From: Wupeng Ma <mawupeng1@huawei.com>
To: <akpm@linux-foundation.org>, <catalin.marinas@arm.com>,
<will@kernel.org>, <corbet@lwn.net>
Cc: <ardb@kernel.org>, <tglx@linutronix.de>, <mingo@redhat.com>,
<bp@alien8.de>, <dave.hansen@linux.intel.com>, <x86@kernel.org>,
<dvhart@infradead.org>, <andy@infradead.org>, <rppt@kernel.org>,
<paulmck@kernel.org>, <peterz@infradead.org>, <jroedel@suse.de>,
<songmuchun@bytedance.com>, <macro@orcam.me.uk>,
<frederic@kernel.org>, <W_Armin@gmx.de>, <john.garry@huawei.com>,
<seanjc@google.com>, <tsbogend@alpha.franken.de>,
<anshuman.khandual@arm.com>, <chenhuacai@kernel.org>,
<david@redhat.com>, <gpiccoli@igalia.com>, <mark.rutland@arm.com>,
<wangkefeng.wang@huawei.com>, <mawupeng1@huawei.com>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-efi@vger.kernel.org>, <linux-ia64@vger.kernel.org>,
<platform-driver-x86@vger.kernel.org>, <linux-mm@kvack.org>
Subject: [PATCH 2/2] arm64/boot: Add support to relocate kernel image to mirrored region without kaslr
Date: Tue, 19 Apr 2022 15:01:50 +0800 [thread overview]
Message-ID: <20220419070150.254377-3-mawupeng1@huawei.com> (raw)
In-Reply-To: <20220419070150.254377-1-mawupeng1@huawei.com>
From: Ma Wupeng <mawupeng1@huawei.com>
Add support to relocate kernel image to mirrord regions if KASLR doesn't
work.
If a suiable mirrored slot if found, call efi_random_alloc() with
random_seed be zero to relocate kernel code and data to the first slot
available.
Signed-off-by: Ma Wupeng <mawupeng1@huawei.com>
---
drivers/firmware/efi/libstub/arm64-stub.c | 10 ++++++++++
drivers/firmware/efi/libstub/randomalloc.c | 1 +
2 files changed, 11 insertions(+)
diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
index 39b774853b93..851a8948cafb 100644
--- a/drivers/firmware/efi/libstub/arm64-stub.c
+++ b/drivers/firmware/efi/libstub/arm64-stub.c
@@ -190,6 +190,16 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
}
if (status != EFI_SUCCESS) {
+ if (efi_mirror_found) {
+ status = efi_random_alloc(*reserve_size, min_kimg_align,
+ reserve_addr, 0,
+ efi_mirror_found);
+ if (status == EFI_SUCCESS)
+ goto out;
+
+ efi_err("Failed to relocate kernel to mirrored region\n");
+ }
+
if (!check_image_region((u64)_text, kernel_memsize)) {
efi_err("FIRMWARE BUG: Image BSS overlaps adjacent EFI memory region\n");
} else if (IS_ALIGNED((u64)_text, min_kimg_align)) {
diff --git a/drivers/firmware/efi/libstub/randomalloc.c b/drivers/firmware/efi/libstub/randomalloc.c
index dd81d6c3c406..d5f4249943a7 100644
--- a/drivers/firmware/efi/libstub/randomalloc.c
+++ b/drivers/firmware/efi/libstub/randomalloc.c
@@ -50,6 +50,7 @@ unsigned long get_entry_num_slots(efi_memory_desc_t *md,
*/
#define MD_NUM_SLOTS(md) ((md)->virt_addr)
+/* random_seed == 0 means alloc mem from the first suitable slot */
efi_status_t efi_random_alloc(unsigned long size,
unsigned long align,
unsigned long *addr,
--
2.25.1
next prev parent reply other threads:[~2022-04-19 6:43 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-14 10:13 [PATCH v2 0/9] introduce mirrored memory support for arm64 Wupeng Ma
2022-04-14 10:13 ` [PATCH v2 1/9] efi: Make efi_print_memmap() public Wupeng Ma
2022-04-14 10:13 ` [PATCH v2 2/9] arm64: efi: Add fake memory support Wupeng Ma
2022-04-14 10:13 ` [PATCH v2 3/9] efi: Make efi_find_mirror() public Wupeng Ma
2022-04-14 10:13 ` [PATCH v2 4/9] arm64/mirror: arm64 enabling - find mirrored memory ranges Wupeng Ma
2022-04-14 10:13 ` [PATCH v2 5/9] mm: Ratelimited mirrored memory related warning messages Wupeng Ma
2022-04-14 10:13 ` [PATCH v2 6/9] mm: Demote warning message in vmemmap_verify() to debug level Wupeng Ma
2022-04-14 10:13 ` [PATCH v2 7/9] mm: Calc the right pfn if page size is not 4K Wupeng Ma
2022-04-19 9:59 ` David Hildenbrand
2022-04-19 11:14 ` Anshuman Khandual
2022-04-19 18:29 ` Ard Biesheuvel
2022-04-20 22:27 ` Andrew Morton
2022-04-20 22:39 ` Ard Biesheuvel
2022-04-14 10:13 ` [PATCH v2 8/9] efi: Disable mirror feature if kernelcore is not specified Wupeng Ma
2022-04-14 10:13 ` [PATCH v2 9/9] ia64/efi: Code simplification in efi_init Wupeng Ma
2022-04-14 10:22 ` [PATCH v2 0/9] introduce mirrored memory support for arm64 Ard Biesheuvel
2022-04-16 1:32 ` mawupeng
2022-04-19 18:32 ` Ard Biesheuvel
2022-04-20 2:13 ` mawupeng
2022-04-19 7:01 ` [PATCH 0/2] Add support to relocate kernel image to mirrored region Wupeng Ma
2022-04-19 7:01 ` [PATCH 1/2] arm64/boot/KASLR: " Wupeng Ma
2022-04-19 7:01 ` Wupeng Ma [this message]
2022-05-03 9:58 ` [PATCH 0/2] " Ard Biesheuvel
2022-05-07 9:28 ` mawupeng
2022-05-19 11:09 ` mawupeng
2022-05-20 6:52 ` Ard Biesheuvel
2022-05-20 6:52 ` Ard Biesheuvel
2022-05-23 11:48 ` mawupeng
2022-05-23 1:18 ` mawupeng
2022-05-23 14:41 ` Ard Biesheuvel
2022-05-24 1:11 ` mawupeng
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=20220419070150.254377-3-mawupeng1@huawei.com \
--to=mawupeng1@huawei.com \
--cc=W_Armin@gmx.de \
--cc=akpm@linux-foundation.org \
--cc=andy@infradead.org \
--cc=anshuman.khandual@arm.com \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=dvhart@infradead.org \
--cc=frederic@kernel.org \
--cc=gpiccoli@igalia.com \
--cc=john.garry@huawei.com \
--cc=jroedel@suse.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=macro@orcam.me.uk \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=seanjc@google.com \
--cc=songmuchun@bytedance.com \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=wangkefeng.wang@huawei.com \
--cc=will@kernel.org \
--cc=x86@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