Commit 60e8fb49 authored by Ben Walker's avatar Ben Walker Committed by Daniel Verkamp
Browse files

blob: Use a separate md and I/O target 



This allows us to allocate different size channels and
not require the unique flag.

Change-Id: I4b1ffd244b60e9e9ab06f9ab4da8161ab57e1169
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/361668


Tested-by: default avatar <sys_sgsw@intel.com>
Reviewed-by: default avatarPiotr Pelpliński <piotr.pelplinski@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent fd293665

include/spdk/util.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ extern "C" { 


#define SPDK_COUNTOF(arr) (sizeof(arr) / sizeof((arr)[0]))



#define SPDK_CONTAINEROF(ptr, type, member) ((type *)((uintptr_t)ptr - offsetof(type, member)))



static inline uint32_t

spdk_u32log2(uint32_t x)

{

lib/blob/blobstore.c

+50 −23
Original line number Diff line number Diff line
@@ -1050,22 +1050,22 @@ _spdk_blob_lookup(struct spdk_blob_store *bs, spdk_blob_id blobid) 
}



static int

_spdk_bs_channel_create(void *io_device, uint32_t priority, void *ctx_buf, void *unique_ctx)

_spdk_bs_channel_create(struct spdk_blob_store *bs, struct spdk_bs_channel *channel,

			uint32_t max_ops)

{

	struct spdk_blob_store		*bs = io_device;

	struct spdk_bs_dev		*dev = bs->dev;

	struct spdk_bs_channel	*channel = ctx_buf;

	struct spdk_bs_dev		*dev;

	uint32_t			i;



	channel->req_mem = calloc(spdk_max(bs->max_channel_ops, bs->max_md_ops),

				  sizeof(struct spdk_bs_request_set));

	dev = bs->dev;



	channel->req_mem = calloc(max_ops, sizeof(struct spdk_bs_request_set));

	if (!channel->req_mem) {

		return -1;

	}



	TAILQ_INIT(&channel->reqs);



	for (i = 0; i < spdk_max(bs->max_channel_ops, bs->max_md_ops); i++) {

	for (i = 0; i < max_ops; i++) {

		TAILQ_INSERT_TAIL(&channel->reqs, &channel->req_mem[i], link);

	}
@@ -1076,6 +1076,29 @@ _spdk_bs_channel_create(void *io_device, uint32_t priority, void *ctx_buf, void 
	return 0;

}



static int

_spdk_bs_md_channel_create(void *io_device, uint32_t priority, void *ctx_buf, void *unique_ctx)

{

	struct spdk_blob_store		*bs;

	struct spdk_bs_channel		*channel = ctx_buf;



	bs = SPDK_CONTAINEROF(io_device, struct spdk_blob_store, md_target);



	return _spdk_bs_channel_create(bs, channel, bs->md_target.max_md_ops);

}



static int

_spdk_bs_io_channel_create(void *io_device, uint32_t priority, void *ctx_buf, void *unique_ctx)

{

	struct spdk_blob_store		*bs;

	struct spdk_bs_channel		*channel = ctx_buf;



	bs = SPDK_CONTAINEROF(io_device, struct spdk_blob_store, io_target);



	return _spdk_bs_channel_create(bs, channel, bs->io_target.max_channel_ops);

}





static void

_spdk_bs_channel_destroy(void *io_device, void *ctx_buf)

{
@@ -1091,7 +1114,8 @@ _spdk_bs_free(struct spdk_blob_store *bs) 
	struct spdk_blob	*blob, *blob_tmp;



	spdk_bs_unregister_md_thread(bs);

	spdk_io_device_unregister(bs);

	spdk_io_device_unregister(&bs->io_target);

	spdk_io_device_unregister(&bs->md_target);



	TAILQ_FOREACH_SAFE(blob, &bs->blobs, link, blob_tmp) {

		TAILQ_REMOVE(&bs->blobs, blob, link);
@@ -1141,17 +1165,20 @@ _spdk_bs_alloc(struct spdk_bs_dev *dev, struct spdk_bs_opts *opts) 
		return NULL;

	}



	bs->max_md_ops = opts->max_md_ops;

	bs->max_channel_ops = opts->max_channel_ops;

	bs->md_target.max_md_ops = opts->max_md_ops;

	bs->io_target.max_channel_ops = opts->max_channel_ops;

	bs->super_blob = SPDK_BLOBID_INVALID;



	/* The metadata is assumed to be at least 1 page */

	bs->used_md_pages = spdk_bit_array_create(1);



	spdk_io_device_register(bs, _spdk_bs_channel_create, _spdk_bs_channel_destroy,

	spdk_io_device_register(&bs->md_target, _spdk_bs_md_channel_create, _spdk_bs_channel_destroy,

				sizeof(struct spdk_bs_channel));

	spdk_bs_register_md_thread(bs);



	spdk_io_device_register(&bs->io_target, _spdk_bs_io_channel_create, _spdk_bs_channel_destroy,

				sizeof(struct spdk_bs_channel));



	return bs;

}
@@ -1364,7 +1391,7 @@ spdk_bs_load(struct spdk_bs_dev *dev, 
	cpl.u.bs_handle.cb_arg = cb_arg;

	cpl.u.bs_handle.bs = bs;



	seq = spdk_bs_sequence_start(bs->md_channel, &cpl);

	seq = spdk_bs_sequence_start(bs->md_target.md_channel, &cpl);

	if (!seq) {

		spdk_free(ctx->super);

		free(ctx);
@@ -1520,7 +1547,7 @@ spdk_bs_init(struct spdk_bs_dev *dev, struct spdk_bs_opts *o, 
	cpl.u.bs_handle.cb_arg = cb_arg;

	cpl.u.bs_handle.bs = bs;



	seq = spdk_bs_sequence_start(bs->md_channel, &cpl);

	seq = spdk_bs_sequence_start(bs->md_target.md_channel, &cpl);

	if (!seq) {

		spdk_free(ctx->super);

		free(ctx);
@@ -1677,7 +1704,7 @@ spdk_bs_unload(struct spdk_blob_store *bs, spdk_bs_op_complete cb_fn, void *cb_a 
	cpl.u.bs_basic.cb_fn = cb_fn;

	cpl.u.bs_basic.cb_arg = cb_arg;



	seq = spdk_bs_sequence_start(bs->md_channel, &cpl);

	seq = spdk_bs_sequence_start(bs->md_target.md_channel, &cpl);

	if (!seq) {

		spdk_free(ctx->super);

		free(ctx);
@@ -1734,15 +1761,15 @@ spdk_bs_free_cluster_count(struct spdk_blob_store *bs) 


int spdk_bs_register_md_thread(struct spdk_blob_store *bs)

{

	bs->md_channel = spdk_get_io_channel(bs, SPDK_IO_PRIORITY_DEFAULT, true,

					     NULL);

	bs->md_target.md_channel = spdk_get_io_channel(&bs->md_target, SPDK_IO_PRIORITY_DEFAULT,

				   false, NULL);



	return 0;

}



int spdk_bs_unregister_md_thread(struct spdk_blob_store *bs)

{

	spdk_put_io_channel(bs->md_channel);

	spdk_put_io_channel(bs->md_target.md_channel);



	return 0;

}
@@ -1815,7 +1842,7 @@ void spdk_bs_md_create_blob(struct spdk_blob_store *bs, 
	cpl.u.blobid.cb_arg = cb_arg;

	cpl.u.blobid.blobid = blob->id;



	seq = spdk_bs_sequence_start(bs->md_channel, &cpl);

	seq = spdk_bs_sequence_start(bs->md_target.md_channel, &cpl);

	if (!seq) {

		_spdk_blob_free(blob);

		cb_fn(cb_arg, 0, -ENOMEM);
@@ -1903,7 +1930,7 @@ spdk_bs_md_delete_blob(struct spdk_blob_store *bs, spdk_blob_id blobid, 
	cpl.u.blob_basic.cb_fn = cb_fn;

	cpl.u.blob_basic.cb_arg = cb_arg;



	seq = spdk_bs_sequence_start(bs->md_channel, &cpl);

	seq = spdk_bs_sequence_start(bs->md_target.md_channel, &cpl);

	if (!seq) {

		_spdk_blob_free(blob);

		cb_fn(cb_arg, -ENOMEM);
@@ -1964,7 +1991,7 @@ void spdk_bs_md_open_blob(struct spdk_blob_store *bs, spdk_blob_id blobid, 
	cpl.u.blob_handle.cb_arg = cb_arg;

	cpl.u.blob_handle.blob = blob;



	seq = spdk_bs_sequence_start(bs->md_channel, &cpl);

	seq = spdk_bs_sequence_start(bs->md_target.md_channel, &cpl);

	if (!seq) {

		_spdk_blob_free(blob);

		cb_fn(cb_arg, NULL, -ENOMEM);
@@ -2003,7 +2030,7 @@ void spdk_bs_md_sync_blob(struct spdk_blob *blob, 
	cpl.u.blob_basic.cb_fn = cb_fn;

	cpl.u.blob_basic.cb_arg = cb_arg;



	seq = spdk_bs_sequence_start(blob->bs->md_channel, &cpl);

	seq = spdk_bs_sequence_start(blob->bs->md_target.md_channel, &cpl);

	if (!seq) {

		cb_fn(cb_arg, -ENOMEM);

		return;
@@ -2058,7 +2085,7 @@ void spdk_bs_md_close_blob(struct spdk_blob **b, 
	cpl.u.blob_basic.cb_fn = cb_fn;

	cpl.u.blob_basic.cb_arg = cb_arg;



	seq = spdk_bs_sequence_start(blob->bs->md_channel, &cpl);

	seq = spdk_bs_sequence_start(blob->bs->md_target.md_channel, &cpl);

	if (!seq) {

		cb_fn(cb_arg, -ENOMEM);

		return;
@@ -2078,7 +2105,7 @@ void spdk_bs_md_close_blob(struct spdk_blob **b, 
struct spdk_io_channel *spdk_bs_alloc_io_channel(struct spdk_blob_store *bs,

		uint32_t priority)

{

	return spdk_get_io_channel(bs, priority, true, NULL);

	return spdk_get_io_channel(&bs->io_target, priority, false, NULL);

}



void spdk_bs_free_io_channel(struct spdk_io_channel *channel)

lib/blob/blobstore.h

+10 −4
Original line number Diff line number Diff line
@@ -133,7 +133,16 @@ struct spdk_blob { 
struct spdk_blob_store {

	uint64_t			md_start; /* Offset from beginning of disk, in pages */

	uint32_t			md_len; /* Count, in pages */



	struct {

		uint32_t		max_md_ops;

		struct spdk_io_channel	*md_channel;

	} md_target;



	struct {

		uint32_t		max_channel_ops;

	} io_target;





	struct spdk_bs_dev		*dev;
@@ -145,9 +154,6 @@ struct spdk_blob_store { 
	uint64_t			num_free_clusters;

	uint32_t			pages_per_cluster;



	uint32_t			max_md_ops;

	uint32_t			max_channel_ops;



	spdk_blob_id			super_blob;



	TAILQ_HEAD(, spdk_blob) 	blobs;