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 9B5C8803F7 for ; Mon, 16 Nov 2026 03:53:27 +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 6AG3qE0A019250; Mon, 16 Nov 2026 06:52:15 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qE0A019250 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="RW8kXi5K" 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 6AG3qA6e019204 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Mon, 16 Nov 2026 06:52:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AG3qA6e019204 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-48e0ef019a4so1991706f8f.3 for ; Sun, 15 Nov 2026 19:52:10 -0800 (PST) X-Gm-Message-State: APuU4Z80DIOJE8c4oPYOpQSComy3LisQ38xl5gRox00iIeabh+H1Ov52 YHh26RW+6vH1VSz2X+NwMisOLY7wTtVW4SEW4D0peofA8cj8LrVH1EWVHmXIqNBhS0knfmihyri 1Mn0hyAoVR1kO6NWFhyyYFdxax2VP83cnYta5oHGE5Wp3LYxT9PAsMg== X-Gm-Gg: AYBFou1D3lC/I9V5PENhsphea1ekDiMx43RemNE4ExPHx5HVMhNogbDE8fhhRmf9cmJ Ov5hQl7pk6r5fyh37Is/Pn5Cb1W1jHUW2notadl3zjEGvdu6ZEtEcVkG0yXdvyc0MKH6mOLqdkg 9W+d6MPd5zPQBtsCd2Kyg1Q/vnERgCDLGVr0UyvqWlA1R/58t3etCcgNJfe0KP8qOBsstcDbDce 59QUzXgvvEmuUCWnTlXE0KpMhN2viDpR7qqvTK7YZ+ka2836J+b5qeyou+d4g85plNeLm84HOL8 oXIOu31e6utEBBcz3Nnc1CylkeoyoHIjm7xFEwpzR7ofoUohwAEcA2cOFdN1ipnm0Gjl2EfTOpo gQhvcm8NXlAWFGIwByS7BEcG8bA== X-Received: by 2002:a05:6000:601:b0:48e:2bf4:e7f1 with SMTP id ffacd0b85a97d-49c72212179mr20870053f8f.39.1794801130550; Sun, 15 Nov 2026 19:52:10 -0800 (PST) X-Received: by 2002:a05:6000:601:b0:48e:2bf4:e7f1 with SMTP id ffacd0b85a97d-49c72212179mr20870027f8f.39.1794801130017; Sun, 15 Nov 2026 19:52:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794801130; cv=none; d=google.com; s=arc-20260327; b=FiNCsIsTXbhLqDt9/fYO3WG8ASgNVehogcKCZf6gYCrbsc1uAgVVvvwnNdSj9r1790 ML6/z4Amf5hsrdYVjJCodGblcnur83jPXCnBDGz3Xr8Jf8IF98ETu+VWZ8Rzgpa2R+n6 dB5TJ05Is8yD7xqzI9GQXeELEEwMGhuOvZOw92CCyBKgOdItbDaNTBHapCFnJDf/F1Ul 4ljumg82F1D+xwxjkbPXfpfDCpMZ0q4/ZZmmFX1BB7KWtPNB/a0g/6SJwH66Ax1Kx30f yxPgdN1XO3CMAFzyUKlZTU99jrHOiRG755x1MCe6vU5WbzQLQr8XRPmA/nbw87j6lALm gIiA== 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=mFUHPY/ylZjhBViD4mPd5dsvF3TDplleWxsjjLcG+8nKGHMKMwWzMpl1gtNWs6/VI6 QKKnvWrjABFfZiMZ88UgHczstGqCGv5XpCPIllL0V67PStWoVvy9gNJERopZT8vHr6Lr s1uXJw1UsD25CSn7Z2X8yAQuKhHrlUcFS08TW4LBq9Ewp4OO8ssoRuusYRm8A3pC8Ee2 u0YjLJ1RfkVXus/trAgl5n1htm74n6/XHpwbQ0XbmDiLMvcxlzDHIXXGn7bYxjWCS1mx GRFO4FfjVT5J5eZFZvoAPGSOgq8tOJ8fXCyyxhDcMf3R0eYDl3jqbikmzBklHKULSrW4 Pp+Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=RW8kXi5K; 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-49c6454b4ddsi20276558f8f.331.2026.11.15.19.52.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 19:52:10 -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=RW8kXi5K; 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=RW8kXi5KL7Ur LFfLI+Lg0JCTqnvs58rRyQ0VgpTsjqHgO+ziVFlGgrnQxYNxog4WdacAehrqvCjsFj/H7qolQLQJm er4JpIrhdBWxaLd5Hh4y2K7sbbc2ElVDs/COu6rBqZlYfMglN6YfMMNYQ4eExTEKUEqwcFCr1c80C HYymrqXn5aR5iXkLBkKgZUffVr/gWJETOHZJv8YmL06FX0m8Sc3mZbXyUiA7jYIJxubAHtockZlAW /1f6huIggI9DzTGnYhDytl3ZasJrEiaVjWQjCBTilhoTKbVZ9QpYYOqNC7yWvseoLYsNi3SuMRqGL DVtv6volna8fULMxEim+ew==; 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 1xSnh5-00A3ol-16; Mon, 16 Nov 2026 04:52:02 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Mon, 16 Nov 2026 05:49:08 +0200 Message-ID: <20261116035204.564416-2-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> References: <20261116035204.564416-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 01/10] 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