From: Pingfan Liu <piliu@redhat.com>
To: kexec@lists.infradead.org
Cc: Pingfan Liu <piliu@redhat.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
John Fastabend <john.fastabend@gmail.com>,
Andrii Nakryiko <andrii@kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
Eduard Zingerman <eddyz87@gmail.com>, Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
Jeremy Linton <jeremy.linton@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>,
Simon Horman <horms@kernel.org>,
Gerd Hoffmann <kraxel@redhat.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Philipp Rudo <prudo@redhat.com>, Viktor Malik <vmalik@redhat.com>,
Jan Hendrik Farr <kernel@jfarr.cc>, Baoquan He <bhe@redhat.com>,
Dave Young <dyoung@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
bpf@vger.kernel.org
Subject: [PATCHv4 06/12] kexec: Integrate with the introduced bpf kfuncs
Date: Tue, 22 Jul 2025 10:03:13 +0800 [thread overview]
Message-ID: <20250722020319.5837-7-piliu@redhat.com> (raw)
In-Reply-To: <20250722020319.5837-1-piliu@redhat.com>
This patch does two things:
First, register as a listener on bpf_copy_to_kernel()
Second, in order that the hooked bpf-prog can call the sleepable kfuncs,
bpf_handle_pefile and bpf_post_handle_pefile are marked as
KF_SLEEPABLE.
Signed-off-by: Pingfan Liu <piliu@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Philipp Rudo <prudo@redhat.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: bpf@vger.kernel.org
To: kexec@lists.infradead.org
---
kernel/kexec_pe_image.c | 67 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/kernel/kexec_pe_image.c b/kernel/kexec_pe_image.c
index b0cf9942e68d2..f8debcde6b516 100644
--- a/kernel/kexec_pe_image.c
+++ b/kernel/kexec_pe_image.c
@@ -38,6 +38,51 @@ static struct kexec_res parsed_resource[3] = {
{ KEXEC_RES_CMDLINE_NAME, },
};
+/*
+ * @name should be one of : kernel, initrd, cmdline
+ */
+static int bpf_kexec_carrier(const char *name, struct mem_range_result *r)
+{
+ struct kexec_res *res;
+ int i;
+
+ if (!r || !name)
+ return -EINVAL;
+
+ for (i = 0; i < 3; i++) {
+ if (!strcmp(parsed_resource[i].name, name))
+ break;
+ }
+ if (i >= 3)
+ return -EINVAL;
+
+ res = &parsed_resource[i];
+ /*
+ * Replace the intermediate resource generated by the previous step.
+ */
+ if (!!res->r)
+ mem_range_result_put(res->r);
+ mem_range_result_get(r);
+ res->r = r;
+ return 0;
+}
+
+static struct carrier_listener kexec_res_listener[3] = {
+ { .name = KEXEC_RES_KERNEL_NAME,
+ .alloc_type = 1,
+ .handler = bpf_kexec_carrier,
+ },
+ { .name = KEXEC_RES_INITRD_NAME,
+ .alloc_type = 1,
+ .handler = bpf_kexec_carrier,
+ },
+ { .name = KEXEC_RES_CMDLINE_NAME,
+ /* kmalloc-ed */
+ .alloc_type = 0,
+ .handler = bpf_kexec_carrier,
+ },
+};
+
static bool pe_has_bpf_section(const char *file_buf, unsigned long pe_sz);
static bool is_valid_pe(const char *kernel_buf, unsigned long kernel_len)
@@ -159,6 +204,22 @@ __attribute__((used, optimize("O0"))) void bpf_post_handle_pefile(struct kexec_c
dummy += 2;
}
+BTF_KFUNCS_START(kexec_modify_return_ids)
+BTF_ID_FLAGS(func, bpf_handle_pefile, KF_SLEEPABLE)
+BTF_ID_FLAGS(func, bpf_post_handle_pefile, KF_SLEEPABLE)
+BTF_KFUNCS_END(kexec_modify_return_ids)
+
+static const struct btf_kfunc_id_set kexec_modify_return_set = {
+ .owner = THIS_MODULE,
+ .set = &kexec_modify_return_ids,
+};
+
+static int __init kexec_bpf_prog_run_init(void)
+{
+ return register_btf_fmodret_id_set(&kexec_modify_return_set);
+}
+late_initcall(kexec_bpf_prog_run_init);
+
/*
* PE file may be nested and should be unfold one by one.
* Query 'kernel', 'initrd', 'cmdline' in cur_phase, as they are inputs for the
@@ -213,6 +274,9 @@ static void *pe_image_load(struct kimage *image,
cmdline_start = cmdline;
cmdline_sz = cmdline_len;
+ for (int i = 0; i < ARRAY_SIZE(kexec_res_listener); i++)
+ register_carrier_listener(&kexec_res_listener[i]);
+
while (is_valid_format(linux_start, linux_sz) &&
pe_has_bpf_section(linux_start, linux_sz)) {
struct kexec_context context;
@@ -250,6 +314,9 @@ static void *pe_image_load(struct kimage *image,
disarm_bpf_prog();
}
+ for (int i = 0; i < ARRAY_SIZE(kexec_res_listener); i++)
+ unregister_carrier_listener(kexec_res_listener[i].name);
+
/*
* image's kernel_buf, initrd_buf, cmdline_buf are set. Now they should
* be updated to the new content.
--
2.49.0
next prev parent reply other threads:[~2025-07-22 2:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-22 2:03 [PATCHv4 00/12] kexec: Use BPF lskel to enable kexec to load PE format boot image Pingfan Liu
2025-07-22 2:03 ` [PATCHv4 01/12] kexec_file: Make kexec_image_load_default global visible Pingfan Liu
2025-07-22 2:03 ` [PATCHv4 02/12] lib/decompress: Keep decompressor when CONFIG_KEXEC_PE_IMAGE Pingfan Liu
2025-07-22 2:03 ` [PATCHv4 03/12] bpf: Introduce bpf_copy_to_kernel() to buffer the content from bpf-prog Pingfan Liu
2025-07-22 16:42 ` kernel test robot
2025-07-22 2:03 ` [PATCHv4 04/12] bpf: Introduce decompressor kfunc Pingfan Liu
2025-07-23 0:44 ` kernel test robot
2025-07-22 2:03 ` [PATCHv4 05/12] kexec: Introduce kexec_pe_image to parse and load PE file Pingfan Liu
2025-07-22 2:03 ` Pingfan Liu [this message]
2025-07-22 2:03 ` [PATCHv4 07/12] kexec: Introduce a bpf-prog lskel to parse " Pingfan Liu
2025-07-22 2:03 ` [PATCHv4 08/12] kexec: Factor out routine to find a symbol in ELF Pingfan Liu
2025-07-22 17:22 ` kernel test robot
2025-07-22 2:03 ` [PATCHv4 09/12] kexec: Integrate bpf light skeleton to load zboot image Pingfan Liu
2025-07-22 2:03 ` [PATCHv4 10/12] arm64/kexec: Add PE image format support Pingfan Liu
2025-07-22 5:49 ` Catalin Marinas
2025-07-22 2:03 ` [PATCHv4 11/12] tools/kexec: Introduce a bpf-prog to parse zboot image format Pingfan Liu
2025-07-22 2:03 ` [PATCHv4 12/12] tools/kexec: Add a zboot image building tool Pingfan Liu
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=20250722020319.5837-7-piliu@redhat.com \
--to=piliu@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andrii@kernel.org \
--cc=ardb@kernel.org \
--cc=ast@kernel.org \
--cc=bhe@redhat.com \
--cc=bpf@vger.kernel.org \
--cc=catalin.marinas@arm.com \
--cc=daniel@iogearbox.net \
--cc=dyoung@redhat.com \
--cc=eddyz87@gmail.com \
--cc=horms@kernel.org \
--cc=jeremy.linton@arm.com \
--cc=john.fastabend@gmail.com \
--cc=kernel@jfarr.cc \
--cc=kexec@lists.infradead.org \
--cc=kraxel@redhat.com \
--cc=martin.lau@linux.dev \
--cc=prudo@redhat.com \
--cc=song@kernel.org \
--cc=vkuznets@redhat.com \
--cc=vmalik@redhat.com \
--cc=will@kernel.org \
--cc=yonghong.song@linux.dev \
/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