bpf: Do not allow to load sleepable BPF_TRACE_RAW_TP program
Subsystems (4)
Jiri Olsa
reviewerPATCH v4 1/2 bpf: Do not allow to load sleepable BPF_TRACE_RAW_TP program
Currently we allow to load any tracing program as sleepable, but BPF_TRACE_RAW_TP can't sleep. Making the check explicit for tracing programs attach types, so sleepable BPF_TRACE_RAW_TP will fail to load.
Updating the verifier error to mention iter programs as well.
---
v4 changes:
- remove kprobe from verifier output and add uprobe comment [Yonghong]
- added ack [Yonghong]
kernel/bpf/verifier.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
kernel/bpf/verifier.c +19 -3
@@ -16743,6 +16743,23 @@ BTF_ID(func, rcu_read_unlock_strict)#endif BTF_SET_END (btf_id_deny) +static bool can_be_sleepable(struct bpf_prog *prog) +{ +if (prog->type ==BPF_PROG_TYPE_TRACING ) { +switch (prog->expected_attach_type) { +case BPF_TRACE_FENTRY : +case BPF_TRACE_FEXIT : +case BPF_MODIFY_RETURN : +case BPF_TRACE_ITER : +return true; +default : +return false; + } + } +return prog->type ==BPF_PROG_TYPE_LSM || + prog->type ==BPF_PROG_TYPE_KPROBE ;/* only for uprobes */ +} +static int check_attach_btf_id (struct bpf_verifier_env *env) {struct bpf_prog *prog = env->prog;
@@ -16761,9 +16778,8 @@ static int check_attach_btf_id(struct bpf_verifier_env *env)return -EINVAL ; } -if (prog->aux->sleepable && prog->type !=BPF_PROG_TYPE_TRACING && - prog->type !=BPF_PROG_TYPE_LSM && prog->type !=BPF_PROG_TYPE_KPROBE ) { -verbose (env,"Only fentry/fexit/fmod_ret, lsm, and kprobe/uprobe programs can be sleepable\n" ); +if (prog->aux->sleepable && !can_be_sleepable (prog)) { +verbose (env,"Only fentry/fexit/fmod_ret, lsm, iter and uprobe programs can be sleepable\n" );return -EINVAL ; }
Signature · 1 line
2.39.0
Jiri Olsa
reviewerPATCH v4 2/2 bpf/selftests: Add verifier tests for loading sleepable programs
Adding verifier tests for loading all types od allowed sleepable programs plus reject for tp_btf type.
--- .../selftests/bpf/verifier/sleepable.c | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 tools/testing/selftests/bpf/verifier/sleepable.c
tools/testing/selftests/bpf/verifier/sleepable.c new file +91 -0
@@ -0,0 +1,91 @@ +{ + "sleepable fentry accept", + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_TRACING , + .expected_attach_type = BPF_TRACE_FENTRY, + .kfunc = "bpf_fentry_test1", + .result = ACCEPT, + .flags = BPF_F_SLEEPABLE, + .runs = -1, +}, +{ +"sleepable fexit accept" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_TRACING , + .expected_attach_type = BPF_TRACE_FENTRY, + .kfunc = "bpf_fentry_test1", + .result = ACCEPT, + .flags = BPF_F_SLEEPABLE, + .runs = -1, +}, +{ +"sleepable fmod_ret accept" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_TRACING , + .expected_attach_type = BPF_MODIFY_RETURN, + .kfunc = "bpf_fentry_test1", + .result = ACCEPT, + .flags = BPF_F_SLEEPABLE, + .runs = -1, +}, +{ +"sleepable iter accept" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_TRACING , + .expected_attach_type = BPF_TRACE_ITER, + .kfunc = "task", + .result = ACCEPT, + .flags = BPF_F_SLEEPABLE, + .runs = -1, +}, +{ +"sleepable lsm accept" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_LSM , + .kfunc = "bpf", + .expected_attach_type = BPF_LSM_MAC, + .result = ACCEPT, + .flags = BPF_F_SLEEPABLE, + .runs = -1, +}, +{ +"sleepable uprobe accept" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_KPROBE , + .kfunc = "bpf_fentry_test1", + .result = ACCEPT, + .flags = BPF_F_SLEEPABLE, + .runs = -1, +}, +{ +"sleepable raw tracepoint reject" , + .insns = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, + .prog_type =BPF_PROG_TYPE_TRACING , + .expected_attach_type = BPF_TRACE_RAW_TP, + .kfunc = "sched_switch", + .result = REJECT, + .errstr = "Only fentry/fexit/fmod_ret, lsm, iter and uprobe programs can be sleepable", + .flags = BPF_F_SLEEPABLE, + .runs = -1, +},
Signature · 1 line
2.39.0
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Tue, 17 Jan 2023 23:37:04 +0100 you wrote:
Currently we allow to load any tracing program as sleepable, but
BPF_TRACE_RAW_TPcan't sleep. Making the check explicit for tracing programs attach types, so sleepableBPF_TRACE_RAW_TPwill fail to load.Updating the verifier error to mention iter programs as well.
[...]
Here is the summary with links:
- [PATCHv4,bpf-next,1/2] bpf: Do not allow to load sleepable BPF_TRACE_RAW_TP program
https://git.kernel.org/bpf/bpf-next/c/700e6f853eb3 - [PATCHv4,bpf-next,2/2] bpf/selftests: Add verifier tests for loading sleepable programs https://git.kernel.org/bpf/bpf-next/c/c0f264e4edb6
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html