block: add a queue_limits_commit_update_frozen helper

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: John Garry <john.g.garry@oracle.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: Nilay Shroff <nilay@linux.ibm.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20250110054726.1499538-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index b180cac61a9ddb60ac8e296ca9d2288247ea3e32..013469faa5e7c4e2592d22882a91a09bccd252eb 100644 (file)
--- 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 89d8366fd43ca93c09249a463d0dcf13e8ac1b0d..6c96a73261d1b690ecb06aad41236dbc2423381d 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -444,6 +444,30 @@ out_unlock:
 }
 EXPORT_SYMBOL_GPL(queue_limits_commit_update);
 
+/**
+ * queue_limits_commit_update_frozen - commit an atomic update of queue limits
+ * @q:         queue to update
+ * @lim:       limits to apply
+ *
+ * Apply the limits in @lim that were obtained from queue_limits_start_update()
+ * and updated with the new values by the caller to @q.  Freezes the queue
+ * before the update and unfreezes it after.
+ *
+ * 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);
+
 /**
  * queue_limits_set - apply queue limits to queue
  * @q:         queue to update

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 4b0be40a8ea7d1836183d424fbf690f1af4967f1..9d08a54c201eea8840e52c6897ad80b62726f029 100644 (file)
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -1444,7 +1444,6 @@ static int disk_update_zone_resources(struct gendisk *disk,
        unsigned int nr_seq_zones, nr_conv_zones;
        unsigned int pool_size;
        struct queue_limits lim;
-       int ret;
 
        disk->nr_zones = args->nr_zones;
        disk->zone_capacity = args->zone_capacity;
@@ -1495,11 +1494,7 @@ static int disk_update_zone_resources(struct gendisk *disk,
        }
 
 commit:
-       blk_mq_freeze_queue(q);
-       ret = queue_limits_commit_update(q, &lim);
-       blk_mq_unfreeze_queue(q);
-
-       return ret;
+       return queue_limits_commit_update_frozen(q, &lim);
 }
 
 static int blk_revalidate_conv_zone(struct blk_zone *zone, unsigned int idx,

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 71a7ffeafb32ccd6329102d3166da7cbc8bc9539..bbaa26b523b8dd18e20497e7980196b7be5b745a 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -1105,9 +1105,7 @@ cache_type_store(struct device *dev, struct device_attribute *attr,
                lim.features |= BLK_FEAT_WRITE_CACHE;
        else
                lim.features &= ~BLK_FEAT_WRITE_CACHE;
-       blk_mq_freeze_queue(disk->queue);
-       i = queue_limits_commit_update(disk->queue, &lim);
-       blk_mq_unfreeze_queue(disk->queue);
+       i = queue_limits_commit_update_frozen(disk->queue, &lim);
        if (i)
                return i;
        return count;

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 8947dab132d789005c9f5e9a3c11d59350890de8..af62a8ed8620043db47e3730b7b2f325fa47f502 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -177,9 +177,8 @@ cache_type_store(struct device *dev, struct device_attribute *attr,
 
                lim = queue_limits_start_update(sdkp->disk->queue);
                sd_set_flush_flag(sdkp, &lim);
-               blk_mq_freeze_queue(sdkp->disk->queue);
-               ret = queue_limits_commit_update(sdkp->disk->queue, &lim);
-               blk_mq_unfreeze_queue(sdkp->disk->queue);
+               ret = queue_limits_commit_update_frozen(sdkp->disk->queue,
+                               &lim);
                if (ret)
                        return ret;
                return count;
@@ -483,9 +482,7 @@ provisioning_mode_store(struct device *dev, struct device_attribute *attr,
 
        lim = queue_limits_start_update(sdkp->disk->queue);
        sd_config_discard(sdkp, &lim, mode);
-       blk_mq_freeze_queue(sdkp->disk->queue);
-       err = queue_limits_commit_update(sdkp->disk->queue, &lim);
-       blk_mq_unfreeze_queue(sdkp->disk->queue);
+       err = queue_limits_commit_update_frozen(sdkp->disk->queue, &lim);
        if (err)
                return err;
        return count;
@@ -594,9 +591,7 @@ max_write_same_blocks_store(struct device *dev, struct device_attribute *attr,
 
        lim = queue_limits_start_update(sdkp->disk->queue);
        sd_config_write_same(sdkp, &lim);
-       blk_mq_freeze_queue(sdkp->disk->queue);
-       err = queue_limits_commit_update(sdkp->disk->queue, &lim);
-       blk_mq_unfreeze_queue(sdkp->disk->queue);
+       err = queue_limits_commit_update_frozen(sdkp->disk->queue, &lim);
        if (err)
                return err;
        return count;
@@ -3803,9 +3798,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
        sd_config_write_same(sdkp, &lim);
        kfree(buffer);
 
-       blk_mq_freeze_queue(sdkp->disk->queue);
-       err = queue_limits_commit_update(sdkp->disk->queue, &lim);
-       blk_mq_unfreeze_queue(sdkp->disk->queue);
+       err = queue_limits_commit_update_frozen(sdkp->disk->queue, &lim);
        if (err)
                return err;
 

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 198bec87bb8e7c95da96cc992f7c148782eebc61..b17796d5ee665265efd79ced98cb98edd0eb2c91 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -797,10 +797,7 @@ static int get_sectorsize(struct scsi_cd *cd)
 
        lim = queue_limits_start_update(q);
        lim.logical_block_size = sector_size;
-       blk_mq_freeze_queue(q);
-       err = queue_limits_commit_update(q, &lim);
-       blk_mq_unfreeze_queue(q);
-       return err;
+       return queue_limits_commit_update_frozen(q, &lim);
 }
 
 static int get_capabilities(struct scsi_cd *cd)

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e781d4e6f92da2f112e22e505b02298949826830..13d353351c37d52582eb421b8414e6e0efaed780 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -952,6 +952,8 @@ queue_limits_start_update(struct request_queue *q)
        mutex_lock(&q->limits_lock);
        return q->limits;
 }
+int queue_limits_commit_update_frozen(struct request_queue *q,
+               struct queue_limits *lim);
 int queue_limits_commit_update(struct request_queue *q,
                struct queue_limits *lim);
 int queue_limits_set(struct request_queue *q, struct queue_limits *lim);