From patchwork Wed Aug 9 20:51:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9892689 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 9258960350 for ; Thu, 10 Aug 2017 03:00:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80C0128A06 for ; Thu, 10 Aug 2017 03:00:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 755EC28A39; Thu, 10 Aug 2017 03:00:31 +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 E4BF728A2A for ; Thu, 10 Aug 2017 03:00:29 +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 1dfdfl-00051R-KD; Thu, 10 Aug 2017 02:58:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dfdfk-00051C-6j for xen-devel@lists.xenproject.org; Thu, 10 Aug 2017 02:58:08 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 9F/A1-01732-FBBCB895; Thu, 10 Aug 2017 02:58:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpikeJIrShJLcpLzFFi42Jpa+sQ0d13ujv SYNJua4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNaNn7SWWghP6Ff3PGpgaGM/IdTFycQgJTGeU WPGrm7mLkZNDQoBX4siyGawQtr/EzJV9bBBFHYwSk+bPZQFJsAmoS5xYPJERxBYRsJLY3rKdE aSIWeALo8SvTXvAuoUFvCQa1j9lArFZBFQlzryYzw5i8wq4SHyc28IEsUFBYsrD92CbOQVcJc 5sXQI2VAio5ta2j2wTGHkXMDKsYtQoTi0qSy3SNbLUSyrKTM8oyU3MzNE1NDDVy00tLk5MT81 JTCrWS87P3cQIDIl6BgbGHYyXt/gdYpTkYFIS5e1o6I4U4kvKT6nMSCzOiC8qzUktPsQow8Gh JMHLfwooJ1iUmp5akZaZAwxOmLQEB4+SCO+vk0Bp3uKCxNzizHSI1ClGY445v3d8YeJ4NeH/N yYhlrz8vFQpcd40kEkCIKUZpXlwg2BRc4lRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMO8ukC k8mXklcPteAZ3CBHRKhG8nyCkliQgpqQZGJun+Bc4+7UvEwxj+9kRGp7RwrRGO/lC4NOn+nD/ JTvqC69sSYn7mMuSYtr9L1Ik+vpmdS4BTZ0/lsm/2VhW3pkndOfBbZ9+UWiUvlSNf3RXu7Dxd k/380bGpeppMr3k+hLNmBE5vmFh/aNa9NbMz3ZceUv2+dNHnEtbtIpveOUq3rjvVrHpUiaU4I 9FQi7moOBEA/iUKuJUCAAA= X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1502333883!86824073!2 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzU1MzU4\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16138 invoked from network); 10 Aug 2017 02:58:06 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-11.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 Aug 2017 02:58:06 -0000 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Aug 2017 19:58:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,349,1498546800"; d="scan'208";a="137770638" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.141]) by fmsmga005.fm.intel.com with ESMTP; 09 Aug 2017 19:58:01 -0700 From: Lan Tianyu To: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org Date: Wed, 9 Aug 2017 16:51:21 -0400 Message-Id: <1502311882-11038-3-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502311882-11038-1-git-send-email-tianyu.lan@intel.com> References: <1502311882-11038-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, sstabellini@kernel.org, ehabkost@redhat.com, mst@redhat.com, marcel@redhat.com, anthony.perard@citrix.com, pbonzini@redhat.com, Chao Gao , rth@twiddle.net Subject: [Xen-devel] [PATCH V2 2/3] xen-pt: bind/unbind interrupt remapping format MSI 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 If a vIOMMU is exposed to guest, guest will configure the msi to remapping format. The original code isn't suitable to the new format. A new pair bind/unbind interfaces are added for this usage. This patch recognizes this case and uses new interfaces to bind/unbind msi. Signed-off-by: Chao Gao Signed-off-by: Lan Tianyu Reviewed-by: Anthony PERARD --- configure | 4 +++- hw/xen/xen_pt_msi.c | 50 ++++++++++++++++++++++++++++++++----------- include/hw/i386/apic-msidef.h | 1 + include/hw/xen/xen_common.h | 25 ++++++++++++++++++++++ 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/configure b/configure index dd73cce..92b56d3 100755 --- a/configure +++ b/configure @@ -2108,13 +2108,15 @@ EOF elif cat > $TMPC < #include int main(void) { + xc_interface *xc = NULL; xenforeignmemory_handle *xfmem; xfmem = xenforeignmemory_open(0, 0); xenforeignmemory_map2(xfmem, 0, 0, 0, 0, 0, 0, 0); - + xc_domain_update_msi_irq_remapping(xc, 0, 0, 0, 0, 0, 0); return 0; } EOF diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index ff9a79f..5c5d15a 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -163,16 +163,23 @@ static int msi_msix_update(XenPCIPassthroughState *s, int rc = 0; uint64_t table_addr = 0; - XEN_PT_LOG(d, "Updating MSI%s with pirq %d gvec %#x gflags %#x" - " (entry: %#x)\n", - is_msix ? "-X" : "", pirq, gvec, gflags, msix_entry); - if (is_msix) { table_addr = s->msix->mmio_base_addr; } - rc = xc_domain_update_msi_irq(xen_xc, xen_domid, gvec, - pirq, gflags, table_addr); + if (addr & MSI_ADDR_IF_MASK) { + XEN_PT_LOG(d, "Updating MSI%s with addr %#" PRIx64 " data %#x\n", + is_msix ? "-X" : "", addr, data); + rc = xc_domain_update_msi_irq_remapping(xen_xc, xen_domid, pirq, + d->devfn, data, addr, table_addr); + } else { + XEN_PT_LOG(d, "Updating MSI%s with pirq %d gvec %#x gflags %#x" + " (entry: %#x)\n", + is_msix ? "-X" : "", pirq, gvec, gflags, msix_entry); + + rc = xc_domain_update_msi_irq(xen_xc, xen_domid, gvec, + pirq, gflags, table_addr); + } if (rc) { XEN_PT_ERR(d, "Updating of MSI%s failed. (err: %d)\n", @@ -204,13 +211,30 @@ static int msi_msix_disable(XenPCIPassthroughState *s, } if (is_binded) { - XEN_PT_LOG(d, "Unbind MSI%s with pirq %d, gvec %#x\n", - is_msix ? "-X" : "", pirq, gvec); - rc = xc_domain_unbind_msi_irq(xen_xc, xen_domid, gvec, pirq, gflags); - if (rc) { - XEN_PT_ERR(d, "Unbinding of MSI%s failed. (err: %d, pirq: %d, gvec: %#x)\n", - is_msix ? "-X" : "", errno, pirq, gvec); - return rc; + if (addr & MSI_ADDR_IF_MASK) { + XEN_PT_LOG(d, "Unbinding of MSI%s . ( pirq: %d, data: %x, " + "addr: %#" PRIx64 ")\n", + is_msix ? "-X" : "", pirq, data, addr); + rc = xc_domain_unbind_msi_irq_remapping(xen_xc, xen_domid, pirq, + d->devfn, data, addr); + if (rc) { + XEN_PT_ERR(d, "Unbinding of MSI%s . (error: %d, pirq: %d, " + "data: %x, addr: %#" PRIx64 ")\n", + is_msix ? "-X" : "", rc, pirq, data, addr); + return rc; + } + + } else { + XEN_PT_LOG(d, "Unbind MSI%s with pirq %d, gvec %#x\n", + is_msix ? "-X" : "", pirq, gvec); + rc = xc_domain_unbind_msi_irq(xen_xc, xen_domid, gvec, + pirq, gflags); + if (rc) { + XEN_PT_ERR(d, "Unbinding of MSI%s failed. (err: %d, pirq: %d, " + "gvec: %#x)\n", + is_msix ? "-X" : "", errno, pirq, gvec); + return rc; + } } } diff --git a/include/hw/i386/apic-msidef.h b/include/hw/i386/apic-msidef.h index 420b411..a2b52d9 100644 --- a/include/hw/i386/apic-msidef.h +++ b/include/hw/i386/apic-msidef.h @@ -27,5 +27,6 @@ #define MSI_ADDR_DEST_ID_SHIFT 12 #define MSI_ADDR_DEST_IDX_SHIFT 4 #define MSI_ADDR_DEST_ID_MASK 0x000ff000 +#define MSI_ADDR_IF_MASK 0x00000010 #endif /* HW_APIC_MSIDEF_H */ diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 86c7f26..454ab6d 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -680,4 +680,29 @@ static inline int xengnttab_grant_copy(xengnttab_handle *xgt, uint32_t count, } #endif +/* Xen before 4.10 */ +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41000 + +static inline int xc_domain_update_msi_irq_remapping(xc_interface *xc, + uint32_t domid, + uint32_t pirq, + uint32_t source_id, + uint32_t data, + uint64_t addr, + uint64_t gtable) +{ + return -ENOSYS; +} + +static inline int xc_domain_unbind_msi_irq_remapping(xc_interface *xc, + uint32_t domid, + uint32_t pirq, + uint32_t source_id, + uint32_t data, + uint64_t addr) +{ + return -ENOSYS; +} +#endif + #endif /* QEMU_HW_XEN_COMMON_H */