From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37F6EC07E9B for ; Wed, 7 Jul 2021 14:20:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1910E61CBF for ; Wed, 7 Jul 2021 14:20:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232005AbhGGOXb (ORCPT ); Wed, 7 Jul 2021 10:23:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231976AbhGGOX3 (ORCPT ); Wed, 7 Jul 2021 10:23:29 -0400 Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2279C061574; Wed, 7 Jul 2021 07:20:49 -0700 (PDT) Date: Wed, 7 Jul 2021 15:20:43 +0100 From: Sergei Trofimovich To: Eric Dumazet Cc: netdev , Florian Westphal , "David S . Miller" , LKML , Paolo Abeni , Mat Martineau , Jakub Kicinski Subject: Re: [PATCH] net: core: fix SO_TIMESTAMP_* option setting Message-ID: <20210707152043.46e78f45@zn3> In-Reply-To: References: <20210707092731.2499-1-slyfox@gentoo.org> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 7 Jul 2021 14:32:01 +0200 Eric Dumazet wrote: > On Wed, Jul 7, 2021 at 11:27 AM Sergei Trofimovich wrote: > > > > I noticed the problem as a systemd-timesyncd (and ntpsec) sync failures: > > > > systemd-timesyncd[586]: Timed out waiting for reply from ... > > systemd-timesyncd[586]: Invalid packet timestamp. > > > > Bisected it down to commit 371087aa476 > > ("sock: expose so_timestamp options for mptcp"). > > > > The commit should be a no-op but it accidentally reordered option type > > and option value: > > > > +void sock_set_timestamp(struct sock *sk, int optname, bool valbool); > > ... > > - __sock_set_timestamps(sk, valbool, true, true); > > + sock_set_timestamp(sk, valbool, optname); > > > > Tested the fix on systemd-timesyncd. The sync failures went away. > > > > CC: Paolo Abeni > > CC: Florian Westphal > > CC: Mat Martineau > > CC: David S. Miller > > CC: Jakub Kicinski > > CC: Eric Dumazet > > Signed-off-by: Sergei Trofimovich > > --- > > I think this has been fixed five days ago in > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=81b4a0cc7565b08cadd0d02bae3434f127d1d72a Aha, looks good! Thank you! -- Sergei