Skip to content

Commit

Permalink
blkcg: use @pol instead of @PLID in update_root_blkg_pd() and blkcg_p…
Browse files Browse the repository at this point in the history 
…rint_blkgs()

The two functions were taking "enum blkio_policy_id plid".  Make them
take "const struct blkio_policy_type *pol" instead.

This is to prepare for per-queue policy activation and doesn't cause
any functional difference.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
@htejun @axboe
htejun authored and axboe committed Apr 20, 2012
1 parent bc0d650 commit ec39934
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
21 changes: 11 additions & 10 deletions block/blk-cgroup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,25 +226,25 @@ static void blkg_destroy(struct blkio_group *blkg)
* aren't shot down. This broken and racy implementation is temporary.
* Eventually, blkg shoot down will be replaced by proper in-place update.
*/
void update_root_blkg_pd(struct request_queue *q, enum blkio_policy_id plid)
void update_root_blkg_pd(struct request_queue *q,
const struct blkio_policy_type *pol)
{
struct blkio_policy_type *pol = blkio_policy[plid];
struct blkio_group *blkg = blkg_lookup(&blkio_root_cgroup, q);
struct blkg_policy_data *pd;

if (!blkg)
return;

kfree(blkg->pd[plid]);
blkg->pd[plid] = NULL;
kfree(blkg->pd[pol->plid]);
blkg->pd[pol->plid] = NULL;

if (!pol)
return;

pd = kzalloc(sizeof(*pd) + pol->pdata_size, GFP_KERNEL);
WARN_ON_ONCE(!pd);

blkg->pd[plid] = pd;
blkg->pd[pol->plid] = pd;
pd->blkg = blkg;
pol->ops.blkio_init_group_fn(blkg);
}
Expand Down Expand Up @@ -360,16 +360,17 @@ static const char *blkg_dev_name(struct blkio_group *blkg)
*/
void blkcg_print_blkgs(struct seq_file *sf, struct blkio_cgroup *blkcg,
u64 (*prfill)(struct seq_file *, void *, int),
int pol, int data, bool show_total)
const struct blkio_policy_type *pol, int data,
bool show_total)
{
struct blkio_group *blkg;
struct hlist_node *n;
u64 total = 0;

spin_lock_irq(&blkcg->lock);
hlist_for_each_entry(blkg, n, &blkcg->blkg_list, blkcg_node)
if (blkg->pd[pol])
total += prfill(sf, blkg->pd[pol]->pdata, data);
if (blkg->pd[pol->plid])
total += prfill(sf, blkg->pd[pol->plid]->pdata, data);
spin_unlock_irq(&blkcg->lock);

if (show_total)
Expand Down Expand Up @@ -739,7 +740,7 @@ void blkio_policy_register(struct blkio_policy_type *blkiop)
BUG_ON(blkio_policy[blkiop->plid]);
blkio_policy[blkiop->plid] = blkiop;
list_for_each_entry(q, &all_q_list, all_q_node)
update_root_blkg_pd(q, blkiop->plid);
update_root_blkg_pd(q, blkiop);

blkcg_bypass_end();

Expand All @@ -765,7 +766,7 @@ void blkio_policy_unregister(struct blkio_policy_type *blkiop)
blkio_policy[blkiop->plid] = NULL;

list_for_each_entry(q, &all_q_list, all_q_node)
update_root_blkg_pd(q, blkiop->plid);
update_root_blkg_pd(q, blkiop);
blkcg_bypass_end();

mutex_unlock(&blkcg_pol_mutex);
Expand Down
7 changes: 4 additions & 3 deletions block/blk-cgroup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,12 @@ extern void blkio_policy_register(struct blkio_policy_type *);
extern void blkio_policy_unregister(struct blkio_policy_type *);
extern void blkg_destroy_all(struct request_queue *q, bool destroy_root);
extern void update_root_blkg_pd(struct request_queue *q,
enum blkio_policy_id plid);
const struct blkio_policy_type *pol);

