bump to 4.6.7_rt11-2, fixes a performance regression in dcache

3 files changed, 64 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9642c454f1e3..536354e15af7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.0.1
-# Mon Aug 22 19:51:29 UTC 2016
+# Sat Sep  3 09:22:01 UTC 2016
 pkgbase = linux-rt
 	pkgver = 4.6.7_rt11
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.kernel.org/
 	arch = i686
 	arch = x86_64
@@ -25,6 +25,7 @@ pkgbase = linux-rt
 	source = linux-rt.preset
 	source = change-default-console-loglevel.patch
 	source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch
+	source = 0001-fix-dcache-try-1.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1
@@ -41,6 +42,7 @@ pkgbase = linux-rt
 	sha256sums = 2abb6e506e4a687723d6a6dc21703f5d2b42a8956fbc3313e3da2b03c718c80d
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06
+	sha256sums = 8b96ecc7c4c1dc5fc81162d010d69606b590f0feee0563aee875706e0ab4d5f9
 
 pkgname = linux-rt
 	pkgdesc = The Linux-rt kernel and modules
diff --git a/0001-fix-dcache-try-1.patch b/0001-fix-dcache-try-1.patch
new file mode 100644
index 000000000000..b3c78b520064
--- /dev/null
+++ b/0001-fix-dcache-try-1.patch
@@ -0,0 +1,51 @@
+From 970e0abab56f86e253ee6d26b1495cb25293318b Mon Sep 17 00:00:00 2001
+From: Joakim Hernberg <jhernberg@alchemy.lu>
+Date: Fri, 2 Sep 2016 18:27:44 +0200
+Subject: [PATCH] fix dcache - try 1
+
+---
+ fs/dcache.c | 14 +++-----------
+ 1 file changed, 3 insertions(+), 11 deletions(-)
+
+diff --git a/fs/dcache.c b/fs/dcache.c
+index 32c0bfe..4adb399 100644
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -579,6 +579,7 @@ static struct dentry *dentry_kill(struct dentry *dentry)
+ 
+ failed:
+ 	spin_unlock(&dentry->d_lock);
++        cpu_chill();
+ 	return dentry; /* try again with same dentry */
+ }
+ 
+@@ -752,8 +753,6 @@ void dput(struct dentry *dentry)
+ 		return;
+ 
+ repeat:
+-	might_sleep();
+-
+ 	rcu_read_lock();
+ 	if (likely(fast_dput(dentry))) {
+ 		rcu_read_unlock();
+@@ -785,15 +784,8 @@ repeat:
+ 
+ kill_it:
+ 	dentry = dentry_kill(dentry);
+-	if (dentry) {
+-		int r;
+-
+-		/* the task with the highest priority won't schedule */
+-		r = cond_resched();
+-		if (!r)
+-			cpu_chill();
+-		goto repeat;
+-	}
++        if (dentry)
++                goto repeat;
+ }
+ EXPORT_SYMBOL(dput);
+ 
+-- 
+2.9.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 31b5d06aafee..a1a7501ff952 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ _srcname=linux-4.6
 _pkgver=4.6.7
 _rtpatchver=rt11
 pkgver=${_pkgver}_${_rtpatchver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -28,7 +28,8 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'change-default-console-loglevel.patch'
-        'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch')
+        'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch'
+        '0001-fix-dcache-try-1.patch')
 
 
 sha256sums=('a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866'
@@ -41,7 +42,8 @@ sha256sums=('a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866'
             '63db5e7975054a40875c051eb1b1bc3fd2234e398d65c5cace9f64ef8c66bfd8'
             '2abb6e506e4a687723d6a6dc21703f5d2b42a8956fbc3313e3da2b03c718c80d'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06')
+            '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06'
+            '8b96ecc7c4c1dc5fc81162d010d69606b590f0feee0563aee875706e0ab4d5f9')
 
 validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -62,6 +64,9 @@ prepare() {
   msg "applying patch-${_pkgver}-${_rtpatchver}.patch"
   patch -p1 -i "${srcdir}/patch-${_pkgver}-${_rtpatchver}.patch"
 
+  msg "applying 0001-fix-dcache-try-1.patch"
+  patch -p1 -i "${srcdir}/0001-fix-dcache-try-1.patch"
+  
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
@@ -75,7 +80,7 @@ prepare() {
   # Stops X from hanging on certain NVIDIA cards
   msg "fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch"
   patch -p1 -i "${srcdir}/fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch"
-
+  
   msg "All patches have successfully been applied"
 
   if [ "${CARCH}" = "x86_64" ]; then