From 30a7a0723f2a9986abbbe1f5ca426139c6b6144d Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Thu, 4 Jan 2018 08:28:38 -0800 Subject: Reenable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 32c53fed7..6538a9c74 100644 --- a/kernel.spec +++ b/kernel.spec @@ -125,7 +125,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -2207,6 +2207,9 @@ fi # # %changelog +* Thu Jan 04 2018 Laura Abbott +- Reenable debugging options. + * Thu Jan 04 2018 Hans de Goede - Add a patch to filter false positive kbd backlight change events (#1514969) - Add a patch to disable runtime-pm for QCA bluetooth devices (#1514836) -- cgit From e8e4bc8ffedb760565090fda438d9a78a7bd65d9 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Thu, 4 Jan 2018 08:30:40 -0800 Subject: Linux v4.15-rc6-18-g00a5ae218d57 --- gitrev | 2 +- kernel.spec | 10 ++--- kpti-fix.patch | 129 --------------------------------------------------------- sources | 1 + 4 files changed, 7 insertions(+), 135 deletions(-) delete mode 100644 kpti-fix.patch diff --git a/gitrev b/gitrev index 78603d10a..fab63dbea 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -ead68f216110170ec729e2c4dec0aad6d38259d7 +00a5ae218d57741088068799b810416ac249a9ce diff --git a/kernel.spec b/kernel.spec index 6538a9c74..83bc0112f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 3 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -647,9 +647,6 @@ Patch636: 0001-ahci-Annotate-PCI-ids-for-mobile-Intel-chipsets-as-s.patch Patch637: 0002-ahci-Add-PCI-ids-for-Intel-Bay-Trail-Cherry-Trail-an.patch Patch638: 0003-ahci-Allow-setting-a-default-LPM-policy-for-mobile-c.patch -# KPTI Fixups -Patch639: kpti-fix.patch - # rhbz1514969, submitted upstream Patch640: 0001-platform-x86-dell-laptop-Filter-out-spurious-keyboar.patch @@ -2207,6 +2204,9 @@ fi # # %changelog +* Thu Jan 04 2018 Laura Abbott - 4.15.0-0.rc6.git1.1 +- Linux v4.15-rc6-18-g00a5ae218d57 + * Thu Jan 04 2018 Laura Abbott - Reenable debugging options. diff --git a/kpti-fix.patch b/kpti-fix.patch deleted file mode 100644 index e01d3bd4b..000000000 --- a/kpti-fix.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 52994c256df36fda9a715697431cba9daecb6b11 Mon Sep 17 00:00:00 2001 -From: Thomas Gleixner -Date: Wed, 3 Jan 2018 15:57:59 +0100 -Subject: x86/pti: Make sure the user/kernel PTEs match - -Meelis reported that his K8 Athlon64 emits MCE warnings when PTI is -enabled: - -[Hardware Error]: Error Addr: 0x0000ffff81e000e0 -[Hardware Error]: MC1 Error: L1 TLB multimatch. -[Hardware Error]: cache level: L1, tx: INSN - -The address is in the entry area, which is mapped into kernel _AND_ user -space. That's special because we switch CR3 while we are executing -there. - -User mapping: -0xffffffff81e00000-0xffffffff82000000 2M ro PSE GLB x pmd - -Kernel mapping: -0xffffffff81000000-0xffffffff82000000 16M ro PSE x pmd - -So the K8 is complaining that the TLB entries differ. They differ in the -GLB bit. - -Drop the GLB bit when installing the user shared mapping. - -Fixes: 6dc72c3cbca0 ("x86/mm/pti: Share entry text PMD") -Reported-by: Meelis Roos -Signed-off-by: Thomas Gleixner -Tested-by: Meelis Roos -Cc: Borislav Petkov -Cc: Tom Lendacky -Cc: stable@vger.kernel.org -Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801031407180.1957@nanos ---- - arch/x86/mm/pti.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c -index bce8aea..2da28ba 100644 ---- a/arch/x86/mm/pti.c -+++ b/arch/x86/mm/pti.c -@@ -367,7 +367,8 @@ static void __init pti_setup_espfix64(void) - static void __init pti_clone_entry_text(void) - { - pti_clone_pmds((unsigned long) __entry_text_start, -- (unsigned long) __irqentry_text_end, _PAGE_RW); -+ (unsigned long) __irqentry_text_end, -+ _PAGE_RW | _PAGE_GLOBAL); - } - - /* --- -cgit v1.1 - -From fea692ec9308084475c0c93bf74bcb2a35f3d417 Mon Sep 17 00:00:00 2001 -From: Thomas Gleixner -Date: Wed, 3 Jan 2018 19:52:04 +0100 -Subject: [PATCH] CONFIG_PAGE_TABLE_ISOLATION=y on x86_64 causes gcc to - segfault when building x86_32 binaries - -On Wed, 3 Jan 2018, Thomas Gleixner wrote: - -> On Wed, 3 Jan 2018, Lars Wendler wrote: -> > Am Wed, 3 Jan 2018 13:05:38 +0100 (CET) -> > schrieb Thomas Gleixner : -> > > Also can you please try Linus v4.15-rc6 with PTI enabled so we can see -> > > whether that's a backport issue or a general one? -> > -> > Same problem with 4.15-rc6. So I suppose that means it's a general -> > issue. -> -> Just a shot in the dark as I just decoded another issue on a AMD CPU. Can -> you please try the patch below? - -Ok. Found the real issue. This is a problem on AMD boxen. - -Fix below. - -Can Xen folks please have a look at that as well? - -Thanks, - - tglx - -8<------------------- - -arch/x86/entry/entry_64_compat.S | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) ---- - arch/x86/entry/entry_64_compat.S | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S -index 40f17009ec20..4c4b9545b848 100644 ---- a/arch/x86/entry/entry_64_compat.S -+++ b/arch/x86/entry/entry_64_compat.S -@@ -190,8 +190,13 @@ ENTRY(entry_SYSCALL_compat) - /* Interrupts are off on entry. */ - swapgs - -- /* Stash user ESP and switch to the kernel stack. */ -+ /* Stash user ESP */ - movl %esp, %r8d -+ -+ /* Use %rsp as scratch reg. User ESP is stashed in r8 */ -+ SWITCH_TO_KERNEL_CR3 scratch_reg=%rsp -+ -+ /* Switch to the kernel stack */ - movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp - - /* Construct struct pt_regs on stack */ -@@ -219,12 +224,6 @@ GLOBAL(entry_SYSCALL_compat_after_hwframe) - pushq $0 /* pt_regs->r14 = 0 */ - pushq $0 /* pt_regs->r15 = 0 */ - -- /* -- * We just saved %rdi so it is safe to clobber. It is not -- * preserved during the C calls inside TRACE_IRQS_OFF anyway. -- */ -- SWITCH_TO_KERNEL_CR3 scratch_reg=%rdi -- - /* - * User mode is traced as though IRQs are on, and SYSENTER - * turned them off. --- -2.14.3 - diff --git a/sources b/sources index 08f022dfd..e952cadef 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8 SHA512 (patch-4.15-rc6.xz) = 45f97ae4216403ee3b3a7e9575610ff422b39650494e82cb194c996511911f2d5a4fdc42456841a083a0d450821648b611d7fd3538cbc3d5c1b2bcbd9486f884 +SHA512 (patch-4.15-rc6-git1.xz) = 519c0382d3b0e977fe899888fea1de18be5fddb86e738a6f4d29fbe0ff50e1fad5ed7f688607245e75bfbb3f25be27d9fc16b0bf661871059d2c6767f897d27b -- cgit From 5e9dae1c74e11da25d643e8ac23c15c37c96176b Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Thu, 4 Jan 2018 15:56:35 -0800 Subject: Oh whoops this was untracked --- baseconfig/x86/x86_64/CONFIG_PAGE_TABLE_ISOLATION | 1 + 1 file changed, 1 insertion(+) create mode 100644 baseconfig/x86/x86_64/CONFIG_PAGE_TABLE_ISOLATION diff --git a/baseconfig/x86/x86_64/CONFIG_PAGE_TABLE_ISOLATION b/baseconfig/x86/x86_64/CONFIG_PAGE_TABLE_ISOLATION new file mode 100644 index 000000000..6881a7757 --- /dev/null +++ b/baseconfig/x86/x86_64/CONFIG_PAGE_TABLE_ISOLATION @@ -0,0 +1 @@ +CONFIG_PAGE_TABLE_ISOLATION=y -- cgit