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>, <kexec@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-pci@vger.kernel.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>,
"Li, Zhen-Hua" <zhen-hual@hp.com>
Subject: [PATCH 2/5] iommu/vt-d: Items required for kdump
Date: Tue, 21 Oct 2014 16:04:16 +0800 [thread overview]
Message-ID: <1413878659-1383-3-git-send-email-zhen-hual@hp.com> (raw)
In-Reply-To: <1413878659-1383-1-git-send-email-zhen-hual@hp.com>
Add structure type domain_values_entry used for kdump;
Add context functions needed for kdump.
Bill Sumner:
Original version;
Li, Zhenhua:
Changed the name of new functions, make them consistent with current
context get/set functions.
Signed-off-by: Bill Sumner
Signed-off-by: Li, Zhen-Hua <zhen-hual@hp.com>
---
drivers/iommu/intel-iommu.c | 69 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 1c7350d..99fe408 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -207,6 +207,15 @@ get_context_addr_from_root(struct root_entry *root)
NULL);
}
+static inline struct context_entry *
+get_context_phys_from_root(struct root_entry *root)
+{
+ return (struct context_entry *)
+ (root_present(root) ? (void *) (root->val & VTD_PAGE_MASK)
+ : NULL);
+}
+
+
/*
* low 64 bits:
* 0: present
@@ -227,6 +236,32 @@ static inline bool context_present(struct context_entry *context)
{
return (context->lo & 1);
}
+
+static inline int context_fault_enable(struct context_entry *c)
+{
+ return((c->lo >> 1) & 0x1);
+}
+
+static inline int context_translation_type(struct context_entry *c)
+{
+ return((c->lo >> 2) & 0x3);
+}
+
+static inline u64 context_address_root(struct context_entry *c)
+{
+ return((c->lo >> VTD_PAGE_SHIFT));
+}
+
+static inline int context_address_width(struct context_entry *c)
+{
+ return((c->hi >> 0) & 0x7);
+}
+
+static inline int context_domain_id(struct context_entry *c)
+{
+ return((c->hi >> 8) & 0xffff);
+}
+
static inline void context_set_present(struct context_entry *context)
{
context->lo |= 1;
@@ -311,6 +346,40 @@ static inline int first_pte_in_page(struct dma_pte *pte)
return !((unsigned long)pte & ~VTD_PAGE_MASK);
}
+
+#ifdef CONFIG_CRASH_DUMP
+/*
+ * Fix Crashdump failure caused by leftover DMA through a hardware IOMMU
+ *
+ * Fixes the crashdump kernel to deal with an active iommu and legacy
+ * DMA from the (old) panicked kernel in a manner similar to how legacy
+ * DMA is handled when no hardware iommu was in use by the old kernel --
+ * allow the legacy DMA to continue into its current buffers.
+ *
+ * In the crashdump kernel, this code:
+ * 1. skips disabling the IOMMU's translating of IO Virtual Addresses (IOVA)
+ * 2. leaves the current translations in-place so that legacy DMA will
+ * continue to use its current buffers,
+ * 3. allocates to the device drivers in the crashdump kernel
+ * portions of the iova address ranges that are different
+ * from the iova address ranges that were being used by the old kernel
+ * at the time of the panic.
+ *
+ */
+
+struct domain_values_entry {
+ struct list_head link; /* link entries into a list */
+ struct iova_domain iovad; /* iova's that belong to this domain */
+ struct dma_pte *pgd; /* virtual address */
+ int did; /* domain id */
+ int gaw; /* max guest address width */
+ int iommu_superpage; /* Level of superpages supported:
+ 0 == 4KiB (no superpages), 1 == 2MiB,
+ 2 == 1GiB, 3 == 512GiB, 4 == 1TiB */
+};
+
+#endif /* CONFIG_CRASH_DUMP */
+
/*
* This domain is a statically identity mapping domain.
* 1. This domain creats a static 1:1 mapping to all usable memory.
--
2.0.0-rc0
next prev parent reply other threads:[~2014-10-21 8:05 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 8:04 [PATCH 0/5] iommu/vt-d: Fix crash dump failure caused by legacy DMA/IO Li, Zhen-Hua
2014-10-21 8:04 ` [PATCH 1/5] iommu/vt-d: Update iommu_attach_domain() and its callers Li, Zhen-Hua
2014-10-21 8:04 ` Li, Zhen-Hua [this message]
2014-10-21 8:04 ` [PATCH 3/5] iommu/vt-d: data types and functions used for kdump Li, Zhen-Hua
2014-10-21 8:04 ` [PATCH 4/5] iommu/vt-d: Add domain-id functions Li, Zhen-Hua
2014-10-21 8:04 ` [PATCH 5/5] iommu/vt-d: enable kdump support in iommu module Li, Zhen-Hua
2014-10-22 10:05 ` [PATCH 0/5] iommu/vt-d: Fix crash dump failure caused by legacy DMA/IO Baoquan He
2014-10-22 10:22 ` Li, Zhen-Hua
2014-10-22 10:27 ` Baoquan He
2014-10-27 7:29 ` Li, ZhenHua
2014-10-27 10:44 ` Baoquan He
2014-11-06 1:31 ` Takao Indoh
2014-11-06 1:35 ` Li, ZhenHua
2014-11-06 1:48 ` Takao Indoh
2014-11-06 2:11 ` Li, ZhenHua
2014-11-06 7:51 ` Takao Indoh
2014-11-06 8:06 ` Li, ZhenHua
2014-11-14 6:27 ` Li, ZhenHua
2014-11-17 13:38 ` Joerg Roedel
2014-12-01 6:31 ` Li, ZhenHua
2014-12-01 12:33 ` Joerg Roedel
2014-12-10 8:46 ` Baoquan He
2014-12-12 2:25 ` Li, ZhenHua
2014-12-12 16:11 ` Joerg Roedel
2014-12-15 9:13 ` Baoquan He
2014-12-15 9:16 ` Baoquan He
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=1413878659-1383-3-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=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=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).