2009-12-03 18:59:42 +01:00
|
|
|
/*
|
|
|
|
* Common Block IO controller cgroup interface
|
|
|
|
*
|
|
|
|
* Based on ideas and code from CFQ, CFS and BFQ:
|
|
|
|
* Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
|
|
|
|
*
|
|
|
|
* Copyright (C) 2008 Fabio Checconi <fabio@gandalf.sssup.it>
|
|
|
|
* Paolo Valente <paolo.valente@unimore.it>
|
|
|
|
*
|
|
|
|
* Copyright (C) 2009 Vivek Goyal <vgoyal@redhat.com>
|
|
|
|
* Nauman Rafique <nauman@google.com>
|
|
|
|
*/
|
|
|
|
#include <linux/ioprio.h>
|
2009-12-03 18:59:49 +01:00
|
|
|
#include <linux/kdev_t.h>
|
2009-12-04 16:36:41 +01:00
|
|
|
#include <linux/module.h>
|
2009-12-07 09:29:39 +01:00
|
|
|
#include <linux/err.h>
|
2010-04-02 00:01:41 +02:00
|
|
|
#include <linux/blkdev.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 09:04:11 +01:00
|
|
|
#include <linux/slab.h>
|
2010-04-13 10:05:49 +02:00
|
|
|
#include <linux/genhd.h>
|
2012-03-05 22:15:00 +01:00
|
|
|
#include <linux/delay.h>
|
2012-03-19 23:10:56 +01:00
|
|
|
#include <linux/atomic.h>
|
2012-03-05 22:15:00 +01:00
|
|
|
#include "blk-cgroup.h"
|
2012-03-05 22:15:12 +01:00
|
|
|
#include "blk.h"
|
2009-12-04 16:36:42 +01:00
|
|
|
|
2010-04-09 08:31:19 +02:00
|
|
|
#define MAX_KEY_LEN 100
|
|
|
|
|
2012-04-13 22:11:26 +02:00
|
|
|
static DEFINE_MUTEX(blkcg_pol_mutex);
|
2012-03-05 22:15:13 +01:00
|
|
|
|
2013-01-09 17:05:10 +01:00
|
|
|
struct blkcg blkcg_root = { .cfq_weight = 2 * CFQ_WEIGHT_DEFAULT,
|
|
|
|
.cfq_leaf_weight = 2 * CFQ_WEIGHT_DEFAULT, };
|
2012-04-16 22:57:25 +02:00
|
|
|
EXPORT_SYMBOL_GPL(blkcg_root);
|
2009-12-04 16:36:41 +01:00
|
|
|
|
2012-04-16 22:57:25 +02:00
|
|
|
static struct blkcg_policy *blkcg_policy[BLKCG_MAX_POLS];
|
2012-03-05 22:15:04 +01:00
|
|
|
|
2013-01-09 17:05:12 +01:00
|
|
|
static struct blkcg_gq *__blkg_lookup(struct blkcg *blkcg,
|
|
|
|
struct request_queue *q, bool update_hint);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* blkg_for_each_descendant_pre - pre-order walk of a blkg's descendants
|
|
|
|
* @d_blkg: loop cursor pointing to the current descendant
|
|
|
|
* @pos_cgrp: used for iteration
|
|
|
|
* @p_blkg: target blkg to walk descendants of
|
|
|
|
*
|
|
|
|
* Walk @c_blkg through the descendants of @p_blkg. Must be used with RCU
|
|
|
|
* read locked. If called under either blkcg or queue lock, the iteration
|
|
|
|
* is guaranteed to include all and only online blkgs. The caller may
|
|
|
|
* update @pos_cgrp by calling cgroup_rightmost_descendant() to skip
|
|
|
|
* subtree.
|
|
|
|
*/
|
|
|
|
#define blkg_for_each_descendant_pre(d_blkg, pos_cgrp, p_blkg) \
|
|
|
|
cgroup_for_each_descendant_pre((pos_cgrp), (p_blkg)->blkcg->css.cgroup) \
|
|
|
|
if (((d_blkg) = __blkg_lookup(cgroup_to_blkcg(pos_cgrp), \
|
|
|
|
(p_blkg)->q, false)))
|
|
|
|
|
2012-04-13 22:11:33 +02:00
|
|
|
static bool blkcg_policy_enabled(struct request_queue *q,
|
2012-04-16 22:57:25 +02:00
|
|
|
const struct blkcg_policy *pol)
|
2012-04-13 22:11:33 +02:00
|
|
|
{
|
|
|
|
return pol && test_bit(pol->plid, q->blkcg_pols);
|
|
|
|
}
|
|
|
|
|
2012-03-05 22:15:14 +01:00
|
|
|
/**
|
|
|
|
* blkg_free - free a blkg
|
|
|
|
* @blkg: blkg to free
|
|
|
|
*
|
|
|
|
* Free @blkg which may be partially allocated.
|
|
|
|
*/
|
2012-04-16 22:57:25 +02:00
|
|
|
static void blkg_free(struct blkcg_gq *blkg)
|
2012-03-05 22:15:14 +01:00
|
|
|
{
|
2012-03-05 22:15:20 +01:00
|
|
|
int i;
|
2012-03-05 22:15:16 +01:00
|
|
|
|
|
|
|
if (!blkg)
|
|
|
|
return;
|
|
|
|
|
2012-04-13 22:11:28 +02:00
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
2012-03-05 22:15:20 +01:00
|
|
|
struct blkg_policy_data *pd = blkg->pd[i];
|
|
|
|
|
2012-04-01 23:38:44 +02:00
|
|
|
if (!pd)
|
|
|
|
continue;
|
|
|
|
|
2012-04-16 22:57:27 +02:00
|
|
|
if (pol && pol->pd_exit_fn)
|
|
|
|
pol->pd_exit_fn(blkg);
|
2012-04-01 23:38:44 +02:00
|
|
|
|
|
|
|
kfree(pd);
|
2012-03-05 22:15:14 +01:00
|
|
|
}
|
2012-03-05 22:15:20 +01:00
|
|
|
|
blkcg: implement per-blkg request allocation
Currently, request_queue has one request_list to allocate requests
from regardless of blkcg of the IO being issued. When the unified
request pool is used up, cfq proportional IO limits become meaningless
- whoever grabs the next request being freed wins the race regardless
of the configured weights.
This can be easily demonstrated by creating a blkio cgroup w/ very low
weight, put a program which can issue a lot of random direct IOs there
and running a sequential IO from a different cgroup. As soon as the
request pool is used up, the sequential IO bandwidth crashes.
This patch implements per-blkg request_list. Each blkg has its own
request_list and any IO allocates its request from the matching blkg
making blkcgs completely isolated in terms of request allocation.
* Root blkcg uses the request_list embedded in each request_queue,
which was renamed to @q->root_rl from @q->rq. While making blkcg rl
handling a bit harier, this enables avoiding most overhead for root
blkcg.
* Queue fullness is properly per request_list but bdi isn't blkcg
aware yet, so congestion state currently just follows the root
blkcg. As writeback isn't aware of blkcg yet, this works okay for
async congestion but readahead may get the wrong signals. It's
better than blkcg completely collapsing with shared request_list but
needs to be improved with future changes.
* After this change, each block cgroup gets a full request pool making
resource consumption of each cgroup higher. This makes allowing
non-root users to create cgroups less desirable; however, note that
allowing non-root users to directly manage cgroups is already
severely broken regardless of this patch - each block cgroup
consumes kernel memory and skews IO weight (IO weights are not
hierarchical).
v2: queue-sysfs.txt updated and patch description udpated as suggested
by Vivek.
v3: blk_get_rl() wasn't checking error return from
blkg_lookup_create() and may cause oops on lookup failure. Fix it
by falling back to root_rl on blkg lookup failures. This problem
was spotted by Rakesh Iyer <rni@google.com>.
v4: Updated to accomodate 458f27a982 "block: Avoid missed wakeup in
request waitqueue". blk_drain_queue() now wakes up waiters on all
blkg->rl on the target queue.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2012-06-27 00:05:44 +02:00
|
|
|
blk_exit_rl(&blkg->rl);
|
2012-03-05 22:15:16 +01:00
|
|
|
kfree(blkg);
|
2012-03-05 22:15:14 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* blkg_alloc - allocate a blkg
|
|
|
|
* @blkcg: block cgroup the new blkg is associated with
|
|
|
|
* @q: request_queue the new blkg is associated with
|
2012-06-05 05:40:52 +02:00
|
|
|
* @gfp_mask: allocation mask to use
|
2012-03-05 22:15:14 +01:00
|
|
|
*
|
2012-03-05 22:15:20 +01:00
|
|
|
* Allocate a new blkg assocating @blkcg and @q.
|
2012-03-05 22:15:14 +01:00
|
|
|
*/
|
2012-06-05 05:40:52 +02:00
|
|
|
static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q,
|
|
|
|
gfp_t gfp_mask)
|
2012-03-05 22:15:14 +01:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg;
|
2012-03-05 22:15:20 +01:00
|
|
|
int i;
|
2012-03-05 22:15:14 +01:00
|
|
|
|
|
|
|
/* alloc and init base part */
|
2012-06-05 05:40:52 +02:00
|
|
|
blkg = kzalloc_node(sizeof(*blkg), gfp_mask, q->node);
|
2012-03-05 22:15:14 +01:00
|
|
|
if (!blkg)
|
|
|
|
return NULL;
|
|
|
|
|
2012-03-05 22:15:22 +01:00
|
|
|
blkg->q = q;
|
2012-03-05 22:15:20 +01:00
|
|
|
INIT_LIST_HEAD(&blkg->q_node);
|
2012-03-05 22:15:14 +01:00
|
|
|
blkg->blkcg = blkcg;
|
2012-03-05 22:15:15 +01:00
|
|
|
blkg->refcnt = 1;
|
2012-03-05 22:15:14 +01:00
|
|
|
|
blkcg: implement per-blkg request allocation
Currently, request_queue has one request_list to allocate requests
from regardless of blkcg of the IO being issued. When the unified
request pool is used up, cfq proportional IO limits become meaningless
- whoever grabs the next request being freed wins the race regardless
of the configured weights.
This can be easily demonstrated by creating a blkio cgroup w/ very low
weight, put a program which can issue a lot of random direct IOs there
and running a sequential IO from a different cgroup. As soon as the
request pool is used up, the sequential IO bandwidth crashes.
This patch implements per-blkg request_list. Each blkg has its own
request_list and any IO allocates its request from the matching blkg
making blkcgs completely isolated in terms of request allocation.
* Root blkcg uses the request_list embedded in each request_queue,
which was renamed to @q->root_rl from @q->rq. While making blkcg rl
handling a bit harier, this enables avoiding most overhead for root
blkcg.
* Queue fullness is properly per request_list but bdi isn't blkcg
aware yet, so congestion state currently just follows the root
blkcg. As writeback isn't aware of blkcg yet, this works okay for
async congestion but readahead may get the wrong signals. It's
better than blkcg completely collapsing with shared request_list but
needs to be improved with future changes.
* After this change, each block cgroup gets a full request pool making
resource consumption of each cgroup higher. This makes allowing
non-root users to create cgroups less desirable; however, note that
allowing non-root users to directly manage cgroups is already
severely broken regardless of this patch - each block cgroup
consumes kernel memory and skews IO weight (IO weights are not
hierarchical).
v2: queue-sysfs.txt updated and patch description udpated as suggested
by Vivek.
v3: blk_get_rl() wasn't checking error return from
blkg_lookup_create() and may cause oops on lookup failure. Fix it
by falling back to root_rl on blkg lookup failures. This problem
was spotted by Rakesh Iyer <rni@google.com>.
v4: Updated to accomodate 458f27a982 "block: Avoid missed wakeup in
request waitqueue". blk_drain_queue() now wakes up waiters on all
blkg->rl on the target queue.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2012-06-27 00:05:44 +02:00
|
|
|
/* root blkg uses @q->root_rl, init rl only for !root blkgs */
|
|
|
|
if (blkcg != &blkcg_root) {
|
|
|
|
if (blk_init_rl(&blkg->rl, q, gfp_mask))
|
|
|
|
goto err_free;
|
|
|
|
blkg->rl.blkg = blkg;
|
|
|
|
}
|
|
|
|
|
2012-04-13 22:11:28 +02:00
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
2012-03-05 22:15:20 +01:00
|
|
|
struct blkg_policy_data *pd;
|
2012-03-05 22:15:14 +01:00
|
|
|
|
2012-04-13 22:11:33 +02:00
|
|
|
if (!blkcg_policy_enabled(q, pol))
|
2012-03-05 22:15:20 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* alloc per-policy data and attach it to blkg */
|
2012-06-05 05:40:52 +02:00
|
|
|
pd = kzalloc_node(pol->pd_size, gfp_mask, q->node);
|
blkcg: implement per-blkg request allocation
Currently, request_queue has one request_list to allocate requests
from regardless of blkcg of the IO being issued. When the unified
request pool is used up, cfq proportional IO limits become meaningless
- whoever grabs the next request being freed wins the race regardless
of the configured weights.
This can be easily demonstrated by creating a blkio cgroup w/ very low
weight, put a program which can issue a lot of random direct IOs there
and running a sequential IO from a different cgroup. As soon as the
request pool is used up, the sequential IO bandwidth crashes.
This patch implements per-blkg request_list. Each blkg has its own
request_list and any IO allocates its request from the matching blkg
making blkcgs completely isolated in terms of request allocation.
* Root blkcg uses the request_list embedded in each request_queue,
which was renamed to @q->root_rl from @q->rq. While making blkcg rl
handling a bit harier, this enables avoiding most overhead for root
blkcg.
* Queue fullness is properly per request_list but bdi isn't blkcg
aware yet, so congestion state currently just follows the root
blkcg. As writeback isn't aware of blkcg yet, this works okay for
async congestion but readahead may get the wrong signals. It's
better than blkcg completely collapsing with shared request_list but
needs to be improved with future changes.
* After this change, each block cgroup gets a full request pool making
resource consumption of each cgroup higher. This makes allowing
non-root users to create cgroups less desirable; however, note that
allowing non-root users to directly manage cgroups is already
severely broken regardless of this patch - each block cgroup
consumes kernel memory and skews IO weight (IO weights are not
hierarchical).
v2: queue-sysfs.txt updated and patch description udpated as suggested
by Vivek.
v3: blk_get_rl() wasn't checking error return from
blkg_lookup_create() and may cause oops on lookup failure. Fix it
by falling back to root_rl on blkg lookup failures. This problem
was spotted by Rakesh Iyer <rni@google.com>.
v4: Updated to accomodate 458f27a982 "block: Avoid missed wakeup in
request waitqueue". blk_drain_queue() now wakes up waiters on all
blkg->rl on the target queue.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2012-06-27 00:05:44 +02:00
|
|
|
if (!pd)
|
|
|
|
goto err_free;
|
2012-03-05 22:15:16 +01:00
|
|
|
|
2012-03-05 22:15:20 +01:00
|
|
|
blkg->pd[i] = pd;
|
|
|
|
pd->blkg = blkg;
|
2013-01-09 17:05:12 +01:00
|
|
|
pd->plid = i;
|
2012-03-05 22:15:20 +01:00
|
|
|
|
2012-06-04 08:21:00 +02:00
|
|
|
/* invoke per-policy init */
|
2013-01-09 17:05:10 +01:00
|
|
|
if (pol->pd_init_fn)
|
2012-04-16 22:57:27 +02:00
|
|
|
pol->pd_init_fn(blkg);
|
2012-03-05 22:15:20 +01:00
|
|
|
}
|
|
|
|
|
2012-03-05 22:15:14 +01:00
|
|
|
return blkg;
|
blkcg: implement per-blkg request allocation
Currently, request_queue has one request_list to allocate requests
from regardless of blkcg of the IO being issued. When the unified
request pool is used up, cfq proportional IO limits become meaningless
- whoever grabs the next request being freed wins the race regardless
of the configured weights.
This can be easily demonstrated by creating a blkio cgroup w/ very low
weight, put a program which can issue a lot of random direct IOs there
and running a sequential IO from a different cgroup. As soon as the
request pool is used up, the sequential IO bandwidth crashes.
This patch implements per-blkg request_list. Each blkg has its own
request_list and any IO allocates its request from the matching blkg
making blkcgs completely isolated in terms of request allocation.
* Root blkcg uses the request_list embedded in each request_queue,
which was renamed to @q->root_rl from @q->rq. While making blkcg rl
handling a bit harier, this enables avoiding most overhead for root
blkcg.
* Queue fullness is properly per request_list but bdi isn't blkcg
aware yet, so congestion state currently just follows the root
blkcg. As writeback isn't aware of blkcg yet, this works okay for
async congestion but readahead may get the wrong signals. It's
better than blkcg completely collapsing with shared request_list but
needs to be improved with future changes.
* After this change, each block cgroup gets a full request pool making
resource consumption of each cgroup higher. This makes allowing
non-root users to create cgroups less desirable; however, note that
allowing non-root users to directly manage cgroups is already
severely broken regardless of this patch - each block cgroup
consumes kernel memory and skews IO weight (IO weights are not
hierarchical).
v2: queue-sysfs.txt updated and patch description udpated as suggested
by Vivek.
v3: blk_get_rl() wasn't checking error return from
blkg_lookup_create() and may cause oops on lookup failure. Fix it
by falling back to root_rl on blkg lookup failures. This problem
was spotted by Rakesh Iyer <rni@google.com>.
v4: Updated to accomodate 458f27a982 "block: Avoid missed wakeup in
request waitqueue". blk_drain_queue() now wakes up waiters on all
blkg->rl on the target queue.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2012-06-27 00:05:44 +02:00
|
|
|
|
|
|
|
err_free:
|
|
|
|
blkg_free(blkg);
|
|
|
|
return NULL;
|
2012-03-05 22:15:14 +01:00
|
|
|
}
|
|
|
|
|
2013-01-09 17:05:12 +01:00
|
|
|
/**
|
|
|
|
* __blkg_lookup - internal version of blkg_lookup()
|
|
|
|
* @blkcg: blkcg of interest
|
|
|
|
* @q: request_queue of interest
|
|
|
|
* @update_hint: whether to update lookup hint with the result or not
|
|
|
|
*
|
|
|
|
* This is internal version and shouldn't be used by policy
|
|
|
|
* implementations. Looks up blkgs for the @blkcg - @q pair regardless of
|
|
|
|
* @q's bypass state. If @update_hint is %true, the caller should be
|
|
|
|
* holding @q->queue_lock and lookup hint is updated on success.
|
|
|
|
*/
|
2012-04-16 22:57:25 +02:00
|
|
|
static struct blkcg_gq *__blkg_lookup(struct blkcg *blkcg,
|
2013-01-09 17:05:10 +01:00
|
|
|
struct request_queue *q, bool update_hint)
|
2012-04-13 23:50:53 +02:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg;
|
2012-04-13 23:50:53 +02:00
|
|
|
|
2012-04-20 01:29:24 +02:00
|
|
|
blkg = rcu_dereference(blkcg->blkg_hint);
|
|
|
|
if (blkg && blkg->q == q)
|
|
|
|
return blkg;
|
|
|
|
|
|
|
|
/*
|
2013-01-09 17:05:10 +01:00
|
|
|
* Hint didn't match. Look up from the radix tree. Note that the
|
|
|
|
* hint can only be updated under queue_lock as otherwise @blkg
|
|
|
|
* could have already been removed from blkg_tree. The caller is
|
|
|
|
* responsible for grabbing queue_lock if @update_hint.
|
2012-04-20 01:29:24 +02:00
|
|
|
*/
|
|
|
|
blkg = radix_tree_lookup(&blkcg->blkg_tree, q->id);
|
2013-01-09 17:05:10 +01:00
|
|
|
if (blkg && blkg->q == q) {
|
|
|
|
if (update_hint) {
|
|
|
|
lockdep_assert_held(q->queue_lock);
|
|
|
|
rcu_assign_pointer(blkcg->blkg_hint, blkg);
|
|
|
|
}
|
2012-04-20 01:29:24 +02:00
|
|
|
return blkg;
|
2013-01-09 17:05:10 +01:00
|
|
|
}
|
2012-04-20 01:29:24 +02:00
|
|
|
|
2012-04-13 23:50:53 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* blkg_lookup - lookup blkg for the specified blkcg - q pair
|
|
|
|
* @blkcg: blkcg of interest
|
|
|
|
* @q: request_queue of interest
|
|
|
|
*
|
|
|
|
* Lookup blkg for the @blkcg - @q pair. This function should be called
|
|
|
|
* under RCU read lock and is guaranteed to return %NULL if @q is bypassing
|
|
|
|
* - see blk_queue_bypass_start() for details.
|
|
|
|
*/
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg_lookup(struct blkcg *blkcg, struct request_queue *q)
|
2012-04-13 23:50:53 +02:00
|
|
|
{
|
|
|
|
WARN_ON_ONCE(!rcu_read_lock_held());
|
|
|
|
|
|
|
|
if (unlikely(blk_queue_bypass(q)))
|
|
|
|
return NULL;
|
2013-01-09 17:05:10 +01:00
|
|
|
return __blkg_lookup(blkcg, q, false);
|
2012-04-13 23:50:53 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(blkg_lookup);
|
|
|
|
|
2012-06-05 05:40:52 +02:00
|
|
|
/*
|
|
|
|
* If @new_blkg is %NULL, this function tries to allocate a new one as
|
|
|
|
* necessary using %GFP_ATOMIC. @new_blkg is always consumed on return.
|
|
|
|
*/
|
2013-01-09 17:05:10 +01:00
|
|
|
static struct blkcg_gq *blkg_create(struct blkcg *blkcg,
|
|
|
|
struct request_queue *q,
|
|
|
|
struct blkcg_gq *new_blkg)
|
2011-05-19 21:38:28 +02:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg;
|
2013-01-09 17:05:12 +01:00
|
|
|
int i, ret;
|
2011-05-19 21:38:28 +02:00
|
|
|
|
2012-03-05 22:15:06 +01:00
|
|
|
WARN_ON_ONCE(!rcu_read_lock_held());
|
|
|
|
lockdep_assert_held(q->queue_lock);
|
|
|
|
|
2012-03-05 22:15:11 +01:00
|
|
|
/* blkg holds a reference to blkcg */
|
2012-06-05 05:40:52 +02:00
|
|
|
if (!css_tryget(&blkcg->css)) {
|
2013-01-09 17:05:10 +01:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto err_free_blkg;
|
2012-06-05 05:40:52 +02:00
|
|
|
}
|
2012-03-05 22:15:06 +01:00
|
|
|
|
2012-04-20 01:29:23 +02:00
|
|
|
/* allocate */
|
2012-06-05 05:40:52 +02:00
|
|
|
if (!new_blkg) {
|
|
|
|
new_blkg = blkg_alloc(blkcg, q, GFP_ATOMIC);
|
|
|
|
if (unlikely(!new_blkg)) {
|
2013-01-09 17:05:10 +01:00
|
|
|
ret = -ENOMEM;
|
|
|
|
goto err_put_css;
|
2012-06-05 05:40:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
blkg = new_blkg;
|
2012-03-05 22:15:06 +01:00
|
|
|
|
2013-01-09 17:05:10 +01:00
|
|
|
/* link parent and insert */
|
|
|
|
if (blkcg_parent(blkcg)) {
|
|
|
|
blkg->parent = __blkg_lookup(blkcg_parent(blkcg), q, false);
|
|
|
|
if (WARN_ON_ONCE(!blkg->parent)) {
|
|
|
|
blkg = ERR_PTR(-EINVAL);
|
|
|
|
goto err_put_css;
|
|
|
|
}
|
|
|
|
blkg_get(blkg->parent);
|
|
|
|
}
|
|
|
|
|
2012-03-05 22:15:06 +01:00
|
|
|
spin_lock(&blkcg->lock);
|
2012-04-20 01:29:24 +02:00
|
|
|
ret = radix_tree_insert(&blkcg->blkg_tree, q->id, blkg);
|
|
|
|
if (likely(!ret)) {
|
|
|
|
hlist_add_head_rcu(&blkg->blkcg_node, &blkcg->blkg_list);
|
|
|
|
list_add(&blkg->q_node, &q->blkg_list);
|
2013-01-09 17:05:12 +01:00
|
|
|
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
|
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
|
|
|
|
|
|
|
if (blkg->pd[i] && pol->pd_online_fn)
|
|
|
|
pol->pd_online_fn(blkg);
|
|
|
|
}
|
2012-04-20 01:29:24 +02:00
|
|
|
}
|
2013-01-09 17:05:12 +01:00
|
|
|
blkg->online = true;
|
2012-03-05 22:15:06 +01:00
|
|
|
spin_unlock(&blkcg->lock);
|
2012-04-20 01:29:23 +02:00
|
|
|
|
2012-04-20 01:29:24 +02:00
|
|
|
if (!ret)
|
|
|
|
return blkg;
|
2012-06-05 05:40:52 +02:00
|
|
|
|
2013-01-09 17:05:10 +01:00
|
|
|
/* @blkg failed fully initialized, use the usual release path */
|
|
|
|
blkg_put(blkg);
|
|
|
|
return ERR_PTR(ret);
|
|
|
|
|
2013-01-09 17:05:10 +01:00
|
|
|
err_put_css:
|
2012-04-20 01:29:23 +02:00
|
|
|
css_put(&blkcg->css);
|
2013-01-09 17:05:10 +01:00
|
|
|
err_free_blkg:
|
2012-06-05 05:40:52 +02:00
|
|
|
blkg_free(new_blkg);
|
2013-01-09 17:05:10 +01:00
|
|
|
return ERR_PTR(ret);
|
2009-12-03 18:59:42 +01:00
|
|
|
}
|
2012-04-13 22:11:34 +02:00
|
|
|
|
2013-01-09 17:05:10 +01:00
|
|
|
/**
|
|
|
|
* blkg_lookup_create - lookup blkg, try to create one if not there
|
|
|
|
* @blkcg: blkcg of interest
|
|
|
|
* @q: request_queue of interest
|
|
|
|
*
|
|
|
|
* Lookup blkg for the @blkcg - @q pair. If it doesn't exist, try to
|
2013-01-09 17:05:10 +01:00
|
|
|
* create one. blkg creation is performed recursively from blkcg_root such
|
|
|
|
* that all non-root blkg's have access to the parent blkg. This function
|
|
|
|
* should be called under RCU read lock and @q->queue_lock.
|
2013-01-09 17:05:10 +01:00
|
|
|
*
|
|
|
|
* Returns pointer to the looked up or created blkg on success, ERR_PTR()
|
|
|
|
* value on error. If @q is dead, returns ERR_PTR(-EINVAL). If @q is not
|
|
|
|
* dead and bypassing, returns ERR_PTR(-EBUSY).
|
|
|
|
*/
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg,
|
|
|
|
struct request_queue *q)
|
2012-04-13 22:11:34 +02:00
|
|
|
{
|
2013-01-09 17:05:10 +01:00
|
|
|
struct blkcg_gq *blkg;
|
|
|
|
|
|
|
|
WARN_ON_ONCE(!rcu_read_lock_held());
|
|
|
|
lockdep_assert_held(q->queue_lock);
|
|
|
|
|
2012-04-13 22:11:34 +02:00
|
|
|
/*
|
|
|
|
* This could be the first entry point of blkcg implementation and
|
|
|
|
* we shouldn't allow anything to go through for a bypassing queue.
|
|
|
|
*/
|
|
|
|
if (unlikely(blk_queue_bypass(q)))
|
2012-11-28 13:42:38 +01:00
|
|
|
return ERR_PTR(blk_queue_dying(q) ? -EINVAL : -EBUSY);
|
2013-01-09 17:05:10 +01:00
|
|
|
|
|
|
|
blkg = __blkg_lookup(blkcg, q, true);
|
|
|
|
if (blkg)
|
|
|
|
return blkg;
|
|
|
|
|
2013-01-09 17:05:10 +01:00
|
|
|
/*
|
|
|
|
* Create blkgs walking down from blkcg_root to @blkcg, so that all
|
|
|
|
* non-root blkgs have access to their parents.
|
|
|
|
*/
|
|
|
|
while (true) {
|
|
|
|
struct blkcg *pos = blkcg;
|
|
|
|
struct blkcg *parent = blkcg_parent(blkcg);
|
|
|
|
|
|
|
|
while (parent && !__blkg_lookup(parent, q, false)) {
|
|
|
|
pos = parent;
|
|
|
|
parent = blkcg_parent(parent);
|
|
|
|
}
|
|
|
|
|
|
|
|
blkg = blkg_create(pos, q, NULL);
|
|
|
|
if (pos == blkcg || IS_ERR(blkg))
|
|
|
|
return blkg;
|
|
|
|
}
|
2012-04-13 22:11:34 +02:00
|
|
|
}
|
2012-03-05 22:15:06 +01:00
|
|
|
EXPORT_SYMBOL_GPL(blkg_lookup_create);
|
2009-12-03 18:59:42 +01:00
|
|
|
|
2012-04-16 22:57:25 +02:00
|
|
|
static void blkg_destroy(struct blkcg_gq *blkg)
|
2012-03-05 22:15:19 +01:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg *blkcg = blkg->blkcg;
|
2013-01-09 17:05:12 +01:00
|
|
|
int i;
|
2012-03-05 22:15:19 +01:00
|
|
|
|
2012-06-05 13:36:44 +02:00
|
|
|
lockdep_assert_held(blkg->q->queue_lock);
|
2012-03-05 22:15:21 +01:00
|
|
|
lockdep_assert_held(&blkcg->lock);
|
2012-03-05 22:15:19 +01:00
|
|
|
|
|
|
|
/* Something wrong if we are trying to remove same group twice */
|
2012-03-05 22:15:20 +01:00
|
|
|
WARN_ON_ONCE(list_empty(&blkg->q_node));
|
2012-03-05 22:15:21 +01:00
|
|
|
WARN_ON_ONCE(hlist_unhashed(&blkg->blkcg_node));
|
2012-04-20 01:29:24 +02:00
|
|
|
|
2013-01-09 17:05:12 +01:00
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
|
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
|
|
|
|
|
|
|
if (blkg->pd[i] && pol->pd_offline_fn)
|
|
|
|
pol->pd_offline_fn(blkg);
|
|
|
|
}
|
|
|
|
blkg->online = false;
|
|
|
|
|
2012-04-20 01:29:24 +02:00
|
|
|
radix_tree_delete(&blkcg->blkg_tree, blkg->q->id);
|
2012-03-05 22:15:20 +01:00
|
|
|
list_del_init(&blkg->q_node);
|
2012-03-05 22:15:21 +01:00
|
|
|
hlist_del_init_rcu(&blkg->blkcg_node);
|
2012-03-05 22:15:19 +01:00
|
|
|
|
2012-04-20 01:29:24 +02:00
|
|
|
/*
|
|
|
|
* Both setting lookup hint to and clearing it from @blkg are done
|
|
|
|
* under queue_lock. If it's not pointing to @blkg now, it never
|
|
|
|
* will. Hint assignment itself can race safely.
|
|
|
|
*/
|
|
|
|
if (rcu_dereference_raw(blkcg->blkg_hint) == blkg)
|
|
|
|
rcu_assign_pointer(blkcg->blkg_hint, NULL);
|
|
|
|
|
2012-03-05 22:15:19 +01:00
|
|
|
/*
|
|
|
|
* Put the reference taken at the time of creation so that when all
|
|
|
|
* queues are gone, group can be destroyed.
|
|
|
|
*/
|
|
|
|
blkg_put(blkg);
|
|
|
|
}
|
|
|
|
|
2012-03-05 22:15:21 +01:00
|
|
|
/**
|
|
|
|
* blkg_destroy_all - destroy all blkgs associated with a request_queue
|
|
|
|
* @q: request_queue of interest
|
|
|
|
*
|
2012-04-13 22:11:34 +02:00
|
|
|
* Destroy all blkgs associated with @q.
|
2012-03-05 22:15:21 +01:00
|
|
|
*/
|
2012-04-13 22:11:34 +02:00
|
|
|
static void blkg_destroy_all(struct request_queue *q)
|
2012-03-05 22:15:00 +01:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg, *n;
|
2012-03-05 22:15:00 +01:00
|
|
|
|
2012-04-13 22:11:35 +02:00
|
|
|
lockdep_assert_held(q->queue_lock);
|
2012-03-05 22:15:00 +01:00
|
|
|
|
2012-03-05 22:15:21 +01:00
|
|
|
list_for_each_entry_safe(blkg, n, &q->blkg_list, q_node) {
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg *blkcg = blkg->blkcg;
|
2012-03-05 22:15:00 +01:00
|
|
|
|
2012-03-05 22:15:21 +01:00
|
|
|
spin_lock(&blkcg->lock);
|
|
|
|
blkg_destroy(blkg);
|
|
|
|
spin_unlock(&blkcg->lock);
|
2012-03-05 22:15:00 +01:00
|
|
|
}
|
2012-10-17 10:45:36 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* root blkg is destroyed. Just clear the pointer since
|
|
|
|
* root_rl does not take reference on root blkg.
|
|
|
|
*/
|
|
|
|
q->root_blkg = NULL;
|
|
|
|
q->root_rl.blkg = NULL;
|
2012-03-05 22:15:00 +01:00
|
|
|
}
|
|
|
|
|
2012-03-05 22:15:15 +01:00
|
|
|
static void blkg_rcu_free(struct rcu_head *rcu_head)
|
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
blkg_free(container_of(rcu_head, struct blkcg_gq, rcu_head));
|
2012-03-05 22:15:15 +01:00
|
|
|
}
|
|
|
|
|
2012-04-16 22:57:25 +02:00
|
|
|
void __blkg_release(struct blkcg_gq *blkg)
|
2012-03-05 22:15:15 +01:00
|
|
|
{
|
2013-01-09 17:05:10 +01:00
|
|
|
/* release the blkcg and parent blkg refs this blkg has been holding */
|
2012-03-05 22:15:15 +01:00
|
|
|
css_put(&blkg->blkcg->css);
|
2013-01-09 17:05:10 +01:00
|
|
|
if (blkg->parent)
|
|
|
|
blkg_put(blkg->parent);
|
2012-03-05 22:15:15 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* A group is freed in rcu manner. But having an rcu lock does not
|
|
|
|
* mean that one can access all the fields of blkg and assume these
|
|
|
|
* are valid. For example, don't try to follow throtl_data and
|
|
|
|
* request queue links.
|
|
|
|
*
|
|
|
|
* Having a reference to blkg under an rcu allows acess to only
|
|
|
|
* values local to groups like group stats and group rate limits
|
|
|
|
*/
|
|
|
|
call_rcu(&blkg->rcu_head, blkg_rcu_free);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(__blkg_release);
|
|
|
|
|
blkcg: implement per-blkg request allocation
Currently, request_queue has one request_list to allocate requests
from regardless of blkcg of the IO being issued. When the unified
request pool is used up, cfq proportional IO limits become meaningless
- whoever grabs the next request being freed wins the race regardless
of the configured weights.
This can be easily demonstrated by creating a blkio cgroup w/ very low
weight, put a program which can issue a lot of random direct IOs there
and running a sequential IO from a different cgroup. As soon as the
request pool is used up, the sequential IO bandwidth crashes.
This patch implements per-blkg request_list. Each blkg has its own
request_list and any IO allocates its request from the matching blkg
making blkcgs completely isolated in terms of request allocation.
* Root blkcg uses the request_list embedded in each request_queue,
which was renamed to @q->root_rl from @q->rq. While making blkcg rl
handling a bit harier, this enables avoiding most overhead for root
blkcg.
* Queue fullness is properly per request_list but bdi isn't blkcg
aware yet, so congestion state currently just follows the root
blkcg. As writeback isn't aware of blkcg yet, this works okay for
async congestion but readahead may get the wrong signals. It's
better than blkcg completely collapsing with shared request_list but
needs to be improved with future changes.
* After this change, each block cgroup gets a full request pool making
resource consumption of each cgroup higher. This makes allowing
non-root users to create cgroups less desirable; however, note that
allowing non-root users to directly manage cgroups is already
severely broken regardless of this patch - each block cgroup
consumes kernel memory and skews IO weight (IO weights are not
hierarchical).
v2: queue-sysfs.txt updated and patch description udpated as suggested
by Vivek.
v3: blk_get_rl() wasn't checking error return from
blkg_lookup_create() and may cause oops on lookup failure. Fix it
by falling back to root_rl on blkg lookup failures. This problem
was spotted by Rakesh Iyer <rni@google.com>.
v4: Updated to accomodate 458f27a982 "block: Avoid missed wakeup in
request waitqueue". blk_drain_queue() now wakes up waiters on all
blkg->rl on the target queue.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2012-06-27 00:05:44 +02:00
|
|
|
/*
|
|
|
|
* The next function used by blk_queue_for_each_rl(). It's a bit tricky
|
|
|
|
* because the root blkg uses @q->root_rl instead of its own rl.
|
|
|
|
*/
|
|
|
|
struct request_list *__blk_queue_next_rl(struct request_list *rl,
|
|
|
|
struct request_queue *q)
|
|
|
|
{
|
|
|
|
struct list_head *ent;
|
|
|
|
struct blkcg_gq *blkg;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine the current blkg list_head. The first entry is
|
|
|
|
* root_rl which is off @q->blkg_list and mapped to the head.
|
|
|
|
*/
|
|
|
|
if (rl == &q->root_rl) {
|
|
|
|
ent = &q->blkg_list;
|
2012-10-22 03:15:37 +02:00
|
|
|
/* There are no more block groups, hence no request lists */
|
|
|
|
if (list_empty(ent))
|
|
|
|
return NULL;
|
blkcg: implement per-blkg request allocation
Currently, request_queue has one request_list to allocate requests
from regardless of blkcg of the IO being issued. When the unified
request pool is used up, cfq proportional IO limits become meaningless
- whoever grabs the next request being freed wins the race regardless
of the configured weights.
This can be easily demonstrated by creating a blkio cgroup w/ very low
weight, put a program which can issue a lot of random direct IOs there
and running a sequential IO from a different cgroup. As soon as the
request pool is used up, the sequential IO bandwidth crashes.
This patch implements per-blkg request_list. Each blkg has its own
request_list and any IO allocates its request from the matching blkg
making blkcgs completely isolated in terms of request allocation.
* Root blkcg uses the request_list embedded in each request_queue,
which was renamed to @q->root_rl from @q->rq. While making blkcg rl
handling a bit harier, this enables avoiding most overhead for root
blkcg.
* Queue fullness is properly per request_list but bdi isn't blkcg
aware yet, so congestion state currently just follows the root
blkcg. As writeback isn't aware of blkcg yet, this works okay for
async congestion but readahead may get the wrong signals. It's
better than blkcg completely collapsing with shared request_list but
needs to be improved with future changes.
* After this change, each block cgroup gets a full request pool making
resource consumption of each cgroup higher. This makes allowing
non-root users to create cgroups less desirable; however, note that
allowing non-root users to directly manage cgroups is already
severely broken regardless of this patch - each block cgroup
consumes kernel memory and skews IO weight (IO weights are not
hierarchical).
v2: queue-sysfs.txt updated and patch description udpated as suggested
by Vivek.
v3: blk_get_rl() wasn't checking error return from
blkg_lookup_create() and may cause oops on lookup failure. Fix it
by falling back to root_rl on blkg lookup failures. This problem
was spotted by Rakesh Iyer <rni@google.com>.
v4: Updated to accomodate 458f27a982 "block: Avoid missed wakeup in
request waitqueue". blk_drain_queue() now wakes up waiters on all
blkg->rl on the target queue.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2012-06-27 00:05:44 +02:00
|
|
|
} else {
|
|
|
|
blkg = container_of(rl, struct blkcg_gq, rl);
|
|
|
|
ent = &blkg->q_node;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* walk to the next list_head, skip root blkcg */
|
|
|
|
ent = ent->next;
|
|
|
|
if (ent == &q->root_blkg->q_node)
|
|
|
|
ent = ent->next;
|
|
|
|
if (ent == &q->blkg_list)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
blkg = container_of(ent, struct blkcg_gq, q_node);
|
|
|
|
return &blkg->rl;
|
|
|
|
}
|
|
|
|
|
2012-04-16 22:57:25 +02:00
|
|
|
static int blkcg_reset_stats(struct cgroup *cgroup, struct cftype *cftype,
|
|
|
|
u64 val)
|
2010-04-02 00:01:24 +02:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg *blkcg = cgroup_to_blkcg(cgroup);
|
|
|
|
struct blkcg_gq *blkg;
|
2012-04-13 22:11:26 +02:00
|
|
|
int i;
|
2010-04-02 00:01:24 +02:00
|
|
|
|
2012-04-13 22:11:26 +02:00
|
|
|
mutex_lock(&blkcg_pol_mutex);
|
2010-04-02 00:01:24 +02:00
|
|
|
spin_lock_irq(&blkcg->lock);
|
2012-03-08 19:53:58 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Note that stat reset is racy - it doesn't synchronize against
|
|
|
|
* stat updates. This is a debug feature which shouldn't exist
|
|
|
|
* anyway. If you get hit by a race, retry.
|
|
|
|
*/
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 02:06:00 +01:00
|
|
|
hlist_for_each_entry(blkg, &blkcg->blkg_list, blkcg_node) {
|
2012-04-13 22:11:28 +02:00
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++) {
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_policy *pol = blkcg_policy[i];
|
2012-03-05 22:15:16 +01:00
|
|
|
|
2012-04-13 22:11:33 +02:00
|
|
|
if (blkcg_policy_enabled(blkg->q, pol) &&
|
2012-04-16 22:57:27 +02:00
|
|
|
pol->pd_reset_stats_fn)
|
|
|
|
pol->pd_reset_stats_fn(blkg);
|
2012-04-13 22:11:26 +02:00
|
|
|
}
|
2010-04-02 00:01:24 +02:00
|
|
|
}
|
2011-05-19 21:38:30 +02:00
|
|
|
|
2010-04-02 00:01:24 +02:00
|
|
|
spin_unlock_irq(&blkcg->lock);
|
2012-04-13 22:11:26 +02:00
|
|
|
mutex_unlock(&blkcg_pol_mutex);
|
2010-04-02 00:01:24 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-16 22:57:25 +02:00
|
|
|
static const char *blkg_dev_name(struct blkcg_gq *blkg)
|
2010-04-02 00:01:24 +02:00
|
|
|
{
|
2012-04-01 23:38:42 +02:00
|
|
|
/* some drivers (floppy) instantiate a queue w/o disk registered */
|
|
|
|
if (blkg->q->backing_dev_info.dev)
|
|
|
|
return dev_name(blkg->q->backing_dev_info.dev);
|
|
|
|
return NULL;
|
2010-04-02 00:01:24 +02:00
|
|
|
}
|
|
|
|
|
2012-04-01 23:38:42 +02:00
|
|
|
/**
|
|
|
|
* blkcg_print_blkgs - helper for printing per-blkg data
|
|
|
|
* @sf: seq_file to print to
|
|
|
|
* @blkcg: blkcg of interest
|
|
|
|
* @prfill: fill function to print out a blkg
|
|
|
|
* @pol: policy in question
|
|
|
|
* @data: data to be passed to @prfill
|
|
|
|
* @show_total: to print out sum of prfill return values or not
|
|
|
|
*
|
|
|
|
* This function invokes @prfill on each blkg of @blkcg if pd for the
|
|
|
|
* policy specified by @pol exists. @prfill is invoked with @sf, the
|
2013-01-09 17:05:13 +01:00
|
|
|
* policy data and @data and the matching queue lock held. If @show_total
|
|
|
|
* is %true, the sum of the return values from @prfill is printed with
|
|
|
|
* "Total" label at the end.
|
2012-04-01 23:38:42 +02:00
|
|
|
*
|
|
|
|
* This is to be used to construct print functions for
|
|
|
|
* cftype->read_seq_string method.
|
|
|
|
*/
|
2012-04-16 22:57:25 +02:00
|
|
|
void blkcg_print_blkgs(struct seq_file *sf, struct blkcg *blkcg,
|
2012-04-16 22:57:26 +02:00
|
|
|
u64 (*prfill)(struct seq_file *,
|
|
|
|
struct blkg_policy_data *, int),
|
2012-04-16 22:57:25 +02:00
|
|
|
const struct blkcg_policy *pol, int data,
|
2012-04-13 22:11:27 +02:00
|
|
|
bool show_total)
|
2011-05-19 21:38:28 +02:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg;
|
2012-04-01 23:38:42 +02:00
|
|
|
u64 total = 0;
|
2011-05-19 21:38:28 +02:00
|
|
|
|
2013-01-09 17:05:13 +01:00
|
|
|
rcu_read_lock();
|
2013-02-28 21:52:24 +01:00
|
|
|
hlist_for_each_entry_rcu(blkg, &blkcg->blkg_list, blkcg_node) {
|
2013-01-09 17:05:13 +01:00
|
|
|
spin_lock_irq(blkg->q->queue_lock);
|
2012-04-13 22:11:33 +02:00
|
|
|
if (blkcg_policy_enabled(blkg->q, pol))
|
2012-04-16 22:57:26 +02:00
|
|
|
total += prfill(sf, blkg->pd[pol->plid], data);
|
2013-01-09 17:05:13 +01:00
|
|
|
spin_unlock_irq(blkg->q->queue_lock);
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
2012-04-01 23:38:42 +02:00
|
|
|
|
|
|
|
if (show_total)
|
|
|
|
seq_printf(sf, "Total %llu\n", (unsigned long long)total);
|
|
|
|
}
|
2012-04-01 23:38:43 +02:00
|
|
|
EXPORT_SYMBOL_GPL(blkcg_print_blkgs);
|
2012-04-01 23:38:42 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* __blkg_prfill_u64 - prfill helper for a single u64 value
|
|
|
|
* @sf: seq_file to print to
|
2012-04-16 22:57:26 +02:00
|
|
|
* @pd: policy private data of interest
|
2012-04-01 23:38:42 +02:00
|
|
|
* @v: value to print
|
|
|
|
*
|
2012-04-16 22:57:26 +02:00
|
|
|
* Print @v to @sf for the device assocaited with @pd.
|
2012-04-01 23:38:42 +02:00
|
|
|
*/
|
2012-04-16 22:57:26 +02:00
|
|
|
u64 __blkg_prfill_u64(struct seq_file *sf, struct blkg_policy_data *pd, u64 v)
|
2012-04-01 23:38:42 +02:00
|
|
|
{
|
2012-04-16 22:57:26 +02:00
|
|
|
const char *dname = blkg_dev_name(pd->blkg);
|
2012-04-01 23:38:42 +02:00
|
|
|
|
|
|
|
if (!dname)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
seq_printf(sf, "%s %llu\n", dname, (unsigned long long)v);
|
|
|
|
return v;
|
|
|
|
}
|
2012-04-01 23:38:43 +02:00
|
|
|
EXPORT_SYMBOL_GPL(__blkg_prfill_u64);
|
2012-04-01 23:38:42 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* __blkg_prfill_rwstat - prfill helper for a blkg_rwstat
|
|
|
|
* @sf: seq_file to print to
|
2012-04-16 22:57:26 +02:00
|
|
|
* @pd: policy private data of interest
|
2012-04-01 23:38:42 +02:00
|
|
|
* @rwstat: rwstat to print
|
|
|
|
*
|
2012-04-16 22:57:26 +02:00
|
|
|
* Print @rwstat to @sf for the device assocaited with @pd.
|
2012-04-01 23:38:42 +02:00
|
|
|
*/
|
2012-04-16 22:57:26 +02:00
|
|
|
u64 __blkg_prfill_rwstat(struct seq_file *sf, struct blkg_policy_data *pd,
|
2012-04-01 23:38:43 +02:00
|
|
|
const struct blkg_rwstat *rwstat)
|
2012-04-01 23:38:42 +02:00
|
|
|
{
|
|
|
|
static const char *rwstr[] = {
|
|
|
|
[BLKG_RWSTAT_READ] = "Read",
|
|
|
|
[BLKG_RWSTAT_WRITE] = "Write",
|
|
|
|
[BLKG_RWSTAT_SYNC] = "Sync",
|
|
|
|
[BLKG_RWSTAT_ASYNC] = "Async",
|
|
|
|
};
|
2012-04-16 22:57:26 +02:00
|
|
|
const char *dname = blkg_dev_name(pd->blkg);
|
2012-04-01 23:38:42 +02:00
|
|
|
u64 v;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!dname)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
for (i = 0; i < BLKG_RWSTAT_NR; i++)
|
|
|
|
seq_printf(sf, "%s %s %llu\n", dname, rwstr[i],
|
|
|
|
(unsigned long long)rwstat->cnt[i]);
|
|
|
|
|
|
|
|
v = rwstat->cnt[BLKG_RWSTAT_READ] + rwstat->cnt[BLKG_RWSTAT_WRITE];
|
|
|
|
seq_printf(sf, "%s Total %llu\n", dname, (unsigned long long)v);
|
|
|
|
return v;
|
|
|
|
}
|
2013-01-09 17:05:12 +01:00
|
|
|
EXPORT_SYMBOL_GPL(__blkg_prfill_rwstat);
|
2012-04-01 23:38:42 +02:00
|
|
|
|
2012-04-01 23:38:45 +02:00
|
|
|
/**
|
|
|
|
* blkg_prfill_stat - prfill callback for blkg_stat
|
|
|
|
* @sf: seq_file to print to
|
2012-04-16 22:57:26 +02:00
|
|
|
* @pd: policy private data of interest
|
|
|
|
* @off: offset to the blkg_stat in @pd
|
2012-04-01 23:38:45 +02:00
|
|
|
*
|
|
|
|
* prfill callback for printing a blkg_stat.
|
|
|
|
*/
|
2012-04-16 22:57:26 +02:00
|
|
|
u64 blkg_prfill_stat(struct seq_file *sf, struct blkg_policy_data *pd, int off)
|
2012-04-01 23:38:42 +02:00
|
|
|
{
|
2012-04-16 22:57:26 +02:00
|
|
|
return __blkg_prfill_u64(sf, pd, blkg_stat_read((void *)pd + off));
|
2012-04-01 23:38:42 +02:00
|
|
|
}
|
2012-04-01 23:38:45 +02:00
|
|
|
EXPORT_SYMBOL_GPL(blkg_prfill_stat);
|
2012-04-01 23:38:42 +02:00
|
|
|
|
2012-04-01 23:38:45 +02:00
|
|
|
/**
|
|
|
|
* blkg_prfill_rwstat - prfill callback for blkg_rwstat
|
|
|
|
* @sf: seq_file to print to
|
2012-04-16 22:57:26 +02:00
|
|
|
* @pd: policy private data of interest
|
|
|
|
* @off: offset to the blkg_rwstat in @pd
|
2012-04-01 23:38:45 +02:00
|
|
|
*
|
|
|
|
* prfill callback for printing a blkg_rwstat.
|
|
|
|
*/
|
2012-04-16 22:57:26 +02:00
|
|
|
u64 blkg_prfill_rwstat(struct seq_file *sf, struct blkg_policy_data *pd,
|
|
|
|
int off)
|
2012-04-01 23:38:42 +02:00
|
|
|
{
|
2012-04-16 22:57:26 +02:00
|
|
|
struct blkg_rwstat rwstat = blkg_rwstat_read((void *)pd + off);
|
2012-04-01 23:38:42 +02:00
|
|
|
|
2012-04-16 22:57:26 +02:00
|
|
|
return __blkg_prfill_rwstat(sf, pd, &rwstat);
|
2012-04-01 23:38:42 +02:00
|
|
|
}
|
2012-04-01 23:38:45 +02:00
|
|
|
EXPORT_SYMBOL_GPL(blkg_prfill_rwstat);
|
2012-04-01 23:38:42 +02:00
|
|
|
|
2013-01-09 17:05:12 +01:00
|
|
|
/**
|
|
|
|
* blkg_stat_recursive_sum - collect hierarchical blkg_stat
|
|
|
|
* @pd: policy private data of interest
|
|
|
|
* @off: offset to the blkg_stat in @pd
|
|
|
|
*
|
|
|
|
* Collect the blkg_stat specified by @off from @pd and all its online
|
|
|
|
* descendants and return the sum. The caller must be holding the queue
|
|
|
|
* lock for online tests.
|
|
|
|
*/
|
|
|
|
u64 blkg_stat_recursive_sum(struct blkg_policy_data *pd, int off)
|
|
|
|
{
|
|
|
|
struct blkcg_policy *pol = blkcg_policy[pd->plid];
|
|
|
|
struct blkcg_gq *pos_blkg;
|
|
|
|
struct cgroup *pos_cgrp;
|
|
|
|
u64 sum;
|
|
|
|
|
|
|
|
lockdep_assert_held(pd->blkg->q->queue_lock);
|
|
|
|
|
|
|
|
sum = blkg_stat_read((void *)pd + off);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
blkg_for_each_descendant_pre(pos_blkg, pos_cgrp, pd_to_blkg(pd)) {
|
|
|
|
struct blkg_policy_data *pos_pd = blkg_to_pd(pos_blkg, pol);
|
|
|
|
struct blkg_stat *stat = (void *)pos_pd + off;
|
|
|
|
|
|
|
|
if (pos_blkg->online)
|
|
|
|
sum += blkg_stat_read(stat);
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return sum;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(blkg_stat_recursive_sum);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* blkg_rwstat_recursive_sum - collect hierarchical blkg_rwstat
|
|
|
|
* @pd: policy private data of interest
|
|
|
|
* @off: offset to the blkg_stat in @pd
|
|
|
|
*
|
|
|
|
* Collect the blkg_rwstat specified by @off from @pd and all its online
|
|
|
|
* descendants and return the sum. The caller must be holding the queue
|
|
|
|
* lock for online tests.
|
|
|
|
*/
|
|
|
|
struct blkg_rwstat blkg_rwstat_recursive_sum(struct blkg_policy_data *pd,
|
|
|
|
int off)
|
|
|
|
{
|
|
|
|
struct blkcg_policy *pol = blkcg_policy[pd->plid];
|
|
|
|
struct blkcg_gq *pos_blkg;
|
|
|
|
struct cgroup *pos_cgrp;
|
|
|
|
struct blkg_rwstat sum;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
lockdep_assert_held(pd->blkg->q->queue_lock);
|
|
|
|
|
|
|
|
sum = blkg_rwstat_read((void *)pd + off);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
blkg_for_each_descendant_pre(pos_blkg, pos_cgrp, pd_to_blkg(pd)) {
|
|
|
|
struct blkg_policy_data *pos_pd = blkg_to_pd(pos_blkg, pol);
|
|
|
|
struct blkg_rwstat *rwstat = (void *)pos_pd + off;
|
|
|
|
struct blkg_rwstat tmp;
|
|
|
|
|
|
|
|
if (!pos_blkg->online)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
tmp = blkg_rwstat_read(rwstat);
|
|
|
|
|
|
|
|
for (i = 0; i < BLKG_RWSTAT_NR; i++)
|
|
|
|
sum.cnt[i] += tmp.cnt[i];
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return sum;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(blkg_rwstat_recursive_sum);
|
|
|
|
|
2012-04-01 23:38:43 +02:00
|
|
|
/**
|
|
|
|
* blkg_conf_prep - parse and prepare for per-blkg config update
|
|
|
|
* @blkcg: target block cgroup
|
2012-04-13 22:11:29 +02:00
|
|
|
* @pol: target policy
|
2012-04-01 23:38:43 +02:00
|
|
|
* @input: input string
|
|
|
|
* @ctx: blkg_conf_ctx to be filled
|
|
|
|
*
|
|
|
|
* Parse per-blkg config update from @input and initialize @ctx with the
|
|
|
|
* result. @ctx->blkg points to the blkg to be updated and @ctx->v the new
|
2012-04-13 22:11:29 +02:00
|
|
|
* value. This function returns with RCU read lock and queue lock held and
|
|
|
|
* must be paired with blkg_conf_finish().
|
2012-04-01 23:38:43 +02:00
|
|
|
*/
|
2012-04-16 22:57:25 +02:00
|
|
|
int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
|
|
|
|
const char *input, struct blkg_conf_ctx *ctx)
|
2012-04-13 22:11:29 +02:00
|
|
|
__acquires(rcu) __acquires(disk->queue->queue_lock)
|
2010-04-13 10:05:49 +02:00
|
|
|
{
|
2012-04-01 23:38:43 +02:00
|
|
|
struct gendisk *disk;
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg;
|
2012-04-01 23:38:43 +02:00
|
|
|
unsigned int major, minor;
|
|
|
|
unsigned long long v;
|
|
|
|
int part, ret;
|
2010-04-13 10:05:49 +02:00
|
|
|
|
2012-04-01 23:38:43 +02:00
|
|
|
if (sscanf(input, "%u:%u %llu", &major, &minor, &v) != 3)
|
|
|
|
return -EINVAL;
|
2012-04-01 23:38:43 +02:00
|
|
|
|
2012-04-01 23:38:43 +02:00
|
|
|
disk = get_gendisk(MKDEV(major, minor), &part);
|
2012-03-05 22:15:08 +01:00
|
|
|
if (!disk || part)
|
2012-04-01 23:38:43 +02:00
|
|
|
return -EINVAL;
|
2012-03-05 22:15:07 +01:00
|
|
|
|
|
|
|
rcu_read_lock();
|
2012-03-05 22:15:08 +01:00
|
|
|
spin_lock_irq(disk->queue->queue_lock);
|
2012-04-13 22:11:29 +02:00
|
|
|
|
2012-04-13 22:11:33 +02:00
|
|
|
if (blkcg_policy_enabled(disk->queue, pol))
|
2012-04-13 22:11:34 +02:00
|
|
|
blkg = blkg_lookup_create(blkcg, disk->queue);
|
2012-04-13 22:11:33 +02:00
|
|
|
else
|
|
|
|
blkg = ERR_PTR(-EINVAL);
|
2012-03-05 22:15:07 +01:00
|
|
|
|
2012-03-05 22:15:08 +01:00
|
|
|
if (IS_ERR(blkg)) {
|
|
|
|
ret = PTR_ERR(blkg);
|
2012-04-01 23:38:43 +02:00
|
|
|
rcu_read_unlock();
|
2012-04-13 22:11:29 +02:00
|
|
|
spin_unlock_irq(disk->queue->queue_lock);
|
2012-04-01 23:38:43 +02:00
|
|
|
put_disk(disk);
|
|
|
|
/*
|
|
|
|
* If queue was bypassing, we should retry. Do so after a
|
|
|
|
* short msleep(). It isn't strictly necessary but queue
|
|
|
|
* can be bypassing for some time and it's always nice to
|
|
|
|
* avoid busy looping.
|
|
|
|
*/
|
|
|
|
if (ret == -EBUSY) {
|
|
|
|
msleep(10);
|
|
|
|
ret = restart_syscall();
|
2010-09-15 23:06:36 +02:00
|
|
|
}
|
2012-04-01 23:38:43 +02:00
|
|
|
return ret;
|
2010-09-15 23:06:33 +02:00
|
|
|
}
|
2012-04-01 23:38:43 +02:00
|
|
|
|
|
|
|
ctx->disk = disk;
|
|
|
|
ctx->blkg = blkg;
|
2012-04-01 23:38:43 +02:00
|
|
|
ctx->v = v;
|
|
|
|
return 0;
|
2010-04-13 10:05:49 +02:00
|
|
|
}
|
2012-04-01 23:38:43 +02:00
|
|
|
EXPORT_SYMBOL_GPL(blkg_conf_prep);
|
2010-04-13 10:05:49 +02:00
|
|
|
|
2012-04-01 23:38:43 +02:00
|
|
|
/**
|
|
|
|
* blkg_conf_finish - finish up per-blkg config update
|
|
|
|
* @ctx: blkg_conf_ctx intiailized by blkg_conf_prep()
|
|
|
|
*
|
|
|
|
* Finish up after per-blkg config update. This function must be paired
|
|
|
|
* with blkg_conf_prep().
|
|
|
|
*/
|
2012-04-01 23:38:43 +02:00
|
|
|
void blkg_conf_finish(struct blkg_conf_ctx *ctx)
|
2012-04-13 22:11:29 +02:00
|
|
|
__releases(ctx->disk->queue->queue_lock) __releases(rcu)
|
2010-04-13 10:05:49 +02:00
|
|
|
{
|
2012-04-13 22:11:29 +02:00
|
|
|
spin_unlock_irq(ctx->disk->queue->queue_lock);
|
2012-04-01 23:38:43 +02:00
|
|
|
rcu_read_unlock();
|
|
|
|
put_disk(ctx->disk);
|
2010-04-13 10:05:49 +02:00
|
|
|
}
|
2012-04-01 23:38:43 +02:00
|
|
|
EXPORT_SYMBOL_GPL(blkg_conf_finish);
|
2010-04-13 10:05:49 +02:00
|
|
|
|
2012-04-16 22:57:25 +02:00
|
|
|
struct cftype blkcg_files[] = {
|
2010-04-09 08:31:19 +02:00
|
|
|
{
|
|
|
|
.name = "reset_stats",
|
2012-04-16 22:57:25 +02:00
|
|
|
.write_u64 = blkcg_reset_stats,
|
2009-12-03 18:59:49 +01:00
|
|
|
},
|
2012-04-01 21:09:55 +02:00
|
|
|
{ } /* terminate */
|
2009-12-03 18:59:42 +01:00
|
|
|
};
|
|
|
|
|
2012-03-05 22:15:21 +01:00
|
|
|
/**
|
2012-11-19 17:13:38 +01:00
|
|
|
* blkcg_css_offline - cgroup css_offline callback
|
2012-03-05 22:15:21 +01:00
|
|
|
* @cgroup: cgroup of interest
|
|
|
|
*
|
|
|
|
* This function is called when @cgroup is about to go away and responsible
|
|
|
|
* for shooting down all blkgs associated with @cgroup. blkgs should be
|
|
|
|
* removed while holding both q and blkcg locks. As blkcg lock is nested
|
|
|
|
* inside q lock, this function performs reverse double lock dancing.
|
|
|
|
*
|
|
|
|
* This is the blkcg counterpart of ioc_release_fn().
|
|
|
|
*/
|
2012-11-19 17:13:38 +01:00
|
|
|
static void blkcg_css_offline(struct cgroup *cgroup)
|
2009-12-03 18:59:42 +01:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg *blkcg = cgroup_to_blkcg(cgroup);
|
2009-12-03 18:59:47 +01:00
|
|
|
|
2012-03-05 22:15:21 +01:00
|
|
|
spin_lock_irq(&blkcg->lock);
|
2012-03-05 22:15:11 +01:00
|
|
|
|
2012-03-05 22:15:21 +01:00
|
|
|
while (!hlist_empty(&blkcg->blkg_list)) {
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg = hlist_entry(blkcg->blkg_list.first,
|
|
|
|
struct blkcg_gq, blkcg_node);
|
2012-03-05 22:15:22 +01:00
|
|
|
struct request_queue *q = blkg->q;
|
2009-12-03 18:59:47 +01:00
|
|
|
|
2012-03-05 22:15:21 +01:00
|
|
|
if (spin_trylock(q->queue_lock)) {
|
|
|
|
blkg_destroy(blkg);
|
|
|
|
spin_unlock(q->queue_lock);
|
|
|
|
} else {
|
|
|
|
spin_unlock_irq(&blkcg->lock);
|
|
|
|
cpu_relax();
|
2012-03-29 20:57:08 +02:00
|
|
|
spin_lock_irq(&blkcg->lock);
|
2010-05-03 14:28:55 +02:00
|
|
|
}
|
2012-03-05 22:15:21 +01:00
|
|
|
}
|
2009-12-03 18:59:47 +01:00
|
|
|
|
2012-03-05 22:15:21 +01:00
|
|
|
spin_unlock_irq(&blkcg->lock);
|
2012-03-05 22:15:11 +01:00
|
|
|
}
|
|
|
|
|
2012-11-19 17:13:38 +01:00
|
|
|
static void blkcg_css_free(struct cgroup *cgroup)
|
2012-03-05 22:15:11 +01:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg *blkcg = cgroup_to_blkcg(cgroup);
|
2012-03-05 22:15:11 +01:00
|
|
|
|
2012-04-16 22:57:25 +02:00
|
|
|
if (blkcg != &blkcg_root)
|
2010-03-11 00:22:11 +01:00
|
|
|
kfree(blkcg);
|
2009-12-03 18:59:42 +01:00
|
|
|
}
|
|
|
|
|
2012-11-19 17:13:38 +01:00
|
|
|
static struct cgroup_subsys_state *blkcg_css_alloc(struct cgroup *cgroup)
|
2009-12-03 18:59:42 +01:00
|
|
|
{
|
2012-03-19 23:10:56 +01:00
|
|
|
static atomic64_t id_seq = ATOMIC64_INIT(0);
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg *blkcg;
|
2010-05-07 08:57:00 +02:00
|
|
|
struct cgroup *parent = cgroup->parent;
|
2009-12-03 18:59:42 +01:00
|
|
|
|
2010-05-07 08:57:00 +02:00
|
|
|
if (!parent) {
|
2012-04-16 22:57:25 +02:00
|
|
|
blkcg = &blkcg_root;
|
2009-12-03 18:59:42 +01:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
blkcg = kzalloc(sizeof(*blkcg), GFP_KERNEL);
|
|
|
|
if (!blkcg)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
2012-04-01 23:38:44 +02:00
|
|
|
blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT;
|
2013-01-09 17:05:10 +01:00
|
|
|
blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT;
|
2012-03-19 23:10:56 +01:00
|
|
|
blkcg->id = atomic64_inc_return(&id_seq); /* root is 0, start from 1 */
|
2009-12-03 18:59:42 +01:00
|
|
|
done:
|
|
|
|
spin_lock_init(&blkcg->lock);
|
2012-04-20 01:29:24 +02:00
|
|
|
INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC);
|
2009-12-03 18:59:42 +01:00
|
|
|
INIT_HLIST_HEAD(&blkcg->blkg_list);
|
|
|
|
|
|
|
|
return &blkcg->css;
|
|
|
|
}
|
|
|
|
|
2012-03-05 22:15:12 +01:00
|
|
|
/**
|
|
|
|
* blkcg_init_queue - initialize blkcg part of request queue
|
|
|
|
* @q: request_queue to initialize
|
|
|
|
*
|
|
|
|
* Called from blk_alloc_queue_node(). Responsible for initializing blkcg
|
|
|
|
* part of new request_queue @q.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* 0 on success, -errno on failure.
|
|
|
|
*/
|
|
|
|
int blkcg_init_queue(struct request_queue *q)
|
|
|
|
{
|
|
|
|
might_sleep();
|
|
|
|
|
2012-04-13 22:11:34 +02:00
|
|
|
return blk_throtl_init(q);
|
2012-03-05 22:15:12 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* blkcg_drain_queue - drain blkcg part of request_queue
|
|
|
|
* @q: request_queue to drain
|
|
|
|
*
|
|
|
|
* Called from blk_drain_queue(). Responsible for draining blkcg part.
|
|
|
|
*/
|
|
|
|
void blkcg_drain_queue(struct request_queue *q)
|
|
|
|
{
|
|
|
|
lockdep_assert_held(q->queue_lock);
|
|
|
|
|
|
|
|
blk_throtl_drain(q);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* blkcg_exit_queue - exit and release blkcg part of request_queue
|
|
|
|
* @q: request_queue being released
|
|
|
|
*
|
|
|
|
* Called from blk_release_queue(). Responsible for exiting blkcg part.
|
|
|
|
*/
|
|
|
|
void blkcg_exit_queue(struct request_queue *q)
|
|
|
|
{
|
2012-04-13 22:11:35 +02:00
|
|
|
spin_lock_irq(q->queue_lock);
|
2012-04-13 22:11:34 +02:00
|
|
|
blkg_destroy_all(q);
|
2012-04-13 22:11:35 +02:00
|
|
|
spin_unlock_irq(q->queue_lock);
|
|
|
|
|
2012-03-05 22:15:12 +01:00
|
|
|
blk_throtl_exit(q);
|
|
|
|
}
|
|
|
|
|
2009-12-03 18:59:42 +01:00
|
|
|
/*
|
|
|
|
* We cannot support shared io contexts, as we have no mean to support
|
|
|
|
* two tasks with the same ioc in two different groups without major rework
|
|
|
|
* of the main cic data structures. For now we allow a task to change
|
|
|
|
* its cgroup only if it's the only owner of its ioc.
|
|
|
|
*/
|
2012-04-16 22:57:25 +02:00
|
|
|
static int blkcg_can_attach(struct cgroup *cgrp, struct cgroup_taskset *tset)
|
2009-12-03 18:59:42 +01:00
|
|
|
{
|
2011-12-13 03:12:21 +01:00
|
|
|
struct task_struct *task;
|
2009-12-03 18:59:42 +01:00
|
|
|
struct io_context *ioc;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
/* task_lock() is needed to avoid races with exit_io_context() */
|
2011-12-13 03:12:21 +01:00
|
|
|
cgroup_taskset_for_each(task, cgrp, tset) {
|
|
|
|
task_lock(task);
|
|
|
|
ioc = task->io_context;
|
|
|
|
if (ioc && atomic_read(&ioc->nr_tasks) > 1)
|
|
|
|
ret = -EINVAL;
|
|
|
|
task_unlock(task);
|
|
|
|
if (ret)
|
|
|
|
break;
|
|
|
|
}
|
2009-12-03 18:59:42 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-04-01 21:09:55 +02:00
|
|
|
struct cgroup_subsys blkio_subsys = {
|
|
|
|
.name = "blkio",
|
2012-11-19 17:13:38 +01:00
|
|
|
.css_alloc = blkcg_css_alloc,
|
|
|
|
.css_offline = blkcg_css_offline,
|
|
|
|
.css_free = blkcg_css_free,
|
2012-04-16 22:57:25 +02:00
|
|
|
.can_attach = blkcg_can_attach,
|
2012-04-01 21:09:55 +02:00
|
|
|
.subsys_id = blkio_subsys_id,
|
2012-04-16 22:57:25 +02:00
|
|
|
.base_cftypes = blkcg_files,
|
2012-04-01 21:09:55 +02:00
|
|
|
.module = THIS_MODULE,
|
2012-09-13 21:20:58 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* blkio subsystem is utterly broken in terms of hierarchy support.
|
|
|
|
* It treats all cgroups equally regardless of where they're
|
|
|
|
* located in the hierarchy - all cgroups are treated as if they're
|
|
|
|
* right below the root. Fix it and remove the following.
|
|
|
|
*/
|
|
|
|
.broken_hierarchy = true,
|
2012-04-01 21:09:55 +02:00
|
|
|
};
|
|
|
|
EXPORT_SYMBOL_GPL(blkio_subsys);
|
|
|
|
|
2012-04-13 22:11:33 +02:00
|
|
|
/**
|
|
|
|
* blkcg_activate_policy - activate a blkcg policy on a request_queue
|
|
|
|
* @q: request_queue of interest
|
|
|
|
* @pol: blkcg policy to activate
|
|
|
|
*
|
|
|
|
* Activate @pol on @q. Requires %GFP_KERNEL context. @q goes through
|
|
|
|
* bypass mode to populate its blkgs with policy_data for @pol.
|
|
|
|
*
|
|
|
|
* Activation happens with @q bypassed, so nobody would be accessing blkgs
|
|
|
|
* from IO path. Update of each blkg is protected by both queue and blkcg
|
|
|
|
* locks so that holding either lock and testing blkcg_policy_enabled() is
|
|
|
|
* always enough for dereferencing policy data.
|
|
|
|
*
|
|
|
|
* The caller is responsible for synchronizing [de]activations and policy
|
|
|
|
* [un]registerations. Returns 0 on success, -errno on failure.
|
|
|
|
*/
|
|
|
|
int blkcg_activate_policy(struct request_queue *q,
|
2012-04-16 22:57:25 +02:00
|
|
|
const struct blkcg_policy *pol)
|
2012-04-13 22:11:33 +02:00
|
|
|
{
|
|
|
|
LIST_HEAD(pds);
|
2013-01-09 17:05:10 +01:00
|
|
|
struct blkcg_gq *blkg, *new_blkg;
|
2012-04-13 22:11:33 +02:00
|
|
|
struct blkg_policy_data *pd, *n;
|
|
|
|
int cnt = 0, ret;
|
2012-06-05 05:40:52 +02:00
|
|
|
bool preloaded;
|
2012-04-13 22:11:33 +02:00
|
|
|
|
|
|
|
if (blkcg_policy_enabled(q, pol))
|
|
|
|
return 0;
|
|
|
|
|
2012-06-05 05:40:52 +02:00
|
|
|
/* preallocations for root blkg */
|
2013-01-09 17:05:10 +01:00
|
|
|
new_blkg = blkg_alloc(&blkcg_root, q, GFP_KERNEL);
|
|
|
|
if (!new_blkg)
|
2012-06-05 05:40:52 +02:00
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
preloaded = !radix_tree_preload(GFP_KERNEL);
|
|
|
|
|
2012-04-13 22:11:33 +02:00
|
|
|
blk_queue_bypass_start(q);
|
|
|
|
|
2013-01-09 17:05:10 +01:00
|
|
|
/*
|
|
|
|
* Make sure the root blkg exists and count the existing blkgs. As
|
|
|
|
* @q is bypassing at this point, blkg_lookup_create() can't be
|
|
|
|
* used. Open code it.
|
|
|
|
*/
|
2012-04-13 22:11:33 +02:00
|
|
|
spin_lock_irq(q->queue_lock);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
2013-01-09 17:05:10 +01:00
|
|
|
blkg = __blkg_lookup(&blkcg_root, q, false);
|
|
|
|
if (blkg)
|
|
|
|
blkg_free(new_blkg);
|
|
|
|
else
|
|
|
|
blkg = blkg_create(&blkcg_root, q, new_blkg);
|
2012-04-13 22:11:33 +02:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
2012-06-05 05:40:52 +02:00
|
|
|
if (preloaded)
|
|
|
|
radix_tree_preload_end();
|
|
|
|
|
2012-04-13 22:11:33 +02:00
|
|
|
if (IS_ERR(blkg)) {
|
|
|
|
ret = PTR_ERR(blkg);
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
q->root_blkg = blkg;
|
blkcg: implement per-blkg request allocation
Currently, request_queue has one request_list to allocate requests
from regardless of blkcg of the IO being issued. When the unified
request pool is used up, cfq proportional IO limits become meaningless
- whoever grabs the next request being freed wins the race regardless
of the configured weights.
This can be easily demonstrated by creating a blkio cgroup w/ very low
weight, put a program which can issue a lot of random direct IOs there
and running a sequential IO from a different cgroup. As soon as the
request pool is used up, the sequential IO bandwidth crashes.
This patch implements per-blkg request_list. Each blkg has its own
request_list and any IO allocates its request from the matching blkg
making blkcgs completely isolated in terms of request allocation.
* Root blkcg uses the request_list embedded in each request_queue,
which was renamed to @q->root_rl from @q->rq. While making blkcg rl
handling a bit harier, this enables avoiding most overhead for root
blkcg.
* Queue fullness is properly per request_list but bdi isn't blkcg
aware yet, so congestion state currently just follows the root
blkcg. As writeback isn't aware of blkcg yet, this works okay for
async congestion but readahead may get the wrong signals. It's
better than blkcg completely collapsing with shared request_list but
needs to be improved with future changes.
* After this change, each block cgroup gets a full request pool making
resource consumption of each cgroup higher. This makes allowing
non-root users to create cgroups less desirable; however, note that
allowing non-root users to directly manage cgroups is already
severely broken regardless of this patch - each block cgroup
consumes kernel memory and skews IO weight (IO weights are not
hierarchical).
v2: queue-sysfs.txt updated and patch description udpated as suggested
by Vivek.
v3: blk_get_rl() wasn't checking error return from
blkg_lookup_create() and may cause oops on lookup failure. Fix it
by falling back to root_rl on blkg lookup failures. This problem
was spotted by Rakesh Iyer <rni@google.com>.
v4: Updated to accomodate 458f27a982 "block: Avoid missed wakeup in
request waitqueue". blk_drain_queue() now wakes up waiters on all
blkg->rl on the target queue.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
2012-06-27 00:05:44 +02:00
|
|
|
q->root_rl.blkg = blkg;
|
2012-04-13 22:11:33 +02:00
|
|
|
|
|
|
|
list_for_each_entry(blkg, &q->blkg_list, q_node)
|
|
|
|
cnt++;
|
|
|
|
|
|
|
|
spin_unlock_irq(q->queue_lock);
|
|
|
|
|
|
|
|
/* allocate policy_data for all existing blkgs */
|
|
|
|
while (cnt--) {
|
2012-04-16 22:57:26 +02:00
|
|
|
pd = kzalloc_node(pol->pd_size, GFP_KERNEL, q->node);
|
2012-04-13 22:11:33 +02:00
|
|
|
if (!pd) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
list_add_tail(&pd->alloc_node, &pds);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Install the allocated pds. With @q bypassing, no new blkg
|
|
|
|
* should have been created while the queue lock was dropped.
|
|
|
|
*/
|
|
|
|
spin_lock_irq(q->queue_lock);
|
|
|
|
|
|
|
|
list_for_each_entry(blkg, &q->blkg_list, q_node) {
|
|
|
|
if (WARN_ON(list_empty(&pds))) {
|
|
|
|
/* umm... this shouldn't happen, just abort */
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
pd = list_first_entry(&pds, struct blkg_policy_data, alloc_node);
|
|
|
|
list_del_init(&pd->alloc_node);
|
|
|
|
|
|
|
|
/* grab blkcg lock too while installing @pd on @blkg */
|
|
|
|
spin_lock(&blkg->blkcg->lock);
|
|
|
|
|
|
|
|
blkg->pd[pol->plid] = pd;
|
|
|
|
pd->blkg = blkg;
|
2013-01-09 17:05:12 +01:00
|
|
|
pd->plid = pol->plid;
|
2012-04-16 22:57:27 +02:00
|
|
|
pol->pd_init_fn(blkg);
|
2012-04-13 22:11:33 +02:00
|
|
|
|
|
|
|
spin_unlock(&blkg->blkcg->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
__set_bit(pol->plid, q->blkcg_pols);
|
|
|
|
ret = 0;
|
|
|
|
out_unlock:
|
|
|
|
spin_unlock_irq(q->queue_lock);
|
|
|
|
out_free:
|
|
|
|
blk_queue_bypass_end(q);
|
|
|
|
list_for_each_entry_safe(pd, n, &pds, alloc_node)
|
|
|
|
kfree(pd);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(blkcg_activate_policy);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* blkcg_deactivate_policy - deactivate a blkcg policy on a request_queue
|
|
|
|
* @q: request_queue of interest
|
|
|
|
* @pol: blkcg policy to deactivate
|
|
|
|
*
|
|
|
|
* Deactivate @pol on @q. Follows the same synchronization rules as
|
|
|
|
* blkcg_activate_policy().
|
|
|
|
*/
|
|
|
|
void blkcg_deactivate_policy(struct request_queue *q,
|
2012-04-16 22:57:25 +02:00
|
|
|
const struct blkcg_policy *pol)
|
2012-04-13 22:11:33 +02:00
|
|
|
{
|
2012-04-16 22:57:25 +02:00
|
|
|
struct blkcg_gq *blkg;
|
2012-04-13 22:11:33 +02:00
|
|
|
|
|
|
|
if (!blkcg_policy_enabled(q, pol))
|
|
|
|
return;
|
|
|
|
|
|
|
|
blk_queue_bypass_start(q);
|
|
|
|
spin_lock_irq(q->queue_lock);
|
|
|
|
|
|
|
|
__clear_bit(pol->plid, q->blkcg_pols);
|
|
|
|
|
2012-04-13 22:11:35 +02:00
|
|
|
/* if no policy is left, no need for blkgs - shoot them down */
|
|
|
|
if (bitmap_empty(q->blkcg_pols, BLKCG_MAX_POLS))
|
|
|
|
blkg_destroy_all(q);
|
|
|
|
|
2012-04-13 22:11:33 +02:00
|
|
|
list_for_each_entry(blkg, &q->blkg_list, q_node) {
|
|
|
|
/* grab blkcg lock too while removing @pd from @blkg */
|
|
|
|
spin_lock(&blkg->blkcg->lock);
|
|
|
|
|
2013-01-09 17:05:12 +01:00
|
|
|
if (pol->pd_offline_fn)
|
|
|
|
pol->pd_offline_fn(blkg);
|
2012-04-16 22:57:27 +02:00
|
|
|
if (pol->pd_exit_fn)
|
|
|
|
pol->pd_exit_fn(blkg);
|
2012-04-13 22:11:33 +02:00
|
|
|
|
|
|
|
kfree(blkg->pd[pol->plid]);
|
|
|
|
blkg->pd[pol->plid] = NULL;
|
|
|
|
|
|
|
|
spin_unlock(&blkg->blkcg->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock_irq(q->queue_lock);
|
|
|
|
blk_queue_bypass_end(q);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(blkcg_deactivate_policy);
|
|
|
|
|
2012-04-13 22:11:28 +02:00
|
|
|
/**
|
2012-04-16 22:57:25 +02:00
|
|
|
* blkcg_policy_register - register a blkcg policy
|
|
|
|
* @pol: blkcg policy to register
|
2012-04-13 22:11:28 +02:00
|
|
|
*
|
2012-04-16 22:57:25 +02:00
|
|
|
* Register @pol with blkcg core. Might sleep and @pol may be modified on
|
|
|
|
* successful registration. Returns 0 on success and -errno on failure.
|
2012-04-13 22:11:28 +02:00
|
|
|
*/
|
2012-04-16 22:57:25 +02:00
|
|
|
int blkcg_policy_register(struct blkcg_policy *pol)
|
2009-12-04 16:36:42 +01:00
|
|
|
{
|
2012-04-13 22:11:28 +02:00
|
|
|
int i, ret;
|
2012-03-05 22:15:20 +01:00
|
|
|
|
2012-04-16 22:57:26 +02:00
|
|
|
if (WARN_ON(pol->pd_size < sizeof(struct blkg_policy_data)))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-04-13 22:11:26 +02:00
|
|
|
mutex_lock(&blkcg_pol_mutex);
|
|
|
|
|
2012-04-13 22:11:28 +02:00
|
|
|
/* find an empty slot */
|
|
|
|
ret = -ENOSPC;
|
|
|
|
for (i = 0; i < BLKCG_MAX_POLS; i++)
|
2012-04-16 22:57:25 +02:00
|
|
|
if (!blkcg_policy[i])
|
2012-04-13 22:11:28 +02:00
|
|
|
break;
|
|
|
|
if (i >= BLKCG_MAX_POLS)
|
|
|
|
goto out_unlock;
|
2012-03-05 22:15:04 +01:00
|
|
|
|
2012-04-13 22:11:28 +02:00
|
|
|
/* register and update blkgs */
|
2012-04-16 22:57:25 +02:00
|
|
|
pol->plid = i;
|
|
|
|
blkcg_policy[i] = pol;
|
2012-04-13 22:11:28 +02:00
|
|
|
|
|
|
|
/* everything is in place, add intf files for the new policy */
|
2012-04-16 22:57:25 +02:00
|
|
|
if (pol->cftypes)
|
|
|
|
WARN_ON(cgroup_add_cftypes(&blkio_subsys, pol->cftypes));
|
2012-04-13 22:11:28 +02:00
|
|
|
ret = 0;
|
|
|
|
out_unlock:
|
2012-04-13 22:11:26 +02:00
|
|
|
mutex_unlock(&blkcg_pol_mutex);
|
2012-04-13 22:11:28 +02:00
|
|
|
return ret;
|
2009-12-04 16:36:42 +01:00
|
|
|
}
|
2012-04-16 22:57:25 +02:00
|
|
|
EXPORT_SYMBOL_GPL(blkcg_policy_register);
|
2009-12-04 16:36:42 +01:00
|
|
|
|
2012-04-13 22:11:28 +02:00
|
|
|
/**
|
2012-04-16 22:57:25 +02:00
|
|
|
* blkcg_policy_unregister - unregister a blkcg policy
|
|
|
|
* @pol: blkcg policy to unregister
|
2012-04-13 22:11:28 +02:00
|
|
|
*
|
2012-04-16 22:57:25 +02:00
|
|
|
* Undo blkcg_policy_register(@pol). Might sleep.
|
2012-04-13 22:11:28 +02:00
|
|
|
*/
|
2012-04-16 22:57:25 +02:00
|
|
|
void blkcg_policy_unregister(struct blkcg_policy *pol)
|
2009-12-04 16:36:42 +01:00
|
|
|
{
|
2012-04-13 22:11:26 +02:00
|
|
|
mutex_lock(&blkcg_pol_mutex);
|
|
|
|
|
2012-04-16 22:57:25 +02:00
|
|
|
if (WARN_ON(blkcg_policy[pol->plid] != pol))
|
2012-04-13 22:11:28 +02:00
|
|
|
goto out_unlock;
|
|
|
|
|
|
|
|
/* kill the intf files first */
|
2012-04-16 22:57:25 +02:00
|
|
|
if (pol->cftypes)
|
|
|
|
cgroup_rm_cftypes(&blkio_subsys, pol->cftypes);
|
2012-04-01 23:38:43 +02:00
|
|
|
|
2012-04-13 22:11:28 +02:00
|
|
|
/* unregister and update blkgs */
|
2012-04-16 22:57:25 +02:00
|
|
|
blkcg_policy[pol->plid] = NULL;
|
2012-04-13 22:11:28 +02:00
|
|
|
out_unlock:
|
2012-04-13 22:11:26 +02:00
|
|
|
mutex_unlock(&blkcg_pol_mutex);
|
2009-12-04 16:36:42 +01:00
|
|
|
}
|
2012-04-16 22:57:25 +02:00
|
|
|
EXPORT_SYMBOL_GPL(blkcg_policy_unregister);
|