From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Abeni Subject: Re: [PATCH net-next] sock: correctly test SOCK_TIMESTAMP in sock_recv_ts_and_drops() Date: Sat, 01 Apr 2017 01:36:38 +0200 Message-ID: <1491003398.2572.1.camel@redhat.com> References: <20170330.202924.1023519735753552178.davem@davemloft.net> <1490997565.8750.39.camel@edumazet-glaptop3.roam.corp.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org To: Eric Dumazet , David Miller Return-path: Received: from mx1.redhat.com ([209.132.183.28]:34238 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932868AbdCaXgl (ORCPT ); Fri, 31 Mar 2017 19:36:41 -0400 In-Reply-To: <1490997565.8750.39.camel@edumazet-glaptop3.roam.corp.google.com> Sender: netdev-owner@vger.kernel.org List-ID: On Fri, 2017-03-31 at 14:59 -0700, Eric Dumazet wrote: > From: Eric Dumazet > > It seems the code does not match the intent. > > This broke packetdrill, and probably other programs. > > Fixes: 6c7c98bad488 ("sock: avoid dirtying sk_stamp, if possible") > Signed-off-by: Eric Dumazet > Cc: Paolo Abeni > --- > include/net/sock.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/net/sock.h b/include/net/sock.h > index 8e53158a7d957ea2a480cc449606dca2480b1259..66349e49d468646ce724485bb8e74952825f0d6c 100644 > --- a/include/net/sock.h > +++ b/include/net/sock.h > @@ -2250,7 +2250,7 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk, > > if (sk->sk_flags & FLAGS_TS_OR_DROPS || sk->sk_tsflags & TSFLAGS_ANY) > __sock_recv_ts_and_drops(msg, sk, skb); > - else if (unlikely(sk->sk_flags & SOCK_TIMESTAMP)) > + else if (unlikely(sock_flag(sk, SOCK_TIMESTAMP))) > sk->sk_stamp = skb->tstamp; > else if (unlikely(sk->sk_stamp == SK_DEFAULT_STAMP)) > sk->sk_stamp = 0; > Oh, my bad! Thanks Eric for fixing this. Acked-by: Paolo Abeni