From patchwork Mon Jun 26 09:46:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 9808975 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 DDD6260329 for ; Mon, 26 Jun 2017 09:49:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5B5C283A5 for ; Mon, 26 Jun 2017 09:49:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA7612847B; Mon, 26 Jun 2017 09:49:52 +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 ADF03283A5 for ; Mon, 26 Jun 2017 09:49:51 +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 1dPQc8-0006B6-Sb; Mon, 26 Jun 2017 09:47:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPQc7-0006B0-Ad for xen-devel@lists.xenproject.org; Mon, 26 Jun 2017 09:47:23 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 63/94-02199-A28D0595; Mon, 26 Jun 2017 09:47:22 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRWlGSWpSXmKPExsXitHRDpK7WjYB Ig2XNTBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bR2etYCvrVK1YvLGlg7JbvYuTkkBDwlziz 8RITiM0moCNxce5Oti5GDg4RARWJ23sNQExmgXKJGTfiQSqEBewl2j4tZQOxWQRUJW78esMMY vMKWErcmTuRGWKinsTbiS8YQWxOoPq/v46wgNhCAnYSn9onQNULSpyc+QQsziygKdG6/Tc7hC 0v0bx1NjNEvaJE/7wHbBMY+WYhaZmFpGUWkpYFjMyrGNWLU4vKUot0jfWSijLTM0pyEzNzdA0 NjPVyU4uLE9NTcxKTivWS83M3MQKDjAEIdjA2f3E6xCjJwaQkyvv0WkCkEF9SfkplRmJxRnxR aU5q8SFGGQ4OJQnekOtAOcGi1PTUirTMHGC4w6QlOHiURHjrLwGleYsLEnOLM9MhUqcYdTk+n Lz9jUmIJS8/L1VKnHclyHwBkKKM0jy4EbDYu8QoKyXMywh0lBBPQWpRbmYJqvwrRnEORiVh3h CQKTyZeSVwm14BHcEEdATLPLAjShIRUlINjHsNjJhTfi366JNy+VN20c66aK9/i1gF+R4Yt5d 1n+365Sf3YfJEw0Uz1mvu2d79+lLpTxWl5GXHTrc4LV5Rcq6+4v2q03kLo69Puuv4+OaGPW6W fk8u7PuawclcUeDjeHzLvq/Lfm557Wp6OoQzTmH1rqYTqsuFNaaEC1wWfFik5N975LxeiYcSS 3FGoqEWc1FxIgBKWICruAIAAA== X-Env-Sender: prvs=343a777b3=roger.pau@citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1498470440!90566742!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32663 invoked from network); 26 Jun 2017 09:47:21 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 26 Jun 2017 09:47:21 -0000 X-IronPort-AV: E=Sophos;i="5.39,395,1493683200"; d="scan'208";a="429328150" From: Roger Pau Monne To: Date: Mon, 26 Jun 2017 10:46:42 +0100 Message-ID: <20170626094642.74458-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <594D3D75020000780016660C@prv-mh.provo.novell.com> References: <594D3D75020000780016660C@prv-mh.provo.novell.com> MIME-Version: 1.0 Cc: Andrew Cooper , Jan Beulich , Roger Pau Monne Subject: [Xen-devel] [PATCH v6.1 1/3] x86/vioapic: make gsi_vioapic private 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 And introduce vioapic_get_{mask/vector} in order to replace it's usage. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- Cc: Jan Beulich Cc: Andrew Cooper --- Changes since v6: - Constify domain parameter. Changes since v5: - New in this version. --- xen/arch/x86/hvm/vioapic.c | 26 ++++++++++++++++++++++++-- xen/arch/x86/hvm/vpt.c | 20 ++++++++++---------- xen/include/asm-x86/hvm/vioapic.h | 6 +++--- 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index abcc473c88..12912f068d 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -61,8 +61,8 @@ static struct hvm_vioapic *addr_vioapic(const struct domain *d, return NULL; } -struct hvm_vioapic *gsi_vioapic(const struct domain *d, unsigned int gsi, - unsigned int *pin) +static struct hvm_vioapic *gsi_vioapic(const struct domain *d, + unsigned int gsi, unsigned int *pin) { unsigned int i; @@ -476,6 +476,28 @@ void vioapic_update_EOI(struct domain *d, u8 vector) spin_unlock(&d->arch.hvm_domain.irq_lock); } +int vioapic_get_mask(const struct domain *d, unsigned int gsi) +{ + unsigned int pin; + const struct hvm_vioapic *vioapic = gsi_vioapic(d, gsi, &pin); + + if ( !vioapic ) + return -EINVAL; + + return vioapic->redirtbl[pin].fields.mask; +} + +int vioapic_get_vector(const struct domain *d, unsigned int gsi) +{ + unsigned int pin; + const struct hvm_vioapic *vioapic = gsi_vioapic(d, gsi, &pin); + + if ( !vioapic ) + return -EINVAL; + + return vioapic->redirtbl[pin].fields.vector; +} + static int ioapic_save(struct domain *d, hvm_domain_context_t *h) { struct hvm_vioapic *s; diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c index e3f203915b..3841140be7 100644 --- a/xen/arch/x86/hvm/vpt.c +++ b/xen/arch/x86/hvm/vpt.c @@ -78,8 +78,8 @@ void hvm_set_guest_time(struct vcpu *v, u64 guest_time) static int pt_irq_vector(struct periodic_time *pt, enum hvm_intsrc src) { struct vcpu *v = pt->vcpu; - struct hvm_vioapic *vioapic; - unsigned int gsi, isa_irq, pin; + unsigned int gsi, isa_irq; + int vector; if ( pt->source == PTSRC_lapic ) return pt->irq; @@ -92,8 +92,8 @@ static int pt_irq_vector(struct periodic_time *pt, enum hvm_intsrc src) + (isa_irq & 7)); ASSERT(src == hvm_intsrc_lapic); - vioapic = gsi_vioapic(v->domain, gsi, &pin); - if ( !vioapic ) + vector = vioapic_get_vector(v->domain, gsi); + if ( vector < 0 ) { dprintk(XENLOG_WARNING, "d%u: invalid GSI (%u) for platform timer\n", v->domain->domain_id, gsi); @@ -101,14 +101,14 @@ static int pt_irq_vector(struct periodic_time *pt, enum hvm_intsrc src) return -1; } - return vioapic->redirtbl[pin].fields.vector; + return vector; } static int pt_irq_masked(struct periodic_time *pt) { struct vcpu *v = pt->vcpu; - unsigned int gsi, isa_irq, pin; - struct hvm_vioapic *vioapic; + unsigned int gsi, isa_irq; + int mask; uint8_t pic_imr; if ( pt->source == PTSRC_lapic ) @@ -121,8 +121,8 @@ static int pt_irq_masked(struct periodic_time *pt) isa_irq = pt->irq; gsi = hvm_isa_irq_to_gsi(isa_irq); pic_imr = v->domain->arch.hvm_domain.vpic[isa_irq >> 3].imr; - vioapic = gsi_vioapic(v->domain, gsi, &pin); - if ( !vioapic ) + mask = vioapic_get_mask(v->domain, gsi); + if ( mask < 0 ) { dprintk(XENLOG_WARNING, "d%u: invalid GSI (%u) for platform timer\n", v->domain->domain_id, gsi); @@ -131,7 +131,7 @@ static int pt_irq_masked(struct periodic_time *pt) } return (((pic_imr & (1 << (isa_irq & 7))) || !vlapic_accept_pic_intr(v)) && - vioapic->redirtbl[pin].fields.mask); + mask); } static void pt_lock(struct periodic_time *pt) diff --git a/xen/include/asm-x86/hvm/vioapic.h b/xen/include/asm-x86/hvm/vioapic.h index 2ceb60eaef..07fcd229e0 100644 --- a/xen/include/asm-x86/hvm/vioapic.h +++ b/xen/include/asm-x86/hvm/vioapic.h @@ -61,13 +61,13 @@ struct hvm_vioapic { #define domain_vioapic(d, i) ((d)->arch.hvm_domain.vioapic[i]) #define vioapic_domain(v) ((v)->domain) -struct hvm_vioapic *gsi_vioapic(const struct domain *d, unsigned int gsi, - unsigned int *pin); - int vioapic_init(struct domain *d); void vioapic_deinit(struct domain *d); void vioapic_reset(struct domain *d); void vioapic_irq_positive_edge(struct domain *d, unsigned int irq); void vioapic_update_EOI(struct domain *d, u8 vector); +int vioapic_get_mask(const struct domain *d, unsigned int gsi); +int vioapic_get_vector(const struct domain *d, unsigned int gsi); + #endif /* __ASM_X86_HVM_VIOAPIC_H__ */