Received: by 2002:ab2:6309:0:b0:1fb:d597:ff75 with SMTP id s9csp1103213lqt; Fri, 7 Jun 2024 08:06:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV9YKFdIEu6nYAIvm001b9q75kHFe3NOdrZ1WP/m9aZG5cZ2aPlmilW2XSz7f2EzBIARfOfwDkSp3GTSY9WT7D4Z+Dn8fhAR07GNvw9GA== X-Google-Smtp-Source: AGHT+IF5p1dxImtAJEnIbmiI2atz3geNoVfUjZNv2mZsD1yyvVldNDgkTEV45t6VRqZnsGHO6DLy X-Received: by 2002:a1f:7d4e:0:b0:4ea:ede1:ab15 with SMTP id 71dfb90a1353d-4eb562cd389mr2730214e0c.15.1717772789347; Fri, 07 Jun 2024 08:06:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717772789; cv=pass; d=google.com; s=arc-20160816; b=lzNDeGT2p/MROuDmU+pLf1qNsm4JTHesMwqExdN4ZhJIwCPd91b73yAsf4G/BxcxWr O+q9HrlxRhavWNLFCFeQMs2nP7VBSsJ+A4dKV1VcMPwPiRrtVfSFrkiKmHwpFR2xhtdf s0F0BXJMW8QNEozW8O6rQ0thjDWvnlIymN1u9e5I3kE+O9l2rhGRZJ7C2OteoRLgzUQ3 GRkZLSXcSWY7+E9WWZzhuhEhpJUa/k/f6mPXFaH6ihm+lcdwfC4UATBU7nPYOQk5OyTs +GYJZXlajQJ+bPSOoyx8TUrQziNtLNAWzQzoR3K5AAFY+mWwRp9PIGNK1zwc7Ypm4I2D Od5A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:from :dkim-signature; bh=ovSIq6RQj1pdS+SQsHTT/TMrIK9JUQ10pzyh5SMD5+k=; fh=x9XjnXg1o7cuS9AqYpyyIRB4svvv6VV/u+iqjzC22To=; b=qP2zEnEp6I+lnSw0YtB+6vT0jpoDMmRL5I9qXwnjI661L0yiDHUA/dsneDe5spL8f6 sxeS+tQ1yIPqzQ2vTwNYPuf3byYl4qJ+ezHsJGwAOYDvMoc60BM1004TR8OynlRsDDZR uXmT1aNN/fn56O8GIOvmrrpqJummogq1EuzqG+hCZKRZfYQKzl4UC0lQGInbAT9aR7pO kveUcwF6MykKacL7iVA+46oV8TUWkLR/fUAidXhXFewDV6zCxGdIXH5r8QgAQxNGukAF 8ViAT11V0YBap2ojEWX4zbRLW10soXrVk1Rs8vnGqOXxKL7VnGJ+CiAmDiEy2H3Xv/Ho 8Olw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OgRNkV9V; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-206339-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-206339-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id 71dfb90a1353d-4eb4ad57fe7si802927e0c.210.2024.06.07.08.06.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 08:06:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-206339-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OgRNkV9V; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-206339-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-206339-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A0A661C22AB3 for ; Fri, 7 Jun 2024 15:04:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5B0181991C6; Fri, 7 Jun 2024 15:02:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OgRNkV9V" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65E6C197521; Fri, 7 Jun 2024 15:02:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717772534; cv=none; b=WsFKnpt1FjhnR6V3EmKzhJd0iXd5gTwUCiNxd8QofSMInQQbqa8HU8sm4JjpDdw9hnyYIpuUnkIy8fTK82r8uYdvcwihkSsbjSEDX8fVBOHdeAysF2s4asZeFkZ5rBoqFDXJoJyI583HAeHRKjSMV6HyN80d7U2TQkh+CjwQ0jI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717772534; c=relaxed/simple; bh=uF8vT+OcPDdR5VdfX4WfqKuZuRJ7pOLHE27ORfVXlFg=; h=From:Subject:Date:Message-Id:MIME-Version:Content-Type:To:Cc; b=CHvjRW7xEHBtgzFSg2K4yFaTJMXWrFFacvTBSuXejbOFpQK6rEAICZbj6TsS+1VVUTQDCM9yDH0lXup/CfRjIrOaN/UcwYNdgr4cHc2LM8cMF9X0kq+8ZQZc4XmAD0mAiOOLXSKE0khH3VDxQ9RSwnvWBbWzisdCd1JBxRyV6Ew= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OgRNkV9V; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2C9CC2BBFC; Fri, 7 Jun 2024 15:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717772533; bh=uF8vT+OcPDdR5VdfX4WfqKuZuRJ7pOLHE27ORfVXlFg=; h=From:Subject:Date:To:Cc:From; b=OgRNkV9VGlIiqIjSZo4jIJWcrQzU0COGkyi78cBkg3cKtjgtogWfVZWKbD6CD5h8W VRyfEsfQxh3Q8SpvnVep+nHhzruYU8tzsaV+GMyFRhD/1AsgWbzGmZyMpzsuo0kHmb 7Zt+JCeYOM8C0zz77ryy6E4LsA2I6/MmPsw0vQK22A8iR7P6SlZSEpBDV0JoX5n9GH Z7t3YpRtBHvNJgAy0zvfFyBZFkBHsJnHJhre/wM1yMWaKzlD8cWJG43t0s0vb2kQy5 bx94E9tOdG71lD2bnPrCqMPjhrj/Y4rG/2HAIsZpoN9u1KViTFTuWCcpHfkKHTwrVh XCaClJrwAOQSw== From: "Matthieu Baerts (NGI0)" Subject: [PATCH net 0/4] mptcp: various fixes Date: Fri, 07 Jun 2024 17:01:47 +0200 Message-Id: <20240607-upstream-net-20240607-misc-fixes-v1-0-1ab9ddfa3d00@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-B4-Tracking: v=1; b=H4sIANsgY2YC/z2MQQ5AQAxFryJda9IRMYmriIWYogtDpohE3F1ZW L73898FyklYoc4uSHyIyhINXJ5BP3VxZJRgDAUVJVXkcV91S9zNGHnD386iPQ5ysuKryDvvQkV gmTXxN1ilATtBe98P4PwTtncAAAA= To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Davide Caratti , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org, Christoph Paasch , YonglongLi X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1437; i=matttbe@kernel.org; h=from:subject:message-id; bh=uF8vT+OcPDdR5VdfX4WfqKuZuRJ7pOLHE27ORfVXlFg=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmYyDyXD9GnRwMZjOUY8pzRftCN0te079/gk33y QAyGVFlIjmJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZmMg8gAKCRD2t4JPQmmg c+toEAC5Il+4G9yWn+KCtBNluOSVUDQ1BitLnWbvmxbZks94ofCsmkGIneSZlEx4E6dBjdq0OCa sRLtJ44sEd20/adnP4lBIEYhX1Nvdmgcokg9/8MkjhUMEsrDMtOVC4oXdd7Qny4q3eB7VEzw0AN SlIElE0hgYqucoXbSGLZQ+B19mhIryj2/iyD0pym/8mOckfybU3qls+9PyPsuZx7QWqEcMAFnL/ VNl81+gke9qsq7+slP0T/I05fnqcA6VJTUy9d51g6FrEAutlFlYW31djKuIRYHmEDTO8kC+NKSq ewGw25W1To59re8VHRAFu2KNcyc9fBQIyZ4ilw1ntCRxa6W9f4RKQAfvBx0HoFudMfUIVRNw5ap ZBq9hLKDibELegf8ojRAO0IG2F36ATYVXRa8gqNtqkr0Rtd3bbA6qYJ+BuLVhVoz2bPf2W6jAvk Dko75mBdNWFvqKEZDZV4G0vbomOk+IDeyH7LA6Nwfn2X1buBrTgE9R29oI4a/DdKZJDmUJIwDk5 Ig2j93I77bDntjyxGD1V5Dpj52qNxYmK7DSZVpWTOlZ0Nzx+rRbDJ1cjrlU4U146rOUJRYvwv7K nRC394Y0NlGcUeokkSBpy/f9jxmanVrtAYytUNQxY97e1zwfLg2Kw8CvtCwGAd83b3b1qZepwS/ n39TKg6jAKJkx9w== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 The different patches here are some unrelated fixes for MPTCP: - Patch 1 ensures 'snd_una' is initialised on connect in case of MPTCP fallback to TCP followed by retransmissions before the processing of any other incoming packets. A fix for v5.9+. - Patch 2 makes sure the RmAddr MIB counter is incremented, and only once per ID, upon the reception of a RM_ADDR. A fix for v5.10+. - Patch 3 doesn't update 'add addr' related counters if the connect() was not possible. A fix for v5.7+. - Patch 4 updates the mailmap file to add Geliang's new email address. Signed-off-by: Matthieu Baerts (NGI0) --- Geliang Tang (1): mailmap: map Geliang's new email address Paolo Abeni (1): mptcp: ensure snd_una is properly initialized on connect YonglongLi (2): mptcp: pm: inc RmAddr MIB counter once per RM_ADDR ID mptcp: pm: update add_addr counters after connect .mailmap | 1 + net/mptcp/pm_netlink.c | 21 ++++++++++++++------- net/mptcp/protocol.c | 1 + tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +++-- 4 files changed, 19 insertions(+), 9 deletions(-) --- base-commit: c44711b78608c98a3e6b49ce91678cd0917d5349 change-id: 20240607-upstream-net-20240607-misc-fixes-024007171d60 Best regards, -- Matthieu Baerts (NGI0)