void blkcg_print_blkgs(struct seq_file *sf, struct blkio_cgroup *blkcg,
u64 (*prfill)(struct seq_file *, void *, int),
int pol, int data, bool show_total);
const struct blkio_policy_type *pol, int data,
bool show_total);
u64 __blkg_prfill_u64(struct seq_file *sf, void *pdata, u64 v);
u64 __blkg_prfill_rwstat(struct seq_file *sf, void *pdata,
const struct blkg_rwstat *rwstat);
Expand Down Expand Up @@ -333,7 +334,7 @@ static inline void blkio_policy_unregister(struct blkio_policy_type *blkiop) { }
static inline void blkg_destroy_all(struct request_queue *q,
bool destory_root) { }
static inline void update_root_blkg_pd(struct request_queue *q,
enum blkio_policy_id plid) { }
const struct blkio_policy_type *pol) { }

static inline void *blkg_to_pdata(struct blkio_group *blkg,
struct blkio_policy_type *pol) { return NULL; }
Expand Down
6 changes: 3 additions & 3 deletions block/blk-throttle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -946,7 +946,7 @@ static int tg_print_cpu_rwstat(struct cgroup *cgrp, struct cftype *cft,
{
struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp);

blkcg_print_blkgs(sf, blkcg, tg_prfill_cpu_rwstat, BLKIO_POLICY_THROTL,
blkcg_print_blkgs(sf, blkcg, tg_prfill_cpu_rwstat, &blkio_policy_throtl,
cft->private, true);
return 0;
}
Expand All @@ -973,15 +973,15 @@ static int tg_print_conf_u64(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf)
{
blkcg_print_blkgs(sf, cgroup_to_blkio_cgroup(cgrp), tg_prfill_conf_u64,
BLKIO_POLICY_THROTL, cft->private, false);
&blkio_policy_throtl, cft->private, false);
return 0;
}

static int tg_print_conf_uint(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf)
{
blkcg_print_blkgs(sf, cgroup_to_blkio_cgroup(cgrp), tg_prfill_conf_uint,
BLKIO_POLICY_THROTL, cft->private, false);
&blkio_policy_throtl, cft->private, false);
return 0;
}

Expand Down
10 changes: 5 additions & 5 deletions block/cfq-iosched.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ static int cfqg_print_weight_device(struct cgroup *cgrp, struct cftype *cft,
struct seq_file *sf)
{
blkcg_print_blkgs(sf, cgroup_to_blkio_cgroup(cgrp),
cfqg_prfill_weight_device, BLKIO_POLICY_PROP, 0,
cfqg_prfill_weight_device, &blkio_policy_cfq, 0,
false);
return 0;
}
Expand Down Expand Up @@ -1445,7 +1445,7 @@ static int cfqg_print_stat(struct cgroup *cgrp, struct cftype *cft,
{
struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp);

blkcg_print_blkgs(sf, blkcg, blkg_prfill_stat, BLKIO_POLICY_PROP,
blkcg_print_blkgs(sf, blkcg, blkg_prfill_stat, &blkio_policy_cfq,
cft->private, false);
return 0;
}
Expand All @@ -1455,7 +1455,7 @@ static int cfqg_print_rwstat(struct cgroup *cgrp, struct cftype *cft,
{
struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp);

blkcg_print_blkgs(sf, blkcg, blkg_prfill_rwstat, BLKIO_POLICY_PROP,
blkcg_print_blkgs(sf, blkcg, blkg_prfill_rwstat, &blkio_policy_cfq,
cft->private, true);
return 0;
}
Expand All @@ -1482,7 +1482,7 @@ static int cfqg_print_avg_queue_size(struct cgroup *cgrp, struct cftype *cft,
struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgrp);

blkcg_print_blkgs(sf, blkcg, cfqg_prfill_avg_queue_size,
BLKIO_POLICY_PROP, 0, false);
&blkio_policy_cfq, 0, false);
return 0;
}
#endif /* CONFIG_DEBUG_BLK_CGROUP */
Expand Down Expand Up @@ -3938,7 +3938,7 @@ static void cfq_exit_queue(struct elevator_queue *e)
#ifndef CONFIG_CFQ_GROUP_IOSCHED
kfree(cfqd->root_group);
#endif
update_root_blkg_pd(q, BLKIO_POLICY_PROP);
update_root_blkg_pd(q, &blkio_policy_cfq);
kfree(cfqd);
}

Expand Down

0 comments on commit ec39934

Please sign in to comment.