32-on-64 VCPU ops
RFC PATCH 12/17 32-on-64 VCPU ops
xen/arch/x86/domain.c +18 -3
@@ -40,6 +40,9 @@#include <asm/hvm/hvm.h> #include <asm/hvm/support.h> #include <asm/msr.h> +#ifdef CONFIG_COMPAT +#include <compat/vcpu.h> +#endif DEFINE_PER_CPU(struct vcpu *, curr_vcpu);
@@ -532,7 +535,7 @@ arch_do_vcpu_op(break ; rc =0 ; - v->runstate_guest = area.addr.h; +runstate_guest (v) = area.addr.h;if ( v == current )__copy_to_guest (area.addr.h, &v->runstate,1 );
@@ -958,8 +961,20 @@ void context_switch(struct vcpu *prev, scontext_saved (prev);/* Update per-VCPU guest runstate shared memory area (if registered). */ -if ( !guest_handle_is_null (next->runstate_guest) ) -__copy_to_guest (next->runstate_guest, &next->runstate,1 ); +if ( !guest_handle_is_null (runstate_guest (next)) ) + { +if ( !IS_COMPAT (next->domain) ) +__copy_to_guest (runstate_guest (next), &next->runstate,1 ); +#ifdef CONFIG_COMPAT + else + { +struct compat_vcpu_runstate_info info; + +XLAT_vcpu_runstate_info (&info, &next->runstate); +__copy_to_guest (next->runstate_guest.compat, &info,1 ); + } +#endif + }schedule_tail (next);BUG ();
xen/arch/x86/x86_64/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-y += mm.o obj-y += traps.o obj-$(CONFIG_COMPAT) += compat.o +obj-$(CONFIG_COMPAT) += domain.o obj-$(CONFIG_COMPAT) += physdev.o ifeq ($(CONFIG_COMPAT),y)
xen/arch/x86/x86_64/compat/entry.S +0 -1
@@ -284,7 +284,6 @@ CFIX14: #define compat_multicall domain_crash_synchronous #define compat_set_timer_op 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
xen/arch/x86/x86_64/domain.c new file +62 -0
62 lines not on this page · raw message
xen/common/compat/Makefile +1 -0
@@ -1,3 +1,4 @@ +obj-y += domain.o obj-y += kernel.o obj-y += memory.o obj-y += xlat.o
xen/common/compat/domain.c new file +102 -0
102 lines not on this page · raw message
xen/common/compat/xlat.c +9 -0
@@ -6,6 +6,7 @@#include <xen/lib.h> #include <compat/xen.h> #include <compat/event_channel.h> +#include <compat/vcpu.h> /* In-place translation functons: */ void xlat_start_info(struct start_info *native,
@@ -17,6 +18,14 @@ void xlat_start_info(struct start_info *XLAT_start_info (compat, native); } +void xlat_vcpu_runstate_info (struct vcpu_runstate_info *native) +{ +struct compat_vcpu_runstate_info *compat = (void *)native; + +BUILD_BUG_ON (sizeof (*native) <sizeof (*compat)); +XLAT_vcpu_runstate_info (compat, native); +} +#define xen_dom0_vga_console_info dom0_vga_console_infoCHECK_dom0_vga_console_info #undef dom0_vga_console_info
xen/include/asm-x86/hypercall.h +4 -0
@@ -125,6 +125,10 @@ compat_physdev_op( int cmd, XEN_GUEST_HANDLE(void) arg); +extern int +arch_compat_vcpu_op ( +int cmd,struct vcpu *v,XEN_GUEST_HANDLE (void ) arg); +#endif #endif /* __ASM_X86_HYPERCALL_H__ */
xen/include/xen/compat.h +2 -0
@@ -148,6 +148,8 @@ int hypercall_xlat_continuation(unsigned/* In-place translation functons: */ struct start_info ;void xlat_start_info (struct start_info *,enum XLAT_start_info_console ); +struct vcpu_runstate_info ; +void xlat_vcpu_runstate_info (struct vcpu_runstate_info *);#define BITS_PER_GUEST_LONG (d) (!IS_COMPAT(d) ? BITS_PER_LONG : COMPAT_BITS_PER_LONG)
xen/include/xen/sched.h +14 -0
@@ -18,6 +18,11 @@#include <xen/xenoprof.h> #include <xen/irq.h> +#ifdef CONFIG_COMPAT +#include <compat/vcpu.h> +DEFINE_XEN_GUEST_HANDLE (vcpu_runstate_info_compat_t); +#endif +extern unsigned long volatile jiffies;extern rwlock_t domlist_lock;
@@ -82,7 +87,16 @@ struct vcpuvoid *sched_priv;/* scheduler-specific data */ struct vcpu_runstate_info runstate; +#ifndef CONFIG_COMPAT +# define runstate_guest (v) ((v)->runstate_guest)XEN_GUEST_HANDLE (vcpu_runstate_info_t) runstate_guest;/* guest address */ +#else +# define runstate_guest (v) ((v)->runstate_guest.native) +union { +XEN_GUEST_HANDLE (vcpu_runstate_info_t) native; +XEN_GUEST_HANDLE (vcpu_runstate_info_compat_t) compat; + } runstate_guest;/* guest address */ +#endif unsigned long vcpu_flags;
xen/include/xlat.lst +4 -0
@@ -6,6 +6,9 @@ ! mmuext_op xen.h ! start_info xen.h ? vcpu_time_info xen.h +! cpu_user_regs arch-@[email protected] +! trap_info arch-@[email protected] +! vcpu_guest_context arch-@[email protected] ? evtchn_alloc_unbound event_channel.h ? evtchn_bind_interdomain event_channel.h ? evtchn_bind_ipi event_channel.h
@@ -22,3 +25,4 @@ ! memory_map memory.h ! memory_reservation memory.h ! translate_gpfn_list memory.h +! vcpu_runstate_info vcpu.h