bpf: Do not allow to load sleepable BPF_TRACE_RAW_TP program
Subsystems (4)
Jiri Olsa
reviewerPATCH v2 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.
---
v2 changes:
- use bool for can_be_sleepable return value [Song]
- add tests [Song]
kernel/bpf/verifier.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
kernel/bpf/verifier.c +14 -3
@@ -16743,6 +16743,18 @@ 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 ) { +return prog->expected_attach_type ==BPF_TRACE_FENTRY || + prog->expected_attach_type ==BPF_TRACE_FEXIT || + prog->expected_attach_type ==BPF_MODIFY_RETURN || + prog->expected_attach_type ==BPF_TRACE_ITER ; + } +return prog->type ==BPF_PROG_TYPE_LSM || + prog->type ==BPF_PROG_TYPE_KPROBE ; +} +static int check_attach_btf_id (struct bpf_verifier_env *env) {struct bpf_prog *prog = env->prog;
@@ -16761,9 +16773,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 kprobe/uprobe programs can be sleepable\n" );return -EINVAL ; }
Signature · 1 line
2.39.0
Jiri Olsa
reviewerPATCH v2 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 kprobe/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 kprobe/uprobe programs can be sleepable", + .flags = BPF_F_SLEEPABLE, + .runs = -1, +},
Signature · 1 line
2.39.0
Re: [PATCHv2 bpf-next 2/2] bpf/selftests: Add verifier tests for loading sleepable programs
Quoted 5 lines · Jiri Olsa
Adding verifier tests for loading all types od allowed sleepable programs plus reject for
tp_btftype.Signed-off-by Jiri Olsa <[email protected]>
Quoted 105 lines
--- .../selftests/bpf/verifier/sleepable.c | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 tools/testing/selftests/bpf/verifier/sleepable.ctools/testing/selftests/bpf/verifier/sleepable.c new file +91
-1@@ -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 kprobe/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 kprobe/uprobe programs can be sleepable", + .flags = BPF_F_SLEEPABLE, + .runs = -1, +}, --2.39.0
Quoted 9 lines · Jiri Olsa
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.
Signed-off-by Jiri Olsa <[email protected]>
Quoted 46 lines
---
v2 changes:
- use bool forcan_be_sleepablereturn value [Song]
- add tests [Song]kernel/bpf/verifier.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)kernel/bpf/verifier.c +14
-4@@ -16743,6 +16743,18 @@ 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 ) { +return prog->expected_attach_type ==BPF_TRACE_FENTRY || + prog->expected_attach_type ==BPF_TRACE_FEXIT || + prog->expected_attach_type ==BPF_MODIFY_RETURN || + prog->expected_attach_type ==BPF_TRACE_ITER ; + } +return prog->type ==BPF_PROG_TYPE_LSM || + prog->type ==BPF_PROG_TYPE_KPROBE ; +} +static int check_attach_btf_id (struct bpf_verifier_env *env) {struct bpf_prog *prog = env->prog;@@ -16761,9 +16773,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 kprobe/uprobe programs can be sleepable\n" );return -EINVAL ; } --2.39.0
Quoted 26 lines · Jiri Olsa
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.
Signed-off-by Jiri Olsa <[email protected]>---
v2 changes:
- use bool forcan_be_sleepablereturn value [Song]
- add tests [Song]kernel/bpf/verifier.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)kernel/bpf/verifier.c +1
-0@@ -16743,6 +16743,18 @@ BTF_ID(func, rcu_read_unlock_strict)#endif BTF_SET_END (btf_id_deny) +static bool can_be_sleepable(struct bpf_prog *prog)
kernel/bpf/verifier.c BTF_ID(func, rcu_read_unlock_strict) · line 16756
Quoted 10 lines
kernel/bpf/verifier.c +10
-0+{ +if (prog->type ==BPF_PROG_TYPE_TRACING ) { +return prog->expected_attach_type ==BPF_TRACE_FENTRY || + prog->expected_attach_type ==BPF_TRACE_FEXIT || + prog->expected_attach_type ==BPF_MODIFY_RETURN || + prog->expected_attach_type ==BPF_TRACE_ITER ; + } +return prog->type ==BPF_PROG_TYPE_LSM || + prog->type ==BPF_PROG_TYPE_KPROBE ; +}
imo it's too verbose.
Maybe try a switch stmt ?
Or at least copy prog->expected_attach_type and prog->type into variables.
Quoted 26 lines · Alexei Starovoitov
Quoted 25 lines · Jiri Olsa
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.
Signed-off-by Jiri Olsa <[email protected]>---
v2 changes:
- use bool forcan_be_sleepablereturn value [Song]
- add tests [Song]kernel/bpf/verifier.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)kernel/bpf/verifier.c +0
-0@@ -16743,6 +16743,18 @@ BTF_ID(func, rcu_read_unlock_strict)#endif BTF_SET_END (btf_id_deny)
Quoted 15 lines
kernel/bpf/verifier.c BTF_ID(func, rcu_read_unlock_strict) · line 16756
Quoted 11 lines
kernel/bpf/verifier.c +11
-0+static bool can_be_sleepable (struct bpf_prog *prog) +{ +if (prog->type ==BPF_PROG_TYPE_TRACING ) { +return prog->expected_attach_type ==BPF_TRACE_FENTRY || + prog->expected_attach_type ==BPF_TRACE_FEXIT || + prog->expected_attach_type ==BPF_MODIFY_RETURN || + prog->expected_attach_type ==BPF_TRACE_ITER ; + } +return prog->type ==BPF_PROG_TYPE_LSM || + prog->type ==BPF_PROG_TYPE_KPROBE ; +}imo it's too verbose.
Maybe try a switch stmt ?
Or at least copyprog->expected_attach_typeandprog->typeinto variables.
ok, the switch seems better, I'll send new version
thanks,
jirka
---
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 ; +} +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 kprobe/uprobe programs can be sleepable\n" );return -EINVAL ; }