Permalink
Browse files

Updated BFQ and setted as optional

  • Loading branch information...
diegoferigo committed Sep 26, 2011
1 parent 1943db5 commit 5d0e34f4f93eb90dee6fdccf0c9e08f09e442628
@@ -1,7 +1,7 @@
-From 2e7fc285ed8ccac37510d1d2f4d549dc4551e2f8 Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@unimore.it>
-Date: Thu, 16 Dec 2010 13:27:20 +0100
-Subject: [PATCH 1/3] block: prepare I/O context code for BFQ-v2 for 2.6.39
+From 31ce479ecab2638892f4fba191d300aa5a9d9746 Mon Sep 17 00:00:00 2001
+From: Arianna Avanzini <73628@studenti.unimore.it>
+Date: Mon, 12 Sep 2011 22:40:31 +0200
+Subject: [PATCH 1/3] block: prepare I/O context code for BFQ-v3 for 3.0
BFQ uses struct cfq_io_context to store its per-process per-device data,
reusing the same code for cic handling of CFQ. The code is not shared
@@ -25,6 +25,7 @@ element per scheduler.
Signed-off-by: Fabio Checconi <fabio@gandalf.sssup.it>
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
+Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
---
block/Kconfig.iosched | 26 ++++++++++++++++++++++++++
block/blk-ioc.c | 30 +++++++++++++++++-------------
@@ -85,7 +86,7 @@ index 3199b76..5905452 100644
endmenu
diff --git a/block/blk-ioc.c b/block/blk-ioc.c
-index b791022..ced5f8c 100644
+index 342eae9..21f13b1 100644
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -5,6 +5,7 @@
@@ -107,9 +108,9 @@ index b791022..ced5f8c 100644
+ if (!hlist_empty(list)) {
struct cfq_io_context *cic;
-- cic = list_entry(ioc->cic_list.first, struct cfq_io_context,
+- cic = hlist_entry(ioc->cic_list.first, struct cfq_io_context,
- cic_list);
-+ cic = list_entry(list->first, struct cfq_io_context, cic_list);
++ cic = hlist_entry(list->first, struct cfq_io_context, cic_list);
cic->dtor(ioc);
}
}
@@ -137,9 +138,9 @@ index b791022..ced5f8c 100644
+ if (!hlist_empty(list)) {
struct cfq_io_context *cic;
-- cic = list_entry(ioc->cic_list.first, struct cfq_io_context,
+- cic = hlist_entry(ioc->cic_list.first, struct cfq_io_context,
- cic_list);
-+ cic = list_entry(list->first, struct cfq_io_context, cic_list);
++ cic = hlist_entry(list->first, struct cfq_io_context, cic_list);
cic->exit(ioc);
}
rcu_read_unlock();
@@ -171,21 +172,21 @@ index b791022..ced5f8c 100644
+ INIT_RADIX_TREE(&ret->bfq_radix_root, GFP_ATOMIC | __GFP_HIGH);
+ INIT_HLIST_HEAD(&ret->bfq_cic_list);
ret->ioc_data = NULL;
- }
-
+ #if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)
+ ret->cgroup_changed = 0;
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
-index 5b52011..9759270 100644
+index ae21919..b581793 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
-@@ -2845,7 +2845,6 @@ static void changed_ioprio(struct io_context *ioc, struct cfq_io_context *cic)
+@@ -2919,7 +2919,6 @@ static void changed_ioprio(struct io_context *ioc, struct cfq_io_context *cic)
static void cfq_ioc_set_ioprio(struct io_context *ioc)
{
call_for_each_cic(ioc, changed_ioprio);
- ioc->ioprio_changed = 0;
}
static void cfq_init_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq,
-@@ -3129,8 +3128,13 @@ cfq_get_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
+@@ -3204,8 +3203,13 @@ cfq_get_io_context(struct cfq_data *cfqd, gfp_t gfp_mask)
goto err_free;
out:
@@ -290,5 +291,5 @@ index b2eee89..7cbace3 100644
};
--
-1.7.0.4
+1.7.4.1
@@ -1,14 +1,15 @@
-From 81a883f99bea21dc011d34e9ec6026f6941ddc1d Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@unimore.it>
-Date: Thu, 16 Dec 2010 13:30:01 +0100
-Subject: [PATCH 2/3] block: cgroups, kconfig, build bits for BFQ-v2-2.6.39
+From cc6bc33c8d4eeddeede3b495ab4e71520b3d5357 Mon Sep 17 00:00:00 2001
+From: Arianna Avanzini <73628@studenti.unimore.it>
+Date: Mon, 12 Sep 2011 22:42:07 +0200
+Subject: [PATCH 2/3] block: cgroups, kconfig, build bits for BFQ-v3-3.0
Add a Kconfig option and do the related Makefile changes to compile
the BFQ I/O scheduler. Also let the cgroups subsystem know about the
BFQ I/O controller.
Signed-off-by: Fabio Checconi <fabio@gandalf.sssup.it>
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
+Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
---
block/Makefile | 1 +
include/linux/cgroup_subsys.h | 6 ++++++
@@ -27,10 +28,10 @@ index 0fec4b3..22d8608 100644
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
-index cdbfcb8..503f70f 100644
+index ac663c1..c966638 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
-@@ -70,3 +70,9 @@ SUBSYS(perf)
+@@ -64,3 +64,9 @@ SUBSYS(perf)
#endif
/* */
@@ -41,5 +42,5 @@ index cdbfcb8..503f70f 100644
+
+/* */
--
-1.7.0.4
+1.7.4.1
Oops, something went wrong.

0 comments on commit 5d0e34f

Please sign in to comment.