From patchwork Mon Jun 26 16:28:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9810073 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3651460209 for ; Mon, 26 Jun 2017 16:31:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3375A280FC for ; Mon, 26 Jun 2017 16:31:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27F57252D5; Mon, 26 Jun 2017 16:31:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 46765252D5 for ; Mon, 26 Jun 2017 16:31:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPWt4-0005Br-Jb; Mon, 26 Jun 2017 16:29:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPWt3-00059F-1J for xen-devel@lists.xenproject.org; Mon, 26 Jun 2017 16:29:17 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 15/AA-19409-C5631595; Mon, 26 Jun 2017 16:29:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrrBXjfGLDD SYN0FAYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePcxK3MBe+8K57f+szWwHjAoouRg0NCwF/i 4Ub/LkZODjYBZYmfnb1sILaIgJ5E04HnjCA2s0CexNnVi1hBbGEBV4nbSxpZQGwWAVWJV58eM IKM4RUwk5h9ACwsISAvsavtIlg5p4C5RMPq6WC2EFDJrt4+NghbQaJj+jEmEJtXQFDi5MwnLB CrJCQOvnjBPIGRdxaS1CwkqQWMTKsYNYpTi8pSi3QNjfWSijLTM0pyEzNzdA0NjPVyU4uLE9N TcxKTivWS83M3MQIDhwEIdjBu2+55iFGSg0lJlJfjSUCkEF9SfkplRmJxRnxRaU5q8SFGGQ4O JQleb9PASCHBotT01Iq0zBxgCMOkJTh4lER4uzSB0rzFBYm5xZnpEKlTjLocC3o2fGESYsnLz 0uVEue1AZkhAFKUUZoHNwIWT5cYZaWEeRmBjhLiKUgtys0sQZV/xSjOwagkzOsJMoUnM68Ebt MroCOYgI5gmRcAckRJIkJKqoFRoiNmpp6s9h0ZCf170wLvfon3bb2+7nrBJ/9Xced8o+ce3Cy z0GnyVs6gE2cWntE/u3ed7G8XxrPf7Ssmbno3x0pQ+Q/LstxrbaJ7rpnYzfN8LiXD5+zNJvJp zjJZwal+QQLyO9X8nR+onSm3equqlsz65KfEgaW2dTaa5+4rZ6tlsGm5OugosRRnJBpqMRcVJ wIAZIy2l6ICAAA= X-Env-Sender: prvs=343741041=wei.liu2@citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1498494551!99840466!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8612 invoked from network); 26 Jun 2017 16:29:15 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 26 Jun 2017 16:29:15 -0000 X-IronPort-AV: E=Sophos;i="5.39,396,1493683200"; d="scan'208";a="437865422" From: Wei Liu To: Xen-devel Date: Mon, 26 Jun 2017 17:28:30 +0100 Message-ID: <20170626162842.482-2-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170626162842.482-1-wei.liu2@citrix.com> References: <20170626162842.482-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v5 01/13] x86: move callback_op code to pv/callback.c X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Take the chance to change v to curr. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- 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 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 . + */ + +#include +#include +#include + +#include +#include +#include + +#include + +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(®, arg, 1) ) + break; + + ret = register_guest_callback(®); + } + 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 #include #include -#include 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(®, arg, 1) ) - break; - - ret = register_guest_callback(®); - } - 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)