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 2/4 v7] kexec: allocate unencrypted control pages for kdump in case SME is enabled
Date: Fri, 7 Sep 2018 16:18:03 +0800 [thread overview]
Message-ID: <20180907081805.368-3-lijiang@redhat.com> (raw)
In-Reply-To: <20180907081805.368-1-lijiang@redhat.com>
When SME is enabled in the first kernel, we will allocate unencrypted pages
for kdump in order to be able to boot the kdump kernel like kexec.
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
---
kernel/kexec_core.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index 23a83a4da38a..e7efcd1a977b 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -471,6 +471,16 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
}
}
+ if (pages) {
+ /*
+ * For kdump, we need to ensure that these pages are
+ * unencrypted pages if SME is enabled.
+ * By the way, it is unnecessary to call the arch_
+ * kexec_pre_free_pages(), which will make the code
+ * become more simple.
+ */
+ arch_kexec_post_alloc_pages(page_address(pages), 1 << order, 0);
+ }
return pages;
}
@@ -867,6 +877,7 @@ static int kimage_load_crash_segment(struct kimage *image,
result = -ENOMEM;
goto out;
}
+ arch_kexec_post_alloc_pages(page_address(page), 1, 0);
ptr = kmap(page);
ptr += maddr & ~PAGE_MASK;
mchunk = min_t(size_t, mbytes,
@@ -884,6 +895,7 @@ static int kimage_load_crash_segment(struct kimage *image,
result = copy_from_user(ptr, buf, uchunk);
kexec_flush_icache_page(page);
kunmap(page);
+ arch_kexec_pre_free_pages(page_address(page), 1);
if (result) {
result = -EFAULT;
goto out;
--
2.17.1
next prev parent reply other threads:[~2018-09-07 8:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 8:18 [PATCH 0/4 v7] Support kdump for AMD secure memory encryption(SME) Lianbo Jiang
2018-09-07 8:18 ` [PATCH 1/4 v7] x86/ioremap: add a function ioremap_encrypted() to remap kdump old memory Lianbo Jiang
2018-09-26 2:21 ` Baoquan He
[not found] ` <e6cd5448-b314-e142-1169-9e3e907faf16@redhat.com>
2018-09-26 6:25 ` lijiang
2018-09-26 9:34 ` [PATCH 1/4 v8] " lijiang
2018-09-27 2:06 ` Baoquan He
2018-09-27 5:12 ` lijiang
2018-09-07 8:18 ` Lianbo Jiang [this message]
2018-09-07 8:18 ` [PATCH 3/4 v7] amd_iommu: remap the device table of IOMMU with the memory encryption mask for kdump Lianbo Jiang
2018-09-25 12:04 ` Joerg Roedel
2018-09-27 2:40 ` lijiang
2018-09-07 8:18 ` [PATCH 4/4 v7] kdump/vmcore: support encrypted old memory with SME enabled Lianbo Jiang
2018-09-25 19:10 ` [PATCH 0/4 v7] Support kdump for AMD secure memory encryption(SME) Lendacky, Thomas
[not found] ` <bdf6961d-3013-f707-bfc9-c55f0c02aba0@redhat.com>
2018-09-26 6:03 ` lijiang
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=20180907081805.368-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;
as well as URLs for NNTP newsgroup(s).