destructive bpf_kfuncs
Subsystems (7)
v4 cover destructive bpf_kfuncs
eBPF is often used for kernel debugging, and one of the widely used and powerful debugging techniques is post-mortem debugging with a full memory dump. Triggering a panic at exactly the right moment allows the user to get such a dump and thus a better view at the system's state. Right now the only way to do this in BPF is to signal userspace to trigger kexec/panic. This is suboptimal as going through userspace requires context changes and adds significant delays taking system further away from "the right moment". On a single-cpu system the situation is even worse because BPF program won't even be able to block the thread of interest.
This patchset tries to solve this problem by allowing properly marked tracing bpf programs to call crash_kexec() kernel function. The only requirement for now to run programs calling crash_kexec() or other destructive kfuncs is CAP_SYS_BOOT capability. When signature checking for bpf programs is available it is possible that stricter rules will be applied to programs utilizing destructive kfuncs.
Changes in v4:
- Added description for KF_DESTRUCTIVE flag to documentation
Changes in v3:
- moved kfunc set registration to kernel/bpf/helpers.c
Changes in v2:
- BPF_PROG_LOAD flag dropped as it doesn't fully achieve it's aim of preventing accidental execution of destructive bpf programs
- selftest moved to the end of patchset
- switched to kfunc destructive flag instead of a separate set
Changes from RFC:
- sysctl knob dropped
- using crash_kexec() instead of panic()
- using kfuncs instead of adding a new helper
Artem Savkov (3):
bpf: add destructive kfunc flag
bpf: export crash_kexec() as destructive kfunc
selftests/bpf: add destructive kfunc test
Documentation/bpf/kfuncs.rst | 9 +++++ include/linux/btf.h | 1 + kernel/bpf/helpers.c | 21 +++++++++++ kernel/bpf/verifier.c | 5 +++ net/bpf/test_run.c | 5 +++ .../selftests/bpf/prog_tests/kfunc_call.c | 36 +++++++++++++++++++ .../bpf/progs/kfunc_call_destructive.c | 14 ++++++++ 7 files changed, 91 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_destructive.c
Signature · 1 line
2.37.1
PATCH v4 1/3 bpf: add destructive kfunc flag
Add KF_DESTRUCTIVE flag for destructive functions. Functions with this flag set will require CAP_SYS_BOOT capabilities.
--- Documentation/bpf/kfuncs.rst | 9 +++++++++ include/linux/btf.h | 1 + kernel/bpf/verifier.c | 5 +++++ 3 files changed, 15 insertions(+)
Documentation/bpf/kfuncs.rst +9 -0
@@ -146,6 +146,15 @@ that operate (change some property, perform some operation) on an object that was obtained using an acquire kfunc. Such kfuncs need an unchanged pointer to ensure the integrity of the operation being performed on the expected object. +2.4.5 KF_DESTRUCTIVE flag +-------------------------- + +The KF_DESTRUCTIVE flag is used to indicate functions calling which is +destructive to the system. For example such a call can result in system +rebooting or panicking. Due to this additional restrictions apply to these +calls. At the moment they only require CAP_SYS_BOOT capability, but more can be +added later. + 2.5 Registering the kfuncs --------------------------
include/linux/btf.h +1 -0
@@ -49,6 +49,7 @@* for this case. */ #define KF_TRUSTED_ARGS (1 << 4)/* kfunc only takes trusted pointer arguments */ +#define KF_DESTRUCTIVE (1 << 5)/* kfunc performs destructive actions */ struct btf ;struct btf_member ;
kernel/bpf/verifier.c +5 -0
@@ -7598,6 +7598,11 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, func_name);return -EACCES ; } +if (*kfunc_flags &KF_DESTRUCTIVE && !capable (CAP_SYS_BOOT )) { +verbose (env,"destructive kfunc calls require CAP_SYS_BOOT capabilities\n" ); +return -EACCES ; + } + acq = *kfunc_flags &KF_ACQUIRE ;/* Check the arguments */
Signature · 1 line
2.37.1
Kumar Kartikeya Dwivedi
maintainerRe: [PATCH bpf-next v4 1/3] bpf: add destructive kfunc flag
Quoted 16 lines · Artem Savkov
Add
KF_DESTRUCTIVEflag for destructive functions. Functions with this flag set will requireCAP_SYS_BOOTcapabilities.Signed-off-by Artem Savkov <[email protected]>--- Documentation/bpf/kfuncs.rst | 9 +++++++++ include/linux/btf.h | 1 + kernel/bpf/verifier.c | 5 +++++ 3 files changed, 15 insertions(+)Documentation/bpf/kfuncs.rst +0
-0
Documentation/bpf/kfuncs.rst that operate (change some property, perform some operation) on an object that · line 149
Quoted 4 lines
Documentation/bpf/kfuncs.rst +1
-0@@ -146,6 +146,15 @@ that operate (change some property, perform some operation) on an object that was obtained using an acquire kfunc. Such kfuncs need an unchanged pointer to ensure the integrity of the operation being performed on the expected object. +2.4.5 KF_DESTRUCTIVE flag
This should be 2.4.6.
Quoted 42 lines
Documentation/bpf/kfuncs.rst +8
-0+-------------------------- + +The KF_DESTRUCTIVE flag is used to indicate functions calling which is +destructive to the system. For example such a call can result in system +rebooting or panicking. Due to this additional restrictions apply to these +calls. At the moment they only require CAP_SYS_BOOT capability, but more can be +added later. + 2.5 Registering the kfuncs --------------------------include/linux/btf.h +1
-0@@ -49,6 +49,7 @@* for this case. */ #define KF_TRUSTED_ARGS (1 << 4)/* kfunc only takes trusted pointer arguments */ +#define KF_DESTRUCTIVE (1 << 5)/* kfunc performs destructive actions */ struct btf ;struct btf_member ;kernel/bpf/verifier.c +5
-1@@ -7598,6 +7598,11 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, func_name);return -EACCES ; } +if (*kfunc_flags &KF_DESTRUCTIVE && !capable (CAP_SYS_BOOT )) { +verbose (env,"destructive kfunc calls require CAP_SYS_BOOT capabilities\n" ); +return -EACCES ; + } + acq = *kfunc_flags &KF_ACQUIRE ;/* Check the arguments */ --2.37.1
PATCH v4 2/3 bpf: export crash_kexec() as destructive kfunc
In reply to Artem SavkovAllow properly marked bpf programs to call crash_kexec().
--- kernel/bpf/helpers.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
kernel/bpf/helpers.c +21 -0
@@ -1711,3 +1711,24 @@ bpf_base_func_proto(enum bpf_func_id func_id)return NULL ; } } + +BTF_SET8_START(tracing_btf_ids) +#ifdef CONFIG_KEXEC_CORE +BTF_ID_FLAGS(func, crash_kexec, KF_DESTRUCTIVE) +#endif +BTF_SET8_END (tracing_btf_ids) + +static const struct btf_kfunc_id_set tracing_kfunc_set = { + .owner =THIS_MODULE , + .set = &tracing_btf_ids, +}; + +static int __init kfunc_init (void ) +{ +if (register_btf_kfunc_id_set (BPF_PROG_TYPE_TRACING , &tracing_kfunc_set)) +pr_warn ("failed to register kfunc id set for BPF_PROG_TYPE_TRACING\n" ); + +return 0 ; +} + +late_initcall (kfunc_init);
Signature · 1 line
2.37.1
Re: [PATCH bpf-next v4 2/3] bpf: export crash_kexec() as destructive kfunc
Quoted 22 lines · Artem Savkov
Allow properly marked bpf programs to call
crash_kexec().Signed-off-by Artem Savkov <[email protected]>--- kernel/bpf/helpers.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)kernel/bpf/helpers.c +6
-0@@ -1711,3 +1711,24 @@ bpf_base_func_proto(enum bpf_func_id func_id)return NULL ; } } + +BTF_SET8_START(tracing_btf_ids) +#ifdef CONFIG_KEXEC_CORE +BTF_ID_FLAGS(func, crash_kexec, KF_DESTRUCTIVE) +#endif +BTF_SET8_END (tracing_btf_ids)
kernel/bpf/helpers.c bpf_base_func_proto(enum bpf_func_id func_id) · line 1729
Quoted 10 lines
kernel/bpf/helpers.c +10
-0+ +static const struct btf_kfunc_id_set tracing_kfunc_set = { + .owner =THIS_MODULE , + .set = &tracing_btf_ids, +}; + +static int __init kfunc_init (void ) +{ +if (register_btf_kfunc_id_set (BPF_PROG_TYPE_TRACING , &tracing_kfunc_set)) +pr_warn ("failed to register kfunc id set for BPF_PROG_TYPE_TRACING\n" );
Please drop pr_warn. We don't have it in all other places where we do registration.
PATCH v4 3/3 selftests/bpf: add destructive kfunc test
In reply to Artem SavkovAdd a test checking that programs calling destructive kfuncs can only do so if they have CAP_SYS_BOOT capabilities.
--- net/bpf/test_run.c | 5 +++ .../selftests/bpf/prog_tests/kfunc_call.c | 36 +++++++++++++++++++ .../bpf/progs/kfunc_call_destructive.c | 14 ++++++++ 3 files changed, 55 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/kfunc_call_destructive.c
net/bpf/test_run.c +5 -0
@@ -695,6 +695,10 @@ noinline void bpf_kfunc_call_test_ref(struct prog_test_ref_kfunc *p) { } +noinline void bpf_kfunc_call_test_destructive(void) +{ +} +__diag_pop ();ALLOW_ERROR_INJECTION (bpf_modify_return_test,ERRNO );
@@ -719,6 +723,7 @@ BTF_ID_FLAGS(func, bpf_kfunc_call_test_mem_len_pass1) BTF_ID_FLAGS(func, bpf_kfunc_call_test_mem_len_fail1) BTF_ID_FLAGS(func, bpf_kfunc_call_test_mem_len_fail2) BTF_ID_FLAGS(func, bpf_kfunc_call_test_ref, KF_TRUSTED_ARGS) +BTF_ID_FLAGS(func, bpf_kfunc_call_test_destructive, KF_DESTRUCTIVE)BTF_SET8_END (test_sk_check_kfunc_ids) static void *bpf_test_init(const union bpf_attr *kattr, u32 user_size,
tools/testing/selftests/bpf/prog_tests/kfunc_call.c +36 -0
@@ -5,6 +5,9 @@#include "kfunc_call_test.lskel.h" #include "kfunc_call_test_subprog.skel.h" #include "kfunc_call_test_subprog.lskel.h" +#include "kfunc_call_destructive.skel.h" + +#include "cap_helpers.h" static void test_main (void ) {
@@ -86,6 +89,36 @@ static void test_subprog_lskel(void)kfunc_call_test_subprog_lskel__destroy (skel); } +static int test_destructive_open_and_load (void ) +{ +struct kfunc_call_destructive *skel; +int err; + + skel =kfunc_call_destructive__open (); +if (!ASSERT_OK_PTR (skel,"prog_open" )) +return -1 ; + + err =kfunc_call_destructive__load (skel); + +kfunc_call_destructive__destroy (skel); + +return err; +} + +static void test_destructive (void ) +{ +__u64 save_caps =0 ; + +ASSERT_OK (test_destructive_open_and_load (),"succesful_load" ); + +if (!ASSERT_OK (cap_disable_effective (1ULL <<CAP_SYS_BOOT , &save_caps),"drop_caps" )) +return ; + +ASSERT_EQ (test_destructive_open_and_load (),-13 ,"no_caps_failure" ); + +cap_enable_effective (save_caps,NULL ); +} +void test_kfunc_call (void ) {if (test__start_subtest ("main" ))
@@ -96,4 +129,7 @@ void test_kfunc_call(void)if (test__start_subtest ("subprog_lskel" ))test_subprog_lskel (); + +if (test__start_subtest ("destructive" )) +test_destructive (); }
tools/testing/selftests/bpf/progs/kfunc_call_destructive.c new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <vmlinux.h> +#include <bpf/bpf_helpers.h> + +extern void bpf_kfunc_call_test_destructive(void) __ksym; + +SEC("tc") +int kfunc_destructive_test (void ) +{ +bpf_kfunc_call_test_destructive (); +return 0 ; +} + +char _license[] SEC("license") = "GPL";
Signature · 1 line
2.37.1