[PATCH net-next v2 12/12] net-timestamp: add bpf support for rx software/hardware timestamp
From: Jason Xing <hidden>
Date: 2024-10-12 04:07:59
Also in:
bpf
Subsystem:
bpf [general] (safe dynamic programs and tools), networking [general], networking [tcp], the rest · Maintainers:
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Neal Cardwell, Linus Torvalds
From: Jason Xing <kernelxing@tencent.com> Now it's time to let the bpf for rx timestamp take effect. Signed-off-by: Jason Xing <kernelxing@tencent.com> --- include/net/tcp.h | 14 ++++++++++++++ include/uapi/linux/bpf.h | 5 +++++ net/ipv4/tcp.c | 29 +++++++++++++++++++++++++++-- tools/include/uapi/linux/bpf.h | 5 +++++ 4 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 728db7107074..5a7893379ef7 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h@@ -2676,6 +2676,14 @@ static inline int tcp_call_bpf_3arg(struct sock *sk, int op, u32 arg1, u32 arg2, return tcp_call_bpf(sk, op, 3, args); } +static inline int tcp_call_bpf_4arg(struct sock *sk, int op, u32 arg1, u32 arg2, + u32 arg3, u32 arg4) +{ + u32 args[4] = {arg1, arg2, arg3, arg4}; + + return tcp_call_bpf(sk, op, 4, args); +} + #else static inline int tcp_call_bpf(struct sock *sk, int op, u32 nargs, u32 *args) {
@@ -2693,6 +2701,12 @@ static inline int tcp_call_bpf_3arg(struct sock *sk, int op, u32 arg1, u32 arg2, return -EPERM; } +static inline int tcp_call_bpf_4arg(struct sock *sk, int op, u32 arg1, u32 arg2, + u32 arg3, u32 arg4) +{ + return -EPERM; +} + #endif static inline u32 tcp_timeout_init(struct sock *sk)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index d2754f155cf7..3527c20c8396 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h@@ -7037,6 +7037,11 @@ enum { * feature is on. It indicates the * recorded timestamp. */ + BPF_SOCK_OPS_TS_RX_OPT_CB, /* Called when tcp layer tries to + * receive skbs with timestamps when + * SO_TIMESTAMPING feature is on + * It indicates the recorded timestamp. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 0891b41bc745..14bc7283f574 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c@@ -2262,10 +2262,35 @@ static int tcp_zerocopy_receive(struct sock *sk, static void tcp_bpf_recv_timestamp(struct sock *sk, struct scm_timestamping_internal *tss) { + u32 tsflags = READ_ONCE(sk->sk_tsflags[BPFPROG_TS_REQUESTOR]); struct tcp_sock *tp = tcp_sk(sk); - if (BPF_SOCK_OPS_TEST_FLAG(tp, BPF_SOCK_OPS_RX_TIMESTAMPING_OPT_CB_FLAG)) - return; + if (BPF_SOCK_OPS_TEST_FLAG(tp, BPF_SOCK_OPS_RX_TIMESTAMPING_OPT_CB_FLAG)) { + u32 hw_sec, hw_nsec, sw_sec, sw_nsec; + + if (!(tsflags & (SOF_TIMESTAMPING_RX_SOFTWARE | + SOF_TIMESTAMPING_RX_HARDWARE))) + return; + + if (tsflags & SOF_TIMESTAMPING_RX_SOFTWARE) { + sw_sec = tss->ts[0].tv_sec; + sw_nsec = tss->ts[0].tv_nsec; + } else { + sw_sec = 0; + sw_nsec = 0; + } + + if (tsflags & SOF_TIMESTAMPING_RX_HARDWARE) { + hw_sec = tss->ts[2].tv_sec; + hw_nsec = tss->ts[2].tv_nsec; + } else { + hw_sec = 0; + hw_nsec = 0; + } + + tcp_call_bpf_4arg(sk, BPF_SOCK_OPS_TS_RX_OPT_CB, + sw_sec, sw_nsec, hw_sec, hw_nsec); + } } /* Similar to __sock_recv_timestamp, but does not require an skb */
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 331e3e6f1ed5..fad942abc36a 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h@@ -7036,6 +7036,11 @@ enum { * feature is on. It indicates the * recorded timestamp. */ + BPF_SOCK_OPS_TS_RX_OPT_CB, /* Called when tcp layer tries to + * receive skbs with timestamps when + * SO_TIMESTAMPING feature is on + * It indicates the recorded timestamp. + */ }; /* List of TCP states. There is a build check in net/ipv4/tcp.c to detect
--
2.37.3