On Wed, Sep 21, 2022 at 08:04:50PM +0200, Christoph Hellwig wrote:
> Pass the gendisk to blkcg_init_disk and blkcg_exit_disk as part of moving
> the blk-cgroup infrastructure to be gendisk based. Also remove the
> rather pointless kerneldoc comments for these internal functions with a
> single caller each.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/blk-cgroup.c | 25 +++++--------------------
> block/blk-cgroup.h | 8 ++++----
> block/genhd.c | 5 +++--
> 3 files changed, 12 insertions(+), 26 deletions(-)
This creates a stale reference to blkcg_exit_queue() in comment of
block/blk-core.c which needs to be adapted, I think:
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -223,7 +223,7 @@ const char *blk_status_to_str(blk_status_t status)
*
* This function does not cancel any asynchronous activity arising
* out of elevator or throttling code. That would require elevator_exit()
- * and blkcg_exit_queue() to be called with queue lock initialized.
+ * and blkcg_exit_disk() to be called with queue lock initialized.
*
*/
void blk_sync_queue(struct request_queue *q)
--
Otherwise
Reviewed-by: Andreas Herrmann <aherrmann@xxxxxxx>
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 1306112d76486..4ca6933a7c3f5 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -1230,18 +1230,9 @@ static int blkcg_css_online(struct cgroup_subsys_state *css)
> return 0;
> }
>
> -/**
> - * blkcg_init_queue - initialize blkcg part of request queue
> - * @q: request_queue to initialize
> - *
> - * Called from blk_alloc_queue(). Responsible for initializing blkcg
> - * part of new request_queue @q.
> - *
> - * RETURNS:
> - * 0 on success, -errno on failure.
> - */
> -int blkcg_init_queue(struct request_queue *q)
> +int blkcg_init_disk(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> struct blkcg_gq *new_blkg, *blkg;
> bool preloaded;
> int ret;
> @@ -1294,16 +1285,10 @@ int blkcg_init_queue(struct request_queue *q)
> return PTR_ERR(blkg);
> }
>
> -/**
> - * blkcg_exit_queue - exit and release blkcg part of request_queue
> - * @q: request_queue being released
> - *
> - * Called from blk_exit_queue(). Responsible for exiting blkcg part.
> - */
> -void blkcg_exit_queue(struct request_queue *q)
> +void blkcg_exit_disk(struct gendisk *disk)
> {
> - blkg_destroy_all(q);
> - blk_throtl_exit(q);
> + blkg_destroy_all(disk->queue);
> + blk_throtl_exit(disk->queue);
> }
>
> static void blkcg_bind(struct cgroup_subsys_state *root_css)
> diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
> index 91b7ae0773be6..aa2b286bc825f 100644
> --- a/block/blk-cgroup.h
> +++ b/block/blk-cgroup.h
> @@ -178,8 +178,8 @@ struct blkcg_policy {
> extern struct blkcg blkcg_root;
> extern bool blkcg_debug_stats;
>
> -int blkcg_init_queue(struct request_queue *q);
> -void blkcg_exit_queue(struct request_queue *q);
> +int blkcg_init_disk(struct gendisk *disk);
> +void blkcg_exit_disk(struct gendisk *disk);
>
> /* Blkio controller policy registration */
> int blkcg_policy_register(struct blkcg_policy *pol);
> @@ -481,8 +481,8 @@ struct blkcg {
> };
>
> static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, void *key) { return NULL; }
> -static inline int blkcg_init_queue(struct request_queue *q) { return 0; }
> -static inline void blkcg_exit_queue(struct request_queue *q) { }
> +static inline int blkcg_init_disk(struct gendisk *disk) { return 0; }
> +static inline void blkcg_exit_disk(struct gendisk *disk) { }
> static inline int blkcg_policy_register(struct blkcg_policy *pol) { return 0; }
> static inline void blkcg_policy_unregister(struct blkcg_policy *pol) { }
> static inline int blkcg_activate_policy(struct request_queue *q,
> diff --git a/block/genhd.c b/block/genhd.c
> index d36fabf0abc1f..f1af045fac2fe 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -1150,7 +1150,8 @@ static void disk_release(struct device *dev)
> !test_bit(GD_ADDED, &disk->state))
> blk_mq_exit_queue(disk->queue);
>
> - blkcg_exit_queue(disk->queue);
> + blkcg_exit_disk(disk);
> +
> bioset_exit(&disk->bio_split);
>
> disk_release_events(disk);
> @@ -1363,7 +1364,7 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,
> if (xa_insert(&disk->part_tbl, 0, disk->part0, GFP_KERNEL))
> goto out_destroy_part_tbl;
>
> - if (blkcg_init_queue(q))
> + if (blkcg_init_disk(disk))
> goto out_erase_part0;
>
> rand_initialize_disk(disk);
> --
> 2.30.2
>
--
Regards,
Andreas
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nürnberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
(HRB 36809, AG Nürnberg)
