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 should also be marked as
KF_SLEEPABLE to allow that behavior.
Signed-off-by: Pingfan Liu <pi...@redhat.com>
Cc: Alexei Starovoitov <a...@kernel.org>
Cc: Philipp Rudo <pr...@redhat.com>
Cc: Baoquan He <b...@redhat.com>
Cc: Dave Young <dyo...@redhat.com>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: b...@vger.kernel.org
To: kexec@lists.infradead.org
---
kernel/kexec_pe_image.c | 59 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/kernel/kexec_pe_image.c b/kernel/kexec_pe_image.c
index 3097efccb8502..e49d6db3c329d 100644
--- a/kernel/kexec_pe_image.c
+++ b/kernel/kexec_pe_image.c
@@ -52,6 +52,43 @@ static struct parsed_phase *alloc_new_phase(void)
return phase;
}
+/*
+ * @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;
+
+ if (!r || !name)
+ return -EINVAL;
+
+ res = kzalloc(sizeof(struct kexec_res), GFP_KERNEL);
+ if (!res)
+ return -ENOMEM;
+ res->name = kstrdup(name, GFP_KERNEL);
+ kref_get(&r->ref);
+ res->r = r;
+
+ INIT_LIST_HEAD(&res->node);
+ list_add_tail(&res->node, &cur_phase->res_head);
+ return 0;
+}
+
+static struct carrier_listener kexec_res_listener[3] = {
+ { .name = "kernel",
+ .kmalloc = false,
+ .handler = bpf_kexec_carrier,
+ },
+ { .name = "initrd",
+ .kmalloc = false,
+ .handler = bpf_kexec_carrier,
+ },
+ { .name = "cmdline",
+ .kmalloc = true,
+ .handler = bpf_kexec_carrier,
+ },
+};
+
static bool is_valid_pe(const char *kernel_buf, unsigned long kernel_len)
{
struct mz_hdr *mz;
@@ -161,6 +198,22 @@ __attribute__((used, optimize("O0"))) void
bpf_post_handle_pefile(struct kexec_c
{
}
+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
@@ -212,6 +265,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;
@@ -252,6 +308,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);
+
/* the rear of parsed phase contains the result */
list_for_each_entry_reverse(phase, &phase_head, head) {
if (initrd != NULL && cmdline != NULL && parsed_kernel != NULL)
--
2.49.0
