brain-hackers_pepepper-mirror/linux-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/linux-brain.git synced 2024-06-09 15:26:21 +09:00
Code Issues Projects Releases Wiki Activity

x86/kaiser: Rename and simplify X86_FEATURE_KAISER handling

Browse Source 
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>
This commit is contained in:
Borislav Petkov 2018-01-02 14:19:48 +01:00 committed by Greg Kroah-Hartman
parent 23e09439aa
commit 50624dd12d
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/kernel-parameters.txt
View File

@ -2763,7 +2763,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

18
arch/x86/kernel/cpu/common.c
View File

@ -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)

20
arch/x86/mm/kaiser.c
View File

@ -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);