From patchwork Thu Jun 29 05:49:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9816517 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 164BF603F2 for ; Thu, 29 Jun 2017 11:59:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E594128602 for ; Thu, 29 Jun 2017 11:59:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA4F92860B; Thu, 29 Jun 2017 11:59:22 +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 5AE3F2866B for ; Thu, 29 Jun 2017 11:59:22 +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 1dQY41-0005dI-Pv; Thu, 29 Jun 2017 11:56: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 1dQY40-0005d5-Js for xen-devel@lists.xensource.com; Thu, 29 Jun 2017 11:56:48 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id 85/9E-03044-FFAE4595; Thu, 29 Jun 2017 11:56:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsVywNxEW/f/q5B Ig/VbZS3uTXnP7sDosb1vF3sAYxRrZl5SfkUCa8a0Xd3MBXOsKjZ0vGJsYLyr3sXIySEkUCnx /NNcRhBbQoBX4siyGawQtr/ElOvv2bsYuYBq2hklWlatZgJJsAmoS5xYPBGsQUTAUmLW+jawB maBbYwS+/YogNjCAu4S3Wc2gNWzCKhKNFx8yAxi8wq4SGyYuwZqgYLElIfvweKcAq4S15bNZ4 c4yEXi6toe9gmMvAsYGVYxahSnFpWlFukaWeglFWWmZ5TkJmbm6BoamOnlphYXJ6an5iQmFes l5+duYgSGAwMQ7GA8vzbwEKMkB5OSKK/h85BIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8p18C 5QSLUtNTK9Iyc4CBCZOW4OBREuHtA2nlLS5IzC3OTIdInWLU5Zjze8cXJiGWvPy8VClx3okgM wRAijJK8+BGwKLkEqOslDAvI9BRQjwFqUW5mSWo8q8YxTkYlYR5l4NM4cnMK4Hb9AroCCagI4 RngB1RkoiQkmpgZKg9lCs7t8CL/+fxlg27PHV5+M1nnomSPh8cYbvc586CqY9/NPz24BQxevT 4lO+B+geXTyhvsj/7sfjBzfupF87/Yo6qdhQytZE7tPx2zuxfimt0/4ZnGFhohrmvXf+YIZbt xR7TrH02r5Z+TZzLp+Vt90I332qehnvUuq9Wzdl5XYYTo858VWIpzkg01GIuKk4EANsfsQiNA gAA X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1498737405!99291441!1 X-Originating-IP: [192.55.52.43] X-SpamReason: No, hits=0.8 required=7.0 tests=DATE_IN_PAST_06_12 X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35022 invoked from network); 29 Jun 2017 11:56:47 -0000 Received: from mga05.intel.com (HELO mga05.intel.com) (192.55.52.43) by server-5.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 29 Jun 2017 11:56:47 -0000 Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP; 29 Jun 2017 04:56:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,280,1496127600"; d="scan'208";a="120737235" Received: from sky-ws.sh.intel.com (HELO localhost) ([10.239.48.74]) by fmsmga006.fm.intel.com with ESMTP; 29 Jun 2017 04:56:43 -0700 From: Lan Tianyu To: qemu-devel@nongnu.org, xen-devel@lists.xensource.com Date: Thu, 29 Jun 2017 01:49:53 -0400 Message-Id: <1498715394-16402-3-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1498715394-16402-1-git-send-email-tianyu.lan@intel.com> References: <1498715394-16402-1-git-send-email-tianyu.lan@intel.com> Cc: Lan Tianyu , kevin.tian@intel.com, sstabellini@kernel.org, mst@redhat.com, anthony.perard@citrix.com, marcel@redhat.com, Chao Gao Subject: [Xen-devel] [PATCH 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 --- configure | 54 +++++++++++++++++++++++++++++++++++++++++++ hw/xen/xen_pt_msi.c | 50 ++++++++++++++++++++++++++++----------- include/hw/i386/apic-msidef.h | 1 + include/hw/xen/xen_common.h | 25 ++++++++++++++++++++ 4 files changed, 117 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 476210b..b3ac49f 100755 --- a/configure +++ b/configure @@ -1982,6 +1982,60 @@ EOF /* * If we have stable libs the we don't want the libxc compat * layers, regardless of what CFLAGS we may have been given. + */ +#undef XC_WANT_COMPAT_EVTCHN_API +#undef XC_WANT_COMPAT_GNTTAB_API +#undef XC_WANT_COMPAT_MAP_FOREIGN_API +#include +#include +#include +#include +#include +#include +#include +#if !defined(HVM_MAX_VCPUS) +# error HVM_MAX_VCPUS not defined +#endif +int main(void) { + xc_interface *xc = NULL; + xenforeignmemory_handle *xfmem; + xenevtchn_handle *xe; + xengnttab_handle *xg; + xen_domain_handle_t handle; + xengnttab_grant_copy_segment_t* seg = NULL; + + xs_daemon_open(); + + xc = xc_interface_open(0, 0, 0); + xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0); + xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); + xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); + xc_hvm_create_ioreq_server(xc, 0, HVM_IOREQSRV_BUFIOREQ_ATOMIC, NULL); + xc_domain_create(xc, 0, handle, 0, NULL, NULL); + + xfmem = xenforeignmemory_open(0, 0); + xenforeignmemory_map(xfmem, 0, 0, 0, 0, 0); + + xe = xenevtchn_open(0, 0); + xenevtchn_fd(xe); + + xg = xengnttab_open(0, 0); + xengnttab_grant_copy(xg, 0, seg); + + xc_domain_update_msi_irq_remapping(xc, 0, 0, 0, 0, 0 ,0); + + return 0; +} +EOF + compile_prog "" "$xen_libs $xen_stable_libs" + then + xen_ctrl_version=4100 + xen=yes + elif + cat > $TMPC <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 8e1580d..4ba43a8 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -438,4 +438,29 @@ static inline int xengnttab_grant_copy(xengnttab_handle *xgt, uint32_t count, } #endif +/* Xen before 4.10 */ +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 4100 + +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 */