Commit 04babbea authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Jim Harris
Browse files

vtophys: remove internal device refcount 



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: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/433866


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 4734811d

lib/env_dpdk/vtophys.c

+8 −23
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ static struct vfio_cfg g_vfio = { 
struct spdk_vtophys_pci_device {

	struct rte_pci_device *pci_device;

	TAILQ_ENTRY(spdk_vtophys_pci_device) tailq;

	uint64_t ref;

};



static pthread_mutex_t g_vtophys_pci_devices_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -518,27 +517,16 @@ void 
spdk_vtophys_pci_device_added(struct rte_pci_device *pci_device)

{

	struct spdk_vtophys_pci_device *vtophys_dev;

	bool found = false;



	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));

	if (vtophys_dev) {

		vtophys_dev->pci_device = pci_device;

			vtophys_dev->ref = 1;

		TAILQ_INSERT_TAIL(&g_vtophys_pci_devices, vtophys_dev, tailq);

	} else {

		DEBUG_PRINT("Memory allocation error\n");

	}

	}

	pthread_mutex_unlock(&g_vtophys_pci_devices_mutex);



#if SPDK_VFIO_ENABLED
@@ -579,11 +567,8 @@ spdk_vtophys_pci_device_removed(struct rte_pci_device *pci_device) 
	pthread_mutex_lock(&g_vtophys_pci_devices_mutex);

	TAILQ_FOREACH(vtophys_dev, &g_vtophys_pci_devices, tailq) {

		if (vtophys_dev->pci_device == pci_device) {

			assert(vtophys_dev->ref > 0);

			if (--vtophys_dev->ref == 0) {

			TAILQ_REMOVE(&g_vtophys_pci_devices, vtophys_dev, tailq);

			free(vtophys_dev);

			}

			break;

		}

	}