Upgrading to 5.6.14.6

Removing upstreamed patches.

6 files changed, 20 insertions, 276 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2abcf6ccefca..e007904d16c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linux-rt
 	pkgdesc = Linux RT
-	pkgver = 5.6.10.5
-	pkgrel = 2
+	pkgver = 5.6.14.6
+	pkgrel = 1
 	url = https://wiki.linuxfoundation.org/realtime/start
 	arch = x86_64
 	license = GPL2
@@ -15,36 +15,30 @@ pkgbase = linux-rt
 	makedepends = python-sphinx_rtd_theme
 	makedepends = xmlto
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.10.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.10.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.10-rt5.patch.xz
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.10-rt5.patch.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.14.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.14.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.14-rt6.patch.xz
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.14-rt6.patch.sign
 	source = config
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
 	source = sphinx-workaround.patch
-	source = 0001-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch
 	source = 0002-gcc-plugins-drop-support-for-GCC-4.7.patch
 	source = 0003-gcc-common.h-Update-for-GCC-10.patch
-	source = 0004-Makefile-disallow-data-races-on-gcc-10-as-well.patch
-	source = 0005-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
 	validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1
 	validpgpkeys = 5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73
 	validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14
-	sha256sums = 7bdc96827a9db8de79cd13d74a1c5fe8915674f793e592387f2903cb225801b9
+	sha256sums = 33763f3541711e39fa743da45ff9512d54ade61406173f3d267ba4484cec7ea3
 	sha256sums = SKIP
-	sha256sums = f712f8225069bc2cc6cf5080724483dff871fb5bdf41bdeeeb00a0087a28c116
+	sha256sums = fd1c48c3a0b0a744b11d0c1a39b1a0261f20ab91cc9e0a716d5cdfe44a4c3e6e
 	sha256sums = SKIP
-	sha256sums = d7203e4d164a7040de524227a072ae3d5155cffb905762af9e12ae224b131245
+	sha256sums = 45759066cd533e989e99ec51c3b14734e4c7020795edd9e371e28599a872d1d3
 	sha256sums = ad3275a696348703c57f05b9626e7fbab7243299da32e52044ff51666f810e85
 	sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
-	sha256sums = 2776ca0b3ca95347518b146aab54fb564d138dfc7310c48141bed6cea98a8a07
 	sha256sums = 96ff333774c0a8686c41610364f13e5244946c86e3e12e841e1bbd0d9f33c788
 	sha256sums = 523280e5d125a19af537ee88a531b56a049f3daeb713da473d244eb423f6125f
-	sha256sums = 7462399703b4017aae39178991775beedd20269100e907c5f0cea3f78e5d825b
-	sha256sums = 585a1320b0c7e42a4ed152bb671288ce992271a4a52a6fffcae5ecaf805ecbce
 
 pkgname = linux-rt
 	pkgdesc = The Linux RT kernel and modules
