Commit 5363eb3c authored by Sochin Jiang's avatar Sochin Jiang Committed by Tomasz Zawadzki
Browse files

lib/blob: fix an uint32_t overflow in blobstore init 



uint32_t supports at most 2TB at most, we need to handle
the larger blobstores, fix this overflow problem.

Signed-off-by: default avatarSochin Jiang <jiangxiaoqing.sochin@bytedance.com>
Change-Id: I27950eb759e9cb9ad48fa4aa8dd1976b4e852832
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4075


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 8701f636

lib/blob/blobstore.c

+18 −12
Original line number Diff line number Diff line
@@ -4596,6 +4596,7 @@ spdk_bs_init(struct spdk_bs_dev *dev, struct spdk_bs_opts *o, 
	uint32_t		i;

	struct spdk_bs_opts	opts = {};

	int			rc;

	uint64_t		lba, lba_count;



	SPDK_DEBUGLOG(SPDK_LOG_BLOB, "Initializing blobstore on dev %p\n", dev);
@@ -4758,19 +4759,24 @@ spdk_bs_init(struct spdk_bs_dev *dev, struct spdk_bs_opts *o, 
	/* Clear metadata space */

	bs_batch_write_zeroes_dev(batch, 0, num_md_lba);



	lba = num_md_lba;

	while (lba < ctx->bs->dev->blockcnt) {

		lba_count = spdk_min(UINT32_MAX, ctx->bs->dev->blockcnt - lba);

		switch (opts.clear_method) {

		case BS_CLEAR_WITH_UNMAP:

			/* Trim data clusters */

		bs_batch_unmap_dev(batch, num_md_lba, ctx->bs->dev->blockcnt - num_md_lba);

			bs_batch_unmap_dev(batch, lba, lba_count);

			break;

		case BS_CLEAR_WITH_WRITE_ZEROES:

			/* Write_zeroes to data clusters */

		bs_batch_write_zeroes_dev(batch, num_md_lba, ctx->bs->dev->blockcnt - num_md_lba);

			bs_batch_write_zeroes_dev(batch, lba, lba_count);

			break;

		case BS_CLEAR_WITH_NONE:

		default:

			break;

		}

		lba += lba_count;

	}



	bs_batch_close(batch);

}