Bump to BFQ v8r11

3 files changed, 11 insertions, 130 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c21c6352a1f..6b1f05bc9b4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-bfq
 	pkgver = 4.10.13
-	pkgrel = 1
+	pkgrel = 2
 	url = http://algo.ing.unimo.it
 	arch = i686
 	arch = x86_64
@@ -13,16 +13,15 @@ pkgbase = linux-bfq
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.10.tar.sign
 	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.10.13.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.10.13.sign
-	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-v8r10/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.10..patch
-	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-v8r10/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.10.0.patch
-	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-v8r10/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
-	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-v8r10/0004-Turn-BFQ-v7r11-for-4.10.0-into-BFQ-v8r10-for-4.10.0.patch
+	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-v8r11/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.10..patch
+	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-v8r11/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.10.0.patch
+	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-v8r11/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
+	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-v8r11/0004-Turn-BFQ-v7r11-for-4.10.0-into-BFQ-v8r11-for-4.10.0.patch
 	source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
 	source = config.i686
 	source = config.x86_64
 	source = 90-linux.hook
 	source = linux.preset
-	source = 0005-BFQ-update-to-v8r11.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha512sums = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
@@ -32,13 +31,12 @@ pkgbase = linux-bfq
 	sha512sums = 03f4d45c0b3ac20baea9eaa92591e1749499e084cbca104f55a3ec4cfeda0e6c7fe6766b0eea0bb5bb4cf7f2371992e7a6002aaec09a08386fe2431c9cf0a3a8
 	sha512sums = c4161e2ff79647b8e8212681c0294b6f160c135728f48adfe61b1089d6242f925584afe4d2ebf0ef9cb650ae45c057d5c7119ce0264d3aeda008bb359b2b2582
 	sha512sums = 3147c29a542342eb2b60c4247edbffce0a35356e3b67a5471ed0e7555d3b9ec1b985e1090dc0b646bab129306962d094d7632e82b72fdbec3582b7461818e664
-	sha512sums = 9ad09ef8a7c89d0b6632b315ed2c89d353cce60c1da66bcbc8039b9bd7ca0f49555a0308e8e330dd24a5e71b66b24bfbb1e012fe560a0645489ad2d77d9d3938
+	sha512sums = ca1b3bcc36e4c61206f4c6fbfbda12eff5996353a3f0f82e972046cec35ff953abb1941ba7ee554db5e012cb61d981f7605b0cbbaad8c09ea9950fa9a3321773
 	sha512sums = 77d80d50d8c4323ed36fd2097ba9f6b49bb8d7cae59d32ffa76b309758a7e9f972d26fedd77046d88ce2691bb01a07909f8bdc34ba214414be3bc030ee31994d
 	sha512sums = 1f0a8695b7c106d7946d67eaa8ebcf4e0bccd2cae01b0cd5621af04aa42f7e9a1b379764fb9bd9917f85ff719ec28e081eeb7c143a682f6d179e2bd1d7d15d7e
 	sha512sums = 6afb164bc7a38fea08a49c70690afafb209d1245588e1ecf57998926f5b43fe85d39a1ab1a133900b82bc1d3d97538330bf5c646b62e782653d69b6139d72200
 	sha512sums = d6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22
 	sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf
-	sha512sums = 554c5a9b3ed415f42f8ba0e25e6d0449b378ab10933e7628ce1fad07bcfcffe3a2319df05360aed4761ac3388e8f05b36e237e2ff1847128672e3461c99fe2c7
 
 pkgname = linux-bfq
 	pkgdesc = Linux Kernel and modules with the BFQ scheduler.
