From: "Xu, Quan" <quan.xu@intel.com> To: xen-devel@lists.xen.org Cc: Kevin Tian <kevin.tian@intel.com>, Stefano Stabellini <sstabellini@kernel.org>, Feng Wu <feng.wu@intel.com>, Quan Xu <quan.xu@intel.com>, dario.faggioli@citrix.com, Julien Grall <julien.grall@arm.com>, Jan Beulich <jbeulich@suse.com>, Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Subject: [PATCH v7 04/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU mapping (top level ones) Date: Wed, 8 Jun 2016 16:58:57 +0800 [thread overview] Message-ID: <1465376344-28290-5-git-send-email-quan.xu@intel.com> (raw) In-Reply-To: <1465376344-28290-1-git-send-email-quan.xu@intel.com> From: Quan Xu <quan.xu@intel.com> Signed-off-by: Quan Xu <quan.xu@intel.com> Acked-by: Kevin Tian <kevin.tian@intel.com> CC: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Julien Grall <julien.grall@arm.com> CC: Kevin Tian <kevin.tian@intel.com> CC: Feng Wu <feng.wu@intel.com> CC: Jan Beulich <jbeulich@suse.com> v7: drop the amd_iommu_hwdom_init() fix, which has been added in patch 2 in this v7. --- xen/drivers/passthrough/arm/smmu.c | 4 ++-- xen/drivers/passthrough/vtd/iommu.c | 7 ++++--- xen/include/asm-x86/hvm/svm/amd-iommu-proto.h | 4 ++-- xen/include/xen/iommu.h | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 1ce4ddf..ee5c89d 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -2745,8 +2745,8 @@ static void arm_smmu_iommu_domain_teardown(struct domain *d) xfree(xen_domain); } -static int arm_smmu_map_page(struct domain *d, unsigned long gfn, - unsigned long mfn, unsigned int flags) +static int __must_check arm_smmu_map_page(struct domain *d, unsigned long gfn, + unsigned long mfn, unsigned int flags) { p2m_type_t t; diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 4844193..e900019 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1687,9 +1687,10 @@ static void iommu_domain_teardown(struct domain *d) spin_unlock(&hd->arch.mapping_lock); } -static int intel_iommu_map_page( - struct domain *d, unsigned long gfn, unsigned long mfn, - unsigned int flags) +static int __must_check intel_iommu_map_page(struct domain *d, + unsigned long gfn, + unsigned long mfn, + unsigned int flags) { struct domain_iommu *hd = dom_iommu(d); struct dma_pte *page = NULL, *pte = NULL, old, new = { 0 }; diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h index 57b6cc1..ac9f036 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h @@ -51,8 +51,8 @@ int amd_iommu_init(void); int amd_iommu_update_ivrs_mapping_acpi(void); /* mapping functions */ -int amd_iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, - unsigned int flags); +int __must_check amd_iommu_map_page(struct domain *d, unsigned long gfn, + unsigned long mfn, unsigned int flags); int __must_check amd_iommu_unmap_page(struct domain *d, unsigned long gfn); u64 amd_iommu_get_next_table_from_pte(u32 *entry); int amd_iommu_reserve_domain_unity_map(struct domain *domain, diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index f45fa5a..2b86710 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -166,8 +166,8 @@ struct iommu_ops { #endif /* HAS_PCI */ void (*teardown)(struct domain *d); - int (*map_page)(struct domain *d, unsigned long gfn, unsigned long mfn, - unsigned int flags); + int __must_check (*map_page)(struct domain *d, unsigned long gfn, + unsigned long mfn, unsigned int flags); int __must_check (*unmap_page)(struct domain *d, unsigned long gfn); void (*free_page_table)(struct page_info *); #ifdef CONFIG_X86 -- 1.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-08 8:58 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-08 8:58 [PATCH v7 00/11] Check VT-d Device-TLB flush error Xu, Quan 2016-06-08 8:58 ` [PATCH v7 01/11] IOMMU: handle IOMMU mapping and unmapping failures Xu, Quan 2016-06-08 8:58 ` [PATCH v7 02/11] IOMMU/MMU: enhance the call trees of IOMMU unmapping and mapping Xu, Quan 2016-06-08 14:40 ` Jan Beulich [not found] ` <57584D8602000078000F32D0@prv-mh.provo.novell.com> [not found] ` <421857ad-4f6b-e99c-1e81-034b19effdfb@amd.com> 2016-06-10 6:56 ` Jan Beulich 2016-06-12 6:41 ` Tian, Kevin 2016-06-08 8:58 ` [PATCH v7 03/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU unmapping (top level ones) Xu, Quan 2016-06-08 14:42 ` Jan Beulich 2016-06-08 14:54 ` Jan Beulich 2016-06-09 19:30 ` Suravee Suthikulanit 2016-06-09 10:28 ` Julien Grall 2016-06-08 8:58 ` Xu, Quan [this message] 2016-06-08 14:43 ` [PATCH v7 04/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU mapping " Jan Beulich 2016-06-09 18:45 ` Suravee Suthikulanit 2016-06-09 10:30 ` Julien Grall 2016-06-08 8:58 ` [PATCH v7 05/11] IOMMU/MMU: propagate IOMMU Device-TLB flush error up to iommu_iotlb_flush{, _all} " Xu, Quan 2016-06-09 11:12 ` Julien Grall 2016-06-09 11:45 ` Jan Beulich 2016-06-09 12:03 ` Julien Grall 2016-06-09 12:08 ` Julien Grall 2016-06-09 12:15 ` Jan Beulich 2016-06-09 12:24 ` Julien Grall 2016-06-09 12:32 ` Jan Beulich 2016-06-09 12:39 ` Julien Grall 2016-06-12 6:55 ` Tian, Kevin 2016-06-12 7:02 ` Xu, Quan 2016-06-12 15:35 ` Julien Grall 2016-06-09 12:14 ` Jan Beulich 2016-06-12 6:46 ` Tian, Kevin 2016-06-08 8:58 ` [PATCH v7 06/11] propagate IOMMU Device-TLB flush error up to EPT update " Xu, Quan 2016-06-08 8:59 ` [PATCH v7 07/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU suspending " Xu, Quan 2016-06-08 14:51 ` Jan Beulich 2016-06-12 7:42 ` Xu, Quan 2016-06-13 9:25 ` Jan Beulich 2016-06-09 18:58 ` Suravee Suthikulanit 2016-06-12 6:58 ` Tian, Kevin 2016-06-08 8:59 ` [PATCH v7 08/11] IOMMU: propagate IOMMU Device-TLB flush error (leaf ones) Xu, Quan 2016-06-08 8:59 ` [PATCH v7 09/11] vt-d: fix the IOMMU flush issue Xu, Quan 2016-06-12 7:32 ` Tian, Kevin 2016-06-12 9:27 ` Xu, Quan 2016-06-13 8:50 ` Xu, Quan 2016-06-08 8:59 ` [PATCH v7 10/11] vt-d: propagate the IOMMU Device-TLB flush error up to ME phantom functions Xu, Quan 2016-06-12 7:34 ` Tian, Kevin 2016-06-08 8:59 ` [PATCH v7 11/11] vt-d: add __must_check annotation to IOMMU flush pointers and handlers Xu, Quan 2016-06-12 7:35 ` Tian, Kevin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1465376344-28290-5-git-send-email-quan.xu@intel.com \ --to=quan.xu@intel.com \ --cc=dario.faggioli@citrix.com \ --cc=feng.wu@intel.com \ --cc=jbeulich@suse.com \ --cc=julien.grall@arm.com \ --cc=kevin.tian@intel.com \ --cc=sstabellini@kernel.org \ --cc=suravee.suthikulpanit@amd.com \ --cc=xen-devel@lists.xen.org \ --subject='Re: [PATCH v7 04/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU mapping (top level ones)' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).