Skip to contentSkip to conversation

32-on-64 physdev ops

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

lore
Share & tools
lore
#0 lore raw

RFC PATCH 11/17 32-on-64 physdev ops

xen/arch/x86/compat.c +11 -3
Index: 2006-10-04/xen/arch/x86/compat.c
===================================================================
@@ -9,17 +9,23 @@
 #include <xen/guest_access.h>
 #include <xen/hypercall.h>
 
+#ifndef COMPAT
+typedef long ret_t;
+#endif
+
 /* Legacy hypercall (as of 0x00030202). */
-long do_physdev_op_compat(XEN_GUEST_HANDLE(physdev_op_t) uop)
+ret_t do_physdev_op_compat(XEN_GUEST_HANDLE(physdev_op_t) uop)
 {
     struct physdev_op op;
 
     if ( unlikely(copy_from_guest(&op, uop, 1) != 0) )
         return -EFAULT;
 
-    return do_physdev_op(op.cmd, (XEN_GUEST_HANDLE(void)) { &uop.p->u });
+    return do_physdev_op(op.cmd, guest_handle_from_ptr(&uop.p->u, void));
 }
 
+#ifndef COMPAT
+
 /* Legacy hypercall (as of 0x00030202). */
 long do_event_channel_op_compat(XEN_GUEST_HANDLE(evtchn_op_t) uop)
 {
@@ -28,5 +34,7 @@ long do_event_channel_op_compat(XEN_GUES
     if ( unlikely(copy_from_guest(&op, uop, 1) != 0) )
         return -EFAULT;
 
-    return do_event_channel_op(op.cmd, (XEN_GUEST_HANDLE(void)) {&uop.p->u });
+    return do_event_channel_op(op.cmd, guest_handle_from_ptr(&uop.p->u, void));
 }
+
+#endif
xen/arch/x86/physdev.c +11 -2
Index: 2006-10-04/xen/arch/x86/physdev.c
===================================================================
@@ -9,9 +9,14 @@
 #include <xen/guest_access.h>
 #include <asm/current.h>
 #include <asm/smpboot.h>
+#include <asm/hypercall.h>
 #include <public/xen.h>
 #include <public/physdev.h>
 
+#ifndef COMPAT
+typedef long ret_t;
+#endif
+
 int
 ioapic_guest_read(
     unsigned long physbase, unsigned int reg, u32 *pval);
@@ -19,10 +24,10 @@ int
 ioapic_guest_write(
     unsigned long physbase, unsigned int reg, u32 pval);
 
-long do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg)
+ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg)
 {
     int irq;
-    long ret;
+    ret_t ret;
 
     switch ( cmd )
     {
@@ -129,7 +134,11 @@ long do_physdev_op(int cmd, XEN_GUEST_HA
              (set_iobitmap.nr_ports > 65536) )
             break;
         ret = 0;
+#ifndef COMPAT
         current->arch.iobmp       = set_iobitmap.bitmap;
+#else
+        guest_from_compat_handle(current->arch.iobmp, set_iobitmap.bitmap);
+#endif
         current->arch.iobmp_limit = set_iobitmap.nr_ports;
         break;
     }
xen/arch/x86/x86_64/Makefile +5 -0
Index: 2006-10-04/xen/arch/x86/x86_64/Makefile
===================================================================
@@ -3,9 +3,14 @@ obj-y += io.o
 obj-y += mm.o
 obj-y += traps.o
 
+obj-$(CONFIG_COMPAT) += compat.o
+obj-$(CONFIG_COMPAT) += physdev.o
+
 ifeq ($(CONFIG_COMPAT),y)
 # extra dependencies
+compat.o:	../compat.c
 entry.o:	compat/entry.S
 mm.o:		compat/mm.c
+physdev.o:	../physdev.c
 traps.o:	compat/traps.c
 endif
xen/arch/x86/x86_64/compat.c new file +29 -0
Index: 2006-10-04/xen/arch/x86/x86_64/compat.c
===================================================================
@@ -0,0 +1,29 @@
+/******************************************************************************
+ * compat.c
+ */
+
+#include <xen/config.h>
+#include <xen/hypercall.h>
+#include <compat/physdev.h>
+
+DEFINE_XEN_GUEST_HANDLE(physdev_op_compat_t);
+#define physdev_op                    compat_physdev_op
+#define physdev_op_t                  physdev_op_compat_t
+#define do_physdev_op                 compat_physdev_op
+#define do_physdev_op_compat(x)       compat_physdev_op_compat(_##x)
+
+#define COMPAT
+#define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t)
+typedef int ret_t;
+
+#include "../compat.c"
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
xen/arch/x86/x86_64/compat/entry.S +2 -6
Index: 2006-10-04/xen/arch/x86/x86_64/compat/entry.S
===================================================================
@@ -283,15 +283,11 @@ CFIX14:
 #define compat_platform_op domain_crash_synchronous
 #define compat_multicall domain_crash_synchronous
 #define compat_set_timer_op domain_crash_synchronous
-#define compat_event_channel_op_compat domain_crash_synchronous
-#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_acm_op domain_crash_synchronous
 #define compat_arch_sched_op domain_crash_synchronous
 #define compat_xenoprof_op domain_crash_synchronous
-#define compat_event_channel_op domain_crash_synchronous
-#define compat_physdev_op domain_crash_synchronous
 #define compat_sysctl domain_crash_synchronous
 #define compat_domctl domain_crash_synchronous
 
@@ -312,7 +308,7 @@ ENTRY(compat_hypercall_table)
         .quad compat_multicall
         .quad compat_update_va_mapping
         .quad compat_set_timer_op       /* 15 */
-        .quad compat_event_channel_op_compat
+        .quad do_event_channel_op_compat
         .quad compat_xen_version
         .quad do_console_io
         .quad compat_physdev_op_compat
@@ -328,7 +324,7 @@ ENTRY(compat_hypercall_table)
         .quad compat_arch_sched_op
         .quad compat_callback_op        /* 30 */
         .quad compat_xenoprof_op
-        .quad compat_event_channel_op
+        .quad do_event_channel_op
         .quad compat_physdev_op
         .quad compat_ni_hypercall
         .quad compat_sysctl             /* 35 */
xen/arch/x86/x86_64/physdev.c new file +48 -0

48 lines not on this page · raw message

xen/common/compat/xlat.c +25 -1
Index: 2006-10-04/xen/common/compat/xlat.c
===================================================================
@@ -4,8 +4,8 @@
 
 #include <xen/compat.h>
 #include <xen/lib.h>
-#include <public/xen.h>
 #include <compat/xen.h>
+#include <compat/event_channel.h>
 
 /* In-place translation functons: */
 void xlat_start_info(struct start_info *native,
@@ -21,6 +21,30 @@ void xlat_start_info(struct start_info *
 CHECK_dom0_vga_console_info
 #undef dom0_vga_console_info
 
+#define xen_evtchn_alloc_unbound evtchn_alloc_unbound
+#define xen_evtchn_bind_interdomain evtchn_bind_interdomain
+#define xen_evtchn_bind_ipi evtchn_bind_ipi
+#define xen_evtchn_bind_pirq evtchn_bind_pirq
+#define xen_evtchn_bind_vcpu evtchn_bind_vcpu
+#define xen_evtchn_bind_virq evtchn_bind_virq
+#define xen_evtchn_close evtchn_close
+#define xen_evtchn_op evtchn_op
+#define xen_evtchn_send evtchn_send
+#define xen_evtchn_status evtchn_status
+#define xen_evtchn_unmask evtchn_unmask
+CHECK_evtchn_op
+#undef xen_evtchn_alloc_unbound
+#undef xen_evtchn_bind_interdomain
+#undef xen_evtchn_bind_ipi
+#undef xen_evtchn_bind_pirq
+#undef xen_evtchn_bind_vcpu
+#undef xen_evtchn_bind_virq
+#undef xen_evtchn_close
+#undef xen_evtchn_op
+#undef xen_evtchn_send
+#undef xen_evtchn_status
+#undef xen_evtchn_unmask
+
 #define xen_mmu_update mmu_update
 CHECK_mmu_update
 #undef xen_mmu_update
xen/include/asm-x86/hypercall.h +9 -0
Index: 2006-10-04/xen/include/asm-x86/hypercall.h
===================================================================
@@ -118,4 +118,13 @@ do_set_callbacks(
 
 #endif
 
+#ifdef CONFIG_COMPAT
+
+extern int
+compat_physdev_op(
+    int cmd,
+    XEN_GUEST_HANDLE(void) arg);
+
+#endif
+
 #endif /* __ASM_X86_HYPERCALL_H__ */
xen/include/xlat.lst +11 -0
Index: 2006-10-04/xen/include/xlat.lst
===================================================================
@@ -6,6 +6,17 @@
 !	mmuext_op			xen.h
 !	start_info			xen.h
 ?	vcpu_time_info			xen.h
+?	evtchn_alloc_unbound		event_channel.h
+?	evtchn_bind_interdomain		event_channel.h
+?	evtchn_bind_ipi			event_channel.h
+?	evtchn_bind_pirq		event_channel.h
+?	evtchn_bind_vcpu		event_channel.h
+?	evtchn_bind_virq		event_channel.h
+?	evtchn_close			event_channel.h
+?	evtchn_op			event_channel.h
+?	evtchn_send			event_channel.h
+?	evtchn_status			event_channel.h
+?	evtchn_unmask			event_channel.h
 !	add_to_physmap			memory.h
 !	memory_exchange			memory.h
 !	memory_map			memory.h