diff --git a/0005-BFQ-update-to-v8r11.patch b/0005-BFQ-update-to-v8r11.patch
deleted file mode 100644
index 97ad479b3865..000000000000
--- a/0005-BFQ-update-to-v8r11.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 1114a7985d8ca1f04210b38a2d90f0e837b4ea05 Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@linaro.org>
-Date: Wed, 26 Apr 2017 19:14:04 +0200
-Subject: [PATCH 1/3] block, bfq: use pointer entity->sched_data only if set
-
-In the function __bfq_deactivate_entity, the pointer
-entity->sched_data could happen to be used before being properly
-initialized. This led to a NULL pointer dereference. This commit fixes
-this bug by just using this pointer only where it is safe to do so.
-
-Reported-by: Tom Harrison <l12436.tw@gmail.com>
-Tested-by: Tom Harrison <l12436.tw@gmail.com>
-Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
----
- block/bfq-sched.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/block/bfq-sched.c b/block/bfq-sched.c
-index 70aac56..8311bdb 100644
---- a/block/bfq-sched.c
-+++ b/block/bfq-sched.c
-@@ -1280,14 +1280,23 @@ static bool __bfq_deactivate_entity(struct bfq_entity *entity,
- 				    bool ins_into_idle_tree)
- {
- 	struct bfq_sched_data *sd = entity->sched_data;
--	struct bfq_service_tree *st = bfq_entity_service_tree(entity);
--	bool is_in_service = entity == sd->in_service_entity;
-+	struct bfq_service_tree *st;
-+	bool is_in_service;
- 
- 	if (!entity->on_st) { /* entity never activated, or already inactive */
--		BUG_ON(entity == entity->sched_data->in_service_entity);
-+		BUG_ON(sd && entity == sd->in_service_entity);
- 		return false;
- 	}
- 
-+	/*
-+	 * If we get here, then entity is active, which implies that
-+	 * bfq_group_set_parent has already been invoked for the group
-+	 * represented by entity. Therefore, the field
-+	 * entity->sched_data has been set, and we can safely use it.
-+	 */
-+	st = bfq_entity_service_tree(entity);
-+	is_in_service = entity == sd->in_service_entity;
-+
- 	BUG_ON(is_in_service && entity->tree && entity->tree != &st->active);
- 
- 	if (is_in_service)
-
-From 614555e901cf87767e339ab4a5e632f938841fe6 Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Thu, 20 Apr 2017 15:07:18 +0100
-Subject: [PATCH 2/3] block, bfq: don't dereference bic before null checking it
-
-The call to bfq_check_ioprio_change will dereference bic, however,
-the null check for bic is after this call.  Move the the null
-check on bic to before the call to avoid any potential null
-pointer dereference issues.
-
-Detected by CoverityScan, CID#1430138 ("Dereference before null check")
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
-Signed-off-by: Jens Axboe <axboe@fb.com>
----
- block/bfq-iosched.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-index 59b1891..77db5a5 100644
---- a/block/bfq-iosched.c
-+++ b/block/bfq-iosched.c
-@@ -4561,6 +4561,8 @@ static int bfq_set_request(struct request_queue *q, struct request *rq,
- 	if (!bic)
- 		goto queue_fail;
- 
-+	bfq_check_ioprio_change(bic, bio);
-+
- 	bfq_bic_update_cgroup(bic, bio);
- 
- new_queue:
-
-From 547022587388ae4e2f27bc45ba23eb040c0558b1 Mon Sep 17 00:00:00 2001
-From: Paolo Valente <paolo.valente@linaro.org>
-Date: Mon, 1 May 2017 19:15:43 +0200
-Subject: [PATCH 3/3] BFQ-v8r11
-
-Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
----
- block/bfq-iosched.c | 2 +-
- block/bfq.h         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-index 77db5a5..6d06c3c 100644
---- a/block/bfq-iosched.c
-+++ b/block/bfq-iosched.c
-@@ -5259,7 +5259,7 @@ static struct blkcg_policy blkcg_policy_bfq = {
- static int __init bfq_init(void)
- {
- 	int ret;
--	char msg[60] = "BFQ I/O-scheduler: v8r10";
-+	char msg[60] = "BFQ I/O-scheduler: v8r11";
- 
- #ifdef CONFIG_BFQ_GROUP_IOSCHED
- 	ret = blkcg_policy_register(&blkcg_policy_bfq);
-diff --git a/block/bfq.h b/block/bfq.h
-index 7cb3240..8cd2b6f 100644
---- a/block/bfq.h
-+++ b/block/bfq.h
-@@ -1,5 +1,5 @@
- /*
-- * BFQ v8r10 for 4.10.0: data structures and common functions prototypes.
-+ * BFQ v8r11 for 4.10.0: data structures and common functions prototypes.
-  *
-  * Based on ideas and code from CFQ:
-  * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
diff --git a/PKGBUILD b/PKGBUILD
index 0fb3e2699e45..280adaefc47b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -52,14 +52,14 @@ pkgbase=linux-bfq
 # pkgname=('linux-bfq' 'linux-bfq-headers' 'linux-bfq-docs')
 _srcname=linux-4.10
 pkgver=4.10.13
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://algo.ing.unimo.it"
 license=('GPL2')
 options=('!strip')
 makedepends=('kmod' 'inetutils' 'bc')
 _bfqrel=v7r11
-_bfqver=v8r10
+_bfqver=v8r11
 _bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.10.0-${_bfqver}"
 #_bfqpath="https://pf.natalenko.name/mirrors/bfq/4.10.0-${_bfqver}"
 _gcc_patch="enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch"
@@ -80,7 +80,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
          # standard config files for mkinitcpio ramdisk
         'linux.preset'
         # patches from https://github.com/linusw/linux-bfq/commits/bfq-v8
-        '0005-BFQ-update-to-v8r11.patch')
+        )
 
 _kernelname=${pkgbase#linux} 
 
@@ -430,13 +430,12 @@ sha512sums=('c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab
             '03f4d45c0b3ac20baea9eaa92591e1749499e084cbca104f55a3ec4cfeda0e6c7fe6766b0eea0bb5bb4cf7f2371992e7a6002aaec09a08386fe2431c9cf0a3a8'
             'c4161e2ff79647b8e8212681c0294b6f160c135728f48adfe61b1089d6242f925584afe4d2ebf0ef9cb650ae45c057d5c7119ce0264d3aeda008bb359b2b2582'
             '3147c29a542342eb2b60c4247edbffce0a35356e3b67a5471ed0e7555d3b9ec1b985e1090dc0b646bab129306962d094d7632e82b72fdbec3582b7461818e664'
-            '9ad09ef8a7c89d0b6632b315ed2c89d353cce60c1da66bcbc8039b9bd7ca0f49555a0308e8e330dd24a5e71b66b24bfbb1e012fe560a0645489ad2d77d9d3938'
+            'ca1b3bcc36e4c61206f4c6fbfbda12eff5996353a3f0f82e972046cec35ff953abb1941ba7ee554db5e012cb61d981f7605b0cbbaad8c09ea9950fa9a3321773'
             '77d80d50d8c4323ed36fd2097ba9f6b49bb8d7cae59d32ffa76b309758a7e9f972d26fedd77046d88ce2691bb01a07909f8bdc34ba214414be3bc030ee31994d'
             '1f0a8695b7c106d7946d67eaa8ebcf4e0bccd2cae01b0cd5621af04aa42f7e9a1b379764fb9bd9917f85ff719ec28e081eeb7c143a682f6d179e2bd1d7d15d7e'
             '6afb164bc7a38fea08a49c70690afafb209d1245588e1ecf57998926f5b43fe85d39a1ab1a133900b82bc1d3d97538330bf5c646b62e782653d69b6139d72200'
             'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22'
-            '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            '554c5a9b3ed415f42f8ba0e25e6d0449b378ab10933e7628ce1fad07bcfcffe3a2319df05360aed4761ac3388e8f05b36e237e2ff1847128672e3461c99fe2c7')
+            '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf')
             
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds