From: "Li, Zhen-Hua" <zhen-hual@hp.com>
To: <dwmw2@infradead.org>, <indou.takao@jp.fujitsu.com>,
<bhe@redhat.com>, <joro@8bytes.org>, <vgoyal@redhat.com>,
<dyoung@redhat.com>
Cc: <iommu@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<kexec@lists.infradead.org>, <alex.williamson@redhat.com>,
<ddutile@redhat.com>, <ishii.hironobu@jp.fujitsu.com>,
<bhelgaas@google.com>, <doug.hatch@hp.com>,
<jerry.hoemann@hp.com>, <tom.vaden@hp.com>, <li.zhang6@hp.com>,
<lisa.mitchell@hp.com>, <billsumnerlinux@gmail.com>,
<zhen-hual@hp.com>, <rwright@hp.com>
Subject: [PATCH v11 08/10] iommu/vt-d: assign new page table for dma_map
Date: Mon, 11 May 2015 17:52:52 +0800 [thread overview]
Message-ID: <1431337974-545-9-git-send-email-zhen-hual@hp.com> (raw)
In-Reply-To: <1431337974-545-1-git-send-email-zhen-hual@hp.com>
When a device driver issues the first dma_map command for a device, we
assign a new and empty page-table, thus removing all mappings from the
old kernel for the device.
Signed-off-by: Li, Zhen-Hua <zhen-hual@hp.com>
---
drivers/iommu/intel-iommu.c | 58 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 50 insertions(+), 8 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 91545bf..3cc1027 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -396,6 +396,9 @@ static int copy_root_entry_table(struct intel_iommu *iommu);
static int intel_iommu_load_translation_tables(struct intel_iommu *iommu);
+static void unmap_device_dma(struct dmar_domain *domain,
+ struct device *dev,
+ struct intel_iommu *iommu);
static void iommu_check_pre_te_status(struct intel_iommu *iommu);
static u8 g_translation_pre_enabled;
@@ -3115,6 +3118,7 @@ static struct iova *intel_alloc_iova(struct device *dev,
static struct dmar_domain *__get_valid_domain_for_dev(struct device *dev)
{
struct dmar_domain *domain;
+ struct intel_iommu *iommu;
int ret;
domain = get_domain_for_dev(dev, DEFAULT_DOMAIN_ADDRESS_WIDTH);
@@ -3124,14 +3128,30 @@ static struct dmar_domain *__get_valid_domain_for_dev(struct device *dev)
return NULL;
}
- /* make sure context mapping is ok */
- if (unlikely(!domain_context_mapped(dev))) {
- ret = domain_context_mapping(domain, dev, CONTEXT_TT_MULTI_LEVEL);
- if (ret) {
- printk(KERN_ERR "Domain context map for %s failed",
- dev_name(dev));
- return NULL;
- }
+ /* if in kdump kernel, we need to unmap the mapped dma pages,
+ * detach this device first.
+ */
+ if (likely(domain_context_mapped(dev))) {
+ iommu = domain_get_iommu(domain);
+ if (iommu->pre_enabled_trans) {
+ unmap_device_dma(domain, dev, iommu);
+
+ domain = get_domain_for_dev(dev,
+ DEFAULT_DOMAIN_ADDRESS_WIDTH);
+ if (!domain) {
+ pr_err("Allocating domain for %s failed",
+ dev_name(dev));
+ return NULL;
+ }
+ } else
+ return domain;
+ }
+
+ ret = domain_context_mapping(domain, dev, CONTEXT_TT_MULTI_LEVEL);
+ if (ret) {
+ pr_err("Domain context map for %s failed",
+ dev_name(dev));
+ return NULL;
}
return domain;
@@ -5168,6 +5188,28 @@ static int intel_iommu_load_translation_tables(struct intel_iommu *iommu)
return ret;
}
+static void unmap_device_dma(struct dmar_domain *domain,
+ struct device *dev,
+ struct intel_iommu *iommu)
+{
+ struct context_entry *ce;
+ struct iova *iova;
+ phys_addr_t phys_addr;
+ dma_addr_t dev_addr;
+ struct pci_dev *pdev;
+
+ pdev = to_pci_dev(dev);
+ ce = iommu_context_addr(iommu, pdev->bus->number, pdev->devfn, 1);
+ phys_addr = context_address_root(ce) << VTD_PAGE_SHIFT;
+ dev_addr = phys_to_dma(dev, phys_addr);
+
+ iova = find_iova(&domain->iovad, IOVA_PFN(dev_addr));
+ if (iova)
+ intel_unmap(dev, dev_addr);
+
+ domain_remove_one_dev_info(domain, dev);
+}
+
static void iommu_check_pre_te_status(struct intel_iommu *iommu)
{
u32 sts;
--
2.0.0-rc0
next prev parent reply other threads:[~2015-05-11 9:56 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 9:52 [PATCH v11 0/10] iommu/vt-d: Fix intel vt-d faults in kdump kernel Li, Zhen-Hua
2015-05-11 9:52 ` [PATCH v11 01/10] iommu/vt-d: New function to attach domain with id Li, Zhen-Hua
2015-05-11 9:52 ` [PATCH v11 02/10] iommu/vt-d: Items required for kdump Li, Zhen-Hua
2015-05-12 8:17 ` Dave Young
2015-05-13 1:45 ` Li, ZhenHua
2015-05-13 6:31 ` Alexander Duyck
2015-05-13 8:42 ` Dave Young
2015-05-11 9:52 ` [PATCH v11 03/10] iommu/vt-d: Function to get existing context entry Li, Zhen-Hua
2015-05-11 9:52 ` [PATCH v11 04/10] iommu/vt-d: functions to copy data from old mem Li, Zhen-Hua
2015-05-12 8:29 ` Dave Young
2015-05-13 9:00 ` Baoquan He
2015-05-13 9:13 ` Li, ZhenHua
2015-05-13 9:21 ` Baoquan He
2015-06-08 14:15 ` David Woodhouse
2015-06-08 15:21 ` Joerg Roedel
2015-06-08 15:44 ` David Woodhouse
2015-05-11 9:52 ` [PATCH v11 05/10] iommu/vt-d: Add functions to load and save old re Li, Zhen-Hua
2015-05-12 8:37 ` Dave Young
2015-05-13 1:47 ` Li, ZhenHua
2015-05-13 8:49 ` Dave Young
2015-05-11 9:52 ` [PATCH v11 06/10] iommu/vt-d: datatypes and functions used for kdump Li, Zhen-Hua
2015-05-12 8:48 ` Dave Young
2015-05-13 8:56 ` Baoquan He
2015-05-13 8:58 ` Li, ZhenHua
2015-05-13 9:10 ` Baoquan He
2015-05-11 9:52 ` [PATCH v11 07/10] iommu/vt-d: enable kdump support in iommu module Li, Zhen-Hua
2015-05-12 8:52 ` Dave Young
2015-05-13 2:10 ` Baoquan He
2015-05-13 2:28 ` Li, ZhenHua
2015-05-13 2:36 ` Baoquan He
2015-05-11 9:52 ` Li, Zhen-Hua [this message]
2015-05-20 23:52 ` [PATCH v11 08/10] iommu/vt-d: assign new page table for dma_map Baoquan He
2015-05-21 1:27 ` Li, ZhenHua
2015-05-21 6:54 ` Baoquan He
2015-05-21 8:40 ` Li, ZhenHua
2015-05-21 10:11 ` Baoquan He
2015-05-11 9:52 ` [PATCH v11 09/10] iommu/vt-d: Copy functions for irte Li, Zhen-Hua
2015-05-12 9:00 ` Dave Young
2015-05-11 9:52 ` [PATCH v11 10/10] iommu/vt-d: Use old irte in kdump kernel Li, Zhen-Hua
2015-05-12 6:18 ` [PATCH v11 0/10] iommu/vt-d: Fix intel vt-d faults " Baoquan He
2015-05-12 9:04 ` Dave Young
2015-05-12 9:34 ` Li, Zhen-Hua
2015-05-13 1:54 ` Li, ZhenHua
2015-05-18 10:05 ` Li, ZhenHua
2015-05-19 1:13 ` Dave Young
2015-05-19 7:43 ` Li, ZhenHua
2015-05-29 16:21 ` Joerg Roedel
2015-05-30 11:23 ` Li, Zhen-Hua
2015-06-08 14:26 ` David Woodhouse
2015-06-08 15:29 ` Joerg Roedel
2015-06-08 15:50 ` David Woodhouse
2015-06-08 16:13 ` Joerg Roedel
2015-06-09 12:55 ` David Woodhouse
2015-06-10 9:21 ` Joerg Roedel
2015-06-10 9:32 ` Li, ZhenHua
2015-06-10 14:10 ` David Woodhouse
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=1431337974-545-9-git-send-email-zhen-hual@hp.com \
--to=zhen-hual@hp.com \
--cc=alex.williamson@redhat.com \
--cc=bhe@redhat.com \
--cc=bhelgaas@google.com \
--cc=billsumnerlinux@gmail.com \
--cc=ddutile@redhat.com \
--cc=doug.hatch@hp.com \
--cc=dwmw2@infradead.org \
--cc=dyoung@redhat.com \
--cc=indou.takao@jp.fujitsu.com \
--cc=iommu@lists.linux-foundation.org \
--cc=ishii.hironobu@jp.fujitsu.com \
--cc=jerry.hoemann@hp.com \
--cc=joro@8bytes.org \
--cc=kexec@lists.infradead.org \
--cc=li.zhang6@hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lisa.mitchell@hp.com \
--cc=rwright@hp.com \
--cc=tom.vaden@hp.com \
--cc=vgoyal@redhat.com \
/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).