[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-devel] [PATCH][P2M] check whether hap mode is enabled before using 2mb pages



This small patch checks whether hap mode is enabled when guest is trying to allocate 2MB pages inside P2M. This prevents potential errors when hap is disabled.

Cc: Chris Lalancette <clalance@xxxxxxxxxx>
Cc: Sarathy, Bhavna <Bhavna.Sarathy@xxxxxxx>
Signed-off-by: Wei Huang <wei.huang2@xxxxxxx>



diff -r 55ca7ef865b4 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Tue Jun 16 11:01:17 2009 +0100
+++ b/xen/arch/x86/mm/p2m.c     Thu Jun 18 13:07:10 2009 -0500
@@ -1499,7 +1499,11 @@ int set_p2m_entry(struct domain *d, unsi
 
     while ( todo )
     {
-        order = (((gfn | mfn_x(mfn) | todo) & ((1ul << 9) - 1)) == 0) ? 9 : 0;
+        if ( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled )
+            order = (((gfn | mfn_x(mfn) | todo) & ((1ul << 9) - 1)) == 0) ?
+                9 : 0;
+        else
+            order = 0;
         rc = d->arch.p2m->set_entry(d, gfn, mfn, order, p2mt);
         gfn += 1ul << order;
         if ( mfn_x(mfn) != INVALID_MFN )
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.