diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0028-x86-kaiser-Rename-and-simplify-X86_FEATURE_KAISER-ha.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.9.21/0028-x86-kaiser-Rename-and-simplify-X86_FEATURE_KAISER-ha.patch | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0028-x86-kaiser-Rename-and-simplify-X86_FEATURE_KAISER-ha.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0028-x86-kaiser-Rename-and-simplify-X86_FEATURE_KAISER-ha.patch deleted file mode 100644 index 4e51c206..00000000 --- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0028-x86-kaiser-Rename-and-simplify-X86_FEATURE_KAISER-ha.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 978e4ec232a9e93c7b378af9b2997e8cf4786a35 Mon Sep 17 00:00:00 2001 -From: Borislav Petkov <bp@suse.de> -Date: Tue, 2 Jan 2018 14:19:48 +0100 -Subject: [PATCH 028/103] x86/kaiser: Rename and simplify X86_FEATURE_KAISER - handling - -Concentrate it in arch/x86/mm/kaiser.c and use the upstream string "nopti". - -Signed-off-by: Borislav Petkov <bp@suse.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - Documentation/kernel-parameters.txt | 2 +- - arch/x86/kernel/cpu/common.c | 18 ------------------ - arch/x86/mm/kaiser.c | 20 +++++++++++++++++++- - 3 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index e2642ec..f5a95f77 100644 ---- a/Documentation/kernel-parameters.txt -+++ b/Documentation/kernel-parameters.txt -@@ -2753,7 +2753,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. - - nojitter [IA-64] Disables jitter checking for ITC timers. - -- nokaiser [X86-64] Disable KAISER isolation of kernel from user. -+ nopti [X86-64] Disable KAISER isolation of kernel from user. - - no-kvmclock [X86,KVM] Disable paravirtualized KVM clock driver - -diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 8b03874..918e447 100644 ---- a/arch/x86/kernel/cpu/common.c -+++ b/arch/x86/kernel/cpu/common.c -@@ -179,20 +179,6 @@ static int __init x86_pcid_setup(char *s) - return 1; - } - __setup("nopcid", x86_pcid_setup); -- --static int __init x86_nokaiser_setup(char *s) --{ -- /* nokaiser doesn't accept parameters */ -- if (s) -- return -EINVAL; --#ifdef CONFIG_KAISER -- kaiser_enabled = 0; -- setup_clear_cpu_cap(X86_FEATURE_KAISER); -- pr_info("nokaiser: KAISER feature disabled\n"); --#endif -- return 0; --} --early_param("nokaiser", x86_nokaiser_setup); - #endif - - static int __init x86_noinvpcid_setup(char *s) -@@ -813,10 +799,6 @@ void get_cpu_cap(struct cpuinfo_x86 *c) - c->x86_capability[CPUID_8000_000A_EDX] = cpuid_edx(0x8000000a); - - init_scattered_cpuid_features(c); --#ifdef CONFIG_KAISER -- if (kaiser_enabled) -- set_cpu_cap(c, X86_FEATURE_KAISER); --#endif - } - - static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c) -diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c -index 11032dc..87cae72 100644 ---- a/arch/x86/mm/kaiser.c -+++ b/arch/x86/mm/kaiser.c -@@ -274,8 +274,13 @@ void __init kaiser_init(void) - { - int cpu; - -- if (!kaiser_enabled) -+ if (!kaiser_enabled) { -+ setup_clear_cpu_cap(X86_FEATURE_KAISER); - return; -+ } -+ -+ setup_force_cpu_cap(X86_FEATURE_KAISER); -+ - kaiser_init_all_pgds(); - - for_each_possible_cpu(cpu) { -@@ -418,3 +423,16 @@ void kaiser_flush_tlb_on_return_to_user(void) - X86_CR3_PCID_USER_FLUSH | KAISER_SHADOW_PGD_OFFSET); - } - EXPORT_SYMBOL(kaiser_flush_tlb_on_return_to_user); -+ -+static int __init x86_nokaiser_setup(char *s) -+{ -+ /* nopti doesn't accept parameters */ -+ if (s) -+ return -EINVAL; -+ -+ kaiser_enabled = 0; -+ pr_info("Kernel/User page tables isolation: disabled\n"); -+ -+ return 0; -+} -+early_param("nopti", x86_nokaiser_setup); --- -2.7.4 - |