Commit f2d9e815 authored by Dariusz Stojaczyk's avatar Dariusz Stojaczyk Committed by Jim Harris
Browse files

virtio: remove init/attached vdev distinction 



This distinction was required to
be able to check if device has been
scanned already. However, with the
upcoming eventq support it will
be possible to re-scan the device
at any time. We could move the
vdev back and forth between the
lists, bu now that SCSI devices have
their own virtio_scsi_dev struct,
we can remove this distinction and
check the scan status from within
the struct itself.

Change-Id: If57e7ce4b9ce900aa36a5aeba9e4b4a432d3c757
Signed-off-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/390109


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 491de04c

lib/bdev/virtio/bdev_virtio.c

+26 −14
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ static void bdev_virtio_finish(void); 
struct virtio_scsi_dev {

	/* Generic virtio device data. */

	struct virtio_dev		vdev;



	/** Context for the SCSI target scan. */

	struct virtio_scsi_scan_base	*scan_ctx;

};



struct virtio_scsi_io_ctx {
@@ -629,7 +632,7 @@ scan_target_abort(struct virtio_scsi_scan_base *base, int error) 
		free(disk);

	}



	TAILQ_REMOVE(&g_virtio_driver.init_ctrlrs, vdev, tailq);

	TAILQ_REMOVE(&g_virtio_driver.scsi_devs, vdev, tailq);

	virtio_dev_stop(vdev);

	virtio_dev_destruct(vdev);

	free(vdev);
