From: Baoquan He <bhe@redhat.com>
To: jroedel@suse.de
Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Baoquan He <bhe@redhat.com>
Subject: [PATCH v8 06/13] iommu/amd: copy old trans table from old kernel
Date: Fri, 21 Jul 2017 16:59:04 +0800 [thread overview]
Message-ID: <1500627551-12930-7-git-send-email-bhe@redhat.com> (raw)
In-Reply-To: <1500627551-12930-1-git-send-email-bhe@redhat.com>
Here several things need be done:
- If iommu is pre-enabled in a normal kernel, just disable it and print
warning.
- If failed to copy dev table of old kernel, continue to proceed as
it does in normal kernel.
- Disable and Re-enable event/cmd buffer, install the copied DTE table
to reg, and detect and enable guest vapic.
- Flush all caches
Signed-off-by: Baoquan He <bhe@redhat.com>
---
drivers/iommu/amd_iommu_init.c | 51 ++++++++++++++++++++++++++++++++++++------
1 file changed, 44 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index c58f091ce232..aa9b5918d11f 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -37,6 +37,7 @@
#include <asm/io_apic.h>
#include <asm/irq_remapping.h>
+#include <linux/crash_dump.h>
#include "amd_iommu_proto.h"
#include "amd_iommu_types.h"
#include "irq_remapping.h"
@@ -1489,9 +1490,12 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h)
iommu->int_enabled = false;
init_translation_status(iommu);
-
- if (translation_pre_enabled(iommu))
- pr_warn("Translation is already enabled - trying to copy translation structures\n");
+ if (translation_pre_enabled(iommu) && !is_kdump_kernel()) {
+ iommu_disable(iommu);
+ clear_translation_pre_enabled(iommu);
+ pr_warn("Translation was enabled for IOMMU:%d but we are not in kdump mode\n",
+ iommu->index);
+ }
ret = init_iommu_from_acpi(iommu, h);
if (ret)
@@ -1986,8 +1990,7 @@ static int __init init_memory_definitions(struct acpi_table_header *table)
}
/*
- * Init the device table to not allow DMA access for devices and
- * suppress all page faults
+ * Init the device table to not allow DMA access for devices
*/
static void init_device_table_dma(void)
{
@@ -2128,9 +2131,43 @@ static void early_enable_iommu(struct amd_iommu *iommu)
static void early_enable_iommus(void)
{
struct amd_iommu *iommu;
+ bool is_pre_enabled = false;
- for_each_iommu(iommu)
- early_enable_iommu(iommu);
+ for_each_iommu(iommu) {
+ if (translation_pre_enabled(iommu)) {
+ is_pre_enabled = true;
+ break;
+ }
+ }
+
+ if (!is_pre_enabled) {
+ for_each_iommu(iommu)
+ early_enable_iommu(iommu);
+ } else {
+ pr_warn("Translation is already enabled - trying to copy translation structures\n");
+ if (copy_dev_tables()) {
+ pr_err("Failed to copy DEV table from previous kernel.\n");
+ /*
+ * If failed to copy dev tables from old kernel, continue to proceed
+ * as it does in normal kernel.
+ */
+ for_each_iommu(iommu) {
+ clear_translation_pre_enabled(iommu);
+ early_enable_iommu(iommu);
+ }
+ } else {
+ pr_info("Copied DEV table from previous kernel.\n");
+ for_each_iommu(iommu) {
+ iommu_disable_command_buffer(iommu);
+ iommu_disable_event_buffer(iommu);
+ iommu_enable_command_buffer(iommu);
+ iommu_enable_event_buffer(iommu);
+ iommu_enable_ga(iommu);
+ iommu_set_device_table(iommu);
+ iommu_flush_all_caches(iommu);
+ }
+ }
+ }
#ifdef CONFIG_IRQ_REMAP
if (AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))
--
2.5.5
next prev parent reply other threads:[~2017-07-21 8:59 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-21 8:58 [PATCH v8 00/13] Fix the on-flight DMA issue on system with amd iommu Baoquan He
2017-07-21 8:58 ` [PATCH v8 01/13] iommu/amd: Detect pre enabled translation Baoquan He
2017-07-27 15:04 ` Joerg Roedel
2017-07-28 2:31 ` Baoquan He
2017-07-21 8:59 ` [PATCH v8 02/13] iommu/amd: add several helper functions Baoquan He
2017-07-27 15:06 ` Joerg Roedel
2017-07-28 2:36 ` Baoquan He
2017-07-31 10:01 ` Baoquan He
2017-07-31 10:07 ` Joerg Roedel
2017-07-21 8:59 ` [PATCH v8 03/13] Revert "iommu/amd: Suppress IO_PAGE_FAULTs in kdump kernel" Baoquan He
2017-07-21 8:59 ` [PATCH v8 04/13] iommu/amd: Define bit fields for DTE particularly Baoquan He
2017-07-21 8:59 ` [PATCH v8 05/13] iommu/amd: Add function copy_dev_tables() Baoquan He
2017-07-27 15:29 ` Joerg Roedel
2017-07-28 3:59 ` Baoquan He
2017-07-21 8:59 ` Baoquan He [this message]
2017-07-27 15:38 ` [PATCH v8 06/13] iommu/amd: copy old trans table from old kernel Joerg Roedel
2017-07-28 6:52 ` Baoquan He
2017-07-21 8:59 ` [PATCH v8 07/13] iommu/amd: Do sanity check for irq remap of old dev table entry Baoquan He
2017-07-21 8:59 ` [PATCH v8 08/13] iommu: Add is_attach_deferred call-back to iommu-ops Baoquan He
2017-07-21 8:59 ` [PATCH v8 09/13] iommu/amd: Use is_attach_deferred call-back Baoquan He
2017-07-27 15:53 ` Joerg Roedel
2017-07-28 4:02 ` Baoquan He
2017-07-21 8:59 ` [PATCH v8 10/13] iommu/amd: Allocate memory below 4G for dev table if translation pre-enabled Baoquan He
2017-07-27 15:55 ` Joerg Roedel
2017-07-28 9:06 ` Baoquan He
2017-07-28 11:14 ` Joerg Roedel
2017-07-28 11:15 ` Baoquan He
2017-07-28 11:18 ` Joerg Roedel
2017-07-28 11:26 ` Baoquan He
2017-07-31 10:15 ` Baoquan He
2017-07-31 10:21 ` Joerg Roedel
2017-07-31 10:29 ` Baoquan He
2017-07-21 8:59 ` [PATCH v8 11/13] iommu/amd: Don't copy GCR3 table root pointer Baoquan He
2017-07-23 22:33 ` kbuild test robot
2017-07-23 23:53 ` Baoquan He
2017-07-27 15:57 ` Joerg Roedel
2017-07-28 9:07 ` Baoquan He
2017-07-21 8:59 ` [PATCH v8 12/13] iommu/amd: Clear out the GV flag when handle deferred domain attach Baoquan He
2017-07-21 8:59 ` [PATCH v8 13/13] iommu/amd: Disable iommu only if amd_iommu=off is specified Baoquan He
2017-07-27 15:58 ` Joerg Roedel
2017-07-28 9:08 ` 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=1500627551-12930-7-git-send-email-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.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).