| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 29 Aug 2018 15:00:25 +0200
From: Matias Bjørling <mb@...htnvm.io>
To: javier@...igon.com
Cc: axboe@...nel.dk, linux-block@...r.kernel.org,
linux-kernel@...r.kernel.org, javier@...xlabs.com
Subject: Re: [PATCH 2/3] lightnvm: encapsule rqd dma allocations
On 08/29/2018 10:56 AM, Javier González wrote:
> dma allocations for ppa_list and meta_list in rqd are replicated in
> several places across the pblk codebase. Make helpers to encapsulate
> creation and deletion to simplify the code.
>
> Signed-off-by: Javier González <javier@...xlabs.com>
> ---
> drivers/lightnvm/pblk-core.c | 69 +++++++++++++++++++++++++---------------
> drivers/lightnvm/pblk-read.c | 35 ++++++++++----------
> drivers/lightnvm/pblk-recovery.c | 29 ++++++-----------
> drivers/lightnvm/pblk-write.c | 15 ++-------
> drivers/lightnvm/pblk.h | 3 ++
> 5 files changed, 74 insertions(+), 77 deletions(-)
>
> diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
> index 09160ec02c5f..767178185f19 100644
> --- a/drivers/lightnvm/pblk-core.c
> +++ b/drivers/lightnvm/pblk-core.c
> @@ -237,6 +237,34 @@ static void pblk_invalidate_range(struct pblk *pblk, sector_t slba,
> spin_unlock(&pblk->trans_lock);
> }
>
> +int pblk_setup_rqd(struct pblk *pblk, struct nvm_rq *rqd, gfp_t mem_flags,
> + bool is_vector)
The mem_flags argument can be removed. It is GFP_KERNEL from all the
places it is called.
is_vector, will be better to do nr_ppas (or similar name). Then
pblk_submit_read/pblk_submit_read_gc are a bit cleaner.
> +{
> + struct nvm_tgt_dev *dev = pblk->dev;
> +
> + rqd->meta_list = nvm_dev_dma_alloc(dev->parent, mem_flags,
> + &rqd->dma_meta_list);
> + if (!rqd->meta_list)
> + return -ENOMEM;
> +
> + if (!is_vector)
> + return 0;
> +
> + rqd->ppa_list = rqd->meta_list + pblk_dma_meta_size;
> + rqd->dma_ppa_list = rqd->dma_meta_list + pblk_dma_meta_size;
Wrt to is_vector, does it matter if we just set ppa_list and
dma_ppa_list? If we have them, we use them, else leave them alone?
> +
> + return 0;
> +}
> +
> +void pblk_clear_rqd(struct pblk *pblk, struct nvm_rq *rqd)
> +{
> + struct nvm_tgt_dev *dev = pblk->dev;
> +
> + if (rqd->meta_list)
> + nvm_dev_dma_free(dev->parent, rqd->meta_list,
> + rqd->dma_meta_list);
> +}
Looks like setup/clear is mainly about managing the metadata. Would
pblk_alloc_rqd_meta()/pblk_free/rqd_meta be better names? Unless we can
fold it all into pblk_alloc_rqd/pblk_free_rqd.
> +
> /* Caller must guarantee that the request is a valid type */
> struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int type)
> {
> @@ -268,7 +296,6 @@ struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int type)
> /* 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;
>
> switch (type) {
> @@ -289,9 +316,7 @@ void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int type)
> return;
> }
>
> - if (rqd->meta_list)
> - nvm_dev_dma_free(dev->parent, rqd->meta_list,
> - rqd->dma_meta_list);
> + pblk_clear_rqd(pblk, rqd);
> mempool_free(rqd, pool);
> }
>
> @@ -687,18 +712,14 @@ int pblk_line_smeta_read(struct pblk *pblk, struct pblk_line *line)
>
> memset(&rqd, 0, sizeof(struct nvm_rq));
>
> - rqd.meta_list = nvm_dev_dma_alloc(dev->parent, GFP_KERNEL,
> - &rqd.dma_meta_list);
> - if (!rqd.meta_list)
> - return -ENOMEM;
> -
> - rqd.ppa_list = rqd.meta_list + pblk_dma_meta_size;
> - rqd.dma_ppa_list = rqd.dma_meta_list + pblk_dma_meta_size;
> + ret = pblk_setup_rqd(pblk, &rqd, GFP_KERNEL, true);
> + if (ret)
> + return ret;
>
> bio = bio_map_kern(dev->q, line->smeta, lm->smeta_len, GFP_KERNEL);
> if (IS_ERR(bio)) {
> ret = PTR_ERR(bio);
> - goto free_ppa_list;
> + goto clear_rqd;
> }
>
> bio->bi_iter.bi_sector = 0; /* internal bio */
> @@ -716,7 +737,7 @@ int pblk_line_smeta_read(struct pblk *pblk, struct pblk_line *line)
> if (ret) {
> pblk_err(pblk, "smeta I/O submission failed: %d\n", ret);
> bio_put(bio);
> - goto free_ppa_list;
> + goto clear_rqd;
> }
>
> atomic_dec(&pblk->inflight_io);
> @@ -724,8 +745,8 @@ int pblk_line_smeta_read(struct pblk *pblk, struct pblk_line *line)
> if (rqd.error)
> pblk_log_read_err(pblk, &rqd);
>
> -free_ppa_list:
> - nvm_dev_dma_free(dev->parent, rqd.meta_list, rqd.dma_meta_list);
> +clear_rqd:
> + pblk_clear_rqd(pblk, &rqd);
> return ret;
> }
>
> @@ -742,18 +763,14 @@ static int pblk_line_smeta_write(struct pblk *pblk, struct pblk_line *line,
>
> memset(&rqd, 0, sizeof(struct nvm_rq));
>
> - rqd.meta_list = nvm_dev_dma_alloc(dev->parent, GFP_KERNEL,
> - &rqd.dma_meta_list);
> - if (!rqd.meta_list)
> - return -ENOMEM;
> -
> - rqd.ppa_list = rqd.meta_list + pblk_dma_meta_size;
> - rqd.dma_ppa_list = rqd.dma_meta_list + pblk_dma_meta_size;
> + ret = pblk_setup_rqd(pblk, &rqd, GFP_KERNEL, true);
> + if (ret)
> + return ret;
>
> bio = bio_map_kern(dev->q, line->smeta, lm->smeta_len, GFP_KERNEL);
> if (IS_ERR(bio)) {
> ret = PTR_ERR(bio);
> - goto free_ppa_list;
> + goto clear_rqd;
> }
>
> bio->bi_iter.bi_sector = 0; /* internal bio */
> @@ -775,7 +792,7 @@ static int pblk_line_smeta_write(struct pblk *pblk, struct pblk_line *line,
> if (ret) {
> pblk_err(pblk, "smeta I/O submission failed: %d\n", ret);
> bio_put(bio);
> - goto free_ppa_list;
> + goto clear_rqd;
> }
>
> atomic_dec(&pblk->inflight_io);
> @@ -785,8 +802,8 @@ static int pblk_line_smeta_write(struct pblk *pblk, struct pblk_line *line,
> ret = -EIO;
> }
>
> -free_ppa_list:
> - nvm_dev_dma_free(dev->parent, rqd.meta_list, rqd.dma_meta_list);
> +clear_rqd:
> + pblk_clear_rqd(pblk, &rqd);
> return ret;
> }
>
> diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c
> index 6d13763f2f6a..57d3155ef9a5 100644
> --- a/drivers/lightnvm/pblk-read.c
> +++ b/drivers/lightnvm/pblk-read.c
> @@ -452,19 +452,15 @@ int pblk_submit_read(struct pblk *pblk, struct bio *bio)
> */
> bio_init_idx = pblk_get_bi_idx(bio);
>
> - rqd->meta_list = nvm_dev_dma_alloc(dev->parent, GFP_KERNEL,
> - &rqd->dma_meta_list);
> - if (!rqd->meta_list) {
> - pblk_err(pblk, "not able to allocate ppa list\n");
> - goto fail_rqd_free;
> - }
> -
> if (nr_secs > 1) {
> - rqd->ppa_list = rqd->meta_list + pblk_dma_meta_size;
> - rqd->dma_ppa_list = rqd->dma_meta_list + pblk_dma_meta_size;
> + if (pblk_setup_rqd(pblk, rqd, GFP_KERNEL, true))
> + goto fail_rqd_free;
>
> pblk_read_ppalist_rq(pblk, rqd, bio, blba, read_bitmap);
> } else {
> + if (pblk_setup_rqd(pblk, rqd, GFP_KERNEL, false))
> + goto fail_rqd_free;
> +
> pblk_read_rq(pblk, rqd, bio, blba, read_bitmap);
> }
>
> @@ -593,14 +589,10 @@ int pblk_submit_read_gc(struct pblk *pblk, struct pblk_gc_rq *gc_rq)
>
> memset(&rqd, 0, sizeof(struct nvm_rq));
>
> - rqd.meta_list = nvm_dev_dma_alloc(dev->parent, GFP_KERNEL,
> - &rqd.dma_meta_list);
> - if (!rqd.meta_list)
> - return -ENOMEM;
> -
> if (gc_rq->nr_secs > 1) {
> - rqd.ppa_list = rqd.meta_list + pblk_dma_meta_size;
> - rqd.dma_ppa_list = rqd.dma_meta_list + pblk_dma_meta_size;
> + ret = pblk_setup_rqd(pblk, &rqd, GFP_KERNEL, true);
> + if (ret)
> + return ret;
>
> gc_rq->secs_to_gc = read_ppalist_rq_gc(pblk, &rqd, gc_rq->line,
> gc_rq->lba_list,
> @@ -609,6 +601,10 @@ int pblk_submit_read_gc(struct pblk *pblk, struct pblk_gc_rq *gc_rq)
> if (gc_rq->secs_to_gc == 1)
> rqd.ppa_addr = rqd.ppa_list[0];
> } else {
> + ret = pblk_setup_rqd(pblk, &rqd, GFP_KERNEL, false);
> + if (ret)
> + return ret;
> +
> gc_rq->secs_to_gc = read_rq_gc(pblk, &rqd, gc_rq->line,
> gc_rq->lba_list[0],
> gc_rq->paddr_list[0]);
> @@ -622,7 +618,8 @@ int pblk_submit_read_gc(struct pblk *pblk, struct pblk_gc_rq *gc_rq)
> PBLK_VMALLOC_META, GFP_KERNEL);
> if (IS_ERR(bio)) {
> pblk_err(pblk, "could not allocate GC bio (%lu)\n",
> - PTR_ERR(bio));
> + PTR_ERR(bio));
> + ret = PTR_ERR(bio);
> goto err_free_dma;
> }
>
> @@ -657,12 +654,12 @@ int pblk_submit_read_gc(struct pblk *pblk, struct pblk_gc_rq *gc_rq)
> #endif
>
> out:
> - nvm_dev_dma_free(dev->parent, rqd.meta_list, rqd.dma_meta_list);
> + pblk_clear_rqd(pblk, &rqd);
> return ret;
>
> err_free_bio:
> bio_put(bio);
> err_free_dma:
> - nvm_dev_dma_free(dev->parent, rqd.meta_list, rqd.dma_meta_list);
> + pblk_clear_rqd(pblk, &rqd);
> return ret;
> }
> diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
> index 95ea5072b27e..fdc770f2545f 100644
> --- a/drivers/lightnvm/pblk-recovery.c
> +++ b/drivers/lightnvm/pblk-recovery.c
> @@ -241,13 +241,11 @@ static int pblk_recov_pad_oob(struct pblk *pblk, struct pblk_line *line,
> {
> struct nvm_tgt_dev *dev = pblk->dev;
> struct nvm_geo *geo = &dev->geo;
> - struct ppa_addr *ppa_list;
> struct pblk_sec_meta *meta_list;
> struct pblk_pad_rq *pad_rq;
> struct nvm_rq *rqd;
> struct bio *bio;
> void *data;
> - dma_addr_t dma_ppa_list, dma_meta_list;
> __le64 *lba_list = emeta_to_lbas(pblk, line->emeta->buf);
> u64 w_ptr = line->cur_sec;
> int left_line_ppas, rq_ppas, rq_len;
> @@ -281,20 +279,11 @@ static int pblk_recov_pad_oob(struct pblk *pblk, struct pblk_line *line,
>
> rq_len = rq_ppas * geo->csecs;
>
> - meta_list = nvm_dev_dma_alloc(dev->parent, GFP_KERNEL, &dma_meta_list);
> - if (!meta_list) {
> - ret = -ENOMEM;
> - goto fail_free_pad;
> - }
> -
> - ppa_list = (void *)(meta_list) + pblk_dma_meta_size;
> - dma_ppa_list = dma_meta_list + pblk_dma_meta_size;
> -
> bio = pblk_bio_map_addr(pblk, data, rq_ppas, rq_len,
> PBLK_VMALLOC_META, GFP_KERNEL);
> if (IS_ERR(bio)) {
> ret = PTR_ERR(bio);
> - goto fail_free_meta;
> + goto fail_free_pad;
> }
>
> bio->bi_iter.bi_sector = 0; /* internal bio */
> @@ -302,17 +291,19 @@ static int pblk_recov_pad_oob(struct pblk *pblk, struct pblk_line *line,
>
> rqd = pblk_alloc_rqd(pblk, PBLK_WRITE_INT);
>
> + ret = pblk_setup_rqd(pblk, rqd, GFP_KERNEL, true);
> + if (ret)
> + goto fail_free_bio;
> +
> rqd->bio = bio;
> rqd->opcode = NVM_OP_PWRITE;
> rqd->is_seq = 1;
> - rqd->meta_list = meta_list;
> rqd->nr_ppas = rq_ppas;
> - rqd->ppa_list = ppa_list;
> - rqd->dma_ppa_list = dma_ppa_list;
> - rqd->dma_meta_list = dma_meta_list;
> rqd->end_io = pblk_end_io_recov;
> rqd->private = pad_rq;
>
> + meta_list = rqd->meta_list;
> +
> for (i = 0; i < rqd->nr_ppas; ) {
> struct ppa_addr ppa;
> int pos;
> @@ -346,7 +337,7 @@ static int pblk_recov_pad_oob(struct pblk *pblk, struct pblk_line *line,
> if (ret) {
> pblk_err(pblk, "I/O submission failed: %d\n", ret);
> pblk_up_page(pblk, rqd->ppa_list, rqd->nr_ppas);
> - goto fail_free_bio;
> + goto fail_free_rqd;
> }
>
> left_line_ppas -= rq_ppas;
> @@ -370,10 +361,10 @@ static int pblk_recov_pad_oob(struct pblk *pblk, struct pblk_line *line,
> kfree(pad_rq);
> return ret;
>
> +fail_free_rqd:
> + pblk_free_rqd(pblk, rqd, PBLK_WRITE_INT);
> fail_free_bio:
> bio_put(bio);
> -fail_free_meta:
> - nvm_dev_dma_free(dev->parent, meta_list, dma_meta_list);
> fail_free_pad:
> kfree(pad_rq);
> vfree(data);
> diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c
> index 8ea66bb83c29..767618eba4c2 100644
> --- a/drivers/lightnvm/pblk-write.c
> +++ b/drivers/lightnvm/pblk-write.c
> @@ -322,11 +322,8 @@ static void pblk_end_io_write_meta(struct nvm_rq *rqd)
> }
>
> static int pblk_alloc_w_rq(struct pblk *pblk, struct nvm_rq *rqd,
> - unsigned int nr_secs,
> - nvm_end_io_fn(*end_io))
> + unsigned int nr_secs, nvm_end_io_fn(*end_io))
> {
> - struct nvm_tgt_dev *dev = pblk->dev;
> -
> /* Setup write request */
> rqd->opcode = NVM_OP_PWRITE;
> rqd->nr_ppas = nr_secs;
> @@ -334,15 +331,7 @@ static int pblk_alloc_w_rq(struct pblk *pblk, struct nvm_rq *rqd,
> rqd->private = pblk;
> rqd->end_io = end_io;
>
> - rqd->meta_list = nvm_dev_dma_alloc(dev->parent, GFP_KERNEL,
> - &rqd->dma_meta_list);
> - if (!rqd->meta_list)
> - return -ENOMEM;
> -
> - rqd->ppa_list = rqd->meta_list + pblk_dma_meta_size;
> - rqd->dma_ppa_list = rqd->dma_meta_list + pblk_dma_meta_size;
> -
> - return 0;
> + return pblk_setup_rqd(pblk, rqd, GFP_KERNEL, true);
> }
>
> static int pblk_setup_w_rq(struct pblk *pblk, struct nvm_rq *rqd,
> diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
> index e29fd35d2991..c0d9eddd344b 100644
> --- a/drivers/lightnvm/pblk.h
> +++ b/drivers/lightnvm/pblk.h
> @@ -778,6 +778,9 @@ ssize_t pblk_rb_sysfs(struct pblk_rb *rb, char *buf);
> */
> struct nvm_rq *pblk_alloc_rqd(struct pblk *pblk, int type);
> void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int type);
> +int pblk_setup_rqd(struct pblk *pblk, struct nvm_rq *rqd, gfp_t mem_flags,
> + bool is_vecto);
> +void pblk_clear_rqd(struct pblk *pblk, struct nvm_rq *rqd);
> 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,
> struct pblk_c_ctx *c_ctx);
>
Powered by blists - more mailing lists