From: Quan Xu <quan.xu@intel.com>
To: jbeulich@suse.com, kevin.tian@intel.com
Cc: feng.wu@intel.com, eddie.dong@intel.com,
george.dunlap@eu.citrix.com, andrew.cooper3@citrix.com,
tim@xen.org, xen-devel@lists.xen.org, jun.nakajima@intel.com,
Quan Xu <quan.xu@intel.com>,
keir@xen.org
Subject: [PATCH v4 3/3] VT-d: Fix vt-d Device-TLB flush timeout issue.
Date: Wed, 23 Dec 2015 16:25:36 +0800 [thread overview]
Message-ID: <1450859136-98482-4-git-send-email-quan.xu@intel.com> (raw)
In-Reply-To: <1450859136-98482-1-git-send-email-quan.xu@intel.com>
Now if IOTLB/Context/IETC flush is timeout, panic hypervisor.
The coming patch set will fix it.
If Device-TLB flush is timeout, we'll hide the target ATS
device and crash the domain owning this ATS device.
If impacted domain is hardware domain, just throw out a warning.
The hided Device will be disallowed to be further assigned to
any domain.
Signed-off-by: Quan Xu <quan.xu@intel.com>
---
xen/drivers/passthrough/pci.c | 2 +-
xen/drivers/passthrough/vtd/extern.h | 2 +
xen/drivers/passthrough/vtd/qinval.c | 80 ++++++++++++++++++++++++++++++++++-
xen/drivers/passthrough/vtd/x86/ats.c | 13 ++++++
4 files changed, 94 insertions(+), 3 deletions(-)
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index 27b3ca7..2d7dc59 100644
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -407,7 +407,7 @@ static void _pci_hide_device(struct pci_dev *pdev)
list_add(&pdev->domain_list, &dom_xen->arch.pdev_list);
}
-int __init pci_hide_device(int bus, int devfn)
+int pci_hide_device(int bus, int devfn)
{
struct pci_dev *pdev;
int rc = -ENOMEM;
diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h
index ec9c513..a2123ce 100644
--- a/xen/drivers/passthrough/vtd/extern.h
+++ b/xen/drivers/passthrough/vtd/extern.h
@@ -58,6 +58,8 @@ int ats_device(const struct pci_dev *, const struct acpi_drhd_unit *);
int dev_invalidate_iotlb(struct iommu *iommu, u16 did,
u64 addr, unsigned int size_order, u64 type);
+int dev_invalidate_iotlb_sync(struct iommu *iommu, u16 did,
+ u16 seg, u8 bus, u8 devfn);
int qinval_device_iotlb(struct iommu *iommu,
u32 max_invs_pend, u16 sid, u16 size, u64 addr);
diff --git a/xen/drivers/passthrough/vtd/qinval.c b/xen/drivers/passthrough/vtd/qinval.c
index b227e4e..7330c5d 100644
--- a/xen/drivers/passthrough/vtd/qinval.c
+++ b/xen/drivers/passthrough/vtd/qinval.c
@@ -190,9 +190,19 @@ static int queue_invalidate_wait(struct iommu *iommu,
static int invalidate_sync(struct iommu *iommu)
{
struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu);
+ int rc;
if ( qi_ctrl->qinval_maddr )
- return queue_invalidate_wait(iommu, 0, 1, 1);
+ {
+ rc = queue_invalidate_wait(iommu, 0, 1, 1);
+ if ( rc )
+ {
+ if ( rc == -ETIMEDOUT )
+ panic("Queue invalidate wait descriptor was timeout.\n");
+ return rc;
+ }
+ }
+
return 0;
}
@@ -229,6 +239,63 @@ int qinval_device_iotlb(struct iommu *iommu,
return 0;
}
+static void dev_invalidate_iotlb_timeout(struct iommu *iommu, u16 did,
+ u16 seg, u8 bus, u8 devfn)
+{
+ struct domain *d;
+ struct pci_dev *pdev;
+
+ d = rcu_lock_domain_by_id(iommu->domid_map[did]);
+ ASSERT(d);
+ for_each_pdev(d, pdev)
+ {
+ if ( (pdev->seg == seg) &&
+ (pdev->bus == bus) &&
+ (pdev->devfn == devfn) )
+ {
+ if ( pdev->domain )
+ {
+ list_del(&pdev->domain_list);
+ pdev->domain = NULL;
+ }
+
+ if ( pci_hide_device(bus, devfn) )
+ {
+ printk(XENLOG_ERR
+ "IOMMU hide device %04x:%02x:%02x error.",
+ seg, bus, devfn);
+ break;
+ }
+
+ break;
+ }
+ }
+
+ if ( !is_hardware_domain(d) )
+ domain_crash(d);
+ rcu_unlock_domain(d);
+}
+
+int dev_invalidate_iotlb_sync(struct iommu *iommu, u16 did,
+ u16 seg, u8 bus, u8 devfn)
+{
+ struct qi_ctrl *qi_ctrl = iommu_qi_ctrl(iommu);
+ int rc;
+
+ if ( qi_ctrl->qinval_maddr )
+ {
+ rc = queue_invalidate_wait(iommu, 0, 1, 1);
+ if ( rc )
+ {
+ if ( rc == -ETIMEDOUT )
+ dev_invalidate_iotlb_timeout(iommu, did, seg, bus, devfn);
+ return rc;
+ }
+ }
+
+ return 0;
+}
+
static void queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
{
unsigned long flags;
@@ -349,9 +416,18 @@ static int flush_iotlb_qi(
queue_invalidate_iotlb(iommu,
type >> DMA_TLB_FLUSH_GRANU_OFFSET, dr,
dw, did, size_order, 0, addr);
+
+ /*
+ * Synchronize with hardware for invalidation request descriptors
+ * submitted before Device-TLB invalidate descriptor.
+ */
+ rc = invalidate_sync(iommu);
+ if ( rc )
+ return rc;
+
if ( flush_dev_iotlb )
ret = dev_invalidate_iotlb(iommu, did, addr, size_order, type);
- rc = invalidate_sync(iommu);
+
if ( !ret )
ret = rc;
}
diff --git a/xen/drivers/passthrough/vtd/x86/ats.c b/xen/drivers/passthrough/vtd/x86/ats.c
index 7c797f6..6299f52 100644
--- a/xen/drivers/passthrough/vtd/x86/ats.c
+++ b/xen/drivers/passthrough/vtd/x86/ats.c
@@ -162,6 +162,19 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did,
return -EOPNOTSUPP;
}
+ /*
+ * Synchronize with hardware for Device-TLB invalidate
+ * descriptor.
+ */
+ ret = dev_invalidate_iotlb_sync(iommu, did, pdev->seg,
+ pdev->bus, pdev->devfn);
+ if ( ret )
+ {
+ dprintk(XENLOG_WARNING VTDPREFIX,
+ "Device-TLB flush timeout.\n");
+ return ret;
+ }
+
if ( !ret )
ret = rc;
}
--
1.9.1
next prev parent reply other threads:[~2015-12-23 8:25 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-23 8:25 [PATCH v4 0/3] VT-d Device-TLB flush issue Quan Xu
2015-12-23 8:25 ` [PATCH v4 1/3] VT-d: Check VT-d Device-TLB flush error Quan Xu
2015-12-25 2:53 ` Tian, Kevin
2016-01-06 2:12 ` Xu, Quan
2016-01-14 17:01 ` Jan Beulich
2016-01-14 17:15 ` Jan Beulich
2015-12-23 8:25 ` [PATCH v4 2/3] VT-d: Reduce spin timeout to 1ms, which can be boot-time changed Quan Xu
2015-12-25 2:56 ` Tian, Kevin
2015-12-25 2:58 ` Xu, Quan
2016-01-13 16:55 ` Jan Beulich
2016-01-14 1:53 ` Xu, Quan
2016-01-13 16:57 ` Jan Beulich
2016-01-14 1:59 ` Xu, Quan
2016-01-14 9:03 ` Jan Beulich
2016-01-14 10:29 ` Xu, Quan
2016-01-14 12:17 ` Jan Beulich
2015-12-23 8:25 ` Quan Xu [this message]
2015-12-25 3:06 ` [PATCH v4 3/3] VT-d: Fix vt-d Device-TLB flush timeout issue Tian, Kevin
2016-01-06 11:25 ` Xu, Quan
2016-01-15 13:09 ` Jan Beulich
2016-01-20 10:26 ` Xu, Quan
2016-01-20 11:29 ` Jan Beulich
2016-01-21 16:16 ` Xu, Quan
2016-01-21 16:31 ` Jan Beulich
2016-01-22 15:57 ` Xu, Quan
2016-01-25 14:09 ` Jan Beulich
2016-01-26 13:47 ` Xu, Quan
2016-01-26 13:59 ` Jan Beulich
2016-01-26 15:27 ` Xu, Quan
2016-01-26 15:52 ` Jan Beulich
2016-01-26 22:47 ` Tian, Kevin
2016-01-27 11:09 ` Xu, Quan
2016-01-27 11:24 ` Jan Beulich
2016-01-27 12:38 ` Xu, Quan
2016-01-27 13:15 ` Jan Beulich
2016-01-27 14:13 ` Xu, Quan
2016-01-27 14:29 ` Jan Beulich
2016-01-27 14:35 ` Xu, Quan
2015-12-23 10:19 ` [PATCH v4 0/3] VT-d Device-TLB flush issue Xu, Quan
2015-12-23 10:40 ` Jan Beulich
2015-12-23 10:59 ` Xu, Quan
2015-12-23 10:39 ` Jan Beulich
2015-12-23 11:09 ` Xu, Quan
2015-12-25 1:50 ` Tian, Kevin
2015-12-25 2:26 ` Xu, Quan
2015-12-25 1:53 ` Tian, Kevin
2015-12-25 2:04 ` Xu, Quan
-- strict thread matches above, loose matches on Subject: below --
2016-01-07 1:39 [PATCH v4 3/3] VT-d: Fix vt-d Device-TLB flush timeout issue Xu, Quan
2016-01-07 13:28 ` Jan Beulich
2016-01-07 13:46 ` Xu, Quan
2016-01-08 1:06 ` Xu, Quan
2016-01-13 6:12 ` Tian, Kevin
2016-01-13 11:02 ` Jan Beulich
2016-01-14 1:22 ` Tian, Kevin
2016-01-14 9:00 ` Jan Beulich
2016-01-14 9:12 ` Tian, Kevin
2016-01-14 10:46 ` Xu, Quan
2016-01-18 15:32 ` Tim Deegan
2016-01-19 0:46 ` Tian, Kevin
2016-01-19 6:54 ` 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=1450859136-98482-4-git-send-email-quan.xu@intel.com \
--to=quan.xu@intel.com \
--cc=andrew.cooper3@citrix.com \
--cc=eddie.dong@intel.com \
--cc=feng.wu@intel.com \
--cc=george.dunlap@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=jun.nakajima@intel.com \
--cc=keir@xen.org \
--cc=kevin.tian@intel.com \
--cc=tim@xen.org \
--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).