From: "Li, Zhen-Hua" <zhen-hual-VXdhtT5mjnY@public.gmane.org>
To: dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org,
indou.takao-+CUm20s59erQFUHtdCDX3A@public.gmane.org,
bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org,
vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Cc: tom.vaden-VXdhtT5mjnY@public.gmane.org,
linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
lisa.mitchell-VXdhtT5mjnY@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
zhen-hual-VXdhtT5mjnY@public.gmane.org,
doug.hatch-VXdhtT5mjnY@public.gmane.org,
ishii.hironobu-+CUm20s59erQFUHtdCDX3A@public.gmane.org,
bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org,
billsumnerlinux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
li.zhang6-VXdhtT5mjnY@public.gmane.org
Subject: [PATCH 03/10] iommu/vt-d: Add domain-id functions
Date: Mon, 22 Dec 2014 17:15:22 +0800 [thread overview]
Message-ID: <1419239729-26529-4-git-send-email-zhen-hual@hp.com> (raw)
In-Reply-To: <1419239729-26529-1-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org>
Interfaces for when a new domain in the crashdump kernel needs some
values from the panicked kernel's context entries.
Signed-off-by: Bill Sumner <billsumnerlinux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/iommu/intel-iommu.c | 62 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 5ce2850..c0bebd6 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -381,6 +381,13 @@ struct domain_values_entry {
2 == 1GiB, 3 == 512GiB, 4 == 1TiB */
};
+static struct domain_values_entry *intel_iommu_did_to_domain_values_entry(
+ int did, struct intel_iommu *iommu);
+
+static int intel_iommu_get_dids_from_old_kernel(struct intel_iommu *iommu);
+
+static int device_to_domain_id(struct intel_iommu *iommu, u8 bus, u8 devfn);
+
#endif /* CONFIG_CRASH_DUMP */
/*
@@ -4832,3 +4839,58 @@ static void __init check_tylersburg_isoch(void)
printk(KERN_WARNING "DMAR: Recommended TLB entries for ISOCH unit is 16; your BIOS set %d\n",
vtisochctrl);
}
+
+#ifdef CONFIG_CRASH_DUMP
+
+/*
+ * Interfaces for when a new domain in the crashdump kernel needs some
+ * values from the panicked kernel's context entries
+ *
+ */
+static struct domain_values_entry *intel_iommu_did_to_domain_values_entry(
+ int did, struct intel_iommu *iommu)
+{
+ struct domain_values_entry *dve; /* iterator */
+
+ list_for_each_entry(dve, &domain_values_list[iommu->seq_id], link)
+ if (dve->did == did)
+ return dve;
+ return NULL;
+}
+
+/* Mark domain-id's from old kernel as in-use on this iommu so that a new
+ * domain-id is allocated in the case where there is a device in the new kernel
+ * that was not in the old kernel -- and therefore a new domain-id is needed.
+ */
+static int intel_iommu_get_dids_from_old_kernel(struct intel_iommu *iommu)
+{
+ struct domain_values_entry *dve; /* iterator */
+
+ pr_info("IOMMU:%d Domain ids from panicked kernel:\n", iommu->seq_id);
+
+ list_for_each_entry(dve, &domain_values_list[iommu->seq_id], link) {
+ set_bit(dve->did, iommu->domain_ids);
+ pr_info("DID did:%d(0x%4.4x)\n", dve->did, dve->did);
+ }
+
+ pr_info("----------------------------------------\n");
+ return 0;
+}
+
+static int device_to_domain_id(struct intel_iommu *iommu, u8 bus, u8 devfn)
+{
+ int did = -1; /* domain-id returned */
+ struct root_entry *root;
+ struct context_entry *context;
+ unsigned long flags;
+
+ spin_lock_irqsave(&iommu->lock, flags);
+ root = &iommu->root_entry[bus];
+ context = get_context_addr_from_root(root);
+ if (context && context_present(context+devfn))
+ did = context_domain_id(context+devfn);
+ spin_unlock_irqrestore(&iommu->lock, flags);
+ return did;
+}
+
+#endif /* CONFIG_CRASH_DUMP */
--
2.0.0-rc0
next prev parent reply other threads:[~2014-12-22 9:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-22 9:15 [PATCH 0/10] iommu/vt-d: Fix intel vt-d faults in kdump kernel Li, Zhen-Hua
[not found] ` <1419239729-26529-1-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org>
2014-12-22 9:15 ` [PATCH 01/10] iommu/vt-d: Update iommu_attach_domain() and its callers Li, Zhen-Hua
2014-12-22 9:15 ` [PATCH 02/10] iommu/vt-d: Items required for kdump Li, Zhen-Hua
2014-12-22 9:15 ` Li, Zhen-Hua [this message]
2014-12-22 9:15 ` [PATCH 04/10] iommu/vt-d: functions to copy data from old mem Li, Zhen-Hua
2014-12-22 9:15 ` [PATCH 05/10] iommu/vt-d: Add functions to load and save old re Li, Zhen-Hua
2014-12-22 9:15 ` [PATCH 06/10] iommu/vt-d: datatypes and functions used for kdump Li, Zhen-Hua
2014-12-22 9:15 ` [PATCH 07/10] iommu/vt-d: enable kdump support in iommu module Li, Zhen-Hua
2014-12-22 9:15 ` [PATCH 08/10] iommu/vtd: assign new page table for dma_map Li, Zhen-Hua
2014-12-22 9:15 ` [PATCH 09/10] iommu/vt-d: Copy functions for irte Li, Zhen-Hua
2014-12-22 9:15 ` [PATCH 10/10] iommu/vt-d: Use old irte in kdump kernel Li, Zhen-Hua
2014-12-26 5:13 ` [PATCH 0/10] iommu/vt-d: Fix intel vt-d faults " Takao Indoh
2014-12-26 6:46 ` Li, ZhenHua
2014-12-26 7:27 ` Takao Indoh
[not found] ` <549D0DEE.8000301-+CUm20s59erQFUHtdCDX3A@public.gmane.org>
2014-12-29 3:15 ` Li, ZhenHua
2015-01-06 0:18 ` Takao Indoh
[not found] ` <54AB29E6.6070403-+CUm20s59erQFUHtdCDX3A@public.gmane.org>
2015-01-06 2:04 ` Li, ZhenHua
2015-01-06 6:37 ` Baoquan He
2015-01-06 7:05 ` Li, ZhenHua
2014-12-22 9:43 ` Li, ZhenHua
-- strict thread matches above, loose matches on Subject: below --
2014-12-15 9:52 Li, Zhen-Hua
[not found] ` <1418637186-9988-1-git-send-email-zhen-hual-VXdhtT5mjnY@public.gmane.org>
2014-12-15 9:52 ` [PATCH 03/10] iommu/vt-d: Add domain-id functions Li, Zhen-Hua
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=1419239729-26529-4-git-send-email-zhen-hual@hp.com \
--to=zhen-hual-vxdhtt5mjny@public.gmane.org \
--cc=bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=billsumnerlinux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=doug.hatch-VXdhtT5mjnY@public.gmane.org \
--cc=dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org \
--cc=dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=indou.takao-+CUm20s59erQFUHtdCDX3A@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=ishii.hironobu-+CUm20s59erQFUHtdCDX3A@public.gmane.org \
--cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
--cc=kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=li.zhang6-VXdhtT5mjnY@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=lisa.mitchell-VXdhtT5mjnY@public.gmane.org \
--cc=tom.vaden-VXdhtT5mjnY@public.gmane.org \
--cc=vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.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