From: Tejun Heo <tj@kernel.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-kernel@vger.kernel.org, Vivek Goyal <vgoyal@redhat.com>
Subject: [PATCH block/for-next 2/4] blkcg: add blkcg_root_css
Date: Mon, 17 Nov 2014 16:13:57 -0500 [thread overview]
Message-ID: <20141117211357.GE23126@htj.dyndns.org> (raw)
In-Reply-To: <20141117211321.GD23126@htj.dyndns.org>
cgroup writeback support would need to tell whether a given blkcg
cgroup_subsys_state is the root one or not. Add global constant
blkcg_root_css which points to &blkcg_root.css. If blkcg is disabled,
it's defined as ERR_PTR(-EINVAL).
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
---
block/blk-cgroup.c | 2 ++
include/linux/blkdev.h | 6 ++++++
2 files changed, 8 insertions(+)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -30,6 +30,8 @@ struct blkcg blkcg_root = { .cfq_weight
.cfq_leaf_weight = 2 * CFQ_WEIGHT_DEFAULT, };
EXPORT_SYMBOL_GPL(blkcg_root);
+struct cgroup_subsys_state * const blkcg_root_css = &blkcg_root.css;
+
static struct blkcg_policy *blkcg_policy[BLKCG_MAX_POLS];
static bool blkcg_policy_enabled(struct request_queue *q,
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1408,6 +1408,9 @@ int kblockd_schedule_delayed_work(struct
int kblockd_schedule_delayed_work_on(int cpu, struct delayed_work *dwork, unsigned long delay);
#ifdef CONFIG_BLK_CGROUP
+
+extern struct cgroup_subsys_state * const blkcg_root_css;
+
/*
* This should not be using sched_clock(). A real patch is in progress
* to fix this up, until that is in place we need to disable preemption
@@ -1437,6 +1440,9 @@ static inline uint64_t rq_io_start_time_
return req->io_start_time_ns;
}
#else
+
+#define blkcg_root_css ((struct cgroup_subsys_state *)ERR_PTR(-EINVAL))
+
static inline void set_start_time_ns(struct request *req) {}
static inline void set_io_start_time_ns(struct request *req) {}
static inline uint64_t rq_start_time_ns(struct request *req)
next prev parent reply other threads:[~2014-11-17 21:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 21:13 [PATCH block/for-next 1/4] blkcg: move block/blk-cgroup.h to include/linux/blk-cgroup.h Tejun Heo
2014-11-17 21:13 ` Tejun Heo [this message]
2014-11-17 21:15 ` [PATCH block/for-next 3/4] cgroup, block: implement task_get_css() and use it in bio_associate_current() Tejun Heo
2014-11-17 21:16 ` [PATCH block/for-next 4/4] block: implement bio_associate_blkcg() Tejun Heo
2014-11-20 21:15 ` Vivek Goyal
2015-01-06 23:12 ` Tejun Heo
2014-11-20 20:27 ` [PATCH block/for-next 3/4] cgroup, block: implement task_get_css() and use it in bio_associate_current() Vivek Goyal
2014-11-20 20:16 ` [PATCH block/for-next 2/4] blkcg: add blkcg_root_css Vivek Goyal
2015-01-06 22:37 ` Tejun Heo
2014-11-20 20:10 ` [PATCH block/for-next 1/4] blkcg: move block/blk-cgroup.h to include/linux/blk-cgroup.h Vivek Goyal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141117211357.GE23126@htj.dyndns.org \
--to=tj@kernel.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=vgoyal@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®