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 88BB4803BB for ; Mon, 16 Nov 2026 20:47:21 +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 6AGKk8R0031580; Mon, 16 Nov 2026 23:46:09 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKk8R0031580 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="BHVHBI2v" Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AGKk4DL031559 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 23:46:04 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AGKk4DL031559 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4bb64c99bb8so18328595e9.1 for ; Mon, 16 Nov 2026 12:46:04 -0800 (PST) X-Gm-Message-State: APuU4Z/OxXtgJ+bQyrFD6EybkCf5JdFhgg7Jh2sKNaQG6n6EJ2TdCC/A CHRxA0qGblK6wHLLnsdZYYZjB37xoHIMV2hqKH+S3Xlapg01Vt67Dn1NmfrCaNADJcLYytUuK29 3n2420Vfj81pXgCG0mfkznMBZAvXVS2T55CLsRWzk1nZrjAEYQlg0pA== X-Gm-Gg: AYBFou1uHk8uHdi55A9L+mMj1N+2pTkj/+R4VuxlM2tqe7TsOQIpGSLPB+cZfXrVj27 5wkfHoXUdKcImpejGAP6JF89GhZVVHCWM5skeba+WI2Lbq7DGK0eE72aJEveyaxD5jI/2YVgyQu rLDNSbdF7QD2eePkaOPOjXPbYdQiedHRuDpRniJtXCp6MlK2qxNG1OOYgk25oI4U9Dl/CEB1Eh7 dDRSn1s7FYtr88FNLf942RIt0MKDsvFkq2WaCmCo1+BNqyebg31dDfax4jY/HBEpShLSMpauDwR FcdlAPK3UXsy8aXqveWwaX6eRJk59eYH+X+sbQsEMhKO08LnuovXpyJX10Qa/N0ZuxMgW6YI/HJ 4zeMHD5TU3tBmMPtol2drupUNNA== X-Received: by 2002:a05:600c:8b23:b0:4bb:6f6a:1976 with SMTP id 5b1f17b1804b1-4bb6f6a1e5amr119796315e9.2.1794861963936; Mon, 16 Nov 2026 12:46:03 -0800 (PST) X-Received: by 2002:a05:600c:8b23:b0:4bb:6f6a:1976 with SMTP id 5b1f17b1804b1-4bb6f6a1e5amr119795905e9.2.1794861963413; Mon, 16 Nov 2026 12:46:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794861963; cv=none; d=google.com; s=arc-20260327; b=YKjOuh6Nx79tEwfKKy00/z6/Pj+k8TgmqnSno2XoGp0q5XTavjUHvx4je0ifi2VeEm xbbtH4tUFh3TSS6gcptrVx5KN+a9vBLg8JcXC9pTP8s45n1oO2uGvobylj9Tpqej6+8/ EN6/Dulh/g6BmKhux3Gb+j4R/WlTJjoF4il/FbUMbw/cDr6Aq0VoaRobDPHw4w/1ooXd j3ygOIWrLk840kV23t5nvrU3K6BhFPbsPN36+cHMBXYqrCh3hSxUgUliPhuZUIOWeLuh tnGbs7dahgnU8+TfYwe3puc6T7JAYwUybg90X0BQNSFOj+HXZprCmrsd2AMHRuddaiCi CdUA== 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=iqHvpVYg35zjBs+Xfx8RrCRuz+hwFprGWvwZb/2nVEQ=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=UujficQD764rzY4tjyYFAqOuIbUKoHAYD3U1JAUKeGgfKCQLDokf0fTeFD6h1gUuuG yM0s+snDf+Jjz8Yhrcc6sY+s2UlQpNTX7PjNe+DUiYtCCQa83HJhdNAV1AtaoFd4SJTu 7nn9Fs2Cn4S5nRlGwveBgT782pwsBlkRePrL3i49Vtk6l223ZCSUmb1LwVT63yVtYbwk PX7mdsQDkgkoHeioGmvtNQLyDoSQNtEt8XUl14Y/5lt3mycQASAvC55+PhE4BoTWx5fv OY3l18Qb8twdlHqCfQRuE+qB1bnK+dlnUOND2kKxBtNDRKr3FbPfWSVVhuRNEjFJD40Z EdTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=BHVHBI2v; 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-49c631226f0si22926086f8f.78.2026.11.16.12.46.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 12:46:03 -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=BHVHBI2v; 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=iqHvpVYg35zjBs+Xfx8RrCRuz+hwFprGWvwZb/2nVEQ=; b=BHVHBI2v71aG /f8yKAsW1iXsyWWoTW+4/8N6AynYszIPYnpxiYY/LyE02yVvCorSOX/fpCqGnjrIadBKofrxmZS+9 APn1FkmjJAdEg6XNcjo30hIAiizakAyyyIbKvxYZgSpnPj3DH2RG5P5jzUnrGU9GcLuL5saIHmmNl NUGW8nCdba9g7gboIrQbBWvPphl62pXjJKtfVffHZAyM8LOvdFL3OdxqJGNU/Gul9RIyfL8aWrx33 2dl82G1UD/hM9n6OjJxM3B2AvL4CZ8pwlY2LiG49vtiWUN1X6QB57eb2XLIkMa4x+jbx1dMoKwR5G wqk0WRks6G1nEiE6NlLJzw==; 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 1xT3WF-00BfjZ-1D; Mon, 16 Nov 2026 21:45:54 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 22:05:53 +0200 Message-ID: <20261116204557.718500-2-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> References: <20261116204557.718500-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v3 01/11] 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.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel