From: Andreas Herrmann <aherrmann@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: Tejun Heo <tj@kernel.org>, Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org
Subject: Re: [PATCH 06/17] blk-cgroup: pass a gendisk to blkcg_init_queue and blkcg_exit_queue
Date: Thu, 22 Sep 2022 15:34:13 +0200 [thread overview]
Message-ID: <YyxkVQs0/+9HEux3@suselix> (raw)
In-Reply-To: <20220921180501.1539876-7-hch@lst.de>
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@lst.de>
> ---
> 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@suse.de>
> 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)
next prev parent reply other threads:[~2022-09-22 13:34 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 18:04 blk-cgroup cleanups Christoph Hellwig
2022-09-21 18:04 ` [PATCH 01/17] blk-cgroup: fix error unwinding in blkcg_init_queue Christoph Hellwig
2022-09-22 13:00 ` Andreas Herrmann
2022-09-21 18:04 ` [PATCH 02/17] blk-cgroup: remove blk_queue_root_blkg Christoph Hellwig
2022-09-22 13:03 ` Andreas Herrmann
2022-09-21 18:04 ` [PATCH 03/17] blk-cgroup: remove open coded blkg_lookup instances Christoph Hellwig
2022-09-22 13:17 ` Andreas Herrmann
2022-09-26 20:56 ` Tejun Heo
2022-09-21 18:04 ` [PATCH 04/17] blk-cgroup: cleanup the blkg_lookup family of functions Christoph Hellwig
2022-09-22 14:15 ` Andreas Herrmann
2022-09-26 20:58 ` Tejun Heo
2022-09-21 18:04 ` [PATCH 05/17] blk-cgroup: remove blkg_lookup_check Christoph Hellwig
2022-09-22 14:16 ` Andreas Herrmann
2022-09-26 21:18 ` Tejun Heo
2022-09-21 18:04 ` [PATCH 06/17] blk-cgroup: pass a gendisk to blkcg_init_queue and blkcg_exit_queue Christoph Hellwig
2022-09-22 13:34 ` Andreas Herrmann [this message]
2022-09-21 18:04 ` [PATCH 07/17] blk-ioprio: pass a gendisk to blk_ioprio_init and blk_ioprio_exit Christoph Hellwig
2022-09-22 13:38 ` Andreas Herrmann
2022-09-21 18:04 ` [PATCH 08/17] blk-iolatency: pass a gendisk to blk_iolatency_init Christoph Hellwig
2022-09-22 13:40 ` Andreas Herrmann
2022-09-27 1:19 ` Jens Axboe
2022-09-21 18:04 ` [PATCH 09/17] blk-iocost: simplify ioc_name Christoph Hellwig
2022-09-22 12:10 ` Andreas Herrmann
2022-09-21 18:04 ` [PATCH 10/17] blk-iocost: pass a gendisk to blk_iocost_init Christoph Hellwig
2022-09-22 12:11 ` Andreas Herrmann
2022-09-21 18:04 ` [PATCH 11/17] blk-iocost: cleanup ioc_qos_write Christoph Hellwig
2022-09-22 12:11 ` Andreas Herrmann
2022-09-21 18:04 ` [PATCH 12/17] blk-throttle: pass a gendisk to blk_throtl_init and blk_throtl_exit Christoph Hellwig
2022-09-23 6:38 ` Andreas Herrmann
2022-09-21 18:04 ` [PATCH 13/17] blk-throttle: pass a gendisk to blk_throtl_register_queue Christoph Hellwig
2022-09-23 6:39 ` Andreas Herrmann
2022-09-21 18:04 ` [PATCH 14/17] blk-throttle: pass a gendisk to blk_throtl_cancel_bios Christoph Hellwig
2022-09-23 6:42 ` Andreas Herrmann
2022-09-21 18:04 ` [PATCH 15/17] blk-cgroup: pass a gendisk to blkg_destroy_all Christoph Hellwig
2022-09-22 13:42 ` Andreas Herrmann
2022-09-21 18:05 ` [PATCH 16/17] blk-cgroup: pass a gendisk to blkcg_schedule_throttle Christoph Hellwig
2022-09-22 14:21 ` Andreas Herrmann
2022-09-21 18:05 ` [PATCH 17/17] blk-cgroup: pass a gendisk to the blkg allocation helpers Christoph Hellwig
2022-09-23 7:03 ` Andreas Herrmann
2022-09-26 21:26 ` blk-cgroup cleanups Tejun Heo
2022-09-27 1:19 ` Jens Axboe
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=YyxkVQs0/+9HEux3@suselix \
--to=aherrmann@suse.de \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=tj@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).