From patchwork Thu May 18 17:09:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9734881 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 1BA66601BC for ; Thu, 18 May 2017 17:13:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F35A0288B9 for ; Thu, 18 May 2017 17:13:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E83DE288C3; Thu, 18 May 2017 17:13:04 +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 775D6288B9 for ; Thu, 18 May 2017 17:13:03 +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 1dBOwJ-0002oF-Qh; Thu, 18 May 2017 17:10:15 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dBOwH-0002mk-TT for xen-devel@lists.xenproject.org; Thu, 18 May 2017 17:10:14 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id 7E/B3-03920-575DD195; Thu, 18 May 2017 17:10:13 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeJIrShJLcpLzFFi42JxWrrBXrfkqmy kwY9Huhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8a7b5uZC+6KVDR8aWNrYJwq2MXIySEh4C+x 6N8tFhCbTUBZ4mdnLxuILSKgJ9F04DkjiM0skCdxdvUiVhBbWCBKYtrZb2A1LAKqEu/3HQCL8 wpYSLxpX8IGMVNeYlfbRaA4BwengKXEg6MuIGEhoJK9D9czQ9gKEh3TjzFBtApKnJz5hAVilY TEwRcvmCcw8s5CkpqFJLWAkWkVo3pxalFZapGuiV5SUWZ6RkluYmaOrqGBmV5uanFxYnpqTmJ SsV5yfu4mRmDgMADBDsbuy/6HGCU5mJREeQ8XyEYK8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuCd cQUoJ1iUmp5akZaZAwxhmLQEB4+SCK8sSJq3uCAxtzgzHSJ1ilFRSpzXByQhAJLIKM2Da4PFz SVGWSlhXkagQ4R4ClKLcjNLUOVfMYpzMCoJ894AmcKTmVcCN/0V0GImoMXND6RBFpckIqSkGh hD/utcULocu1mN91tG4Fz3FIskff5CpeefTRkM7tVXvZSUtZw5S++M4PfH0wUFvXm82Q5U1Gk VPgoK4nvEPOv+v6Wx6tKur6bPCDh/N0HMdyoHm0utV4xyfvakVPulGTE/zddfXu7Gwll8NX0j y96drfz2T7Pr72pq97ip//iX7u34IKKqVomlOCPRUIu5qDgRABkuE9WWAgAA X-Env-Sender: prvs=304fe0a9c=wei.liu2@citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1495127407!103216303!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.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59558 invoked from network); 18 May 2017 17:10:12 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 18 May 2017 17:10:12 -0000 X-IronPort-AV: E=Sophos;i="5.38,359,1491264000"; d="scan'208";a="433060343" From: Wei Liu To: Xen-devel Date: Thu, 18 May 2017 18:09:50 +0100 Message-ID: <20170518171004.27204-9-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170518171004.27204-1-wei.liu2@citrix.com> References: <20170518171004.27204-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH for-next v3 08/22] x86/traps: move set_guest_{machinecheck, nmi}_trapbounce 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 No functional change. Signed-off-by: Wei Liu --- xen/arch/x86/pv/traps.c | 27 +++++++++++++++++++++++++++ xen/arch/x86/traps.c | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 79304704dd..d7e8db5820 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -201,6 +201,33 @@ void pv_inject_event(const struct x86_event *event) } } +/* + * Called from asm to set up the MCE trapbounce info. + * Returns 0 if no callback is set up, else 1. + */ +int set_guest_machinecheck_trapbounce(void) +{ + struct vcpu *v = current; + struct trap_bounce *tb = &v->arch.pv_vcpu.trap_bounce; + + pv_inject_hw_exception(TRAP_machine_check, X86_EVENT_NO_EC); + tb->flags &= ~TBF_EXCEPTION; /* not needed for MCE delivery path */ + return !null_trap_bounce(v, tb); +} + +/* + * Called from asm to set up the NMI trapbounce info. + * Returns 0 if no callback is set up, else 1. + */ +int set_guest_nmi_trapbounce(void) +{ + struct vcpu *v = current; + struct trap_bounce *tb = &v->arch.pv_vcpu.trap_bounce; + pv_inject_hw_exception(TRAP_nmi, X86_EVENT_NO_EC); + tb->flags &= ~TBF_EXCEPTION; /* not needed for NMI delivery path */ + return !null_trap_bounce(v, tb); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 96f3ffffd6..8eb7b31a6c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -627,33 +627,6 @@ void fatal_trap(const struct cpu_user_regs *regs, bool_t show_remote) (regs->eflags & X86_EFLAGS_IF) ? "" : ", IN INTERRUPT CONTEXT"); } -/* - * Called from asm to set up the MCE trapbounce info. - * Returns 0 if no callback is set up, else 1. - */ -int set_guest_machinecheck_trapbounce(void) -{ - struct vcpu *v = current; - struct trap_bounce *tb = &v->arch.pv_vcpu.trap_bounce; - - pv_inject_hw_exception(TRAP_machine_check, X86_EVENT_NO_EC); - tb->flags &= ~TBF_EXCEPTION; /* not needed for MCE delivery path */ - return !null_trap_bounce(v, tb); -} - -/* - * Called from asm to set up the NMI trapbounce info. - * Returns 0 if no callback is set up, else 1. - */ -int set_guest_nmi_trapbounce(void) -{ - struct vcpu *v = current; - struct trap_bounce *tb = &v->arch.pv_vcpu.trap_bounce; - pv_inject_hw_exception(TRAP_nmi, X86_EVENT_NO_EC); - tb->flags &= ~TBF_EXCEPTION; /* not needed for NMI delivery path */ - return !null_trap_bounce(v, tb); -} - void do_reserved_trap(struct cpu_user_regs *regs) { unsigned int trapnr = regs->entry_vector;