On Tue, Jan 17, 2023 at 09:12:55AM +0100, Christoph Hellwig wrote:
> No need to the request_queue here, pass a gendisk and extract the
> node ids from that.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> block/bfq-cgroup.c | 6 +++---
> block/blk-cgroup.c | 10 +++++-----
> block/blk-cgroup.h | 4 ++--
> block/blk-iocost.c | 7 ++++---
> block/blk-iolatency.c | 7 +++----
> block/blk-ioprio.c | 2 +-
> block/blk-throttle.c | 7 +++----
> 7 files changed, 21 insertions(+), 22 deletions(-)
Looks good to me. Feel free to add
Reviewed-by: Andreas Herrmann <aherrmann@xxxxxxx>
> diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
> index b1b8eca99d988f..055f9684c1c502 100644
> --- a/block/bfq-cgroup.c
> +++ b/block/bfq-cgroup.c
> @@ -515,12 +515,12 @@ static void bfq_cpd_free(struct blkcg_policy_data *cpd)
> kfree(cpd_to_bfqgd(cpd));
> }
>
> -static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, struct request_queue *q,
> - struct blkcg *blkcg)
> +static struct blkg_policy_data *bfq_pd_alloc(struct gendisk *disk,
> + struct blkcg *blkcg, gfp_t gfp)
> {
> struct bfq_group *bfqg;
>
> - bfqg = kzalloc_node(sizeof(*bfqg), gfp, q->node);
> + bfqg = kzalloc_node(sizeof(*bfqg), gfp, disk->node_id);
> if (!bfqg)
> return NULL;
>
> diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
> index 353421afe1d70d..601b156897dea4 100644
> --- a/block/blk-cgroup.c
> +++ b/block/blk-cgroup.c
> @@ -268,7 +268,7 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct gendisk *disk,
> continue;
>
> /* alloc per-policy data and attach it to blkg */
> - pd = pol->pd_alloc_fn(gfp_mask, disk->queue, blkcg);
> + pd = pol->pd_alloc_fn(disk, blkcg, gfp_mask);
> if (!pd)
> goto err_free;
>
> @@ -1404,8 +1404,8 @@ int blkcg_activate_policy(struct gendisk *disk, const struct blkcg_policy *pol)
> pd = pd_prealloc;
> pd_prealloc = NULL;
> } else {
> - pd = pol->pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q,
> - blkg->blkcg);
> + pd = pol->pd_alloc_fn(disk, blkg->blkcg,
> + GFP_NOWAIT | __GFP_NOWARN);
> }
>
> if (!pd) {
> @@ -1422,8 +1422,8 @@ int blkcg_activate_policy(struct gendisk *disk, const struct blkcg_policy *pol)
>
> if (pd_prealloc)
> pol->pd_free_fn(pd_prealloc);
> - pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q,
> - blkg->blkcg);
> + pd_prealloc = pol->pd_alloc_fn(disk, blkg->blkcg,
> + GFP_KERNEL);
> if (pd_prealloc)
> goto retry;
> else
> diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
> index e9e0c00d13d64d..9a2cd3c71a94a2 100644
> --- a/block/blk-cgroup.h
> +++ b/block/blk-cgroup.h
> @@ -150,8 +150,8 @@ typedef struct blkcg_policy_data *(blkcg_pol_alloc_cpd_fn)(gfp_t gfp);
> typedef void (blkcg_pol_init_cpd_fn)(struct blkcg_policy_data *cpd);
> typedef void (blkcg_pol_free_cpd_fn)(struct blkcg_policy_data *cpd);
> typedef void (blkcg_pol_bind_cpd_fn)(struct blkcg_policy_data *cpd);
> -typedef struct blkg_policy_data *(blkcg_pol_alloc_pd_fn)(gfp_t gfp,
> - struct request_queue *q, struct blkcg *blkcg);
> +typedef struct blkg_policy_data *(blkcg_pol_alloc_pd_fn)(struct gendisk *disk,
> + struct blkcg *blkcg, gfp_t gfp);
> typedef void (blkcg_pol_init_pd_fn)(struct blkg_policy_data *pd);
> typedef void (blkcg_pol_online_pd_fn)(struct blkg_policy_data *pd);
> typedef void (blkcg_pol_offline_pd_fn)(struct blkg_policy_data *pd);
> diff --git a/block/blk-iocost.c b/block/blk-iocost.c
> index 6557bbd409b57e..3f41d83b4c4ecf 100644
> --- a/block/blk-iocost.c
> +++ b/block/blk-iocost.c
> @@ -2916,13 +2916,14 @@ static void ioc_cpd_free(struct blkcg_policy_data *cpd)
> kfree(container_of(cpd, struct ioc_cgrp, cpd));
> }
>
> -static struct blkg_policy_data *ioc_pd_alloc(gfp_t gfp, struct request_queue *q,
> - struct blkcg *blkcg)
> +static struct blkg_policy_data *ioc_pd_alloc(struct gendisk *disk,
> + struct blkcg *blkcg, gfp_t gfp)
> {
> int levels = blkcg->css.cgroup->level + 1;
> struct ioc_gq *iocg;
>
> - iocg = kzalloc_node(struct_size(iocg, ancestors, levels), gfp, q->node);
> + iocg = kzalloc_node(struct_size(iocg, ancestors, levels), gfp,
> + disk->node_id);
> if (!iocg)
> return NULL;
>
> diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
> index 39853fc5c2b02f..bc0d217f5c1723 100644
> --- a/block/blk-iolatency.c
> +++ b/block/blk-iolatency.c
> @@ -946,13 +946,12 @@ static void iolatency_pd_stat(struct blkg_policy_data *pd, struct seq_file *s)
> iolat->max_depth, avg_lat, cur_win);
> }
>
> -static struct blkg_policy_data *iolatency_pd_alloc(gfp_t gfp,
> - struct request_queue *q,
> - struct blkcg *blkcg)
> +static struct blkg_policy_data *iolatency_pd_alloc(struct gendisk *disk,
> + struct blkcg *blkcg, gfp_t gfp)
> {
> struct iolatency_grp *iolat;
>
> - iolat = kzalloc_node(sizeof(*iolat), gfp, q->node);
> + iolat = kzalloc_node(sizeof(*iolat), gfp, disk->node_id);
> if (!iolat)
> return NULL;
> iolat->stats = __alloc_percpu_gfp(sizeof(struct latency_stat),
> diff --git a/block/blk-ioprio.c b/block/blk-ioprio.c
> index 8194826cc824bc..055529b9b92bab 100644
> --- a/block/blk-ioprio.c
> +++ b/block/blk-ioprio.c
> @@ -116,7 +116,7 @@ static ssize_t ioprio_set_prio_policy(struct kernfs_open_file *of, char *buf,
> }
>
> static struct blkg_policy_data *
> -ioprio_alloc_pd(gfp_t gfp, struct request_queue *q, struct blkcg *blkcg)
> +ioprio_alloc_pd(struct gendisk *disk, struct blkcg *blkcg, gfp_t gfp)
> {
> struct ioprio_blkg *ioprio_blkg;
>
> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
> index efc0a9092c6942..74bb1e753ea09d 100644
> --- a/block/blk-throttle.c
> +++ b/block/blk-throttle.c
> @@ -335,14 +335,13 @@ static void throtl_service_queue_init(struct throtl_service_queue *sq)
> timer_setup(&sq->pending_timer, throtl_pending_timer_fn, 0);
> }
>
> -static struct blkg_policy_data *throtl_pd_alloc(gfp_t gfp,
> - struct request_queue *q,
> - struct blkcg *blkcg)
> +static struct blkg_policy_data *throtl_pd_alloc(struct gendisk *disk,
> + struct blkcg *blkcg, gfp_t gfp)
> {
> struct throtl_grp *tg;
> int rw;
>
> - tg = kzalloc_node(sizeof(*tg), gfp, q->node);
> + tg = kzalloc_node(sizeof(*tg), gfp, disk->node_id);
> if (!tg)
> return NULL;
>
> --
> 2.39.0
>
--
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)
