ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vtophys: remove internal device refcount

Browse Source 
This was dead code. Registering the same device more than
once has never been possible within a single process.

Change-Id: I04fa2a62cd9f3d7f99ff799ea4504c49a2232da4
Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/433866
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Darek Stojaczyk 2018-11-18 02:23:22 +01:00 committed by Jim Harris
parent 4734811dc6
commit 04babbea35
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/env_dpdk/vtophys.c
View File

@ -103,7 +103,6 @@ static struct vfio_cfg g_vfio = {
struct spdk_vtophys_pci_device { struct spdk_vtophys_pci_device {
struct rte_pci_device *pci_device; struct rte_pci_device *pci_device;
TAILQ_ENTRY(spdk_vtophys_pci_device) tailq; TAILQ_ENTRY(spdk_vtophys_pci_device) tailq;
uint64_t ref;
}; };
static pthread_mutex_t g_vtophys_pci_devices_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t g_vtophys_pci_devices_mutex = PTHREAD_MUTEX_INITIALIZER;
@ -518,26 +517,15 @@ void
spdk_vtophys_pci_device_added(struct rte_pci_device *pci_device) spdk_vtophys_pci_device_added(struct rte_pci_device *pci_device)
{ {
struct spdk_vtophys_pci_device *vtophys_dev; struct spdk_vtophys_pci_device *vtophys_dev;
bool found = false;
pthread_mutex_lock(&g_vtophys_pci_devices_mutex); pthread_mutex_lock(&g_vtophys_pci_devices_mutex);
TAILQ_FOREACH(vtophys_dev, &g_vtophys_pci_devices, tailq) {
if (vtophys_dev->pci_device == pci_device) {
vtophys_dev->ref++;
found = true;
break;
}
}
if (!found) { vtophys_dev = calloc(1, sizeof(*vtophys_dev));
vtophys_dev = calloc(1, sizeof(*vtophys_dev)); if (vtophys_dev) {
if (vtophys_dev) { vtophys_dev->pci_device = pci_device;
vtophys_dev->pci_device = pci_device; TAILQ_INSERT_TAIL(&g_vtophys_pci_devices, vtophys_dev, tailq);
vtophys_dev->ref = 1; } else {
TAILQ_INSERT_TAIL(&g_vtophys_pci_devices, vtophys_dev, tailq); DEBUG_PRINT("Memory allocation error\n");
} else {
DEBUG_PRINT("Memory allocation error\n");
}
} }
pthread_mutex_unlock(&g_vtophys_pci_devices_mutex); pthread_mutex_unlock(&g_vtophys_pci_devices_mutex);
@ -579,11 +567,8 @@ spdk_vtophys_pci_device_removed(struct rte_pci_device *pci_device)
pthread_mutex_lock(&g_vtophys_pci_devices_mutex); pthread_mutex_lock(&g_vtophys_pci_devices_mutex);
TAILQ_FOREACH(vtophys_dev, &g_vtophys_pci_devices, tailq) { TAILQ_FOREACH(vtophys_dev, &g_vtophys_pci_devices, tailq) {
if (vtophys_dev->pci_device == pci_device) { if (vtophys_dev->pci_device == pci_device) {
assert(vtophys_dev->ref > 0); TAILQ_REMOVE(&g_vtophys_pci_devices, vtophys_dev, tailq);
if (--vtophys_dev->ref == 0) { free(vtophys_dev);
TAILQ_REMOVE(&g_vtophys_pci_devices, vtophys_dev, tailq);
free(vtophys_dev);
}
break; break;
} }
} }