[Xen-changelog] [xen-4.1-testing] hvm: Print support/enable status of HAP superpage mappings.

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1331287384 0
# Node ID 3f158dd40b314e0a4cb24acda69257c20e269cbb
# Parent  b01091775dd9bfe2ea3ebad478a1668703c19434
hvm: Print support/enable status of HAP superpage mappings.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
xen-unstable changeset:   24992:0384f791e538
xen-unstable date:        Thu Mar 08 09:43:49 2012 +0000
---


diff -r b01091775dd9 -r 3f158dd40b31 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Thu Mar 08 10:05:04 2012 +0000
+++ b/xen/arch/x86/hvm/hvm.c    Fri Mar 09 10:03:04 2012 +0000
@@ -132,7 +132,15 @@
 
     printk("HVM: %s enabled\n", hvm_funcs.name);
     if ( hvm_funcs.hap_supported )
-        printk("HVM: Hardware Assisted Paging detected.\n");
+    {
+        printk("HVM: Hardware Assisted Paging (HAP) detected\n");
+        printk("HVM: HAP page sizes: 4kB");
+        if ( hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_2MB )
+            printk(", 2MB%s", opt_hap_2mb ? "" : " [disabled]");
+        if ( hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_1GB )
+            printk(", 1GB%s", opt_hap_1gb ? "" : " [disabled]");
+        printk("\n");
+    }
 
     /*
      * Allow direct access to the PC debug ports 0x80 and 0xed (they are
diff -r b01091775dd9 -r 3f158dd40b31 xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c       Thu Mar 08 10:05:04 2012 +0000
+++ b/xen/arch/x86/hvm/vmx/vmcs.c       Fri Mar 09 10:03:04 2012 +0000
@@ -92,11 +92,6 @@
 
     if ( !printed )
         printk(" - none\n");
-
-    if ( cpu_has_vmx_ept_1gb )
-        printk("EPT supports 1GB super page.\n");
-    if ( cpu_has_vmx_ept_2mb )
-        printk("EPT supports 2MB super page.\n");
 }
 
 static u32 adjust_vmx_controls(
diff -r b01091775dd9 -r 3f158dd40b31 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Thu Mar 08 10:05:04 2012 +0000
+++ b/xen/arch/x86/mm/p2m.c     Fri Mar 09 10:03:04 2012 +0000
@@ -40,10 +40,10 @@
 #define P2M_DEBUGGING 0
 
 /* turn on/off 1GB host page table support for hap, default on */
-static bool_t __read_mostly opt_hap_1gb = 1;
+bool_t __read_mostly opt_hap_1gb = 1;
 boolean_param("hap_1gb", opt_hap_1gb);
 
-static bool_t __read_mostly opt_hap_2mb = 1;
+bool_t __read_mostly opt_hap_2mb = 1;
 boolean_param("hap_2mb", opt_hap_2mb);
 
 /* Printouts */
diff -r b01091775dd9 -r 3f158dd40b31 xen/include/asm-x86/p2m.h
--- a/xen/include/asm-x86/p2m.h Thu Mar 08 10:05:04 2012 +0000
+++ b/xen/include/asm-x86/p2m.h Fri Mar 09 10:03:04 2012 +0000
@@ -31,6 +31,8 @@
 #include <asm/mem_sharing.h>
 #include <asm/page.h>    /* for pagetable_t */
 
+extern bool_t opt_hap_1gb, opt_hap_2mb;
+
 /*
  * The phys_to_machine_mapping maps guest physical frame numbers 
  * to machine frame numbers.  It only exists for paging_mode_translate 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog