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: jerry.hoemann@hp.com, tom.vaden@hp.com, rwright@hp.com,
linux-pci@vger.kernel.org, kexec@lists.infradead.org,
iommu@lists.linux-foundation.org, lisa.mitchell@hp.com,
linux-kernel@vger.kernel.org, alex.williamson@redhat.com,
zhen-hual@hp.com, ddutile@redhat.com, doug.hatch@hp.com,
ishii.hironobu@jp.fujitsu.com, bhelgaas@google.com,
billsumnerlinux@gmail.com, li.zhang6@hp.com
Subject: [PATCH v8 02/10] iommu/vt-d: Items required for kdump
Date: Mon, 12 Jan 2015 15:06:20 +0800 [thread overview]
Message-ID: <1421046388-27925-3-git-send-email-zhen-hual@hp.com> (raw)
In-Reply-To: <1421046388-27925-1-git-send-email-zhen-hual@hp.com>
Add structure type domain_values_entry used for kdump;
Add context entry 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 <billsumnerlinux@gmail.com>
Signed-off-by: Li, Zhen-Hua <zhen-hual@hp.com>
---
drivers/iommu/intel-iommu.c | 70 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 8d5c400..a71de3f 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -40,6 +40,7 @@
#include <linux/pci-ats.h>
#include <linux/memblock.h>
#include <linux/dma-contiguous.h>
+#include <linux/crash_dump.h>
#include <asm/irq_remapping.h>
#include <asm/cacheflush.h>
#include <asm/iommu.h>
@@ -208,6 +209,12 @@ get_context_addr_from_root(struct root_entry *root)
NULL);
}
+static inline unsigned long
+get_context_phys_from_root(struct root_entry *root)
+{
+ return root_present(root) ? (root->val & VTD_PAGE_MASK) : 0;
+}
+
/*
* low 64 bits:
* 0: present
@@ -228,6 +235,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;
@@ -313,6 +346,43 @@ 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. Do not re-enable IOMMU's translating.
+ * 3. In kdump kernel, use the old root entry table.
+ * 4. Leaves the current translations in-place so that legacy DMA will
+ * continue to use its current buffers.
+ * 5. 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
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2015-01-12 7:08 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-12 7:06 [PATCH v8 0/10] iommu/vt-d: Fix intel vt-d faults in kdump kernel Li, Zhen-Hua
2015-01-12 7:06 ` [PATCH v8 01/10] iommu/vt-d: Update iommu_attach_domain() and its callers Li, Zhen-Hua
2015-01-12 15:18 ` Joerg Roedel
2015-01-13 1:28 ` Li, ZhenHua
2015-01-12 7:06 ` Li, Zhen-Hua [this message]
2015-01-12 15:22 ` [PATCH v8 02/10] iommu/vt-d: Items required for kdump Joerg Roedel
2015-01-12 15:29 ` Vivek Goyal
2015-01-12 16:06 ` Joerg Roedel
2015-01-12 16:15 ` Vivek Goyal
2015-01-12 16:48 ` Joerg Roedel
2015-01-13 11:41 ` Baoquan He
2015-01-13 8:12 ` Li, ZhenHua
2015-01-12 7:06 ` [PATCH v8 03/10] iommu/vt-d: Add domain-id functions Li, Zhen-Hua
2015-01-12 7:06 ` [PATCH v8 04/10] iommu/vt-d: functions to copy data from old mem Li, Zhen-Hua
2015-01-12 7:06 ` [PATCH v8 05/10] iommu/vt-d: Add functions to load and save old re Li, Zhen-Hua
2015-01-12 7:06 ` [PATCH v8 06/10] iommu/vt-d: datatypes and functions used for kdump Li, Zhen-Hua
2015-01-15 3:28 ` Baoquan He
2015-01-15 5:45 ` Li, ZhenHua
2015-01-15 7:01 ` Baoquan He
2015-01-12 7:06 ` [PATCH v8 07/10] iommu/vt-d: enable kdump support in iommu module Li, Zhen-Hua
2015-01-12 7:06 ` [PATCH v8 08/10] iommu/vt-d: assign new page table for dma_map Li, Zhen-Hua
2015-01-12 7:06 ` [PATCH v8 09/10] iommu/vt-d: Copy functions for irte Li, Zhen-Hua
2015-01-12 7:06 ` [PATCH v8 10/10] iommu/vt-d: Use old irte in kdump kernel Li, Zhen-Hua
2015-01-12 8:00 ` [PATCH v8 0/10] iommu/vt-d: Fix intel vt-d faults " Li, ZhenHua
2015-01-12 9:07 ` Baoquan He
2015-01-12 9:28 ` Li, ZhenHua
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=1421046388-27925-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=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