Skip to contentSkip to conversation

32-on-64 mmu ops

RFC PATCH In review Jan Beulich 1 participant 1 message Oct 4, 2006

lore
Share & tools
lore
#0 lore raw

RFC PATCH 10/17 32-on-64 mmu ops

xen/arch/x86/mm.c +8 -8
Index: 2006-10-04/xen/arch/x86/mm.c
===================================================================
@@ -106,6 +106,7 @@
 #include <asm/ldt.h>
 #include <asm/x86_emulate.h>
 #include <asm/e820.h>
+#include <asm/hypercall.h>
 #include <public/memory.h>
 
 #ifdef VERBOSE
@@ -125,13 +126,6 @@
 #define PTE_UPDATE_WITH_CMPXCHG
 #endif
 
-/*
- * Both do_mmuext_op() and do_mmu_update():
- * We steal the m.s.b. of the @count parameter to indicate whether this
- * invocation of do_mmu_update() is resuming a previously preempted call.
- */
-#define MMU_UPDATE_PREEMPTED          (~(~0U>>1))
-
 /* Used to defer flushing of memory structures. */
 struct percpu_mm_info {
 #define DOP_FLUSH_TLB      (1<<0) /* Flush the local TLB.                    */
@@ -2011,6 +2005,8 @@ int do_mmuext_op(
 
         case MMUEXT_PIN_L4_TABLE:
             type = PGT_l4_page_table;
+            if ( IS_COMPAT(FOREIGNDOM) )
+                break;
 
         pin_page:
             /* Ignore pinning of invalid paging levels. */
@@ -2073,7 +2069,11 @@ int do_mmuext_op(
         
 #ifdef __x86_64__
         case MMUEXT_NEW_USER_BASEPTR:
-            okay = 1;
+            if ( IS_COMPAT(FOREIGNDOM) )
+            {
+                okay = 0;
+                break;
+            }
             if (likely(mfn != 0))
             {
                 if ( shadow_mode_refcounts(d) )
xen/arch/x86/x86_64/compat/entry.S +1 -3
Index: 2006-10-04/xen/arch/x86/x86_64/compat/entry.S
===================================================================
@@ -279,7 +279,6 @@ CFIX14:
 .section .rodata, "a", @progbits
 
 #define compat_set_trap_table domain_crash_synchronous
-#define compat_mmu_update domain_crash_synchronous
 #define compat_set_gdt domain_crash_synchronous
 #define compat_platform_op domain_crash_synchronous
 #define compat_multicall domain_crash_synchronous
@@ -288,7 +287,6 @@ CFIX14:
 #define compat_physdev_op_compat domain_crash_synchronous
 #define compat_grant_table_op domain_crash_synchronous
 #define compat_vcpu_op domain_crash_synchronous
-#define compat_mmuext_op domain_crash_synchronous
 #define compat_acm_op domain_crash_synchronous
 #define compat_arch_sched_op domain_crash_synchronous
 #define compat_xenoprof_op domain_crash_synchronous
@@ -299,7 +297,7 @@ CFIX14:
 
 ENTRY(compat_hypercall_table)
         .quad compat_set_trap_table     /*  0 */
-        .quad compat_mmu_update
+        .quad do_mmu_update
         .quad compat_set_gdt
         .quad do_stack_switch
         .quad compat_set_callbacks
xen/arch/x86/x86_64/compat/mm.c +147 -0

159 lines not on this page · raw message

xen/common/compat/xlat.c +4 -0
Index: 2006-10-04/xen/common/compat/xlat.c
===================================================================
@@ -21,6 +21,10 @@ void xlat_start_info(struct start_info *
 CHECK_dom0_vga_console_info
 #undef dom0_vga_console_info
 
+#define xen_mmu_update mmu_update
+CHECK_mmu_update
+#undef xen_mmu_update
+
 #define xen_vcpu_time_info vcpu_time_info
 CHECK_vcpu_time_info
 #undef xen_vcpu_time_info
xen/include/asm-x86/hypercall.h +7 -0
Index: 2006-10-04/xen/include/asm-x86/hypercall.h
===================================================================
@@ -7,6 +7,13 @@
 
 #include <public/physdev.h>
 
+/*
+ * Both do_mmuext_op() and do_mmu_update():
+ * We steal the m.s.b. of the @count parameter to indicate whether this
+ * invocation of do_mmu_update() is resuming a previously preempted call.
+ */
+#define MMU_UPDATE_PREEMPTED          (~(~0U>>1))
+
 extern long
 do_event_channel_op_compat(
     XEN_GUEST_HANDLE(evtchn_op_t) uop);
xen/include/xlat.lst +2 -0
Index: 2006-10-04/xen/include/xlat.lst
===================================================================
@@ -2,6 +2,8 @@
 # ! - needs translation
 # ? - needs checking
 ?	dom0_vga_console_info		xen.h
+?	mmu_update			xen.h
+!	mmuext_op			xen.h
 !	start_info			xen.h
 ?	vcpu_time_info			xen.h
 !	add_to_physmap			memory.h