diff --git a/0001-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch b/0001-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch
deleted file mode 100644
index 966b69b73859..000000000000
--- a/0001-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From da707adaee9ff035c943178160be54a90de00cb3 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Mon, 4 May 2020 12:19:45 -0400
-Subject: [PATCH 1/5] kvm: ioapic: Restrict lazy EOI update to edge-triggered
- interrupts
-
-Commit f458d039db7e ("kvm: ioapic: Lazy update IOAPIC EOI") introduces
-the following infinite loop:
-
-BUG: stack guard page was hit at 000000008f595917 \
-(stack is 00000000bdefe5a4..00000000ae2b06f5)
-kernel stack overflow (double-fault): 0000 [#1] SMP NOPTI
-RIP: 0010:kvm_set_irq+0x51/0x160 [kvm]
-Call Trace:
- irqfd_resampler_ack+0x32/0x90 [kvm]
- kvm_notify_acked_irq+0x62/0xd0 [kvm]
- kvm_ioapic_update_eoi_one.isra.0+0x30/0x120 [kvm]
- ioapic_set_irq+0x20e/0x240 [kvm]
- kvm_ioapic_set_irq+0x5c/0x80 [kvm]
- kvm_set_irq+0xbb/0x160 [kvm]
- ? kvm_hv_set_sint+0x20/0x20 [kvm]
- irqfd_resampler_ack+0x32/0x90 [kvm]
- kvm_notify_acked_irq+0x62/0xd0 [kvm]
- kvm_ioapic_update_eoi_one.isra.0+0x30/0x120 [kvm]
- ioapic_set_irq+0x20e/0x240 [kvm]
- kvm_ioapic_set_irq+0x5c/0x80 [kvm]
- kvm_set_irq+0xbb/0x160 [kvm]
- ? kvm_hv_set_sint+0x20/0x20 [kvm]
-....
-
-The re-entrancy happens because the irq state is the OR of
-the interrupt state and the resamplefd state.  That is, we don't
-want to show the state as 0 until we've had a chance to set the
-resamplefd.  But if the interrupt has _not_ gone low then
-ioapic_set_irq is invoked again, causing an infinite loop.
-
-This can only happen for a level-triggered interrupt, otherwise
-irqfd_inject would immediately set the KVM_USERSPACE_IRQ_SOURCE_ID high
-and then low.  Fortunately, in the case of level-triggered interrupts the VMEXIT already happens because
-TMR is set.  Thus, fix the bug by restricting the lazy invocation
-of the ack notifier to edge-triggered interrupts, the only ones that
-need it.
-
-Tested-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
-Reported-by: borisvk@bstnet.org
-Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
-Link: https://www.spinics.net/lists/kvm/msg213512.html
-Fixes: f458d039db7e ("kvm: ioapic: Lazy update IOAPIC EOI")
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=207489
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- arch/x86/kvm/ioapic.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
-index 750ff0b29404..d057376bd3d3 100644
---- a/arch/x86/kvm/ioapic.c
-+++ b/arch/x86/kvm/ioapic.c
-@@ -225,12 +225,12 @@ static int ioapic_set_irq(struct kvm_ioapic *ioapic, unsigned int irq,
- 	}
- 
- 	/*
--	 * AMD SVM AVIC accelerate EOI write and do not trap,
--	 * in-kernel IOAPIC will not be able to receive the EOI.
--	 * In this case, we do lazy update of the pending EOI when
--	 * trying to set IOAPIC irq.
-+	 * AMD SVM AVIC accelerate EOI write iff the interrupt is edge
-+	 * triggered, in which case the in-kernel IOAPIC will not be able
-+	 * to receive the EOI.  In this case, we do a lazy update of the
-+	 * pending EOI when trying to set IOAPIC irq.
- 	 */
--	if (kvm_apicv_activated(ioapic->kvm))
-+	if (edge && kvm_apicv_activated(ioapic->kvm))
- 		ioapic_lazy_update_eoi(ioapic, irq);
- 
- 	/*
--- 
-2.26.2
-
diff --git a/0004-Makefile-disallow-data-races-on-gcc-10-as-well.patch b/0004-Makefile-disallow-data-races-on-gcc-10-as-well.patch
deleted file mode 100644
index dc41a7f34561..000000000000
--- a/0004-Makefile-disallow-data-races-on-gcc-10-as-well.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From af805f5f1d2e61dd2cf907d9635f0abc66fe1197 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 17 Mar 2020 00:07:18 +0000
-Subject: [PATCH 4/5] Makefile: disallow data races on gcc-10 as well
-
-gcc-10 will rename --param=allow-store-data-races=0
-to -fno-allow-store-data-races.
-
-The flag change happened at https://gcc.gnu.org/PR92046.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-Acked-by: Jiri Kosina <jkosina@suse.cz>
-Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index 5dedd6f9ad75..6899bfc9dc7b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -714,6 +714,7 @@ endif
- 
- # Tell gcc to never replace conditional load with a non-conditional one
- KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)
-+KBUILD_CFLAGS	+= $(call cc-option,-fno-allow-store-data-races)
- 
- include scripts/Makefile.kcov
- include scripts/Makefile.gcc-plugins
--- 
-2.26.2
-
diff --git a/0005-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch b/0005-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch
deleted file mode 100644
index 3ff1480b7d9b..000000000000
--- a/0005-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 309b6eca2e2605accf7a3b02b47b5c2732dbe543 Mon Sep 17 00:00:00 2001
-From: Borislav Petkov <bp@suse.de>
-Date: Wed, 22 Apr 2020 18:11:30 +0200
-Subject: [PATCH 5/5] x86: Fix early boot crash on gcc-10, next try
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-... or the odyssey of trying to disable the stack protector for the
-function which generates the stack canary value.
-
-The whole story started with Sergei reporting a boot crash with a kernel
-built with gcc-10:
-
-  Kernel panic — not syncing: stack-protector: Kernel stack is corrupted in: start_secondary
-  CPU: 1 PID: 0 Comm: swapper/1 Not tainted 5.6.0-rc5—00235—gfffb08b37df9 #139
-  Hardware name: Gigabyte Technology Co., Ltd. To be filled by O.E.M./H77M—D3H, BIOS F12 11/14/2013
-  Call Trace:
-    dump_stack
-    panic
-    ? start_secondary
-    __stack_chk_fail
-    start_secondary
-    secondary_startup_64
-  -—-[ end Kernel panic — not syncing: stack—protector: Kernel stack is corrupted in: start_secondary
-
-This happens because gcc-10 tail-call optimizes the last function call
-in start_secondary() - cpu_startup_entry() - and thus emits a stack
-canary check which fails because the canary value changes after the
-boot_init_stack_canary() call.
-
-To fix that, the initial attempt was to mark the one function which
-generates the stack canary with:
-
-  __attribute__((optimize("-fno-stack-protector"))) ... start_secondary(void *unused)
-
-however, using the optimize attribute doesn't work cumulatively
-as the attribute does not add to but rather replaces previously
-supplied optimization options - roughly all -fxxx options.
-
-The key one among them being -fno-omit-frame-pointer and thus leading to
-not present frame pointer - frame pointer which the kernel needs.
-
-The next attempt to prevent compilers from tail-call optimizing
-the last function call cpu_startup_entry(), shy of carving out
-start_secondary() into a separate compilation unit and building it with
--fno-stack-protector, is this one.
-
-The current solution is short and sweet, and reportedly, is supported by
-both compilers so let's see how far we'll get this time.
-
-Reported-by: Sergei Trofimovich <slyfox@gentoo.org>
-Signed-off-by: Borislav Petkov <bp@suse.de>
-Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
-Reviewed-by: Kees Cook <keescook@chromium.org>
-Link: https://lkml.kernel.org/r/20200314164451.346497-1-slyfox@gentoo.org
----
- arch/x86/include/asm/stackprotector.h | 7 ++++++-
- arch/x86/kernel/smpboot.c             | 8 ++++++++
- arch/x86/xen/smp_pv.c                 | 1 +
- include/linux/compiler.h              | 6 ++++++
- 4 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
-index 91e29b6a86a5..9804a7957f4e 100644
---- a/arch/x86/include/asm/stackprotector.h
-+++ b/arch/x86/include/asm/stackprotector.h
-@@ -55,8 +55,13 @@
- /*
-  * Initialize the stackprotector canary value.
-  *
-- * NOTE: this must only be called from functions that never return,
-+ * NOTE: this must only be called from functions that never return
-  * and it must always be inlined.
-+ *
-+ * In addition, it should be called from a compilation unit for which
-+ * stack protector is disabled. Alternatively, the caller should not end
-+ * with a function call which gets tail-call optimized as that would
-+ * lead to checking a modified canary value.
-  */
- static __always_inline void boot_init_stack_canary(void)
- {
-diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
-index 69881b2d446c..9674321ce3a3 100644
---- a/arch/x86/kernel/smpboot.c
-+++ b/arch/x86/kernel/smpboot.c
-@@ -262,6 +262,14 @@ static void notrace start_secondary(void *unused)
- 
- 	wmb();
- 	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
-+
-+	/*
-+	 * Prevent tail call to cpu_startup_entry() because the stack protector
-+	 * guard has been changed a couple of function calls up, in
-+	 * boot_init_stack_canary() and must not be checked before tail calling
-+	 * another function.
-+	 */
-+	prevent_tail_call_optimization();
- }
- 
- /**
-diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c
-index 802ee5bba66c..0cebe5db691d 100644
---- a/arch/x86/xen/smp_pv.c
-+++ b/arch/x86/xen/smp_pv.c
-@@ -92,6 +92,7 @@ asmlinkage __visible void cpu_bringup_and_idle(void)
- 	cpu_bringup();
- 	boot_init_stack_canary();
- 	cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);
-+	prevent_tail_call_optimization();
- }
- 
- void xen_smp_intr_free_pv(unsigned int cpu)
-diff --git a/include/linux/compiler.h b/include/linux/compiler.h
-index 034b0a644efc..732754d96039 100644
---- a/include/linux/compiler.h
-+++ b/include/linux/compiler.h
-@@ -356,4 +356,10 @@ static inline void *offset_to_ptr(const int *off)
- /* &a[0] degrades to a pointer: a different type from an array */
- #define __must_be_array(a)	BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
- 
-+/*
-+ * This is needed in functions which generate the stack canary, see
-+ * arch/x86/kernel/smpboot.c::start_secondary() for an example.
-+ */
-+#define prevent_tail_call_optimization()	asm("")
-+
- #endif /* __LINUX_COMPILER_H */
--- 
-2.26.2
-
diff --git a/PKGBUILD b/PKGBUILD
index ccbb51944783..6d52929e6c3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: David Runge <dvzrv@archlinux.org>
 
 pkgbase=linux-rt
-_pkgver=5.6.10
-_rtpatchver=5
+_pkgver=5.6.14
+_rtpatchver=6
 pkgver="${_pkgver}.${_rtpatchver}"
-pkgrel=2
+pkgrel=1
 pkgdesc='Linux RT'
 arch=('x86_64')
 url="https://wiki.linuxfoundation.org/realtime/start"
@@ -22,11 +22,8 @@ source=(
   config
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   sphinx-workaround.patch
-  0001-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch
   0002-gcc-plugins-drop-support-for-GCC-4.7.patch
-  0003-gcc-common.h-Update-for-GCC-10.patch
-  0004-Makefile-disallow-data-races-on-gcc-10-as-well.patch
-  0005-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch)
+  0003-gcc-common.h-Update-for-GCC-10.patch)
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
@@ -35,18 +32,15 @@ validpgpkeys=(
   '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73'  # Steven Rostedt
   'E644E2F1D45FA0B2EAA02F33109F098506FF0B14'  # Thomas Gleixner
 )
