Commit 002cfe9d authored by Li Feng's avatar Li Feng Committed by Tomasz Zawadzki
Browse files

vhost-scsi: fix hang when removing target 



If the virtio-scsi controller doesn't support the 'eventq' and
'controlq' queue, the operation(vhost_scsi_controller_remove_target)
of removing target from this controller will always hang.

We can reproduce this by starting a qemu without a bootable guest os.

Change-Id: Ia53b48ae1a18cfb9dc919352fc3cce6ade84c9d8
Signed-off-by: default avatarLi Feng <fengli@smartx.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5151


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Community-CI: Mellanox Build Bot
parent 348bd072

lib/vhost/vhost_scsi.c

+10 −8
Original line number Diff line number Diff line
@@ -807,10 +807,15 @@ vdev_mgmt_worker(void *arg) 
	struct spdk_vhost_session *vsession = &svsession->vsession;



	process_removed_devs(svsession);



	if (vsession->virtqueue[VIRTIO_SCSI_EVENTQ].vring.desc) {

		vhost_vq_used_signal(vsession, &vsession->virtqueue[VIRTIO_SCSI_EVENTQ]);

	}



	if (vsession->virtqueue[VIRTIO_SCSI_CONTROLQ].vring.desc) {

		process_vq(svsession, &vsession->virtqueue[VIRTIO_SCSI_CONTROLQ]);

		vhost_vq_used_signal(vsession, &vsession->virtqueue[VIRTIO_SCSI_CONTROLQ]);

	}



	return SPDK_POLLER_BUSY;

}
@@ -1408,11 +1413,8 @@ vhost_scsi_start_cb(struct spdk_vhost_dev *vdev, 
		     vsession->name, spdk_env_get_current_core());



	svsession->requestq_poller = SPDK_POLLER_REGISTER(vdev_worker, svsession, 0);

	if (vsession->virtqueue[VIRTIO_SCSI_CONTROLQ].vring.desc &&

	    vsession->virtqueue[VIRTIO_SCSI_EVENTQ].vring.desc) {

	svsession->mgmt_poller = SPDK_POLLER_REGISTER(vdev_mgmt_worker, svsession,

				 MGMT_POLL_PERIOD_US);

	}

out:

	vhost_session_start_done(vsession, rc);

	return rc;