From: John Garry <john.g.garry@oracle.com>
To: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>
Cc: Damien Le Moal <dlemoal@kernel.org>,
Ming Lei <ming.lei@redhat.com>,
Nilay Shroff <nilay@linux.ibm.com>,
linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
nbd@other.debian.org, linux-scsi@vger.kernel.org,
usb-storage@lists.one-eyed-alien.net,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: Re: [PATCH 02/11] block: add a queue_limits_commit_update_frozen helper
Date: Thu, 9 Jan 2025 11:33:29 +0000 [thread overview]
Message-ID: <fd048cd8-1c81-4346-8f8c-75c7dcd29008@oracle.com> (raw)
In-Reply-To: <20250109055810.1402918-3-hch@lst.de>
On 09/01/2025 05:57, Christoph Hellwig wrote:
> Add a helper that freezes the queue, updates the queue limits and
> unfreezes the queue and convert all open coded versions of that to the
> new helper.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Ming Lei <ming.lei@redhat.com>
> Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
> Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Apart from some nitpicking on the code comments, FWIW:
Reviewed-by: John Garry <john.g.garry@oracle.com>
> ---
> block/blk-integrity.c | 4 +---
> block/blk-settings.c | 24 ++++++++++++++++++++++++
> block/blk-zoned.c | 7 +------
> drivers/block/virtio_blk.c | 4 +---
> drivers/scsi/sd.c | 17 +++++------------
> drivers/scsi/sr.c | 5 +----
> include/linux/blkdev.h | 2 ++
> 7 files changed, 35 insertions(+), 28 deletions(-)
>
> diff --git a/block/blk-integrity.c b/block/blk-integrity.c
> index b180cac61a9d..013469faa5e7 100644
> --- a/block/blk-integrity.c
> +++ b/block/blk-integrity.c
> @@ -218,9 +218,7 @@ static ssize_t flag_store(struct device *dev, const char *page, size_t count,
> else
> lim.integrity.flags |= flag;
>
> - blk_mq_freeze_queue(q);
> - err = queue_limits_commit_update(q, &lim);
> - blk_mq_unfreeze_queue(q);
> + err = queue_limits_commit_update_frozen(q, &lim);
> if (err)
> return err;
> return count;
> diff --git a/block/blk-settings.c b/block/blk-settings.c
> index 89d8366fd43c..7c099d686dd8 100644
> --- a/block/blk-settings.c
> +++ b/block/blk-settings.c
> @@ -444,6 +444,30 @@ int queue_limits_commit_update(struct request_queue *q,
> }
> EXPORT_SYMBOL_GPL(queue_limits_commit_update);
>
> +/**
> + * queue_limits_commit_update_frozen - commit an atomic update of queue limits
nit: this has same brief description of queue_limits_commit_update(),
but it does not do the same thing. I know that space is limited here for
the comment, though.
> + * @q: queue to update
> + * @lim: limits to apply
> + *
> + * Apply the limits in @lim that were obtained from queue_limits_start_update()
> + * and updated by the caller to @q.
"updated by the caller to @q" - this sounds odd
> Freezes the queue before the updated and
> + * unfreezes it after.
should that be "before the update"?
> + *
> + * Returns 0 if successful, else a negative error code.
> + */
> +int queue_limits_commit_update_frozen(struct request_queue *q,
> + struct queue_limits *lim)
> +{
> + int ret;
> +
> + blk_mq_freeze_queue(q);
> + ret = queue_limits_commit_update(q, lim);
> + blk_mq_unfreeze_queue(q);
> +
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(queue_limits_commit_update_frozen);
> +
next prev parent reply other threads:[~2025-01-09 11:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-09 5:57 fix queue freeze and limit locking order v3 Christoph Hellwig
2025-01-09 5:57 ` [PATCH 01/11] block: fix docs for freezing of queue limits updates Christoph Hellwig
2025-01-09 5:57 ` [PATCH 02/11] block: add a queue_limits_commit_update_frozen helper Christoph Hellwig
2025-01-09 11:33 ` John Garry [this message]
2025-01-09 5:57 ` [PATCH 03/11] block: check BLK_FEAT_POLL under q_usage_count Christoph Hellwig
2025-01-09 8:14 ` Ming Lei
2025-01-09 9:03 ` Nilay Shroff
2025-01-09 5:57 ` [PATCH 04/11] block: don't update BLK_FEAT_POLL in __blk_mq_update_nr_hw_queues Christoph Hellwig
2025-01-09 8:16 ` Ming Lei
2025-01-09 9:01 ` Nilay Shroff
2025-01-09 5:57 ` [PATCH 05/11] block: add a store_limit operations for sysfs entries Christoph Hellwig
2025-01-09 5:57 ` [PATCH 06/11] block: fix queue freeze vs limits lock order in sysfs store methods Christoph Hellwig
2025-01-09 13:07 ` John Garry
2025-01-10 9:33 ` Christoph Hellwig
2025-01-09 5:57 ` [PATCH 07/11] nvme: fix queue freeze vs limits lock order Christoph Hellwig
2025-01-09 5:57 ` [PATCH 08/11] nbd: " Christoph Hellwig
2025-01-09 5:57 ` [PATCH 09/11] usb-storage: " Christoph Hellwig
2025-01-09 5:57 ` [PATCH 10/11] loop: refactor queue limits updates Christoph Hellwig
2025-01-09 9:11 ` Nilay Shroff
2025-01-09 5:57 ` [PATCH 11/11] loop: fix queue freeze vs limits lock order Christoph Hellwig
2025-01-09 14:57 ` fix queue freeze and limit locking order v3 Martin K. Petersen
-- strict thread matches above, loose matches on Subject: below --
2025-01-10 5:47 fix queue freeze and limit locking order v4 Christoph Hellwig
2025-01-10 5:47 ` [PATCH 02/11] block: add a queue_limits_commit_update_frozen helper Christoph Hellwig
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=fd048cd8-1c81-4346-8f8c-75c7dcd29008@oracle.com \
--to=john.g.garry@oracle.com \
--cc=axboe@kernel.dk \
--cc=dlemoal@kernel.org \
--cc=hch@lst.de \
--cc=johannes.thumshirn@wdc.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=nbd@other.debian.org \
--cc=nilay@linux.ibm.com \
--cc=usb-storage@lists.one-eyed-alien.net \
/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