From: Jason Xing <kernelxing@xxxxxxxxxxx>
Prepare for later changes in this series. Here I use u32 for
bpf_sock_ops_cb_flags for better extension and introduce a new
rx bpf flag to control separately.
Main change is let userside set through bpf_setsockopt() for
SO_TIMESTAMPING feature.
Signed-off-by: Jason Xing <kernelxing@xxxxxxxxxxx>
---
include/linux/tcp.h | 2 +-
include/uapi/linux/bpf.h | 5 ++++-
net/ipv4/tcp.c | 13 +++++++++++++
tools/include/uapi/linux/bpf.h | 5 ++++-
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 6a5e08b937b3..e21fd3035962 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -446,7 +446,7 @@ struct tcp_sock {
/* Sock_ops bpf program related variables */
#ifdef CONFIG_BPF
- u8 bpf_sock_ops_cb_flags; /* Control calling BPF programs
+ u32 bpf_sock_ops_cb_flags; /* Control calling BPF programs
* values defined in uapi/linux/tcp.h
*/
u8 bpf_chg_cc_inprogress:1; /* In the middle of
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 6bf3f2892776..3c28d74d14ea 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -6903,8 +6903,11 @@ enum {
/* Call bpf when the kernel is generating tx timestamps.
*/
BPF_SOCK_OPS_TX_TIMESTAMPING_OPT_CB_FLAG = (1<<7),
+ /* Call bpf when the kernel is generating rx timestamps.
+ */
+ BPF_SOCK_OPS_RX_TIMESTAMPING_OPT_CB_FLAG = (1<<8),
/* Mask of all currently supported cb flags */
- BPF_SOCK_OPS_ALL_CB_FLAGS = 0xFF,
+ BPF_SOCK_OPS_ALL_CB_FLAGS = 0x1FF,
};
/* List of known BPF sock_ops operators.
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 1d52640f9ff4..938e2bff4fa6 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2276,6 +2276,16 @@ static int tcp_zerocopy_receive(struct sock *sk,
}
#endif
+static bool tcp_bpf_recv_timestamp(struct sock *sk, struct scm_timestamping_internal *tss)
+{
+ struct tcp_sock *tp = tcp_sk(sk);
+
+ if (BPF_SOCK_OPS_TEST_FLAG(tp, BPF_SOCK_OPS_RX_TIMESTAMPING_OPT_CB_FLAG))
+ return true;
+
+ return false;
+}
+
/* Similar to __sock_recv_timestamp, but does not require an skb */
void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,
struct scm_timestamping_internal *tss)
@@ -2284,6 +2294,9 @@ void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,
u32 tsflags = READ_ONCE(sk->sk_tsflags);
bool has_timestamping = false;
+ if (tcp_bpf_recv_timestamp(sk, tss))
+ return;
+
if (tss->ts[0].tv_sec || tss->ts[0].tv_nsec) {
if (sock_flag(sk, SOCK_RCVTSTAMP)) {
if (sock_flag(sk, SOCK_RCVTSTAMPNS)) {
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index d3bf538846da..ff17cd820bde 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -6902,8 +6902,11 @@ enum {
/* Call bpf when the kernel is generating tx timestamps.
*/
BPF_SOCK_OPS_TX_TIMESTAMPING_OPT_CB_FLAG = (1<<7),
+ /* Call bpf when the kernel is generating rx timestamps.
+ */
+ BPF_SOCK_OPS_RX_TIMESTAMPING_OPT_CB_FLAG = (1<<8),
/* Mask of all currently supported cb flags */
- BPF_SOCK_OPS_ALL_CB_FLAGS = 0xFF,
+ BPF_SOCK_OPS_ALL_CB_FLAGS = 0x1FF,
};
/* List of known BPF sock_ops operators.
--
2.37.3
