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

vhost/nvme: generic cleanup 



* don't iterate through g_nvme_ctrlrs when it's unnecessary
* fixup a potential deadlock on session stop error
  (which can't practically happen unless the SPDK generic
   vhost layer is malfunctioning)
* add a FIXME note to wait for pending I/Os before putting
  bdev io channels and stopping the vhost pollers.

Change-Id: I576c4771f51e432fbbab244fd1b91668436004bf
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/448224


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 3b760a4d

lib/vhost/vhost_nvme.c

+22 −29
Original line number Diff line number Diff line
@@ -1156,14 +1156,13 @@ static int 
destroy_device_poller_cb(void *arg)

{

	struct spdk_vhost_nvme_dev *nvme = arg;

	struct spdk_vhost_nvme_dev *dev, *tmp;

	struct spdk_vhost_nvme_ns *ns_dev;

	uint32_t i;



	SPDK_DEBUGLOG(SPDK_LOG_VHOST_NVME, "Destroy device poller callback\n");



	TAILQ_FOREACH_SAFE(dev, &g_nvme_ctrlrs, tailq, tmp) {

		if (dev == nvme) {

	/* FIXME wait for pending I/Os to complete */



	for (i = 0; i < nvme->num_ns; i++) {

		ns_dev = &nvme->ns[i];

		if (ns_dev->bdev_io_channel) {
@@ -1180,8 +1179,6 @@ destroy_device_poller_cb(void *arg) 
	nvme->dbbuf_dbs = NULL;

	nvme->dbbuf_eis = NULL;

	nvme->dataplane_started = false;

		}

	}



	spdk_poller_unregister(&nvme->destroy_ctx.poller);

	spdk_vhost_session_event_done(nvme->vsession, 0);
@@ -1196,6 +1193,7 @@ spdk_vhost_nvme_stop_cb(struct spdk_vhost_dev *vdev, 
	struct spdk_vhost_nvme_dev *nvme = to_nvme_dev(vdev);



	if (nvme == NULL) {

		spdk_vhost_session_event_done(vsession, -1);

		return -1;

	}
@@ -1422,7 +1420,6 @@ int 
spdk_vhost_nvme_dev_remove(struct spdk_vhost_dev *vdev)

{

	struct spdk_vhost_nvme_dev *nvme = to_nvme_dev(vdev);

	struct spdk_vhost_nvme_dev *dev, *tmp;

	struct spdk_vhost_nvme_ns *ns;

	int rc;

	uint32_t i;
@@ -1431,17 +1428,13 @@ spdk_vhost_nvme_dev_remove(struct spdk_vhost_dev *vdev) 
		return -EINVAL;

	}



	TAILQ_FOREACH_SAFE(dev, &g_nvme_ctrlrs, tailq, tmp) {

		if (dev == nvme) {

			TAILQ_REMOVE(&g_nvme_ctrlrs, dev, tailq);

	TAILQ_REMOVE(&g_nvme_ctrlrs, nvme, tailq);

	for (i = 0; i < nvme->num_ns; i++) {

		ns = &nvme->ns[i];

		if (ns->active_ns) {

			spdk_vhost_nvme_deactive_ns(ns);

		}

	}

		}

	}



	rc = spdk_vhost_dev_unregister(vdev);

	if (rc != 0) {