Commit 8944bb46 authored by paul luse's avatar paul luse Committed by Jim Harris
Browse files

bdev/comrpess: add/fix bdev delete 



Was partially present but not complete. Fits here in the series as
it requires read/write operations.

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


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

lib/bdev/compress/vbdev_compress.c

+39 −13
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ struct vbdev_compress { 
	struct spdk_reduce_vol_params	params;		/* params for the reduce volume */

	struct spdk_reduce_backing_dev	backing_dev;	/* backing device info for the reduce volume */

	struct spdk_reduce_vol		*vol;		/* the reduce volume */

	spdk_delete_compress_complete	delete_cb_fn;

	void				*delete_cb_arg;

	TAILQ_ENTRY(vbdev_compress)	link;

};

static TAILQ_HEAD(, vbdev_compress) g_vbdev_comp = TAILQ_HEAD_INITIALIZER(g_vbdev_comp);
@@ -517,27 +519,33 @@ _device_unregister_cb(void *io_device) 
	free(comp_bdev);

}



/* Called by reduceLib after performing unload vol actions */

static void

spdk_reduce_vol_unload_cb(void *cb_arg, int reduce_errno)

_reduce_destroy_cb(void *ctx, int reduce_errno)

{

	struct vbdev_compress *comp_bdev = (struct vbdev_compress *)cb_arg;

	struct vbdev_compress *comp_bdev = (struct vbdev_compress *)ctx;



	if (reduce_errno) {

		SPDK_ERRLOG("error %d\n", reduce_errno);

	}



	/* Remove this device from the internal list */

	TAILQ_REMOVE(&g_vbdev_comp, comp_bdev, link);

	spdk_bdev_unregister(&comp_bdev->comp_bdev, comp_bdev->delete_cb_fn,

			     comp_bdev->delete_cb_arg);

}



	/* Unclaim the underlying bdev. */

	spdk_bdev_module_release_bdev(comp_bdev->base_bdev);

/* Called by reduceLib after performing unload vol actions */

static void

spdk_reduce_vol_unload_cb(void *cb_arg, int reduce_errno)

{

	struct vbdev_compress *comp_bdev = (struct vbdev_compress *)cb_arg;



	/* Close the underlying bdev. */

	spdk_bdev_close(comp_bdev->base_desc);

	if (reduce_errno) {

		SPDK_ERRLOG("error %d\n", reduce_errno);

	}



	/* Unregister the io_device. */

	spdk_io_device_unregister(comp_bdev, _device_unregister_cb);

	/* Clean the device before we free our resources. */

	spdk_reduce_vol_destroy(&comp_bdev->backing_dev, _reduce_destroy_cb, comp_bdev);

}



/* Called after we've unregistered following a hot remove callback.
@@ -548,8 +556,17 @@ vbdev_compress_destruct(void *ctx) 
{

	struct vbdev_compress *comp_bdev = (struct vbdev_compress *)ctx;



	/* Tell reduceLiib that we're done with this volume. */

	spdk_reduce_vol_unload(comp_bdev->vol, spdk_reduce_vol_unload_cb, comp_bdev);

	/* Remove this device from the internal list */

	TAILQ_REMOVE(&g_vbdev_comp, comp_bdev, link);



	/* Unclaim the underlying bdev. */

	spdk_bdev_module_release_bdev(comp_bdev->base_bdev);



	/* Close the underlying bdev. */

	spdk_bdev_close(comp_bdev->base_desc);



	/* Unregister the io_device. */

	spdk_io_device_unregister(comp_bdev, _device_unregister_cb);



	return 0;

}
@@ -1046,7 +1063,6 @@ vbdev_compress_claim(struct vbdev_compress *comp_bdev) 
	}



	SPDK_NOTICELOG("registered io_device and virtual bdev for: %s\n", comp_bdev->comp_bdev.name);

	spdk_bdev_module_examine_done(&compress_if);



	return;

	/* Error cleanup paths. */
@@ -1067,12 +1083,21 @@ error_bdev_name: 
void

delete_compress_disk(struct spdk_bdev *bdev, spdk_delete_compress_complete cb_fn, void *cb_arg)

{

	struct vbdev_compress *comp_bdev = NULL;



	if (!bdev || bdev->module != &compress_if) {

		cb_fn(cb_arg, -ENODEV);

		return;

	}



	spdk_bdev_unregister(bdev, cb_fn, cb_arg);

	comp_bdev = SPDK_CONTAINEROF(bdev, struct vbdev_compress, comp_bdev);



	/* Save these for after the vol is destroyed. */

	comp_bdev->delete_cb_fn = cb_fn;

	comp_bdev->delete_cb_arg = cb_arg;



	/* Tell reduceLib that we're done with this volume. */

	spdk_reduce_vol_unload(comp_bdev->vol, spdk_reduce_vol_unload_cb, comp_bdev);

}



/* Callback from reduce for then load is complete. We'll pass the vbdev_comp struct
@@ -1099,6 +1124,7 @@ vbdev_reduce_load_cb(void *cb_arg, struct spdk_reduce_vol *vol, int reduce_errno 


	meta_ctx->vol = vol;

	vbdev_compress_claim(meta_ctx);

	spdk_bdev_module_examine_done(&compress_if);

}



/* Examine_disk entry point: will do a metadata load to see if this is ours,