iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lightnvm: pblk: refactor rqd alloc/free

Browse Source 
Refactor the rqd allocation and free functions so that all I/O types can
use these helper functions.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Javier González 2017-10-13 14:46:20 +02:00 committed by Jens Axboe
parent e2cddf2082
commit 67bf26a322
5 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/lightnvm/pblk-core.c
View File

@ -146,18 +146,26 @@ static void pblk_invalidate_range(struct pblk *pblk, sector_t slba,
spin_unlock(&pblk->trans_lock); spin_unlock(&pblk->trans_lock);
} }
struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int rw) /* Caller must guarantee that the request is a valid type */
struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int type)
{ {
mempool_t *pool; mempool_t *pool;
struct nvm_rq *rqd; struct nvm_rq *rqd;
int rq_size; int rq_size;
if (rw == PBLK_WRITE) { switch (type) {
case PBLK_WRITE:
case PBLK_WRITE_INT:
pool = pblk->w_rq_pool; pool = pblk->w_rq_pool;
rq_size = pblk_w_rq_size; rq_size = pblk_w_rq_size;
} else { break;
case PBLK_READ:
pool = pblk->r_rq_pool; pool = pblk->r_rq_pool;
rq_size = pblk_g_rq_size; rq_size = pblk_g_rq_size;
break;
default:
pool = pblk->e_rq_pool;
rq_size = pblk_g_rq_size;
} }
rqd = mempool_alloc(pool, GFP_KERNEL); rqd = mempool_alloc(pool, GFP_KERNEL);
@ -166,15 +174,30 @@ struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int rw)
return rqd; return rqd;
} }
void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int rw) /* Typically used on completion path. Cannot guarantee request consistency */
void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int type)
{ {
struct nvm_tgt_dev *dev = pblk->dev;
mempool_t *pool; mempool_t *pool;
if (rw == PBLK_WRITE) switch (type) {
case PBLK_WRITE:
kfree(((struct pblk_c_ctx *)nvm_rq_to_pdu(rqd))->lun_bitmap);
case PBLK_WRITE_INT:
pool = pblk->w_rq_pool; pool = pblk->w_rq_pool;
else break;
case PBLK_READ:
pool = pblk->r_rq_pool; pool = pblk->r_rq_pool;
break;
case PBLK_ERASE:
pool = pblk->e_rq_pool;
break;
default:
pr_err("pblk: trying to free unknown rqd type\n");
return;
}
nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
mempool_free(rqd, pool); mempool_free(rqd, pool);
} }
@ -1470,8 +1493,7 @@ int pblk_blk_erase_async(struct pblk *pblk, struct ppa_addr ppa)
struct nvm_rq *rqd; struct nvm_rq *rqd;
int err; int err;
rqd = mempool_alloc(pblk->e_rq_pool, GFP_KERNEL); rqd = pblk_alloc_rqd(pblk, PBLK_ERASE);
memset(rqd, 0, pblk_g_rq_size);
pblk_setup_e_rq(pblk, rqd, ppa); pblk_setup_e_rq(pblk, rqd, ppa);
@ -1739,8 +1761,6 @@ void pblk_up_rq(struct pblk *pblk, struct ppa_addr *ppa_list, int nr_ppas,
rlun = &pblk->luns[bit]; rlun = &pblk->luns[bit];
up(&rlun->wr_sem); up(&rlun->wr_sem);
} }
kfree(lun_bitmap);
} }
void pblk_update_map(struct pblk *pblk, sector_t lba, struct ppa_addr ppa) void pblk_update_map(struct pblk *pblk, sector_t lba, struct ppa_addr ppa)

2
drivers/lightnvm/pblk-read.c
View File

