Commit 4b8db27b authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

lib/blob: add _spdk_bs_md_page_to_lba() function internal to blobstore 



The _spdk_bs_page_to_lba() [without 'md'] is only for translating the
pages on the blobstore to lba they are at. Those pages start at
the begining of the device and cover all of it. Thus simple
math is enough to translate those.
It is used to calculate lba_count for set of pages as well.

Meanwhile there are 'md_pages' which are the same pages as for
the above, but their count start at bs->md_start.
Which is right after super_block and couple pages for bit masks.

This patch creates new _spdk_bs_md_page_to_lba() that is more
explicit in what page number is passed. Hopefully avoiding
confusion when reading which page number refers to which
'type' of page.

Exception to the that is _spdk_bs_dump_read_md_page(), where
blobstore is not actually loaded (md_start from super block
is not copied to bs structure).

Additionaly providing assert to catch errors on debug builds.
Making the check in _spdk_blob_load_cpl() for max_md_lba obsolete.

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


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 72f6c808

lib/blob/blobstore.c

+7 −12
Original line number Diff line number Diff line
@@ -979,12 +979,7 @@ _spdk_blob_load_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) 


	if (page->next != SPDK_INVALID_MD_PAGE) {

		uint32_t next_page = page->next;

		uint64_t next_lba = _spdk_bs_page_to_lba(blob->bs, blob->bs->md_start + next_page);

		uint64_t max_md_lba = _spdk_bs_page_to_lba(blob->bs, blob->bs->md_start + blob->bs->md_len);



		if (next_lba >= max_md_lba) {

			assert(false);

		}

		uint64_t next_lba = _spdk_bs_md_page_to_lba(blob->bs, next_page);



		/* Read the next page */

		ctx->num_pages++;
@@ -1065,7 +1060,7 @@ _spdk_blob_load(spdk_bs_sequence_t *seq, struct spdk_blob *blob, 
	ctx->seq = seq;



	page_num = _spdk_bs_blobid_to_page(blob->id);

	lba = _spdk_bs_page_to_lba(blob->bs, bs->md_start + page_num);

	lba = _spdk_bs_md_page_to_lba(blob->bs, page_num);



	blob->state = SPDK_BLOB_STATE_LOADING;
@@ -1260,7 +1255,7 @@ _spdk_blob_persist_zero_pages(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno 
	 * so any pages in the clean list must be zeroed.

	 */

	for (i = 1; i < blob->clean.num_pages; i++) {

		lba = _spdk_bs_page_to_lba(bs, bs->md_start + blob->clean.pages[i]);

		lba = _spdk_bs_md_page_to_lba(bs, blob->clean.pages[i]);



		spdk_bs_batch_write_zeroes_dev(batch, lba, lba_count);

	}
@@ -1271,7 +1266,7 @@ _spdk_blob_persist_zero_pages(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno 


		/* The first page in the metadata goes where the blobid indicates */

		page_num = _spdk_bs_blobid_to_page(blob->id);

		lba = _spdk_bs_page_to_lba(bs, bs->md_start + page_num);

		lba = _spdk_bs_md_page_to_lba(bs, page_num);



		spdk_bs_batch_write_zeroes_dev(batch, lba, lba_count);

	}
@@ -1299,7 +1294,7 @@ _spdk_blob_persist_write_page_root(spdk_bs_sequence_t *seq, void *cb_arg, int bs 


	page = &ctx->pages[0];

	/* The first page in the metadata goes where the blobid indicates */

	lba = _spdk_bs_page_to_lba(bs, bs->md_start + _spdk_bs_blobid_to_page(blob->id));

	lba = _spdk_bs_md_page_to_lba(bs, _spdk_bs_blobid_to_page(blob->id));



	spdk_bs_sequence_write_dev(seq, page, lba, lba_count,

				   _spdk_blob_persist_zero_pages, ctx);
@@ -1332,7 +1327,7 @@ _spdk_blob_persist_write_page_chain(spdk_bs_sequence_t *seq, void *cb_arg, int b 
		page = &ctx->pages[i];

		assert(page->sequence_num == i);



		lba = _spdk_bs_page_to_lba(bs, bs->md_start + blob->active.pages[i]);

		lba = _spdk_bs_md_page_to_lba(bs, blob->active.pages[i]);



		spdk_bs_batch_write_dev(batch, page, lba, lba_count);

	}
@@ -3184,7 +3179,7 @@ _spdk_bs_load_replay_cur_md_page(spdk_bs_sequence_t *seq, void *cb_arg) 
	uint64_t lba;



	assert(ctx->cur_page < ctx->super->md_len);

	lba = _spdk_bs_page_to_lba(ctx->bs, ctx->super->md_start + ctx->cur_page);

	lba = _spdk_bs_md_page_to_lba(ctx->bs, ctx->cur_page);

	spdk_bs_sequence_read_dev(seq, ctx->page, lba,

				  _spdk_bs_byte_to_lba(ctx->bs, SPDK_BS_PAGE_SIZE),

				  _spdk_bs_load_replay_md_cpl, ctx);

lib/blob/blobstore.h

+7 −0
Original line number Diff line number Diff line
@@ -400,6 +400,13 @@ _spdk_bs_page_to_lba(struct spdk_blob_store *bs, uint64_t page) 
	return page * SPDK_BS_PAGE_SIZE / bs->dev->blocklen;

}



static inline uint64_t

_spdk_bs_md_page_to_lba(struct spdk_blob_store *bs, uint32_t page)

{

	assert(page < bs->md_len);

	return _spdk_bs_page_to_lba(bs, page + bs->md_start);

}



static inline uint64_t

_spdk_bs_dev_page_to_lba(struct spdk_bs_dev *bs_dev, uint64_t page)

{