Preserve mono delivery time (EDT) in skb->tstamp
Subsystems (18)
v5 cover Preserve mono delivery time (EDT) in skb->tstamp
skb->tstamp was first used as the (rcv) timestamp.
The major usage is to report it to the user (e.g. SO_TIMESTAMP).
Later, skb->tstamp is also set as the (future) delivery_time (e.g. EDT in TCP) during egress and used by the qdisc (e.g. sch_fq) to make decision on when the skb can be passed to the dev.
Currently, there is no way to tell skb->tstamp having the (rcv) timestamp or the delivery_time, so it is always reset to 0 whenever forwarded between egress and ingress.
While it makes sense to always clear the (rcv) timestamp in skb->tstamp to avoid confusing sch_fq that expects the delivery_time, it is a performance issue [0] to clear the delivery_time if the skb finally egress to a fq@phy-dev.
This set is to keep the mono delivery time and make it available to the final egress interface. Please see individual patch for the details.
[0] (slide 22): https://linuxplumbersconf.org/event/11/contributions/953/attachments/867/1658/LPC_2021_BPF_Datapath_Extensions.pdf
v5:
netdev:
- Patch 3 in v4 is broken down into smaller patches 3, 4, and 5 in v5
- The mono_delivery_time bit clearing in __skb_tstamp_tx() is
done in __net_timestamp() instead. This is patch 4 in v5.
- Missed a skb_clear_delivery_time() for the 'skip_classify' case in dev.c in v4. That is fixed in patch 5 in v5 for correctness. The skb_clear_delivery_time() will be moved to a later
stage in Patch 10, so it was an intermediate error in v4.
- Added delivery time handling for nfnetlink_{log, queue}.c in patch 9 (Daniel)
- Added delivery time handling in the IPv6 IOAM hop-by-hop option which has an experimental IANA assigned value 49 in patch 8
- Added delivery time handling in nf_conntrack for the ipv6 defrag case in patch 7
- Removed unlikely() from testing skb->mono_delivery_time (Daniel)
bpf:
- Remove the skb->tstamp dance in ingress. Depends on bpf insn rewrite to return 0 if skb->tstamp has delivery time in patch 11. It is to backward compatible with the existing tc-bpf@ingress in patch 11.
- bpf_set_delivery_time() will also allow dtime == 0 and dtime_type == BPF_SKB_DELIVERY_TIME_NONE as argument in patch 12.
v4:
netdev:
- Push the skb_clear_delivery_time() from ip_local_deliver() and ip6_input() to ip_local_deliver_finish() and ip6_input_finish() to accommodate the ipvs forward path.
This is the notable change in v4 at the netdev side.
- Patch 3/8 first does the skb_clear_delivery_time() after sch_handle_ingress() in dev.c and this will make the tc-bpf forward path work via the bpf_redirect_*() helper.
- The next patch 4/8 (new in v4) will then postpone the skb_clear_delivery_time() from dev.c to
the ip_local_deliver_finish() and ip6_input_finish() after taking care of the tstamp usage in the ip defrag case. This will make the kernel forward path also work, e.g. the ip[6]_forward().
- Fixed a case v3 which missed setting the skb->mono_delivery_time bit when sending TCP rst/ack in some cases (e.g. from a ctl_sk). That case happens at ip_send_unicast_reply() and tcp_v6_send_response(). It is fixed in patch 1/8 (and then patch 3/8) in v4.
bpf:
- Adding __sk_buff->delivery_time_type instead of adding __sk_buff->mono_delivery_time as in v3. The tc-bpf can stay with one __sk_buff->tstamp instead of having two 'time' fields while one is 0 and another is not.
tc-bpf can use the new __sk_buff->delivery_time_type to tell what is stored in __sk_buff->tstamp.
- bpf_skb_set_delivery_time() helper is added to set __sk_buff->tstamp from non mono delivery_time to
mono delivery_time
- Most of the convert_ctx_access() bpf insn rewrite in v3 is gone, so no new rewrite added for __sk_buff->tstamp. The only rewrite added is for reading the new __sk_buff->delivery_time_type.
- Added selftests, test_tc_dtime.c
v3:
- Feedback from v2 is using shinfo(skb)->tx_flags could be racy.
- Considered to reuse a few bits in skb->tstamp to represent different semantics, other than more code churns, it will break the bpf usecase which currently can write and then read back the skb->tstamp.
- Went back to v1 idea on adding a bit to skb and address the feedbacks on v1:
- Added one bit skb->mono_delivery_time to flag that
the skb->tstamp has the mono delivery_time (EDT), instead of adding a bit to flag if the skb->tstamp has been forwarded or not.
- Instead of resetting the delivery_time back to the (rcv) timestamp during recvmsg syscall which may be too late and not useful, the delivery_time reset in v3 happens earlier once the stack knows that the skb will be delivered locally.
- Handled the tapping@ingress case by af_packet
- No need to change the (rcv) timestamp to mono clock base as in v1. The added one bit to flag skb->mono_delivery_time is enough to keep the EDT delivery_time during forward.
- Added logic to the bpf side to make the existing bpf running at ingress can still get the (rcv) timestamp
when reading the __sk_buff->tstamp. New __sk_buff->mono_delivery_time is also added. Test is still needed to test this piece.
Martin KaFai Lau (13):
net: Add skb->mono_delivery_time to distinguish mono delivery_time
from (rcv) timestamp
net: Add skb_clear_tstamp() to keep the mono delivery_time
net: Handle delivery_time in skb->tstamp during network tapping with
af_packet
net: Clear mono_delivery_time bit in __skb_tstamp_tx()
net: Set skb->mono_delivery_time and clear it after
sch_handle_ingress()
net: ip: Handle delivery_time in ip defrag
net: ipv6: Handle delivery_time in ipv6 defrag
net: ipv6: Get rcv timestamp if needed when handling hop-by-hop IOAM
option
net: Get rcv tstamp if needed in nfnetlink_{log, queue}.c
net: Postpone skb_clear_delivery_time() until knowing the skb is
delivered locally
bpf: Keep the (rcv) timestamp behavior for the existing tc-bpf@ingress
bpf: Add __sk_buff->delivery_time_type and
bpf_skb_set_skb_delivery_time()
bpf: selftests: test skb->tstamp in redirect_neigh
drivers/net/loopback.c | 2 +- include/linux/filter.h | 3 +- include/linux/skbuff.h | 74 ++- include/net/inet_frag.h | 1 + include/uapi/linux/bpf.h | 41 +- net/bridge/br_forward.c | 2 +- net/bridge/netfilter/nf_conntrack_bridge.c | 5 +- net/core/dev.c | 8 +- net/core/filter.c | 178 ++++++- net/core/skbuff.c | 4 +- net/ieee802154/6lowpan/reassembly.c | 1 + net/ipv4/inet_fragment.c | 1 + net/ipv4/ip_forward.c | 2 +- net/ipv4/ip_fragment.c | 1 + net/ipv4/ip_input.c | 1 + net/ipv4/ip_output.c | 6 +- net/ipv4/tcp_output.c | 16 +- net/ipv6/ioam6.c | 19 +- net/ipv6/ip6_input.c | 1 + net/ipv6/ip6_output.c | 7 +- net/ipv6/netfilter.c | 5 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 1 + net/ipv6/reassembly.c | 1 + net/ipv6/tcp_ipv6.c | 2 +- net/netfilter/ipvs/ip_vs_xmit.c | 6 +- net/netfilter/nf_dup_netdev.c | 2 +- net/netfilter/nf_flow_table_ip.c | 4 +- net/netfilter/nfnetlink_log.c | 6 +- net/netfilter/nfnetlink_queue.c | 8 +- net/netfilter/nft_fwd_netdev.c | 2 +- net/openvswitch/vport.c | 2 +- net/packet/af_packet.c | 4 +- net/sched/act_bpf.c | 2 + net/sched/cls_bpf.c | 2 + net/xfrm/xfrm_interface.c | 2 +- tools/include/uapi/linux/bpf.h | 41 +- .../selftests/bpf/prog_tests/tc_redirect.c | 434 ++++++++++++++++++ .../selftests/bpf/progs/test_tc_dtime.c | 347 ++++++++++++++ 38 files changed, 1171 insertions(+), 73 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/test_tc_dtime.c
Signature · 1 line
2.30.2
PATCH v5 1/13 net: Add skb->mono_delivery_time to distinguish mono delivery_time from (rcv) timestamp
skb->tstamp was first used as the (rcv) timestamp.
The major usage is to report it to the user (e.g. SO_TIMESTAMP).
Later, skb->tstamp is also set as the (future) delivery_time (e.g. EDT in TCP) during egress and used by the qdisc (e.g. sch_fq) to make decision on when the skb can be passed to the dev.
Currently, there is no way to tell skb->tstamp having the (rcv) timestamp or the delivery_time, so it is always reset to 0 whenever forwarded between egress and ingress.
While it makes sense to always clear the (rcv) timestamp in skb->tstamp to avoid confusing sch_fq that expects the delivery_time, it is a performance issue [0] to clear the delivery_time if the skb finally egress to a fq@phy-dev. For example, when forwarding from egress to ingress and then finally back to egress:
tcp-sender => veth@netns => veth@hostns => fq@eth0@hostns
^ ^
reset rest
This patch adds one bit skb->mono_delivery_time to flag the skb->tstamp is storing the mono delivery_time (EDT) instead of the (rcv) timestamp.
The current use case is to keep the TCP mono delivery_time (EDT) and to be used with sch_fq. A latter patch will also allow tc-bpf@ingress to read and change the mono delivery_time.
In the future, another bit (e.g. skb->user_delivery_time) can be added for the SCM_TXTIME where the clock base is tracked by sk->sk_clockid.
[ This patch is a prep work. The following patches will
get the other parts of the stack ready first. Then another patch after that will finally set the skb->mono_delivery_time. ]
skb_set_delivery_time() function is added. It is used by the tcp_output.c and during ip[6] fragmentation to assign the delivery_time to the skb->tstamp and also set the skb->mono_delivery_time.
A note on the change in ip_send_unicast_reply() in ip_output.c. It is only used by TCP to send reset/ack out of a ctl_sk. Like the new skb_set_delivery_time(), this patch sets the skb->mono_delivery_time to 0 for now as a place holder. It will be enabled in a latter patch.
A similar case in tcp_ipv6 can be done with skb_set_delivery_time() in tcp_v6_send_response().
[0] (slide 22): https://linuxplumbersconf.org/event/11/contributions/953/attachments/867/1658/LPC_2021_BPF_Datapath_Extensions.pdf
--- include/linux/skbuff.h | 13 +++++++++++++ net/bridge/netfilter/nf_conntrack_bridge.c | 5 +++-- net/ipv4/ip_output.c | 7 +++++-- net/ipv4/tcp_output.c | 16 +++++++++------- net/ipv6/ip6_output.c | 5 +++-- net/ipv6/netfilter.c | 5 +++-- net/ipv6/tcp_ipv6.c | 2 +- 7 files changed, 37 insertions(+), 16 deletions(-)
include/linux/skbuff.h +13 -0
@@ -795,6 +795,10 @@ typedef unsigned char *sk_buff_data_t;* @dst_pending_confirm: need to confirm neighbour * @decrypted: Decrypted SKB * @slow_gro: state present at GRO time, slower prepare step required +* @mono_delivery_time: When set, skb->tstamp has the +* delivery_time in mono clock base (i.e. EDT). Otherwise, the +* skb->tstamp has the (rcv) timestamp at ingress and +* delivery_time at egress. * @napi_id: id of the NAPI struct this skb came from * @sender_cpu: (aka @napi_id) source CPU in XPS * @secmark: security marking
@@ -965,6 +969,7 @@ struct sk_buff { __u8 decrypted:1;#endif __u8 slow_gro:1; + __u8 mono_delivery_time:1;#ifdef CONFIG_NET_SCHED __u16 tc_index;/* traffic control index */
@@ -3983,6 +3988,14 @@ static inline ktime_t net_timedelta(ktime_t t)return ktime_sub (ktime_get_real (), t); } +static inline void skb_set_delivery_time (struct sk_buff *skb,ktime_t kt, +bool mono) +{ + skb->tstamp = kt; +/* Setting mono_delivery_time will be enabled later */ + skb->mono_delivery_time =0 ; +} +static inline u8 skb_metadata_len (const struct sk_buff *skb) {return skb_shinfo (skb)->meta_len;
net/bridge/netfilter/nf_conntrack_bridge.c +3 -2
@@ -32,6 +32,7 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk, struct sk_buff *)) {int frag_max_size =BR_INPUT_SKB_CB (skb)->frag_max_size; +bool mono_delivery_time = skb->mono_delivery_time;unsigned int hlen, ll_rs, mtu;ktime_t tstamp = skb->tstamp;struct ip_frag_state state;
@@ -81,7 +82,7 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk,if (iter.frag)ip_fraglist_prepare (skb, &iter); - skb->tstamp = tstamp; +skb_set_delivery_time (skb, tstamp, mono_delivery_time); err =output (net, sk, data, skb);if (err || !iter.frag)break ;
@@ -112,7 +113,7 @@ static int nf_br_ip_fragment(struct net *net, struct sock *sk, goto blackhole; } - skb2->tstamp = tstamp; +skb_set_delivery_time (skb2, tstamp, mono_delivery_time); err =output (net, sk, data, skb2);if (err) goto blackhole;
net/ipv4/ip_output.c +5 -2
@@ -761,6 +761,7 @@ int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, {struct iphdr *iph;struct sk_buff *skb2; +bool mono_delivery_time = skb->mono_delivery_time;struct rtable *rt =skb_rtable (skb);unsigned int mtu, hlen, ll_rs;struct ip_fraglist_iter iter;
@@ -852,7 +853,7 @@ int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, } } - skb->tstamp = tstamp; +skb_set_delivery_time (skb, tstamp, mono_delivery_time); err =output (net, sk, skb);if (!err)
@@ -908,7 +909,7 @@ int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,/* * Put this fragment into the sending queue. */ - skb2->tstamp = tstamp; +skb_set_delivery_time (skb2, tstamp, mono_delivery_time); err =output (net, sk, skb2);if (err) goto fail;
@@ -1727,6 +1728,8 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, arg->csumoffset) = csum_fold(csum_add(nskb->csum, arg->csum)); nskb->ip_summed =CHECKSUM_NONE ; +/* Setting mono_delivery_time will be enabled later */ + nskb->mono_delivery_time =0 ;ip_push_pending_frames (sk, &fl4); } out:
net/ipv4/tcp_output.c +9 -7
@@ -1253,7 +1253,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, tp =tcp_sk (sk); prior_wstamp = tp->tcp_wstamp_ns; tp->tcp_wstamp_ns =max (tp->tcp_wstamp_ns, tp->tcp_clock_cache); - skb->skb_mstamp_ns = tp->tcp_wstamp_ns; +skb_set_delivery_time (skb, tp->tcp_wstamp_ns, true);if (clone_it) { oskb = skb;
@@ -1589,7 +1589,7 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,skb_split (skb, buff, len); - buff->tstamp = skb->tstamp; +skb_set_delivery_time (buff, skb->tstamp, true);tcp_fragment_tstamp (skb, buff); old_factor =tcp_skb_pcount (skb);
@@ -2616,7 +2616,8 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,if (unlikely (tp->repair) && tp->repair_queue ==TCP_SEND_QUEUE ) {/* "skb_mstamp_ns" is used as a start point for the retransmit timer */ - skb->skb_mstamp_ns = tp->tcp_wstamp_ns = tp->tcp_clock_cache; + tp->tcp_wstamp_ns = tp->tcp_clock_cache; +skb_set_delivery_time (skb, tp->tcp_wstamp_ns, true);list_move_tail (&skb->tcp_tsorted_anchor, &tp->tsorted_sent_queue);tcp_init_tso_segs (skb, mss_now); goto repair;/* Skip network transmission */
@@ -3541,11 +3542,12 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst, now =tcp_clock_ns ();#ifdef CONFIG_SYN_COOKIES if (unlikely (synack_type ==TCP_SYNACK_COOKIE && ireq->tstamp_ok)) - skb->skb_mstamp_ns =cookie_init_timestamp (req, now); +skb_set_delivery_time (skb,cookie_init_timestamp (req, now), + true); else#endif { - skb->skb_mstamp_ns = now; +skb_set_delivery_time (skb, now, true);if (!tcp_rsk (req)->snt_synack)/* Timestamp first SYNACK */ tcp_rsk (req)->snt_synack =tcp_skb_timestamp_us (skb); }
@@ -3594,7 +3596,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst,bpf_skops_write_hdr_opt ((struct sock *)sk, skb, req, syn_skb, synack_type, &opts); - skb->skb_mstamp_ns = now; +skb_set_delivery_time (skb, now, true);tcp_add_tx_delay (skb, tp);return skb;
@@ -3771,7 +3773,7 @@ static int tcp_send_syn_data(struct sock *sk, struct sk_buff *syn) err =tcp_transmit_skb (sk, syn_data,1 , sk->sk_allocation); - syn->skb_mstamp_ns = syn_data->skb_mstamp_ns; +skb_set_delivery_time (syn, syn_data->skb_mstamp_ns, true);/* Now full SYN+DATA was cloned and sent (or not), * remove the SYN from the original skb (syn_data)
net/ipv6/ip6_output.c +3 -2
@@ -813,6 +813,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,struct rt6_info *rt = (struct rt6_info *)skb_dst (skb);struct ipv6_pinfo *np = skb->sk && !dev_recursion_level () ?inet6_sk (skb->sk) :NULL ; +bool mono_delivery_time = skb->mono_delivery_time;struct ip6_frag_state state;unsigned int mtu, hlen, nexthdr_offset;ktime_t tstamp = skb->tstamp;
@@ -903,7 +904,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,if (iter.frag)ip6_fraglist_prepare (skb, &iter); - skb->tstamp = tstamp; +skb_set_delivery_time (skb, tstamp, mono_delivery_time); err =output (net, sk, skb);if (!err) IP6_INC_STATS(net, ip6_dst_idev(&rt->dst),
@@ -962,7 +963,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,/* * Put this fragment into the sending queue. */ - frag->tstamp = tstamp; +skb_set_delivery_time (frag, tstamp, mono_delivery_time); err =output (net, sk, frag);if (err) goto fail;
net/ipv6/netfilter.c +3 -2
@@ -121,6 +121,7 @@ int br_ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, struct sk_buff *)) {int frag_max_size =BR_INPUT_SKB_CB (skb)->frag_max_size; +bool mono_delivery_time = skb->mono_delivery_time;ktime_t tstamp = skb->tstamp;struct ip6_frag_state state;u8 *prevhdr, nexthdr =0 ;
@@ -186,7 +187,7 @@ int br_ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,if (iter.frag)ip6_fraglist_prepare (skb, &iter); - skb->tstamp = tstamp; +skb_set_delivery_time (skb, tstamp, mono_delivery_time); err =output (net, sk, data, skb);if (err || !iter.frag)break ;
@@ -219,7 +220,7 @@ int br_ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, goto blackhole; } - skb2->tstamp = tstamp; +skb_set_delivery_time (skb2, tstamp, mono_delivery_time); err =output (net, sk, data, skb2);if (err) goto blackhole;
net/ipv6/tcp_ipv6.c +1 -1
@@ -940,7 +940,7 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 }else { mark = sk->sk_mark; } - buff->tstamp =tcp_transmit_time (sk); +skb_set_delivery_time (buff,tcp_transmit_time (sk), true); } fl6.flowi6_mark =IP6_REPLY_MARK (net, skb->mark) ?: mark; fl6.fl6_dport = t1->dest;
Signature · 1 line
2.30.2
PATCH v5 2/13 net: Add skb_clear_tstamp() to keep the mono delivery_time
In reply to Martin KaFai LauRight now, skb->tstamp is reset to 0 whenever the skb is forwarded.
If skb->tstamp has the mono delivery_time, clearing it can hurt the performance when it finally transmits out to fq@phy-dev.
The earlier patch added a skb->mono_delivery_time bit to flag the skb->tstamp carrying the mono delivery_time.
This patch adds skb_clear_tstamp() helper which keeps the mono delivery_time and clears everything else.
The delivery_time clearing will be postponed until the stack knows the skb will be delivered locally. It will be done in a latter patch.
--- drivers/net/loopback.c | 2 +- include/linux/skbuff.h | 10 +++++++++- net/bridge/br_forward.c | 2 +- net/core/filter.c | 6 +++--- net/core/skbuff.c | 2 +- net/ipv4/ip_forward.c | 2 +- net/ipv6/ip6_output.c | 2 +- net/netfilter/ipvs/ip_vs_xmit.c | 6 +++--- net/netfilter/nf_dup_netdev.c | 2 +- net/netfilter/nf_flow_table_ip.c | 4 ++-- net/netfilter/nft_fwd_netdev.c | 2 +- net/openvswitch/vport.c | 2 +- net/xfrm/xfrm_interface.c | 2 +- 13 files changed, 26 insertions(+), 18 deletions(-)
drivers/net/loopback.c +1 -1
@@ -74,7 +74,7 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,skb_tx_timestamp (skb);/* do not fool net_timestamp_check() with various clock bases */ - skb->tstamp =0 ; +skb_clear_tstamp (skb);skb_orphan (skb);
include/linux/skbuff.h +9 -1
@@ -3996,6 +3996,14 @@ static inline void skb_set_delivery_time(struct sk_buff *skb, ktime_t kt, skb->mono_delivery_time =0 ; } +static inline void skb_clear_tstamp (struct sk_buff *skb) +{ +if (skb->mono_delivery_time) +return ; + + skb->tstamp =0 ; +} +static inline u8 skb_metadata_len (const struct sk_buff *skb) {return skb_shinfo (skb)->meta_len;
@@ -4852,7 +4860,7 @@ static inline void skb_set_redirected(struct sk_buff *skb, bool from_ingress)#ifdef CONFIG_NET_REDIRECT skb->from_ingress = from_ingress;if (skb->from_ingress) - skb->tstamp =0 ; +skb_clear_tstamp (skb);#endif }
net/bridge/br_forward.c +1 -1
@@ -62,7 +62,7 @@ EXPORT_SYMBOL_GPL(br_dev_queue_push_xmit);int br_forward_finish (struct net *net,struct sock *sk,struct sk_buff *skb) { - skb->tstamp =0 ; +skb_clear_tstamp (skb);return NF_HOOK (NFPROTO_BRIDGE ,NF_BR_POST_ROUTING , net, sk, skb,NULL , skb->dev, br_dev_queue_push_xmit);
net/core/filter.c +3 -3
@@ -2107,7 +2107,7 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb) } skb->dev = dev; - skb->tstamp =0 ; +skb_clear_tstamp (skb);dev_xmit_recursion_inc (); ret =dev_queue_xmit (skb);
@@ -2176,7 +2176,7 @@ static int bpf_out_neigh_v6(struct net *net, struct sk_buff *skb, } skb->dev = dev; - skb->tstamp =0 ; +skb_clear_tstamp (skb);if (unlikely (skb_headroom (skb) < hh_len && dev->header_ops)) { skb =skb_expand_head (skb, hh_len);
@@ -2274,7 +2274,7 @@ static int bpf_out_neigh_v4(struct net *net, struct sk_buff *skb, } skb->dev = dev; - skb->tstamp =0 ; +skb_clear_tstamp (skb);if (unlikely (skb_headroom (skb) < hh_len && dev->header_ops)) { skb =skb_expand_head (skb, hh_len);
net/core/skbuff.c +1 -1
@@ -5381,7 +5381,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)ipvs_reset (skb); skb->mark =0 ; - skb->tstamp =0 ; +skb_clear_tstamp (skb); }EXPORT_SYMBOL_GPL (skb_scrub_packet);
net/ipv4/ip_forward.c +1 -1
@@ -79,7 +79,7 @@ static int ip_forward_finish(struct net *net, struct sock *sk, struct sk_buff *sif (unlikely (opt->optlen))ip_forward_options (skb); - skb->tstamp =0 ; +skb_clear_tstamp (skb);return dst_output (net, sk, skb); }
net/ipv6/ip6_output.c +1 -1
@@ -440,7 +440,7 @@ static inline int ip6_forward_finish(struct net *net, struct sock *sk, }#endif - skb->tstamp =0 ; +skb_clear_tstamp (skb);return dst_output (net, sk, skb); }
net/netfilter/ipvs/ip_vs_xmit.c +3 -3
@@ -610,7 +610,7 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,nf_reset_ct (skb);skb_forward_csum (skb);if (skb->dev) - skb->tstamp =0 ; +skb_clear_tstamp (skb); }return ret; }
@@ -652,7 +652,7 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,if (!local) {skb_forward_csum (skb);if (skb->dev) - skb->tstamp =0 ; +skb_clear_tstamp (skb);NF_HOOK (pf,NF_INET_LOCAL_OUT , cp->ipvs->net,NULL , skb,NULL ,skb_dst (skb)->dev, dst_output); }else
@@ -674,7 +674,7 @@ static inline int ip_vs_send_or_cont(int pf, struct sk_buff *skb,ip_vs_drop_early_demux_sk (skb);skb_forward_csum (skb);if (skb->dev) - skb->tstamp =0 ; +skb_clear_tstamp (skb);NF_HOOK (pf,NF_INET_LOCAL_OUT , cp->ipvs->net,NULL , skb,NULL ,skb_dst (skb)->dev, dst_output); }else
net/netfilter/nf_dup_netdev.c +1 -1
@@ -19,7 +19,7 @@ static void nf_do_netdev_egress(struct sk_buff *skb, struct net_device *dev)skb_push (skb, skb->mac_len); skb->dev = dev; - skb->tstamp =0 ; +skb_clear_tstamp (skb);dev_queue_xmit (skb); }
net/netfilter/nf_flow_table_ip.c +2 -2
@@ -376,7 +376,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,nf_flow_nat_ip (flow, skb, thoff, dir, iph);ip_decrease_ttl (iph); - skb->tstamp =0 ; +skb_clear_tstamp (skb);if (flow_table->flags &NF_FLOWTABLE_COUNTER )nf_ct_acct_update (flow->ct, tuplehash->tuple.dir, skb->len);
@@ -611,7 +611,7 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb,nf_flow_nat_ipv6 (flow, skb, dir, ip6h); ip6h->hop_limit--; - skb->tstamp =0 ; +skb_clear_tstamp (skb);if (flow_table->flags &NF_FLOWTABLE_COUNTER )nf_ct_acct_update (flow->ct, tuplehash->tuple.dir, skb->len);
net/netfilter/nft_fwd_netdev.c +1 -1
@@ -145,7 +145,7 @@ static void nft_fwd_neigh_eval(const struct nft_expr *expr,return ; skb->dev = dev; - skb->tstamp =0 ; +skb_clear_tstamp (skb);neigh_xmit (neigh_table, dev, addr, skb); out: regs->verdict.code = verdict;
net/openvswitch/vport.c +1 -1
@@ -507,7 +507,7 @@ void ovs_vport_send(struct vport *vport, struct sk_buff *skb, u8 mac_proto) } skb->dev = vport->dev; - skb->tstamp =0 ; +skb_clear_tstamp (skb); vport->ops->send (skb);return ;
net/xfrm/xfrm_interface.c +1 -1
@@ -190,7 +190,7 @@ static void xfrmi_dev_uninit(struct net_device *dev)static void xfrmi_scrub_packet (struct sk_buff *skb,bool xnet) { - skb->tstamp =0 ; +skb_clear_tstamp (skb); skb->pkt_type =PACKET_HOST ; skb->skb_iif =0 ; skb->ignore_df =0 ;
Signature · 1 line
2.30.2
PATCH v5 3/13 net: Handle delivery_time in skb->tstamp during network tapping with af_packet
In reply to Martin KaFai LauA latter patch will set the skb->mono_delivery_time to flag the skb->tstamp is used as the mono delivery_time (EDT) instead of the (rcv) timestamp. skb_clear_tstamp() will then keep this delivery_time during forwarding.
This patch is to make the network tapping (with af_packet) to handle the delivery_time stored in skb->tstamp.
Regardless of tapping at the ingress or egress, the tapped skb is received by the af_packet socket, so it is ingress to the af_packet socket and it expects the (rcv) timestamp.
When tapping at egress, dev_queue_xmit_nit() is used. It has already expected skb->tstamp may have delivery_time, so it does skb_clone()+net_timestamp_set() to ensure the cloned skb has the (rcv) timestamp before passing to the af_packet sk. This patch only adds to clear the skb->mono_delivery_time bit in net_timestamp_set().
When tapping at ingress, it currently expects the skb->tstamp is either 0 or the (rcv) timestamp. Meaning, the tapping at ingress path has already expected the skb->tstamp could be 0 and it will get the (rcv) timestamp by ktime_get_real() when needed.
There are two cases for tapping at ingress:
One case is af_packet queues the skb to its sk_receive_queue. The skb is either not shared or new clone created. The newly added skb_clear_delivery_time() is called to clear the delivery_time (if any) and set the (rcv) timestamp if needed before the skb is queued to the sk_receive_queue.
Another case, the ingress skb is directly copied to the rx_ring and tpacket_get_timestamp() is used to get the (rcv) timestamp. The newly added skb_tstamp() is used in tpacket_get_timestamp() to check the skb->mono_delivery_time bit before returning skb->tstamp. As mentioned earlier, the tapping@ingress has already expected the skb may not have the (rcv) timestamp (because no sk has asked for it) and has handled this case by directly calling ktime_get_real().
--- include/linux/skbuff.h | 24 ++++++++++++++++++++++++ net/core/dev.c | 4 +++- net/packet/af_packet.c | 4 +++- 3 files changed, 30 insertions(+), 2 deletions(-)
include/linux/skbuff.h +24 -0
@@ -3996,6 +3996,22 @@ static inline void skb_set_delivery_time(struct sk_buff *skb, ktime_t kt, skb->mono_delivery_time =0 ; } +DECLARE_STATIC_KEY_FALSE (netstamp_needed_key); + +/* It is used in the ingress path to clear the delivery_time. +* If needed, set the skb->tstamp to the (rcv) timestamp. +*/ +static inline void skb_clear_delivery_time (struct sk_buff *skb) +{ +if (skb->mono_delivery_time) { + skb->mono_delivery_time =0 ; +if (static_branch_unlikely (&netstamp_needed_key)) + skb->tstamp =ktime_get_real (); +else + skb->tstamp =0 ; + } +} +static inline void skb_clear_tstamp (struct sk_buff *skb) {if (skb->mono_delivery_time)
@@ -4004,6 +4020,14 @@ static inline void skb_clear_tstamp(struct sk_buff *skb) skb->tstamp =0 ; } +static inline ktime_t skb_tstamp (const struct sk_buff *skb) +{ +if (skb->mono_delivery_time) +return 0 ; + +return skb->tstamp; +} +static inline u8 skb_metadata_len (const struct sk_buff *skb) {return skb_shinfo (skb)->meta_len;
net/core/dev.c +3 -1
@@ -2020,7 +2020,8 @@ void net_dec_egress_queue(void)EXPORT_SYMBOL_GPL (net_dec_egress_queue);#endif -static DEFINE_STATIC_KEY_FALSE (netstamp_needed_key); +DEFINE_STATIC_KEY_FALSE (netstamp_needed_key); +EXPORT_SYMBOL (netstamp_needed_key);#ifdef CONFIG_JUMP_LABEL static atomic_t netstamp_needed_deferred;static atomic_t netstamp_wanted;
@@ -2081,6 +2082,7 @@ EXPORT_SYMBOL(net_disable_timestamp);static inline void net_timestamp_set (struct sk_buff *skb) { skb->tstamp =0 ; + skb->mono_delivery_time =0 ;if (static_branch_unlikely (&netstamp_needed_key))__net_timestamp (skb); }
net/packet/af_packet.c +3 -1
@@ -460,7 +460,7 @@ static __u32 tpacket_get_timestamp(struct sk_buff *skb, struct timespec64 *ts,return TP_STATUS_TS_RAW_HARDWARE ;if ((flags &SOF_TIMESTAMPING_SOFTWARE ) && -ktime_to_timespec64_cond (skb->tstamp, ts)) +ktime_to_timespec64_cond (skb_tstamp (skb), ts))return TP_STATUS_TS_SOFTWARE ;return 0 ;
@@ -2199,6 +2199,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,spin_lock (&sk->sk_receive_queue.lock); po->stats.stats1.tp_packets++;sock_skb_set_dropcount (sk, skb); +skb_clear_delivery_time (skb);__skb_queue_tail (&sk->sk_receive_queue, skb);spin_unlock (&sk->sk_receive_queue.lock); sk->sk_data_ready (sk);
@@ -2377,6 +2378,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, po->stats.stats1.tp_packets++;if (copy_skb) { status |=TP_STATUS_COPY ; +skb_clear_delivery_time (copy_skb);__skb_queue_tail (&sk->sk_receive_queue, copy_skb); }spin_unlock (&sk->sk_receive_queue.lock);
Signature · 1 line
2.30.2
PATCH v5 4/13 net: Clear mono_delivery_time bit in __skb_tstamp_tx()
In reply to Martin KaFai LauIn __skb_tstamp_tx(), it may clone the egress skb and queues the clone to the sk_error_queue. The outgoing skb may have the mono delivery_time while the (rcv) timestamp is expected for the clone, so the skb->mono_delivery_time bit needs to be cleared from the clone.
This patch adds the skb->mono_delivery_time clearing to the existing __net_timestamp() and use it in __skb_tstamp_tx().
The __net_timestamp() fast path usage in dev.c is changed to directly call ktime_get_real() since the mono_delivery_time bit is not set at that point.
--- include/linux/skbuff.h | 1 + net/core/dev.c | 4 ++-- net/core/skbuff.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)
include/linux/skbuff.h +1 -0
@@ -3981,6 +3981,7 @@ static inline void skb_get_new_timestampns(const struct sk_buff *skb,static inline void __net_timestamp (struct sk_buff *skb) { skb->tstamp =ktime_get_real (); + skb->mono_delivery_time =0 ; }static inline ktime_t net_timedelta (ktime_t t)
net/core/dev.c +2 -2
@@ -2084,13 +2084,13 @@ static inline void net_timestamp_set(struct sk_buff *skb) skb->tstamp =0 ; skb->mono_delivery_time =0 ;if (static_branch_unlikely (&netstamp_needed_key)) -__net_timestamp (skb); + skb->tstamp =ktime_get_real (); }#define net_timestamp_check (COND ,SKB ) \ if (static_branch_unlikely(&netstamp_needed_key)) { \ if ((COND) && !(SKB)->tstamp) \ - __net_timestamp(SKB); \ + (SKB)->tstamp = ktime_get_real(); \ } \bool is_skb_forwardable (const struct net_device *dev,const struct sk_buff *skb)
net/core/skbuff.c +1 -1
@@ -4851,7 +4851,7 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb,if (hwtstamps) *skb_hwtstamps (skb) = *hwtstamps;else - skb->tstamp =ktime_get_real (); +__net_timestamp (skb);__skb_complete_tx_timestamp (skb, sk, tstype, opt_stats); }
Signature · 1 line
2.30.2
PATCH v5 5/13 net: Set skb->mono_delivery_time and clear it after sch_handle_ingress()
In reply to Martin KaFai LauThe previous patches handled the delivery_time before sch_handle_ingress().
This patch can now set the skb->mono_delivery_time to flag the skb->tstamp is used as the mono delivery_time (EDT) instead of the (rcv) timestamp and also clear it with skb_clear_delivery_time() after sch_handle_ingress(). This will make the bpf_redirect_*()
to keep the mono delivery_time and used by a qdisc (fq) of
the egress-ing interface.
A latter patch will postpone the skb_clear_delivery_time() until the stack learns that the skb is being delivered locally and that will make other kernel forwarding paths (ip[6]_forward) able to keep the delivery_time also. Thus, like the previous patches on using the skb->mono_delivery_time bit, calling skb_clear_delivery_time() is not limited within the CONFIG_NET_INGRESS to avoid too many code churns among this set.
--- include/linux/skbuff.h | 3 +-- net/core/dev.c | 8 ++++++-- net/ipv4/ip_output.c | 3 +-- 3 files changed, 8 insertions(+), 6 deletions(-)
include/linux/skbuff.h +1 -2
@@ -3993,8 +3993,7 @@ static inline void skb_set_delivery_time(struct sk_buff *skb, ktime_t kt, bool mono) { skb->tstamp = kt; -/* Setting mono_delivery_time will be enabled later */ - skb->mono_delivery_time =0 ; + skb->mono_delivery_time = kt && mono; }DECLARE_STATIC_KEY_FALSE (netstamp_needed_key);
net/core/dev.c +6 -2
@@ -5193,8 +5193,10 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, goto out; } -if (skb_skip_tc_classify (skb)) +if (skb_skip_tc_classify (skb)) { +skb_clear_delivery_time (skb); goto skip_classify; + }if (pfmemalloc) goto skip_taps;
@@ -5223,12 +5225,14 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, goto another_round;if (!skb) goto out; +skb_clear_delivery_time (skb);nf_skip_egress (skb, false);if (nf_ingress (skb, &pt_prev, &ret, orig_dev) <0 ) goto out; - } + } else#endif +skb_clear_delivery_time (skb);skb_reset_redirect (skb); skip_classify:if (pfmemalloc && !skb_pfmemalloc_protocol (skb))
net/ipv4/ip_output.c +1 -2
@@ -1728,8 +1728,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, arg->csumoffset) = csum_fold(csum_add(nskb->csum, arg->csum)); nskb->ip_summed =CHECKSUM_NONE ; -/* Setting mono_delivery_time will be enabled later */ - nskb->mono_delivery_time =0 ; + nskb->mono_delivery_time = !!transmit_time;ip_push_pending_frames (sk, &fl4); } out:
Signature · 1 line
2.30.2
PATCH v5 6/13 net: ip: Handle delivery_time in ip defrag
In reply to Martin KaFai LauA latter patch will postpone the delivery_time clearing until the stack knows the skb is being delivered locally. That will allow other kernel forwarding path (e.g. ip[6]_forward) to keep the delivery_time also.
An earlier attempt was to do skb_clear_delivery_time() in ip_local_deliver() and ip6_input(). The discussion [0] requested to move it one step later into ip_local_deliver_finish() and ip6_input_finish() so that the delivery_time can be kept for the ip_vs forwarding path also.
To do that, this patch also needs to take care of the (rcv) timestamp usecase in ip_is_fragment(). It needs to expect delivery_time in the skb->tstamp, so it needs to save the mono_delivery_time bit in inet_frag_queue such that the delivery_time (if any) can be restored in the final defragmented skb.
[Note that it will only happen when the locally generated skb is looping
from egress to ingress over a virtual interface (e.g. veth, loopback...), skb->tstamp may have the delivery time before it is known that it will be delivered locally and received by another sk.]
[0]: https://lore.kernel.org/netdev/[email protected]/
--- include/net/inet_frag.h | 1 + net/ipv4/inet_fragment.c | 1 + net/ipv4/ip_fragment.c | 1 + 3 files changed, 3 insertions(+)
include/net/inet_frag.h +1 -0
@@ -90,6 +90,7 @@ struct inet_frag_queue {ktime_t stamp;int len;int meat; +__u8 mono_delivery_time;__u8 flags;u16 max_size;struct fqdir *fqdir;
net/ipv4/inet_fragment.c +1 -0
@@ -572,6 +572,7 @@ void inet_frag_reasm_finish(struct inet_frag_queue *q, struct sk_buff *head,skb_mark_not_on_list (head); head->prev =NULL ; head->tstamp = q->stamp; + head->mono_delivery_time = q->mono_delivery_time; }EXPORT_SYMBOL (inet_frag_reasm_finish);
net/ipv4/ip_fragment.c +1 -0
@@ -349,6 +349,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb) qp->iif = dev->ifindex; qp->q.stamp = skb->tstamp; + qp->q.mono_delivery_time = skb->mono_delivery_time; qp->q.meat += skb->len; qp->ecn |= ecn;add_frag_mem_limit (qp->q.fqdir, skb->truesize);
Signature · 1 line
2.30.2
Jakub Kicinski
maintainerRe: [PATCH v5 net-next 06/13] net: ip: Handle delivery_time in ip defrag
include/net/inet_frag.h struct inet_frag_queue { · line 96
Quoted 12 lines · On Mon, 28 Feb 2022 21:37:09 -0800 Martin KaFai Lau wrote:
include/net/inet_frag.h +1
-0@@ -90,6 +90,7 @@ struct inet_frag_queue {ktime_t stamp;int len;int meat; +__u8 mono_delivery_time;__u8 flags;u16 max_size;struct fqdir *fqdir;
kdoc missing for this one, also we can ignore the __u8 in flags and stick to non-uAPI types this time
PATCH v5 7/13 net: ipv6: Handle delivery_time in ipv6 defrag
In reply to Martin KaFai LauA latter patch will postpone the delivery_time clearing until the stack knows the skb is being delivered locally (i.e. calling skb_clear_delivery_time() at ip_local_deliver_finish() for IPv4 and at ip6_input_finish() for IPv6). That will allow other kernel forwarding path (e.g. ip[6]_forward) to keep the delivery_time also.
A very similar IPv6 defrag codes have been duplicated in multiple places: regular IPv6, nf_conntrack, and 6lowpan.
Unlike the IPv4 defrag which is done before ip_local_deliver_finish(), the regular IPv6 defrag is done after ip6_input_finish(). Thus, no change should be needed in the regular IPv6 defrag logic because skb_clear_delivery_time() should have been called.
6lowpan also does not need special handling on delivery_time because it is a non-inet packet_type.
However, cf_conntrack has a case in NF_INET_PRE_ROUTING that needs to do the IPv6 defrag earlier. Thus, it needs to save the mono_delivery_time bit in the inet_frag_queue which is similar to how it is handled in the previous patch for the IPv4 defrag.
This patch chooses to do it consistently and stores the mono_delivery_time in the inet_frag_queue for all cases such that it will be easier for the future refactoring effort on the IPv6 reasm code.
--- net/ieee802154/6lowpan/reassembly.c | 1 + net/ipv6/netfilter/nf_conntrack_reasm.c | 1 + net/ipv6/reassembly.c | 1 + 3 files changed, 3 insertions(+)
net/ieee802154/6lowpan/reassembly.c +1 -0
@@ -130,6 +130,7 @@ static int lowpan_frag_queue(struct lowpan_frag_queue *fq, goto err; fq->q.stamp = skb->tstamp; + fq->q.mono_delivery_time = skb->mono_delivery_time;if (frag_type ==LOWPAN_DISPATCH_FRAG1 ) fq->q.flags |=INET_FRAG_FIRST_IN ;
net/ipv6/netfilter/nf_conntrack_reasm.c +1 -0
@@ -264,6 +264,7 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, fq->iif = dev->ifindex; fq->q.stamp = skb->tstamp; + fq->q.mono_delivery_time = skb->mono_delivery_time; fq->q.meat += skb->len; fq->ecn |= ecn;if (payload_len > fq->q.max_size)
net/ipv6/reassembly.c +1 -0
@@ -194,6 +194,7 @@ static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb, fq->iif = dev->ifindex; fq->q.stamp = skb->tstamp; + fq->q.mono_delivery_time = skb->mono_delivery_time; fq->q.meat += skb->len; fq->ecn |= ecn;add_frag_mem_limit (fq->q.fqdir, skb->truesize);
Signature · 1 line
2.30.2
PATCH v5 8/13 net: ipv6: Get rcv timestamp if needed when handling hop-by-hop IOAM option
In reply to Martin KaFai LauIOAM is a hop-by-hop option with a temporary iana allocation (49). Since it is hop-by-hop, it is done before the input routing decision. One of the traced data field is the (rcv) timestamp.
When the locally generated skb is looping from egress to ingress over a virtual interface (e.g. veth, loopback...), skb->tstamp may have the delivery time before it is known that it will be delivered locally and received by another sk.
Like handling the network tapping (tcpdump) in the earlier patch, this patch gets the timestamp if needed without over-writing the delivery_time in the skb->tstamp. skb_tstamp_cond() is added to do the ktime_get_real() with an extra cond arg to check on top of the netstamp_needed_key static key. skb_tstamp_cond() will also be used in a latter patch and it needs the netstamp_needed_key check.
--- include/linux/skbuff.h | 11 +++++++++++ net/ipv6/ioam6.c | 19 +++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-)
include/linux/skbuff.h +11 -0
@@ -4028,6 +4028,17 @@ static inline ktime_t skb_tstamp(const struct sk_buff *skb)return skb->tstamp; } +static inline ktime_t skb_tstamp_cond (const struct sk_buff *skb,bool cond) +{ +if (!skb->mono_delivery_time && skb->tstamp) +return skb->tstamp; + +if (static_branch_unlikely (&netstamp_needed_key) || cond) +return ktime_get_real (); + +return 0 ; +} +static inline u8 skb_metadata_len (const struct sk_buff *skb) {return skb_shinfo (skb)->meta_len;
net/ipv6/ioam6.c +9 -10
@@ -635,7 +635,8 @@ static void __ioam6_fill_trace_data(struct sk_buff *skb,struct ioam6_schema *sc, u8 sclen, bool is_input) { - struct __kernel_sock_timeval ts; + struct timespec64 ts; +ktime_t tstamp;u64 raw64;u32 raw32;u16 raw16;
@@ -680,10 +681,9 @@ static void __ioam6_fill_trace_data(struct sk_buff *skb,if (!skb->dev) { *(__be32 *)data =cpu_to_be32 (IOAM6_U32_UNAVAILABLE ); }else { -if (!skb->tstamp) -__net_timestamp (skb); + tstamp =skb_tstamp_cond (skb, true); + ts =ktime_to_timespec64 (tstamp); -skb_get_new_timestamp (skb, &ts); *(__be32 *)data =cpu_to_be32 ((u32 )ts.tv_sec); } data +=sizeof (__be32);
@@ -694,13 +694,12 @@ static void __ioam6_fill_trace_data(struct sk_buff *skb,if (!skb->dev) { *(__be32 *)data =cpu_to_be32 (IOAM6_U32_UNAVAILABLE ); }else { -if (!skb->tstamp) -__net_timestamp (skb); +if (!trace->type.bit2) { + tstamp =skb_tstamp_cond (skb, true); + ts =ktime_to_timespec64 (tstamp); + } -if (!trace->type.bit2) -skb_get_new_timestamp (skb, &ts); - - *(__be32 *)data =cpu_to_be32 ((u32 )ts.tv_usec); + *(__be32 *)data =cpu_to_be32 ((u32)(ts.tv_nsec /NSEC_PER_USEC )); } data +=sizeof (__be32); }
Signature · 1 line
2.30.2
PATCH v5 9/13 net: Get rcv tstamp if needed in nfnetlink_{log, queue}.c
In reply to Martin KaFai LauIf skb has the (rcv) timestamp available, nfnetlink_{log, queue}.c logs/outputs it to the userspace. When the locally generated skb is looping from egress to ingress over a virtual interface (e.g. veth, loopback...), skb->tstamp may have the delivery time before it is known that will be delivered locally and received by another sk. Like handling the delivery time in network tapping, use ktime_get_real() to get the (rcv) timestamp. The earlier added helper skb_tstamp_cond() is used to do this. false is passed to the second 'cond' arg such that doing ktime_get_real() or not only depends on the netstamp_needed_key static key.
--- net/netfilter/nfnetlink_log.c | 6 ++++-- net/netfilter/nfnetlink_queue.c | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-)
net/netfilter/nfnetlink_log.c +4 -2
@@ -460,6 +460,7 @@ __build_packet_message(struct nfnl_log_net *log,sk_buff_data_t old_tail = inst->skb->tail;struct sock *sk;const unsigned char *hwhdrp; +ktime_t tstamp; nlh = nfnl_msg_put(inst->skb, 0, 0, nfnl_msg_type(NFNL_SUBSYS_ULOG, NFULNL_MSG_PACKET),
@@ -588,9 +589,10 @@ __build_packet_message(struct nfnl_log_net *log, goto nla_put_failure; } -if (hooknum <=NF_INET_FORWARD && skb->tstamp) { + tstamp =skb_tstamp_cond (skb, false); +if (hooknum <=NF_INET_FORWARD && tstamp) {struct nfulnl_msg_packet_timestamp ts; -struct timespec64 kts =ktime_to_timespec64 (skb->tstamp); +struct timespec64 kts =ktime_to_timespec64 (tstamp); ts.sec =cpu_to_be64 (kts.tv_sec); ts.usec =cpu_to_be64 (kts.tv_nsec /NSEC_PER_USEC );
net/netfilter/nfnetlink_queue.c +5 -3
@@ -392,6 +392,7 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,bool csum_verify;char *secdata =NULL ;u32 seclen =0 ; +ktime_t tstamp; size =nlmsg_total_size (sizeof (struct nfgenmsg )) +nla_total_size (sizeof (struct nfqnl_msg_packet_hdr ))
@@ -407,7 +408,8 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue, +nla_total_size (sizeof (u_int32_t))/* skbinfo */ +nla_total_size (sizeof (u_int32_t));/* cap_len */ -if (entskb->tstamp) + tstamp =skb_tstamp_cond (entskb, false); +if (tstamp) size +=nla_total_size (sizeof (struct nfqnl_msg_packet_timestamp )); size +=nfqnl_get_bridge_size (entry);
@@ -582,9 +584,9 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,if (nfqnl_put_bridge (entry, skb) <0 ) goto nla_put_failure; -if (entry->state.hook <=NF_INET_FORWARD && entskb->tstamp) { +if (entry->state.hook <=NF_INET_FORWARD && tstamp) {struct nfqnl_msg_packet_timestamp ts; -struct timespec64 kts =ktime_to_timespec64 (entskb->tstamp); +struct timespec64 kts =ktime_to_timespec64 (tstamp); ts.sec =cpu_to_be64 (kts.tv_sec); ts.usec =cpu_to_be64 (kts.tv_nsec /NSEC_PER_USEC );
Signature · 1 line
2.30.2
PATCH v5 10/13 net: Postpone skb_clear_delivery_time() until knowing the skb is delivered locally
In reply to Martin KaFai LauThe previous patches handled the delivery_time in the ingress path before the routing decision is made. This patch can postpone clearing delivery_time in a skb until knowing it is delivered locally and also set the (rcv) timestamp if needed. This patch moves the skb_clear_delivery_time() from dev.c to ip_local_deliver_finish() and ip6_input_finish().
--- net/core/dev.c | 8 ++------ net/ipv4/ip_input.c | 1 + net/ipv6/ip6_input.c | 1 + 3 files changed, 4 insertions(+), 6 deletions(-)
net/core/dev.c +2 -6
@@ -5193,10 +5193,8 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, goto out; } -if (skb_skip_tc_classify (skb)) { -skb_clear_delivery_time (skb); +if (skb_skip_tc_classify (skb)) goto skip_classify; - }if (pfmemalloc) goto skip_taps;
@@ -5225,14 +5223,12 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, goto another_round;if (!skb) goto out; -skb_clear_delivery_time (skb);nf_skip_egress (skb, false);if (nf_ingress (skb, &pt_prev, &ret, orig_dev) <0 ) goto out; - } else + }#endif -skb_clear_delivery_time (skb);skb_reset_redirect (skb); skip_classify:if (pfmemalloc && !skb_pfmemalloc_protocol (skb))
net/ipv4/ip_input.c +1 -0
@@ -226,6 +226,7 @@ void ip_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int protocol)static int ip_local_deliver_finish (struct net *net,struct sock *sk,struct sk_buff *skb) { +skb_clear_delivery_time (skb);__skb_pull (skb,skb_network_header_len (skb));rcu_read_lock ();
net/ipv6/ip6_input.c +1 -0
@@ -459,6 +459,7 @@ void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr,static int ip6_input_finish (struct net *net,struct sock *sk,struct sk_buff *skb) { +skb_clear_delivery_time (skb);rcu_read_lock ();ip6_protocol_deliver_rcu (net, skb,0 , false);rcu_read_unlock ();
Signature · 1 line
2.30.2
PATCH v5 11/13 bpf: Keep the (rcv) timestamp behavior for the existing tc-bpf@ingress
In reply to Martin KaFai LauThe current tc-bpf@ingress reads and writes the __sk_buff->tstamp as a (rcv) timestamp which currently could either be 0 (not available) or ktime_get_real(). This patch is to backward compatible with the (rcv) timestamp expectation at ingress. If the skb->tstamp has the delivery_time, the bpf insn rewrite will read 0 for tc-bpf running at ingress as it is not available. When writing at ingress, it will also clear the skb->mono_delivery_time bit.
/* BPF_READ: a = __sk_buff->tstamp */
if (!skb->tc_at_ingress || !skb->mono_delivery_time)
a = skb->tstamp; else a = 0
/* BPF_WRITE: __sk_buff->tstamp = a */
if (skb->tc_at_ingress)
skb->mono_delivery_time = 0;
skb->tstamp = a;
[ A note on the BPF_CGROUP_INET_INGRESS which can also access
skb->tstamp. At that point, the skb is delivered locally and skb_clear_delivery_time() has already been done, so the skb->tstamp will only have the (rcv) timestamp. ]
If the tc-bpf@egress writes 0 to skb->tstamp, the skb->mono_delivery_time has to be cleared also. It could be done together during convert_ctx_access(). However, the latter patch will also expose the skb->mono_delivery_time bit as __sk_buff->delivery_time_type. Changing the delivery_time_type in the background may surprise the user, e.g. the 2nd read on __sk_buff->delivery_time_type may need a READ_ONCE() to avoid compiler optimization. Thus, in expecting the needs in the latter patch, this patch does a check on !skb->tstamp after running the tc-bpf and clears the skb->mono_delivery_time bit if needed. The earlier discussion on v4 [0].
The bpf insn rewrite requires the skb's mono_delivery_time bit and tc_at_ingress bit. They are moved up in sk_buff so that bpf rewrite can be done at a fixed offset. tc_skip_classify is moved together with tc_at_ingress. To get one bit for mono_delivery_time, csum_not_inet is moved down and this bit is currently used by sctp.
[0]: https://lore.kernel.org/bpf/[email protected]/
--- include/linux/skbuff.h | 18 +++++++---- net/core/filter.c | 71 ++++++++++++++++++++++++++++++++++++------ net/sched/act_bpf.c | 2 ++ net/sched/cls_bpf.c | 2 ++ 4 files changed, 77 insertions(+), 16 deletions(-)
include/linux/skbuff.h +12 -6
@@ -941,8 +941,12 @@ struct sk_buff { __u8 vlan_present:1; /* See PKT_VLAN_PRESENT_BIT */ __u8 csum_complete_sw:1; __u8 csum_level:2; - __u8 csum_not_inet:1; __u8 dst_pending_confirm:1; + __u8 mono_delivery_time:1; +#ifdef CONFIG_NET_CLS_ACT + __u8 tc_skip_classify:1; + __u8 tc_at_ingress:1; +#endif #ifdef CONFIG_IPV6_NDISC_NODETYPE __u8 ndisc_nodetype:2;#endif
@@ -953,10 +957,6 @@ struct sk_buff {#ifdef CONFIG_NET_SWITCHDEV __u8 offload_fwd_mark:1; __u8 offload_l3_fwd_mark:1; -#endif -#ifdef CONFIG_NET_CLS_ACT - __u8 tc_skip_classify:1; - __u8 tc_at_ingress:1;#endif __u8 redirected:1;#ifdef CONFIG_NET_REDIRECT
@@ -969,7 +969,7 @@ struct sk_buff { __u8 decrypted:1;#endif __u8 slow_gro:1; - __u8 mono_delivery_time:1; + __u8 csum_not_inet:1;#ifdef CONFIG_NET_SCHED __u16 tc_index;/* traffic control index */
@@ -1047,10 +1047,16 @@ struct sk_buff {/* if you move pkt_vlan_present around you also must adapt these constants */ #ifdef __BIG_ENDIAN_BITFIELD#define PKT_VLAN_PRESENT_BIT 7 +#define TC_AT_INGRESS_MASK (1 << 0) +#define SKB_MONO_DELIVERY_TIME_MASK (1 << 2)#else #define PKT_VLAN_PRESENT_BIT 0 +#define TC_AT_INGRESS_MASK (1 << 7) +#define SKB_MONO_DELIVERY_TIME_MASK (1 << 5)#endif #define PKT_VLAN_PRESENT_OFFSET offsetof(struct sk_buff, __pkt_vlan_present_offset) +#define TC_AT_INGRESS_OFFSET offsetof(struct sk_buff, __pkt_vlan_present_offset) +#define SKB_MONO_DELIVERY_TIME_OFFSET offsetof(struct sk_buff, __pkt_vlan_present_offset)#ifdef __KERNEL__/*
net/core/filter.c +61 -10
84 lines not on this page · raw message
net/sched/act_bpf.c +2 -0
@@ -53,6 +53,8 @@ static int tcf_bpf_act(struct sk_buff *skb, const struct tc_action *act,bpf_compute_data_pointers (skb); filter_res =bpf_prog_run (filter, skb); } +if (unlikely (!skb->tstamp && skb->mono_delivery_time)) + skb->mono_delivery_time =0 ;if (skb_sk_is_prefetched (skb) && filter_res !=TC_ACT_OK )skb_orphan (skb);
net/sched/cls_bpf.c +2 -0
@@ -102,6 +102,8 @@ static int cls_bpf_classify(struct sk_buff *skb, const struct tcf_proto *tp,bpf_compute_data_pointers (skb); filter_res =bpf_prog_run (prog->filter, skb); } +if (unlikely (!skb->tstamp && skb->mono_delivery_time)) + skb->mono_delivery_time =0 ;if (prog->exts_integrated) { res->class =0 ;
Signature · 1 line
2.30.2
PATCH v5 12/13 bpf: Add __sk_buff->delivery_time_type and bpf_skb_set_skb_delivery_time()
In reply to Martin KaFai Lau* __sk_buff->delivery_time_type:
This patch adds __sk_buff->delivery_time_type. It tells if the delivery_time is stored in __sk_buff->tstamp or not.
It will be most useful for ingress to tell if the __sk_buff->tstamp has the (rcv) timestamp or delivery_time. If delivery_time_type is 0 (BPF_SKB_DELIVERY_TIME_NONE), it has the (rcv) timestamp.
Two non-zero types are defined for the delivery_time_type, BPF_SKB_DELIVERY_TIME_MONO and BPF_SKB_DELIVERY_TIME_UNSPEC. For UNSPEC, it can only happen in egress because only mono delivery_time can be forwarded to ingress now. The clock of UNSPEC delivery_time can be deduced from the skb->sk->sk_clockid which is how
the sch_etf doing it also.
* Provide forwarded delivery_time to tc-bpf@ingress:
With the help of the new delivery_time_type, the tc-bpf has a way to tell if the __sk_buff->tstamp has the (rcv) timestamp or the delivery_time. During bpf load time, the verifier will learn if the bpf prog has accessed the new __sk_buff->delivery_time_type. If it does, it means the tc-bpf@ingress is expecting the skb->tstamp could have the delivery_time. The kernel will then read the skb->tstamp as-is during bpf insn rewrite without checking the skb->mono_delivery_time. This is done by adding a new prog->delivery_time_access bit. The same goes for writing skb->tstamp.
* bpf_skb_set_delivery_time():
The bpf_skb_set_delivery_time() helper is added to allow setting both delivery_time and the delivery_time_type at the same time. If the tc-bpf does not need to change the delivery_time_type, it can directly write to the __sk_buff->tstamp as the existing tc-bpf has already been doing. It will be most useful at ingress to change the __sk_buff->tstamp from the (rcv) timestamp to
a mono delivery_time and then bpf_redirect_*().
bpf only has mono clock helper (bpf_ktime_get_ns), and the current known use case is the mono EDT for fq, and only mono delivery time can be kept during forward now, so bpf_skb_set_delivery_time() only supports setting BPF_SKB_DELIVERY_TIME_MONO. It can be extended later when use cases come up and the forwarding path also supports other clock bases.
--- include/linux/filter.h | 3 +- include/uapi/linux/bpf.h | 41 +++++++- net/core/filter.c | 169 ++++++++++++++++++++++++++------- tools/include/uapi/linux/bpf.h | 41 +++++++- 4 files changed, 216 insertions(+), 38 deletions(-)
include/linux/filter.h +2 -1
@@ -572,7 +572,8 @@ struct bpf_prog { has_callchain_buf:1, /* callchain buffer allocated? */ enforce_expected_attach_type:1, /* Enforce expected_attach_type checking at attach time */ call_get_stack:1, /* Do we call bpf_get_stack() or bpf_get_stackid() */ - call_get_func_ip:1; /* Do we call get_func_ip() */ + call_get_func_ip:1, /* Do we call get_func_ip() */ + delivery_time_access:1; /* Accessed __sk_buff->delivery_time_type */enum bpf_prog_type type;/* Type of BPF program */ enum bpf_attach_type expected_attach_type;/* For some prog types */ u32 len;/* Number of filter blocks */
include/uapi/linux/bpf.h +40 -1
65 lines not on this page · raw message
net/core/filter.c +134 -35
230 lines not on this page · raw message
tools/include/uapi/linux/bpf.h +40 -1
65 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH v5 13/13 bpf: selftests: test skb->tstamp in redirect_neigh
In reply to Martin KaFai LauThis patch adds tests on forwarding the delivery_time for the following cases
- tcp/udp + ip4/ip6 + bpf_redirect_neigh
- tcp/udp + ip4/ip6 + ip[6]_forward
- bpf_skb_set_delivery_time
- The old rcv timestamp expectation on tc-bpf@ingress
--- .../selftests/bpf/prog_tests/tc_redirect.c | 434 ++++++++++++++++++ .../selftests/bpf/progs/test_tc_dtime.c | 347 ++++++++++++++ 2 files changed, 781 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/test_tc_dtime.c
tools/testing/selftests/bpf/prog_tests/tc_redirect.c +434 -0
@@ -17,6 +17,8 @@#include <linux/if_tun.h> #include <linux/limits.h> #include <linux/sysctl.h> +#include <linux/time_types.h> +#include <linux/net_tstamp.h> #include <sched.h> #include <stdbool.h> #include <stdio.h>
@@ -29,6 +31,11 @@#include "test_tc_neigh_fib.skel.h" #include "test_tc_neigh.skel.h" #include "test_tc_peer.skel.h" +#include "test_tc_dtime.skel.h" + +#ifndef TCP_TX_DELAY +#define TCP_TX_DELAY 37 +#endif #define NS_SRC "ns_src"#define NS_FWD "ns_fwd"
@@ -61,6 +68,7 @@#define CHK_PROG_PIN_FILE "/sys/fs/bpf/test_tc_chk"#define TIMEOUT_MILLIS 10000 +#define NSEC_PER_SEC 1000000000ULL#define log_err (MSG , ...) \ fprintf(stderr, "(%s:%d: errno: %s) " MSG "\n", \
@@ -440,6 +448,431 @@ static int set_forwarding(bool enable)return 0 ; } +static void rcv_tstamp (int fd,const char *expected,size_t s) +{ +struct __kernel_timespec pkt_ts = {}; +char ctl[CMSG_SPACE (sizeof (pkt_ts))]; +struct timespec now_ts; +struct msghdr msg = {}; +__u64 now_ns, pkt_ns; +struct cmsghdr *cmsg; +struct iovec iov; +char data[32 ]; +int ret; + + iov.iov_base = data; + iov.iov_len =sizeof (data); + msg.msg_iov = &iov; + msg.msg_iovlen =1 ; + msg.msg_control = &ctl; + msg.msg_controllen =sizeof (ctl); + + ret =recvmsg (fd, &msg,0 ); +if (!ASSERT_EQ (ret, s,"recvmsg" )) +return ; +ASSERT_STRNEQ (data, expected, s,"expected rcv data" ); + + cmsg =CMSG_FIRSTHDR (&msg); +if (cmsg && cmsg->cmsg_level ==SOL_SOCKET && + cmsg->cmsg_type ==SO_TIMESTAMPNS_NEW ) +memcpy (&pkt_ts,CMSG_DATA (cmsg),sizeof (pkt_ts)); + + pkt_ns = pkt_ts.tv_sec *NSEC_PER_SEC + pkt_ts.tv_nsec; +ASSERT_NEQ (pkt_ns,0 ,"pkt rcv tstamp" ); + + ret =clock_gettime (CLOCK_REALTIME , &now_ts); +ASSERT_OK (ret,"clock_gettime" ); + now_ns = now_ts.tv_sec *NSEC_PER_SEC + now_ts.tv_nsec; + +if (ASSERT_GE (now_ns, pkt_ns,"check rcv tstamp" )) +ASSERT_LT (now_ns - pkt_ns,5 *NSEC_PER_SEC , +"check rcv tstamp" ); +} + +static void snd_tstamp (int fd,char *b,size_t s) +{ +struct sock_txtime opt = { .clockid =CLOCK_TAI }; +char ctl[CMSG_SPACE (sizeof (__u64))]; +struct timespec now_ts; +struct msghdr msg = {}; +struct cmsghdr *cmsg; +struct iovec iov; +__u64 now_ns; +int ret; + + ret =clock_gettime (CLOCK_TAI , &now_ts); +ASSERT_OK (ret,"clock_get_time(CLOCK_TAI)" ); + now_ns = now_ts.tv_sec *NSEC_PER_SEC + now_ts.tv_nsec; + + iov.iov_base = b; + iov.iov_len = s; + msg.msg_iov = &iov; + msg.msg_iovlen =1 ; + msg.msg_control = &ctl; + msg.msg_controllen =sizeof (ctl); + + cmsg =CMSG_FIRSTHDR (&msg); + cmsg->cmsg_level =SOL_SOCKET ; + cmsg->cmsg_type =SCM_TXTIME ; + cmsg->cmsg_len =CMSG_LEN (sizeof (now_ns)); + *(__u64 *)CMSG_DATA (cmsg) = now_ns; + + ret =setsockopt (fd,SOL_SOCKET ,SO_TXTIME , &opt,sizeof (opt)); +ASSERT_OK (ret,"setsockopt(SO_TXTIME)" ); + + ret =sendmsg (fd, &msg,0 ); +ASSERT_EQ (ret, s,"sendmsg" ); +} + +static void test_inet_dtime (int family,int type,const char *addr,__u16 port) +{ +int opt =1 , accept_fd =-1 , client_fd =-1 , listen_fd, err; +char buf[] ="testing testing" ; +struct nstoken *nstoken; + + nstoken =open_netns (NS_DST ); +if (!ASSERT_OK_PTR (nstoken,"setns dst" )) +return ; + listen_fd =start_server (family, type, addr, port,0 ); +close_netns (nstoken); + +if (!ASSERT_GE (listen_fd,0 ,"listen" )) +return ; + +/* Ensure the kernel puts the (rcv) timestamp for all skb */ + err =setsockopt (listen_fd,SOL_SOCKET ,SO_TIMESTAMPNS_NEW , + &opt,sizeof (opt)); +if (!ASSERT_OK (err,"setsockopt(SO_TIMESTAMPNS_NEW)" )) + goto done; + +if (type ==SOCK_STREAM ) { +/* Ensure the kernel set EDT when sending out rst/ack +* from the kernel's ctl_sk. +*/ + err =setsockopt (listen_fd,SOL_TCP ,TCP_TX_DELAY , &opt, +sizeof (opt)); +if (!ASSERT_OK (err,"setsockopt(TCP_TX_DELAY)" )) + goto done; + } + + nstoken =open_netns (NS_SRC ); +if (!ASSERT_OK_PTR (nstoken,"setns src" )) + goto done; + client_fd =connect_to_fd (listen_fd,TIMEOUT_MILLIS ); +close_netns (nstoken); + +if (!ASSERT_GE (client_fd,0 ,"connect_to_fd" )) + goto done; + +if (type ==SOCK_STREAM ) { +int n; + + accept_fd =accept (listen_fd,NULL ,NULL ); +if (!ASSERT_GE (accept_fd,0 ,"accept" )) + goto done; + + n =write (client_fd, buf,sizeof (buf)); +if (!ASSERT_EQ (n,sizeof (buf),"send to server" )) + goto done; +rcv_tstamp (accept_fd, buf,sizeof (buf)); + }else { +snd_tstamp (client_fd, buf,sizeof (buf)); +rcv_tstamp (listen_fd, buf,sizeof (buf)); + } + +done: +close (listen_fd); +if (accept_fd !=-1 ) +close (accept_fd); +if (client_fd !=-1 ) +close (client_fd); +} + +static int netns_load_dtime_bpf (struct test_tc_dtime *skel) +{ +struct nstoken *nstoken; + +#define PIN_FNAME (__file) "/sys/fs/bpf/" #__file +#define PIN (__prog) ({ \ + int err = bpf_program__pin(skel->progs.__prog, PIN_FNAME(__prog)); \ + if (!ASSERT_OK(err, "pin " #__prog)) \ + goto fail; \ + }) + +/* setup ns_src tc progs */ + nstoken =open_netns (NS_SRC ); +if (!ASSERT_OK_PTR (nstoken,"setns " NS_SRC )) +return -1 ; +PIN (egress_host); +PIN (ingress_host); +SYS ("tc qdisc add dev veth_src clsact" ); +SYS ("tc filter add dev veth_src ingress bpf da object-pinned " +PIN_FNAME (ingress_host)); +SYS ("tc filter add dev veth_src egress bpf da object-pinned " +PIN_FNAME (egress_host)); +close_netns (nstoken); + +/* setup ns_dst tc progs */ + nstoken =open_netns (NS_DST ); +if (!ASSERT_OK_PTR (nstoken,"setns " NS_DST )) +return -1 ; +PIN (egress_host); +PIN (ingress_host); +SYS ("tc qdisc add dev veth_dst clsact" ); +SYS ("tc filter add dev veth_dst ingress bpf da object-pinned " +PIN_FNAME (ingress_host)); +SYS ("tc filter add dev veth_dst egress bpf da object-pinned " +PIN_FNAME (egress_host)); +close_netns (nstoken); + +/* setup ns_fwd tc progs */ + nstoken =open_netns (NS_FWD ); +if (!ASSERT_OK_PTR (nstoken,"setns " NS_FWD )) +return -1 ; +PIN (ingress_fwdns_prio100); +PIN (egress_fwdns_prio100); +PIN (ingress_fwdns_prio101); +PIN (egress_fwdns_prio101); +SYS ("tc qdisc add dev veth_dst_fwd clsact" ); +SYS ("tc filter add dev veth_dst_fwd ingress prio 100 bpf da object-pinned " +PIN_FNAME (ingress_fwdns_prio100)); +SYS ("tc filter add dev veth_dst_fwd ingress prio 101 bpf da object-pinned " +PIN_FNAME (ingress_fwdns_prio101)); +SYS ("tc filter add dev veth_dst_fwd egress prio 100 bpf da object-pinned " +PIN_FNAME (egress_fwdns_prio100)); +SYS ("tc filter add dev veth_dst_fwd egress prio 101 bpf da object-pinned " +PIN_FNAME (egress_fwdns_prio101)); +SYS ("tc qdisc add dev veth_src_fwd clsact" ); +SYS ("tc filter add dev veth_src_fwd ingress prio 100 bpf da object-pinned " +PIN_FNAME (ingress_fwdns_prio100)); +SYS ("tc filter add dev veth_src_fwd ingress prio 101 bpf da object-pinned " +PIN_FNAME (ingress_fwdns_prio101)); +SYS ("tc filter add dev veth_src_fwd egress prio 100 bpf da object-pinned " +PIN_FNAME (egress_fwdns_prio100)); +SYS ("tc filter add dev veth_src_fwd egress prio 101 bpf da object-pinned " +PIN_FNAME (egress_fwdns_prio101)); +close_netns (nstoken); + +#undef PIN + +return 0 ; + +fail: +close_netns (nstoken); +return -1 ; +} + +enum { +INGRESS_FWDNS_P100 , +INGRESS_FWDNS_P101 , +EGRESS_FWDNS_P100 , +EGRESS_FWDNS_P101 , +INGRESS_ENDHOST , +EGRESS_ENDHOST , +SET_DTIME , + __MAX_CNT, +}; + +const char *cnt_names[] = { +"ingress_fwdns_p100" , +"ingress_fwdns_p101" , +"egress_fwdns_p100" , +"egress_fwdns_p101" , +"ingress_endhost" , +"egress_endhost" , +"set_dtime" , +}; + +enum { +TCP_IP6_CLEAR_DTIME , +TCP_IP4 , +TCP_IP6 , +UDP_IP4 , +UDP_IP6 , +TCP_IP4_RT_FWD , +TCP_IP6_RT_FWD , +UDP_IP4_RT_FWD , +UDP_IP6_RT_FWD , +UKN_TEST , + __NR_TESTS, +}; + +const char *test_names[] = { +"tcp ip6 clear dtime" , +"tcp ip4" , +"tcp ip6" , +"udp ip4" , +"udp ip6" , +"tcp ip4 rt fwd" , +"tcp ip6 rt fwd" , +"udp ip4 rt fwd" , +"udp ip6 rt fwd" , +}; + +static const char *dtime_cnt_str (int test,int cnt) +{ +static char name[64 ]; + +snprintf (name,sizeof (name),"%s %s" , test_names[test], cnt_names[cnt]); + +return name; +} + +static const char *dtime_err_str (int test,int cnt) +{ +static char name[64 ]; + +snprintf (name,sizeof (name),"%s %s errs" , test_names[test], + cnt_names[cnt]); + +return name; +} + +static void test_tcp_clear_dtime (struct test_tc_dtime *skel) +{ +int i, t =TCP_IP6_CLEAR_DTIME ; +__u32 *dtimes = skel->bss->dtimes[t]; +__u32 *errs = skel->bss->errs[t]; + + skel->bss->test = t; +test_inet_dtime (AF_INET6 ,SOCK_STREAM ,IP6_DST ,0 ); + +ASSERT_EQ (dtimes[INGRESS_FWDNS_P100 ],0 , +dtime_cnt_str (t,INGRESS_FWDNS_P100 )); +ASSERT_EQ (dtimes[INGRESS_FWDNS_P101 ],0 , +dtime_cnt_str (t,INGRESS_FWDNS_P101 )); +ASSERT_GT (dtimes[EGRESS_FWDNS_P100 ],0 , +dtime_cnt_str (t,EGRESS_FWDNS_P100 )); +ASSERT_EQ (dtimes[EGRESS_FWDNS_P101 ],0 , +dtime_cnt_str (t,EGRESS_FWDNS_P101 )); +ASSERT_GT (dtimes[EGRESS_ENDHOST ],0 , +dtime_cnt_str (t,EGRESS_ENDHOST )); +ASSERT_GT (dtimes[INGRESS_ENDHOST ],0 , +dtime_cnt_str (t,INGRESS_ENDHOST )); + +for (i =INGRESS_FWDNS_P100 ; i < __MAX_CNT; i++) +ASSERT_EQ (errs[i],0 ,dtime_err_str (t, i)); +} + +static void test_tcp_dtime (struct test_tc_dtime *skel,int family,bool bpf_fwd) +{ +__u32 *dtimes, *errs; +const char *addr; +int i, t; + +if (family ==AF_INET ) { + t = bpf_fwd ?TCP_IP4 :TCP_IP4_RT_FWD ; + addr =IP4_DST ; + }else { + t = bpf_fwd ?TCP_IP6 :TCP_IP6_RT_FWD ; + addr =IP6_DST ; + } + + dtimes = skel->bss->dtimes[t]; + errs = skel->bss->errs[t]; + + skel->bss->test = t; +test_inet_dtime (family,SOCK_STREAM , addr,0 ); + +/* fwdns_prio100 prog does not read delivery_time_type, so +* kernel puts the (rcv) timetamp in __sk_buff->tstamp +*/ +ASSERT_EQ (dtimes[INGRESS_FWDNS_P100 ],0 , +dtime_cnt_str (t,INGRESS_FWDNS_P100 )); +for (i =INGRESS_FWDNS_P101 ; i <SET_DTIME ; i++) +ASSERT_GT (dtimes[i],0 ,dtime_cnt_str (t, i)); + +for (i =INGRESS_FWDNS_P100 ; i < __MAX_CNT; i++) +ASSERT_EQ (errs[i],0 ,dtime_err_str (t, i)); +} + +static void test_udp_dtime (struct test_tc_dtime *skel,int family,bool bpf_fwd) +{ +__u32 *dtimes, *errs; +const char *addr; +int i, t; + +if (family ==AF_INET ) { + t = bpf_fwd ?UDP_IP4 :UDP_IP4_RT_FWD ; + addr =IP4_DST ; + }else { + t = bpf_fwd ?UDP_IP6 :UDP_IP6_RT_FWD ; + addr =IP6_DST ; + } + + dtimes = skel->bss->dtimes[t]; + errs = skel->bss->errs[t]; + + skel->bss->test = t; +test_inet_dtime (family,SOCK_DGRAM , addr,0 ); + +ASSERT_EQ (dtimes[INGRESS_FWDNS_P100 ],0 , +dtime_cnt_str (t,INGRESS_FWDNS_P100 )); +/* non mono delivery time is not forwarded */ +ASSERT_EQ (dtimes[INGRESS_FWDNS_P101 ],0 , +dtime_cnt_str (t,INGRESS_FWDNS_P100 )); +for (i =EGRESS_FWDNS_P100 ; i <SET_DTIME ; i++) +ASSERT_GT (dtimes[i],0 ,dtime_cnt_str (t, i)); + +for (i =INGRESS_FWDNS_P100 ; i < __MAX_CNT; i++) +ASSERT_EQ (errs[i],0 ,dtime_err_str (t, i)); +} + +static void test_tc_redirect_dtime (struct netns_setup_result *setup_result) +{ +struct test_tc_dtime *skel; +struct nstoken *nstoken; +int err; + + skel =test_tc_dtime__open (); +if (!ASSERT_OK_PTR (skel,"test_tc_dtime__open" )) +return ; + + skel->rodata->IFINDEX_SRC = setup_result->ifindex_veth_src_fwd; + skel->rodata->IFINDEX_DST = setup_result->ifindex_veth_dst_fwd; + + err =test_tc_dtime__load (skel); +if (!ASSERT_OK (err,"test_tc_dtime__load" )) + goto done; + +if (netns_load_dtime_bpf (skel)) + goto done; + + nstoken =open_netns (NS_FWD ); +if (!ASSERT_OK_PTR (nstoken,"setns fwd" )) + goto done; + err =set_forwarding (false); +close_netns (nstoken); +if (!ASSERT_OK (err,"disable forwarding" )) + goto done; + +test_tcp_clear_dtime (skel); + +test_tcp_dtime (skel,AF_INET , true); +test_tcp_dtime (skel,AF_INET6 , true); +test_udp_dtime (skel,AF_INET , true); +test_udp_dtime (skel,AF_INET6 , true); + +/* Test the kernel ip[6]_forward path instead +* of bpf_redirect_neigh(). +*/ + nstoken =open_netns (NS_FWD ); +if (!ASSERT_OK_PTR (nstoken,"setns fwd" )) + goto done; + err =set_forwarding (true); +close_netns (nstoken); +if (!ASSERT_OK (err,"enable forwarding" )) + goto done; + +test_tcp_dtime (skel,AF_INET , false); +test_tcp_dtime (skel,AF_INET6 , false); +test_udp_dtime (skel,AF_INET , false); +test_udp_dtime (skel,AF_INET6 , false); + +done: +test_tc_dtime__destroy (skel); +} +static void test_tc_redirect_neigh_fib (struct netns_setup_result *setup_result) {struct nstoken *nstoken =NULL ;
@@ -787,6 +1220,7 @@ static void *test_tc_redirect_run_tests(void *arg)RUN_TEST (tc_redirect_peer_l3);RUN_TEST (tc_redirect_neigh);RUN_TEST (tc_redirect_neigh_fib); +RUN_TEST (tc_redirect_dtime);return NULL ; }
tools/testing/selftests/bpf/progs/test_tc_dtime.c new file +347 -0
347 lines not on this page · raw message
Signature · 1 line
2.30.2