| From: Borislav Petkov <bp@suse.de> |
| Date: Tue, 2 Jan 2018 14:19:48 +0100 |
| Subject: 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> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| 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 28c23bdc1af4..56b678603531 100644 |
| --- a/Documentation/kernel-parameters.txt |
| +++ b/Documentation/kernel-parameters.txt |
| @@ -1803,7 +1803,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 dbad6b1ee60e..d5ff61ffbe01 100644 |
| --- a/arch/x86/kernel/cpu/common.c |
| +++ b/arch/x86/kernel/cpu/common.c |
| @@ -171,20 +171,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) |
| @@ -695,10 +681,6 @@ void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c) |
| c->x86_power = cpuid_edx(0x80000007); |
| |
| init_scattered_cpuid_features(c); |
| -#ifdef CONFIG_KAISER |
| - if (kaiser_enabled) |
| - set_cpu_cap(c, X86_FEATURE_KAISER); |
| -#endif |
| } |
| |
| static void __cpuinit identify_cpu_without_cpuid(struct cpuinfo_x86 *c) |
| diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c |
| index bef8a415048b..5d0be21c32a6 100644 |
| --- a/arch/x86/mm/kaiser.c |
| +++ b/arch/x86/mm/kaiser.c |
| @@ -275,8 +275,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) { |
| @@ -408,3 +413,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); |
| |