Switch between sq and mq scheduling

sirlucjan · Dec 5, 2017 · fe80772 · fe80772
1 parent bccc317
commit fe80772
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/linux-rt-bfq/.SRCINFO b/linux-rt-bfq/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.0.2
-# Sun Dec  3 13:31:34 UTC 2017
+# Tue Dec  5 14:38:56 UTC 2017
 pkgbase = linux-rt-bfq
 	pkgver = 4.14.3.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Algodev-github/bfq-mq/
 	arch = x86_64
 	license = GPL2
@@ -60,7 +60,7 @@ pkgbase = linux-rt-bfq
 	sha512sums = a1ccc22354a420467fb912f822585ed4573e68f4694f02ab83d7c8e352da88be495acb3cb4c451c27ca0cf0befe5925b8734d37205bb3dfdaf86d2dedef0798f
 	sha512sums = 5ca7ae20245a54caa71fb570d971d6872d4e888f35c6123b93fbca16baf9a0e2500d6ec931f3906e4faecaaca9cad0d593694d9cab617efd0cb7b5fc09c0fa48
 	sha512sums = 86f717f596c613db3bc40624fd956ed379b8a2a20d1d99e076ae9061251fe9afba39cf536623eccd970258e124b8c2c05643e3d539f37bd910e02dc5dd498749
-	sha512sums = 16a9c682b6468e7879303d1e428ab9f23be8e23ad639ba11bd0b67329d91ceb5ea01e65c899436fc6f81b70cb4530a56dec7c165df825f689af5d7ae6fe8627d
+	sha512sums = 858af40e897318dc9f781ebe29c498e03161d5b6956daff9db1a44177b5934bc95618d6f36366ca4b9d73f13a203f3d42174f55f77b8e1bc9002fb1713e6cdad
 	sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a
 	sha512sums = 4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44
 	sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74

diff --git a/linux-rt-bfq/PKGBUILD b/linux-rt-bfq/PKGBUILD
@@ -56,6 +56,9 @@ _localmodcfg=
 # a new kernel is released, but again, convenient for package bumps.
 _use_current=
 
+### Enable MQ scheduling 
+_mq_enable=
+
 ### Do not edit below this line unless you know what you're doing
 
 pkgbase=linux-rt-bfq
@@ -65,7 +68,7 @@ _pkgver=4.14.3
 _rtver=5
 _rtpatchver=rt${_rtver}
 pkgver=${_pkgver}.${_rtver}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://github.com/Algodev-github/bfq-mq/"
 license=('GPL2')
@@ -196,6 +199,13 @@ prepare() {
 			-i -e 's/^# CONFIG_HZ_1000 is not set/CONFIG_HZ_1000=y/' \
 			-i -e 's/^CONFIG_HZ=300/CONFIG_HZ=1000/' .config
 	fi
+
+    ### Enable MQ scheduling
+        if [ -n "$_mq_enable" ]; then
+            msg "Enable MQ scheduling..."
+            sed -i -e s'/^# CONFIG_SCSI_MQ_DEFAULT is not set/CONFIG_SCSI_MQ_DEFAULT=y/' \
+                -i -e s'/^# CONFIG_DM_MQ_DEFAULT is not set/CONFIG_DM_MQ_DEFAULT=y/' ./.config
+        fi
 
 	if [ "${_kernelname}" != "" ]; then
 		sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
@@ -439,7 +449,7 @@ sha512sums=('77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b
             'a1ccc22354a420467fb912f822585ed4573e68f4694f02ab83d7c8e352da88be495acb3cb4c451c27ca0cf0befe5925b8734d37205bb3dfdaf86d2dedef0798f'
             '5ca7ae20245a54caa71fb570d971d6872d4e888f35c6123b93fbca16baf9a0e2500d6ec931f3906e4faecaaca9cad0d593694d9cab617efd0cb7b5fc09c0fa48'
             '86f717f596c613db3bc40624fd956ed379b8a2a20d1d99e076ae9061251fe9afba39cf536623eccd970258e124b8c2c05643e3d539f37bd910e02dc5dd498749'
-            '16a9c682b6468e7879303d1e428ab9f23be8e23ad639ba11bd0b67329d91ceb5ea01e65c899436fc6f81b70cb4530a56dec7c165df825f689af5d7ae6fe8627d'
+            '858af40e897318dc9f781ebe29c498e03161d5b6956daff9db1a44177b5934bc95618d6f36366ca4b9d73f13a203f3d42174f55f77b8e1bc9002fb1713e6cdad'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74'

diff --git a/linux-rt-bfq/config b/linux-rt-bfq/config
@@ -2175,7 +2175,7 @@ CONFIG_RAID_ATTRS=m
 CONFIG_SCSI=m
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_MQ_DEFAULT=y
+# CONFIG_SCSI_MQ_DEFAULT is not set
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -2434,7 +2434,7 @@ CONFIG_BCACHE=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=m
-CONFIG_DM_MQ_DEFAULT=y
+# CONFIG_DM_MQ_DEFAULT is not set
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
 # CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set