Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1382597iob; Wed, 4 May 2022 23:08:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0R8rauQQLmueOg1jlvCvCczemwPHj6Oxhn8mA1EdlRodqOh0kyq+AQs58uEev8NorO1BU X-Received: by 2002:a05:6a00:114b:b0:4f7:915:3ec3 with SMTP id b11-20020a056a00114b00b004f709153ec3mr24870555pfm.8.1651730928341; Wed, 04 May 2022 23:08:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651730928; cv=none; d=google.com; s=arc-20160816; b=M36YRtGZ6csWzj5kwsuNN0NxiI9YG3N74v3w6rRARZJUjLMLjlzY2Xx6bqXTH26wuh oXLSA6qOpNmQ6MNMZk2W53mjdUxaChDefDWsXXYjShsh5Rc5MNHLkfBCOSVD6uutAmpg D32DEuQ2J5OpSkDm93LNrzAwbwwxi4vmYgnOwqsutMPkcMVJkrQh7p1mA0xuu0tHL6p3 h0K0LUNIYpSevEH/tek9Z8xtnyBYU95XoIxa+sLR0mcGors2tuXDRGvUhbL7wypN1F7D L1YfGICHdiAWfh+PsNq6n4wCQtfJPGeikaotBDAcuTWuEKEFYP9fgmXOv+H17TpraujN NwqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qzCFPlRrPpdJdtAK+hF85M2rZDt7dBu/K2TWsglqWgM=; b=RZ3gXKFEQkXXID0io0sOV10Iz5m3D15XtmYhQe/o+DVCGoVVmHLjkGKYLmoxyK2oWY Aot3nK+/EsAlZe/5+xLJ0ytgD24aCXLs6Asgq+Q8nBKIsxWfGQ58w9NHSehg9t3Qd5t/ JBI7b/kYV5njKgcIGWw6LYkEOeTzVaNoM1O5lfO/yXxtpM/x4dsoZCWei+zqjXAx82Le DVNUGz9uEbQSmWHi2NjBt2AP3MGGR8b+QHxH6nDtzT0WdOb7qN1Gnv/pwtW18G9ISCNu ACX+41sGi1S/H/HighLeBQdEKHkPd3sF7S+OVyAgZkoPWSWffKlqnwKs2urNMhN+fvJo MloQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ffouwe6s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s3-20020a17090b070300b001cd5ffccabbsi897652pjz.148.2022.05.04.23.08.33; Wed, 04 May 2022 23:08:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ffouwe6s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343709AbiEDRs2 (ORCPT + 99 others); Wed, 4 May 2022 13:48:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357306AbiEDRO6 (ORCPT ); Wed, 4 May 2022 13:14:58 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B4CE4BBA8; Wed, 4 May 2022 09:58:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C73B5B827AD; Wed, 4 May 2022 16:58:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64699C385B0; Wed, 4 May 2022 16:58:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683497; bh=6Qm773bFft6WIk5/8XpRI5B+8Ixq/DSQYma6AF5aifw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ffouwe6sMsHUIznXAmzZ15h2rIkxKMDD8CkpIzOrnzzBtZpjm2/FoFD9PGOySYNuc YdTjRlnkHY2qtIS/skV5R3qqW3sDExlrSOr5eEN1GzZTv+Km63AKpNEJRl6KZ5houl hNOh7Nyc4uaouXvUi61H0jtWOm+rsRwZInkWUZLY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pengcheng Yang , Neal Cardwell , Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.17 155/225] tcp: fix F-RTO may not work correctly when receiving DSACK Date: Wed, 4 May 2022 18:46:33 +0200 Message-Id: <20220504153123.898291430@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pengcheng Yang [ Upstream commit d9157f6806d1499e173770df1f1b234763de5c79 ] Currently DSACK is regarded as a dupack, which may cause F-RTO to incorrectly enter "loss was real" when receiving DSACK. Packetdrill to demonstrate: // Enable F-RTO and TLP 0 `sysctl -q net.ipv4.tcp_frto=2` 0 `sysctl -q net.ipv4.tcp_early_retrans=3` 0 `sysctl -q net.ipv4.tcp_congestion_control=cubic` // Establish a connection +0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3 +0 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0 +0 bind(3, ..., ...) = 0 +0 listen(3, 1) = 0 // RTT 10ms, RTO 210ms +.1 < S 0:0(0) win 32792 +0 > S. 0:0(0) ack 1 <...> +.01 < . 1:1(0) ack 1 win 257 +0 accept(3, ..., ...) = 4 // Send 2 data segments +0 write(4, ..., 2000) = 2000 +0 > P. 1:2001(2000) ack 1 // TLP +.022 > P. 1001:2001(1000) ack 1 // Continue to send 8 data segments +0 write(4, ..., 10000) = 10000 +0 > P. 2001:10001(8000) ack 1 // RTO +.188 > . 1:1001(1000) ack 1 // The original data is acked and new data is sent(F-RTO step 2.b) +0 < . 1:1(0) ack 2001 win 257 +0 > P. 10001:12001(2000) ack 1 // D-SACK caused by TLP is regarded as a dupack, this results in // the incorrect judgment of "loss was real"(F-RTO step 3.a) +.022 < . 1:1(0) ack 2001 win 257 // Never-retransmitted data(3001:4001) are acked and // expect to switch to open state(F-RTO step 3.b) +0 < . 1:1(0) ack 4001 win 257 +0 %{ assert tcpi_ca_state == 0, tcpi_ca_state }% Fixes: e33099f96d99 ("tcp: implement RFC5682 F-RTO") Signed-off-by: Pengcheng Yang Acked-by: Neal Cardwell Tested-by: Neal Cardwell Reviewed-by: Eric Dumazet Link: https://lore.kernel.org/r/1650967419-2150-1-git-send-email-yangpc@wangsu.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv4/tcp_input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 525bf37c0fdb..7bf84ce34d9e 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3867,7 +3867,8 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) tcp_process_tlp_ack(sk, ack, flag); if (tcp_ack_is_dubious(sk, flag)) { - if (!(flag & (FLAG_SND_UNA_ADVANCED | FLAG_NOT_DUP))) { + if (!(flag & (FLAG_SND_UNA_ADVANCED | + FLAG_NOT_DUP | FLAG_DSACKING_ACK))) { num_dupack = 1; /* Consider if pure acks were aggregated in tcp_add_backlog() */ if (!(flag & FLAG_DATA)) -- 2.35.1