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 12/17] blk-throttle: pass a gendisk to blk_throtl_init and blk_throtl_exit
Date: Fri, 23 Sep 2022 08:38:29 +0200 [thread overview]
Message-ID: <Yy1UZXgRcwXzaidt@suselix> (raw)
In-Reply-To: <20220921180501.1539876-13-hch@lst.de>
On Wed, Sep 21, 2022 at 08:04:56PM +0200, Christoph Hellwig wrote:
> Pass the gendisk to blk_throtl_init and blk_throtl_exit as part of moving
> the blk-cgroup infrastructure to be gendisk based.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/blk-cgroup.c | 6 +++---
> block/blk-throttle.c | 7 +++++--
> block/blk-throttle.h | 8 ++++----
> 3 files changed, 12 insertions(+), 9 deletions(-)
Reviewed-by: Andreas Herrmann <aherrmann@suse.de>
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 82a117ff54de5..3dfd78f1312db 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -1261,7 +1261,7 @@ int blkcg_init_disk(struct gendisk *disk)
> if (ret)
> goto err_destroy_all;
>
> - ret = blk_throtl_init(q);
> + ret = blk_throtl_init(disk);
> if (ret)
> goto err_ioprio_exit;
>
> @@ -1272,7 +1272,7 @@ int blkcg_init_disk(struct gendisk *disk)
> return 0;
>
> err_throtl_exit:
> - blk_throtl_exit(q);
> + blk_throtl_exit(disk);
> err_ioprio_exit:
> blk_ioprio_exit(disk);
> err_destroy_all:
> @@ -1288,7 +1288,7 @@ int blkcg_init_disk(struct gendisk *disk)
> void blkcg_exit_disk(struct gendisk *disk)
> {
> blkg_destroy_all(disk->queue);
> - blk_throtl_exit(disk->queue);
> + blk_throtl_exit(disk);
> }
>
> static void blkcg_bind(struct cgroup_subsys_state *root_css)
> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index 55f2d985cfbbd..9ca8ae0ae6683 100644
> --- a/block/blk-throttle.c
> +++ b/block/blk-throttle.c
> @@ -2358,8 +2358,9 @@ void blk_throtl_bio_endio(struct bio *bio)
> }
> #endif
>
> -int blk_throtl_init(struct request_queue *q)
> +int blk_throtl_init(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> struct throtl_data *td;
> int ret;
>
> @@ -2401,8 +2402,10 @@ int blk_throtl_init(struct request_queue *q)
> return ret;
> }
>
> -void blk_throtl_exit(struct request_queue *q)
> +void blk_throtl_exit(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> +
> BUG_ON(!q->td);
> del_timer_sync(&q->td->service_queue.pending_timer);
> throtl_shutdown_wq(q);
> diff --git a/block/blk-throttle.h b/block/blk-throttle.h
> index 66b4292b1b92a..f75852a4e5337 100644
> --- a/block/blk-throttle.h
> +++ b/block/blk-throttle.h
> @@ -168,14 +168,14 @@ static inline struct throtl_grp *blkg_to_tg(struct blkcg_gq *blkg)
> * Internal throttling interface
> */
> #ifndef CONFIG_BLK_DEV_THROTTLING
> -static inline int blk_throtl_init(struct request_queue *q) { return 0; }
> -static inline void blk_throtl_exit(struct request_queue *q) { }
> +static inline int blk_throtl_init(struct gendisk *disk) { return 0; }
> +static inline void blk_throtl_exit(struct gendisk *disk) { }
> static inline void blk_throtl_register_queue(struct request_queue *q) { }
> static inline bool blk_throtl_bio(struct bio *bio) { return false; }
> static inline void blk_throtl_cancel_bios(struct request_queue *q) { }
> #else /* CONFIG_BLK_DEV_THROTTLING */
> -int blk_throtl_init(struct request_queue *q);
> -void blk_throtl_exit(struct request_queue *q);
> +int blk_throtl_init(struct gendisk *disk);
> +void blk_throtl_exit(struct gendisk *disk);
> void blk_throtl_register_queue(struct request_queue *q);
> bool __blk_throtl_bio(struct bio *bio);
> void blk_throtl_cancel_bios(struct request_queue *q);
> --
> 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-23 6:38 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
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 [this message]
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=Yy1UZXgRcwXzaidt@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).