Revert "net: Re-use and set mono_delivery_time bit for userspace tstamp packets"
authorAbhishek Chauhan <quic_abchauha@quicinc.com>
Thu, 14 Mar 2024 19:24:04 +0000 (12:24 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 18 Mar 2024 12:29:53 +0000 (12:29 +0000)
commit35c3e27917568192927c785fc380f139255468b4
treecea90dc6e4c3226ed8f9a5c6c11bdf9971cba4f7
parentf490c492e946d8ffbe65ad4efc66de3c5ede30a4
Revert "net: Re-use and set mono_delivery_time bit for userspace tstamp packets"

This reverts commit 885c36e59f46375c138de18ff1692f18eff67b7f.

The patch currently broke the bpf selftest test_tc_dtime because
uapi field __sk_buff->tstamp_type depends on skb->mono_delivery_time which
does not necessarily mean mono with the original fix as the bit was re-used
for userspace timestamp as well to avoid tstamp reset in the forwarding
path. To solve this we need to keep mono_delivery_time as is and
introduce another bit called user_delivery_time and fall back to the
initial proposal of setting the user_delivery_time bit based on
sk_clockid set from userspace.

Fixes: 885c36e59f46 ("net: Re-use and set mono_delivery_time bit for userspace tstamp packets")
Link: https://lore.kernel.org/netdev/bc037db4-58bb-4861-ac31-a361a93841d3@linux.dev/
Signed-off-by: Abhishek Chauhan <quic_abchauha@quicinc.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Martin KaFai Lau <martin.lau@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/skbuff.h
net/ipv4/ip_output.c
net/ipv4/raw.c
net/ipv6/ip6_output.c
net/ipv6/raw.c
net/packet/af_packet.c