Skip to content

Commit

Permalink
blkcg: clear all request_queues on blkcg policy [un]registrations
Browse files Browse the repository at this point in the history
Keep track of all request_queues which have blkcg initialized and turn
on bypass and invoke blkcg_clear_queue() on all before making changes
to blkcg policies.

This is to prepare for moving blkg management into blkcg core.  Note
that this uses more brute force than necessary.  Finer grained shoot
down will be implemented later and given that policy [un]registration
almost never happens on running systems (blk-throtl can't be built as
a module and cfq usually is the builtin default iosched), this
shouldn't be a problem for the time being.

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
Tejun Heo authored and Jens Axboe committed Mar 6, 2012
1 parent 5efd611 commit 923adde
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 1 deletion.
48 changes: 47 additions & 1 deletion block/blk-cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
static DEFINE_SPINLOCK(blkio_list_lock);
static LIST_HEAD(blkio_list);

static DEFINE_MUTEX(all_q_mutex);
static LIST_HEAD(all_q_list);

struct blkio_cgroup blkio_root_cgroup = { .weight = 2*BLKIO_WEIGHT_DEFAULT };
EXPORT_SYMBOL_GPL(blkio_root_cgroup);

Expand Down Expand Up @@ -1472,9 +1475,20 @@ blkiocg_create(struct cgroup_subsys *subsys, struct cgroup *cgroup)
*/
int blkcg_init_queue(struct request_queue *q)
{
int ret;

might_sleep();

return blk_throtl_init(q);
ret = blk_throtl_init(q);
if (ret)
return ret;

mutex_lock(&all_q_mutex);
INIT_LIST_HEAD(&q->all_q_node);
list_add_tail(&q->all_q_node, &all_q_list);
mutex_unlock(&all_q_mutex);

return 0;
}

/**
Expand All @@ -1498,6 +1512,10 @@ void blkcg_drain_queue(struct request_queue *q)
*/
void blkcg_exit_queue(struct request_queue *q)
{
mutex_lock(&all_q_mutex);
list_del_init(&q->all_q_node);
mutex_unlock(&all_q_mutex);

blk_throtl_exit(q);
}

Expand Down Expand Up @@ -1543,26 +1561,54 @@ static void blkiocg_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
}
}

static void blkcg_bypass_start(void)
__acquires(&all_q_mutex)
{
struct request_queue *q;

mutex_lock(&all_q_mutex);

list_for_each_entry(q, &all_q_list, all_q_node) {
blk_queue_bypass_start(q);
blkg_destroy_all(q);
}
}

static void blkcg_bypass_end(void)
__releases(&all_q_mutex)
{
struct request_queue *q;

list_for_each_entry(q, &all_q_list, all_q_node)
blk_queue_bypass_end(q);

mutex_unlock(&all_q_mutex);
}

void blkio_policy_register(struct blkio_policy_type *blkiop)
{
blkcg_bypass_start();
spin_lock(&blkio_list_lock);

BUG_ON(blkio_policy[blkiop->plid]);
blkio_policy[blkiop->plid] = blkiop;
list_add_tail(&blkiop->list, &blkio_list);

spin_unlock(&blkio_list_lock);
blkcg_bypass_end();
}
EXPORT_SYMBOL_GPL(blkio_policy_register);

void blkio_policy_unregister(struct blkio_policy_type *blkiop)
{
blkcg_bypass_start();
spin_lock(&blkio_list_lock);

BUG_ON(blkio_policy[blkiop->plid] != blkiop);
blkio_policy[blkiop->plid] = NULL;
list_del_init(&blkiop->list);

spin_unlock(&blkio_list_lock);
blkcg_bypass_end();
}
EXPORT_SYMBOL_GPL(blkio_policy_unregister);
3 changes: 3 additions & 0 deletions include/linux/blkdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,9 @@ struct request_queue {
struct bsg_class_device bsg_dev;
#endif

#ifdef CONFIG_BLK_CGROUP
struct list_head all_q_node;
#endif
#ifdef CONFIG_BLK_DEV_THROTTLING
/* Throttle data */
struct throtl_data *td;
Expand Down

0 comments on commit 923adde

Please sign in to comment.