x86/srat: vmap the pages for acpi_slit

This avoids the assumption that boot pages are in the direct map.

Signed-off-by: Hongyan Xia <hongyxia@amazon.com>
Signed-off-by: Julien Grall <jgrall@amazon.com>
Signed-off-by: Elias El Yandouzi <eliasely@amazon.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 3f70338e6e235079ff262fa1fd212cf5b3c301c5..688f410287d4a9c47ef21ff8b4cf78e174490ac9 100644 (file)
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -135,7 +135,9 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
                return;
        }
        mfn = alloc_boot_pages(PFN_UP(slit->header.length), 1);
-       acpi_slit = mfn_to_virt(mfn_x(mfn));
+       acpi_slit = vmap_contig(mfn, PFN_UP(slit->header.length));
+       if ( !acpi_slit )
+               panic("Unable to map the ACPI SLIT. Retry with numa=off");
        memcpy(acpi_slit, slit, slit->header.length);
 }