Commit aec00435 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

lib/vhost: separate out bdev events handling 



Generic vhost-blk layer is responsible for opening the bdev
attached to the vhost controller.

This patch adds vhost_user_bdev_event_cb() that is called
for vhost_user backend. This function will be replaced with
a callback to particular virtio-blk transport.

Having this piped through to the transports, allows
to adjust their behavior upon bdev events.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Id73f5131b6e57f0354e970d0bce92716ec69985b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12132


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 34c7b6c1

lib/vhost/vhost_blk.c

+49 −33
Original line number Diff line number Diff line
@@ -1134,6 +1134,25 @@ vhost_blk_poller_set_interrupt_mode(struct spdk_poller *poller, void *cb_arg, bo 
	vhost_user_session_set_interrupt_mode(&bvsession->vsession, interrupt_mode);

}



typedef void (*bdev_event_cb_complete)(struct spdk_vhost_dev *vdev, void *ctx);



static void

bdev_event_cpl_cb(struct spdk_vhost_dev *vdev, void *ctx)

{

	enum spdk_bdev_event_type type = (enum spdk_bdev_event_type)(uintptr_t)ctx;

	struct spdk_vhost_blk_dev *bvdev;



	if (type == SPDK_BDEV_EVENT_REMOVE) {

		/* All sessions have been notified, time to close the bdev */

		bvdev = to_blk_dev(vdev);

		assert(bvdev != NULL);

		spdk_put_io_channel(bvdev->dummy_io_channel);

		spdk_bdev_close(bvdev->bdev_desc);

		bvdev->bdev_desc = NULL;

		bvdev->bdev = NULL;

	}

}



static int

vhost_session_bdev_resize_cb(struct spdk_vhost_dev *vdev,

			     struct spdk_vhost_session *vsession,
@@ -1150,32 +1169,16 @@ vhost_session_bdev_resize_cb(struct spdk_vhost_dev *vdev, 
}



static void

blk_resize_cb(void *resize_ctx)

vhost_user_blk_resize_cb(struct spdk_vhost_dev *vdev, bdev_event_cb_complete cb, void *cb_arg)

{

	struct spdk_vhost_blk_dev *bvdev = resize_ctx;



	spdk_vhost_lock();

	vhost_user_dev_foreach_session(&bvdev->vdev, vhost_session_bdev_resize_cb,

				       NULL, NULL);

	vhost_user_dev_foreach_session(vdev, vhost_session_bdev_resize_cb,

				       cb, cb_arg);

	spdk_vhost_unlock();

}



static void

vhost_dev_bdev_remove_cpl_cb(struct spdk_vhost_dev *vdev, void *ctx)

{



	/* All sessions have been notified, time to close the bdev */

	struct spdk_vhost_blk_dev *bvdev = to_blk_dev(vdev);



	assert(bvdev != NULL);

	spdk_put_io_channel(bvdev->dummy_io_channel);

	spdk_bdev_close(bvdev->bdev_desc);

	bvdev->bdev_desc = NULL;

	bvdev->bdev = NULL;

}



static int

vhost_session_bdev_remove_cb(struct spdk_vhost_dev *vdev,

vhost_user_session_bdev_remove_cb(struct spdk_vhost_dev *vdev,

				  struct spdk_vhost_session *vsession,

				  void *ctx)

{
@@ -1204,35 +1207,48 @@ vhost_session_bdev_remove_cb(struct spdk_vhost_dev *vdev, 
}



static void

bdev_remove_cb(void *remove_ctx)

vhost_user_bdev_remove_cb(struct spdk_vhost_dev *vdev, bdev_event_cb_complete cb, void *cb_arg)

{

	struct spdk_vhost_blk_dev *bvdev = remove_ctx;



	SPDK_WARNLOG("%s: hot-removing bdev - all further requests will fail.\n",

		     bvdev->vdev.name);

		     vdev->name);



	spdk_vhost_lock();

	vhost_user_dev_foreach_session(&bvdev->vdev, vhost_session_bdev_remove_cb,

				       vhost_dev_bdev_remove_cpl_cb, NULL);

	vhost_user_dev_foreach_session(vdev, vhost_user_session_bdev_remove_cb,

				       cb, cb_arg);

	spdk_vhost_unlock();

}



static void

vhost_user_bdev_event_cb(enum spdk_bdev_event_type type, struct spdk_vhost_dev *vdev,

			 bdev_event_cb_complete cb, void *cb_arg)

{

	switch (type) {

	case SPDK_BDEV_EVENT_REMOVE:

		vhost_user_bdev_remove_cb(vdev, cb, cb_arg);

		break;

	case SPDK_BDEV_EVENT_RESIZE:

		vhost_user_blk_resize_cb(vdev, cb, cb_arg);

		break;

	default:

		assert(false);

		return;

	}

}



static void

bdev_event_cb(enum spdk_bdev_event_type type, struct spdk_bdev *bdev,

	      void *event_ctx)

{

	struct spdk_vhost_dev *vdev = (struct spdk_vhost_dev *)event_ctx;



	SPDK_DEBUGLOG(vhost_blk, "Bdev event: type %d, name %s\n",

		      type,

		      bdev->name);



	switch (type) {

	case SPDK_BDEV_EVENT_REMOVE:

		SPDK_NOTICELOG("bdev name (%s) received event(SPDK_BDEV_EVENT_REMOVE)\n", bdev->name);

		bdev_remove_cb(event_ctx);

		break;

	case SPDK_BDEV_EVENT_RESIZE:

		SPDK_NOTICELOG("bdev name (%s) received event(SPDK_BDEV_EVENT_RESIZE)\n", bdev->name);

		blk_resize_cb(event_ctx);

		vhost_user_bdev_event_cb(type, vdev, bdev_event_cpl_cb, (void *)type);

		break;

	default:

		SPDK_NOTICELOG("Unsupported bdev event: type %d\n", type);