Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
xen
24116-x86-continuation-cancel.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 24116-x86-continuation-cancel.patch of Package xen
# HG changeset patch # User Jean Guyader <jean.guyader@eu.citrix.com> # Date 1321002862 -3600 # Node ID a095cf28f2b6eeb8f5873c18eb18d4d7e5544e2c # Parent 6534da595d695a4f2af12a64e46fb06219a0e4bc Hypercall continuation cancelation in compat mode for XENMEM_get/set_pod_target If copy_to_guest failed in the compat code after a continuation as been done in the native code we need to cancel it so we won't reexecute the hypercall but return from the hypercall with the appropriate error. Signed-off-by: Jean Guyader <jean.guyader@eu.citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com> Acked-by: Keir Fraser <keir@xen.org> Committed-by: Jan Beulich <jbeulich@suse.com> --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1585,6 +1585,24 @@ void sync_vcpu_execstate(struct vcpu *v) __arg; \ }) +void hypercall_cancel_continuation(void) +{ + struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct mc_state *mcs = ¤t->mc_state; + + if ( test_bit(_MCSF_in_multicall, &mcs->flags) ) + { + __clear_bit(_MCSF_call_preempted, &mcs->flags); + } + else + { + if ( !is_hvm_vcpu(current) ) + regs->eip += 2; /* skip re-execute 'syscall' / 'int $xx' */ + else + current->arch.hvm_vcpu.hcall_preempted = 0; + } +} + unsigned long hypercall_create_continuation( unsigned int op, const char *format, ...) { --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -133,7 +133,11 @@ int compat_arch_memory_op(int op, XEN_GU XLAT_pod_target(&cmp, nat); if ( copy_to_guest(arg, &cmp, 1) ) + { + if ( rc == __HYPERVISOR_memory_op ) + hypercall_cancel_continuation(); rc = -EFAULT; + } break; } --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -560,6 +560,7 @@ void startup_cpu_idle_loop(void); */ unsigned long hypercall_create_continuation( unsigned int op, const char *format, ...); +void hypercall_cancel_continuation(void); #define hypercall_preempt_check() (unlikely( \ softirq_pending(smp_processor_id()) | \
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor