| Message ID | 20250409102937.15632-1-jiayuan.chen@linux.dev (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [bpf-next,v1] bpf, sockmap: Introduce tracing capability for sockmap | expand |
On Wed, 9 Apr 2025 18:29:33 +0800 Jiayuan Chen <jiayuan.chen@linux.dev> wrote: > +#define trace_sockmap_skmsg_redirect(sk, prog, msg, act) \ > + trace_sockmap_redirect((sk), "msg", (prog), (msg)->sg.size, (act)) > + > +#define trace_sockmap_skb_redirect(sk, prog, skb, act) \ > + trace_sockmap_redirect((sk), "skb", (prog), (skb)->len, (act)) > + > +TRACE_EVENT(sockmap_redirect, > + TP_PROTO(const struct sock *sk, const char *type, > + const struct bpf_prog *prog, int length, int act), > + TP_ARGS(sk, type, prog, length, act), > + > + TP_STRUCT__entry( > + __field(const void *, sk) > + __field(const char *, type) On 64bit, const char * is 8 bytes, and you are pointing it to a string of size 4 bytes (3 chars and '\0'). Why not just make it a constant string, or better yet, an enum? -- Steve > + __field(__u16, family) > + __field(__u16, protocol) > + __field(int, prog_id) > + __field(int, length) > + __field(int, act) > + ), > + > + TP_fast_assign( > + __entry->sk = sk; > + __entry->type = type; > + __entry->family = sk->sk_family; > + __entry->protocol = sk->sk_protocol; > + __entry->prog_id = prog->aux->id; > + __entry->length = length; > + __entry->act = act; > + ), > +
April 10, 2025 at 24:11, "Steven Rostedt" <rostedt@goodmis.org> wrote: > > On Wed, 9 Apr 2025 18:29:33 +0800 > > Jiayuan Chen <jiayuan.chen@linux.dev> wrote: > > > > > +#define trace_sockmap_skmsg_redirect(sk, prog, msg, act) \ > > + trace_sockmap_redirect((sk), "msg", (prog), (msg)->sg.size, (act)) > > + > > +#define trace_sockmap_skb_redirect(sk, prog, skb, act) \ > > + trace_sockmap_redirect((sk), "skb", (prog), (skb)->len, (act)) > > + > > +TRACE_EVENT(sockmap_redirect, > > + TP_PROTO(const struct sock *sk, const char *type, > > + const struct bpf_prog *prog, int length, int act), > > + TP_ARGS(sk, type, prog, length, act), > > + > > + TP_STRUCT__entry( > > + __field(const void *, sk) > > + __field(const char *, type) > > > > On 64bit, const char * is 8 bytes, and you are pointing it to a string of > size 4 bytes (3 chars and '\0'). Why not just make it a constant string, or > better yet, an enum? > > -- Steve > Using an enum is indeed more appropriate in TRACE. Thank you for the suggestion.
On Wed, Apr 09, 2025 at 06:29:33PM +0800, Jiayuan Chen wrote: > Sockmap has the same high-performance forwarding capability as XDP, but > operates at Layer 7. > > Introduce tracing capability for sockmap, similar to XDP, to trace the > execution results of BPF programs without modifying the programs > themselves, similar to the existing trace_xdp_redirect{_map}. > > It is crucial for debugging BPF programs, especially in production > environments. > > Additionally, a header file was added to bpf_trace.h to automatically > generate tracepoints. > > Test results: > $ echo "1" > /sys/kernel/tracing/events/sockmap/enable > > skb: > sockmap_redirect: sk=00000000d3266a8d, type=skb, family=2, protocol=6, \ > prog_id=73, length=256, action=PASS > > msg: > sockmap_redirect: sk=00000000528c7614, type=msg, family=2, protocol=6, \ > prog_id=185, length=5, action=REDIRECT > > tls: > sockmap_redirect: sk=00000000d04d2224, type=skb, family=2, protocol=6, \ > prog_id=143, length=35, action=PASS > > strparser: > sockmap_skb_strp_parse: sk=00000000ecab0b30, family=2, protocol=6, \ > prog_id=170, size=5 Nice work! While you are on it, could we also trace skb->_sk_redir bits too? It is very useful to distinguish, at least, ingress from egress redirection. Thanks!
April 10, 2025 at 01:04, "Cong Wang" <xiyou.wangcong@gmail.com> wrote: > > On Wed, Apr 09, 2025 at 06:29:33PM +0800, Jiayuan Chen wrote: > > > > > Sockmap has the same high-performance forwarding capability as XDP, but > > > > operates at Layer 7. > > > > > > > > Introduce tracing capability for sockmap, similar to XDP, to trace the > > > > execution results of BPF programs without modifying the programs > > > > themselves, similar to the existing trace_xdp_redirect{_map}. > > > > > > > > It is crucial for debugging BPF programs, especially in production > > > > environments. > > > > > > > > Additionally, a header file was added to bpf_trace.h to automatically > > > > generate tracepoints. > > > > > > > > Test results: > > > > $ echo "1" > /sys/kernel/tracing/events/sockmap/enable > > > > > > > > skb: > > > > sockmap_redirect: sk=00000000d3266a8d, type=skb, family=2, protocol=6, \ > > > > prog_id=73, length=256, action=PASS > > > > > > > > msg: > > > > sockmap_redirect: sk=00000000528c7614, type=msg, family=2, protocol=6, \ > > > > prog_id=185, length=5, action=REDIRECT > > > > > > > > tls: > > > > sockmap_redirect: sk=00000000d04d2224, type=skb, family=2, protocol=6, \ > > > > prog_id=143, length=35, action=PASS > > > > > > > > strparser: > > > > sockmap_skb_strp_parse: sk=00000000ecab0b30, family=2, protocol=6, \ > > > > prog_id=170, size=5 > > > > Nice work! > > While you are on it, could we also trace skb->_sk_redir bits too? It is > > very useful to distinguish, at least, ingress from egress redirection. > > Thanks! > Thanks for your suggestion! The skb->_sk_redir contains a lot of important information about redirection, so it's definitely worth including.
On Wed, Apr 09, 2025 at 06:29 PM +08, Jiayuan Chen wrote: > Sockmap has the same high-performance forwarding capability as XDP, but > operates at Layer 7. > > Introduce tracing capability for sockmap, similar to XDP, to trace the > execution results of BPF programs without modifying the programs > themselves, similar to the existing trace_xdp_redirect{_map}. > > It is crucial for debugging BPF programs, especially in production > environments. > > Additionally, a header file was added to bpf_trace.h to automatically > generate tracepoints. > > Test results: > $ echo "1" > /sys/kernel/tracing/events/sockmap/enable > > skb: > sockmap_redirect: sk=00000000d3266a8d, type=skb, family=2, protocol=6, \ > prog_id=73, length=256, action=PASS > > msg: > sockmap_redirect: sk=00000000528c7614, type=msg, family=2, protocol=6, \ > prog_id=185, length=5, action=REDIRECT > > tls: > sockmap_redirect: sk=00000000d04d2224, type=skb, family=2, protocol=6, \ > prog_id=143, length=35, action=PASS > > strparser: > sockmap_skb_strp_parse: sk=00000000ecab0b30, family=2, protocol=6, \ > prog_id=170, size=5 > > Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev> > --- > MAINTAINERS | 1 + > include/linux/bpf_trace.h | 2 +- > include/trace/events/sockmap.h | 89 ++++++++++++++++++++++++++++++++++ > net/core/skmsg.c | 6 +++ > 4 files changed, 97 insertions(+), 1 deletion(-) > create mode 100644 include/trace/events/sockmap.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index a7a1d121a83e..578e16d86853 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -4420,6 +4420,7 @@ L: netdev@vger.kernel.org > L: bpf@vger.kernel.org > S: Maintained > F: include/linux/skmsg.h > +F: include/trace/events/sockmap.h > F: net/core/skmsg.c > F: net/core/sock_map.c > F: net/ipv4/tcp_bpf.c > diff --git a/include/linux/bpf_trace.h b/include/linux/bpf_trace.h > index ddf896abcfb6..896346fb2b46 100644 > --- a/include/linux/bpf_trace.h > +++ b/include/linux/bpf_trace.h > @@ -3,5 +3,5 @@ > #define __LINUX_BPF_TRACE_H__ > > #include <trace/events/xdp.h> > - > +#include <trace/events/sockmap.h> > #endif /* __LINUX_BPF_TRACE_H__ */ > diff --git a/include/trace/events/sockmap.h b/include/trace/events/sockmap.h > new file mode 100644 > index 000000000000..2a69b011e88f > --- /dev/null > +++ b/include/trace/events/sockmap.h > @@ -0,0 +1,89 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#undef TRACE_SYSTEM > +#define TRACE_SYSTEM sockmap > + > +#if !defined(_TRACE_SOCKMAP_H) || defined(TRACE_HEADER_MULTI_READ) > +#define _TRACE_SOCKMAP_H > + > +#include <linux/filter.h> > +#include <linux/tracepoint.h> > +#include <linux/bpf.h> > +#include <linux/skmsg.h> > + > +TRACE_DEFINE_ENUM(__SK_DROP); > +TRACE_DEFINE_ENUM(__SK_PASS); > +TRACE_DEFINE_ENUM(__SK_REDIRECT); > +TRACE_DEFINE_ENUM(__SK_NONE); > + > +#define show_act(x) \ > + __print_symbolic(x, \ > + { __SK_DROP, "DROP" }, \ > + { __SK_PASS, "PASS" }, \ > + { __SK_REDIRECT, "REDIRECT" }, \ > + { __SK_NONE, "NONE" }) > + > +#define trace_sockmap_skmsg_redirect(sk, prog, msg, act) \ > + trace_sockmap_redirect((sk), "msg", (prog), (msg)->sg.size, (act)) > + > +#define trace_sockmap_skb_redirect(sk, prog, skb, act) \ > + trace_sockmap_redirect((sk), "skb", (prog), (skb)->len, (act)) > + > +TRACE_EVENT(sockmap_redirect, > + TP_PROTO(const struct sock *sk, const char *type, > + const struct bpf_prog *prog, int length, int act), > + TP_ARGS(sk, type, prog, length, act), > + > + TP_STRUCT__entry( > + __field(const void *, sk) > + __field(const char *, type) > + __field(__u16, family) > + __field(__u16, protocol) > + __field(int, prog_id) > + __field(int, length) > + __field(int, act) > + ), > + > + TP_fast_assign( > + __entry->sk = sk; > + __entry->type = type; > + __entry->family = sk->sk_family; > + __entry->protocol = sk->sk_protocol; > + __entry->prog_id = prog->aux->id; > + __entry->length = length; > + __entry->act = act; > + ), > + > + TP_printk("sk=%p, type=%s, family=%d, protocol=%d, prog_id=%d, length=%d, action=%s", > + __entry->sk, __entry->type, __entry->family, __entry->protocol, > + __entry->prog_id, __entry->length, > + show_act(__entry->act)) sk address is useful if you're going to attach a bpf program to the tracepoint. Not so much if you're printing the recorded trace. I'd print the netns and the socket inode instead, or in addition to. These can be cross-referenced against `lsns` and `ss` output. > +); > + > +TRACE_EVENT(sockmap_skb_strp_parse, > + TP_PROTO(const struct sock *sk, const struct bpf_prog *prog, > + int size), > + TP_ARGS(sk, prog, size), > + > + TP_STRUCT__entry( > + __field(const void *, sk) > + __field(__u16, family) > + __field(__u16, protocol) > + __field(int, prog_id) > + __field(int, size) > + ), > + > + TP_fast_assign( > + __entry->sk = sk; > + __entry->family = sk->sk_family; > + __entry->protocol = sk->sk_protocol; > + __entry->prog_id = prog->aux->id; > + __entry->size = size; > + ), > + > + TP_printk("sk=%p, family=%d, protocol=%d, prog_id=%d, size=%d", > + __entry->sk, __entry->family, __entry->protocol, > + __entry->prog_id, __entry->size) > +); > +#endif /* _TRACE_SOCKMAP_H */ > + > +#include <trace/define_trace.h>
April 10, 2025 at 17:14, "Jakub Sitnicki" <jakub@cloudflare.com> wrote: > > On Wed, Apr 09, 2025 at 06:29 PM +08, Jiayuan Chen wrote: > > > > > Sockmap has the same high-performance forwarding capability as XDP, but > > > > operates at Layer 7. > > > > Introduce tracing capability for sockmap, similar to XDP, to trace the > > > > execution results of BPF programs without modifying the programs > > > > themselves, similar to the existing trace_xdp_redirect{_map}. > > > > It is crucial for debugging BPF programs, especially in production > > > > environments. > > > > Additionally, a header file was added to bpf_trace.h to automatically > > > > generate tracepoints. > > > > Test results: > > > > $ echo "1" > /sys/kernel/tracing/events/sockmap/enable > > > > skb: > > > > sockmap_redirect: sk=00000000d3266a8d, type=skb, family=2, protocol=6, \ > > > > prog_id=73, length=256, action=PASS > > > > msg: > > > > sockmap_redirect: sk=00000000528c7614, type=msg, family=2, protocol=6, \ > > > > prog_id=185, length=5, action=REDIRECT > > > > tls: > > > > sockmap_redirect: sk=00000000d04d2224, type=skb, family=2, protocol=6, \ > > > > prog_id=143, length=35, action=PASS > > > > strparser: > > > > sockmap_skb_strp_parse: sk=00000000ecab0b30, family=2, protocol=6, \ > > > > prog_id=170, size=5 > > > > Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev> > > > > --- > > > > MAINTAINERS | 1 + > > > > include/linux/bpf_trace.h | 2 +- > > > > include/trace/events/sockmap.h | 89 ++++++++++++++++++++++++++++++++++ > > > > net/core/skmsg.c | 6 +++ > > > > 4 files changed, 97 insertions(+), 1 deletion(-) > > > > create mode 100644 include/trace/events/sockmap.h > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > > > index a7a1d121a83e..578e16d86853 100644 > > > > --- a/MAINTAINERS > > > > +++ b/MAINTAINERS > > > > @@ -4420,6 +4420,7 @@ L: netdev@vger.kernel.org > > > > L: bpf@vger.kernel.org > > > > S: Maintained > > > > F: include/linux/skmsg.h > > > > +F: include/trace/events/sockmap.h > > > > F: net/core/skmsg.c > > > > F: net/core/sock_map.c > > > > F: net/ipv4/tcp_bpf.c > > > > diff --git a/include/linux/bpf_trace.h b/include/linux/bpf_trace.h > > > > index ddf896abcfb6..896346fb2b46 100644 > > > > --- a/include/linux/bpf_trace.h > > > > +++ b/include/linux/bpf_trace.h > > > > @@ -3,5 +3,5 @@ > > > > #define __LINUX_BPF_TRACE_H__ > > > > > > > > #include <trace/events/xdp.h> > > > > - > > > > +#include <trace/events/sockmap.h> > > > > #endif /* __LINUX_BPF_TRACE_H__ */ > > > > diff --git a/include/trace/events/sockmap.h b/include/trace/events/sockmap.h > > > > new file mode 100644 > > > > index 000000000000..2a69b011e88f > > > > --- /dev/null > > > > +++ b/include/trace/events/sockmap.h > > > > @@ -0,0 +1,89 @@ > > > > +/* SPDX-License-Identifier: GPL-2.0 */ > > > > +#undef TRACE_SYSTEM > > > > +#define TRACE_SYSTEM sockmap > > > > + > > > > +#if !defined(_TRACE_SOCKMAP_H) || defined(TRACE_HEADER_MULTI_READ) > > > > +#define _TRACE_SOCKMAP_H > > > > + > > > > +#include <linux/filter.h> > > > > +#include <linux/tracepoint.h> > > > > +#include <linux/bpf.h> > > > > +#include <linux/skmsg.h> > > > > + > > > > +TRACE_DEFINE_ENUM(__SK_DROP); > > > > +TRACE_DEFINE_ENUM(__SK_PASS); > > > > +TRACE_DEFINE_ENUM(__SK_REDIRECT); > > > > +TRACE_DEFINE_ENUM(__SK_NONE); > > > > + > > > > +#define show_act(x) \ > > > > + __print_symbolic(x, \ > > > > + { __SK_DROP, "DROP" }, \ > > > > + { __SK_PASS, "PASS" }, \ > > > > + { __SK_REDIRECT, "REDIRECT" }, \ > > > > + { __SK_NONE, "NONE" }) > > > > + > > > > +#define trace_sockmap_skmsg_redirect(sk, prog, msg, act) \ > > > > + trace_sockmap_redirect((sk), "msg", (prog), (msg)->sg.size, (act)) > > > > + > > > > +#define trace_sockmap_skb_redirect(sk, prog, skb, act) \ > > > > + trace_sockmap_redirect((sk), "skb", (prog), (skb)->len, (act)) > > > > + > > > > +TRACE_EVENT(sockmap_redirect, > > > > + TP_PROTO(const struct sock *sk, const char *type, > > > > + const struct bpf_prog *prog, int length, int act), > > > > + TP_ARGS(sk, type, prog, length, act), > > > > + > > > > + TP_STRUCT__entry( > > > > + __field(const void *, sk) > > > > + __field(const char *, type) > > > > + __field(__u16, family) > > > > + __field(__u16, protocol) > > > > + __field(int, prog_id) > > > > + __field(int, length) > > > > + __field(int, act) > > > > + ), > > > > + > > > > + TP_fast_assign( > > > > + __entry->sk = sk; > > > > + __entry->type = type; > > > > + __entry->family = sk->sk_family; > > > > + __entry->protocol = sk->sk_protocol; > > > > + __entry->prog_id = prog->aux->id; > > > > + __entry->length = length; > > > > + __entry->act = act; > > > > + ), > > > > + > > > > + TP_printk("sk=%p, type=%s, family=%d, protocol=%d, prog_id=%d, length=%d, action=%s", > > > > + __entry->sk, __entry->type, __entry->family, __entry->protocol, > > > > + __entry->prog_id, __entry->length, > > > > + show_act(__entry->act)) > > > > sk address is useful if you're going to attach a bpf program to the > tracepoint. Not so much if you're printing the recorded trace. > > I'd print the netns and the socket inode instead, or in addition to. > These can be cross-referenced against `lsns` and `ss` output. Good suggestions. I will print all of this. sk address helps us track connection more easily. Thanks~
diff --git a/MAINTAINERS b/MAINTAINERS index a7a1d121a83e..578e16d86853 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4420,6 +4420,7 @@ L: netdev@vger.kernel.org L: bpf@vger.kernel.org S: Maintained F: include/linux/skmsg.h +F: include/trace/events/sockmap.h F: net/core/skmsg.c F: net/core/sock_map.c F: net/ipv4/tcp_bpf.c diff --git a/include/linux/bpf_trace.h b/include/linux/bpf_trace.h index ddf896abcfb6..896346fb2b46 100644 --- a/include/linux/bpf_trace.h +++ b/include/linux/bpf_trace.h @@ -3,5 +3,5 @@ #define __LINUX_BPF_TRACE_H__ #include <trace/events/xdp.h> - +#include <trace/events/sockmap.h> #endif /* __LINUX_BPF_TRACE_H__ */ diff --git a/include/trace/events/sockmap.h b/include/trace/events/sockmap.h new file mode 100644 index 000000000000..2a69b011e88f --- /dev/null +++ b/include/trace/events/sockmap.h @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM sockmap + +#if !defined(_TRACE_SOCKMAP_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_SOCKMAP_H + +#include <linux/filter.h> +#include <linux/tracepoint.h> +#include <linux/bpf.h> +#include <linux/skmsg.h> + +TRACE_DEFINE_ENUM(__SK_DROP); +TRACE_DEFINE_ENUM(__SK_PASS); +TRACE_DEFINE_ENUM(__SK_REDIRECT); +TRACE_DEFINE_ENUM(__SK_NONE); + +#define show_act(x) \ + __print_symbolic(x, \ + { __SK_DROP, "DROP" }, \ + { __SK_PASS, "PASS" }, \ + { __SK_REDIRECT, "REDIRECT" }, \ + { __SK_NONE, "NONE" }) + +#define trace_sockmap_skmsg_redirect(sk, prog, msg, act) \ + trace_sockmap_redirect((sk), "msg", (prog), (msg)->sg.size, (act)) + +#define trace_sockmap_skb_redirect(sk, prog, skb, act) \ + trace_sockmap_redirect((sk), "skb", (prog), (skb)->len, (act)) + +TRACE_EVENT(sockmap_redirect, + TP_PROTO(const struct sock *sk, const char *type, + const struct bpf_prog *prog, int length, int act), + TP_ARGS(sk, type, prog, length, act), + + TP_STRUCT__entry( + __field(const void *, sk) + __field(const char *, type) + __field(__u16, family) + __field(__u16, protocol) + __field(int, prog_id) + __field(int, length) + __field(int, act) + ), + + TP_fast_assign( + __entry->sk = sk; + __entry->type = type; + __entry->family = sk->sk_family; + __entry->protocol = sk->sk_protocol; + __entry->prog_id = prog->aux->id; + __entry->length = length; + __entry->act = act; + ), + + TP_printk("sk=%p, type=%s, family=%d, protocol=%d, prog_id=%d, length=%d, action=%s", + __entry->sk, __entry->type, __entry->family, __entry->protocol, + __entry->prog_id, __entry->length, + show_act(__entry->act)) +); + +TRACE_EVENT(sockmap_skb_strp_parse, + TP_PROTO(const struct sock *sk, const struct bpf_prog *prog, + int size), + TP_ARGS(sk, prog, size), + + TP_STRUCT__entry( + __field(const void *, sk) + __field(__u16, family) + __field(__u16, protocol) + __field(int, prog_id) + __field(int, size) + ), + + TP_fast_assign( + __entry->sk = sk; + __entry->family = sk->sk_family; + __entry->protocol = sk->sk_protocol; + __entry->prog_id = prog->aux->id; + __entry->size = size; + ), + + TP_printk("sk=%p, family=%d, protocol=%d, prog_id=%d, size=%d", + __entry->sk, __entry->family, __entry->protocol, + __entry->prog_id, __entry->size) +); +#endif /* _TRACE_SOCKMAP_H */ + +#include <trace/define_trace.h> diff --git a/net/core/skmsg.c b/net/core/skmsg.c index 0ddc4c718833..9fb948f3b1eb 100644 --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@ -9,6 +9,7 @@ #include <net/tcp.h> #include <net/tls.h> #include <trace/events/sock.h> +#include <trace/events/sockmap.h> static bool sk_msg_try_coalesce_ok(struct sk_msg *msg, int elem_first_coalesce) { @@ -904,6 +905,7 @@ int sk_psock_msg_verdict(struct sock *sk, struct sk_psock *psock, sock_hold(psock->sk_redir); } out: + trace_sockmap_skmsg_redirect(sk, prog, msg, ret); rcu_read_unlock(); return ret; } @@ -975,6 +977,7 @@ int sk_psock_tls_strp_read(struct sk_psock *psock, struct sk_buff *skb) ret = bpf_prog_run_pin_on_cpu(prog, skb); ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb)); skb->sk = NULL; + trace_sockmap_skb_redirect(psock->sk, prog, skb, ret); } sk_psock_tls_verdict_apply(skb, psock, ret); rcu_read_unlock(); @@ -1084,6 +1087,7 @@ static void sk_psock_strp_read(struct strparser *strp, struct sk_buff *skb) skb_bpf_set_strparser(skb); ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb)); skb->sk = NULL; + trace_sockmap_skb_redirect(sk, prog, skb, ret); } sk_psock_verdict_apply(psock, skb, ret); out: @@ -1107,6 +1111,7 @@ static int sk_psock_strp_parse(struct strparser *strp, struct sk_buff *skb) skb->sk = psock->sk; ret = bpf_prog_run_pin_on_cpu(prog, skb); skb->sk = NULL; + trace_sockmap_skb_strp_parse(psock->sk, prog, ret); } rcu_read_unlock(); return ret; @@ -1211,6 +1216,7 @@ static int sk_psock_verdict_recv(struct sock *sk, struct sk_buff *skb) skb_bpf_redirect_clear(skb); ret = bpf_prog_run_pin_on_cpu(prog, skb); ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb)); + trace_sockmap_skb_redirect(psock->sk, prog, skb, ret); } ret = sk_psock_verdict_apply(psock, skb, ret); if (ret < 0)
Sockmap has the same high-performance forwarding capability as XDP, but operates at Layer 7. Introduce tracing capability for sockmap, similar to XDP, to trace the execution results of BPF programs without modifying the programs themselves, similar to the existing trace_xdp_redirect{_map}. It is crucial for debugging BPF programs, especially in production environments. Additionally, a header file was added to bpf_trace.h to automatically generate tracepoints. Test results: $ echo "1" > /sys/kernel/tracing/events/sockmap/enable skb: sockmap_redirect: sk=00000000d3266a8d, type=skb, family=2, protocol=6, \ prog_id=73, length=256, action=PASS msg: sockmap_redirect: sk=00000000528c7614, type=msg, family=2, protocol=6, \ prog_id=185, length=5, action=REDIRECT tls: sockmap_redirect: sk=00000000d04d2224, type=skb, family=2, protocol=6, \ prog_id=143, length=35, action=PASS strparser: sockmap_skb_strp_parse: sk=00000000ecab0b30, family=2, protocol=6, \ prog_id=170, size=5 Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev> --- MAINTAINERS | 1 + include/linux/bpf_trace.h | 2 +- include/trace/events/sockmap.h | 89 ++++++++++++++++++++++++++++++++++ net/core/skmsg.c | 6 +++ 4 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 include/trace/events/sockmap.h