From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id EBB698139E for ; Fri, 6 Nov 2026 03:04:29 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6A633Fps012736; Fri, 6 Nov 2026 06:03:16 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A633Fps012736 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="pjejEWLo" Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6A63399R012695 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Fri, 6 Nov 2026 06:03:09 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6A63399R012695 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-4901562b819so211873f8f.3 for ; Thu, 05 Nov 2026 19:03:09 -0800 (PST) X-Gm-Message-State: APuU4Z9kunGxQtiCfZGIbrbhGYmyH1Tbj8zncK8757U+IkWF6PbYBaqB QVtQ5xjcs729uz172+0ycLJI7Sq67H2f7hUCed5sQ+gdx+qHCTxUXJbFe99sB7dx/QFQ3CSTgwo iqM7BooGHYQWyaiA+s1rzq/wjtY0jQNOpumSl6TmIGviPgkkdAverKA== X-Gm-Gg: AYBFou0O38VnKf/IIOc0FRw/24S8E9OUFLCfXwTO6F/M/r2HaioMJxJEYrn00x5IZr4 anRhhUVJ2l5hb8XIlr4dTD6ieVNK+oA47DTbTflkVvxnXCoFc8sAh9Jds5vOQUNdjrFTwc1J7bM P7em/EpeWR3Fc7qsk+hV22CIjDyaF4JLvaPu+7Z6N5yT95zzNFHAsb+3PbWkAhe4sQyqvC5clyb tcjMJcbpbByc05IoJ2EY4wqnMXeWTLxkKyI2xzppa68NEhDZTv9gkpEZesr2dX2fv4DhdlqCOuS exqQXswb8OLml/emdBHCpPOkz8bLp/xL3GQeOrx9re/jpAC6HBkIShOHQ1fFxeW9Q17uO7Cv9ie 6uRhnIYcZj7pARkxSJUQbIeN/MA== X-Received: by 2002:a05:6000:2c08:b0:48e:2a6c:153b with SMTP id ffacd0b85a97d-49276f37c3dmr2515759f8f.35.1793934188913; Thu, 05 Nov 2026 19:03:08 -0800 (PST) X-Received: by 2002:a05:6000:2c08:b0:48e:2a6c:153b with SMTP id ffacd0b85a97d-49276f37c3dmr2515731f8f.35.1793934188439; Thu, 05 Nov 2026 19:03:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1793934188; cv=none; d=google.com; s=arc-20260327; b=RNJOkaBzdSk4oBvLed4vrAII/XeNIXR6YL3lCsEymV5AQfnRmEwFLEk4Wq+XrtAm8q ylA2DTUxPzG7UWqq/KNIUcSeHiZvaVCCb2M7l10Eq4vrgV6kwEZm6WGfR+lo/v4ekET7 1H1e145lPVVvM6Eb2Pvpv4BYbJgVxq/jidC26U7J+/2ocbnSoPmnoVHYCYXHSeckGCWc FK+5s900Z8pDWVQSajlukshbEBvRJiXVxeDSv5RYBNDt21tCJyT3Ks1yvMtl8AIZGNYT 9Tr72e19cgIi8MTaY5mVe+jbguJCMUxg0WQhS61I6xFJydgyUBNXDssNIE2XROASHFD1 WHTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=k22Qj8WvksBsYgOdQqezNQkHobgTrMGZg36y8sOeCVI=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=f5o6JnD5lQ5+Wj4J43L4bAqdasnQ5dERJgnkpDtMm9Kp0k+Co+ALLcpOV6y17uYiTQ 5sDbmDx2JKlosBcxdNeN5fIJL7Axmk6/3s5OB0x8d+nOcV+eBdo/42pdMfHFtH6LYNB2 v3hHvJthWix4GOnOXIcL5KSz0OKmyf9A5QapEKO2eGzjnq8mVqbzCUdztDdp2o9c671+ r5N3iGVt+5bT4eESoYo8uB9VH1s+T7j1alOchJ8HYi2doPSvq+iZRopkXtQ1yLnhV9JZ rZu659N+xbl5KQt8Fpyf48Yc6A3MXdHCZjzraLUxy1ebc53VT5a/cOkXDZLdA0vGBBaQ ipKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=pjejEWLo; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-492d8757ea5si1071812f8f.455.2026.11.05.19.03.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2026 19:03:08 -0800 (PST) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=pjejEWLo; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=k22Qj8WvksBsYgOdQqezNQkHobgTrMGZg36y8sOeCVI=; b=pjejEWLoFkwl 9C046UPSFV2uNKTTUQhJXk6J+/m/5Ygm2JxY/FYdUszHcMrs3C3ZcCp7jaIAAjF0JV8O5DWJx3i1l 58U7994B/O/kFTJ9Jo1CB86QBcGPlHHnSBmbmk+BNL53sNVCd955Ad48U4s63PEQt1dzq8HAlnQ4r zDTFO3CCUhJQFoG/vxGtBGDYzpsqrYKFpcvMD0cIM6d59tyc7r/6ZYu79w9KstvQkrNCEa8rgk0Hb 8UXw1jbGoq+3AlMJjwXv9EvKowELZeklk/x+MNZA/yjh8h2qOoNH34vvebcShqh9aMGI+tVhQANKR komx159MnAgYFl6RaWro6w==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xPAAO-00Gfia-39; Fri, 06 Nov 2026 04:03:05 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Fri, 6 Nov 2026 05:02:09 +0200 Message-ID: <20261106030306.16014-2-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261106030306.16014-1-eva.kurchatova@virtuozzo.com> References: <20261106030306.16014-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 1/8] ms/mptcp: fix retransmission loop when csum is enabled X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org From: Paolo Abeni Sashiko noted that retransmission with csum enabled can actually transmit new data, but currently the relevant code does not update accordingly snd_nxt. The may cause incoming ack drop and an endless retransmission loop. Address the issue incrementing snd_nxt as needed. Fixes: 4e14867d5e91 ("mptcp: tune re-injections for csum enabled mode") Cc: stable@vger.kernel.org Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260602-net-mptcp-misc-fixes-7-1-rc7-v2-2-856831229976@kernel.org Signed-off-by: Jakub Kicinski (cherry picked from commit d1918b36edcaed0ec4ef6888b2358c6b1ddcff47) https://virtuozzo.atlassian.net/browse/VSTOR-153491 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e526648a583e..9f1cc648a272 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2666,6 +2666,10 @@ static void __mptcp_retrans(struct sock *sk) msk->bytes_retrans += len; dfrag->already_sent = max(dfrag->already_sent, len); + /* With csum enabled retransmission can send new data. */ + if (after64(dfrag->already_sent + dfrag->data_seq, msk->snd_nxt)) + WRITE_ONCE(msk->snd_nxt, dfrag->already_sent + dfrag->data_seq); + reset_timer: mptcp_check_and_set_pending(sk); -- 2.56.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel