From: Marc Zyngier <maz@kernel.org>
To: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
James Morse <james.morse@arm.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Hanjun Guo <guohanjun@huawei.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Eric Biederman <ebiederm@xmission.com>,
Bhupesh SHARMA <bhupesh.sharma@linaro.org>,
AKASHI Takahiro <takahiro.akashi@linaro.org>,
Dave Young <dyoung@redhat.com>, Moritz Fischer <mdf@kernel.org>,
kernel-team@android.com
Subject: [PATCH 4/4] arm64: kexec_image: Implement arch_kexec_locate_mem_hole()
Date: Wed, 26 May 2021 20:05:31 +0100 [thread overview]
Message-ID: <20210526190531.62751-5-maz@kernel.org> (raw)
In-Reply-To: <20210526190531.62751-1-maz@kernel.org>
Provide an arm64-specific implementation for arch_kexec_locate_mem_hole(),
using the resource tree instead of memblock, and respecting
the reservations added by EFI.
This ensures that kexec_file is finally reliable.
Reported-by: Moritz Fischer <mdf@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/kernel/kexec_image.c | 45 +++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c
index 9ec34690e255..91e852c735df 100644
--- a/arch/arm64/kernel/kexec_image.c
+++ b/arch/arm64/kernel/kexec_image.c
@@ -145,3 +145,48 @@ const struct kexec_file_ops kexec_image_ops = {
.verify_sig = image_verify_sig,
#endif
};
+
+static int filter_out_reserved_res(struct resource *res, void *arg)
+{
+ return walk_excluding_child_res(res, arg,
+ kexec_locate_mem_hole_callback);
+}
+
+/**
+ * arch_kexec_locate_mem_hole - Find free memory to place the segments.
+ * @kbuf: Parameters for the memory search.
+ *
+ * On success, kbuf->mem will have the start address of the memory region found.
+ *
+ * Return: 0 on success, negative errno on error.
+ */
+int arch_kexec_locate_mem_hole(struct kexec_buf *kbuf)
+{
+ int ret;
+
+ /* Arch knows where to place */
+ if (kbuf->mem != KEXEC_BUF_MEM_UNKNOWN)
+ return 0;
+
+ /*
+ * Crash kernels land in a well known place that has been
+ * reserved upfront.
+ *
+ * Normal kexec kernels can however land anywhere in memory.
+ * We have to be extra careful not to step over critical
+ * memory ranges that have been marked as reserved in the
+ * iomem resource tree (LPI and ACPI tables, among others),
+ * hence the use of the child-excluding iterator. This
+ * matches what the userspace version of kexec does.
+ */
+ if (kbuf->image->type == KEXEC_TYPE_CRASH)
+ ret = walk_iomem_res_desc(crashk_res.desc,
+ IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY,
+ crashk_res.start, crashk_res.end,
+ kbuf, kexec_locate_mem_hole_callback);
+ else
+ ret = walk_system_ram_res(0, ULONG_MAX, kbuf,
+ filter_out_reserved_res);
+
+ return ret == 1 ? 0 : -EADDRNOTAVAIL;
+}
--
2.30.2
next prev parent reply other threads:[~2021-05-26 19:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 19:05 [PATCH 0/4] arm64: Make kexec_file_load honor iomem reservations Marc Zyngier
2021-05-26 19:05 ` [PATCH 1/4] kexec_file: Make locate_mem_hole_callback global Marc Zyngier
2021-05-26 19:05 ` [PATCH 2/4] kernel/resource: Populate child pointer in find_next_iomem_res() Marc Zyngier
2021-05-27 16:53 ` Catalin Marinas
2021-05-28 8:06 ` Marc Zyngier
2021-05-26 19:05 ` [PATCH 3/4] kernel/resource: Add walk_excluding_child_res() helper Marc Zyngier
2021-05-26 19:05 ` Marc Zyngier [this message]
2021-05-27 17:37 ` [PATCH 4/4] arm64: kexec_image: Implement arch_kexec_locate_mem_hole() Catalin Marinas
2021-05-28 9:05 ` Marc Zyngier
2021-05-27 17:39 ` [PATCH 0/4] arm64: Make kexec_file_load honor iomem reservations Catalin Marinas
2021-05-31 6:02 ` Ard Biesheuvel
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=20210526190531.62751-5-maz@kernel.org \
--to=maz@kernel.org \
--cc=ardb@kernel.org \
--cc=bhupesh.sharma@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=dyoung@redhat.com \
--cc=ebiederm@xmission.com \
--cc=guohanjun@huawei.com \
--cc=james.morse@arm.com \
--cc=kernel-team@android.com \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=mdf@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=takahiro.akashi@linaro.org \
--cc=will@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