From patchwork Fri Mar 17 11:27:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9630413 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 EEA8860249 for ; Fri, 17 Mar 2017 11:37:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8C86284E9 for ; Fri, 17 Mar 2017 11:37:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDAAF2862B; Fri, 17 Mar 2017 11:37:20 +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 82528284E9 for ; Fri, 17 Mar 2017 11:37:20 +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 1coqAc-0004KG-BE; Fri, 17 Mar 2017 11:35:46 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coqAb-0004IY-Kr for xen-devel@lists.xen.org; Fri, 17 Mar 2017 11:35:45 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id A6/E5-21675-11ACBC85; Fri, 17 Mar 2017 11:35:45 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsXS1tYhrytw6nS EwZ9ZChZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8a9HUcZC6aLVpz6OZ25gfGXQBcjJ4eQQKXE q+mTmEBsCQFeiSPLZrBC2AESTS+msHcxcgHV9DNKrG9ZxQaSYBNQlzixeCIjiC0iIC1x7fNlR pAiZoFGRomGvY1gRcICIRKz5jwDm8QioCrx8sddZhCbV8BVYvWWd0ANHEAbFCTmTLIBCXMChe +2PWCHOMhF4l7XFZYJjLwLGBlWMaoXpxaVpRbpmuslFWWmZ5TkJmbm6BoamOnlphYXJ6an5iQ mFesl5+duYgQGAwMQ7GCcedn/EKMkB5OSKO+LFacjhPiS8lMqMxKLM+KLSnNSiw8xynBwKEnw lp0AygkWpaanVqRl5gDDEiYtwcGjJMJrB5LmLS5IzC3OTIdInWJUlBLn7QdJCIAkMkrz4Npgs XCJUVZKmJcR6BAhnoLUotzMElT5V4ziHIxKwrzLQKbwZOaVwE1/BbSYCWjx2w8nQBaXJCKkpB oY47oWHki78++Q0++T2Z5Lbyd4iJ08vuWkBUOL1NFvdQEVy94ecCvxvPnz+LpjxpFSPK+TNZz iUg8EON8JC9hVwavUeS56Q86x2edsmR7+K167Zo3+2oUfTnPu5JMrv3iAe1aQ6CWrd7J7tlf1 OFmfX6DiuNXvd+y3hsOH66Y1z2v+kTJr48+kViWW4oxEQy3mouJEABSEujOAAgAA X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1489750542!56941859!1 X-Originating-IP: [134.134.136.31] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54942 invoked from network); 17 Mar 2017 11:35:44 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-13.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Mar 2017 11:35:44 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP; 17 Mar 2017 04:35:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.36,176,1486454400"; d="scan'208"; a="1123972634" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.159.159]) by fmsmga001.fm.intel.com with ESMTP; 17 Mar 2017 04:35:40 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Fri, 17 Mar 2017 19:27:18 +0800 Message-Id: <1489750043-17260-19-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1489750043-17260-1-git-send-email-tianyu.lan@intel.com> References: <1489750043-17260-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , andrew.cooper3@citrix.com, kevin.tian@intel.com, jbeulich@suse.com, chao.gao@intel.com Subject: [Xen-devel] [RFC PATCH 18/23] x86/vpt: Get interrupt vector through a vioapic interface 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Chao Gao When irq remapping enabled, IRE may not contain the vector of interrupt. So, a new function, vioapic_gsi_vector() is added to translate gsi to vector. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu --- xen/arch/x86/hvm/vioapic.c | 26 ++++++++++++++++++++++++++ xen/arch/x86/hvm/vpt.c | 2 +- xen/include/asm-x86/hvm/vioapic.h | 1 + 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 6a00644..95a2e15 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -276,6 +276,32 @@ static inline int pit_channel0_enabled(void) return pt_active(¤t->domain->arch.vpit.pt0); } +int vioapic_gsi_vector(struct domain *d, unsigned int gsi) +{ + int err; + struct irq_remapping_request request; + struct hvm_hw_vioapic *vioapic = domain_vioapic(d); + struct irq_remapping_info info; + + if ( vioapic->redirtbl[gsi].ir.format ) + { + irq_request_ioapic_fill(&request, vioapic->id, + vioapic->redirtbl[gsi].bits); + err = viommu_get_irq_info(d, &request, &info); + if ( err < 0 ) + { + gdprintk(XENLOG_ERR, "Bad gsi or bad interrupt remapping table " + "entry.\n"); + domain_crash(d); + } + return info.vector; + } + else + { + return vioapic->redirtbl[gsi].fields.vector; + } +} + static void vioapic_deliver(struct hvm_hw_vioapic *vioapic, int irq) { uint16_t dest = vioapic->redirtbl[irq].fields.dest_id; diff --git a/xen/arch/x86/hvm/vpt.c b/xen/arch/x86/hvm/vpt.c index 5c48fdb..a1fafe2 100644 --- a/xen/arch/x86/hvm/vpt.c +++ b/xen/arch/x86/hvm/vpt.c @@ -91,7 +91,7 @@ static int pt_irq_vector(struct periodic_time *pt, enum hvm_intsrc src) + (isa_irq & 7)); ASSERT(src == hvm_intsrc_lapic); - return domain_vioapic(v->domain)->redirtbl[gsi].fields.vector; + return vioapic_gsi_vector(v->domain, gsi); } static int pt_irq_masked(struct periodic_time *pt) diff --git a/xen/include/asm-x86/hvm/vioapic.h b/xen/include/asm-x86/hvm/vioapic.h index 745c09a..fc3dc22 100644 --- a/xen/include/asm-x86/hvm/vioapic.h +++ b/xen/include/asm-x86/hvm/vioapic.h @@ -56,6 +56,7 @@ struct hvm_vioapic { #define vioapic_domain(v) (container_of((v), struct hvm_vioapic, \ hvm_hw_vioapic)->domain) +int vioapic_gsi_vector(struct domain *d, unsigned int gsi); int vioapic_init(struct domain *d); void vioapic_deinit(struct domain *d); void vioapic_reset(struct domain *d);