From: Roger Pau Monné <roger.pau@citrix.com>
Date: Mon, 25 Nov 2024 11:19:08 +0000 (+0100)
Subject: x86/mm: ensure L2 is always freed if empty
X-Git-Tag: RELEASE-4.18.4~11
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=84f5440be5e8555cc2820d0a99572e956737f1d0;p=xen.git

x86/mm: ensure L2 is always freed if empty

The current logic in modify_xen_mappings() allows for fully empty L2 tables to
not be freed and unhooked from the parent L3 if the last L2 slot is not
populated.

Ensure that even when an L2 slot is empty the logic to check whether the whole
L2 can be removed is not skipped.

Fixes: 4376c05c3113 ('x86-64: use 1GB pages in 1:1 mapping if available')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
master commit: 41c80496084aa3601230e01c3bc579a0a6d8359a
master date: 2024-11-14 16:13:10 +0100
---

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index ecd3322868..2f0e586463 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -5711,7 +5711,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf)
 
             v += 1UL << L2_PAGETABLE_SHIFT;
             v &= ~((1UL << L2_PAGETABLE_SHIFT) - 1);
-            continue;
+            goto check_l3;
         }
 
         if ( l2e_get_flags(*pl2e) & _PAGE_PSE )