Commit 0a0b4f79 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-cgroup: pass a gendisk to pd_alloc_fn 



No need to the request_queue here, pass a gendisk and extract the
node ids from that.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndreas Herrmann <aherrmann@suse.de>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20230203150400.3199230-18-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 40e4996e

block/bfq-cgroup.c

+3 −3
Original line number Diff line number Diff line
@@ -513,12 +513,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;

block/blk-cgroup.c

+5 −5
Original line number Diff line number Diff line
@@ -276,7 +276,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 out_free_pds;

		blkg->pd[i] = pd;
@@ -1432,8 +1432,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) {
@@ -1450,8 +1450,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

block/blk-cgroup.h

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,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);

block/blk-iocost.c

+4 −3
Original line number Diff line number Diff line
@@ -2923,13 +2923,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;

block/blk-iolatency.c

+3 −4
Original line number Diff line number Diff line
@@ -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),