@@ -704,8 +707,7 @@ scan_target_finish(struct virtio_scsi_scan_base *base) 
		bdevs_cnt++;

	}



	TAILQ_REMOVE(&g_virtio_driver.init_ctrlrs, vdev, tailq);

	TAILQ_INSERT_TAIL(&g_virtio_driver.attached_ctrlrs, vdev, tailq);

	base->svdev->scan_ctx = NULL;



	if (base->cb_fn) {

		base->cb_fn(base->cb_arg, 0, bdevs, bdevs_cnt);
@@ -1297,6 +1299,9 @@ bdev_virtio_scsi_scan(struct virtio_scsi_dev *svdev, bdev_virtio_create_cb cb_fn 


	vq = vdev->vqs[VIRTIO_SCSI_REQUESTQ];

	base->vq = vq;



	svdev->scan_ctx = base;



	vq->poller_ctx = base;

	vq->poller = spdk_poller_register(bdev_scan_poll, base, 0);

	rc = scan_target(base);
@@ -1312,9 +1317,16 @@ bdev_virtio_initial_scan_complete(void *ctx __attribute__((unused)), 
				  int result  __attribute__((unused)),

				  struct spdk_bdev **bdevs __attribute__((unused)), size_t bdevs_cnt __attribute__((unused)))

{

	if (TAILQ_EMPTY(&g_virtio_driver.init_ctrlrs)) {

		spdk_bdev_module_init_done(SPDK_GET_BDEV_MODULE(virtio_scsi));

	struct virtio_dev *vdev;



	TAILQ_FOREACH(vdev, &g_virtio_driver.scsi_devs, tailq) {

		if (virtio_dev_to_scsi(vdev)->scan_ctx) {

			/* another device is still being scanned */

			return;

		}

	}



	spdk_bdev_module_init_done(SPDK_GET_BDEV_MODULE(virtio_scsi));

}



static int
@@ -1329,13 +1341,13 @@ bdev_virtio_initialize(void) 
		goto out;

	}



	if (TAILQ_EMPTY(&g_virtio_driver.init_ctrlrs)) {

	if (TAILQ_EMPTY(&g_virtio_driver.scsi_devs)) {

		spdk_bdev_module_init_done(SPDK_GET_BDEV_MODULE(virtio_scsi));

		return 0;

	}



	/* Initialize all created devices and scan available targets */

	TAILQ_FOREACH(vdev, &g_virtio_driver.init_ctrlrs, tailq) {

	TAILQ_FOREACH(vdev, &g_virtio_driver.scsi_devs, tailq) {

		svdev = virtio_dev_to_scsi(vdev);

		rc = bdev_virtio_scsi_scan(svdev, bdev_virtio_initial_scan_complete, NULL);

		if (rc != 0) {
@@ -1347,9 +1359,9 @@ bdev_virtio_initialize(void) 


out:

	/* Remove any created devices */

	TAILQ_FOREACH_SAFE(vdev, &g_virtio_driver.init_ctrlrs, tailq, next_vdev) {

	TAILQ_FOREACH_SAFE(vdev, &g_virtio_driver.scsi_devs, tailq, next_vdev) {

		svdev = virtio_dev_to_scsi(vdev);

		TAILQ_REMOVE(&g_virtio_driver.init_ctrlrs, vdev, tailq);

		TAILQ_REMOVE(&g_virtio_driver.scsi_devs, vdev, tailq);

		bdev_virtio_scsi_dev_free(svdev);

	}
@@ -1388,8 +1400,8 @@ virtio_scsi_dev_unregister_cb(void *io_device) 
	virtio_dev_destruct(vdev);

	free(svdev);



	TAILQ_REMOVE(&g_virtio_driver.attached_ctrlrs, vdev, tailq);

	finish_module = TAILQ_EMPTY(&g_virtio_driver.attached_ctrlrs);

	TAILQ_REMOVE(&g_virtio_driver.scsi_devs, vdev, tailq);

	finish_module = TAILQ_EMPTY(&g_virtio_driver.scsi_devs);



	if (finish_module) {

		spdk_bdev_module_finish_done();
@@ -1401,12 +1413,12 @@ bdev_virtio_finish(void) 
{

	struct virtio_dev *vdev, *next;



	if (TAILQ_EMPTY(&g_virtio_driver.attached_ctrlrs)) {

	if (TAILQ_EMPTY(&g_virtio_driver.scsi_devs)) {

		spdk_bdev_module_finish_done();

		return;

	}



	TAILQ_FOREACH_SAFE(vdev, &g_virtio_driver.attached_ctrlrs, tailq, next) {

	TAILQ_FOREACH_SAFE(vdev, &g_virtio_driver.scsi_devs, tailq, next) {

		spdk_io_device_unregister(virtio_dev_to_scsi(vdev),

					  virtio_scsi_dev_unregister_cb);

	}
@@ -1435,7 +1447,7 @@ bdev_virtio_scsi_dev_create(const char *base_name, const char *path, unsigned nu 


	rc = bdev_virtio_scsi_scan(svdev, cb_fn, cb_arg);

	if (rc) {

		TAILQ_REMOVE(&g_virtio_driver.init_ctrlrs, &svdev->vdev, tailq);

		TAILQ_REMOVE(&g_virtio_driver.scsi_devs, &svdev->vdev, tailq);

		bdev_virtio_scsi_dev_free(svdev);

	}

lib/bdev/virtio/rte_virtio/virtio.c

+1 −2
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ 
#include "virtio.h"



struct virtio_driver g_virtio_driver = {

	.init_ctrlrs = TAILQ_HEAD_INITIALIZER(g_virtio_driver.init_ctrlrs),

	.attached_ctrlrs = TAILQ_HEAD_INITIALIZER(g_virtio_driver.attached_ctrlrs),

	.scsi_devs = TAILQ_HEAD_INITIALIZER(g_virtio_driver.scsi_devs),

};



/* Chain all the descriptors in the ring with an END */

lib/bdev/virtio/rte_virtio/virtio.h

+1 −2
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ struct virtio_req { 
};



struct virtio_driver {

	TAILQ_HEAD(, virtio_dev) init_ctrlrs;

	TAILQ_HEAD(, virtio_dev) attached_ctrlrs;

	TAILQ_HEAD(, virtio_dev) scsi_devs;

};



extern struct virtio_driver g_virtio_driver;

lib/bdev/virtio/rte_virtio/virtio_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ virtio_pci_dev_init(struct virtio_dev *vdev, const char *name, 
	vdev->modern = 1;

	vdev->max_queues = SPDK_VIRTIO_MAX_VIRTQUEUES;



	TAILQ_INSERT_TAIL(&g_virtio_driver.init_ctrlrs, vdev, tailq);

	TAILQ_INSERT_TAIL(&g_virtio_driver.scsi_devs, vdev, tailq);

	return 0;

}

lib/bdev/virtio/rte_virtio/virtio_user.c

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ virtio_user_dev_init(struct virtio_dev *vdev, const char *name, const char *path 
		goto err;

	}



	TAILQ_INSERT_TAIL(&g_virtio_driver.init_ctrlrs, vdev, tailq);

	TAILQ_INSERT_TAIL(&g_virtio_driver.scsi_devs, vdev, tailq);

	return 0;



err: