diff options
| author | Dave Hansen <dave.hansen@intel.com> | 2017-11-21 12:52:16 -0800 |
|---|---|---|
| committer | Dave Hansen <dave.hansen@intel.com> | 2017-11-21 12:52:16 -0800 |
| commit | c1569326b8b772c755ec7dc4e10760da50728a37 (patch) | |
| tree | e1abff861618803741b66eba2b4955570548c1de | |
| parent | 921700cf8313660c2b68425a5b714dc70425c723 (diff) | |
| download | x86-kaiser-kaiser-414-tipwip-20171121.tar.gz | |
x86, kaiser, xen: Dynamically disable KAISER when running under Xen PVkaiser-414-tipwip-20171121
From: Dave Hansen <dave.hansen@linux.intel.com>
From: Dave Hansen <dave.hansen@linux.intel.com>
If you paravirtualize the MMU, you can not use KAISER. This boils down
to the fact that KAISER needs to do CR3 writes in places that it is not
feasible to do real hypercalls.
If Xen PV is detected to be in use, do not do the KAISER CR3 switches.
I don't think this too bug of a deal for Xen. I was under the
impression that the Xen guest kernel and Xen guest userspace didn't
share an address space *anyway* so Xen PV is not normally even exposed
to the kinds of things that KAISER protects against.
This allows KAISER=y kernels to deployed in environments that also
require PARAVIRT=y.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Juergen Gross <jgross@suse.com>
Cc: Moritz Lipp <moritz.lipp@iaik.tugraz.at>
Cc: Daniel Gruss <daniel.gruss@iaik.tugraz.at>
Cc: Michael Schwarz <michael.schwarz@iaik.tugraz.at>
Cc: Richard Fellner <richard.fellner@student.tugraz.at>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Kees Cook <keescook@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: x86@kernel.org
kaiser-debug-earlycrash-2
From: Dave Hansen <dave.hansen@linux.intel.com>
| -rw-r--r-- | arch/x86/mm/kaiser.c | 24 | ||||
| -rw-r--r-- | security/Kconfig | 2 |
2 files changed, 23 insertions, 3 deletions
diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c index 2177ad06aeecd..b9a68d9abbf39 100644 --- a/arch/x86/mm/kaiser.c +++ b/arch/x86/mm/kaiser.c @@ -41,8 +41,20 @@ #include <asm/tlbflush.h> #include <asm/desc.h> +/* + * We need a two-stage enable/disable. One (kaiser_enabled) to stop + * the ongoing work that keeps KAISER from being disabled (like PGD + * poisoning) and another (kaiser_asm_do_switch) that we set when it + * is completely safe to run without doing KAISER switches. + */ +int kaiser_enabled; + +/* + * Sized and aligned so that we can easily map it out to userspace + * for use before we have done the assembly CR3 switching. + */ __aligned(PAGE_SIZE) -unsigned long kaiser_asm_do_switch[PAGE_SIZE/sizeof(unsigned long)] = { 1 }; +unsigned long kaiser_asm_do_switch[PAGE_SIZE/sizeof(unsigned long)]; /* * At runtime, the only things we map are some things for CPU @@ -422,6 +434,15 @@ void __init kaiser_init(void) * we ever run userspace and need the KAISER mappings. */ kaiser_add_mapping_cpu_entry(0); + + if (cpu_feature_enabled(X86_FEATURE_XENPV)) { + pr_info("x86/kaiser: Xen PV detected, disabling " + "KAISER protection\n"); + } else { + pr_info("x86/kaiser: Unmapping kernel while in userspace\n"); + kaiser_asm_do_switch[0] = 1; + kaiser_enabled = 1; + } } int kaiser_add_mapping(unsigned long addr, unsigned long size, @@ -472,7 +493,6 @@ void kaiser_remove_mapping(unsigned long start, unsigned long size) __native_flush_tlb_global(); } -int kaiser_enabled = 1; static ssize_t kaiser_enabled_read_file(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { diff --git a/security/Kconfig b/security/Kconfig index 99b530d0dd9e2..5365dc0a8ec16 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -56,7 +56,7 @@ config SECURITY_NETWORK config KAISER bool "Remove the kernel mapping in user mode" - depends on X86_64 && SMP && !PARAVIRT + depends on X86_64 && SMP help This feature reduces the number of hardware side channels by ensuring that the majority of kernel addresses are not mapped |