blkcg: pass @q and @blkcg into blkcg_pol_alloc_pd_fn()

Instead of @node, pass in @q and @blkcg so that the alloc function has
more context.  This doesn't cause any behavior change and will be used
by io.weight implementation.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

5 files changed, 16 insertions, 10 deletions

diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 0f6cd688924f..e6fb537b4bfc 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -501,11 +501,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, int node)
+static struct blkg_policy_data *bfq_pd_alloc(gfp_t gfp, struct request_queue *q,
+                                             struct blkcg *blkcg)
 {
         struct bfq_group *bfqg;
 
-        bfqg = kzalloc_node(sizeof(*bfqg), gfp, node);
+        bfqg = kzalloc_node(sizeof(*bfqg), gfp, q->node);
         if (!bfqg)
                 return NULL;
 
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 55a7dc227dfb..6a82ca3fb5cf 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -175,7 +175,7 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q,
                         continue;
 
                 /* alloc per-policy data and attach it to blkg */
-                pd = pol->pd_alloc_fn(gfp_mask, q->node);
+                pd = pol->pd_alloc_fn(gfp_mask, q, blkcg);
                 if (!pd)
                         goto err_free;
 
@@ -1346,7 +1346,7 @@ int blkcg_activate_policy(struct request_queue *q,
                 blk_mq_freeze_queue(q);
 pd_prealloc:
         if (!pd_prealloc) {
-                pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q->node);
+                pd_prealloc = pol->pd_alloc_fn(GFP_KERNEL, q, &blkcg_root);
                 if (!pd_prealloc) {
                         ret = -ENOMEM;
                         goto out_bypass_end;
@@ -1362,7 +1362,7 @@ pd_prealloc:
                 if (blkg->pd[pol->plid])
                         continue;
 
-                pd = pol->pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q->node);
+                pd = pol->pd_alloc_fn(GFP_NOWAIT | __GFP_NOWARN, q, &blkcg_root);
                 if (!pd)
                         swap(pd, pd_prealloc);
                 if (!pd) {
diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index 0fff7b56df0e..46fa6449f4bb 100644
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -934,11 +934,13 @@ static size_t iolatency_pd_stat(struct blkg_policy_data *pd, char *buf,
 }
 
 
-static struct blkg_policy_data *iolatency_pd_alloc(gfp_t gfp, int node)
+static struct blkg_policy_data *iolatency_pd_alloc(gfp_t gfp,
+                                                   struct request_queue *q,
+                                                   struct blkcg *blkcg)
 {
         struct iolatency_grp *iolat;
 
-        iolat = kzalloc_node(sizeof(*iolat), gfp, node);
+        iolat = kzalloc_node(sizeof(*iolat), gfp, q->node);
         if (!iolat)
                 return NULL;
         iolat->stats = __alloc_percpu_gfp(sizeof(struct latency_stat),
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 8ab6c8153223..0445c998c377 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -478,12 +478,14 @@ 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, int node)
+static struct blkg_policy_data *throtl_pd_alloc(gfp_t gfp,
+                                                struct request_queue *q,
+                                                struct blkcg *blkcg)
 {
         struct throtl_grp *tg;
         int rw;
 
-        tg = kzalloc_node(sizeof(*tg), gfp, node);
+        tg = kzalloc_node(sizeof(*tg), gfp, q->node);
         if (!tg)
                 return NULL;
 
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
index 0bb79d858a13..261248e88eb1 100644
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h
@@ -149,7 +149,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, int node);
+typedef struct blkg_policy_data *(blkcg_pol_alloc_pd_fn)(gfp_t gfp,
+                                struct request_queue *q, struct blkcg *blkcg);
 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);