From patchwork Thu Jun 8 17:11:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9776081 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 C13F560350 for ; Thu, 8 Jun 2017 17:14:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A745023B24 for ; Thu, 8 Jun 2017 17:14:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C22A28438; Thu, 8 Jun 2017 17:14:37 +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 7B93723B24 for ; Thu, 8 Jun 2017 17:14:36 +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 1dJ0yk-0004u8-Kl; Thu, 08 Jun 2017 17:12:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dJ0yj-0004rn-68 for xen-devel@lists.xenproject.org; Thu, 08 Jun 2017 17:12:13 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id CD/E6-01992-C6589395; Thu, 08 Jun 2017 17:12:12 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeJIrShJLcpLzFFi42JxWrrBXjez1TL S4PVaDovvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPmrUXMBbO0KlZe72FqYFyi0MXIySEh4C/R +usfM4jNJqAs8bOzlw3EFhHQk2g68JwRxGYWyJPo/PiRHcQWFnCX2Lb2OUsXIwcHi4CKRPfbC JAwr4ClxKPXV5ggRspL7Gq7yApicwLFl3yezgxSLiRgIdG7MwEkLCSgINEx/RgTRKugxMmZT1 ggNklIHHzxgnkCI+8sJKlZSFILGJlWMWoUpxaVpRbpGprrJRVlpmeU5CZm5ugaGpjq5aYWFye mp+YkJhXrJefnbmIEBg4DEOxgvHja8xCjJAeTkiivooBlpBBfUn5KZUZicUZ8UWlOavEhRhkO DiUJ3s/NQDnBotT01Iq0zBxgCMOkJTh4lER41zYApXmLCxJzizPTIVKnGBWlxHnPgPQJgCQyS vPg2mBxc4lRVkqYlxHoECGegtSi3MwSVPlXjOIcjErCvMktQFN4MvNK4Ka/AlrMBLR4yTsLkM UliQgpqQbGzcy9r8/Zrnu858k6nr/vdnx5ZuvFq3aI9+//PvHWlNLfPC/b0zrVoifvTo+/sMh yJTd3qtXn64f7Hp37s+B55hS2S3+LJ7aXnI7mN361cO1ujZ6zgkvr68SnHQ1+k91+rGn1it0l nHYzZ/xPuVt3fhvP5j+e4Tfki+5OqQ1Kfbv4V+ImqWVR3EosxRmJhlrMRcWJAHchv0GWAgAA X-Env-Sender: prvs=3259bf657=wei.liu2@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1496941925!66244469!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 3583 invoked from network); 8 Jun 2017 17:12:08 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jun 2017 17:12:08 -0000 X-IronPort-AV: E=Sophos;i="5.39,315,1493683200"; d="scan'208";a="435686874" From: Wei Liu To: Xen-devel Date: Thu, 8 Jun 2017 18:11:45 +0100 Message-ID: <20170608171203.20416-10-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170608171203.20416-1-wei.liu2@citrix.com> References: <20170608171203.20416-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v4 09/27] x86/traps: move pv_inject_event to pv/traps.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 opportunity to rename "v" to "curr". No functional change. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- xen/arch/x86/pv/traps.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/traps.c | 69 ---------------------------------------------- 2 files changed, 73 insertions(+), 69 deletions(-) diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 6e69f2ad58..ec7ff1040b 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -22,9 +22,13 @@ #include #include #include +#include #include +#include #include +#include +#include void do_entry_int82(struct cpu_user_regs *regs) { @@ -83,6 +87,75 @@ long do_set_trap_table(XEN_GUEST_HANDLE_PARAM(const_trap_info_t) traps) return rc; } +void pv_inject_event(const struct x86_event *event) +{ + struct vcpu *curr = current; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct trap_bounce *tb; + const struct trap_info *ti; + const uint8_t vector = event->vector; + unsigned int error_code = event->error_code; + bool use_error_code; + + ASSERT(vector == event->vector); /* Confirm no truncation. */ + if ( event->type == X86_EVENTTYPE_HW_EXCEPTION ) + { + ASSERT(vector < 32); + use_error_code = TRAP_HAVE_EC & (1u << vector); + } + else + { + ASSERT(event->type == X86_EVENTTYPE_SW_INTERRUPT); + use_error_code = false; + } + if ( use_error_code ) + ASSERT(error_code != X86_EVENT_NO_EC); + else + ASSERT(error_code == X86_EVENT_NO_EC); + + tb = &curr->arch.pv_vcpu.trap_bounce; + ti = &curr->arch.pv_vcpu.trap_ctxt[vector]; + + tb->flags = TBF_EXCEPTION; + tb->cs = ti->cs; + tb->eip = ti->address; + + if ( event->type == X86_EVENTTYPE_HW_EXCEPTION && + vector == TRAP_page_fault ) + { + curr->arch.pv_vcpu.ctrlreg[2] = event->cr2; + arch_set_cr2(curr, event->cr2); + + /* Re-set error_code.user flag appropriately for the guest. */ + error_code &= ~PFEC_user_mode; + if ( !guest_kernel_mode(curr, regs) ) + error_code |= PFEC_user_mode; + + trace_pv_page_fault(event->cr2, error_code); + } + else + trace_pv_trap(vector, regs->rip, use_error_code, error_code); + + if ( use_error_code ) + { + tb->flags |= TBF_EXCEPTION_ERRCODE; + tb->error_code = error_code; + } + + if ( TI_GET_IF(ti) ) + tb->flags |= TBF_INTERRUPT; + + if ( unlikely(null_trap_bounce(curr, tb)) ) + { + gprintk(XENLOG_WARNING, + "Unhandled %s fault/trap [#%d, ec=%04x]\n", + trapstr(vector), vector, error_code); + + if ( vector == TRAP_page_fault ) + show_page_walk(event->cr2); + } +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 6923c2ef01..6abfb62c0c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -626,75 +626,6 @@ void fatal_trap(const struct cpu_user_regs *regs, bool_t show_remote) (regs->eflags & X86_EFLAGS_IF) ? "" : ", IN INTERRUPT CONTEXT"); } -void pv_inject_event(const struct x86_event *event) -{ - struct vcpu *v = current; - struct cpu_user_regs *regs = guest_cpu_user_regs(); - struct trap_bounce *tb; - const struct trap_info *ti; - const uint8_t vector = event->vector; - unsigned int error_code = event->error_code; - bool use_error_code; - - ASSERT(vector == event->vector); /* Confirm no truncation. */ - if ( event->type == X86_EVENTTYPE_HW_EXCEPTION ) - { - ASSERT(vector < 32); - use_error_code = TRAP_HAVE_EC & (1u << vector); - } - else - { - ASSERT(event->type == X86_EVENTTYPE_SW_INTERRUPT); - use_error_code = false; - } - if ( use_error_code ) - ASSERT(error_code != X86_EVENT_NO_EC); - else - ASSERT(error_code == X86_EVENT_NO_EC); - - tb = &v->arch.pv_vcpu.trap_bounce; - ti = &v->arch.pv_vcpu.trap_ctxt[vector]; - - tb->flags = TBF_EXCEPTION; - tb->cs = ti->cs; - tb->eip = ti->address; - - if ( event->type == X86_EVENTTYPE_HW_EXCEPTION && - vector == TRAP_page_fault ) - { - v->arch.pv_vcpu.ctrlreg[2] = event->cr2; - arch_set_cr2(v, event->cr2); - - /* Re-set error_code.user flag appropriately for the guest. */ - error_code &= ~PFEC_user_mode; - if ( !guest_kernel_mode(v, regs) ) - error_code |= PFEC_user_mode; - - trace_pv_page_fault(event->cr2, error_code); - } - else - trace_pv_trap(vector, regs->rip, use_error_code, error_code); - - if ( use_error_code ) - { - tb->flags |= TBF_EXCEPTION_ERRCODE; - tb->error_code = error_code; - } - - if ( TI_GET_IF(ti) ) - tb->flags |= TBF_INTERRUPT; - - if ( unlikely(null_trap_bounce(v, tb)) ) - { - gprintk(XENLOG_WARNING, - "Unhandled %s fault/trap [#%d, ec=%04x]\n", - trapstr(vector), vector, error_code); - - if ( vector == TRAP_page_fault ) - show_page_walk(event->cr2); - } -} - /* * Called from asm to set up the MCE trapbounce info. * Returns 0 if no callback is set up, else 1.