Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2018-12-03 07:27:25 +0100
committerMichal Kubecek <mkubecek@suse.cz>2018-12-03 08:08:40 +0100
commit2ccaf3021163759d43189d939727ce31d9bfbf96 (patch)
treedaad3837ef932edfc5f9c3cb5d5e4fe485452288
parent1ac69b78bf42658b60edda5d3785091e51cb1337 (diff)
Update to 4.20-rc5
- Config changes: - General: - PSI_DEFAULT_DISABLED=y - Sound: - SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y - ARM: - ARM64_ERRATUM_1286807=y
-rw-r--r--config/arm64/default7
-rw-r--r--config/i386/pae11
-rw-r--r--config/ppc64/default5
-rw-r--r--config/ppc64le/default5
-rw-r--r--config/s390x/default5
-rw-r--r--config/s390x/zfcpdump4
-rw-r--r--config/x86_64/default11
-rw-r--r--patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch59
-rw-r--r--patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch6
-rw-r--r--rpm/config.sh2
10 files changed, 70 insertions, 45 deletions
diff --git a/config/arm64/default b/config/arm64/default
index c52b6e94c4..96a633e46e 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.20.0-rc4 Kernel Configuration
+# Linux/arm64 4.20.0-rc5 Kernel Configuration
#
#
-# Compiler: aarch64-suse-linux-gcc (SUSE Linux) 8.2.1 20180831 [gcc-8-branch revision 264010]
+# Compiler: aarch64-suse-linux-gcc (SUSE Linux) 8.2.1 20181108 [gcc-8-branch revision 265914]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=80201
@@ -90,6 +90,7 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_CPU_ISOLATION=y
#
@@ -395,12 +396,14 @@ CONFIG_ARM64_ERRATUM_845719=y
CONFIG_ARM64_ERRATUM_843419=y
CONFIG_ARM64_ERRATUM_1024718=y
CONFIG_ARM64_ERRATUM_1188873=y
+CONFIG_ARM64_ERRATUM_1286807=y
CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23144=y
CONFIG_CAVIUM_ERRATUM_23154=y
CONFIG_CAVIUM_ERRATUM_27456=y
CONFIG_CAVIUM_ERRATUM_30115=y
CONFIG_QCOM_FALKOR_ERRATUM_1003=y
+CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
CONFIG_QCOM_FALKOR_ERRATUM_1009=y
CONFIG_QCOM_QDF2400_ERRATUM_0065=y
CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
diff --git a/config/i386/pae b/config/i386/pae
index d7eb14b8d5..fca7b43f98 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.20.0-rc4 Kernel Configuration
+# Linux/i386 4.20.0-rc5 Kernel Configuration
#
#
-# Compiler: gcc (SUSE Linux) 8.2.1 20180831 [gcc-8-branch revision 264010]
+# Compiler: gcc (SUSE Linux) 8.2.1 20181108 [gcc-8-branch revision 265914]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=80201
@@ -103,6 +103,7 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_CPU_ISOLATION=y
#
@@ -6094,8 +6095,10 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
CONFIG_SND_SOC_INTEL_MACH=y
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
@@ -6119,8 +6122,8 @@ CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
#
# STMicroelectronics STM32 SOC audio support
diff --git a/config/ppc64/default b/config/ppc64/default
index 54e57d5c2e..e4f9061885 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.0-rc4 Kernel Configuration
+# Linux/powerpc 4.20.0-rc5 Kernel Configuration
#
#
-# Compiler: powerpc64-suse-linux-gcc (SUSE Linux) 8.2.1 20180831 [gcc-8-branch revision 264010]
+# Compiler: powerpc64-suse-linux-gcc (SUSE Linux) 8.2.1 20181108 [gcc-8-branch revision 265914]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=80201
@@ -87,6 +87,7 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_CPU_ISOLATION=y
#
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 875b29c374..e18f90667b 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.20.0-rc4 Kernel Configuration
+# Linux/powerpc 4.20.0-rc5 Kernel Configuration
#
#
-# Compiler: powerpc64le-suse-linux-gcc (SUSE Linux) 8.2.1 20180831 [gcc-8-branch revision 264010]
+# Compiler: powerpc64le-suse-linux-gcc (SUSE Linux) 8.2.1 20181108 [gcc-8-branch revision 265914]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=80201
@@ -86,6 +86,7 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_CPU_ISOLATION=y
#
diff --git a/config/s390x/default b/config/s390x/default
index 6013f7a227..1d8b90e4f9 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.20.0-rc3 Kernel Configuration
+# Linux/s390 4.20.0-rc5 Kernel Configuration
#
#
-# Compiler: s390x-suse-linux-gcc (SUSE Linux) 8.2.1 20180831 [gcc-8-branch revision 264010]
+# Compiler: s390x-suse-linux-gcc (SUSE Linux) 8.2.1 20181108 [gcc-8-branch revision 265914]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=80201
@@ -85,6 +85,7 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_CPU_ISOLATION=y
#
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index f217f7e476..4c833c8068 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.20.0-rc2 Kernel Configuration
+# Linux/s390 4.20.0-rc5 Kernel Configuration
#
#
-# Compiler: s390x-suse-linux-gcc (SUSE Linux) 8.2.1 20180831 [gcc-8-branch revision 264010]
+# Compiler: s390x-suse-linux-gcc (SUSE Linux) 8.2.1 20181108 [gcc-8-branch revision 265914]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=80201
diff --git a/config/x86_64/default b/config/x86_64/default
index 37cb63cf72..f090232e8b 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.20.0-rc4 Kernel Configuration
+# Linux/x86_64 4.20.0-rc5 Kernel Configuration
#
#
-# Compiler: gcc (SUSE Linux) 8.2.1 20180831 [gcc-8-branch revision 264010]
+# Compiler: gcc (SUSE Linux) 8.2.1 20181108 [gcc-8-branch revision 265914]
#
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=80201
@@ -105,6 +105,7 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
CONFIG_CPU_ISOLATION=y
#
@@ -6086,8 +6087,10 @@ CONFIG_SND_SOC_INTEL_HASWELL=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
-CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
CONFIG_SND_SOC_INTEL_MACH=y
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
@@ -6111,8 +6114,8 @@ CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
#
# STMicroelectronics STM32 SOC audio support
diff --git a/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch b/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch
index 33f807b0bc..b9b2271374 100644
--- a/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch
+++ b/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch
@@ -23,21 +23,22 @@ Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
SUSE: added back SPECTRE_V2_IBRS removed by mainline commit d9f4426c7300
-("x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation")
-and is_skylake_era() removed by commit fdf82a7856b3 ("x86/speculation:
-Protect against userspace-userspace spectreRSB").
+("x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation"),
+is_skylake_era() removed by commit fdf82a7856b3 ("x86/speculation: Protect
+against userspace-userspace spectreRSB") and retp_compiler() removed by
+commit ef014aae8f1c ("x86/retpoline: Remove minimal retpoline support").
---
.../admin-guide/kernel-parameters.txt | 1 +
arch/x86/include/asm/cpufeatures.h | 1 +
arch/x86/include/asm/nospec-branch.h | 3 +-
- arch/x86/kernel/cpu/bugs.c | 34 +++++++++++++++++++
+ arch/x86/kernel/cpu/bugs.c | 39 +++++++++++++++++++
arch/x86/lib/Makefile | 2 +-
arch/x86/lib/retpoline.S | 5 +++
- 6 files changed, 43 insertions(+), 3 deletions(-)
+ 6 files changed, 48 insertions(+), 3 deletions(-)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4207,6 +4207,7 @@
+@@ -4226,6 +4226,7 @@
retpoline - replace indirect branches
retpoline,generic - google's original retpoline
retpoline,amd - AMD-specific minimal thunk
@@ -57,15 +58,15 @@ Protect against userspace-userspace spectreRSB").
#define X86_FEATURE_TPR_SHADOW ( 8*32+ 0) /* Intel TPR Shadow */
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
-@@ -223,6 +223,7 @@ enum spectre_v2_mitigation {
- SPECTRE_V2_RETPOLINE_MINIMAL_AMD,
+@@ -225,6 +225,7 @@ enum spectre_v2_mitigation {
+ SPECTRE_V2_NONE,
SPECTRE_V2_RETPOLINE_GENERIC,
SPECTRE_V2_RETPOLINE_AMD,
+ SPECTRE_V2_IBRS,
SPECTRE_V2_IBRS_ENHANCED,
};
-@@ -245,7 +246,6 @@ extern char __indirect_thunk_end[];
+@@ -255,7 +256,6 @@ extern char __indirect_thunk_end[];
*/
static inline void vmexit_fill_RSB(void)
{
@@ -73,7 +74,7 @@ Protect against userspace-userspace spectreRSB").
unsigned long loops;
asm volatile (ANNOTATE_NOSPEC_ALTERNATIVE
-@@ -255,7 +255,6 @@ static inline void vmexit_fill_RSB(void)
+@@ -265,7 +265,6 @@ static inline void vmexit_fill_RSB(void)
"910:"
: "=r" (loops), ASM_CALL_CONSTRAINT
: : "memory" );
@@ -83,32 +84,44 @@ Protect against userspace-userspace spectreRSB").
static __always_inline
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
-@@ -131,6 +131,7 @@ enum spectre_v2_mitigation_cmd {
+@@ -234,6 +234,11 @@ static inline const char *spectre_v2_module_string(void)
+ static inline const char *spectre_v2_module_string(void) { return ""; }
+ #endif
+
++static inline bool retp_compiler(void)
++{
++ return __is_defined(CONFIG_RETPOLINE);
++}
++
+ static inline bool match_option(const char *arg, int arglen, const char *opt)
+ {
+ int len = strlen(opt);
+@@ -249,6 +254,7 @@ enum spectre_v2_mitigation_cmd {
SPECTRE_V2_CMD_RETPOLINE,
SPECTRE_V2_CMD_RETPOLINE_GENERIC,
SPECTRE_V2_CMD_RETPOLINE_AMD,
+ SPECTRE_V2_CMD_IBRS,
};
- static const char *spectre_v2_strings[] = {
-@@ -139,6 +140,7 @@ static const char *spectre_v2_strings[] = {
- [SPECTRE_V2_RETPOLINE_MINIMAL_AMD] = "Vulnerable: Minimal AMD ASM retpoline",
+ enum spectre_v2_user_cmd {
+@@ -400,6 +406,7 @@ static const char * const spectre_v2_strings[] = {
+ [SPECTRE_V2_NONE] = "Vulnerable",
[SPECTRE_V2_RETPOLINE_GENERIC] = "Mitigation: Full generic retpoline",
[SPECTRE_V2_RETPOLINE_AMD] = "Mitigation: Full AMD retpoline",
+ [SPECTRE_V2_IBRS] = "Mitigation: Indirect Branch Restricted Speculation",
[SPECTRE_V2_IBRS_ENHANCED] = "Mitigation: Enhanced IBRS",
};
-@@ -272,6 +274,7 @@ static const struct {
- { "retpoline", SPECTRE_V2_CMD_RETPOLINE, false },
- { "retpoline,amd", SPECTRE_V2_CMD_RETPOLINE_AMD, false },
- { "retpoline,generic", SPECTRE_V2_CMD_RETPOLINE_GENERIC, false },
-+ { "ibrs", SPECTRE_V2_CMD_IBRS, false },
- { "auto", SPECTRE_V2_CMD_AUTO, false },
+@@ -413,6 +420,7 @@ static const struct {
+ { "retpoline", SPECTRE_V2_CMD_RETPOLINE, false },
+ { "retpoline,amd", SPECTRE_V2_CMD_RETPOLINE_AMD, false },
+ { "retpoline,generic", SPECTRE_V2_CMD_RETPOLINE_GENERIC, false },
++ { "ibrs", SPECTRE_V2_CMD_IBRS, false },
+ { "auto", SPECTRE_V2_CMD_AUTO, false },
};
-@@ -364,6 +367,23 @@ void arch_smt_update(void)
- mutex_unlock(&spec_ctrl_mutex);
+@@ -467,6 +475,23 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)
+ return cmd;
}
+/* Check for Skylake-like CPUs (for RSB handling) */
@@ -131,7 +144,7 @@ Protect against userspace-userspace spectreRSB").
static void __init spectre_v2_select_mitigation(void)
{
enum spectre_v2_mitigation_cmd cmd = spectre_v2_parse_cmdline();
-@@ -390,17 +410,31 @@ static void __init spectre_v2_select_mitigation(void)
+@@ -493,17 +518,31 @@ static void __init spectre_v2_select_mitigation(void)
wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base);
goto specv2_set_mode;
}
diff --git a/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch b/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch
index 4bd012a431..b72db966f6 100644
--- a/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch
+++ b/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch
@@ -28,9 +28,9 @@ Signed-off-by: Jiri Slaby <jslaby@suse.cz>
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
-@@ -292,6 +292,42 @@ do { \
- preempt_enable(); \
- } while (0)
+@@ -316,6 +316,42 @@ DECLARE_STATIC_KEY_FALSE(switch_to_cond_stibp);
+ DECLARE_STATIC_KEY_FALSE(switch_mm_cond_ibpb);
+ DECLARE_STATIC_KEY_FALSE(switch_mm_always_ibpb);
+/*
+ * This also performs a barrier, and setting it again when it was already
diff --git a/rpm/config.sh b/rpm/config.sh
index 5e13a7a032..75501b4acd 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=4.20-rc4
+SRCVERSION=4.20-rc5
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against