From: Joerg Roedel <joro@8bytes.org>
To: x86@kernel.org, Eric Biederman <ebiederm@xmission.com>
Cc: kexec@lists.infradead.org, Joerg Roedel <jroedel@suse.de>,
hpa@zytor.com, Andy Lutomirski <luto@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Jiri Slaby <jslaby@suse.cz>,
Dan Williams <dan.j.williams@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Juergen Gross <jgross@suse.com>,
Kees Cook <keescook@chromium.org>,
David Rientjes <rientjes@google.com>,
Cfir Cohen <cfir@google.com>, Erdem Aktas <erdemaktas@google.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Mike Stunes <mstunes@vmware.com>,
Sean Christopherson <seanjc@google.com>,
Martin Radev <martin.b.radev@gmail.com>,
Arvind Sankar <nivedita@alum.mit.edu>,
Joerg Roedel <joro@8bytes.org>,
linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org, virtualization@lists.linux-foundation.org
Subject: [PATCH 06/12] x86/sev: Cache AP Jump Table Address
Date: Wed, 21 Jul 2021 16:20:09 +0200 [thread overview]
Message-ID: <20210721142015.1401-7-joro@8bytes.org> (raw)
In-Reply-To: <20210721142015.1401-1-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
Store the physical address of the AP Jump Table in kernel memory so
that it does not need to be fetched from the Hypervisor again.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
arch/x86/kernel/sev.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
index 5d3422e8b25e..eedba56b6bac 100644
--- a/arch/x86/kernel/sev.c
+++ b/arch/x86/kernel/sev.c
@@ -42,6 +42,9 @@ static struct ghcb boot_ghcb_page __bss_decrypted __aligned(PAGE_SIZE);
*/
static struct ghcb __initdata *boot_ghcb;
+/* Cached AP Jump Table Address */
+static phys_addr_t sev_es_jump_table_pa;
+
/* #VC handler runtime per-CPU data */
struct sev_es_runtime_data {
struct ghcb ghcb_page;
@@ -546,12 +549,14 @@ void noinstr __sev_es_nmi_complete(void)
__sev_put_ghcb(&state);
}
-static u64 get_jump_table_addr(void)
+static phys_addr_t get_jump_table_addr(void)
{
struct ghcb_state state;
unsigned long flags;
struct ghcb *ghcb;
- u64 ret = 0;
+
+ if (sev_es_jump_table_pa)
+ return sev_es_jump_table_pa;
local_irq_save(flags);
@@ -567,39 +572,36 @@ static u64 get_jump_table_addr(void)
if (ghcb_sw_exit_info_1_is_valid(ghcb) &&
ghcb_sw_exit_info_2_is_valid(ghcb))
- ret = ghcb->save.sw_exit_info_2;
+ sev_es_jump_table_pa = (phys_addr_t)ghcb->save.sw_exit_info_2;
__sev_put_ghcb(&state);
local_irq_restore(flags);
- return ret;
+ return sev_es_jump_table_pa;
}
int sev_es_setup_ap_jump_table(struct real_mode_header *rmh)
{
u16 startup_cs, startup_ip;
- phys_addr_t jump_table_pa;
- u64 jump_table_addr;
u16 __iomem *jump_table;
+ phys_addr_t pa;
- jump_table_addr = get_jump_table_addr();
+ pa = get_jump_table_addr();
/* On UP guests there is no jump table so this is not a failure */
- if (!jump_table_addr)
+ if (!pa)
return 0;
/* Check if AP Jump Table is page-aligned */
- if (jump_table_addr & ~PAGE_MASK)
+ if (pa & ~PAGE_MASK)
return -EINVAL;
- jump_table_pa = jump_table_addr & PAGE_MASK;
-
startup_cs = (u16)(rmh->trampoline_start >> 4);
startup_ip = (u16)(rmh->sev_es_trampoline_start -
rmh->trampoline_start);
- jump_table = ioremap_encrypted(jump_table_pa, PAGE_SIZE);
+ jump_table = ioremap_encrypted(pa, PAGE_SIZE);
if (!jump_table)
return -EIO;
--
2.31.1
next prev parent reply other threads:[~2021-07-21 14:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 14:20 [PATCH 00/12] x86/sev: KEXEC/KDUMP support for SEV-ES guests Joerg Roedel
2021-07-21 14:20 ` [PATCH 01/12] kexec: Allow architecture code to opt-out at runtime Joerg Roedel
2022-04-21 13:20 ` Tao Liu
2021-07-21 14:20 ` [PATCH 02/12] x86/kexec/64: Forbid kexec when running as an SEV-ES guest Joerg Roedel
2021-07-21 14:20 ` [PATCH 03/12] x86/sev: Save and print negotiated GHCB protocol version Joerg Roedel
2021-07-21 14:20 ` [PATCH 04/12] x86/sev: Do not hardcode " Joerg Roedel
2021-07-21 21:17 ` Tom Lendacky
2021-07-31 7:18 ` Joerg Roedel
2021-07-21 14:20 ` [PATCH 05/12] x86/sev: Use GHCB protocol version 2 if supported Joerg Roedel
2021-07-21 14:20 ` Joerg Roedel [this message]
2021-07-21 14:20 ` [PATCH 07/12] x86/sev: Setup code to park APs in the AP Jump Table Joerg Roedel
2021-07-21 14:20 ` [PATCH 08/12] x86/sev: Park APs on AP Jump Table with GHCB protocol version 2 Joerg Roedel
2021-07-21 14:20 ` [PATCH 09/12] x86/sev: Use AP Jump Table blob to stop CPU Joerg Roedel
2021-07-21 14:20 ` [PATCH 10/12] x86/sev: Add MMIO handling support to boot/compressed/ code Joerg Roedel
2021-07-21 14:20 ` [PATCH 11/12] x86/sev: Handle CLFLUSH MMIO events Joerg Roedel
2021-07-30 22:42 ` Sean Christopherson
2021-07-31 7:17 ` Joerg Roedel
2021-07-21 14:20 ` [PATCH 12/12] x86/sev: Support kexec under SEV-ES with AP Jump Table blob Joerg Roedel
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=20210721142015.1401-7-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=cfir@google.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=ebiederm@xmission.com \
--cc=erdemaktas@google.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=jroedel@suse.de \
--cc=jslaby@suse.cz \
--cc=keescook@chromium.org \
--cc=kexec@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-coco@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=martin.b.radev@gmail.com \
--cc=mhiramat@kernel.org \
--cc=mstunes@vmware.com \
--cc=nivedita@alum.mit.edu \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=seanjc@google.com \
--cc=thomas.lendacky@amd.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=x86@kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).