-sha256sums=('7bdc96827a9db8de79cd13d74a1c5fe8915674f793e592387f2903cb225801b9'
+sha256sums=('33763f3541711e39fa743da45ff9512d54ade61406173f3d267ba4484cec7ea3'
             'SKIP'
-            'f712f8225069bc2cc6cf5080724483dff871fb5bdf41bdeeeb00a0087a28c116'
+            'fd1c48c3a0b0a744b11d0c1a39b1a0261f20ab91cc9e0a716d5cdfe44a4c3e6e'
             'SKIP'
-            'd7203e4d164a7040de524227a072ae3d5155cffb905762af9e12ae224b131245'
+            '45759066cd533e989e99ec51c3b14734e4c7020795edd9e371e28599a872d1d3'
             'ad3275a696348703c57f05b9626e7fbab7243299da32e52044ff51666f810e85'
             '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
-            '2776ca0b3ca95347518b146aab54fb564d138dfc7310c48141bed6cea98a8a07'
             '96ff333774c0a8686c41610364f13e5244946c86e3e12e841e1bbd0d9f33c788'
-            '523280e5d125a19af537ee88a531b56a049f3daeb713da473d244eb423f6125f'
-            '7462399703b4017aae39178991775beedd20269100e907c5f0cea3f78e5d825b'
-            '585a1320b0c7e42a4ed152bb671288ce992271a4a52a6fffcae5ecaf805ecbce')
+            '523280e5d125a19af537ee88a531b56a049f3daeb713da473d244eb423f6125f')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index 381a044dc17b..19b354b65de8 100644
--- a/config
+++ b/config
@@ -1,18 +1,17 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.10 Kernel Configuration
+# Linux/x86 5.6.14 Kernel Configuration
 #
 
 #
-# Compiler: gcc (Arch Linux 9.3.0-1) 9.3.0
+# Compiler: gcc (GCC) 10.1.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=90300
+CONFIG_GCC_VERSION=100100
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -853,7 +852,6 @@ CONFIG_ARCH_HAS_MEM_ENCRYPT=y
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
-CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set