p2m: Support page orders other than 0 (4kB) and 9 (2MB)

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index dba676d57a73939a95b46fb51ecf40f7c3ed9f00..bf97d45c00afe4d63ab852b366376f074a29c9a8 100644 (file)
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -530,11 +530,25 @@ void p2m_change_entry_type_global(struct domain *d,
     p2m_unlock(p2m);
 }
 
-static inline
+static
 int set_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, 
-                  unsigned int page_order, p2m_type_t p2mt)
+                    unsigned int page_order, p2m_type_t p2mt)
 {
-    return d->arch.p2m->set_entry(d, gfn, mfn, page_order, p2mt);
+    unsigned long todo = 1ul << page_order;
+    unsigned int order;
+    int rc = 0;
+
+    while ( todo )
+    {
+        order = (((gfn | mfn_x(mfn) | todo) & ((1ul << 9) - 1)) == 0) ? 9 : 0;
+        rc = d->arch.p2m->set_entry(d, gfn, mfn, order, p2mt);
+        gfn += 1ul << order;
+        if ( mfn_x(mfn) != INVALID_MFN )
+            mfn = _mfn(mfn_x(mfn) + (1ul << order));
+        todo -= 1ul << order;
+    }
+
+    return rc;
 }
 
 // Allocate a new p2m table for a domain.