Received-SPF: pass (google.com: domain of linux-kernel+bounces-171206-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 07 May 2024 07:39:28 -0400
From: Willem de Bruijn <willemdebruijn.kernel@gmail.com>
To: Martin KaFai Lau <martin.lau@linux.dev>, 
 Abhishek Chauhan <quic_abchauha@quicinc.com>
Cc: "David S. Miller" <davem@davemloft.net>, 
 Eric Dumazet <edumazet@google.com>, 
 Jakub Kicinski <kuba@kernel.org>, 
 Paolo Abeni <pabeni@redhat.com>, 
 netdev@vger.kernel.org, 
 linux-kernel@vger.kernel.org, 
 Andrew Halaney <ahalaney@redhat.com>, 
 Willem de Bruijn <willemdebruijn.kernel@gmail.com>, 
 Martin KaFai Lau <martin.lau@kernel.org>, 
 Daniel Borkmann <daniel@iogearbox.net>, 
 bpf <bpf@vger.kernel.org>, 
 kernel@quicinc.com
Message-ID: <663a12f089b81_726ea29426@willemb.c.googlers.com.notmuch>
In-Reply-To: <cab0c7ba-90bf-49e2-908d-ecd879160667@linux.dev>
References: <20240504031331.2737365-1-quic_abchauha@quicinc.com>
 <20240504031331.2737365-3-quic_abchauha@quicinc.com>
 <cab0c7ba-90bf-49e2-908d-ecd879160667@linux.dev>
Subject: Re: [RFC PATCH bpf-next v6 2/3] net: Add additional bit to support
 clockid_t timestamp type
Precedence: bulk
Mime-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: 7bit

Martin KaFai Lau wrote:
> On 5/3/24 8:13 PM, Abhishek Chauhan wrote:
> > diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
> > index fe86cadfa85b..c3d852eecb01 100644
> > --- a/net/ipv4/ip_output.c
> > +++ b/net/ipv4/ip_output.c
> > @@ -1457,7 +1457,10 @@ 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;
> > +	if (sk_is_tcp(sk))
> 
> This seems not catching all IPPROTO_TCP case. In particular, the percpu 
> "ipv4_tcp_sk" is SOCK_RAW. sk_is_tcp() is checking SOCK_STREAM:
> 
> void __init tcp_v4_init(void)
> {
> 
> 	/* ... */
> 	res = inet_ctl_sock_create(&sk, PF_INET, SOCK_RAW,
> 				   IPPROTO_TCP, &init_net);
> 
> 	/* ... */
> }
> 
> "while :; do ./test_progs -t tc_redirect/tc_redirect_dtime || break; done" 
> failed pretty often exactly in this case.
> 

Interesting. The TCP stack opens non TCP sockets.

Initializing sk->sk_clockid for this socket should address that.