From patchwork Tue Jun 27 09:02:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9811067 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 0F63460329 for ; Tue, 27 Jun 2017 09:05:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02C3D28503 for ; Tue, 27 Jun 2017 09:05:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9FAA28524; Tue, 27 Jun 2017 09:05:03 +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 5072128503 for ; Tue, 27 Jun 2017 09:05:02 +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 1dPmOP-0001d0-F4; Tue, 27 Jun 2017 09:02:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPmOO-0001cu-2P for xen-devel@lists.xenproject.org; Tue, 27 Jun 2017 09:02:40 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id B1/0D-17076-E2F12595; Tue, 27 Jun 2017 09:02:38 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDIsWRWlGSWpSXmKPExsXitHSDva6GfFC kwf49Ghbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8alPWeZCn6pVyzZfZetgfGpQhcjJ4eEgL/E x78X2EFsFgFViakPeplAbDYBZYmfnb1sILYIkP35+UpmEJtZIFLi86xWsHphAWeJv6fegNXwC lhIzJp8j7WLkYtDSOAko8SG5g4WiISgxMmZT1ggmnUkFuz+BNTAAWRLSyz/xwES5hSwl3iwbT nYfFEBFYnOpXPAyoUEFCQ6ph9jmsDINwvJpFlIJs1CmLSAkXkVo0ZxalFZapGukaFeUlFmekZ JbmJmjq6hgbFebmpxcWJ6ak5iUrFecn7uJkZgqNUzMDDuYOzZ63eIUZKDSUmUd7VEUKQQX1J+ SmVGYnFGfFFpTmrxIUYZDg4lCd4DskA5waLU9NSKtMwcYNDDpCU4eJREeMuOB0YK8RYXJOYWZ 6ZDpE4xKkqJ82rKAfUJgCQySvPg2mCRdolRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMO82kO 08mXklcNNfAS1mAlrMMi8AZHFJIkJKqoFRL/tYbd6Zw7JHvNJ1VES3vq/63PO1yk1jJm+a5MO 7ButfuUZ/d5nNtCvy7QKT75mdYXmlSbZ9/y2NTfrDCpNzZnXHSDyo02y4/+PoFY8flX5Tp0mr bLTg6eHj+st+YMFRrQmTQ+fe8XJ4FeiqKert27DIWdFiX8Hag68n/sgx/ayR/UnSKk6JpTgj0 VCLuag4EQDW9UuvrwIAAA== X-Env-Sender: prvs=344c6b82c=wei.liu2@citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1498554150!90741678!1 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 4337 invoked from network); 27 Jun 2017 09:02:32 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 27 Jun 2017 09:02:32 -0000 X-IronPort-AV: E=Sophos;i="5.39,399,1493683200"; d="scan'208";a="437947210" Date: Tue, 27 Jun 2017 10:02:28 +0100 From: Wei Liu To: Jan Beulich Message-ID: <20170627090228.5bs5dm4ojgzm6xpx@citrix.com> References: <20170626162842.482-1-wei.liu2@citrix.com> <20170626162842.482-7-wei.liu2@citrix.com> <5951F68A02000078001013B5@prv-mh.provo.novell.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <5951F68A02000078001013B5@prv-mh.provo.novell.com> User-Agent: NeoMutt/20170113 (1.7.2) Cc: andrew.cooper3@citrix.com, wei.liu2@citrix.com, xen-devel@lists.xenproject.org Subject: Re: [Xen-devel] [PATCH v5 06/13] x86: simplify guest_has_trap_callback 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 On Tue, Jun 27, 2017 at 12:09:14AM -0600, Jan Beulich wrote: > >>> Andrew Cooper 06/26/17 6:58 PM >>> > >On 26/06/17 17:28, Wei Liu wrote: > >> --- a/xen/arch/x86/cpu/mcheck/vmce.c > >> +++ b/xen/arch/x86/cpu/mcheck/vmce.c > >> @@ -359,6 +359,15 @@ static int vmce_load_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) > >> HVM_REGISTER_SAVE_RESTORE(VMCE_VCPU, vmce_save_vcpu_ctxt, > >> vmce_load_vcpu_ctxt, 1, HVMSR_PER_VCPU); > >> > >> +static inline bool pv_callback_registered(const struct vcpu *v, uint8_t vector) > >> +{ > >> +#ifdef CONFIG_PV > >> + return v->arch.pv_vcpu.trap_ctxt[vector].address; > >> +#else > >> + return false; > >> +#endif > >> +} > >> + > > > >Isn't there a header file this would be better living in? Its certainly > >not vmce-specific. > > We certainly have the equivalent of this check in assembly code (which > iirc we mean to convert to C eventually), so pv/traps.h would seem to be > the right place. The function name would need to change a little though, > as we're talking about exception callbacks here, not the things we call > callbacks in the public interface. pv_trap_callback_registered() perhaps? I agree pv/traps.h is the right place and I've rename it to pv_trap_callback_registered. I kept Andrew's Rb because those are just cosmetic changes. ---8<--- From d211f6a7aea2e8497bddf72df084f37588234e2d Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 23 Jun 2017 18:34:41 +0100 Subject: [PATCH] x86: simplify guest_has_trap_callback Simplify that function, rename it to pv_trap_callback_registered and move it to pv/traps.h. Adjust vmce.c accordingly. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/vmce.c | 3 ++- xen/arch/x86/traps.c | 18 ------------------ xen/include/asm-x86/pv/traps.h | 11 +++++++++++ xen/include/asm-x86/traps.h | 8 -------- 4 files changed, 13 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/vmce.c b/xen/arch/x86/cpu/mcheck/vmce.c index d591d31600..1356f611ab 100644 --- a/xen/arch/x86/cpu/mcheck/vmce.c +++ b/xen/arch/x86/cpu/mcheck/vmce.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "mce.h" #include "x86_mca.h" @@ -383,7 +384,7 @@ int inject_vmce(struct domain *d, int vcpu) continue; if ( (is_hvm_domain(d) || - guest_has_trap_callback(d, v->vcpu_id, TRAP_machine_check)) && + pv_trap_callback_registered(v, TRAP_machine_check)) && !test_and_set_bool(v->mce_pending) ) { mce_printk(MCE_VERBOSE, "MCE: inject vMCE to %pv\n", v); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index c43f3f1095..f3c5de6f2c 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2008,24 +2008,6 @@ long unregister_guest_nmi_callback(void) return 0; } -int guest_has_trap_callback(struct domain *d, uint16_t vcpuid, unsigned int trap_nr) -{ - struct vcpu *v; - struct trap_info *t; - - BUG_ON(d == NULL); - BUG_ON(vcpuid >= d->max_vcpus); - - /* Sanity check - XXX should be more fine grained. */ - BUG_ON(trap_nr >= NR_VECTORS); - - v = d->vcpu[vcpuid]; - t = &v->arch.pv_vcpu.trap_ctxt[trap_nr]; - - return (t->address != 0); -} - - int send_guest_trap(struct domain *d, uint16_t vcpuid, unsigned int trap_nr) { struct vcpu *v; diff --git a/xen/include/asm-x86/pv/traps.h b/xen/include/asm-x86/pv/traps.h index f9d44ab989..c32c38c372 100644 --- a/xen/include/asm-x86/pv/traps.h +++ b/xen/include/asm-x86/pv/traps.h @@ -29,12 +29,23 @@ int pv_emulate_privileged_op(struct cpu_user_regs *regs); void pv_emulate_gate_op(struct cpu_user_regs *regs); bool pv_emulate_invalid_op(struct cpu_user_regs *regs); +static inline bool pv_trap_callback_registered(const struct vcpu *v, + uint8_t vector) +{ + return v->arch.pv_vcpu.trap_ctxt[vector].address; +} + #else /* !CONFIG_PV */ static inline int pv_emulate_privileged_op(struct cpu_user_regs *regs) { return 0; } static inline void pv_emulate_gate_op(struct cpu_user_regs *regs) {} static inline bool pv_emulate_invalid_op(struct cpu_user_regs *regs) { return true; } +static inline bool pv_trap_callback_registered(const struct vcpu *v, + uint8_t vector) +{ + return false; +} #endif /* CONFIG_PV */ #endif /* __X86_PV_TRAPS_H__ */ diff --git a/xen/include/asm-x86/traps.h b/xen/include/asm-x86/traps.h index 893b4dbe77..cc1d7d01d9 100644 --- a/xen/include/asm-x86/traps.h +++ b/xen/include/asm-x86/traps.h @@ -29,14 +29,6 @@ struct cpu_user_regs; void async_exception_cleanup(struct vcpu *); -/** - * guest_has_trap_callback - * - * returns true (non-zero) if guest registered a trap handler - */ -extern int guest_has_trap_callback(struct domain *d, uint16_t vcpuid, - unsigned int trap_nr); - /** * send_guest_trap *