diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | 0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch | 80 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | config | 25 |
4 files changed, 21 insertions, 117 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Sun Feb 18 17:16:53 UTC 2018 +# Thu Feb 22 22:08:49 UTC 2018 pkgbase = linux-ck - pkgver = 4.15.4 + pkgver = 4.15.5 pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 @@ -13,8 +13,8 @@ pkgbase = linux-ck options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.4.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.4.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.5.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.5.sign source = config source = 60-linux.hook source = 90-linux.hook @@ -23,12 +23,11 @@ pkgbase = linux-ck source = http://ck.kolivas.org/patches/4.0/4.15/4.15-ck1/patch-4.15-ck1.xz source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - source = 0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 sha256sums = SKIP - sha256sums = 5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8 + sha256sums = b5dc7021bd0c08e4a58b59035f9b757ce6909b46067950ac56d2ad68c1b69dd1 sha256sums = SKIP - sha256sums = bb9520c2d8fe2a2bd3a434d62c3c369a0192eeff6958ca816898ca8a23af610d + sha256sums = ea0dbe0c3cf14be9fafeddfa809cd80a50cc59437663f969637013c3859c05a8 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 @@ -36,7 +35,6 @@ pkgbase = linux-ck sha256sums = af51d2433340fdd88a73fdfdfa88b304b3933a937c7ef16a22ba73950360de71 sha256sums = c7951a3dfa6dcfd6f7c56d8d5c7c89cceb0e612ce3e6134d3fe23d1202b69863 sha256sums = b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676 - sha256sums = 54380eafa1dfb42f7860a5eee9f521c14aa5fd2c9f5bfaa6e0537d75800225b7 pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.170 @@ -46,12 +44,12 @@ pkgname = linux-ck depends = kmod depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country - provides = linux-ck=4.15.4 + provides = linux-ck=4.15.5 backup = etc/mkinitcpio.d/linux-ck.preset pkgname = linux-ck-headers pkgdesc = Header files and scripts for building modules for Linux-ck kernel depends = linux-ck - provides = linux-ck-headers=4.15.4 - provides = linux-headers=4.15.4 + provides = linux-ck-headers=4.15.5 + provides = linux-headers=4.15.5 diff --git a/0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch b/0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch deleted file mode 100644 index 4b490730e3c3..000000000000 --- a/0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch +++ /dev/null @@ -1,80 +0,0 @@ -From cd0c80aa02dbfe649c743fa98fcc0d9f427e0827 Mon Sep 17 00:00:00 2001 -Message-Id: <cd0c80aa02dbfe649c743fa98fcc0d9f427e0827.1518828081.git.jan.steffens@gmail.com> -In-Reply-To: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> -References: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> -From: Juergen Gross <jgross@suse.com> -Date: Thu, 1 Feb 2018 13:40:19 +0100 -Subject: [PATCH 3/3] x86/xen: init %gs very early to avoid page faults with - stack protector - -When running as Xen pv guest %gs is initialized some time after -C code is started. Depending on stack protector usage this might be -too late, resulting in page faults. - -So setup %gs and MSR_GS_BASE in assembly code already. - -Cc: stable@vger.kernel.org -Signed-off-by: Juergen Gross <jgross@suse.com> -Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> -Tested-by: Chris Patterson <cjp256@gmail.com> -Signed-off-by: Juergen Gross <jgross@suse.com> ---- - arch/x86/xen/xen-head.S | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S -index 497cc55a0c16..96f26e026783 100644 ---- a/arch/x86/xen/xen-head.S -+++ b/arch/x86/xen/xen-head.S -@@ -9,32 +9,48 @@ - - #include <asm/boot.h> - #include <asm/asm.h> -+#include <asm/msr.h> - #include <asm/page_types.h> -+#include <asm/percpu.h> - #include <asm/unwind_hints.h> - - #include <xen/interface/elfnote.h> - #include <xen/interface/features.h> - #include <xen/interface/xen.h> - #include <xen/interface/xen-mca.h> - #include <asm/xen/interface.h> - - #ifdef CONFIG_XEN_PV - __INIT - ENTRY(startup_xen) - UNWIND_HINT_EMPTY - cld - - /* Clear .bss */ - xor %eax,%eax - mov $__bss_start, %_ASM_DI - mov $__bss_stop, %_ASM_CX - sub %_ASM_DI, %_ASM_CX - shr $__ASM_SEL(2, 3), %_ASM_CX - rep __ASM_SIZE(stos) - - mov %_ASM_SI, xen_start_info - mov $init_thread_union+THREAD_SIZE, %_ASM_SP - -+#ifdef CONFIG_X86_64 -+ /* Set up %gs. -+ * -+ * The base of %gs always points to the bottom of the irqstack -+ * union. If the stack protector canary is enabled, it is -+ * located at %gs:40. Note that, on SMP, the boot cpu uses -+ * init data section till per cpu areas are set up. -+ */ -+ movl $MSR_GS_BASE,%ecx -+ movq $INIT_PER_CPU_VAR(irq_stack_union),%rax -+ cdq -+ wrmsr -+#endif -+ - jmp xen_start_kernel - END(startup_xen) - __FINIT --- -2.16.1 - @@ -62,7 +62,7 @@ _localmodcfg= pkgbase=linux-ck _srcname=linux-4.15 -pkgver=4.15.4 +pkgver=4.15.5 pkgrel=1 _ckpatchversion=1 arch=('x86_64') @@ -84,7 +84,6 @@ source=( "http://ck.kolivas.org/patches/4.0/4.15/4.15-ck${_ckpatchversion}/${_ckpatchname}.xz" 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - 0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -92,17 +91,16 @@ validpgpkeys=( ) sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP' - '5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8' + 'b5dc7021bd0c08e4a58b59035f9b757ce6909b46067950ac56d2ad68c1b69dd1' 'SKIP' - 'bb9520c2d8fe2a2bd3a434d62c3c369a0192eeff6958ca816898ca8a23af610d' + 'ea0dbe0c3cf14be9fafeddfa809cd80a50cc59437663f969637013c3859c05a8' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8' 'af51d2433340fdd88a73fdfdfa88b304b3933a937c7ef16a22ba73950360de71' 'c7951a3dfa6dcfd6f7c56d8d5c7c89cceb0e612ce3e6134d3fe23d1202b69863' - 'b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676' - '54380eafa1dfb42f7860a5eee9f521c14aa5fd2c9f5bfaa6e0537d75800225b7') + 'b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676') _kernelname=${pkgbase#linux} : ${_kernelname:=-ARCH} @@ -122,9 +120,6 @@ prepare() { # https://bugs.archlinux.org/task/56711 patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - # https://bugs.archlinux.org/task/57500 - patch -Np1 -i ../0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch - # fix naming schema in EXTRAVERSION of ck patch set sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../${_ckpatchname}" @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.15.4-1 Kernel Configuration +# Linux/x86 4.15.5-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -5878,7 +5878,7 @@ CONFIG_FB=y CONFIG_FIRMWARE_EDID=y CONFIG_FB_CMDLINE=y CONFIG_FB_NOTIFY=y -CONFIG_FB_DDC=m +# CONFIG_FB_DDC is not set CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -5906,30 +5906,21 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -CONFIG_FB_VGA16=m -CONFIG_FB_UVESA=m +# CONFIG_FB_VGA16 is not set +# CONFIG_FB_UVESA is not set CONFIG_FB_VESA=y CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_OPENCORES is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set # CONFIG_FB_I740 is not set # CONFIG_FB_LE80578 is not set # CONFIG_FB_INTEL is not set # CONFIG_FB_MATROX is not set -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set +# CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set # CONFIG_FB_ATY is not set # CONFIG_FB_S3 is not set @@ -6003,7 +5994,7 @@ CONFIG_BACKLIGHT_GPIO=m CONFIG_BACKLIGHT_LV5207LP=m CONFIG_BACKLIGHT_BD6107=m CONFIG_BACKLIGHT_ARCXCNN=m -CONFIG_VGASTATE=m +# CONFIG_VGASTATE is not set CONFIG_VIDEOMODE_HELPERS=y CONFIG_HDMI=y |