From: Christoph Hellwig <hch@lst.de>
To: 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: [PATCH 09/11] usb-storage: fix queue freeze vs limits lock order
Date: Thu, 9 Jan 2025 06:57:30 +0100 [thread overview]
Message-ID: <20250109055810.1402918-10-hch@lst.de> (raw)
In-Reply-To: <20250109055810.1402918-1-hch@lst.de>
Match the locking order used by the core block code by only freezing
the queue after taking the limits lock using the
queue_limits_commit_update_frozen 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>
---
drivers/usb/storage/scsiglue.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 8c8b5e6041cc..dc98ceecb724 100644
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -592,12 +592,9 @@ static ssize_t max_sectors_store(struct device *dev, struct device_attribute *at
if (sscanf(buf, "%hu", &ms) <= 0)
return -EINVAL;
- blk_mq_freeze_queue(sdev->request_queue);
lim = queue_limits_start_update(sdev->request_queue);
lim.max_hw_sectors = ms;
- ret = queue_limits_commit_update(sdev->request_queue, &lim);
- blk_mq_unfreeze_queue(sdev->request_queue);
-
+ ret = queue_limits_commit_update_frozen(sdev->request_queue, &lim);
if (ret)
return ret;
return count;
--
2.45.2
next prev parent reply other threads:[~2025-01-09 5:58 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
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 ` Christoph Hellwig [this message]
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 09/11] usb-storage: fix queue freeze vs limits lock order 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=20250109055810.1402918-10-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=dlemoal@kernel.org \
--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