bpf: add the missing fsession
Subsystems (6)
v3 cover bpf: add the missing fsession
Add the missing fsession attach type to the BPF docs, verifier log and bpftool.
Changes since v2:
- replace "FENTRY/FEXIT/FSESSION" with "Tracing" in the 1st patch
- v2: https://lore.kernel.org/all/[email protected]/
Changes since v1:
- add a missing FSESSION in bpf_check_attach_target() in the 1st patch
- v1: https://lore.kernel.org/all/[email protected]/
Menglong Dong (3):
bpf: add missing fsession to the verifier log docs/bpf: add missing fsession attach type to docs
bpftool: add missing fsession to the usage and docs of bpftool
Documentation/bpf/drgn.rst | 4 ++-- Documentation/bpf/libbpf/program_types.rst | 4 ++++ kernel/bpf/verifier.c | 10 +++++----- tools/bpf/bpftool/Documentation/bpftool-prog.rst | 2 +- tools/bpf/bpftool/bash-completion/bpftool | 2 +- tools/bpf/bpftool/prog.c | 2 +- tools/testing/selftests/bpf/prog_tests/exceptions.c | 8 ++++---- tools/testing/selftests/bpf/verifier/sleepable.c | 2 +- 8 files changed, 19 insertions(+), 15 deletions(-)
Signature · 1 line
2.53.0
PATCH v3 1/3 bpf: add missing fsession to the verifier log
The fsession attach type is missed in the verifier log in check_get_func_ip(), bpf_check_attach_target() and check_attach_btf_id(). Update them to make the verifier log proper. Meanwhile, update the corresponding selftests.
---
v3:
- replace "FENTRY/FEXIT/FSESSION" with "Tracing"
v2:
- add a missing FSESSION in bpf_check_attach_target()
--- kernel/bpf/verifier.c | 10 +++++----- tools/testing/selftests/bpf/prog_tests/exceptions.c | 8 ++++---- tools/testing/selftests/bpf/verifier/sleepable.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-)
kernel/bpf/verifier.c +5 -5
@@ -11690,7 +11690,7 @@ static int check_get_func_ip(struct bpf_verifier_env *env)if (type ==BPF_PROG_TYPE_TRACING ) {if (!bpf_prog_has_trampoline (env->prog)) { -verbose (env,"func %s#%d supported only for fentry/fexit/fmod_ret programs\n" , +verbose (env,"func %s#%d supported only for fentry/fexit/fsession/fmod_ret programs\n" ,func_id_name (func_id), func_id);return -ENOTSUPP ; }
@@ -25494,7 +25494,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, btf = tgt_prog ? tgt_prog->aux->btf : prog->aux->attach_btf;if (!btf) {bpf_log (log, -"FENTRY/FEXIT program can only be attached to another program annotated with BTF\n" ); +"Tracing program can only be attached to another program annotated with BTF\n" );return -EINVAL ; } t =btf_type_by_id (btf, btf_id);
@@ -25530,7 +25530,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,if (aux->func && aux->func[subprog]->aux->exception_cb) {bpf_log (log,"%s programs cannot attach to exception callback\n" , - prog_extension ?"Extension" :"FENTRY/FEXIT" ); + prog_extension ?"Extension" :"Tracing" );return -EINVAL ; } conservative = aux->func_info_aux[subprog].unreliable;
@@ -25619,7 +25619,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,case BPF_TRACE_RAW_TP :if (tgt_prog) {bpf_log (log, -"Only FENTRY/FEXIT progs are attachable to another BPF prog\n" ); +"Only FENTRY/FEXIT/FSESSION progs are attachable to another BPF prog\n" );return -EINVAL ; }if (!btf_type_is_typedef (t)) {
@@ -25885,7 +25885,7 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) }if (prog->sleepable && !can_be_sleepable (prog)) { -verbose (env,"Only fentry/fexit/fmod_ret, lsm, iter, uprobe, and struct_ops programs can be sleepable\n" ); +verbose (env,"Only fentry/fexit/fsession/fmod_ret, lsm, iter, uprobe, and struct_ops programs can be sleepable\n" );return -EINVAL ; }
tools/testing/selftests/bpf/prog_tests/exceptions.c +4 -4
@@ -128,7 +128,7 @@ static void test_exceptions_success(void) bpf_program__fd(skel->progs.exception_ext_mod_cb_runtime), "exception_cb_mod"), "set_attach_target")) goto done; - }), "FENTRY/FEXIT programs cannot attach to exception callback", 0); + }), "Tracing programs cannot attach to exception callback", 0); if (test__start_subtest("throwing fentry -> exception_cb")) RUN_EXT(-EINVAL, true, ({
@@ -138,7 +138,7 @@ static void test_exceptions_success(void) bpf_program__fd(skel->progs.exception_ext_mod_cb_runtime), "exception_cb_mod"), "set_attach_target")) goto done; - }), "FENTRY/FEXIT programs cannot attach to exception callback", 0); + }), "Tracing programs cannot attach to exception callback", 0); if (test__start_subtest("non-throwing fexit -> exception_cb")) RUN_EXT(-EINVAL, true, ({
@@ -148,7 +148,7 @@ static void test_exceptions_success(void) bpf_program__fd(skel->progs.exception_ext_mod_cb_runtime), "exception_cb_mod"), "set_attach_target")) goto done; - }), "FENTRY/FEXIT programs cannot attach to exception callback", 0); + }), "Tracing programs cannot attach to exception callback", 0); if (test__start_subtest("throwing fexit -> exception_cb")) RUN_EXT(-EINVAL, true, ({
@@ -158,7 +158,7 @@ static void test_exceptions_success(void) bpf_program__fd(skel->progs.exception_ext_mod_cb_runtime), "exception_cb_mod"), "set_attach_target")) goto done; - }), "FENTRY/FEXIT programs cannot attach to exception callback", 0); + }), "Tracing programs cannot attach to exception callback", 0); if (test__start_subtest("throwing extension (with custom cb) -> exception_cb")) RUN_EXT(-EINVAL, true, ({
tools/testing/selftests/bpf/verifier/sleepable.c +1 -1
@@ -85,7 +85,7 @@ .expected_attach_type = BPF_TRACE_RAW_TP, .kfunc = "sched_switch", .result = REJECT, - .errstr = "Only fentry/fexit/fmod_ret, lsm, iter, uprobe, and struct_ops programs can be sleepable", + .errstr = "Only fentry/fexit/fsession/fmod_ret, lsm, iter, uprobe, and struct_ops programs can be sleepable", .flags = BPF_F_SLEEPABLE, .runs = -1, },
Signature · 1 line
2.53.0
PATCH v3 2/3 docs/bpf: add missing fsession attach type to docs
In reply to Menglong DongAdd the fsession attach type to program_types.rst and drgn.rst.
--- Documentation/bpf/drgn.rst | 4 ++-- Documentation/bpf/libbpf/program_types.rst | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)
Documentation/bpf/drgn.rst +2 -2
@@ -26,8 +26,8 @@ about these objects, including id, type and name. The main use-case `bpf_inspect.py`_ covers is to show BPF programs of types ``BPF_PROG_TYPE_EXT`` and ``BPF_PROG_TYPE_TRACING`` attached to other BPF -programs via ``freplace``/``fentry``/``fexit`` mechanisms, since there is no -user-space API to get this information. +programs via ``freplace``/``fentry``/``fexit``/``fsession`` mechanisms, since +there is no user-space API to get this information. Getting started ===============
Documentation/bpf/libbpf/program_types.rst +4 -0
@@ -207,6 +207,10 @@ described in more detail in the footnotes. + + +----------------------------------+-----------+ | | | ``fexit.s+`` [#fentry]_ | Yes | + +----------------------------------------+----------------------------------+-----------+ +| | ``BPF_TRACE_FSESSION`` | ``fsession+`` [#fentry]_ | | ++ + +----------------------------------+-----------+ +| | | ``fsession.s+`` [#fentry]_ | Yes | ++ +----------------------------------------+----------------------------------+-----------+ | | ``BPF_TRACE_ITER`` | ``iter+`` [#iter]_ | | + + +----------------------------------+-----------+ | | | ``iter.s+`` [#iter]_ | Yes |
Signature · 1 line
2.53.0
PATCH v3 3/3 bpftool: add missing fsession to the usage and docs of bpftool
In reply to Menglong DongAdd the fsession attach type to the usage of bpftool in do_help(). Meanwhile, add it to the bash-completion and bpftool-prog.rst too.
--- tools/bpf/bpftool/Documentation/bpftool-prog.rst | 2 +- tools/bpf/bpftool/bash-completion/bpftool | 2 +- tools/bpf/bpftool/prog.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
tools/bpf/bpftool/Documentation/bpftool-prog.rst +1 -1
@@ -54,7 +54,7 @@ PROG COMMANDS | **cgroup/sendmsg4** | **cgroup/sendmsg6** | **cgroup/sendmsg_unix** | | **cgroup/recvmsg4** | **cgroup/recvmsg6** | **cgroup/recvmsg_unix** | **cgroup/sysctl** | | **cgroup/getsockopt** | **cgroup/setsockopt** | **cgroup/sock_release** | -| **struct_ops** | **fentry** | **fexit** | **freplace** | **sk_lookup** +| **struct_ops** | **fentry** | **fexit** | **fsession** | **freplace** | **sk_lookup** | } | *ATTACH_TYPE* := { | **sk_msg_verdict** | **sk_skb_verdict** | **sk_skb_stream_verdict** |
tools/bpf/bpftool/bash-completion/bpftool +1 -1
@@ -501,7 +501,7 @@ _bpftool() cgroup/post_bind4 cgroup/post_bind6 \ cgroup/sysctl cgroup/getsockopt \ cgroup/setsockopt cgroup/sock_release struct_ops \ - fentry fexit freplace sk_lookup' + fentry fexit fsession freplace sk_lookup' COMPREPLY=( $( compgen -W "$BPFTOOL_PROG_LOAD_TYPES" -- "$cur" ) ) return 0 ;;
tools/bpf/bpftool/prog.c +1 -1
@@ -2583,7 +2583,7 @@ static int do_help(int argc, char **argv)" cgroup/getsockname_unix | cgroup/sendmsg4 | cgroup/sendmsg6 |\n" " cgroup/sendmsg_unix | cgroup/recvmsg4 | cgroup/recvmsg6 | cgroup/recvmsg_unix |\n" " cgroup/getsockopt | cgroup/setsockopt | cgroup/sock_release |\n" -" struct_ops | fentry | fexit | freplace | sk_lookup }\n" +" struct_ops | fentry | fexit | fsession | freplace | sk_lookup }\n" " ATTACH_TYPE := { sk_msg_verdict | sk_skb_verdict | sk_skb_stream_verdict |\n" " sk_skb_stream_parser | flow_dissector }\n" " METRIC := { cycles | instructions | l1d_loads | llc_misses | itlb_misses | dtlb_misses }\n"
Signature · 1 line
2.53.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 Sun, 12 Apr 2026 14:03:43 +0800 you wrote:
Add the missing fsession attach type to the BPF docs, verifier log and bpftool.
Changes since v2:
- replace "FENTRY/FEXIT/FSESSION" with "Tracing" in the 1st patch
- v2: https://lore.kernel.org/all/[email protected]/[...]
Here is the summary with links:
- [bpf-next,v3,1/3] bpf: add missing fsession to the verifier log
https://git.kernel.org/bpf/bpf-next/c/9fd19e3ed775 - [bpf-next,v3,2/3] docs/bpf: add missing fsession attach type to docs https://git.kernel.org/bpf/bpf-next/c/46d9f15a55fb - [bpf-next,v3,3/3] bpftool: add missing fsession to the usage and docs of bpftool https://git.kernel.org/bpf/bpf-next/c/f0e16ac71618
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html