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 44D8A803F6 for ; Tue, 17 Nov 2026 07:47:51 +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 6AH7kdbu004456; Tue, 17 Nov 2026 10:46:39 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AH7kdbu004456 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="NecC1Fw4" Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AH7kUbe004438 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 10:46:30 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AH7kUbe004438 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-4901562b819so4146410f8f.3 for ; Mon, 16 Nov 2026 23:46:30 -0800 (PST) X-Gm-Message-State: APuU4Z8YHq3StH18y23LI/E1NuHGDPT2EEytePWrSktXqn2v26WWnbaR sl5JWGDn2ogGtAyrDHvcfLT9TLOxoiw1mvlN9YMBYy4gSEf7OvsyYl+rH22yN07eqAs3RX5BDPt rQRYIn/rBiTcovsyu9FTzEiX9oniwqrtlYrpCRDGw3NisTyVzRpwc3w== X-Gm-Gg: AYBFou1t2mNN2x/IASgoiY4LBuDo1e/t78qzI/SsXSiyv1cQnpoyFFmXe2A87n0qVFb 0c/OcpGhm4KBsk34qihDBcO7oCH43oFPd//7wofatDxprOpKP14rAl/KTDI8UxC6AxsDppa4du2 ZQaDvdkYNYX8Gs4mtcF5QU6q90oPBEW0KyqKdbunx0nygCGDXItijqTnQqMWDGSQOTW+2ic9YSa T1J46Vcla56hBE3K0PBz6fjkV51gNUPUndATpmZ88/PgyswkzABR+ZIOgtZsYmf2OeY+HGCLK5z 4xWNUb/0K2V6wrjBjdQ7jjctYwoaVtQBYbzAcLq2aAazqa5O3CBpipTeYjaj4f63qTDVU4oH6hu EXsyzB+VXlRnlJ4BDEalQF9e8 X-Received: by 2002:a05:600c:468d:b0:4bb:741d:ea0 with SMTP id 5b1f17b1804b1-4bb741d103amr94672965e9.17.1794901590484; Mon, 16 Nov 2026 23:46:30 -0800 (PST) X-Received: by 2002:a05:600c:468d:b0:4bb:741d:ea0 with SMTP id 5b1f17b1804b1-4bb741d103amr94672365e9.17.1794901589787; Mon, 16 Nov 2026 23:46:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794901589; cv=none; d=google.com; s=arc-20260327; b=bHixGGysLVs0zABnJ9bedbFH+izLrzj1d1Ag8/JpzHKp+XXd5xxtqbkmI77lNZ0zmX ck+iuLA8j78guKgpm3J0/0b99qjP1k+PriQ26LCr6Rm4iUCdQuwv1axap/ByBdWXxcHe +5gaRgzzeY9VNmxurFOCY7ctQmawfGKJaJPLRlLqcSPpUO/+RgR0TQZ9cERjaLQZjPQr kMOqjchLDNWTzAIjz7qecYkkWDWdt8WM6g8wYT9ytDKIkYQhAiPxj7/zT8QrhuF+mtex w+Q5VRdmdk2lSdnGxr+I79LthBS841kk0CW44UESfi+dieHthoCTNkGQKA3E13aXI4QY pz7A== 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=ln5z/wP60C51vcbR90jZsYnjjcCkBaCiCweHPWYUvD8=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=g4O9nW5YIYaSohllD3g1PtlnwY+a/2+VIhRJ8gB0kjhs8kQVZa43Qem/L4R9tylMjG dhh00c5QJP4Dx1d41wfkBehBCHyr6caCBYNe0T9Lq6jqpCKku0GpgsJCFCxxhXLWpYk/ YlvMAAQy6OZE1e4e7NgmMCUPcivAKzaCU5f55/6EYzd+ooSexvEFsPDAM9aB5M2evEYd ghWqsPBgEdhEYUhc/TA9G0EiEeFQf07jwXX9RXcPYH9DniBiV08HwSx2Vs3zxBVK1hxO KMfJMZ2CQb9k+J2XO3RqfdXkXy4EUGhd9HKaKY2pUPyImbZ5+W40TwQIqtskUGtuFg01 KB5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=NecC1Fw4; 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 5b1f17b1804b1-4bb78448736si49848245e9.17.2026.11.16.23.46.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 23:46:29 -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=NecC1Fw4; 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=ln5z/wP60C51vcbR90jZsYnjjcCkBaCiCweHPWYUvD8=; b=NecC1Fw4cI4M plxGU7eqIswvg0OgiJZAmIL9iZUsW4Lq6g1CkgiTTj69EFnEVXzaI5jKCyU7nTNkP+0+oMAfmk5pN Z8uh357WdXTFfujGp/FF3TxuyJADGdPkPIjxnBMqz1r8YRtuL7YyXl3fBoRVOSQ1oDX9dXhLGedcE Fx0LfBv6xnd8Yf36TvcjVminj7zuakNklVPCJqMl8f/QohUS0EeY3KNlPFImbLUS+JcLsbzkHmLA5 QiZ5tHz7Ii+CgxhlFTrBWvBnxPOAHxg3u4MOyHsx3pu7GBi3oBpjp87ey0ZM7uD4Oe9xDltLn8Z3/ yzietfRqbjBgvTPGmc2vfw==; 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 1xTDpN-006Zss-0p; Tue, 17 Nov 2026 08:46:20 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Tue, 17 Nov 2026 09:44:52 +0200 Message-ID: <20261117074627.820727-3-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.1 In-Reply-To: <20261117074627.820727-1-eva.kurchatova@virtuozzo.com> References: <20261117074627.820727-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 2/2] ms/mptcp: avoid dup SUB_CLOSED events after disconnect 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: "Matthieu Baerts (NGI0)" [ Upstream commit 280d654324e33f8e6e3641f76764694c7b64c5db ] In case of subflow disconnect(), which can also happen with the first subflow in case of errors like timeout or reset, mptcp_subflow_ctx_reset will reset most fields from the mptcp_subflow_context structure, including close_event_done. Then, when another subflow is closed, yet another SUB_CLOSED event for the disconnected initial subflow is sent. Because of the previous reset, there are no source address and destination port. A solution is then to also check the subflow's local id: it shouldn't be negative anyway. Another solution would be not to reset subflow->close_event_done at disconnect time, but when reused. But then, probably the whole reset could be done when being reused. Let's not change this logic, similar to TCP with tcp_disconnect(). Fixes: d82809b6c5f2 ("mptcp: avoid duplicated SUB_CLOSED events") Cc: stable@vger.kernel.org Reported-by: Marco Angaroni Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/603 Reviewed-by: Geliang Tang Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20260127-net-mptcp-dup-nl-events-v1-1-7f71e1bc4feb@kernel.org Signed-off-by: Jakub Kicinski [ Adjust context ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 42c44bd729dcb651ee11de48cfde1e0d5ff0d963) https://virtuozzo.atlassian.net/browse/VSTOR-155419 Feature: fix ms/net Signed-off-by: Eva Kurchatova --- net/mptcp/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 62afc750db43..366a4b8167d8 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2472,8 +2472,8 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, void mptcp_close_ssk(struct sock *sk, struct sock *ssk, struct mptcp_subflow_context *subflow) { - /* The first subflow can already be closed and still in the list */ - if (subflow->close_event_done) + /* The first subflow can already be closed or disconnected */ + if (subflow->close_event_done || READ_ONCE(subflow->local_id) < 0) return; subflow->close_event_done = true; -- 2.56.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel