Prev: [RFC][PATCH 06/11] blkiocg async: ext4_writepage not to overwrite iotrack info
Next: [RFC][PATCH 08/11] blkiocg async: Function to search blkcg from css ID
From: Munehiro Ikeda on 8 Jul 2010 23:30
Functions to get cfq_group from bio.
This patch contains only the functionality to get cfq_group from
bio. cfq_get_cfqg() is always called with bio==NULL and returns
cfq_group of current process at this point. So CFQ actual behavior
is not changed yet.

Signed-off-by: Munehiro "Muuhh" Ikeda <m-ikeda(a)ds.jp.nec.com>
---
block/cfq-iosched.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index cd4c0bd..68f76e9 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -14,6 +14,7 @@
#include <linux/rbtree.h>
#include <linux/ioprio.h>
#include <linux/blktrace_api.h>
+#include <linux/blk-iotrack.h>
#include "cfq.h"

/*
@@ -1007,23 +1008,85 @@ done:
}

/*
- * Search for the cfq group current task belongs to. If create = 1, then also
- * create the cfq group if it does not exist. request_queue lock must be held.
+ * Body of searching for and alloc cfq group which is corresponding
+ * to cfqd and blockio-cgroup. If create = 1, then also create the
+ * cfq group if it does not exist. request_queue lock must be held.
*/
-static struct cfq_group *cfq_get_cfqg(struct cfq_data *cfqd, int create)
+static struct cfq_group *
+cfq_get_cfqg_blkcg(struct cfq_data *cfqd, struct blkio_cgroup *blkcg,
+ int create)
+{
+ struct cfq_group *cfqg = NULL;
+
+ cfqg = cfq_find_alloc_cfqg(cfqd, blkcg, create);
+ if (!cfqg && create)
+ cfqg = &cfqd->root_group;
+
+ return cfqg;
+}
+
+/*
+ * Search for the cfq group current task belongs to.
+ * If create = 1, then also create the cfq group if it does not
+ * exist. request_queue lock must be held.
+ */
+static struct cfq_group *
+cfq_get_cfqg_current(struct cfq_data *cfqd, int create)
{
struct cgroup *cgroup;
+ struct blkio_cgroup *blkcg;
struct cfq_group *cfqg = NULL;

rcu_read_lock();
+
cgroup = task_cgroup(current, blkio_subsys_id);
- cfqg = cfq_find_alloc_cfqg(cfqd, cgroup, create);
- if (!cfqg && create)
+ blkcg = cgroup_to_blkio_cgroup(cgroup);
+ cfqg = cfq_get_cfqg_blkcg(cfqd, blkcg, create);
+
+ rcu_read_unlock();
+
+ return cfqg;
+}
+
+/*
+ * Search for the cfq group corresponding to bio.
+ * If bio is for sync, the cfq group is one which current task
+ * belongs to. If cfq group doesn't exist, it is created.
+ * request_queue lock must be held.
+ */
+static struct cfq_group *
+cfq_get_cfqg_bio(struct cfq_data *cfqd, struct bio *bio, int create)
+{
+ unsigned short blkcg_id;
+ struct blkio_cgroup *blkcg;
+ struct cfq_group *cfqg;
+
+ if (!bio || cfq_bio_sync(bio))
+ return cfq_get_cfqg_current(cfqd, create);
+
+ rcu_read_lock();
+
+ blkcg_id = blk_iotrack_cgroup_id(bio);
+ blkcg = blkiocg_id_to_blkcg(blkcg_id);
+ if (blkcg)
+ cfqg = cfq_get_cfqg_blkcg(cfqd, blkcg, create);
+ else
cfqg = &cfqd->root_group;
+
rcu_read_unlock();
return cfqg;
}

+static inline struct cfq_group *
+cfq_get_cfqg(struct cfq_data *cfqd, struct bio *bio, int create)
+{
+#ifdef CONFIG_GROUP_IOSCHED_ASYNC
+ return cfq_get_cfqg_bio(cfqd, bio, create);
+#else
+ return cfq_get_cfqg_current(cfqd, create);
+#endif
+}
+
static inline struct cfq_group *cfq_ref_get_cfqg(struct cfq_group *cfqg)
{
atomic_inc(&cfqg->ref);
@@ -1109,7 +1172,8 @@ void cfq_unlink_blkio_group(void *key, struct blkio_group *blkg)
}

#else /* GROUP_IOSCHED */
-static struct cfq_group *cfq_get_cfqg(struct cfq_data *cfqd, int create)
+static struct cfq_group *
+cfq_get_cfqg(struct cfq_data *cfqd, struct bio *bio, int create)
{
return &cfqd->root_group;
}
@@ -2822,7 +2886,7 @@ cfq_find_alloc_queue(struct cfq_data *cfqd, bool is_sync,
struct cfq_group *cfqg;

retry:
- cfqg = cfq_get_cfqg(cfqd, 1);
+ cfqg = cfq_get_cfqg(cfqd, NULL, 1);
cic = cfq_cic_lookup(cfqd, ioc);
/* cic always exists here */
cfqq = cic_to_cfqq(cic, is_sync);
--
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [RFC][PATCH 06/11] blkiocg async: ext4_writepage not to overwrite iotrack info
Next: [RFC][PATCH 08/11] blkiocg async: Function to search blkcg from css ID