diff mbox

[v5,01/13] x86: move callback_op code to pv/callback.c

Message ID 20170626162842.482-2-wei.liu2@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Liu June 26, 2017, 4:28 p.m. UTC 
Take the chance to change v to curr.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 xen/arch/x86/pv/Makefile    |   1 +
 xen/arch/x86/pv/callback.c  | 183 ++++++++++++++++++++++++++++++++++++++++++++
 xen/arch/x86/x86_64/traps.c | 148 -----------------------------------
 3 files changed, 184 insertions(+), 148 deletions(-)
 create mode 100644 xen/arch/x86/pv/callback.c

Comments

Andrew Cooper June 26, 2017, 4:44 p.m. UTC | #1 
On 26/06/17 17:28, Wei Liu wrote:
> Take the chance to change v to curr.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Jan Beulich June 27, 2017, 6:13 a.m. UTC | #2 
>>> Wei Liu <wei.liu2@citrix.com> 06/26/17 6:29 PM >>>
>--- a/xen/arch/x86/pv/Makefile
>+++ b/xen/arch/x86/pv/Makefile
>@@ -1,6 +1,7 @@
 >obj-y += hypercall.o
 >obj-y += traps.o
 >
>+obj-y += callback.o
 >obj-bin-y += dom0_build.init.o
 >obj-y += domain.o
 >obj-y += emulate.o

Not something to be dealt with in this patch, but - is there a reason we
have two groups of object files here? I see none, and hence would have
expected this to be a single sorted list instead of two.

Jan
Wei Liu June 27, 2017, 8:48 a.m. UTC | #3 
On Tue, Jun 27, 2017 at 12:13:19AM -0600, Jan Beulich wrote:
> >>> Wei Liu <wei.liu2@citrix.com> 06/26/17 6:29 PM >>>
> >--- a/xen/arch/x86/pv/Makefile
> >+++ b/xen/arch/x86/pv/Makefile
> >@@ -1,6 +1,7 @@
>  >obj-y += hypercall.o
>  >obj-y += traps.o
>  >
> >+obj-y += callback.o
>  >obj-bin-y += dom0_build.init.o
>  >obj-y += domain.o
>  >obj-y += emulate.o
> 
> Not something to be dealt with in this patch, but - is there a reason we
> have two groups of object files here? I see none, and hence would have
> expected this to be a single sorted list instead of two.
> 

No. It just so happened I added a newline at some point.

I will submit a patch to fix this at some point.

> Jan
>
Andrew Cooper June 27, 2017, 5:57 p.m. UTC | #4 
On 27/06/17 09:48, Wei Liu wrote:
> On Tue, Jun 27, 2017 at 12:13:19AM -0600, Jan Beulich wrote:
>>>>> Wei Liu <wei.liu2@citrix.com> 06/26/17 6:29 PM >>>
>>> --- a/xen/arch/x86/pv/Makefile
>>> +++ b/xen/arch/x86/pv/Makefile
>>> @@ -1,6 +1,7 @@
>>  >obj-y += hypercall.o
>>  >obj-y += traps.o
>>  >
>>> +obj-y += callback.o
>>  >obj-bin-y += dom0_build.init.o
>>  >obj-y += domain.o
>>  >obj-y += emulate.o
>>
>> Not something to be dealt with in this patch, but - is there a reason we
>> have two groups of object files here? I see none, and hence would have
>> expected this to be a single sorted list instead of two.
>>
> No. It just so happened I added a newline at some point.
>
> I will submit a patch to fix this at some point.

I'd suggest splitting the obj-y and obj-bin-y lists, as it will make the
Makefile easier to read.  That appears to have been the original
intention behind the space in the first place.

~Andrew
Wei Liu June 28, 2017, 10:14 a.m. UTC | #5 
On Tue, Jun 27, 2017 at 06:57:52PM +0100, Andrew Cooper wrote:
> On 27/06/17 09:48, Wei Liu wrote:
> > On Tue, Jun 27, 2017 at 12:13:19AM -0600, Jan Beulich wrote:
> >>>>> Wei Liu <wei.liu2@citrix.com> 06/26/17 6:29 PM >>>
> >>> --- a/xen/arch/x86/pv/Makefile
> >>> +++ b/xen/arch/x86/pv/Makefile
> >>> @@ -1,6 +1,7 @@
> >>  >obj-y += hypercall.o
> >>  >obj-y += traps.o
> >>  >
> >>> +obj-y += callback.o
> >>  >obj-bin-y += dom0_build.init.o
> >>  >obj-y += domain.o
> >>  >obj-y += emulate.o
> >>
> >> Not something to be dealt with in this patch, but - is there a reason we
> >> have two groups of object files here? I see none, and hence would have
> >> expected this to be a single sorted list instead of two.
> >>
> > No. It just so happened I added a newline at some point.
> >
> > I will submit a patch to fix this at some point.
> 
> I'd suggest splitting the obj-y and obj-bin-y lists, as it will make the
> Makefile easier to read.  That appears to have been the original
> intention behind the space in the first place.
> 

That's a good suggestion.
diff mbox

