From: Lianbo Jiang <lijiang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@redhat.com, tglx@linutronix.de, hpa@zytor.com,
ebiederm@xmission.com, joro@8bytes.org, thomas.lendacky@amd.com,
dyoung@redhat.com, kexec@lists.infradead.org,
iommu@lists.linux-foundation.org, bhe@redhat.com
Subject: [PATCH 4/5 V5] Adjust some permanent mappings in unencrypted ways for kdump when SME is enabled.
Date: Mon, 2 Jul 2018 15:26:38 +0800 [thread overview]
Message-ID: <20180702072639.10110-5-lijiang@redhat.com> (raw)
In-Reply-To: <20180702072639.10110-1-lijiang@redhat.com>
For kdump, the acpi table and dmi table will need to be remapped in
unencrypted ways during early init, they have just a simple wrapper
around early_memremap(), but the early_memremap() remaps the memory
in encrypted ways by default when SME is enabled, so we put some logic
into the early_memremap_pgprot_adjust(), which will have an opportunity
to adjust it.
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
---
arch/x86/mm/ioremap.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index e01e6c6..3c1c8c4 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -689,8 +689,17 @@ pgprot_t __init early_memremap_pgprot_adjust(resource_size_t phys_addr,
encrypted_prot = true;
if (sme_active()) {
+ /*
+ * In kdump mode, the acpi table and dmi table will need to
+ * be remapped in unencrypted ways during early init when
+ * SME is enabled. They have just a simple wrapper around
+ * early_memremap(), but the early_memremap() remaps the
+ * memory in encrypted ways by default when SME is enabled,
+ * so we must adjust it.
+ */
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.9.5
next prev parent reply other threads:[~2018-07-02 7:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-02 7:26 [PATCH 0/5 V5] Support kdump for AMD secure memory encryption(SME) Lianbo Jiang
2018-07-02 7:26 ` [PATCH 1/5 V5] Add a function(ioremap_encrypted) for kdump when AMD sme enabled Lianbo Jiang
2018-07-02 10:14 ` Borislav Petkov
[not found] ` <20180702101451.GB28730-Jj63ApZU6fQ@public.gmane.org>
2018-07-03 2:17 ` lijiang
[not found] ` <4ae1cfb5-0a4b-2aac-2575-024e2c74826f-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2018-07-03 9:39 ` Borislav Petkov
[not found] ` <20180703093924.GA5748-Jj63ApZU6fQ@public.gmane.org>
2018-07-03 11:25 ` lijiang
2018-07-03 10:58 ` lijiang
2018-07-03 11:14 ` Borislav Petkov
[not found] ` <20180703111428.GB5748-Jj63ApZU6fQ@public.gmane.org>
2018-07-03 11:44 ` lijiang
[not found] ` <4fbb843b-9597-a48b-8b6f-00e354b91950-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2018-07-09 6:28 ` lijiang
[not found] ` <e7357038-08bd-7ba8-5357-7c91d21d10fe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2018-07-09 9:29 ` Borislav Petkov
[not found] ` <20180709092901.GA22182-K5JNixvcfoxupOikMc4+xw@public.gmane.org>
2018-07-09 13:55 ` lijiang
2018-07-13 17:08 ` Borislav Petkov
[not found] ` <20180713170857.GB17896-K5JNixvcfoxupOikMc4+xw@public.gmane.org>
2018-07-20 5:06 ` lijiang
2018-07-20 5:23 ` Dave Young
2018-07-20 7:32 ` Borislav Petkov
2018-07-20 9:55 ` lijiang
2018-07-20 10:08 ` Boris Petkov
2018-08-16 5:35 ` lijiang
2018-08-23 15:21 ` Borislav Petkov
2018-07-02 7:26 ` [PATCH 2/5 V5] Allocate pages for kdump without encryption when SME is enabled Lianbo Jiang
2018-07-02 7:26 ` [PATCH 3/5 V5] Remap the device table of IOMMU in encrypted manner for kdump Lianbo Jiang
2018-07-02 7:26 ` Lianbo Jiang [this message]
2018-07-02 7:26 ` [PATCH 5/5 V5] Help to dump the old memory encrypted into vmcore file 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=20180702072639.10110-5-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;
as well as URLs for NNTP newsgroup(s).