summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO36
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch4
-rw-r--r--0002-gcc-plugins-drop-support-for-GCC-4.7.patch (renamed from 0003-gcc-plugins-drop-support-for-GCC-4.7.patch)4
-rw-r--r--0002-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch79
-rw-r--r--0003-gcc-common.h-Update-for-GCC-10.patch (renamed from 0004-gcc-common.h-Update-for-GCC-10.patch)4
-rw-r--r--0004-Makefile-disallow-data-races-on-gcc-10-as-well.patch (renamed from 0005-Makefile-disallow-data-races-on-gcc-10-as-well.patch)6
-rw-r--r--0005-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch (renamed from 0006-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch)4
-rw-r--r--PKGBUILD26
8 files changed, 40 insertions, 123 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b04af244e794..b56e2a6c9437 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-ck
- pkgver = 5.6.12
- pkgrel = 2
+ pkgver = 5.6.13
+ pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
license = GPL2
@@ -8,32 +8,30 @@ pkgbase = linux-ck
makedepends = kmod
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.12.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.12.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.13.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.13.tar.sign
source = config
source = 0000-sphinx-workaround.patch
source = enable_additional_cpu_optimizations-20191217.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20191217.tar.gz
source = http://ck.kolivas.org/patches/5.0/5.6/5.6-ck1/patch-5.6-ck1.xz
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- source = 0002-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch
- source = 0003-gcc-plugins-drop-support-for-GCC-4.7.patch
- source = 0004-gcc-common.h-Update-for-GCC-10.patch
- source = 0005-Makefile-disallow-data-races-on-gcc-10-as-well.patch
- source = 0006-x86-Fix-early-boot-crash-on-gcc-10-next-try.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
- sha256sums = daea336aace63a9116475b3f698e259073c00bea57a2a545300dba1c45562221
+ sha256sums = f125d79c8f6974213638787adcad6b575bbd35a05851802fd83f622ec18ff987
sha256sums = SKIP
sha256sums = f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21
sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
sha256sums = 7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5
sha256sums = a6fe596e75333a5ac8ed4a4d63e4408ef38ebef6303889223e236af3ce576877
- sha256sums = 46c253f0d12b73a0cff3c40b82b656b7c7c423dac9abb61a391042d873eb9c47
- sha256sums = f6eb9166b582cba0b8e4bf859b50cabb5ea9d724e9d1b25937fbc30e26a6a988
- sha256sums = dc1418b2c3f793da567a4bd5e3ad5f161bd415ae20fc67fd68d1edc2f3afce71
- sha256sums = 04e773b9d80a17221ffdf7f1bd6ac0b9ec7d2963d0578bbc2edab1a553aac0d0
- sha256sums = 2165ef75486f37b84155dbd8dfd63bdf9dd2bc51517428dbfe42b93ad9e46c50
- sha256sums = 4f75e2f83e7bd2e0e65c0ce5b4feff9b4d204fa9531c92212b92809c46e4f3c3
+ sha256sums = d1dbc1c83d58436358af56b1534d13fa1dc405a95905f71aff4edbe56747e3da
+ sha256sums = 77ab60c3a4e122158b69ca87a15baddbae3912bf2b3f467deb1b82a0989be569
+ sha256sums = d6638a7da040c545079541e0a062528d7daabf5683f1fa7e67d30f27893144d0
+ sha256sums = b58adb407e1b0be6bd3ca035da07ca223a952fadc5e16a90f01e010ce6bec8ca
+ sha256sums = 081476f699d41b4994c8ee67c12330e6271ed5c04d16b045a43a64dbf5ba752d
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
@@ -42,11 +40,11 @@ pkgname = linux-ck
depends = initramfs
optdepends = crda: to set the correct wireless channels of your country
optdepends = linux-firmware: firmware images needed for some devices
- provides = linux-ck=5.6.12
+ provides = linux-ck=5.6.13
pkgname = linux-ck-headers
pkgdesc = Headers and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=5.6.12
- provides = linux-headers=5.6.12
+ provides = linux-ck-headers=5.6.13
+ provides = linux-headers=5.6.13
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index dbd5ac181817..9d894224f5e0 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From f1107f172c74a9a8550a9e566c525ef28dbc139f Mon Sep 17 00:00:00 2001
+From 2efb3d95a5e8a14c097d570a61751f36d0be5215 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 1/7] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/6] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
diff --git a/0003-gcc-plugins-drop-support-for-GCC-4.7.patch b/0002-gcc-plugins-drop-support-for-GCC-4.7.patch
index bbc05d14d07f..5f4cfb59de20 100644
--- a/0003-gcc-plugins-drop-support-for-GCC-4.7.patch
+++ b/0002-gcc-plugins-drop-support-for-GCC-4.7.patch
@@ -1,7 +1,7 @@
-From 79a6b30bb7e8e4ef1baffd8adca2ae594781b4ce Mon Sep 17 00:00:00 2001
+From 5dd873b339bffa037dafd0188375fc13564bbe93 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sun, 29 Mar 2020 20:08:32 +0900
-Subject: [PATCH 3/7] gcc-plugins: drop support for GCC <= 4.7
+Subject: [PATCH 2/6] gcc-plugins: drop support for GCC <= 4.7
Nobody was opposed to raising minimum GCC version to 4.8 [1]
So, we will drop GCC <= 4.7 support sooner or later.
diff --git a/0002-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch b/0002-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch
deleted file mode 100644
index ff2990023ef2..000000000000
--- a/0002-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From bb4a15eb06341e6cadc99de418c81375b560af85 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Mon, 4 May 2020 12:19:45 -0400
-Subject: [PATCH 2/7] 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-gcc-common.h-Update-for-GCC-10.patch b/0003-gcc-common.h-Update-for-GCC-10.patch
index 2ce306726d97..be8afe71d521 100644
--- a/0004-gcc-common.h-Update-for-GCC-10.patch
+++ b/0003-gcc-common.h-Update-for-GCC-10.patch
@@ -1,8 +1,8 @@
-From e5d7c52e5b460940175b26075cf86df5fb6b06a2 Mon Sep 17 00:00:00 2001
+From fbe2e575df0f88daa156069cf66c3db0ebc64e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
<frederic.pierret@qubes-os.org>
Date: Tue, 7 Apr 2020 13:32:59 +0200
-Subject: [PATCH 4/7] gcc-common.h: Update for GCC 10
+Subject: [PATCH 3/6] gcc-common.h: Update for GCC 10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/0005-Makefile-disallow-data-races-on-gcc-10-as-well.patch b/0004-Makefile-disallow-data-races-on-gcc-10-as-well.patch
index ab9fb3dd255a..6b5c0f28a397 100644
--- a/0005-Makefile-disallow-data-races-on-gcc-10-as-well.patch
+++ b/0004-Makefile-disallow-data-races-on-gcc-10-as-well.patch
@@ -1,7 +1,7 @@
-From 9d03a04a2d7097afd3c177e8125e7b65e2d26102 Mon Sep 17 00:00:00 2001
+From e33336e058bdd4e109c9131bb13584ccb1b5e15d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Tue, 17 Mar 2020 00:07:18 +0000
-Subject: [PATCH 5/7] Makefile: disallow data races on gcc-10 as well
+Subject: [PATCH 4/6] 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.
@@ -16,7 +16,7 @@ Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
-index 97e4c4d9ac95..5ee8b2d86bab 100644
+index d252219666fd..abca59ecbe2b 100644
--- a/Makefile
+++ b/Makefile
@@ -714,6 +714,7 @@ endif
diff --git a/0006-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch b/0005-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch
index 69101597ca48..ee7b469fb8da 100644
--- a/0006-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch
+++ b/0005-x86-Fix-early-boot-crash-on-gcc-10-next-try.patch
@@ -1,7 +1,7 @@
-From 0cf3349234df93705eb0b24070e91c8132de42b7 Mon Sep 17 00:00:00 2001
+From 53e90d763b7fe8bec6a0c86b6813131cd8e25026 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@suse.de>
Date: Wed, 22 Apr 2020 18:11:30 +0200
-Subject: [PATCH 6/7] x86: Fix early boot crash on gcc-10, next try
+Subject: [PATCH 5/6] 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
diff --git a/PKGBUILD b/PKGBUILD
index e89b0c38bd40..aeb514819539 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -61,8 +61,8 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=5.6.12
-pkgrel=2
+pkgver=5.6.13
+pkgrel=1
_ckpatchversion=1
arch=(x86_64)
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -80,28 +80,26 @@ source=(
"enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz"
"http://ck.kolivas.org/patches/5.0/5.6/5.6-ck${_ckpatchversion}/$_ckpatch.xz"
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- 0002-kvm-ioapic-Restrict-lazy-EOI-update-to-edge-triggere.patch
- 0003-gcc-plugins-drop-support-for-GCC-4.7.patch
- 0004-gcc-common.h-Update-for-GCC-10.patch
- 0005-Makefile-disallow-data-races-on-gcc-10-as-well.patch
- 0006-x86-Fix-early-boot-crash-on-gcc-10-next-try.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
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('daea336aace63a9116475b3f698e259073c00bea57a2a545300dba1c45562221'
+sha256sums=('f125d79c8f6974213638787adcad6b575bbd35a05851802fd83f622ec18ff987'
'SKIP'
'f392c9ecbb5177ea2573aaf22935322940ea2be0366f3fb9c9f861431f4aed21'
'8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
'7a4a209de815f4bae49c7c577c0584c77257e3953ac4324d2aa425859ba657f5'
'a6fe596e75333a5ac8ed4a4d63e4408ef38ebef6303889223e236af3ce576877'
- '46c253f0d12b73a0cff3c40b82b656b7c7c423dac9abb61a391042d873eb9c47'
- 'f6eb9166b582cba0b8e4bf859b50cabb5ea9d724e9d1b25937fbc30e26a6a988'
- 'dc1418b2c3f793da567a4bd5e3ad5f161bd415ae20fc67fd68d1edc2f3afce71'
- '04e773b9d80a17221ffdf7f1bd6ac0b9ec7d2963d0578bbc2edab1a553aac0d0'
- '2165ef75486f37b84155dbd8dfd63bdf9dd2bc51517428dbfe42b93ad9e46c50'
- '4f75e2f83e7bd2e0e65c0ce5b4feff9b4d204fa9531c92212b92809c46e4f3c3')
+ 'd1dbc1c83d58436358af56b1534d13fa1dc405a95905f71aff4edbe56747e3da'
+ '77ab60c3a4e122158b69ca87a15baddbae3912bf2b3f467deb1b82a0989be569'
+ 'd6638a7da040c545079541e0a062528d7daabf5683f1fa7e67d30f27893144d0'
+ 'b58adb407e1b0be6bd3ca035da07ca223a952fadc5e16a90f01e010ce6bec8ca'
+ '081476f699d41b4994c8ee67c12330e6271ed5c04d16b045a43a64dbf5ba752d')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase