x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting
PATCH 1/1 x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting
RDMSR in the trampoline code overrides EDX, but we use the register to indicate if 5-level paging has to enabled. It leads to failure to boot on a 5-level paging machine.
Preserve EDX on the stack while we are dealing with EFER.
--- arch/x86/boot/compressed/head_64.S | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/boot/compressed/head_64.S +2 -0
@@ -602,10 +602,12 @@ ENTRY(trampoline_32bit_src) 3: /* Set EFER.LME=1 as a precaution in case hypervsior pulls the rug */ pushl %ecx + pushl %edx movl $MSR_EFER, %ecx rdmsr btsl $_EFER_LME, %eax wrmsr + popl %edx popl %ecx /* Enable PAE and LA57 (if required) paging modes */
Signature · 1 line
2.20.1
Borislav Petkov
maintainerQuoted 5 lines · Kirill A. Shutemov
RDMSR in the trampoline code overrides EDX, but we use the register to indicate if 5-level paging has to enabled. It leads to failure to boot on a 5-level paging machine.
Preserve EDX on the stack while we are dealing with EFER.
Comment says:
* Non zero RDX on return means we need to enable 5-level paging.
Is that per-chance refering to struct paging_config which paging_prepare() returns and on that return rdx contains paging_config.l5_required which is 1 when 5 level is to be enabled?
If so, is that written somewhere explicitly? Because it is not immediately clear at least to me why that RDX is live...
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Quoted 7 lines · Borislav Petkov
Quoted 5 lines · Kirill A. Shutemov
RDMSR in the trampoline code overrides EDX, but we use the register to indicate if 5-level paging has to enabled. It leads to failure to boot on a 5-level paging machine.
Preserve EDX on the stack while we are dealing with EFER.
Quoted 7 lines
Comment says:
* Non zero RDX on return means we need to enable 5-level paging.
Is that per-chance refering to struct
paging_configwhichpaging_prepare()returns and on that return rdx contains paging_config.l5_required which is 1 when 5 level is to be enabled?
Yes.
Quoted 2 lines
If so, is that written somewhere explicitly? Because it is not immediately clear at least to me why that RDX is live...
What about this:
From d43b9d157c574baf782f6d9982fe6f2c1f918c0e Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <[email protected]>
Date: Wed, 6 Feb 2019 18:29:08 +0300
Subject: [PATCH] x86/boot/compressed/64: Fix confusing comment for
paging_config()
paging_prepare() returns two-quadword structure which lands into RDX:RAX:
- Address of the trampoline is returned in RAX.
- Non zero RDX means trampoline needs to enable 5-level paging.
--- arch/x86/boot/compressed/head_64.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/boot/compressed/head_64.S +6 -3
@@ -358,8 +358,11 @@ ENTRY(startup_64) * paging_prepare() sets up the trampoline and checks if we need to * enable 5-level paging. * - * Address of the trampoline is returned in RAX. - * Non zero RDX on return means we need to enable 5-level paging. + * paging_prepare() returns two-quadword structure which lands + * into RDX:RAX: + * - Address of the trampoline is returned in RAX. + * - Non zero RDX means trampoline needs to enable 5-level + * paging. * * RSI holds real mode data and needs to be preserved across * this function call.
@@ -565,7 +568,7 @@ adjust_got: * * RDI contains the return address (might be above 4G). * ECX contains the base address of the trampoline memory. - * Non zero RDX on return means we need to enable 5-level paging. + * Non zero RDX means trampoline needs to enable 5-level paging. */ ENTRY(trampoline_32bit_src) /* Set up data and stack segments */
Signature · 1 line
Kirill A. Shutemov
Borislav Petkov
maintainerQuoted 1 line · Kirill A. Shutemov
What about this:
Yap, thanks!
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.tip-bot for Kirill A. Shutemov
merge bot[tip:x86/cleanups] x86/boot/compressed/64: Explain paging_prepare()'s return value
In reply to Kirill A. Shutemovx86/boot/compressed/64: Explain paging_prepare()'s return value
Commit-ID: 82434d23f36de42f70925f70d645ed3b1394361b Gitweb: https://git.kernel.org/tip/82434d23f36de42f70925f70d645ed3b1394361b Author: Kirill A. Shutemov <[email protected]> AuthorDate: Wed, 6 Feb 2019 18:29:08 +0300 Committer: Borislav Petkov <[email protected]> CommitDate: Wed, 6 Feb 2019 19:08:34 +0100
x86/boot/compressed/64: Explain paging_prepare()'s return value
paging_prepare() returns a two-quadword structure which lands into RDX:RAX:
- Address of the trampoline is returned in RAX.
- Non zero RDX means trampoline needs to enable 5-level paging.
Document that explicitly.
--- arch/x86/boot/compressed/head_64.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/x86/boot/compressed/head_64.S +6 -3
@@ -358,8 +358,11 @@ ENTRY(startup_64) * paging_prepare() sets up the trampoline and checks if we need to * enable 5-level paging. * - * Address of the trampoline is returned in RAX. - * Non zero RDX on return means we need to enable 5-level paging. + * paging_prepare() returns a two-quadword structure which lands + * into RDX:RAX: + * - Address of the trampoline is returned in RAX. + * - Non zero RDX means trampoline needs to enable 5-level + * paging. * * RSI holds real mode data and needs to be preserved across * this function call.
@@ -565,7 +568,7 @@ adjust_got: * * RDI contains the return address (might be above 4G). * ECX contains the base address of the trampoline memory. - * Non zero RDX on return means we need to enable 5-level paging. + * Non zero RDX means trampoline needs to enable 5-level paging. */ ENTRY(trampoline_32bit_src) /* Set up data and stack segments */
tip-bot for Kirill A. Shutemov
merge botx86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting
Commit-ID: 45b13b424faafb81c8c44541f093a682fdabdefc Gitweb: https://git.kernel.org/tip/45b13b424faafb81c8c44541f093a682fdabdefc Author: Kirill A. Shutemov <[email protected]> AuthorDate: Wed, 6 Feb 2019 14:52:53 +0300 Committer: Borislav Petkov <[email protected]> CommitDate: Wed, 6 Feb 2019 18:56:18 +0100
x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting
RDMSR in the trampoline code overwrites EDX but that register is used to indicate whether 5-level paging has to be enabled and if clobbered, leads to failure to boot on a 5-level paging machine.
Preserve EDX on the stack while we are dealing with EFER.
--- arch/x86/boot/compressed/head_64.S | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/boot/compressed/head_64.S +2 -0
@@ -602,10 +602,12 @@ ENTRY(trampoline_32bit_src) 3: /* Set EFER.LME=1 as a precaution in case hypervsior pulls the rug */ pushl %ecx + pushl %edx movl $MSR_EFER, %ecx rdmsr btsl $_EFER_LME, %eax wrmsr + popl %edx popl %ecx /* Enable PAE and LA57 (if required) paging modes */
Quoted 22 lines · Kirill A. Shutemov
RDMSR in the trampoline code overrides EDX, but we use the register to indicate if 5-level paging has to enabled. It leads to failure to boot on a 5-level paging machine.
Preserve EDX on the stack while we are dealing with EFER.
Signed-off-by Kirill A. Shutemov <[email protected]>Fixes b677dfae5aa1 ("x86/boot/compressed/64: Set EFER.LME=1 in 32-bit trampoline before returning to long mode")Reported-by Kyle D Pelton <[email protected]>Cc Wei Huang <[email protected]>--- arch/x86/boot/compressed/head_64.S | 2 ++ 1 file changed, 2 insertions(+)arch/x86/boot/compressed/head_64.S +0
-0@@ -602,10 +602,12 @@ ENTRY(trampoline_32bit_src) 3: /* Set EFER.LME=1 as a precaution in case hypervsior pulls the rug */
arch/x86/boot/compressed/head_64.S ENTRY(trampoline_32bit_src) · line 613
Quoted 10 lines
arch/x86/boot/compressed/head_64.S +2
-0pushl %ecx + pushl %edx movl $MSR_EFER, %ecx rdmsr btsl $_EFER_LME, %eax wrmsr + popl %edx popl %ecx /* Enable PAE and LA57 (if required) paging modes */
Oops, rdmsr indeed corrupts EDX.