Commit 2c2a0056 authored by Wojciech Malikowski's avatar Wojciech Malikowski Committed by Tomasz Zawadzki
Browse files

lib/ftl: Rename ftl_dev_num_punits() to ftl_get_num_punits() 



This patch is part of name refactoring associated
with moving FTL to work with zone bdev API.

Change-Id: I9e0a569e9dfd0e8b8236c0840ce10b92362c4996
Signed-off-by: default avatarWojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479844


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent 3ff9d6e4

lib/ftl/ftl_band.c

+2 −2
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ ftl_band_from_addr(struct spdk_ftl_dev *dev, struct ftl_addr addr) 
struct ftl_zone *

ftl_band_zone_from_addr(struct ftl_band *band, struct ftl_addr addr)

{

	assert(addr.pu < ftl_dev_num_punits(band->dev));

	assert(addr.pu < ftl_get_num_punits(band->dev));

	return &band->zone_buf[addr.pu];

}
@@ -526,7 +526,7 @@ uint64_t 
ftl_band_lbkoff_from_addr(struct ftl_band *band, struct ftl_addr addr)

{

	assert(addr.zone_id == band->id);

	assert(addr.pu < ftl_dev_num_punits(band->dev));

	assert(addr.pu < ftl_get_num_punits(band->dev));

	return addr.pu * ftl_get_num_blocks_in_zone(band->dev) + addr.offset;

}

lib/ftl/ftl_core.h

+2 −2
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ ftl_get_num_blocks_in_zone(const struct spdk_ftl_dev *dev) 
}



static inline size_t

ftl_dev_num_punits(const struct spdk_ftl_dev *dev)

ftl_get_num_punits(const struct spdk_ftl_dev *dev)

{

	return dev->geo.num_pu * dev->geo.num_grp;

}
@@ -471,7 +471,7 @@ ftl_dev_num_punits(const struct spdk_ftl_dev *dev) 
static inline uint64_t

ftl_get_num_blocks_in_band(const struct spdk_ftl_dev *dev)

{

	return ftl_dev_num_punits(dev) * ftl_get_num_blocks_in_zone(dev);

	return ftl_get_num_punits(dev) * ftl_get_num_blocks_in_zone(dev);

}



static inline size_t

lib/ftl/ftl_init.c

+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev) 
		pband = band;



		CIRCLEQ_INIT(&band->zones);

		band->zone_buf = calloc(ftl_dev_num_punits(dev), sizeof(*band->zone_buf));

		band->zone_buf = calloc(ftl_get_num_punits(dev), sizeof(*band->zone_buf));

		if (!band->zone_buf) {

			SPDK_ERRLOG("Failed to allocate block state table for band: [%u]\n", i);

			rc = -1;
@@ -318,7 +318,7 @@ ftl_dev_init_bands(struct spdk_ftl_dev *dev) 
		}

	}



	for (i = 0; i < ftl_dev_num_punits(dev); ++i) {

	for (i = 0; i < ftl_get_num_punits(dev); ++i) {

		rc = ftl_retrieve_punit_chunk_info(dev, i, info);

		if (rc) {

			goto out;
@@ -1075,7 +1075,7 @@ spdk_ftl_dev_init(const struct spdk_ftl_dev_init_opts *_opts, spdk_ftl_init_fn c 
		goto fail_sync;

	}



	dev->rwb = ftl_rwb_init(&dev->conf, dev->geo.ws_opt, dev->md_size, ftl_dev_num_punits(dev));

	dev->rwb = ftl_rwb_init(&dev->conf, dev->geo.ws_opt, dev->md_size, ftl_get_num_punits(dev));

	if (!dev->rwb) {

		SPDK_ERRLOG("Unable to initialize rwb structures\n");

		goto fail_sync;

lib/ftl/ftl_reloc.c

+5 −5
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ ftl_reloc_read_cb(struct ftl_io *io, void *arg, int status) 
static void

ftl_reloc_iter_reset(struct ftl_band_reloc *breloc)

{

	memset(breloc->iter.zone_offset, 0, ftl_dev_num_punits(breloc->band->dev) *

	memset(breloc->iter.zone_offset, 0, ftl_get_num_punits(breloc->band->dev) *

	       sizeof(*breloc->iter.zone_offset));

	breloc->iter.zone_current = 0;

}
@@ -314,7 +314,7 @@ ftl_reloc_iter_lbkoff(struct ftl_band_reloc *breloc) 
static void

ftl_reloc_iter_next_zone(struct ftl_band_reloc *breloc)

{

	size_t num_zones = ftl_dev_num_punits(breloc->band->dev);

	size_t num_zones = ftl_get_num_punits(breloc->band->dev);



	breloc->iter.zone_current = (breloc->iter.zone_current + 1) % num_zones;

}
@@ -368,7 +368,7 @@ static int 
ftl_reloc_iter_done(struct ftl_band_reloc *breloc)

{

	size_t i;

	size_t num_zones = ftl_dev_num_punits(breloc->band->dev);

	size_t num_zones = ftl_get_num_punits(breloc->band->dev);

	size_t num_lbks = ftl_get_num_blocks_in_zone(breloc->parent->dev);



	for (i = 0; i < num_zones; ++i) {
@@ -407,7 +407,7 @@ ftl_reloc_next_lbks(struct ftl_band_reloc *breloc, struct ftl_addr *addr) 
	size_t i, lbk_cnt = 0;

	struct spdk_ftl_dev *dev = breloc->parent->dev;



	for (i = 0; i < ftl_dev_num_punits(dev); ++i) {

	for (i = 0; i < ftl_get_num_punits(dev); ++i) {

		lbk_cnt = ftl_reloc_find_valid_lbks(breloc, breloc->parent->xfer_size, addr);

		ftl_reloc_iter_next_zone(breloc);
@@ -617,7 +617,7 @@ ftl_band_reloc_init(struct ftl_reloc *reloc, struct ftl_band_reloc *breloc, 
		return -1;

	}



	breloc->iter.zone_offset = calloc(ftl_dev_num_punits(band->dev),

	breloc->iter.zone_offset = calloc(ftl_get_num_punits(band->dev),

					  sizeof(*breloc->iter.zone_offset));

	if (!breloc->iter.zone_offset) {

		SPDK_ERRLOG("Failed to initialize reloc iterator");

test/unit/lib/ftl/common/utils.c

+2 −2
Original line number Diff line number Diff line
@@ -89,13 +89,13 @@ test_init_ftl_band(struct spdk_ftl_dev *dev, size_t id) 
	band->lba_map.vld = spdk_bit_array_create(ftl_get_num_blocks_in_band(dev));

	SPDK_CU_ASSERT_FATAL(band->lba_map.vld != NULL);



	band->zone_buf = calloc(ftl_dev_num_punits(dev), sizeof(*band->zone_buf));

	band->zone_buf = calloc(ftl_get_num_punits(dev), sizeof(*band->zone_buf));

	SPDK_CU_ASSERT_FATAL(band->zone_buf != NULL);



	band->reloc_bitmap = spdk_bit_array_create(ftl_dev_num_bands(dev));

	SPDK_CU_ASSERT_FATAL(band->reloc_bitmap != NULL);



	for (size_t i = 0; i < ftl_dev_num_punits(dev); ++i) {

	for (size_t i = 0; i < ftl_get_num_punits(dev); ++i) {

		zone = &band->zone_buf[i];

		zone->state = SPDK_BDEV_ZONE_STATE_CLOSED;

		zone->start_addr.pu = i;