p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Tejun Heo 2019-08-28 15:05:51 -07:00 committed by Jens Axboe
parent da8c828190
commit cf09a8ee19
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/bfq-cgroup.c
View File

@ -501,11 +501,12 @@ static void bfq_cpd_free(struct blkcg_policy_data *cpd)
kfree(cpd_to_bfqgd(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; struct bfq_group *bfqg;
bfqg = kzalloc_node(sizeof(*bfqg), gfp, node); bfqg = kzalloc_node(sizeof(*bfqg), gfp, q->node);
if (!bfqg) if (!bfqg)
return NULL; return NULL;

6
block/blk-cgroup.c
View File

@ -175,7 +175,7 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q,
continue; continue;
/* alloc per-policy data and attach it to blkg */ /* 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) if (!pd)
goto err_free; goto err_free;
@ -1346,7 +1346,7 @@ int blkcg_activate_policy(struct request_queue *q,
blk_mq_freeze_queue(q); blk_mq_freeze_queue(q);
pd_prealloc: pd_prealloc:
if (!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) { if (!pd_prealloc) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_bypass_end; goto out_bypass_end;
@ -1362,7 +1362,7 @@ int blkcg_activate_policy(struct request_queue *q,
if (blkg->pd[pol->plid]) if (blkg->pd[pol->plid])
continue; 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) if (!pd)
swap(pd, pd_prealloc); swap(pd, pd_prealloc);
if (!pd) { if (!pd) {

6
block/blk-iolatency.c
View File

@ -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; struct iolatency_grp *iolat;
iolat = kzalloc_node(sizeof(*iolat), gfp, node); iolat = kzalloc_node(sizeof(*iolat), gfp, q->node);
if (!iolat) if (!iolat)
return NULL; return NULL;
iolat->stats = __alloc_percpu_gfp(sizeof(struct latency_stat), iolat->stats = __alloc_percpu_gfp(sizeof(struct latency_stat),

6
block/blk-throttle.c
View File

@ -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); 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; struct throtl_grp *tg;
int rw; int rw;
tg = kzalloc_node(sizeof(*tg), gfp, node); tg = kzalloc_node(sizeof(*tg), gfp, q->node);
if (!tg) if (!tg)
return NULL; return NULL;

3
include/linux/blk-cgroup.h
View File

@ -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_init_cpd_fn)(struct blkcg_policy_data *cpd);
typedef void (blkcg_pol_free_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 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_init_pd_fn)(struct blkg_policy_data *pd);
typedef void (blkcg_pol_online_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); typedef void (blkcg_pol_offline_pd_fn)(struct blkg_policy_data *pd);