Commit 75c2135d authored by paul luse's avatar paul luse Committed by Tomasz Zawadzki
Browse files

module/ioat: fix pci device cleanup on exit 



Using bdevperf, for example, with CBDMA on a malloc backend
with zcopy disabled, 16 messages like this would appear on
exist (each for a different BDF):

Device 0000:00:04.0 is still attached at shutdown!

Signed-off-by: default avatarpaul luse <paul.e.luse@intel.com>
Change-Id: I05dd84c9f6a7c398ac1ee705b1c292530d283042
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/839


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 83e8cc3b

lib/ioat/ioat.c

+0 −2
Original line number Diff line number Diff line
@@ -370,8 +370,6 @@ ioat_channel_destruct(struct spdk_ioat_chan *ioat) 
		spdk_free((void *)ioat->comp_update);

		ioat->comp_update = NULL;

	}



	spdk_pci_device_detach(ioat->device);

}



static int

module/accel/ioat/accel_engine_ioat.c

+25 −0
Original line number Diff line number Diff line
@@ -61,9 +61,17 @@ struct ioat_device { 
	TAILQ_ENTRY(ioat_device) tailq;

};



struct pci_device {

	struct spdk_pci_device *pci_dev;

	TAILQ_ENTRY(pci_device) tailq;

};



static TAILQ_HEAD(, ioat_device) g_devices = TAILQ_HEAD_INITIALIZER(g_devices);

static pthread_mutex_t g_ioat_mutex = PTHREAD_MUTEX_INITIALIZER;



static TAILQ_HEAD(, pci_device) g_pci_devices = TAILQ_HEAD_INITIALIZER(g_pci_devices);





struct ioat_io_channel {

	struct spdk_ioat_chan	*ioat_ch;

	struct ioat_device	*ioat_dev;
@@ -226,6 +234,7 @@ probe_cb(void *cb_ctx, struct spdk_pci_device *pci_dev) 
{

	struct ioat_probe_ctx *ctx = cb_ctx;

	struct spdk_pci_addr pci_addr = spdk_pci_device_get_addr(pci_dev);

	struct pci_device *pdev;



	SPDK_INFOLOG(SPDK_LOG_ACCEL_IOAT,

		     " Found matching device at %04x:%02x:%02x.%x vendor:0x%04x device:0x%04x\n",
@@ -236,6 +245,13 @@ probe_cb(void *cb_ctx, struct spdk_pci_device *pci_dev) 
		     spdk_pci_device_get_vendor_id(pci_dev),

		     spdk_pci_device_get_device_id(pci_dev));



	pdev = calloc(1, sizeof(*pdev));

	if (pdev == NULL) {

		return false;

	}

	pdev->pci_dev = pci_dev;

	TAILQ_INSERT_TAIL(&g_pci_devices, pdev, tailq);



	if (ctx->num_whitelist_devices > 0 &&

	    !ioat_find_dev_by_whitelist_bdf(&pci_addr, ctx->whitelist, ctx->num_whitelist_devices)) {

		return false;
@@ -381,6 +397,7 @@ static void 
accel_engine_ioat_exit(void *ctx)

{

	struct ioat_device *dev;

	struct pci_device *pci_dev;



	if (g_ioat_initialized) {

		spdk_io_device_unregister(&ioat_accel_engine, NULL);
@@ -393,6 +410,14 @@ accel_engine_ioat_exit(void *ctx) 
		ioat_free_device(dev);

		free(dev);

	}



	while (!TAILQ_EMPTY(&g_pci_devices)) {

		pci_dev = TAILQ_FIRST(&g_pci_devices);

		TAILQ_REMOVE(&g_pci_devices, pci_dev, tailq);

		spdk_pci_device_detach(pci_dev->pci_dev);

		free(pci_dev);

	}



	spdk_accel_engine_module_finish();

}