From: "Matias Bjørling" <mb@lightnvm.io>
To: chansol.kim@samsung.com,
"linux-block@vger.kernel.org" <linux-block@vger.kernel.org>
Cc: "matias.bjorling@wdc.com" <matias.bjorling@wdc.com>,
"javier@javigon.com" <javier@javigon.com>
Subject: Re: [PATCH] lightnvm: pblk: fix bio leak on large sized io
Date: Thu, 31 Jan 2019 22:14:58 +0100 [thread overview]
Message-ID: <0fd83092-515e-7e59-bc38-66e1d3b5d9c1@lightnvm.io> (raw)
In-Reply-To: <20190130015343epcms2p14be92e88982e86f5e9d494e3bdc3fb2a@epcms2p1>
On 1/30/19 2:53 AM, 김찬솔 wrote:
>
> Changes:
> 1. Function pblk_rw_io to get bio* as a reference
> 2. In pblk_rw_io bio_put call on read case removed
>
> A fix to address issue where
> 1. pblk_make_rq calls pblk_rw_io passes bio* pointer as a value (0xA)
> 2. pblk_rw_io calls blk_queue_split passing bio* pointer as reference
> 3. In blk_queue_split, when there is a split, the original bio* (0xA)
> is passed to generic_make_requests, and the newly allocated bio is
> returned
> 4. If NVM_IO_DONE returned, pblk_make_rq calls bio_endio on the bio*,
> that is not the one returned by blk_queue_split
> 5. As a result bio_endio is not called on the newly allocated bio.
>
> Signed-off-by: chansol.kim <chansol.kim@samsung.com>
> ---
> drivers/lightnvm/pblk-init.c | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c
> index b57f764d..4efc929 100644
> --- a/drivers/lightnvm/pblk-init.c
> +++ b/drivers/lightnvm/pblk-init.c
> @@ -31,30 +31,24 @@ static DECLARE_RWSEM(pblk_lock);
> struct bio_set pblk_bio_set;
>
> static int pblk_rw_io(struct request_queue *q, struct pblk *pblk,
> - struct bio *bio)
> + struct bio **bio)
> {
> - int ret;
> -
> /* Read requests must be <= 256kb due to NVMe's 64 bit completion bitmap
> * constraint. Writes can be of arbitrary size.
> */
> - if (bio_data_dir(bio) == READ) {
> - blk_queue_split(q, &bio);
> - ret = pblk_submit_read(pblk, bio);
> - if (ret == NVM_IO_DONE && bio_flagged(bio, BIO_CLONED))
> - bio_put(bio);
Could we kill the NVM_DONE_IO check in the pblk_rw_io, that should
achieve the same?
> -
> - return ret;
> + if (bio_data_dir(*bio) == READ) {
> + blk_queue_split(q, bio);
> + return pblk_submit_read(pblk, *bio);
> }
>
> /* Prevent deadlock in the case of a modest LUN configuration and large
> * user I/Os. Unless stalled, the rate limiter leaves at least 256KB
> * available for user I/O.
> */
> - if (pblk_get_secs(bio) > pblk_rl_max_io(&pblk->rl))
> - blk_queue_split(q, &bio);
> + if (pblk_get_secs(*bio) > pblk_rl_max_io(&pblk->rl))
> + blk_queue_split(q, bio);
>
> - return pblk_write_to_cache(pblk, bio, PBLK_IOTYPE_USER);
> + return pblk_write_to_cache(pblk, *bio, PBLK_IOTYPE_USER);
> }
>
> static blk_qc_t pblk_make_rq(struct request_queue *q, struct bio *bio)
> @@ -69,7 +63,7 @@ static blk_qc_t pblk_make_rq(struct request_queue *q, struct bio *bio)
> }
> }
>
> - switch (pblk_rw_io(q, pblk, bio)) {
> + switch (pblk_rw_io(q, pblk, &bio)) {
> case NVM_IO_ERR:
> bio_io_error(bio);
> break;
>
next prev parent reply other threads:[~2019-01-31 21:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20190130015343epcms2p14be92e88982e86f5e9d494e3bdc3fb2a@epcms2p1>
2019-01-30 1:53 ` [PATCH] lightnvm: pblk: fix bio leak on large sized io 김찬솔
2019-01-30 6:58 ` Javier González
2019-01-30 14:06 ` Matias Bjørling
2019-01-30 15:02 ` Javier González
[not found] ` <CGME20190130015343epcms2p14be92e88982e86f5e9d494e3bdc3fb2a@epcms2p2>
2019-01-31 5:55 ` Chansol Kim
2019-01-31 21:14 ` Matias Bjørling [this message]
2019-02-01 8:22 ` Chansol Kim
2019-02-05 9:23 ` Matias Bjørling
2019-02-05 10:20 ` Javier González
[not found] ` <CGME20190130015343epcms2p14be92e88982e86f5e9d494e3bdc3fb2a@epcms2p7>
2019-02-11 11:14 ` Chansol Kim
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=0fd83092-515e-7e59-bc38-66e1d3b5d9c1@lightnvm.io \
--to=mb@lightnvm.io \
--cc=chansol.kim@samsung.com \
--cc=javier@javigon.com \
--cc=linux-block@vger.kernel.org \
--cc=matias.bjorling@wdc.com \
/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).