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 10/17] blk-iocost: pass a gendisk to blk_iocost_init
Date: Thu, 22 Sep 2022 14:11:07 +0200 [thread overview]
Message-ID: <YyxQ2x9zJBCHkVUS@suselix> (raw)
In-Reply-To: <20220921180501.1539876-11-hch@lst.de>
On Wed, Sep 21, 2022 at 08:04:54PM +0200, Christoph Hellwig wrote:
> Pass the gendisk to blk_iocost_init as part of moving the blk-cgroup
> infrastructure to be gendisk based.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/blk-iocost.c | 7 ++++---
> block/blk.h | 2 +-
> 2 files changed, 5 insertions(+), 4 deletions(-)
Reviewed-by: Andreas Herrmann <aherrmann@suse.de>
> diff --git a/block/blk-iocost.c b/block/blk-iocost.c
> index cba9d3ad58e16..1e7bf0d353227 100644
> --- a/block/blk-iocost.c
> +++ b/block/blk-iocost.c
> @@ -2828,8 +2828,9 @@ static struct rq_qos_ops ioc_rqos_ops = {
> .exit = ioc_rqos_exit,
> };
>
> -static int blk_iocost_init(struct request_queue *q)
> +static int blk_iocost_init(struct gendisk *disk)
> {
> + struct request_queue *q = disk->queue;
> struct ioc *ioc;
> struct rq_qos *rqos;
> int i, cpu, ret;
> @@ -3178,7 +3179,7 @@ static ssize_t ioc_qos_write(struct kernfs_open_file *of, char *input,
>
> ioc = q_to_ioc(bdev_get_queue(bdev));
> if (!ioc) {
> - ret = blk_iocost_init(bdev_get_queue(bdev));
> + ret = blk_iocost_init(bdev->bd_disk);
> if (ret)
> goto err;
> ioc = q_to_ioc(bdev_get_queue(bdev));
> @@ -3345,7 +3346,7 @@ static ssize_t ioc_cost_model_write(struct kernfs_open_file *of, char *input,
>
> ioc = q_to_ioc(bdev_get_queue(bdev));
> if (!ioc) {
> - ret = blk_iocost_init(bdev_get_queue(bdev));
> + ret = blk_iocost_init(bdev->bd_disk);
> if (ret)
> goto err;
> ioc = q_to_ioc(bdev_get_queue(bdev));
> diff --git a/block/blk.h b/block/blk.h
> index 361db83147c6f..8d5c7a6f52a66 100644
> --- a/block/blk.h
> +++ b/block/blk.h
> @@ -391,7 +391,7 @@ static inline struct bio *blk_queue_bounce(struct bio *bio,
> #ifdef CONFIG_BLK_CGROUP_IOLATENCY
> int blk_iolatency_init(struct gendisk *disk);
> #else
> -static int blk_iolatency_init(struct gendisk *disk) { return 0 };
> +static int blk_iolatency_init(struct gendisk *disk) { return 0; }
> #endif
>
> #ifdef CONFIG_BLK_DEV_ZONED
> --
> 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 12:11 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 [this message]
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=YyxQ2x9zJBCHkVUS@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).