From patchwork Wed Aug 9 20:34:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9892623 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 1845860236 for ; Thu, 10 Aug 2017 02:43:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3495289D6 for ; Thu, 10 Aug 2017 02:43:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3B6428A08; Thu, 10 Aug 2017 02:43: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=-2.7 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, 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 39ADA289E6 for ; Thu, 10 Aug 2017 02:43: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 1dfdPy-0001VL-CC; Thu, 10 Aug 2017 02:41:50 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfdPw-0001Pi-Ol for xen-devel@lists.xen.org; Thu, 10 Aug 2017 02:41:48 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id 58/70-02962-CE7CB895; Thu, 10 Aug 2017 02:41:48 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsXS1tYhofv6eHe kwa7zFhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bnX8tZC9byVexrms7cwPicu4uRi0NIYBqj xPfr29m7GDk5JAR4JY4sm8EKYftLzL3Yxw5R1MEoseTzCTaQBJuAusSJxRMZQWwRAWmJa58vM 4IUMQtcZZQ4vW0+M0hCWMBTYuPsZWA2i4CqxIrLp8CaeQVcJd5vu8EGsUFBYsrD92A1nEDxqV u2MoHYQgIuEuuWT2OcwMi7gJFhFaN6cWpRWWqRrqleUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5 iUrFecn7uJkZgQDAAwQ7G6Zf9DzFKcjApifJ2NHRHCvEl5adUZiQWZ8QXleakFh9ilOHgUJLg 7T4GlBMsSk1PrUjLzAGGJkxagoNHSYRXDRieQrzFBYm5xZnpEKlTjLocryb8/8YkxJKXn5cqJ c67BGSGAEhRRmke3AhYnFxilJUS5mUEOkqIpyC1KDezBFX+FaM4B6OSMO8nkCk8mXklcJteAR 3BBHREhG8nyBEliQgpqQZGk0cLl7zs+dyt3uJX6bIrO9/m/AXmmtQ47mk/S7pTuQ/NmCL3bMa 290ozm/N/vZ7zs1+1/krrp5O1K1hlUntfznZdrRPfXsOuLrPMPFSv4D+HVf2luX9UbvHPmTC7 Y+VLZb7fwdW3Nz92mt814Y7LCdl51ha3ld7MfmEQPTG8scCIb7nUzBB5JZbijERDLeai4kQAM kAsdo4CAAA= X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1502332905!77089499!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11654 invoked from network); 10 Aug 2017 02:41:47 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-15.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Aug 2017 02:41:47 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Aug 2017 19:41:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,349,1498546800"; d="scan'208";a="121898944" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by orsmga002.jf.intel.com with ESMTP; 09 Aug 2017 19:41:43 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Wed, 9 Aug 2017 16:34:17 -0400 Message-Id: <1502310866-10450-17-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502310866-10450-1-git-send-email-tianyu.lan@intel.com> References: <1502310866-10450-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, julien.grall@arm.com, jbeulich@suse.com, Chao Gao Subject: [Xen-devel] [PATCH V2 16/25] x86/vioapic: Hook interrupt delivery of vIOAPIC 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 is enabled, IOAPIC Redirection Entry may be in remapping format. If that, generate an irq_remapping_request and call the common VIOMMU abstraction's callback to handle this interrupt request. Device model is responsible for checking the request's validity. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu --- xen/arch/x86/hvm/vioapic.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c index 72cae93..322f33c 100644 --- a/xen/arch/x86/hvm/vioapic.c +++ b/xen/arch/x86/hvm/vioapic.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,8 @@ #include #include +#include "../../../drivers/passthrough/vtd/vtd.h" + /* HACK: Route IRQ0 only to VCPU0 to prevent time jumps. */ #define IRQ0_SPECIAL_ROUTING 1 @@ -387,9 +390,20 @@ static void vioapic_deliver(struct hvm_vioapic *vioapic, unsigned int pin) struct vlapic *target; struct vcpu *v; unsigned int irq = vioapic->base_gsi + pin; + struct IO_APIC_route_remap_entry rte = { { vioapic->redirtbl[pin].bits } }; ASSERT(spin_is_locked(&d->arch.hvm_domain.irq_lock)); + if ( rte.format ) + { + struct irq_remapping_request request; + + irq_request_ioapic_fill(&request, vioapic->id, rte.val); + /* Currently, only viommu 0 is supported */ + viommu_handle_irq_request(d, 0, &request); + return; + } + HVM_DBG_LOG(DBG_LEVEL_IOAPIC, "dest=%x dest_mode=%x delivery_mode=%x " "vector=%x trig_mode=%x",