@ -124,8 +124,6 @@ static void pblk_end_io_read(struct nvm_rq *rqd)
WARN_ONCE(bio->bi_status, "pblk: corrupted read error\n"); WARN_ONCE(bio->bi_status, "pblk: corrupted read error\n");
#endif #endif
nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
bio_put(bio); bio_put(bio);
if (r_ctx->private) { if (r_ctx->private) {
struct bio *orig_bio = r_ctx->private; struct bio *orig_bio = r_ctx->private;

2
drivers/lightnvm/pblk-recovery.c
View File

@ -329,11 +329,9 @@ static void pblk_end_io_recov(struct nvm_rq *rqd)
{ {
struct pblk_pad_rq *pad_rq = rqd->private; struct pblk_pad_rq *pad_rq = rqd->private;
struct pblk *pblk = pad_rq->pblk; struct pblk *pblk = pad_rq->pblk;
struct nvm_tgt_dev *dev = pblk->dev;
pblk_up_page(pblk, rqd->ppa_list, rqd->nr_ppas); pblk_up_page(pblk, rqd->ppa_list, rqd->nr_ppas);
nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
pblk_free_rqd(pblk, rqd, PBLK_WRITE_INT); pblk_free_rqd(pblk, rqd, PBLK_WRITE_INT);
atomic_dec(&pblk->inflight_io); atomic_dec(&pblk->inflight_io);

7
drivers/lightnvm/pblk-write.c
View File

@ -20,7 +20,6 @@
static unsigned long pblk_end_w_bio(struct pblk *pblk, struct nvm_rq *rqd, static unsigned long pblk_end_w_bio(struct pblk *pblk, struct nvm_rq *rqd,
struct pblk_c_ctx *c_ctx) struct pblk_c_ctx *c_ctx)
{ {
struct nvm_tgt_dev *dev = pblk->dev;
struct bio *original_bio; struct bio *original_bio;
unsigned long ret; unsigned long ret;
int i; int i;
@ -43,8 +42,6 @@ static unsigned long pblk_end_w_bio(struct pblk *pblk, struct nvm_rq *rqd,
ret = pblk_rb_sync_advance(&pblk->rwb, c_ctx->nr_valid); ret = pblk_rb_sync_advance(&pblk->rwb, c_ctx->nr_valid);
nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
bio_put(rqd->bio); bio_put(rqd->bio);
pblk_free_rqd(pblk, rqd, PBLK_WRITE); pblk_free_rqd(pblk, rqd, PBLK_WRITE);
@ -176,7 +173,6 @@ static void pblk_end_io_write(struct nvm_rq *rqd)
static void pblk_end_io_write_meta(struct nvm_rq *rqd) static void pblk_end_io_write_meta(struct nvm_rq *rqd)
{ {
struct pblk *pblk = rqd->private; struct pblk *pblk = rqd->private;
struct nvm_tgt_dev *dev = pblk->dev;
struct pblk_g_ctx *m_ctx = nvm_rq_to_pdu(rqd); struct pblk_g_ctx *m_ctx = nvm_rq_to_pdu(rqd);
struct pblk_line *line = m_ctx->private; struct pblk_line *line = m_ctx->private;
struct pblk_emeta *emeta = line->emeta; struct pblk_emeta *emeta = line->emeta;
@ -194,7 +190,6 @@ static void pblk_end_io_write_meta(struct nvm_rq *rqd)
pblk_gen_run_ws(pblk, line, NULL, pblk_line_close_ws, pblk_gen_run_ws(pblk, line, NULL, pblk_line_close_ws,
GFP_ATOMIC, pblk->close_wq); GFP_ATOMIC, pblk->close_wq);
nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
pblk_free_rqd(pblk, rqd, PBLK_WRITE_INT); pblk_free_rqd(pblk, rqd, PBLK_WRITE_INT);
atomic_dec(&pblk->inflight_io); atomic_dec(&pblk->inflight_io);
@ -419,8 +414,6 @@ fail_rollback:
pblk_dealloc_page(pblk, meta_line, rq_ppas); pblk_dealloc_page(pblk, meta_line, rq_ppas);
list_add(&meta_line->list, &meta_line->list); list_add(&meta_line->list, &meta_line->list);
spin_unlock(&l_mg->close_lock); spin_unlock(&l_mg->close_lock);
nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list);
fail_free_bio: fail_free_bio:
bio_put(bio); bio_put(bio);
fail_free_rqd: fail_free_rqd:

4
drivers/lightnvm/pblk.h
View File

@ -699,11 +699,11 @@ ssize_t pblk_rb_sysfs(struct pblk_rb *rb, char *buf);
/* /*
* pblk core * pblk core
*/ */
struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int rw); struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int type);
void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int type);
void pblk_set_sec_per_write(struct pblk *pblk, int sec_per_write); void pblk_set_sec_per_write(struct pblk *pblk, int sec_per_write);
int pblk_setup_w_rec_rq(struct pblk *pblk, struct nvm_rq *rqd, int pblk_setup_w_rec_rq(struct pblk *pblk, struct nvm_rq *rqd,
struct pblk_c_ctx *c_ctx); struct pblk_c_ctx *c_ctx);
void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int rw);
void pblk_wait_for_meta(struct pblk *pblk); void pblk_wait_for_meta(struct pblk *pblk);
struct ppa_addr pblk_get_lba_map(struct pblk *pblk, sector_t lba); struct ppa_addr pblk_get_lba_map(struct pblk *pblk, sector_t lba);
void pblk_discard(struct pblk *pblk, struct bio *bio); void pblk_discard(struct pblk *pblk, struct bio *bio);