Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp5510382pxv; Wed, 7 Jul 2021 05:36:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMgcMKdla1Vk5BCJgnkqLTK8zyexVeIB69joabOMzPxH6lhjWji7PeGP/7V6qFsMVOc/0B X-Received: by 2002:a02:b388:: with SMTP id p8mr21310171jan.88.1625661373705; Wed, 07 Jul 2021 05:36:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625661373; cv=none; d=google.com; s=arc-20160816; b=1FjNzKo1/CsGMV3FFzZnl4zRWwNIIQeA2SG8VyHLDyqozkgqyFcQImX+Tg5DTvc3PI OfuWR/wley93M48qKM5qC8upG2xLg4ixse38BTgJRubtJ/z5ZapRDd7AUjMD0pKNefeR 6bfeWH4UHmGQ6BCJ8bZ5hnf+Rw5EyT/FohcBBFPK/FuDuZG501mEBQYYw8/zVxv+06rX 7txfC7fyIsdjgubfHObaJAhIH2KCi2wtjEefvGarx8cXGiVP7fUCAPgRU8z2EXMNbkfW CQfelLKp+voWAg3dI6NMW0962f85qS2CaT7a76dBAGQQDhif8Z/nao4shWqF4vFnTcaP m2Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=0o/tc3UWp4uEa8O3pP1dD613UEK3mpfOAPKmpdjDsI8=; b=g+IrLB/Rs+V4F7ToiyqLtfGcYDXAvVIaRJhe5KcQQ0dUFwe9nw7Cx3Weu4HnO0RGBE GzDishCk3rOM3YSOkE1h7pazwtFR1IaiRZeZAmjVWVTE5NDd5ZlxOTrsh3qb3ygyh1aS czUiPpvncp0FIeyBtjkQ/rW3VCM54DcL7wtTbINNBW2TICaVwxvG2uJmifYidyBQBHD9 0NYuPteFf+spMcXPB1S7VbpFJPJVHFvJ6OKu5d1uyqCaTYewmQrjvj5r+Tgys/N1j2nD TnPDqeN6FwRJMvYgHZrdvPnbT2LOV2PPuLHmC9vvCx6FVTPjKNI91WfF4gJdgf7LKzNp mhNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ACgWk2Nr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i26si20360846iol.73.2021.07.07.05.36.01; Wed, 07 Jul 2021 05:36:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=ACgWk2Nr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231616AbhGGMhF (ORCPT + 99 others); Wed, 7 Jul 2021 08:37:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231791AbhGGMg4 (ORCPT ); Wed, 7 Jul 2021 08:36:56 -0400 Received: from mail-yb1-xb2c.google.com (mail-yb1-xb2c.google.com [IPv6:2607:f8b0:4864:20::b2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E50A3C061760 for ; Wed, 7 Jul 2021 05:32:13 -0700 (PDT) Received: by mail-yb1-xb2c.google.com with SMTP id g19so2837430ybe.11 for ; Wed, 07 Jul 2021 05:32:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0o/tc3UWp4uEa8O3pP1dD613UEK3mpfOAPKmpdjDsI8=; b=ACgWk2NrZg9VaCj/FjYB5IGKNNpBZ/D8CrXxoAuoXJE79u/wdmv/S6N0AcTSbUkuw8 y+YZIzfW5lkZSWcQxk9Kq6nK5DnNcw0Za6syZOwIZ5RC6LIYWw/1k4xDvxuHuh56KB2z XarNb6nSoAOEDRaUIcYF8qJ3hL9n7INu5oh0/9IdbVStq5sBnWJgDX8nKJKxF26SVill Lji61Kn31sJgKiHxOjtAE9XGXXRonBnZJqMFv2t3frcIY77f+31WlvetD7c/O33Q/umb 1A0KfUCBa9RY4i5ZML+9fMKfYdH8764vwUsbQPBnLstZOPjvpI0FSdY5k9biTlYKG5ea z0Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0o/tc3UWp4uEa8O3pP1dD613UEK3mpfOAPKmpdjDsI8=; b=Yzu1j68Oz5Ms7tV7c3p9bFL0hZp/7hiMHpizvED4vns2Gd6nS7nAipdYRpRFzueeQi oT6aHQ8Mf/gUPirRjuH6bXLwLb7gGmY8VpDI0AUqe8dSnJfkx4QMPFcyFzoRdBWmiuOT tOEeYKml2CxutLT71rhLPOqQSTlxeJUolAI8+KyK/uOsBbgFc1OEQfI86HqIiu8OIvds 11CMqtFjHWmczWDEEJCYZRCXIWgNd/aDKKolL0kCz5xrK2mr+tQRX7rsOQwGB2ueHN2d +1B+kp+oe78rVVnGzrau3E7KDw07u9SqfzNdIkNFlNTdHD7Cixlelf7OvJ2ERXGow9TN iSqA== X-Gm-Message-State: AOAM531CPlWoHbtiYsXp3adK+4sqdCNAYCume40KjokzrzsKP+RepItb tQ6QBhygRBbKB1BNEQOOVO9eO4LUR5UdJrg+krlwgw== X-Received: by 2002:a05:6902:4e2:: with SMTP id w2mr33237227ybs.132.1625661132215; Wed, 07 Jul 2021 05:32:12 -0700 (PDT) MIME-Version: 1.0 References: <20210707092731.2499-1-slyfox@gentoo.org> In-Reply-To: <20210707092731.2499-1-slyfox@gentoo.org> From: Eric Dumazet Date: Wed, 7 Jul 2021 14:32:01 +0200 Message-ID: Subject: Re: [PATCH] net: core: fix SO_TIMESTAMP_* option setting To: Sergei Trofimovich Cc: netdev , Florian Westphal , "David S . Miller" , LKML , Paolo Abeni , Mat Martineau , Jakub Kicinski Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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