From patchwork Mon Aug 7 13:45:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Menglong Dong X-Patchwork-Id: 132069 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1486949vqr; Mon, 7 Aug 2023 07:23:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE/7Pd1iDq0jMvVsbYuA2tRs3/eaFNJMUxNTEuFhrSOQCidwN55mx/7NCRRN+yMOQb46ybt X-Received: by 2002:a17:906:7490:b0:993:f744:d230 with SMTP id e16-20020a170906749000b00993f744d230mr8312030ejl.16.1691418204163; Mon, 07 Aug 2023 07:23:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691418204; cv=none; d=google.com; s=arc-20160816; b=ZtH07HU9HgFKEFqtBkl19BjPW+nzyJUVLOZs7Y8rHAw/0aWFobU6YvqVSqZZXyKlZ6 T/0M3HJvNh6+wdqM1Q6fnC3oglDULSj+m0mo3wHMKUNGTMq2A5WmWRY5k8LICfqOp4l4 z1kx4zq4DXBXCe45sahjmRODQ2idbUMNS6fhCkyaNSZ2uqHPbb1JQFSrGTh1RwbGNSI0 GJWbn2F+NBNbpzf/Y8gYJe6JVinits1nn4P/MauOu/tFbqXp/cHeGsXDdTZx4tzQNYXf hGAAlmKKBmcObVeEEUWnF3HDqHCyRZSTB76C2rY03oHVW9xqkYsd6dD4BPUm21xCA2iU VPEQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ujZiVs9WYzU9nGaUspRh3pJHwz3VwVmUv7LZdW5BRhE=; fh=gMFH2stvrvmy061Sc0HEKF4vM70SocLRgs9YiwvSocI=; b=pjrpcN8PQwEaKO+Dra3xieM9s3k0sXDYSCD0FgbxUZXpf43PhOcSVKKyiw7V8GyitX /YMkixa0F4Qwwp3Cni0P9PUk8K+ddV8JOc8XIsx8WfLq80wQOBaFDBx51DpmKuEOSPsM YcOA3muwjO5kyO9T2ri5twJwjvu5/ubuRa4YiQUk3osW++Xeb4brXMGJdbcJbWgi+Uwt ZS9LLsjDfvzokl2jfr1yCfNOClATIBj9jq0t+exaA3e5Trw3RV1yq+3zuQnYPphpXN1G 2sQJ3eS9gRinYLxmwB3QCCc0digkniyhEiE0cQK600Ex+E8TQtTZHToyiu2rcotq4cAz 1Kzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="QiU/70y8"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i17-20020a170906091100b0099bc9896c74si6082448ejd.175.2023.08.07.07.23.00; Mon, 07 Aug 2023 07:23:24 -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=@gmail.com header.s=20221208 header.b="QiU/70y8"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233762AbjHGNrY (ORCPT + 99 others); Mon, 7 Aug 2023 09:47:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233014AbjHGNrT (ORCPT ); Mon, 7 Aug 2023 09:47:19 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F60A10D5; Mon, 7 Aug 2023 06:47:18 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id d9443c01a7336-1bbd03cb7c1so28376995ad.3; Mon, 07 Aug 2023 06:47:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691416037; x=1692020837; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ujZiVs9WYzU9nGaUspRh3pJHwz3VwVmUv7LZdW5BRhE=; b=QiU/70y8hV0yRGawTxx8X4WMJJJ6A8PQ/M+j1eP1xpUj2WI6TkxhC9NoGqo2Yc1ly1 MyFyd/zy5EHwdxAhxKYiM/rZ43ZctBXvSijSH4Y264vd8QyoMisSzrBBuOxug/okDsG6 MVG8gX1VYvds4lLcWKZZsQvxHXuI0RijwimGg0uAXi8Cb4OWIgf/s/weRONZ0F8hL/UZ Y/9xbPyR9418eLrcia8NaCFYu2VwzpKkKWxBCLHWahB4dyQupl2pSl3bQLipvXu7Wksb 8P9JEQMf4N2P8/CnIzaAwY7GGMYhER/I7ie+8WtTQ9FBtClII7che7vCP/T9ttpF3eyz zMqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691416037; x=1692020837; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ujZiVs9WYzU9nGaUspRh3pJHwz3VwVmUv7LZdW5BRhE=; b=OvRiq/YXP7H81Svv9Om+qQXUpOm8fZ+/5DMRRQAkor4kqRkBjfNMU/MXIryK1R1+bf LuQ8JUT+pRhbn2JpOSYTltYEe80P4YywOVGdUnSDfs5/t+CKJ5y5r/LEeQK/MZx/P7nH h8PBUNAmUQgCticlexzKKJctY/pSeRfWMiTt2YKW4ZTJiaX0wDLWGG5wmn3wPZc2JUap Rj3dz8MV9s4q58IfIqvdd3fGqY9uMiw66Vb4QoIj2Li2eQpIgCiEwqYn3WuTvgzO8zkO jV1LucpJzDqUoGjK4GxY+E1Hmm7UHrPPaH8cxtRN5JMryxj/+hm/gT10FuIjH+oyhir0 OfLA== X-Gm-Message-State: AOJu0Yy81832ttY8/itMj2JfQqs23L6T1ZOxL7cZgB2kPVQVv602rJqn nAG5Y1fgzLI8gQCAvm9MqeA= X-Received: by 2002:a17:902:dad2:b0:1b6:6c32:59a8 with SMTP id q18-20020a170902dad200b001b66c3259a8mr7472543plx.36.1691416037440; Mon, 07 Aug 2023 06:47:17 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.23]) by smtp.gmail.com with ESMTPSA id h2-20020a170902704200b001b54a88e4a6sm6912097plt.51.2023.08.07.06.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 06:47:16 -0700 (PDT) From: menglong8.dong@gmail.com X-Google-Original-From: imagedong@tencent.com To: edumazet@google.com, ncardwell@google.com Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, dsahern@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Menglong Dong Subject: [PATCH net-next v2 2/3] net: tcp: allow zero-window ACK update the window Date: Mon, 7 Aug 2023 21:45:46 +0800 Message-Id: <20230807134547.2782227-3-imagedong@tencent.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230807134547.2782227-1-imagedong@tencent.com> References: <20230807134547.2782227-1-imagedong@tencent.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773580534638058880 X-GMAIL-MSGID: 1773580534638058880 From: Menglong Dong Fow now, an ACK can update the window in following case, according to the tcp_may_update_window(): 1. the ACK acknowledged new data 2. the ACK has new data 3. the ACK expand the window and the seq of it is valid Now, we allow the ACK update the window if the window is 0, and the seq/ack of it is valid. This is for the case that the receiver replies an zero-window ACK when it is under memory stress and can't queue the new data. Signed-off-by: Menglong Dong --- net/ipv4/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index aae485d0a3b6..f17cca362086 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3525,7 +3525,7 @@ static inline bool tcp_may_update_window(const struct tcp_sock *tp, { return after(ack, tp->snd_una) || after(ack_seq, tp->snd_wl1) || - (ack_seq == tp->snd_wl1 && nwin > tp->snd_wnd); + (ack_seq == tp->snd_wl1 && (nwin > tp->snd_wnd || !nwin)); } /* If we update tp->snd_una, also update tp->bytes_acked */