From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
To: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>
Cc: dm-devel@redhat.com, linux-block@vger.kernel.org,
linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org
Subject: Re: [PATCH 04/17] block: simplify blk_mq_plug
Date: Tue, 5 Jul 2022 11:30:55 +0900 [thread overview]
Message-ID: <36284d54-bb3d-d77b-cc30-1759e897478b@opensource.wdc.com> (raw)
In-Reply-To: <20220704124500.155247-5-hch@lst.de>
On 7/4/22 21:44, Christoph Hellwig wrote:
> Drop the unused q argument, and invert the check to move the exception
> into a branch and the regular path as the normal return.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/blk-core.c | 2 +-
> block/blk-merge.c | 2 +-
> block/blk-mq.c | 2 +-
> block/blk-mq.h | 18 ++++++++----------
> 4 files changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/block/blk-core.c b/block/blk-core.c
> index 6bcca0b686de4..bc16e9bae2dc4 100644
> --- a/block/blk-core.c
> +++ b/block/blk-core.c
> @@ -719,7 +719,7 @@ void submit_bio_noacct(struct bio *bio)
>
> might_sleep();
>
> - plug = blk_mq_plug(q, bio);
> + plug = blk_mq_plug(bio);
> if (plug && plug->nowait)
> bio->bi_opf |= REQ_NOWAIT;
>
> diff --git a/block/blk-merge.c b/block/blk-merge.c
> index 0f5f42ebd0bb0..5abf5aa5a5f0e 100644
> --- a/block/blk-merge.c
> +++ b/block/blk-merge.c
> @@ -1051,7 +1051,7 @@ bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio,
> struct blk_plug *plug;
> struct request *rq;
>
> - plug = blk_mq_plug(q, bio);
> + plug = blk_mq_plug(bio);
> if (!plug || rq_list_empty(plug->mq_list))
> return false;
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 15c7c5c4ad222..dc714dff73001 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -2804,7 +2804,7 @@ static void bio_set_ioprio(struct bio *bio)
> void blk_mq_submit_bio(struct bio *bio)
> {
> struct request_queue *q = bdev_get_queue(bio->bi_bdev);
> - struct blk_plug *plug = blk_mq_plug(q, bio);
> + struct blk_plug *plug = blk_mq_plug(bio);
> const int is_sync = op_is_sync(bio->bi_opf);
> struct request *rq;
> unsigned int nr_segs = 1;
> diff --git a/block/blk-mq.h b/block/blk-mq.h
> index 31d75a83a562d..1cc0b17d69229 100644
> --- a/block/blk-mq.h
> +++ b/block/blk-mq.h
> @@ -294,7 +294,6 @@ static inline void blk_mq_clear_mq_map(struct blk_mq_queue_map *qmap)
>
> /*
> * blk_mq_plug() - Get caller context plug
> - * @q: request queue
> * @bio : the bio being submitted by the caller context
> *
> * Plugging, by design, may delay the insertion of BIOs into the elevator in
> @@ -305,23 +304,22 @@ static inline void blk_mq_clear_mq_map(struct blk_mq_queue_map *qmap)
> * order. While this is not a problem with regular block devices, this ordering
> * change can cause write BIO failures with zoned block devices as these
> * require sequential write patterns to zones. Prevent this from happening by
> - * ignoring the plug state of a BIO issuing context if the target request queue
> - * is for a zoned block device and the BIO to plug is a write operation.
> + * ignoring the plug state of a BIO issuing context if is for a zoned block
s/if is/if it is/
> + 8 device and the BIO to plug is a write operation.
s/8/*
> *
> * Return current->plug if the bio can be plugged and NULL otherwise
> */
> -static inline struct blk_plug *blk_mq_plug(struct request_queue *q,
> - struct bio *bio)
> +static inline struct blk_plug *blk_mq_plug( struct bio *bio)
> {
> + /* Zoned block device write operation case: do not plug the BIO */
> + if (bdev_is_zoned(bio->bi_bdev) && op_is_write(bio_op(bio)))
> + return NULL;
> +
> /*
> * For regular block devices or read operations, use the context plug
> * which may be NULL if blk_start_plug() was not executed.
> */
> - if (!bdev_is_zoned(bio->bi_bdev) || !op_is_write(bio_op(bio)))
> - return current->plug;
> -
> - /* Zoned block device write operation case: do not plug the BIO */
> - return NULL;
> + return current->plug;
> }
>
> /* Free all requests on the list */
With the typos fixed, looks good.
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
--
Damien Le Moal
Western Digital Research
next prev parent reply other threads:[~2022-07-05 2:31 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-04 12:44 clean up zoned device information Christoph Hellwig
2022-07-04 12:44 ` [PATCH 01/17] block: remove a superflous ifdef in blkdev.h Christoph Hellwig
2022-07-04 12:58 ` Johannes Thumshirn
2022-07-04 13:01 ` Christoph Hellwig
2022-07-04 13:04 ` Johannes Thumshirn
2022-07-05 2:26 ` Damien Le Moal
2022-07-05 6:22 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 02/17] block: call blk_queue_free_zone_bitmaps from disk_release Christoph Hellwig
2022-07-04 13:01 ` Johannes Thumshirn
2022-07-05 2:27 ` Damien Le Moal
2022-07-05 6:23 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 03/17] block: use bdev_is_zoned instead of open coding it Christoph Hellwig
2022-07-04 13:13 ` Johannes Thumshirn
2022-07-05 2:28 ` Damien Le Moal
2022-07-05 6:45 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 04/17] block: simplify blk_mq_plug Christoph Hellwig
2022-07-04 13:14 ` Johannes Thumshirn
2022-07-05 2:30 ` Damien Le Moal [this message]
2022-07-05 6:25 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 05/17] block: export blkdev_zone_mgmt_all Christoph Hellwig
2022-07-04 13:17 ` Johannes Thumshirn
2022-07-05 2:31 ` Damien Le Moal
2022-07-05 2:39 ` Damien Le Moal
2022-07-05 6:25 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 06/17] nvmet: use blkdev_zone_mgmt_all Christoph Hellwig
2022-07-04 13:18 ` Johannes Thumshirn
2022-07-04 12:44 ` [PATCH 07/17] block: simplify blk_check_zone_append Christoph Hellwig
2022-07-04 13:21 ` Johannes Thumshirn
2022-07-05 2:40 ` Damien Le Moal
2022-07-05 6:27 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 08/17] block: pass a gendisk to blk_queue_set_zoned Christoph Hellwig
2022-07-04 13:22 ` Johannes Thumshirn
2022-07-05 2:41 ` Damien Le Moal
2022-07-05 6:28 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 09/17] block: pass a gendisk to blk_queue_clear_zone_settings Christoph Hellwig
2022-07-04 13:23 ` Johannes Thumshirn
2022-07-05 2:41 ` Damien Le Moal
2022-07-05 6:29 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 10/17] block: pass a gendisk to blk_queue_free_zone_bitmaps Christoph Hellwig
2022-07-04 13:23 ` Johannes Thumshirn
2022-07-05 2:42 ` Damien Le Moal
2022-07-05 6:40 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 11/17] block: remove queue_max_open_zones and queue_max_active_zones Christoph Hellwig
2022-07-04 13:23 ` Johannes Thumshirn
2022-07-05 2:43 ` Damien Le Moal
2022-07-05 6:41 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 12/17] block: pass a gendisk to blk_queue_max_open_zones and blk_queue_max_active_zones Christoph Hellwig
2022-07-04 13:24 ` Johannes Thumshirn
2022-07-05 2:50 ` Damien Le Moal
2022-07-05 6:41 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 13/17] block: replace blkdev_nr_zones with bdev_nr_zones Christoph Hellwig
2022-07-04 13:27 ` Johannes Thumshirn
2022-07-05 2:53 ` Damien Le Moal
2022-07-05 6:42 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 14/17] block: use bdev based helpers in blkdev_zone_mgmt / blkdev_zone_mgmt_all Christoph Hellwig
2022-07-04 13:27 ` Johannes Thumshirn
2022-07-05 2:54 ` Damien Le Moal
2022-07-05 6:43 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 15/17] dm-zoned: cleanup dmz_fixup_devices Christoph Hellwig
2022-07-04 13:28 ` Johannes Thumshirn
2022-07-05 2:54 ` Damien Le Moal
2022-07-05 6:43 ` Chaitanya Kulkarni
2022-07-04 12:44 ` [PATCH 16/17] block: remove blk_queue_zone_sectors Christoph Hellwig
2022-07-04 13:29 ` Johannes Thumshirn
2022-07-05 2:55 ` Damien Le Moal
2022-07-05 6:44 ` Chaitanya Kulkarni
2022-07-04 12:45 ` [PATCH 17/17] block: move zone related fields to struct gendisk Christoph Hellwig
2022-07-04 13:31 ` Johannes Thumshirn
2022-07-05 2:59 ` Damien Le Moal
2022-07-05 6:44 ` Chaitanya Kulkarni
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=36284d54-bb3d-d77b-cc30-1759e897478b@opensource.wdc.com \
--to=damien.lemoal@opensource.wdc.com \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
/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).