From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDD5C39FFD for ; Thu, 18 Apr 2024 08:02:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713427336; cv=none; b=Dg0oA0lzwJWalcYq+NAbJLcdK2JUfSf79mf8v6HBKQhEmMtN8xgwXQCUiR0J7LGGPWmGepzyewbGFbn3rzN16E3UPiXkm5DWQIAkwy5a7OF/jn2ZmpwX21HEelL37waCoqtVODHMS9kkOW4lyvin2Jq54uKra/VfRwJzm5+tX1I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713427336; c=relaxed/simple; bh=UmmR1Xh52JNUL+/3eDwA8yNpzbutz25QNgqaJdUTGzc=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=rga2FBaRmSy4poRHlr7SN8zQz4JCB3rN5oXeSsbOHUYPwUcZy4VKzVDRR0Z/AVepLU8Pg7AaC9ZmnmtXsTB6uU9xnlplrDTcDDQKrtV5ddO15qX76Wkn8vQHufd5vF1qW0DMsFmYxjrXpuHPkJT/H3eFB8ekOjvnPMhidXTEPjU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Wey4UsoI; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Wey4UsoI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713427330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=8WM5dpZGRGX5ePgiqZE+BPkTGad8/w+N9VXSrDUr17k=; b=Wey4UsoIfICBuYSjepCas3VSINNvQufQAoYR8kDozP04pwrofWctV5w5xKRH3I7dw9b+kN CZQpEwrleVttI2gq+SXHpz01wcz/Vake6lUNgKkqEJ9zOyawjXLrvdO9SdexU3RTwCSKnX jIjv9TcYjyTRmSpWrTWb7zbcIHF4Xl4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-245-VW8kmCDmNqirkGiyfvXigw-1; Thu, 18 Apr 2024 04:02:08 -0400 X-MC-Unique: VW8kmCDmNqirkGiyfvXigw-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-349c454bd6fso74241f8f.3 for ; Thu, 18 Apr 2024 01:02:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713427327; x=1714032127; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:cc:to:from:subject:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=8WM5dpZGRGX5ePgiqZE+BPkTGad8/w+N9VXSrDUr17k=; b=rbtsy2SWmvd6EgUT6ZcABnaGTgMO1SBHBZ3r8oDint1oLUR0aTexVEz5DqAKXe/CtY JCGfAgUr0x0i4MjrRXBsy6u+81E9T1YCbwQqu7VmnZKc1VLlnOpkXfzRncNr+JCMvrs0 mZrg7igdausR3jCNHihzLbptJ+3ISRHMM8BLmkNVy+lp+vdlf9sy7BlK+4gX0ewMF2qJ T/F3Xqo2Y9pgvxTi04D/F5BdmfxAcRCzqjxnV3BXXkWq6zF5mw+Db1GLX2Ova1JjgJtS rHkZItLLCxzLfUlQW3aNBqUTshZMowxBIS/PVch+DW2qWlNJzQX7HTPcKCxhUjgGo6Al EVXQ== X-Gm-Message-State: AOJu0YypQ6LoNSf4hAx6ZxHgwMP6smuyuR/u79F4u6DqD2BMb/BC+RgW 0JTv9uE8fCh2pzg/iRBgVAeLK2RrUye07L0zELtVh54KCATqvajBWIQCPviExF0iaFOZKiDZEHD 9mFT48J/QI6cr1Du6evsCPv0yb2Tzwd+onHrI0gsk6sopaf0RX6/LKw== X-Received: by 2002:a05:600c:1d16:b0:416:b5f7:7ceb with SMTP id l22-20020a05600c1d1600b00416b5f77cebmr1360009wms.0.1713427327080; Thu, 18 Apr 2024 01:02:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFzoiFve9p/LmnfMsA/6CVOCkcJnP3NFFhUhrXearo13+N66aK/25nlSNlj39oqK1lwa2Wfpg== X-Received: by 2002:a05:600c:1d16:b0:416:b5f7:7ceb with SMTP id l22-20020a05600c1d1600b00416b5f77cebmr1359984wms.0.1713427326706; Thu, 18 Apr 2024 01:02:06 -0700 (PDT) Received: from gerbillo.redhat.com (146-241-236-143.dyn.eolo.it. [146.241.236.143]) by smtp.gmail.com with ESMTPSA id j13-20020a05600c190d00b00418a386c17bsm5546070wmq.12.2024.04.18.01.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 01:02:06 -0700 (PDT) Message-ID: Subject: Re: [PATCH net-next 1/2] tcp: conditionally call ip_icmp_error() from tcp_v4_err() From: Paolo Abeni To: Eric Dumazet , "David S . Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Neal Cardwell , Dragos Tatulea , eric.dumazet@gmail.com, Maciej =?UTF-8?Q?=C5=BBenczykowski?= , Willem de Bruijn , Shachar Kagan Date: Thu, 18 Apr 2024 10:02:04 +0200 In-Reply-To: <20240417165756.2531620-2-edumazet@google.com> References: <20240417165756.2531620-1-edumazet@google.com> <20240417165756.2531620-2-edumazet@google.com> Autocrypt: addr=pabeni@redhat.com; prefer-encrypt=mutual; keydata=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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.4 (3.50.4-1.fc39) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi, On Wed, 2024-04-17 at 16:57 +0000, Eric Dumazet wrote: > Blamed commit claimed in its changelog that the new functionality > was guarded by IP_RECVERR/IPV6_RECVERR : >=20 > Note that applications need to set IP_RECVERR/IPV6_RECVERR option to > enable this feature, and that the error message is only queued > while in SYN_SNT state. >=20 > This was true only for IPv6, because ipv6_icmp_error() has > the following check: >=20 > if (!inet6_test_bit(RECVERR6, sk)) > return; >=20 > Other callers check IP_RECVERR by themselves, it is unclear > if we could factorize these checks in ip_icmp_error() >=20 > For stable backports, I chose to add the missing check in tcp_v4_err() >=20 > We think this missing check was the root cause for commit > 0a8de364ff7a ("tcp: no longer abort SYN_SENT when receiving > some ICMP") breakage, leading to a revert. >=20 > Many thanks to Dragos Tatulea for conducting the investigations. >=20 > As Jakub said : >=20 > The suspicion is that SSH sees the ICMP report on the socket error qu= eue > and tries to connect() again, but due to the patch the socket isn't > disconnected, so it gets EALREADY, and throws its hands up... >=20 > The error bubbles up to Vagrant which also becomes unhappy. >=20 > Can we skip the call to ip_icmp_error() for non-fatal ICMP errors? >=20 > Fixes: 45af29ca761c ("tcp: allow traceroute -Mtcp for unpriv users") > Signed-off-by: Eric Dumazet > Tested-by: Dragos Tatulea > Cc: Dragos Tatulea > Cc: Maciej =C5=BBenczykowski > Cc: Willem de Bruijn > Cc: Neal Cardwell > Cc: Shachar Kagan > --- > net/ipv4/tcp_ipv4.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c > index 88c83ac4212957f19efad0f967952d2502bdbc7f..a717db99972d977a64178d7ed= 1109325d64a6d51 100644 > --- a/net/ipv4/tcp_ipv4.c > +++ b/net/ipv4/tcp_ipv4.c > @@ -602,7 +602,8 @@ int tcp_v4_err(struct sk_buff *skb, u32 info) > if (fastopen && !fastopen->sk) > break; > =20 > - ip_icmp_error(sk, skb, err, th->dest, info, (u8 *)th); > + if (inet_test_bit(RECVERR, sk)) > + ip_icmp_error(sk, skb, err, th->dest, info, (u8 *)th); > =20 > if (!sock_owned_by_user(sk)) { > WRITE_ONCE(sk->sk_err, err); We have a fcnal-test.sh self-test failure: https://netdev.bots.linux.dev/contest.html?branch=3Dnet-next-2024-04-18--06= -00&test=3Dfcnal-test-sh that I suspect are related to this patch (or the following one): the test case creates a TCP connection on loopback and this is the only patchseries touching the related code, included in the relevant patch burst. Could you please have a look? Thanks! Paolo