x86/sev: Make sure pages are not skipped during kdump

When shared pages are being converted to private during kdump, additional
checks are performed. They include handling the case of a GHCB page being
contained within a huge page.

Currently, this check incorrectly skips a page just below the GHCB page from
being transitioned back to private during kdump preparation.

This skipped page causes a 0x404 #VC exception when it is accessed later while
dumping guest memory for vmcore generation.

Correct the range to be checked for GHCB contained in a huge page.  Also,
ensure that the skipped huge page containing the GHCB page is transitioned
back to private by applying the correct address mask later when changing GHCBs
to private at end of kdump preparation.

  [ bp: Massage commit message. ]

Fixes: 3074152e56c9 ("x86/sev: Convert shared memory back to private on kexec")
Signed-off-by: Ashish Kalra <ashish.kalra@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Tested-by: Srikanth Aithal <sraithal@amd.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/20250506183529.289549-1-Ashish.Kalra@amd.com

diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c
index 41060ba..36beaac 100644 (file)
--- a/arch/x86/coco/sev/core.c
+++ b/arch/x86/coco/sev/core.c
@@ -1101,7 +1101,8 @@ static void unshare_all_memory(void)
                        data = per_cpu(runtime_data, cpu);
                        ghcb = (unsigned long)&data->ghcb_page;
 
-                       if (addr <= ghcb && ghcb <= addr + size) {
+                       /* Handle the case of a huge page containing the GHCB page */
+                       if (addr <= ghcb && ghcb < addr + size) {
                                skipped_addr = true;
                                break;
                        }
@@ -1213,8 +1214,8 @@ static void shutdown_all_aps(void)
 void snp_kexec_finish(void)
 {
        struct sev_es_runtime_data *data;
+       unsigned long size, addr;
        unsigned int level, cpu;
-       unsigned long size;
        struct ghcb *ghcb;
        pte_t *pte;
 
@@ -1242,8 +1243,10 @@ void snp_kexec_finish(void)
                ghcb = &data->ghcb_page;
                pte = lookup_address((unsigned long)ghcb, &level);
                size = page_level_size(level);
-               set_pte_enc(pte, level, (void *)ghcb);
-               snp_set_memory_private((unsigned long)ghcb, (size / PAGE_SIZE));
+               /* Handle the case of a huge page containing the GHCB page */
+               addr = (unsigned long)ghcb & page_level_mask(level);
+               set_pte_enc(pte, level, (void *)addr);
+               snp_set_memory_private(addr, (size / PAGE_SIZE));
        }
 }