[Xen-changelog] [xen-4.1-testing] Hypercall continuation cancelation in compat mode for XENMEM_get/set_pod_target

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

# HG changeset patch
# User Jean Guyader <jean.guyader@xxxxxxxxxxxxx>
# Date 1321521205 0
# Node ID e73ada19a69daf821aa7d80323f1bd76239b9bae
# Parent  344dddd4160bec210e7cb97e772a5bcc2b0a5fa0
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@xxxxxxxxxxxxx>
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
Committed-by: Jan Beulich <jbeulich@xxxxxxxx>
xen-unstable changeset:   24116:a095cf28f2b6
xen-unstable date:        Fri Nov 11 10:14:22 2011 +0100
Committed-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 344dddd4160b -r e73ada19a69d xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c     Thu Nov 17 09:12:00 2011 +0000
+++ b/xen/arch/x86/domain.c     Thu Nov 17 09:13:25 2011 +0000
@@ -1585,6 +1585,24 @@
     __arg;                                                                  \
 })
 
+void hypercall_cancel_continuation(void)
+{
+    struct cpu_user_regs *regs = guest_cpu_user_regs();
+    struct mc_state *mcs = &current->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, ...)
 {
diff -r 344dddd4160b -r e73ada19a69d xen/arch/x86/x86_64/compat/mm.c
--- a/xen/arch/x86/x86_64/compat/mm.c   Thu Nov 17 09:12:00 2011 +0000
+++ b/xen/arch/x86/x86_64/compat/mm.c   Thu Nov 17 09:13:25 2011 +0000
@@ -133,7 +133,11 @@
         XLAT_pod_target(&cmp, nat);
 
         if ( copy_to_guest(arg, &cmp, 1) )
+        {
+            if ( rc == __HYPERVISOR_memory_op )
+                hypercall_cancel_continuation();
             rc = -EFAULT;
+        }
 
         break;
     }
diff -r 344dddd4160b -r e73ada19a69d xen/include/xen/sched.h
--- a/xen/include/xen/sched.h   Thu Nov 17 09:12:00 2011 +0000
+++ b/xen/include/xen/sched.h   Thu Nov 17 09:13:25 2011 +0000
@@ -554,6 +554,7 @@
  */
 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()) |   \

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