From: Quan Xu <quan.xu@intel.com>
To: xen-devel@lists.xen.org
Cc: dario.faggioli@citrix.com, Jan Beulich <jbeulich@suse.com>,
Feng Wu <feng.wu@intel.com>, Kevin Tian <kevin.tian@intel.com>,
Quan Xu <quan.xu@intel.com>
Subject: [PATCH v2 05/11] vt-d: propagate IOMMU Device-TLB flush error up to IOMMU unmapping.
Date: Mon, 18 Apr 2016 22:00:05 +0800 [thread overview]
Message-ID: <1460988011-17758-6-git-send-email-quan.xu@intel.com> (raw)
In-Reply-To: <1460988011-17758-1-git-send-email-quan.xu@intel.com>
While IOMMU Device-TLB flush timed out, xen calls panic() at present.
However the existing panic() is going to be eliminated, so we must
propagate the IOMMU Device-TLB flush error up to IOMMU unmapping.
Signed-off-by: Quan Xu <quan.xu@intel.com>
CC: Kevin Tian <kevin.tian@intel.com>
CC: Feng Wu <feng.wu@intel.com>
CC: Jan Beulich <jbeulich@suse.com>
---
xen/drivers/passthrough/vtd/iommu.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index 50d98ac..580a9cf 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -617,11 +617,12 @@ static void intel_iommu_iotlb_flush_all(struct domain *d)
}
/* clear one page's page table */
-static void dma_pte_clear_one(struct domain *domain, u64 addr)
+static int dma_pte_clear_one(struct domain *domain, u64 addr)
{
struct hvm_iommu *hd = domain_hvm_iommu(domain);
struct dma_pte *page = NULL, *pte = NULL;
u64 pg_maddr;
+ int rc = 0;
spin_lock(&hd->arch.mapping_lock);
/* get last level pte */
@@ -629,7 +630,7 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr)
if ( pg_maddr == 0 )
{
spin_unlock(&hd->arch.mapping_lock);
- return;
+ return 0;
}
page = (struct dma_pte *)map_vtd_domain_page(pg_maddr);
@@ -639,7 +640,7 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr)
{
spin_unlock(&hd->arch.mapping_lock);
unmap_vtd_domain_page(page);
- return;
+ return 0;
}
dma_clear_pte(*pte);
@@ -647,9 +648,11 @@ static void dma_pte_clear_one(struct domain *domain, u64 addr)
iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
if ( !this_cpu(iommu_dont_flush_iotlb) )
- iommu_flush_iotlb(domain, addr >> PAGE_SHIFT_4K, 1, 1);
+ rc = iommu_flush_iotlb(domain, addr >> PAGE_SHIFT_4K, 1, 1);
unmap_vtd_domain_page(page);
+
+ return rc;
}
static void iommu_free_pagetable(u64 pt_maddr, int level)
@@ -1770,9 +1773,7 @@ static int intel_iommu_unmap_page(struct domain *d, unsigned long gfn)
if ( iommu_passthrough && is_hardware_domain(d) )
return 0;
- dma_pte_clear_one(d, (paddr_t)gfn << PAGE_SHIFT_4K);
-
- return 0;
+ return dma_pte_clear_one(d, (paddr_t)gfn << PAGE_SHIFT_4K);
}
int iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte,
--
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-04-18 14:00 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-18 14:00 [PATCH v2 00/11] Check VT-d Device-TLB flush error Quan Xu
2016-04-18 14:00 ` [PATCH v2 01/11] vt-d: fix the IOMMU flush issue Quan Xu
2016-04-19 6:33 ` Tian, Kevin
2016-04-19 8:33 ` Xu, Quan
2016-04-25 9:22 ` Jan Beulich
2016-04-26 1:17 ` Xu, Quan
2016-04-26 2:18 ` Xu, Quan
2016-04-26 9:10 ` Jan Beulich
2016-04-26 10:15 ` Xu, Quan
2016-04-26 10:52 ` Jan Beulich
2016-04-26 10:58 ` Xu, Quan
2016-04-18 14:00 ` [PATCH v2 02/11] IOMMU: handle IOMMU mapping and unmapping failures Quan Xu
2016-04-19 6:36 ` Tian, Kevin
2016-04-19 6:40 ` Xu, Quan
2016-04-25 9:26 ` Jan Beulich
2016-04-27 14:26 ` Xu, Quan
2016-04-27 15:02 ` Jan Beulich
2016-04-28 1:23 ` Xu, Quan
2016-04-18 14:00 ` [PATCH v2 03/11] IOMMU/MMU: enhance the call trees of IOMMU unmapping and mapping Quan Xu
2016-04-19 6:44 ` Tian, Kevin
2016-04-20 5:27 ` Xu, Quan
2016-04-20 5:44 ` Tian, Kevin
2016-04-20 6:11 ` Jan Beulich
2016-04-20 6:26 ` Xu, Quan
2016-04-25 9:50 ` Jan Beulich
2016-04-27 8:49 ` Xu, Quan
2016-04-27 9:36 ` Jan Beulich
2016-04-27 13:10 ` Xu, Quan
2016-04-27 14:06 ` Jan Beulich
2016-04-27 15:48 ` George Dunlap
2016-04-28 1:18 ` Xu, Quan
2016-04-18 14:00 ` [PATCH v2 04/11] grant_table: avoid unnecessary work during grant table unmapping Quan Xu
2016-04-19 6:46 ` Tian, Kevin
2016-04-19 13:27 ` Xu, Quan
2016-04-20 5:35 ` Tian, Kevin
2016-04-25 9:55 ` Jan Beulich
2016-04-26 6:48 ` Xu, Quan
2016-04-18 14:00 ` Quan Xu [this message]
2016-04-19 6:51 ` [PATCH v2 05/11] vt-d: propagate IOMMU Device-TLB flush error up to IOMMU unmapping Tian, Kevin
2016-04-19 7:01 ` Xu, Quan
2016-04-25 10:06 ` Jan Beulich
2016-04-26 6:49 ` Xu, Quan
2016-04-18 14:00 ` [PATCH v2 06/11] vt-d: propagate IOMMU Device-TLB flush error up to IOMMU mapping Quan Xu
2016-04-19 6:53 ` Tian, Kevin
2016-04-18 14:00 ` [PATCH v2 07/11] IOMMU/MMU: propagate IOMMU Device-TLB flush error up to iommu_iotlb_flush{, _all} (top level ones) Quan Xu
2016-04-25 10:19 ` Jan Beulich
2016-04-26 12:23 ` Xu, Quan
2016-04-26 12:48 ` Jan Beulich
2016-04-27 6:21 ` Xu, Quan
2016-04-27 6:31 ` Jan Beulich
2016-04-27 9:08 ` Xu, Quan
2016-04-27 9:38 ` Jan Beulich
2016-04-18 14:00 ` [PATCH v2 08/11] IOMMU: propagate IOMMU Device-TLB flush error up to iommu_iotlb_flush{, _all} (leaf ones) Quan Xu
2016-04-19 6:58 ` Tian, Kevin
2016-04-19 8:58 ` Xu, Quan
2016-04-25 11:39 ` Jan Beulich
2016-04-26 11:50 ` Xu, Quan
2016-04-26 12:51 ` Jan Beulich
2016-04-26 13:20 ` Xu, Quan
2016-04-18 14:00 ` [PATCH v2 09/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU suspending Quan Xu
2016-04-25 11:52 ` Jan Beulich
2016-04-25 13:58 ` Julien Grall
2016-04-25 14:50 ` Xu, Quan
2016-04-26 9:40 ` Julien Grall
2016-04-26 11:28 ` Xu, Quan
2016-04-28 14:14 ` Xu, Quan
2016-04-28 14:36 ` Jan Beulich
2016-04-28 15:03 ` Xu, Quan
2016-04-28 15:12 ` Jan Beulich
2016-04-28 16:08 ` Xu, Quan
2016-04-29 2:20 ` Tian, Kevin
2016-04-29 2:41 ` Xu, Quan
2016-04-29 7:13 ` Jan Beulich
2016-04-29 8:23 ` Xu, Quan
2016-04-18 14:00 ` [PATCH v2 10/11] vt-d: propagate IOMMU Device-TLB flush error up to vt-d hardware initialization Quan Xu
2016-04-18 14:00 ` [PATCH v2 11/11] vt-d: propagate error up to ME phantom function mapping and unmapping Quan Xu
2016-04-25 12:00 ` Jan Beulich
2016-04-26 10:48 ` Xu, Quan
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=1460988011-17758-6-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=kevin.tian@intel.com \
--cc=xen-devel@lists.xen.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).