Skip to content

Commit

Permalink
x86/boot/sev: Avoid shared GHCB page for early memory acceptance
Browse files Browse the repository at this point in the history
Communicating with the hypervisor using the shared GHCB page requires
clearing the C bit in the mapping of that page. When executing in the
context of the EFI boot services, the page tables are owned by the
firmware, and this manipulation is not possible.

So switch to a different API for accepting memory in SEV-SNP guests, one
which is actually supported at the point during boot where the EFI stub
may need to accept memory, but the SEV-SNP init code has not executed
yet.

For simplicity, also switch the memory acceptance carried out by the
decompressor when not booting via EFI - this only involves the
allocation for the decompressed kernel, and is generally only called
after kexec, as normal boot will jump straight into the kernel from the
EFI stub.

Fixes: 6c32117 ("x86/sev: Add SNP-specific unaccepted memory support")
Tested-by: Tom Lendacky <thomas.lendacky@amd.com>
Co-developed-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: <stable@vger.kernel.org>
Cc: Dionna Amalie Glaze <dionnaglaze@google.com>
Cc: Kevin Loughlin <kevinloughlin@google.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-efi@vger.kernel.org
Link: https://lore.kernel.org/r/20250404082921.2767593-8-ardb+git@google.com # discussion thread #1
Link: https://lore.kernel.org/r/20250410132850.3708703-2-ardb+git@google.com # discussion thread #2
Link: https://lore.kernel.org/r/20250417202120.1002102-2-ardb+git@google.com # final submission
  • Loading branch information
Ard Biesheuvel authored and Ingo Molnar committed Apr 18, 2025
1 parent 263e559 commit d54d610
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 53 deletions.
5 changes: 4 additions & 1 deletion arch/x86/boot/compressed/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ static bool early_is_tdx_guest(void)

void arch_accept_memory(phys_addr_t start, phys_addr_t end)
{
static bool sevsnp;

/* Platform-specific memory-acceptance call goes here */
if (early_is_tdx_guest()) {
if (!tdx_accept_memory(start, end))
panic("TDX: Failed to accept memory\n");
} else if (sev_snp_enabled()) {
} else if (sevsnp || (sev_get_status() & MSR_AMD64_SEV_SNP_ENABLED)) {
sevsnp = true;
snp_accept_memory(start, end);
} else {
error("Cannot accept memory: unknown platform\n");
Expand Down
67 changes: 15 additions & 52 deletions arch/x86/boot/compressed/sev.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,7 @@ bool sev_snp_enabled(void)

static void __page_state_change(unsigned long paddr, enum psc_op op)
{
u64 val;

if (!sev_snp_enabled())
return;
u64 val, msr;

/*
* If private -> shared then invalidate the page before requesting the
Expand All @@ -176,6 +173,9 @@ static void __page_state_change(unsigned long paddr, enum psc_op op)
if (op == SNP_PAGE_STATE_SHARED)
pvalidate_4k_page(paddr, paddr, false);

/* Save the current GHCB MSR value */
msr = sev_es_rd_ghcb_msr();

/* Issue VMGEXIT to change the page state in RMP table. */
sev_es_wr_ghcb_msr(GHCB_MSR_PSC_REQ_GFN(paddr >> PAGE_SHIFT, op));
VMGEXIT();
Expand All @@ -185,6 +185,9 @@ static void __page_state_change(unsigned long paddr, enum psc_op op)
if ((GHCB_RESP_CODE(val) != GHCB_MSR_PSC_RESP) || GHCB_MSR_PSC_RESP_VAL(val))
sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_PSC);

/* Restore the GHCB MSR value */
sev_es_wr_ghcb_msr(msr);

/*
* Now that page state is changed in the RMP table, validate it so that it is
* consistent with the RMP entry.
Expand All @@ -195,11 +198,17 @@ static void __page_state_change(unsigned long paddr, enum psc_op op)

void snp_set_page_private(unsigned long paddr)
{
if (!sev_snp_enabled())
return;

__page_state_change(paddr, SNP_PAGE_STATE_PRIVATE);
}

void snp_set_page_shared(unsigned long paddr)
{
if (!sev_snp_enabled())
return;

__page_state_change(paddr, SNP_PAGE_STATE_SHARED);
}

Expand All @@ -223,56 +232,10 @@ static bool early_setup_ghcb(void)
return true;
}

static phys_addr_t __snp_accept_memory(struct snp_psc_desc *desc,
phys_addr_t pa, phys_addr_t pa_end)
{
struct psc_hdr *hdr;
struct psc_entry *e;
unsigned int i;

hdr = &desc->hdr;
memset(hdr, 0, sizeof(*hdr));

e = desc->entries;

i = 0;
while (pa < pa_end && i < VMGEXIT_PSC_MAX_ENTRY) {
hdr->end_entry = i;

e->gfn = pa >> PAGE_SHIFT;
e->operation = SNP_PAGE_STATE_PRIVATE;
if (IS_ALIGNED(pa, PMD_SIZE) && (pa_end - pa) >= PMD_SIZE) {
e->pagesize = RMP_PG_SIZE_2M;
pa += PMD_SIZE;
} else {
e->pagesize = RMP_PG_SIZE_4K;
pa += PAGE_SIZE;
}

e++;
i++;
}

if (vmgexit_psc(boot_ghcb, desc))
sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_PSC);

pvalidate_pages(desc);

return pa;
}

void snp_accept_memory(phys_addr_t start, phys_addr_t end)
{
struct snp_psc_desc desc = {};
unsigned int i;
phys_addr_t pa;

if (!boot_ghcb && !early_setup_ghcb())
sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_PSC);

pa = start;
while (pa < end)
pa = __snp_accept_memory(&desc, pa, end);
for (phys_addr_t pa = start; pa < end; pa += PAGE_SIZE)
__page_state_change(pa, SNP_PAGE_STATE_PRIVATE);
}

void sev_es_shutdown_ghcb(void)
Expand Down
2 changes: 2 additions & 0 deletions arch/x86/boot/compressed/sev.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

bool sev_snp_enabled(void);
void snp_accept_memory(phys_addr_t start, phys_addr_t end);
u64 sev_get_status(void);

#else

static inline bool sev_snp_enabled(void) { return false; }
static inline void snp_accept_memory(phys_addr_t start, phys_addr_t end) { }
static inline u64 sev_get_status(void) { return 0; }

#endif

Expand Down

0 comments on commit d54d610

Please sign in to comment.