From: "Javier González" <javier@javigon.com>
To: Heiner Litz <hlitz@ucsc.edu>
Cc: "Matias Bjørling" <mb@lightnvm.io>,
"Hans Holmberg" <hans.holmberg@cnexlabs.com>,
"Konopko, Igor J" <igor.j.konopko@intel.com>,
linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] lightnvm: pblk: Fix freeing merged pages
Date: Wed, 15 May 2019 11:12:02 +0200 [thread overview]
Message-ID: <C02560B2-DD7F-4B59-8E63-8A06E5DF2271@javigon.com> (raw)
In-Reply-To: <20190515003952.12541-1-hlitz@ucsc.edu>
[-- Attachment #1: Type: text/plain, Size: 1427 bytes --]
> On 15 May 2019, at 02.39, Heiner Litz <hlitz@ucsc.edu> wrote:
>
> bio_add_pc_page() may merge pages when a bio is padded due to a flush.
> Fix iteration over the bio to free the correct pages in case of a merge.
>
> Signed-off-by: Heiner Litz <hlitz@ucsc.edu>
> ---
> drivers/lightnvm/pblk-core.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
> index 773537804319..88d61b27a9ab 100644
> --- a/drivers/lightnvm/pblk-core.c
> +++ b/drivers/lightnvm/pblk-core.c
> @@ -323,14 +323,16 @@ void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int type)
> void pblk_bio_free_pages(struct pblk *pblk, struct bio *bio, int off,
> int nr_pages)
> {
> - struct bio_vec bv;
> - int i;
> -
> - WARN_ON(off + nr_pages != bio->bi_vcnt);
> -
> - for (i = off; i < nr_pages + off; i++) {
> - bv = bio->bi_io_vec[i];
> - mempool_free(bv.bv_page, &pblk->page_bio_pool);
> + struct bio_vec *bv;
> + struct page *page;
> + int i,e, nbv = 0;
> +
> + for (i = 0; i < bio->bi_vcnt; i++) {
> + bv = &bio->bi_io_vec[i];
> + page = bv->bv_page;
> + for (e = 0; e < bv->bv_len; e += PBLK_EXPOSED_PAGE_SIZE, nbv++)
> + if (nbv >= off)
> + mempool_free(page++, &pblk->page_bio_pool);
> }
> }
>
> --
> 2.17.1
Looks good to me.
Reviewed-by: Javier González <javier@javigon.com>
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-05-15 9:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 0:39 [PATCH] lightnvm: pblk: Fix freeing merged pages Heiner Litz
2019-05-15 9:12 ` Javier González [this message]
2019-05-24 14:10 ` Matias Bjørling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=C02560B2-DD7F-4B59-8E63-8A06E5DF2271@javigon.com \
--to=javier@javigon.com \
--cc=hans.holmberg@cnexlabs.com \
--cc=hlitz@ucsc.edu \
--cc=igor.j.konopko@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mb@lightnvm.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).