ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/ftl: Update alignment layout's region

Browse Source 
Layout's regions need to be aligned to write unit size.
Calculate the exact amount of bands needed for metadata, rather than
assuming 1 band is enough.

Signed-off-by: Kozlowski Mateusz <mateusz.kozlowski@intel.com>
Signed-off-by: Mariusz Barczak <mariusz.barczak@intel.com>
Change-Id: Ib304ea65a35d8b34518efda02379072355c0cd10
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16218
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Kozlowski Mateusz 2023-01-10 12:03:02 +01:00 committed by Tomasz Zawadzki
parent dd94984927
commit 102d266d1a
4 changed files with 76 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
lib/ftl/ftl_layout.c
View File

@ -28,16 +28,30 @@ blocks2mib(uint64_t blocks)
return result;
}
/* TODO: This should be aligned to the write unit size of the device a given piece of md is on.
* The tricky part is to make sure interpreting old alignment values will still be valid...
*/
#define FTL_LAYOUT_REGION_ALIGNMENT_BLOCKS 32ULL
#define FTL_LAYOUT_REGION_ALIGNMENT_BYTES (FTL_LAYOUT_REGION_ALIGNMENT_BLOCKS * FTL_BLOCK_SIZE)
static uint64_t
superblock_region_size(struct spdk_ftl_dev *dev)
{
const struct spdk_bdev *bdev = spdk_bdev_desc_get_bdev(dev->base_bdev_desc);
uint64_t wus = spdk_bdev_get_write_unit_size(bdev) * FTL_BLOCK_SIZE;
if (wus > FTL_SUPERBLOCK_SIZE) {
return wus;
} else {
return wus * spdk_divide_round_up(FTL_SUPERBLOCK_SIZE, wus);
}
}
static uint64_t
superblock_region_blocks(struct spdk_ftl_dev *dev)
{
return superblock_region_size(dev) / FTL_BLOCK_SIZE;
}
static inline uint64_t
blocks_region(uint64_t bytes)
blocks_region(struct spdk_ftl_dev *dev, uint64_t bytes)
{
const uint64_t alignment = FTL_LAYOUT_REGION_ALIGNMENT_BYTES;
const uint64_t alignment = superblock_region_size(dev);
uint64_t result;
result = spdk_divide_round_up(bytes, alignment);
@ -50,8 +64,8 @@ blocks_region(uint64_t bytes)
static void
dump_region(struct spdk_ftl_dev *dev, struct ftl_layout_region *region)
{
assert(!(region->current.offset % FTL_LAYOUT_REGION_ALIGNMENT_BLOCKS));
assert(!(region->current.blocks % FTL_LAYOUT_REGION_ALIGNMENT_BLOCKS));
assert(!(region->current.offset % superblock_region_blocks(dev)));
assert(!(region->current.blocks % superblock_region_blocks(dev)));
FTL_NOTICELOG(dev, "Region %s\n", region->name);
FTL_NOTICELOG(dev, " offset: %.2f MiB\n",
@ -162,7 +176,7 @@ setup_layout_nvc(struct spdk_ftl_dev *dev)
region->current.version = 0;
region->prev.version = 0;
region->current.offset = offset;
region->current.blocks = blocks_region(layout->l2p.addr_size * dev->num_lbas);
region->current.blocks = blocks_region(dev, layout->l2p.addr_size * dev->num_lbas);
set_region_bdev_nvc(region, dev);
offset += region->current.blocks;
@ -176,7 +190,7 @@ setup_layout_nvc(struct spdk_ftl_dev *dev)
region->name = "band_md";
region->current.version = region->prev.version = FTL_BAND_VERSION_CURRENT;
region->current.offset = offset;
region->current.blocks = blocks_region(ftl_get_num_bands(dev) * sizeof(struct ftl_band_md));
region->current.blocks = blocks_region(dev, ftl_get_num_bands(dev) * sizeof(struct ftl_band_md));
region->entry_size = sizeof(struct ftl_band_md) / FTL_BLOCK_SIZE;
region->num_entries = ftl_get_num_bands(dev);
set_region_bdev_nvc(region, dev);
@ -215,7 +229,7 @@ setup_layout_nvc(struct spdk_ftl_dev *dev)
region->current.version = FTL_P2L_VERSION_CURRENT;
region->prev.version = FTL_P2L_VERSION_CURRENT;
region->current.offset = offset;
region->current.blocks = blocks_region(layout->p2l.ckpt_pages * FTL_BLOCK_SIZE);
region->current.blocks = blocks_region(dev, layout->p2l.ckpt_pages * FTL_BLOCK_SIZE);
region->entry_size = 1;
region->num_entries = region->current.blocks;
set_region_bdev_nvc(region, dev);
@ -236,7 +250,7 @@ setup_layout_nvc(struct spdk_ftl_dev *dev)
region->current.version = 0;
region->prev.version = 0;
region->current.offset = offset;
region->current.blocks = blocks_region(l2p_blocks * sizeof(uint64_t));
region->current.blocks = blocks_region(dev, l2p_blocks * sizeof(uint64_t));
region->entry_size = 1;
region->num_entries = region->current.blocks;
set_region_bdev_nvc(region, dev);
@ -278,7 +292,7 @@ setup_layout_nvc(struct spdk_ftl_dev *dev)
region->name = "nvc_md";
region->current.version = region->prev.version = FTL_NVC_VERSION_CURRENT;
region->current.offset = offset;
region->current.blocks = blocks_region(layout->nvc.chunk_count *
region->current.blocks = blocks_region(dev, layout->nvc.chunk_count *
sizeof(struct ftl_nv_cache_chunk_md));
region->entry_size = sizeof(struct ftl_nv_cache_chunk_md) / FTL_BLOCK_SIZE;
region->num_entries = layout->nvc.chunk_count;
@ -378,7 +392,7 @@ setup_layout_base(struct spdk_ftl_dev *dev)
region->name = "vmap";
region->current.version = region->prev.version = 0;
region->current.offset = offset;
region->current.blocks = blocks_region(spdk_divide_round_up(
region->current.blocks = blocks_region(dev, spdk_divide_round_up(
layout->base.total_blocks + layout->nvc.total_blocks, 8));
set_region_bdev_btm(region, dev);
offset += region->current.blocks;
@ -482,7 +496,7 @@ ftl_layout_setup_vss_emu(struct spdk_ftl_dev *dev)
bdev = spdk_bdev_desc_get_bdev(dev->nv_cache.bdev_desc);
layout->nvc.total_blocks = spdk_bdev_get_num_blocks(bdev);
region->current.blocks = blocks_region(dev->nv_cache.md_size * layout->nvc.total_blocks);
region->current.blocks = blocks_region(dev, dev->nv_cache.md_size * layout->nvc.total_blocks);
region->vss_blksz = 0;
region->bdev_desc = dev->nv_cache.bdev_desc;
@ -518,7 +532,7 @@ ftl_layout_setup_superblock(struct spdk_ftl_dev *dev)
layout->region[FTL_LAYOUT_REGION_TYPE_VSS].current.blocks;
#endif
region->current.blocks = blocks_region(FTL_SUPERBLOCK_SIZE);
region->current.blocks = superblock_region_blocks(dev);
region->vss_blksz = 0;
region->bdev_desc = dev->nv_cache.bdev_desc;
region->ioch = dev->nv_cache.cache_ioch;
@ -533,7 +547,7 @@ ftl_layout_setup_superblock(struct spdk_ftl_dev *dev)
region->current.version = FTL_SB_VERSION_CURRENT;
region->prev.version = FTL_SB_VERSION_CURRENT;
region->current.offset = 0;
region->current.blocks = blocks_region(FTL_SUPERBLOCK_SIZE);
region->current.blocks = superblock_region_blocks(dev);
set_region_bdev_btm(region, dev);
/* Check if SB can be stored at the end of base device */
@ -554,16 +568,37 @@ ftl_layout_dump(struct spdk_ftl_dev *dev)
{
struct ftl_layout *layout = &dev->layout;
int i;
FTL_NOTICELOG(dev, "NV cache layout:\n");
for (i = 0; i < FTL_LAYOUT_REGION_TYPE_MAX; ++i) {
if (layout->region[i].bdev_desc == dev->nv_cache.bdev_desc) {
dump_region(dev, &layout->region[i]);
}
}
FTL_NOTICELOG(dev, "Bottom device layout:\n");
FTL_NOTICELOG(dev, "Base device layout:\n");
for (i = 0; i < FTL_LAYOUT_REGION_TYPE_MAX; ++i) {
if (layout->region[i].bdev_desc == dev->base_bdev_desc) {
dump_region(dev, &layout->region[i]);
}
}
}
uint64_t
ftl_layout_base_md_blocks(struct spdk_ftl_dev *dev)
{
const struct spdk_bdev *bdev;
uint64_t md_blocks = 0, total_blocks = 0;
bdev = spdk_bdev_desc_get_bdev(dev->base_bdev_desc);
total_blocks += spdk_bdev_get_num_blocks(bdev);
bdev = spdk_bdev_desc_get_bdev(dev->nv_cache.bdev_desc);
total_blocks += spdk_bdev_get_num_blocks(bdev);
/* Count space needed for validity map */
md_blocks += blocks_region(dev, spdk_divide_round_up(total_blocks, 8));
/* Count space needed for superblock */
md_blocks += superblock_region_blocks(dev);
return md_blocks;
}

5
lib/ftl/ftl_layout.h
View File

@ -183,4 +183,9 @@ void ftl_layout_setup_vss_emu(struct spdk_ftl_dev *dev);
void ftl_layout_dump(struct spdk_ftl_dev *dev);
int ftl_validate_regions(struct spdk_ftl_dev *dev, struct ftl_layout *layout);
/**
* @brief Get number of blocks required to store metadata on bottom device
*/
uint64_t ftl_layout_base_md_blocks(struct spdk_ftl_dev *dev);
#endif /* FTL_LAYOUT_H */

18
lib/ftl/mngt/ftl_mngt_band.c
View File

@ -43,7 +43,23 @@ static int
ftl_dev_init_bands(struct spdk_ftl_dev *dev)
{
struct ftl_band *band;
uint64_t i;
uint64_t i, blocks, md_blocks, md_bands;
/* Calculate initial number of bands */
blocks = spdk_bdev_get_num_blocks(spdk_bdev_desc_get_bdev(dev->base_bdev_desc));
dev->num_bands = blocks / ftl_get_num_blocks_in_band(dev);
/* Calculate number of bands considering base device metadata size requirement */
md_blocks = ftl_layout_base_md_blocks(dev);
md_bands = spdk_divide_round_up(md_blocks, dev->num_blocks_in_band);
if (dev->num_bands > md_bands) {
/* Save a band worth of space for metadata */
dev->num_bands -= md_bands;
} else {
FTL_ERRLOG(dev, "Base device too small to store metadata\n");
return -1;
}
TAILQ_INIT(&dev->free_bands);
TAILQ_INIT(&dev->shut_bands);

5
lib/ftl/mngt/ftl_mngt_bdev.c
View File

@ -107,11 +107,6 @@ ftl_mngt_open_base_bdev(struct spdk_ftl_dev *dev, struct ftl_mngt_process *mngt)
goto error;
}
dev->num_bands = num_blocks / ftl_get_num_blocks_in_band(dev);
/* Save a band worth of space for metadata */
dev->num_bands--;
ftl_mngt_next_step(mngt);
return;
error: