Skip to content

Commit 0327ca9

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: use queue_limits_commit_update in queue_max_sectors_store
Convert queue_max_sectors_store to use queue_limits_commit_update to check and update the max_sectors limit and freeze the queue before doing so to ensure we don't have requests in flight while changing the limits. Note that this removes the previously held queue_lock that doesn't protect against any other reader or writer. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Keith Busch <kbusch@kernel.org> Reviewed-by: John Garry <john.g.garry@oracle.com> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Link: https://lore.kernel.org/r/20240213073425.1621680-6-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent d690cb8 commit 0327ca9

File tree

1 file changed

+12
-25
lines changed

1 file changed

+12
-25
lines changed

block/blk-sysfs.c

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -226,35 +226,22 @@ static ssize_t queue_zone_append_max_show(struct request_queue *q, char *page)
226226
static ssize_t
227227
queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
228228
{
229-
unsigned long var;
230-
unsigned int max_sectors_kb,
231-
max_hw_sectors_kb = queue_max_hw_sectors(q) >> 1,
232-
page_kb = 1 << (PAGE_SHIFT - 10);
233-
ssize_t ret = queue_var_store(&var, page, count);
229+
unsigned long max_sectors_kb;
230+
struct queue_limits lim;
231+
ssize_t ret;
232+
int err;
234233

234+
ret = queue_var_store(&max_sectors_kb, page, count);
235235
if (ret < 0)
236236
return ret;
237237

238-
max_sectors_kb = (unsigned int)var;
239-
max_hw_sectors_kb = min_not_zero(max_hw_sectors_kb,
240-
q->limits.max_dev_sectors >> 1);
241-
if (max_sectors_kb == 0) {
242-
q->limits.max_user_sectors = 0;
243-
max_sectors_kb = min(max_hw_sectors_kb,
244-
BLK_DEF_MAX_SECTORS_CAP >> 1);
245-
} else {
246-
if (max_sectors_kb > max_hw_sectors_kb ||
247-
max_sectors_kb < page_kb)
248-
return -EINVAL;
249-
q->limits.max_user_sectors = max_sectors_kb << 1;
250-
}
251-
252-
spin_lock_irq(&q->queue_lock);
253-
q->limits.max_sectors = max_sectors_kb << 1;
254-
if (q->disk)
255-
q->disk->bdi->io_pages = max_sectors_kb >> (PAGE_SHIFT - 10);
256-
spin_unlock_irq(&q->queue_lock);
257-
238+
blk_mq_freeze_queue(q);
239+
lim = queue_limits_start_update(q);
240+
lim.max_user_sectors = max_sectors_kb << 1;
241+
err = queue_limits_commit_update(q, &lim);
242+
blk_mq_unfreeze_queue(q);
243+
if (err)
244+
return err;
258245
return ret;
259246
}
260247

0 commit comments

Comments
 (0)