From: Jason Xing <kernelxing@xxxxxxxxxxx> Until now, we've already prepared the generation related work, so it's time to let it work finally for both TCP and UDP protos. This is how I use in bpf program: 1) for UDP case BPF_SOCK_OPS_TS_UDP_SND_CB: bpf_setsockopt(...); 2) for TCP case BPF_SOCK_OPS_TCP_CONNECT_CB: bpf_setsockopt(...) 3) common part used to report the timestamp case BPF_SOCK_OPS_TS_SCHED_OPT_CB: dport = bpf_ntohl(skops->remote_port); sport = skops->local_port; bpf_printk(...); Signed-off-by: Jason Xing <kernelxing@xxxxxxxxxxx> --- include/net/sock.h | 6 ++++++ net/ipv4/ip_output.c | 1 + net/ipv4/tcp.c | 16 ++++++++++++++++ net/ipv6/ip6_output.c | 1 + 4 files changed, 24 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index cf7fea456455..cf687efbea9f 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2710,6 +2710,12 @@ static inline void sock_tx_timestamp(struct sock *sk, _sock_tx_timestamp(sk, sockc, tx_flags, NULL); } +static inline void sock_tx_timestamp_bpf(u32 tsflags, __u8 *tx_flags) +{ + if (tsflags) + __sock_tx_timestamp(tsflags, tx_flags); +} + static inline void skb_setup_tx_timestamp(struct sk_buff *skb, const struct sockcm_cookie *sockc) { diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 0065b1996c94..9d94a209057b 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1332,6 +1332,7 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork, cork->transmit_time = ipc->sockc.transmit_time; cork->tx_flags = 0; sock_tx_timestamp(sk, &ipc->sockc, &cork->tx_flags); + sock_tx_timestamp_bpf(READ_ONCE(sk->sk_tsflags_bpf), &cork->tx_flags); if (ipc->sockc.tsflags & SOCKCM_FLAG_TS_OPT_ID) { cork->flags |= IPCORK_TS_OPT_ID; cork->ts_opt_id = ipc->sockc.ts_opt_id; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 82cc4a5633ce..6b23b4aa3c91 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -477,6 +477,20 @@ void tcp_init_sock(struct sock *sk) } EXPORT_SYMBOL(tcp_init_sock); +static void tcp_tx_timestamp_bpf(struct sock *sk, struct sk_buff *skb) +{ + u32 tsflags = READ_ONCE(sk->sk_tsflags_bpf); + + if (tsflags && skb) { + struct skb_shared_info *shinfo = skb_shinfo(skb); + struct tcp_skb_cb *tcb = TCP_SKB_CB(skb); + + sock_tx_timestamp_bpf(tsflags, &shinfo->tx_flags); + if (tsflags & SOF_TIMESTAMPING_TX_ACK) + tcb->txstamp_ack = 1; + } +} + static void tcp_tx_timestamp(struct sock *sk, struct sockcm_cookie *sockc) { struct sk_buff *skb = tcp_write_queue_tail(sk); @@ -492,6 +506,8 @@ static void tcp_tx_timestamp(struct sock *sk, struct sockcm_cookie *sockc) if (tsflags & SOF_TIMESTAMPING_TX_RECORD_MASK) shinfo->tskey = TCP_SKB_CB(skb)->seq + skb->len - 1; } + + tcp_tx_timestamp_bpf(sk, skb); } static bool tcp_stream_is_readable(struct sock *sk, int target) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index f7b4608bb316..230e8d5a792c 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1402,6 +1402,7 @@ static int ip6_setup_cork(struct sock *sk, struct inet_cork_full *cork, cork->base.tx_flags = 0; cork->base.mark = ipc6->sockc.mark; sock_tx_timestamp(sk, &ipc6->sockc, &cork->base.tx_flags); + sock_tx_timestamp_bpf(READ_ONCE(sk->sk_tsflags_bpf), &cork->base.tx_flags); if (ipc6->sockc.tsflags & SOCKCM_FLAG_TS_OPT_ID) { cork->base.flags |= IPCORK_TS_OPT_ID; cork->base.ts_opt_id = ipc6->sockc.ts_opt_id; -- 2.37.3