mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
lightnvm: pblk: reduce L2P memory footprint
Currently L2P map size is calculated based on the total number of available sectors, which is redundant, since it contains mapping for overprovisioning as well (11% by default). Change this size to the real capacity and thus reduce the memory footprint significantly - with default op value it is approx. 110MB of DRAM less for every 1TB of media. Signed-off-by: Igor Konopko <igor.j.konopko@intel.com> Reviewed-by: Hans Holmberg <hans.holmberg@cnexlabs.com> Reviewed-by: Javier González <javier@javigon.com> Signed-off-by: Matias Bjørling <mb@lightnvm.io> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
8935ebfc5d
commit
847a3a2788
5 changed files with 9 additions and 11 deletions
|
@ -2023,7 +2023,7 @@ void pblk_update_map(struct pblk *pblk, sector_t lba, struct ppa_addr ppa)
|
|||
struct ppa_addr ppa_l2p;
|
||||
|
||||
/* logic error: lba out-of-bounds. Ignore update */
|
||||
if (!(lba < pblk->rl.nr_secs)) {
|
||||
if (!(lba < pblk->capacity)) {
|
||||
WARN(1, "pblk: corrupted L2P map request\n");
|
||||
return;
|
||||
}
|
||||
|
@ -2063,7 +2063,7 @@ int pblk_update_map_gc(struct pblk *pblk, sector_t lba, struct ppa_addr ppa_new,
|
|||
#endif
|
||||
|
||||
/* logic error: lba out-of-bounds. Ignore update */
|
||||
if (!(lba < pblk->rl.nr_secs)) {
|
||||
if (!(lba < pblk->capacity)) {
|
||||
WARN(1, "pblk: corrupted L2P map request\n");
|
||||
return 0;
|
||||
}
|
||||
|
@ -2109,7 +2109,7 @@ void pblk_update_map_dev(struct pblk *pblk, sector_t lba,
|
|||
}
|
||||
|
||||
/* logic error: lba out-of-bounds. Ignore update */
|
||||
if (!(lba < pblk->rl.nr_secs)) {
|
||||
if (!(lba < pblk->capacity)) {
|
||||
WARN(1, "pblk: corrupted L2P map request\n");
|
||||
return;
|
||||
}
|
||||
|
@ -2167,7 +2167,7 @@ void pblk_lookup_l2p_rand(struct pblk *pblk, struct ppa_addr *ppas,
|
|||
lba = lba_list[i];
|
||||
if (lba != ADDR_EMPTY) {
|
||||
/* logic error: lba out-of-bounds. Ignore update */
|
||||
if (!(lba < pblk->rl.nr_secs)) {
|
||||
if (!(lba < pblk->capacity)) {
|
||||
WARN(1, "pblk: corrupted L2P map request\n");
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -105,7 +105,7 @@ static size_t pblk_trans_map_size(struct pblk *pblk)
|
|||
if (pblk->addrf_len < 32)
|
||||
entry_size = 4;
|
||||
|
||||
return entry_size * pblk->rl.nr_secs;
|
||||
return entry_size * pblk->capacity;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NVM_PBLK_DEBUG
|
||||
|
@ -170,7 +170,7 @@ static int pblk_l2p_init(struct pblk *pblk, bool factory_init)
|
|||
|
||||
pblk_ppa_set_empty(&ppa);
|
||||
|
||||
for (i = 0; i < pblk->rl.nr_secs; i++)
|
||||
for (i = 0; i < pblk->capacity; i++)
|
||||
pblk_trans_map_set(pblk, i, ppa);
|
||||
|
||||
ret = pblk_l2p_recover(pblk, factory_init);
|
||||
|
@ -701,7 +701,6 @@ static int pblk_set_provision(struct pblk *pblk, int nr_free_chks)
|
|||
* on user capacity consider only provisioned blocks
|
||||
*/
|
||||
pblk->rl.total_blocks = nr_free_chks;
|
||||
pblk->rl.nr_secs = nr_free_chks * geo->clba;
|
||||
|
||||
/* Consider sectors used for metadata */
|
||||
sec_meta = (lm->smeta_sec + lm->emeta_sec[0]) * l_mg->nr_free_lines;
|
||||
|
@ -1284,7 +1283,7 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk,
|
|||
|
||||
pblk_info(pblk, "luns:%u, lines:%d, secs:%llu, buf entries:%u\n",
|
||||
geo->all_luns, pblk->l_mg.nr_lines,
|
||||
(unsigned long long)pblk->rl.nr_secs,
|
||||
(unsigned long long)pblk->capacity,
|
||||
pblk->rwb.nr_entries);
|
||||
|
||||
wake_up_process(pblk->writer_ts);
|
||||
|
|
|
@ -568,7 +568,7 @@ static int read_rq_gc(struct pblk *pblk, struct nvm_rq *rqd,
|
|||
goto out;
|
||||
|
||||
/* logic error: lba out-of-bounds */
|
||||
if (lba >= pblk->rl.nr_secs) {
|
||||
if (lba >= pblk->capacity) {
|
||||
WARN(1, "pblk: read lba out of bounds\n");
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -474,7 +474,7 @@ static int pblk_recov_scan_oob(struct pblk *pblk, struct pblk_line *line,
|
|||
|
||||
lba_list[paddr++] = cpu_to_le64(lba);
|
||||
|
||||
if (lba == ADDR_EMPTY || lba > pblk->rl.nr_secs)
|
||||
if (lba == ADDR_EMPTY || lba >= pblk->capacity)
|
||||
continue;
|
||||
|
||||
line->nr_valid_lbas++;
|
||||
|
|
|
@ -305,7 +305,6 @@ struct pblk_rl {
|
|||
|
||||
struct timer_list u_timer;
|
||||
|
||||
unsigned long long nr_secs;
|
||||
unsigned long total_blocks;
|
||||
|
||||
atomic_t free_blocks; /* Total number of free blocks (+ OP) */
|
||||
|
|
Loading…
Reference in a new issue