From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Andy Lutomirski <luto@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Ard Biesheuvel <ardb@kernel.org>,
"Paul E. McKenney" <paulmck@kernel.org>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Xiongwei Song <xiongwei.song@windriver.com>,
Xin Li <xin3.li@intel.com>,
"Mike Rapoport (IBM)" <rppt@kernel.org>,
Brijesh Singh <brijesh.singh@amd.com>,
Michael Roth <michael.roth@amd.com>,
Tony Luck <tony.luck@intel.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Alexey Kardashevskiy <aik@amd.com>
Cc: Jonathan Corbet <corbet@lwn.net>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Sohil Mehta <sohil.mehta@intel.com>,
Ingo Molnar <mingo@kernel.org>,
Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
Daniel Sneddon <daniel.sneddon@linux.intel.com>,
Kai Huang <kai.huang@intel.com>,
Sandipan Das <sandipan.das@amd.com>,
Breno Leitao <leitao@debian.org>,
Rick Edgecombe <rick.p.edgecombe@intel.com>,
Yian Chen <yian.chen@intel.com>,
Alexei Starovoitov <ast@kernel.org>, Hou Tao <houtao1@huawei.com>,
Juergen Gross <jgross@suse.com>,
Vegard Nossum <vegard.nossum@oracle.com>,
Kees Cook <kees@kernel.org>, Eric Biggers <ebiggers@google.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Luis Chamberlain <mcgrof@kernel.org>,
Yuntao Wang <ytcoode@gmail.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Tejun Heo <tj@kernel.org>, Changbin Du <changbin.du@huawei.com>,
Huang Shijie <shijie@os.amperecomputing.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Namhyung Kim <namhyung@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-efi@vger.kernel.org
Subject: [PATCH v4 15/16] efi: Disable LASS around set_virtual_address_map call
Date: Wed, 10 Jul 2024 19:06:51 +0300 [thread overview]
Message-ID: <20240710160655.3402786-16-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <20240710160655.3402786-1-alexander.shishkin@linux.intel.com>
Of all the EFI runtime services, set_virtual_address_map is the only one
that is called at its lower mapping, which LASS prohibits regardless of
EFLAGS.AC setting. The only way to allow this to happen is to disable
LASS in the CR4 register.
Disable LASS around this low address EFI call.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
arch/x86/platform/efi/efi.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index f090ec972d7b..6e5c2bb4f4df 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -848,11 +848,24 @@ static void __init __efi_enter_virtual_mode(void)
efi_sync_low_kernel_mappings();
+ /*
+ * set_virtual_address_map is the only service located at lower
+ * addresses, so we have to temporarily disable LASS around it.
+ * Note that clearing EFLAGS.AC is not enough for this, the whole
+ * LASS needs to be disabled.
+ */
+ if (cpu_feature_enabled(X86_FEATURE_LASS))
+ cr4_clear_bits(X86_CR4_LASS);
+
status = efi_set_virtual_address_map(efi.memmap.desc_size * count,
efi.memmap.desc_size,
efi.memmap.desc_version,
(efi_memory_desc_t *)pa,
efi_systab_phys);
+
+ if (cpu_feature_enabled(X86_FEATURE_LASS))
+ cr4_set_bits(X86_CR4_LASS);
+
if (status != EFI_SUCCESS) {
pr_err("Unable to switch EFI into virtual mode (status=%lx)!\n",
status);
--
2.43.0
next prev parent reply other threads:[~2024-07-10 16:11 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 16:06 [PATCH v4 00/16] Enable Linear Address Space Separation support Alexander Shishkin
2024-07-10 16:06 ` [PATCH v4 01/16] x86/cpu: Enumerate the LASS feature bits Alexander Shishkin
2025-05-13 3:08 ` Xin Li
2024-07-10 16:06 ` [PATCH v4 02/16] x86/asm: Introduce inline memcpy and memset Alexander Shishkin
2024-07-11 8:13 ` Peter Zijlstra
2024-07-10 16:06 ` [PATCH v4 03/16] x86/alternatives: Disable LASS when patching kernel alternatives Alexander Shishkin
2024-07-10 17:18 ` Borislav Petkov
2024-07-10 22:33 ` Kirill A. Shutemov
2024-07-10 23:05 ` Dave Hansen
2024-07-11 8:16 ` Peter Zijlstra
2024-07-11 10:32 ` Kirill A. Shutemov
2024-07-11 14:03 ` Dave Hansen
2024-07-11 1:23 ` Borislav Petkov
2024-07-11 8:14 ` Peter Zijlstra
2024-07-10 16:06 ` [PATCH v4 04/16] x86/cpu: Enable LASS during CPU initialization Alexander Shishkin
2024-07-10 16:06 ` [PATCH v4 05/16] x86/cpu: Remove redundant comment during feature setup Alexander Shishkin
2024-07-10 17:21 ` Borislav Petkov
2024-07-10 16:06 ` [PATCH v4 06/16] init/main.c: Move EFI runtime service initialization to x86/cpu Alexander Shishkin
2024-07-10 16:06 ` [PATCH v4 07/16] x86/cpu: Defer CR pinning setup until after EFI initialization Alexander Shishkin
2024-07-11 8:11 ` Peter Zijlstra
2024-07-11 10:37 ` Kirill A. Shutemov
2024-07-10 16:06 ` [PATCH v4 08/16] x86/vsyscall: Reorganize the #PF emulation code Alexander Shishkin
2024-07-10 16:06 ` [PATCH v4 09/16] x86/traps: Consolidate user fixups in exc_general_protection() Alexander Shishkin
2024-07-10 16:06 ` [PATCH v4 10/16] x86/vsyscall: Add vsyscall emulation for #GP Alexander Shishkin
2024-07-10 16:06 ` [PATCH v4 11/16] x86/vsyscall: Disable LASS if vsyscall mode is set to EMULATE Alexander Shishkin
2024-07-10 16:06 ` [PATCH v4 12/16] x86/vsyscall: Document the fact that vsyscall=emulate disables LASS Alexander Shishkin
2024-07-10 16:06 ` [PATCH v4 13/16] x86/cpu: Set LASS CR4 bit as pinning sensitive Alexander Shishkin
2024-07-10 16:06 ` [PATCH v4 14/16] x86/traps: Communicate a LASS violation in #GP message Alexander Shishkin
2024-07-10 16:06 ` Alexander Shishkin [this message]
2024-07-10 16:06 ` [PATCH v4 16/16] x86/cpu: Make LAM depend on LASS Alexander Shishkin
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=20240710160655.3402786-16-alexander.shishkin@linux.intel.com \
--to=alexander.shishkin@linux.intel.com \
--cc=acme@redhat.com \
--cc=aik@amd.com \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=ast@kernel.org \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=changbin.du@huawei.com \
--cc=christophe.leroy@csgroup.eu \
--cc=corbet@lwn.net \
--cc=daniel.sneddon@linux.intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=ebiggers@google.com \
--cc=geert+renesas@glider.be \
--cc=houtao1@huawei.com \
--cc=hpa@zytor.com \
--cc=jgg@ziepe.ca \
--cc=jgross@suse.com \
--cc=jpoimboe@kernel.org \
--cc=kai.huang@intel.com \
--cc=kees@kernel.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=leitao@debian.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=luto@kernel.org \
--cc=mcgrof@kernel.org \
--cc=mhiramat@kernel.org \
--cc=michael.roth@amd.com \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulmck@kernel.org \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=peterz@infradead.org \
--cc=rick.p.edgecombe@intel.com \
--cc=rppt@kernel.org \
--cc=sandipan.das@amd.com \
--cc=shijie@os.amperecomputing.com \
--cc=sohil.mehta@intel.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=tony.luck@intel.com \
--cc=vegard.nossum@oracle.com \
--cc=x86@kernel.org \
--cc=xin3.li@intel.com \
--cc=xiongwei.song@windriver.com \
--cc=yian.chen@intel.com \
--cc=ytcoode@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox