From: Ming Lei <[email protected]>
To: Anuj Gupta <[email protected]>
Cc: Kanchan Joshi <[email protected]>,
[email protected], [email protected], [email protected],
[email protected], [email protected],
[email protected], [email protected], [email protected],
[email protected]
Subject: Re: [PATCH v5 2/6] block: wire-up support for passthrough plugging
Date: Thu, 12 May 2022 22:06:07 +0800 [thread overview]
Message-ID: <Yn0UT8/ymJPy2hBu@T590> (raw)
In-Reply-To: <20220512114623.GA11657@test-zns>
On Thu, May 12, 2022 at 05:20:47PM +0530, Anuj Gupta wrote:
> On Thu, May 12, 2022 at 01:25:24PM +0800, Ming Lei wrote:
> > Hello,
> >
> > On Wed, May 11, 2022 at 11:17:46AM +0530, Kanchan Joshi wrote:
> > > From: Jens Axboe <[email protected]>
> > >
> > > Add support for plugging in passthrough path. When plugging is enabled, the
> > > requests are added to a plug instead of getting dispatched to the driver.
> > > And when the plug is finished, the whole batch gets dispatched via
> > > ->queue_rqs which turns out to be more efficient. Otherwise dispatching
> > > used to happen via ->queue_rq, one request at a time.
> > >
> > > Signed-off-by: Jens Axboe <[email protected]>
> > > Reviewed-by: Christoph Hellwig <[email protected]>
> > > ---
> > > block/blk-mq.c | 73 +++++++++++++++++++++++++++-----------------------
> > > 1 file changed, 39 insertions(+), 34 deletions(-)
> > >
> > > diff --git a/block/blk-mq.c b/block/blk-mq.c
> > > index 84d749511f55..2cf011b57cf9 100644
> > > --- a/block/blk-mq.c
> > > +++ b/block/blk-mq.c
> > > @@ -2340,6 +2340,40 @@ void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
> > > blk_mq_hctx_mark_pending(hctx, ctx);
> > > }
> > >
> > > +/*
> > > + * Allow 2x BLK_MAX_REQUEST_COUNT requests on plug queue for multiple
> > > + * queues. This is important for md arrays to benefit from merging
> > > + * requests.
> > > + */
> > > +static inline unsigned short blk_plug_max_rq_count(struct blk_plug *plug)
> > > +{
> > > + if (plug->multiple_queues)
> > > + return BLK_MAX_REQUEST_COUNT * 2;
> > > + return BLK_MAX_REQUEST_COUNT;
> > > +}
> > > +
> > > +static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq)
> > > +{
> > > + struct request *last = rq_list_peek(&plug->mq_list);
> > > +
> > > + if (!plug->rq_count) {
> > > + trace_block_plug(rq->q);
> > > + } else if (plug->rq_count >= blk_plug_max_rq_count(plug) ||
> > > + (!blk_queue_nomerges(rq->q) &&
> > > + blk_rq_bytes(last) >= BLK_PLUG_FLUSH_SIZE)) {
> > > + blk_mq_flush_plug_list(plug, false);
> > > + trace_block_plug(rq->q);
> > > + }
> > > +
> > > + if (!plug->multiple_queues && last && last->q != rq->q)
> > > + plug->multiple_queues = true;
> > > + if (!plug->has_elevator && (rq->rq_flags & RQF_ELV))
> > > + plug->has_elevator = true;
> > > + rq->rq_next = NULL;
> > > + rq_list_add(&plug->mq_list, rq);
> > > + plug->rq_count++;
> > > +}
> > > +
> > > /**
> > > * blk_mq_request_bypass_insert - Insert a request at dispatch list.
> > > * @rq: Pointer to request to be inserted.
> > > @@ -2353,7 +2387,12 @@ void blk_mq_request_bypass_insert(struct request *rq, bool at_head,
> > > bool run_queue)
> > > {
> > > struct blk_mq_hw_ctx *hctx = rq->mq_hctx;
> > > + struct blk_plug *plug = current->plug;
> > >
> > > + if (plug) {
> > > + blk_add_rq_to_plug(plug, rq);
> > > + return;
> > > + }
> >
> > This way may cause nested plugging, and breaks xfstests generic/131.
> > Also may cause io hang since request can't be polled before flushing
> > plug in blk_execute_rq().
> >
> Hi Ming,
> Could you please share your test setup.
> I tried test 131 with xfs and it passed.
>
> I followed these steps:
> 1) mkfs.xfs -f /dev/nvme0n1
> 2) mount /dev/nvme0n1 /mnt/test
> 3) ./check tests/generic/131
It is triggered when I run xfstests over UBD & xfs:
https://github.com/ming1/linux/tree/my_for-5.18-ubd-devel_v2
https://github.com/ming1/ubdsrv/tree/devel-v2
Thanks,
Ming
next prev parent reply other threads:[~2022-05-12 14:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20220511055306epcas5p3bf3b4c1e32d2bb43db12785bd7caf5da@epcas5p3.samsung.com>
2022-05-11 5:47 ` [PATCH v5 0/6] io_uring passthrough for nvme Kanchan Joshi
[not found] ` <CGME20220511055308epcas5p3627bcb0ec10d7a2222e701898e9ad0db@epcas5p3.samsung.com>
2022-05-11 5:47 ` [PATCH v5 1/6] fs,io_uring: add infrastructure for uring-cmd Kanchan Joshi
2022-05-11 12:42 ` Christoph Hellwig
[not found] ` <CGME20220511055310epcas5p46650f5b6fe963279f686b8f50a98a286@epcas5p4.samsung.com>
2022-05-11 5:47 ` [PATCH v5 2/6] block: wire-up support for passthrough plugging Kanchan Joshi
2022-05-12 5:25 ` Ming Lei
2022-05-12 8:09 ` Christoph Hellwig
2022-05-12 8:44 ` Ming Lei
2022-05-12 12:31 ` Jens Axboe
2022-05-12 11:50 ` Anuj Gupta
2022-05-12 14:06 ` Ming Lei [this message]
[not found] ` <CGME20220511055312epcas5p3b1e9989a32cb1a79f8a941476fc433d1@epcas5p3.samsung.com>
2022-05-11 5:47 ` [PATCH v5 3/6] nvme: refactor nvme_submit_user_cmd() Kanchan Joshi
[not found] ` <CGME20220511055314epcas5p42ddbc17608f2677814c07b0d790e1318@epcas5p4.samsung.com>
2022-05-11 5:47 ` [PATCH v5 4/6] nvme: wire-up uring-cmd support for io-passthru on char-device Kanchan Joshi
[not found] ` <CGME20220511055319epcas5p1d78cb03bd1b145a6d58c8e616795af14@epcas5p1.samsung.com>
2022-05-11 5:47 ` [PATCH v5 5/6] nvme: add vectored-io support for uring-cmd Kanchan Joshi
[not found] ` <CGME20220511055320epcas5p2457aaf8e7405387282f60831f5a4eca9@epcas5p2.samsung.com>
2022-05-11 5:47 ` [PATCH v5 6/6] io_uring: finish IOPOLL/ioprio prep handler removal Kanchan Joshi
2022-05-11 6:54 ` Christoph Hellwig
2022-05-11 11:05 ` Kanchan Joshi
2022-05-11 12:38 ` Jens Axboe
2022-05-11 12:39 ` [PATCH v5 0/6] io_uring passthrough for nvme Jens Axboe
2022-05-11 13:14 ` Kanchan Joshi
2022-05-11 13:39 ` Jens Axboe
2022-05-11 13:48 ` Jens Axboe
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=Yn0UT8/ymJPy2hBu@T590 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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