From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH 2/3] x86/EFI: be cautious about being handed control with CR4.PGE enabled
Date: Fri, 19 Aug 2016 01:51:35 -0600 [thread overview]
Message-ID: <57B6D6A70200007800107461@prv-mh.provo.novell.com> (raw)
In-Reply-To: <57B6D3C3020000780010743E@prv-mh.provo.novell.com>
[-- Attachment #1: Type: text/plain, Size: 1771 bytes --]
To effect proper TLB flushing in that case we should clear CR4.PGE
before loading the new page tables.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/efi/efi-boot.h
+++ b/xen/arch/x86/efi/efi-boot.h
@@ -228,7 +228,7 @@ static void __init efi_arch_pre_exit_boo
static void __init noreturn efi_arch_post_exit_boot(void)
{
- u64 efer;
+ u64 cr4 = XEN_MINIMAL_CR4 & ~X86_CR4_PGE, efer;
efi_arch_relocate_image(__XEN_VIRT_START - xen_phys_start);
memcpy((void *)trampoline_phys, trampoline_start, cfg.size);
@@ -244,6 +244,10 @@ static void __init noreturn efi_arch_pos
X86_CR0_AM | X86_CR0_PG);
asm volatile ( "mov %[cr4], %%cr4\n\t"
"mov %[cr3], %%cr3\n\t"
+#if XEN_MINIMAL_CR4 & X86_CR4_PGE
+ "or $"__stringify(X86_CR4_PGE)", %[cr4]\n\t"
+ "mov %[cr4], %%cr4\n\t"
+#endif
"movabs $__start_xen, %[rip]\n\t"
"lgdt gdt_descr(%%rip)\n\t"
"mov stack_start(%%rip), %%rsp\n\t"
@@ -255,9 +259,9 @@ static void __init noreturn efi_arch_pos
"movl %[cs], 8(%%rsp)\n\t"
"mov %[rip], (%%rsp)\n\t"
"lretq %[stkoff]-16"
- : [rip] "=&r" (efer/* any dead 64-bit variable */)
+ : [rip] "=&r" (efer/* any dead 64-bit variable */),
+ [cr4] "+&r" (cr4)
: [cr3] "r" (idle_pg_table),
- [cr4] "r" (mmu_cr4_features),
[cs] "ir" (__HYPERVISOR_CS),
[ds] "r" (__HYPERVISOR_DS),
[stkoff] "i" (STACK_SIZE - sizeof(struct cpu_info)),
[-- Attachment #2: x86-EFI-CR4-PGE.patch --]
[-- Type: text/plain, Size: 1837 bytes --]
x86/EFI: be cautious about being handed control with CR4.PGE enabled
To effect proper TLB flushing in that case we should clear CR4.PGE
before loading the new page tables.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/efi/efi-boot.h
+++ b/xen/arch/x86/efi/efi-boot.h
@@ -228,7 +228,7 @@ static void __init efi_arch_pre_exit_boo
static void __init noreturn efi_arch_post_exit_boot(void)
{
- u64 efer;
+ u64 cr4 = XEN_MINIMAL_CR4 & ~X86_CR4_PGE, efer;
efi_arch_relocate_image(__XEN_VIRT_START - xen_phys_start);
memcpy((void *)trampoline_phys, trampoline_start, cfg.size);
@@ -244,6 +244,10 @@ static void __init noreturn efi_arch_pos
X86_CR0_AM | X86_CR0_PG);
asm volatile ( "mov %[cr4], %%cr4\n\t"
"mov %[cr3], %%cr3\n\t"
+#if XEN_MINIMAL_CR4 & X86_CR4_PGE
+ "or $"__stringify(X86_CR4_PGE)", %[cr4]\n\t"
+ "mov %[cr4], %%cr4\n\t"
+#endif
"movabs $__start_xen, %[rip]\n\t"
"lgdt gdt_descr(%%rip)\n\t"
"mov stack_start(%%rip), %%rsp\n\t"
@@ -255,9 +259,9 @@ static void __init noreturn efi_arch_pos
"movl %[cs], 8(%%rsp)\n\t"
"mov %[rip], (%%rsp)\n\t"
"lretq %[stkoff]-16"
- : [rip] "=&r" (efer/* any dead 64-bit variable */)
+ : [rip] "=&r" (efer/* any dead 64-bit variable */),
+ [cr4] "+&r" (cr4)
: [cr3] "r" (idle_pg_table),
- [cr4] "r" (mmu_cr4_features),
[cs] "ir" (__HYPERVISOR_CS),
[ds] "r" (__HYPERVISOR_DS),
[stkoff] "i" (STACK_SIZE - sizeof(struct cpu_info)),
[-- Attachment #3: Type: text/plain, Size: 127 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-08-19 7:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-19 7:39 [PATCH 0/3] x86/EFI: boot adjustments Jan Beulich
2016-08-19 7:50 ` [PATCH 1/3] x86/EFI: don't apply relocations to l{2, 3}_bootmap Jan Beulich
2016-08-19 10:34 ` Andrew Cooper
2016-08-19 12:05 ` Jan Beulich
2016-08-19 7:51 ` Jan Beulich [this message]
2016-08-19 12:26 ` [PATCH 2/3] x86/EFI: be cautious about being handed control with CR4.PGE enabled Andrew Cooper
2016-08-19 7:52 ` [PATCH 3/3] x86/EFI: don't accept 64-bit base relocations on page tables Jan Beulich
2016-08-19 12:39 ` Andrew Cooper
2016-08-19 12:57 ` Jan Beulich
2016-08-30 16:35 ` Andrew Cooper
2016-08-31 12:28 ` Jan Beulich
2016-08-31 12:32 ` Andrew Cooper
2016-08-31 13:03 ` Jan Beulich
2016-08-30 16:18 ` Ping: " Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57B6D6A70200007800107461@prv-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.