[xen master] acpi: vmap pages in acpi_os_alloc_memory

[patchbot@xxxxxxx]

commit f940facaa37059a95769ea9eb638efb062b85b52
Author:     Hongyan Xia <hongyxia@xxxxxxxxxx>
AuthorDate: Tue Feb 6 11:54:50 2024 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Feb 6 11:54:50 2024 +0100

    acpi: vmap pages in acpi_os_alloc_memory
    
    Also, introduce a wrapper around vmap that maps a contiguous range for
    boot allocations. Unfortunately, the new helper cannot be a static inline
    because the dependencies are a mess. We would need to re-include
    asm/page.h (was removed in aa4b9d1ee653 "include: don't use asm/page.h
    from common headers") and it doesn't look to be enough anymore
    because bits from asm/cpufeature.h is used in the definition of PAGE_NX.
    
    Lastly, with the move to vmap(), it is now easier to find the size
    of the mapping. So pass the whole area to init_boot_pages() rather than
    just the first page.
    
    Signed-off-by: Hongyan Xia <hongyxia@xxxxxxxxxx>
    Signed-off-by: Julien Grall <jgrall@xxxxxxxxxx>
    Signed-off-by: Elias El Yandouzi <eliasely@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/common/vmap.c      |  5 +++++
 xen/drivers/acpi/osl.c | 14 ++++++++++++--
 xen/include/xen/vmap.h |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/xen/common/vmap.c b/xen/common/vmap.c
index 171271fae3..966a7e763f 100644
--- a/xen/common/vmap.c
+++ b/xen/common/vmap.c
@@ -245,6 +245,11 @@ void *vmap(const mfn_t *mfn, unsigned int nr)
     return __vmap(mfn, 1, nr, 1, PAGE_HYPERVISOR, VMAP_DEFAULT);
 }
 
+void *vmap_contig(mfn_t mfn, unsigned int nr)
+{
+    return __vmap(&mfn, nr, 1, 1, PAGE_HYPERVISOR, VMAP_DEFAULT);
+}
+
 unsigned int vmap_size(const void *va)
 {
     unsigned int pages = vm_size(va, VMAP_DEFAULT);
diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
index 389505f786..ab80d6b2a9 100644
--- a/xen/drivers/acpi/osl.c
+++ b/xen/drivers/acpi/osl.c
@@ -221,7 +221,11 @@ void *__init acpi_os_alloc_memory(size_t sz)
        void *ptr;
 
        if (system_state == SYS_STATE_early_boot)
-               return mfn_to_virt(mfn_x(alloc_boot_pages(PFN_UP(sz), 1)));
+       {
+               mfn_t mfn = alloc_boot_pages(PFN_UP(sz), 1);
+
+               return vmap_contig(mfn, PFN_UP(sz));
+       }
 
        ptr = xmalloc_bytes(sz);
        ASSERT(!ptr || is_xmalloc_memory(ptr));
@@ -246,5 +250,11 @@ void __init acpi_os_free_memory(void *ptr)
        if (is_xmalloc_memory(ptr))
                xfree(ptr);
        else if (ptr && system_state == SYS_STATE_early_boot)
-               init_boot_pages(__pa(ptr), __pa(ptr) + PAGE_SIZE);
+       {
+               paddr_t addr = mfn_to_maddr(vmap_to_mfn(ptr));
+               unsigned int nr = vmap_size(ptr);
+
+               vunmap(ptr);
+               init_boot_pages(addr, addr + nr * PAGE_SIZE);
+       }
 }
diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h
index 24c85de490..0c16baa85f 100644
--- a/xen/include/xen/vmap.h
+++ b/xen/include/xen/vmap.h
@@ -15,6 +15,7 @@ void vm_init_type(enum vmap_region type, void *start, void 
*end);
 void *__vmap(const mfn_t *mfn, unsigned int granularity, unsigned int nr,
              unsigned int align, unsigned int flags, enum vmap_region type);
 void *vmap(const mfn_t *mfn, unsigned int nr);
+void *vmap_contig(mfn_t mfn, unsigned int nr);
 void vunmap(const void *va);
 
 void *vmalloc(size_t size);
--
generated by git-patchbot for /home/xen/git/xen.git#master