Kexec Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lianbo Jiang <lijiang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: thomas.lendacky@amd.com, bhe@redhat.com, joro@8bytes.org,
	kexec@lists.infradead.org, iommu@lists.linux-foundation.org,
	mingo@redhat.com, ebiederm@xmission.com, hpa@zytor.com,
	tglx@linutronix.de, dyoung@redhat.com
Subject: [PATCH 2/5 V6] x86/ioremap: strengthen the logic in early_memremap_pgprot_adjust() to adjust encryption mask
Date: Fri, 31 Aug 2018 16:19:27 +0800	[thread overview]
Message-ID: <20180831081930.31561-3-lijiang@redhat.com> (raw)
In-Reply-To: <20180831081930.31561-1-lijiang@redhat.com>

For kdump kernel, when SME is enabled, the acpi table and dmi table will need
to be remapped without the memory encryption mask. So we have to strengthen
the logic in early_memremap_pgprot_adjust(), which makes us have an opportunity
to adjust the memory encryption mask.

Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
---
 arch/x86/mm/ioremap.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index e01e6c695add..f9d9a39955f3 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -689,8 +689,15 @@ pgprot_t __init early_memremap_pgprot_adjust(resource_size_t phys_addr,
 	encrypted_prot = true;
 
 	if (sme_active()) {
+                /*
+                 * In kdump kernel, the acpi table and dmi table will need
+                 * to be remapped without the memory encryption mask. Here
+                 * we have to strengthen the logic to adjust the memory
+                 * encryption mask.
+                 */
 		if (early_memremap_is_setup_data(phys_addr, size) ||
-		    memremap_is_efi_data(phys_addr, size))
+		    memremap_is_efi_data(phys_addr, size) ||
+		    is_kdump_kernel())
 			encrypted_prot = false;
 	}
 
-- 
2.17.1


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

  parent reply	other threads:[~2018-08-31  8:20 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-31  8:19 [PATCH 0/5 V6] Support kdump for AMD secure memory encryption(SME) Lianbo Jiang
2018-08-31  8:19 ` [PATCH 1/5 V6] x86/ioremap: add a function ioremap_encrypted() to remap kdump old memroy Lianbo Jiang
2018-08-31  8:19 ` Lianbo Jiang [this message]
2018-09-03  2:45   ` [PATCH 2/5 V6] x86/ioremap: strengthen the logic in early_memremap_pgprot_adjust() to adjust encryption mask Dave Young
2018-09-03 14:06     ` lijiang
2018-09-04  0:44       ` Dave Young
2018-09-04  1:29         ` Dave Young
2018-09-04  1:51           ` Dave Young
2018-09-05  6:35             ` lijiang
2018-09-05  6:46               ` Dave Young
2018-09-05 14:04                 ` lijiang
2018-09-04  1:44         ` lijiang
2018-08-31  8:19 ` [PATCH 3/5 V6] kexec: allocate unencrypted control pages for kdump in case SME is enabled Lianbo Jiang
2018-08-31  8:19 ` [PATCH 4/5 V6] iommu/amd_iommu: remap the device table of IOMMU with the memory encryption mask for kdump Lianbo Jiang
2018-08-31  8:19 ` [PATCH 5/5 V6] kdump/vmcore: support encrypted old memory with SME enabled Lianbo Jiang

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=20180831081930.31561-3-lijiang@redhat.com \
    --to=lijiang@redhat.com \
    --cc=bhe@redhat.com \
    --cc=dyoung@redhat.com \
    --cc=ebiederm@xmission.com \
    --cc=hpa@zytor.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=joro@8bytes.org \
    --cc=kexec@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=thomas.lendacky@amd.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