[xen staging-4.18] x86/setup: remove bootstrap_map_addr() usage of destroy_xen_mappings()

[patchbot@xxxxxxx]

commit d58565a1923fc393dd6a937c6b2aeea296f502cf
Author:     Roger Pau Monné <roger.pau@xxxxxxxxx>
AuthorDate: Mon Nov 25 12:18:58 2024 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Nov 25 12:18:58 2024 +0100

    x86/setup: remove bootstrap_map_addr() usage of destroy_xen_mappings()
    
    bootstrap_map_addr() needs to be careful to not remove existing page-table
    structures when tearing down mappings, as such pagetable structures might be
    needed to fulfill subsequent mappings requests.  The comment ahead of the
    function already notes that pagetable memory shouldn't be allocated.
    
    Fix this by using map_pages_to_xen(), which does zap the page-table entries,
    but does not free page-table structures even when empty.
    
    Fixes: 4376c05c3113 ('x86-64: use 1GB pages in 1:1 mapping if available')
    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 73194b5701725e53d72b98e568484b2fccaf855c
    master date: 2024-11-14 16:12:51 +0100
---
 xen/arch/x86/setup.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 689f828d6a..98d18f237a 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -402,7 +402,9 @@ void *__init bootstrap_map(const module_t *mod)
 
     if ( !mod )
     {
-        destroy_xen_mappings(BOOTSTRAP_MAP_BASE, BOOTSTRAP_MAP_LIMIT);
+        map_pages_to_xen(BOOTSTRAP_MAP_BASE, INVALID_MFN,
+                         PFN_DOWN(map_cur - BOOTSTRAP_MAP_BASE),
+                         _PAGE_NONE);
         map_cur = BOOTSTRAP_MAP_BASE;
         return NULL;
     }
--
generated by git-patchbot for /home/xen/git/xen.git#staging-4.18