added ML2 disable wbt patch from Luca Miccio

1 files changed, 21 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 99c1b79377ef..fa2d9f0386e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,10 @@ _use_tentative_patches=
 
 ### Use mailing-list patches; many thanks to Piotr "sir_lucjan" Gorski
 # ML1 - [PATCH V4 00/14] blk-mq-sched: improve SCSI-MQ performance: https://marc.info/?l=linux-block&m=150436546704854&w=2
-_use_ml_patches=
+_use_ml1_patches=
+
+# ML2 - [PATCH] block,bfq: Disable writeback throttling: https://marc.info/?l=linux-block&m=150486424501778&w=2
+_use_ml2_patches=
 
 # Running with a 1000 HZ tick rate
 _1k_HZ_ticks=
@@ -65,7 +68,7 @@ pkgbase=linux-bfq-mq
 pkgver=4.13
 _srcpatch="${pkgver##*\.*\.}"
 _srcname="linux-${pkgver%%\.${_srcpatch}}"
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="https://github.com/Algodev-github/bfq-mq/"
 license=('GPL2')
@@ -74,6 +77,7 @@ options=('!strip')
 _bfqpath="https://gitlab.com/tom81094/custom-patches/raw/master/bfq-mq"
 _mergepath="${_bfqpath}/merges/${pkgver}"
 _mlpath_1="${_bfqpath}/mailing-list/blk-mq-sched-improve-SCSI-MQ-performance-V4"
+_mlpath_2="${_bfqpath}/mailing-list/block-bfq-disable-wbt"
 _bfqgroup="https://groups.google.com/group/bfq-iosched/attach"
 _gcc_patch='enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch'
 _bfq_mq_patch='4.13-bfq-mq-20170904.patch'
@@ -103,6 +107,8 @@ source=(# mainline kernel patches
         "${_mlpath_1}/ML1-0012-block-introduce-.last_merge-and-.hash-to-blk_mq_ctx.patch"
         "${_mlpath_1}/ML1-0013-blk-mq-sched-refactor-blk_mq_sched_try_merge.patch"
         "${_mlpath_1}/ML1-0014-blk-mq-improve-bio-merge-from-blk-mq-sw-queue.patch"
+        # mailing-list (ML2) patches
+        "${_mlpath_2}/ML2-0001-block-bfq-Disable-writeback-throttling.patch"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # pacman hook for initramfs regeneration
@@ -136,6 +142,8 @@ sha256sums=(# mainline kernel patches
             '00346abf88880eaa8b200705b5a63e322df518eb2129e34ca45e1d90c4742037'
             'bbb9dfdc98f5cdeaf1113d9c24cfafb95bc764af76d56dd57d964a16d81986b7'
             '4f7bbc6d983ab947474f5ab44194328321def86ab3f8b095f4def198d5604d08'
+            # mailing-list (ML2) patches
+            '5e57c8d1d87a63e1c5947aba02346862992f39be2b2761ea142b3897995495aa'
             # the main kernel config files
             'c3b90be8c525f770090e58eac502a5ed2bdde2528960de97e2de1e64acc21854'
             '9bc042875c43c868166924c7ed7f3feed553206a971ebf7bb02bd4e1072257b9'
@@ -173,9 +181,17 @@ prepare() {
 
   ### Patches from mailing-list
   # ML1 - [PATCH V4 00/14] blk-mq-sched: improve SCSI-MQ performance: https://marc.info/?l=linux-block&m=150436546704854&w=2
-  if [ -n "$_use_ml_patches" ]; then
-    msg "Apply mailing-list patches"
-    for p in "${srcdir}"/ML*.patch; do
+  if [ -n "$_use_ml1_patches" ]; then
+    msg "Apply mailing-list patches 1"
+    for p in "${srcdir}"/ML1*.patch; do
+      msg " $p"
+    patch -Np1 -i "$p"; done
+  fi
+
+  # ML2 - [PATCH] block,bfq: Disable writeback throttling: https://marc.info/?l=linux-block&m=150486424501778&w=2
+  if [ -n "$_use_ml2_patches" ]; then
+    msg "Apply mailing-list patches 2"
+    for p in "${srcdir}"/ML2*.patch; do
       msg " $p"
     patch -Np1 -i "$p"; done
   fi