block/cgroup: Split blkg_conf_prep()

Move the blkg_conf_open_bdev() call out of blkg_conf_prep() to make it
possible to add lock context annotations to blkg_conf_prep(). Change an
if-statement in blkg_conf_open_bdev() into a WARN_ON_ONCE() call. Export
blkg_conf_open_bdev() because it is called by the BFQ I/O scheduler and
the BFQ I/O scheduler may be built as a kernel module.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@kernel.org>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://patch.msgid.link/e6ea0387f413217c8561a0ca54ce7b846aa5c7c5.1780682325.git.bvanassche@acm.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 37ab70930c8d1be909e113487f4b983722507486..df7b5a646e9654cec4fb0c246c40d24baf5adcf5 100644 (file)
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -1052,6 +1052,10 @@ static ssize_t bfq_io_set_device_weight(struct kernfs_open_file *of,
 
        blkg_conf_init(&ctx, buf);
 
+       ret = blkg_conf_open_bdev(&ctx);
+       if (ret)
+               goto out;
+
        ret = blkg_conf_prep(blkcg, &blkcg_policy_bfq, &ctx);
        if (ret)
                goto out;

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 554c87bb4a8651daae006cc039006a0539d6894b..a8d95d51b8661e0f66332555202e8934ca718577 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -771,10 +771,7 @@ EXPORT_SYMBOL_GPL(blkg_conf_init);
  * @ctx->input and get and store the matching bdev in @ctx->bdev. @ctx->body is
  * set to point past the device node prefix.
  *
- * This function may be called multiple times on @ctx and the extra calls become
- * NOOPs. blkg_conf_prep() implicitly calls this function. Use this function
- * explicitly if bdev access is needed without resolving the blkcg / policy part
- * of @ctx->input. Returns -errno on error.
+ * Returns: -errno on error.
  */
 int blkg_conf_open_bdev(struct blkg_conf_ctx *ctx)
 {
@@ -783,8 +780,8 @@ int blkg_conf_open_bdev(struct blkg_conf_ctx *ctx)
        struct block_device *bdev;
        int key_len;
 
-       if (ctx->bdev)
-               return 0;
+       if (WARN_ON_ONCE(ctx->bdev))
+               return -EINVAL;
 
        if (sscanf(input, "%u:%u%n", &major, &minor, &key_len) != 2)
                return -EINVAL;
@@ -813,6 +810,8 @@ int blkg_conf_open_bdev(struct blkg_conf_ctx *ctx)
        ctx->bdev = bdev;
        return 0;
 }
+EXPORT_SYMBOL_GPL(blkg_conf_open_bdev);
+
 /*
  * Similar to blkg_conf_open_bdev, but additionally freezes the queue,
  * ensures the correct locking order between freeze queue and q->rq_qos_mutex.
@@ -857,7 +856,7 @@ unsigned long __must_check blkg_conf_open_bdev_frozen(struct blkg_conf_ctx *ctx)
  * following MAJ:MIN, @ctx->bdev points to the target block device and
  * @ctx->blkg to the blkg being configured.
  *
- * blkg_conf_open_bdev() may be called on @ctx beforehand. On success, this
+ * blkg_conf_open_bdev() must be called on @ctx beforehand. On success, this
  * function returns with queue lock held and must be followed by
  * blkg_conf_exit().
  */
@@ -870,9 +869,8 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
        struct blkcg_gq *blkg;
        int ret;
 
-       ret = blkg_conf_open_bdev(ctx);
-       if (ret)
-               return ret;
+       if (WARN_ON_ONCE(!ctx->bdev))
+               return -EINVAL;
 
        disk = ctx->bdev->bd_disk;
        q = disk->queue;

diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index 0cca88a366dc92eded08e9376e0b4a572a9e6f8d..b34f820dedcc0b9fc8233a93d4557c892041c9a6 100644 (file)
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -3140,6 +3140,10 @@ static ssize_t ioc_weight_write(struct kernfs_open_file *of, char *buf,
 
        blkg_conf_init(&ctx, buf);
 
+       ret = blkg_conf_open_bdev(&ctx);
+       if (ret)
+               goto err;
+
        ret = blkg_conf_prep(blkcg, &blkcg_policy_iocost, &ctx);
        if (ret)
                goto err;