Commit 885c36e5 authored by Abhishek Chauhan's avatar Abhishek Chauhan Committed by Paolo Abeni
Browse files

net: Re-use and set mono_delivery_time bit for userspace tstamp packets 



Bridge driver today has no support to forward the userspace timestamp
packets and ends up resetting the timestamp. ETF qdisc checks the
packet coming from userspace and encounters to be 0 thereby dropping
time sensitive packets. These changes will allow userspace timestamps
packets to be forwarded from the bridge to NIC drivers.

Setting the same bit (mono_delivery_time) to avoid dropping of
userspace tstamp packets in the forwarding path.

Existing functionality of mono_delivery_time remains unaltered here,
instead just extended with userspace tstamp support for bridge
forwarding path.

Signed-off-by: default avatarAbhishek Chauhan <quic_abchauha@quicinc.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://lore.kernel.org/r/20240301201348.2815102-1-quic_abchauha@quicinc.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent d35c9659

include/linux/skbuff.h

+3 −3
Original line number Diff line number Diff line
@@ -822,9 +822,9 @@ typedef unsigned char *sk_buff_data_t; 
 *	@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.

 *		delivery_time in mono clock base (i.e., EDT) or a clock base chosen

 *		by SO_TXTIME. If zero, skb->tstamp has the (rcv) timestamp at

 *		ingress.

 *	@napi_id: id of the NAPI struct this skb came from

 *	@sender_cpu: (aka @napi_id) source CPU in XPS

 *	@alloc_cpu: CPU which did the skb allocation.

net/ipv4/ip_output.c

+1 −0
Original line number Diff line number Diff line
@@ -1458,6 +1458,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk, 
	skb->priority = (cork->tos != -1) ? cork->priority: READ_ONCE(sk->sk_priority);

	skb->mark = cork->mark;

	skb->tstamp = cork->transmit_time;

	skb->mono_delivery_time = !!skb->tstamp;

	/*

	 * Steal rt from cork.dst to avoid a pair of atomic_inc/atomic_dec

	 * on dst refcount

net/ipv4/raw.c

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, 
	skb->priority = READ_ONCE(sk->sk_priority);

	skb->mark = sockc->mark;

	skb->tstamp = sockc->transmit_time;

	skb->mono_delivery_time = !!skb->tstamp;

	skb_dst_set(skb, &rt->dst);

	*rtp = NULL;

net/ipv6/ip6_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1925,7 +1925,7 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, 
	skb->priority = READ_ONCE(sk->sk_priority);

	skb->mark = cork->base.mark;

	skb->tstamp = cork->base.transmit_time;



	skb->mono_delivery_time = !!skb->tstamp;

	ip6_cork_steal_dst(skb, cork);

	IP6_INC_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUTREQUESTS);

	if (proto == IPPROTO_ICMPV6) {

net/ipv6/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length, 
	skb->priority = READ_ONCE(sk->sk_priority);

	skb->mark = sockc->mark;

	skb->tstamp = sockc->transmit_time;



	skb->mono_delivery_time = !!skb->tstamp;

	skb_put(skb, length);

	skb_reset_network_header(skb);

	iph = ipv6_hdr(skb);