Patch

diff --git a/xen/arch/x86/pv/Makefile b/xen/arch/x86/pv/Makefile
index 7e3da332d8..bd1a7081fc 100644
--- a/xen/arch/x86/pv/Makefile
+++ b/xen/arch/x86/pv/Makefile
@@ -1,6 +1,7 @@ 
 obj-y += hypercall.o
 obj-y += traps.o
 
+obj-y += callback.o
 obj-bin-y += dom0_build.init.o
 obj-y += domain.o
 obj-y += emulate.o
diff --git a/xen/arch/x86/pv/callback.c b/xen/arch/x86/pv/callback.c
new file mode 100644
index 0000000000..cbcdeac2da
--- /dev/null
+++ b/xen/arch/x86/pv/callback.c
@@ -0,0 +1,183 @@ 
+/*
+ * pv/callback.c
+ *
+ * hypercall handles and helper functions for guest callback
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms and conditions of the GNU General Public
+ * License, version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <xen/guest_access.h>
+#include <xen/lib.h>
+#include <xen/sched.h>
+
+#include <asm/current.h>
+#include <asm/nmi.h>
+#include <asm/traps.h>
+
+#include <public/callback.h>
+
+static long register_guest_callback(struct callback_register *reg)
+{
+    long ret = 0;
+    struct vcpu *curr = current;
+
+    if ( !is_canonical_address(reg->address) )
+        return -EINVAL;
+
+    switch ( reg->type )
+    {
+    case CALLBACKTYPE_event:
+        curr->arch.pv_vcpu.event_callback_eip    = reg->address;
+        break;
+
+    case CALLBACKTYPE_failsafe:
+        curr->arch.pv_vcpu.failsafe_callback_eip = reg->address;
+        if ( reg->flags & CALLBACKF_mask_events )
+            set_bit(_VGCF_failsafe_disables_events,
+                    &curr->arch.vgc_flags);
+        else
+            clear_bit(_VGCF_failsafe_disables_events,
+                      &curr->arch.vgc_flags);
+        break;
+
+    case CALLBACKTYPE_syscall:
+        curr->arch.pv_vcpu.syscall_callback_eip  = reg->address;
+        if ( reg->flags & CALLBACKF_mask_events )
+            set_bit(_VGCF_syscall_disables_events,
+                    &curr->arch.vgc_flags);
+        else
+            clear_bit(_VGCF_syscall_disables_events,
+                      &curr->arch.vgc_flags);
+        break;
+
+    case CALLBACKTYPE_syscall32:
+        curr->arch.pv_vcpu.syscall32_callback_eip = reg->address;
+        curr->arch.pv_vcpu.syscall32_disables_events =
+            !!(reg->flags & CALLBACKF_mask_events);
+        break;
+
+    case CALLBACKTYPE_sysenter:
+        curr->arch.pv_vcpu.sysenter_callback_eip = reg->address;
+        curr->arch.pv_vcpu.sysenter_disables_events =
+            !!(reg->flags & CALLBACKF_mask_events);
+        break;
+
+    case CALLBACKTYPE_nmi:
+        ret = register_guest_nmi_callback(reg->address);
+        break;
+
+    default:
+        ret = -ENOSYS;
+        break;
+    }
+
+    return ret;
+}
+
+static long unregister_guest_callback(struct callback_unregister *unreg)
+{
+    long ret;
+
+    switch ( unreg->type )
+    {
+    case CALLBACKTYPE_event:
+    case CALLBACKTYPE_failsafe:
+    case CALLBACKTYPE_syscall:
+    case CALLBACKTYPE_syscall32:
+    case CALLBACKTYPE_sysenter:
+        ret = -EINVAL;
+        break;
+
+    case CALLBACKTYPE_nmi:
+        ret = unregister_guest_nmi_callback();
+        break;
+
+    default:
+        ret = -ENOSYS;
+        break;
+    }
+
+    return ret;
+}
+
+long do_callback_op(int cmd, XEN_GUEST_HANDLE_PARAM(const_void) arg)
+{
+    long ret;
+
+    switch ( cmd )
+    {
+    case CALLBACKOP_register:
+    {
+        struct callback_register reg;
+
+        ret = -EFAULT;
+        if ( copy_from_guest(&reg, arg, 1) )
+            break;
+
+        ret = register_guest_callback(&reg);
+    }
+    break;
+
+    case CALLBACKOP_unregister:
+    {
+        struct callback_unregister unreg;
+
+        ret = -EFAULT;
+        if ( copy_from_guest(&unreg, arg, 1) )
+            break;
+
+        ret = unregister_guest_callback(&unreg);
+    }
+    break;
+
+    default:
+        ret = -ENOSYS;
+        break;
+    }
+
+    return ret;
+}
+
+long do_set_callbacks(unsigned long event_address,
+                      unsigned long failsafe_address,
+                      unsigned long syscall_address)
+{
+    struct callback_register event = {
+        .type = CALLBACKTYPE_event,
+        .address = event_address,
+    };
+    struct callback_register failsafe = {
+        .type = CALLBACKTYPE_failsafe,
+        .address = failsafe_address,
+    };
+    struct callback_register syscall = {
+        .type = CALLBACKTYPE_syscall,
+        .address = syscall_address,
+    };
+
+    register_guest_callback(&event);
+    register_guest_callback(&failsafe);
+    register_guest_callback(&syscall);
+
+    return 0;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index c87746ef1c..79bfc4d3f0 100644
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -23,7 +23,6 @@ 
 #include <asm/shared.h>
 #include <asm/hvm/hvm.h>
 #include <asm/hvm/support.h>
-#include <public/callback.h>
 
 
 static void print_xen_info(void)
@@ -336,153 +335,6 @@  void subarch_percpu_traps_init(void)
     wrmsrl(MSR_SYSCALL_MASK, XEN_SYSCALL_MASK);
 }
 
-static long register_guest_callback(struct callback_register *reg)
-{
-    long ret = 0;
-    struct vcpu *v = current;
-
-    if ( !is_canonical_address(reg->address) )
-        return -EINVAL;
-
-    switch ( reg->type )
-    {
-    case CALLBACKTYPE_event:
-        v->arch.pv_vcpu.event_callback_eip    = reg->address;
-        break;
-
-    case CALLBACKTYPE_failsafe:
-        v->arch.pv_vcpu.failsafe_callback_eip = reg->address;
-        if ( reg->flags & CALLBACKF_mask_events )
-            set_bit(_VGCF_failsafe_disables_events,
-                    &v->arch.vgc_flags);
-        else
-            clear_bit(_VGCF_failsafe_disables_events,
-                      &v->arch.vgc_flags);
-        break;
-
-    case CALLBACKTYPE_syscall:
-        v->arch.pv_vcpu.syscall_callback_eip  = reg->address;
-        if ( reg->flags & CALLBACKF_mask_events )
-            set_bit(_VGCF_syscall_disables_events,
-                    &v->arch.vgc_flags);
-        else
-            clear_bit(_VGCF_syscall_disables_events,
-                      &v->arch.vgc_flags);
-        break;
-
-    case CALLBACKTYPE_syscall32:
-        v->arch.pv_vcpu.syscall32_callback_eip = reg->address;
-        v->arch.pv_vcpu.syscall32_disables_events =
-            !!(reg->flags & CALLBACKF_mask_events);
-        break;
-
-    case CALLBACKTYPE_sysenter:
-        v->arch.pv_vcpu.sysenter_callback_eip = reg->address;
-        v->arch.pv_vcpu.sysenter_disables_events =
-            !!(reg->flags & CALLBACKF_mask_events);
-        break;
-
-    case CALLBACKTYPE_nmi:
-        ret = register_guest_nmi_callback(reg->address);
-        break;
-
-    default:
-        ret = -ENOSYS;
-        break;
-    }
-
-    return ret;
-}
-
-static long unregister_guest_callback(struct callback_unregister *unreg)
-{
-    long ret;
-
-    switch ( unreg->type )
-    {
-    case CALLBACKTYPE_event:
-    case CALLBACKTYPE_failsafe:
-    case CALLBACKTYPE_syscall:
-    case CALLBACKTYPE_syscall32:
-    case CALLBACKTYPE_sysenter:
-        ret = -EINVAL;
-        break;
-
-    case CALLBACKTYPE_nmi:
-        ret = unregister_guest_nmi_callback();
-        break;
-
-    default:
-        ret = -ENOSYS;
-        break;
-    }
-
-    return ret;
-}
-
-
-long do_callback_op(int cmd, XEN_GUEST_HANDLE_PARAM(const_void) arg)
-{
-    long ret;
-
-    switch ( cmd )
-    {
-    case CALLBACKOP_register:
-    {
-        struct callback_register reg;
-
-        ret = -EFAULT;
-        if ( copy_from_guest(&reg, arg, 1) )
-            break;
-
-        ret = register_guest_callback(&reg);
-    }
-    break;
-
-    case CALLBACKOP_unregister:
-    {
-        struct callback_unregister unreg;
-
-        ret = -EFAULT;
-        if ( copy_from_guest(&unreg, arg, 1) )
-            break;
-
-        ret = unregister_guest_callback(&unreg);
-    }
-    break;
-
-    default:
-        ret = -ENOSYS;
-        break;
-    }
-
-    return ret;
-}
-
-long do_set_callbacks(unsigned long event_address,
-                      unsigned long failsafe_address,
-                      unsigned long syscall_address)
-{
-    struct callback_register event = {
-        .type = CALLBACKTYPE_event,
-        .address = event_address,
-    };
-    struct callback_register failsafe = {
-        .type = CALLBACKTYPE_failsafe,
-        .address = failsafe_address,
-    };
-    struct callback_register syscall = {
-        .type = CALLBACKTYPE_syscall,
-        .address = syscall_address,
-    };
-
-    register_guest_callback(&event);
-    register_guest_callback(&failsafe);
-    register_guest_callback(&syscall);
-
-    return 0;
-}
-
 #include "compat/traps.c"
 
 void hypercall_page_initialise(struct domain *d, void *hypercall_page)