[Xen-devel] xen/arm: domheap mappings can have avail > 0

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

We use 2 MB slots to map domain pages. As a consequence one slot can be
used for more than one 4k page mapping.

Change the ASSERT to reflect that.


Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>

diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index ae0394c..03e9083 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -216,7 +216,7 @@ void unmap_domain_page(const void *va)
     local_irq_save(flags);
 
     ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES);
-    ASSERT(map[slot].pt.avail != 0);
+    ASSERT(map[slot].pt.avail > 0);
 
     map[slot].pt.avail--;
 
@@ -230,7 +230,7 @@ unsigned long domain_page_map_to_mfn(const void *va)
     unsigned long offset = ((unsigned long)va>>THIRD_SHIFT) & LPAE_ENTRY_MASK;
 
     ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES);
-    ASSERT(map[slot].pt.avail != 0);
+    ASSERT(map[slot].pt.avail > 0);
 
     return map[slot].pt.base + offset;
 }

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel