From patchwork Tue Jun 20 09:15:37 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: 9798929 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 72675601BC for ; Tue, 20 Jun 2017 09:17:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 697FB28477 for ; Tue, 20 Jun 2017 09:17:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E79C2847C; Tue, 20 Jun 2017 09:17:56 +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 E2C9228477 for ; Tue, 20 Jun 2017 09:17:55 +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 1dNFGH-00005i-L3; Tue, 20 Jun 2017 09:15:49 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dNFGF-000056-OR for xen-devel@lists.xenproject.org; Tue, 20 Jun 2017 09:15:47 +0000 Received: from [193.109.254.147] by server-7.bemta-6.messagelabs.com id E0/50-03620-3C7E8495; Tue, 20 Jun 2017 09:15:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRWlGSWpSXmKPExsXitHRDpO6h5x6 RBnuuaFl83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBmb/t1lLvjFVfFz622WBsbXHF2MnBwSAv4S N5YfYwOx2QR0JC7O3Qlkc3CICKhI3N5r0MXIxcEssIFR4tyPvewgNcICkRIre+YwgdSwCKhKf O5PBAnzClhKzNrbwwYxUk/i7cQXjCA2p4CVxNKnLewg5UJANT3/wiDKBSVOznzCAmIzC2hKtG 7/zQ5hy0s0b53NDGILCShK9M97wDaBkW8WkpZZSFpmIWlZwMi8ilGjOLWoLLVI18hSL6koMz2 jJDcxM0fX0MBMLze1uDgxPTUnMalYLzk/dxMjMNAYgGAH44FFgYcYJTmYlER5F9zxiBTiS8pP qcxILM6ILyrNSS0+xCjDwaEkwVv5DCgnWJSanlqRlpkDDHmYtAQHj5II72KQVt7igsTc4sx0i NQpRkUpcV5ekD4BkERGaR5cGyzOLjHKSgnzMgIdIsRTkFqUm1mCKv+KUZyDUUmYtxFkCk9mXg nc9FdAi5mAFr84Ara4JBEhJdXAqMD28MBEKf3oWIYvV5ffvbrhp+pMbZ4K4ZXyb35Ln3J6sDb XaJ0ak+jf1W9V/ucW/WNpSJteFaCaa3uJk8+72bFgYXore6tBg8rR2z887xlN3725u8Lpxd/L UUqvvx72k319NeS8wl7ObVv2vv6S3/Fr69fzak/nHOCXCvh4MmVy5SvORGN1YSWW4oxEQy3mo uJEAKhAIjmuAgAA X-Env-Sender: prvs=337a62209=roger.pau@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1497950145!99003087!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 12563 invoked from network); 20 Jun 2017 09:15:46 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 20 Jun 2017 09:15:46 -0000 X-IronPort-AV: E=Sophos;i="5.39,364,1493683200"; d="scan'208";a="428603387" From: Roger Pau Monne To: Date: Tue, 20 Jun 2017 10:15:37 +0100 Message-ID: <20170620091539.59051-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: <20170620091539.59051-1-roger.pau@citrix.com> References: <20170620091539.59051-1-roger.pau@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , boris.ostrovsky@oracle.com, Roger Pau Monne , Jan Beulich Subject: [Xen-devel] [PATCH v5 1/3] x86/dpci: make sure hvm_do_IRQ_dpci is only called for HVM guests 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 While there add an ASSERT to hvm_do_IRQ_dpci. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- Cc: Jan Beulich Cc: Andrew Cooper --- Changes since v4: - New in this version. --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/io.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 7f6c2fe9fb..3cfe848ecc 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1180,7 +1180,7 @@ static void __do_IRQ_guest(int irq) if ( (action->ack_type != ACKTYPE_NONE) && !test_and_set_bool(pirq->masked) ) action->in_flight++; - if ( !hvm_do_IRQ_dpci(d, pirq) ) + if ( !is_hvm_domain(d) || !hvm_do_IRQ_dpci(d, pirq) ) send_guest_pirq(d, pirq); } diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index e5a43e508f..7158afea88 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -696,6 +696,8 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) struct hvm_irq_dpci *dpci = domain_get_irq_dpci(d); struct hvm_pirq_dpci *pirq_dpci = pirq_dpci(pirq); + ASSERT(is_hvm_domain(d)); + if ( !iommu_enabled || !dpci || !pirq_dpci || !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) return 0;