From nobody Mon May 13 01:18:12 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2053.outbound.protection.outlook.com [40.107.249.53]) (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 A59BD9CA42 for ; Mon, 9 Oct 2023 06:02:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="OdK3flam" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fLORyYQwgknl8O//skzDEvPxAUybiqjmPBTDKDr7c0Ee+JvCkBTd6cU4bB7ik2FbYDBkE2Chfxu78R9c/k0E9nY4E0suHHKQf4Y4aWJd+mmW0oTHg9LRptSJSa+Y0D97LtRU+UNbmd+h9t0Lc3bK5meEWFUIcUShen3SIpVudZU6RVJJoNpwV62r8OnO6EljEtUiIRcePkkGNDupiPQlj52t0DLlxPFSUCAPkEmosEFRJGw07z+qC3v0mWJ+pylXOmpAJI1QPS2V2hOa4hFfA1r6+8FWOEqUr9TCjI9Q94No6rusU89wr1KuFK5YprFubeLpgCISNiiK+Y0xAvMqzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YYXnd7/nJQmqTWmWETRd/CB5Tf7RvjX4NlKcgExcjIc=; b=nx7txpoPkb3rta6aEL5tf1sEVhOx1seSxN0aqYwYIjrqN/HgplM+VhxjYH1dig8TlWODlVRo1ai7MG7qLtVL9NHiMyeA1os8uPFRtZsTkNzDUKJXuI7QHiG91fyjVJTrlEiMtQiqj6hr9H8ZclsWUWUrP5O+0sk2qiUilXkZPZczARHZh9CZMktkmm5eRHPyNQqMLL4+tMOkMdEx6gIYIdk957TjcPgDqQSGPxdm7QB2Id30kY+mwxsKRzdBQbM8IQhS3pW5bMjae26h1GTyMpmIC+28eFV/1F96dHPTGzn0UrhT8sX2I7DX1cbokxXYvbKctCyW0WHgDkhMrfhViw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YYXnd7/nJQmqTWmWETRd/CB5Tf7RvjX4NlKcgExcjIc=; b=OdK3flam8hjb7v4asFYbc8G5wHht205qo50/doVfc1jYrXNhZEUtxJoyZRQOBcCheygFWLX9Klc2tga3cLuVD5GdEei8q7urMUaNXiSXtidYS1j+Tp7bFgRDaOQgH4+/ALTFq7anKYUKy83tfICP0S/0sd6AYGziDo3RWcGb1Hfh0nh1HCxg+z00smu4W0lUOYTiFLcPbmeK+NDeDEDMupCSzQwNn3gW/bl2zjgAMXRbT8/EJuC/NChmzKneI8SMfb2oK/kAHT+e3yhL6v0Iv8jIcngiimLcaRlv0LCKheeuopRCH+9JPZDTOgB0v6uOX93yAM4M6L/w0C+2Hzw6GA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DU0PR04MB9658.eurprd04.prod.outlook.com (2603:10a6:10:31f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37; Mon, 9 Oct 2023 06:01:57 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8%3]) with mapi id 15.20.6838.030; Mon, 9 Oct 2023 06:01:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 1/5] mptcp: avoid resetting when another subflow available Date: Mon, 9 Oct 2023 14:02:56 +0800 Message-Id: <2b69fa22510db02a12eb101c3e8173dda76f8133.1696831239.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0009.apcprd06.prod.outlook.com (2603:1096:4:186::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DU0PR04MB9658:EE_ X-MS-Office365-Filtering-Correlation-Id: 21632c61-92e9-4d56-8b65-08dbc88d3ef4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nKYiOLrTucbQJu9oFabsZi2zi7s8wsjX0gCLinrLMbkhRs+l5C7Dl0gAHJj+fX/QXwYnPWHs7hxURnalB60Ky7TocFuZKD3qY94P3Cn0to1juHx5/lDcP6EXiPUK4V4Htx6jfaj1TMTk1t+86fx2P+d1kbMMaFjbW0KVInCF3UmsKfNwK3hPNKSNjmVFny5asdRpjuxfL2xe6QaPXR2VfOFZSo7lZSazP4qa0Y8HCUYxhyLCaDzZQcUmyaeTUNIxWWremqkPUqMM5IX8dJ+m/vRo+SrwKqniRybrHB0jaCJASBKfkxEdzVIwVRor3RkhNk3xtb+lcSwhX6L/ahS/+9k2JwZOj7BFvkHMBAK1pXHdYHrRkgkMR7yfbhTk/BR20FVxS8Gr+mTYYL8CyzXwq4rz8zLIaH2MrZRfPH7+ZLjRbi3HEVPWssQSVsK6Y7hQt/ut8t1V/rZiCHlS8viYHYv2d9I9WeSO1sjCrMnzg7GWE9QoDWs3wAPzjX6FrcKesDFvGdbmHX9GZaKAHTlOmUVQ7tb/+YjC3GWF5RST57+n6N9O6GtCAUS4z+G9h1ZBzVTUP2S23QBJ0tm/4cvBbKr4IiGGklWXLuMxV3lqtCk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(346002)(376002)(39860400002)(230922051799003)(186009)(451199024)(64100799003)(1800799009)(6506007)(107886003)(2616005)(6512007)(36756003)(86362001)(38100700002)(26005)(83380400001)(4744005)(2906002)(44832011)(6486002)(478600001)(41300700001)(8676002)(4326008)(316002)(8936002)(66476007)(5660300002)(6916009)(66946007)(66556008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FcKSCgpPNtvgZNyDoOYadoT1juUlYIilx5US9XxoDO7Yxy3T5oAPc3tlsL3p?= =?us-ascii?Q?zantDrHin1+d1jM1sjxzad2GrwA36BfE/MXH3uOon929LEjpJdor8Ouu13Oe?= =?us-ascii?Q?VZ7uUIaG8Xp/YNbCAQ+rzp8ppUL5Qm2ViG1J77oxYkXTSNmZ6MDCGwu8DH9y?= =?us-ascii?Q?dYrM5hwbtD+cHKtDiKIadSSndQG793hVulDd5b69lc6fIxbpmFnUJYYN9I/D?= =?us-ascii?Q?FVq65j0IOGcTmQasjhQkDMzMzi8NHh3QDJk/VugGv85mpiCvsga6FFdGvYex?= =?us-ascii?Q?lD29T2SKYsuxwJGgrhxiV8YtkGOg/PiqWLbJW1EbRF84TlTepuI7KIJ6IEEI?= =?us-ascii?Q?CC4XMeK8tgukqwwsOp6SaRMkjW19go4lkC8Qa7cMpJOFjAnY2NyW2dJrEsYI?= =?us-ascii?Q?C325xoq9phXW0xjjArAsV1eF366fXK2Ioya1BcTi8NKEMQB0TiHiVhCb3of2?= =?us-ascii?Q?IZZ9gHduc2ZsNQk7v+9+Q9uCWVyT5CrVOOUjA1LvrnZp7GMVw1+/KfGeQwTu?= =?us-ascii?Q?Yg1TK/Q+d2hRBSwcKNiDb/c+KAhxXwK4K2VQ42P+R1cauXnX/PE5KxoT0sTL?= =?us-ascii?Q?DqswUsBOLVwPihr8XRqoqKk4uf/4Jxp0MP3nlnWHDegSiIdR1a2TbhrC48yc?= =?us-ascii?Q?NzFoeQOEJAp/n1zmRgkxFbpIX+mwqq1L6Hl3+HVp7/LOrs8WJg36xbpcbZB6?= =?us-ascii?Q?U8+VtL10MbPY7g1iaoKq2boQht0MttI9VeM3P3dqEVcBF+1Ee8R0N4ITSmci?= =?us-ascii?Q?pzEZ1kwdkTQkfh24uVYNgQlrq3TgsxAvUFqg6q8RBQZbhjsyc7MhK3USN90c?= =?us-ascii?Q?GXItQN7ws182DvnKigYp7olIdnuri5YNSpGZmrG1Pm6A5EDSDHDk+K3KNh9t?= =?us-ascii?Q?0dIYnIsS6Kju8nVriA/nQCJjBxZNmKZSWy512sTZ4MMtGhgbbbRBR0gyJfkE?= =?us-ascii?Q?0SQI7BJdgBQqhB8y30IPTgjeZKW4ofSy+RWE64t6DXIPBa36xyYH0aj9QS4U?= =?us-ascii?Q?iiJnlj5ZQIp0SeAnFRwXQJRPGITfElSz8aUgxm3sq1nfgt08g7SXvsVoKys9?= =?us-ascii?Q?M1/ittM7aZVYDInAarmr3wVWFbRccLGRjeVRYlQIq1t5fcPXNusmq5GKf4ve?= =?us-ascii?Q?hmZyNmMDTBA4fQIeI2hWvELnsYDgzHqWYebBtD0biFcJHDCdQkqXOcP7/+DB?= =?us-ascii?Q?IYSz1SwbNldDW3KY2w4GU8l4NKlqa+YUOJ+UEIvjnaD5PugRLpJSYVpVev37?= =?us-ascii?Q?LAwDSPbCzEzul/GPgtksUDnbJoU/xv4DEfQPkmh+4mhTdsqKehpNBhdXEWiF?= =?us-ascii?Q?lFiaf7AaFWBqRtn3lb7oI2XUOlwNcAnqBrdSE3h+Yg7IZ3Kumy2Be/9PTU/k?= =?us-ascii?Q?tZKogp5iFWmBkBr5dkC99m+C7Zv7vLvbCDarVscIQS8phRuGQbR8EklHPXco?= =?us-ascii?Q?bGabYCUbvwND7baNwvOjpFckXCJ/F4Bsh/MHYIW+sPKKmuYkQhE1oTp1kRBz?= =?us-ascii?Q?WomOKVvjO7bdHrTNsB6FN40EPwv3ctBhuJSmV47DIrwmWx2/nQb+He0mvZfU?= =?us-ascii?Q?UCEG5qzU13+0GNMfiJP0W7C7llEQZxXlPlFILkeP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21632c61-92e9-4d56-8b65-08dbc88d3ef4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 06:01:57.6346 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ba1JiLw8H+69kc3XQ+W/Ge4IzYQxKf/+Belvw5fKCeg0wg+TcQdvILj2h5Gbhx2fsNJGeUMpv9tBX2nVt98NRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9658 Content-Type: text/plain; charset="utf-8" When closing the msk->first socket in __mptcp_close_ssk(), if there's another subflow available, it's better to avoid resetting it. Signed-off-by: Geliang Tang --- 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 30e0c29ae0a4..6346a164ed66 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2396,7 +2396,7 @@ static void __mptcp_close_ssk(struct sock *sk, struct= sock *ssk, goto out_release; } =20 - dispose_it =3D msk->free_first || ssk !=3D msk->first; + dispose_it =3D msk->free_first || ssk !=3D msk->first || !list_is_singula= r(&msk->conn_list); if (dispose_it) list_del(&subflow->node); =20 @@ -2446,7 +2446,7 @@ static void __mptcp_close_ssk(struct sock *sk, struct= sock *ssk, =20 sock_put(ssk); =20 - if (ssk =3D=3D msk->first) + if (ssk =3D=3D msk->first && list_is_singular(&msk->conn_list)) WRITE_ONCE(msk->first, NULL); =20 out: --=20 2.35.3 From nobody Mon May 13 01:18:12 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2068.outbound.protection.outlook.com [40.107.249.68]) (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 B0FEB9CA42 for ; Mon, 9 Oct 2023 06:02:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="aZ5XcOSp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MK+EPVvfDL0voFgrbJMzBH2LZKiN/70R57HRihVUBJnxM1f5mWbDuLyShNUCyF7tR7Kg1dPNVDJ+rfZ9IMaxzlePLdF2b+uNt3Ch/OXdtBgYGUTKYTWdysLsUvjmGaUL23ygwdV+kpYIrHT9LebGZdISQLQLToO3FyQ7cGnesqDUghdL0j2U0Wh6ixou6wKdHCVgxUsyS3WxxmlkFqL/KCmLXGEGvQ8NeL3M9s34eFoZQLey3/LtRw4oi+ZO95sj4zRW4GUL2+kWm/LucG5mRvFwRmHU8TveRJadfNcJCP0sIfoBXPdWPBSgXQu+82ZfTN5byAXgA/05aDRE2pV0XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ROuMMGJMRfCKgFVMJUF1Xb856vDr2OZfTITup2Ntwiw=; b=QQBO0MqjGxtsVk9qQ46IeeL2J28Sumar5h+hARAHRoYlGBKRQDUKaIXZjiGwB0k4BDO070f0TbHh2+WHxnUuqgBfFFEUIRS4SoR/EHXaYVU1+KC+8J4JcDpXw72d+O1RgldYyoTcNSkeKAWhzhnsvNV8kKiNp0E7rf+8ktmRvBQxnkCak54IJQzKWFL/9I96KCgvgTEppgfzGD61QE6MoiNTX+BHKaqSaQs5oKMCUz9ic6JouKWXKWWNgNaU8ywLVTqwRWFlX2Fj1sJtSfKMlHLEe0AO6KGuMycQTMF5ZmQ1TPL7O9rX93S/8yxLn/ZW1jrkTzH1YAuQnV615Ro7Yw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ROuMMGJMRfCKgFVMJUF1Xb856vDr2OZfTITup2Ntwiw=; b=aZ5XcOSpYaLi2yJKVp9or3MiF68DFakrUkFx6VDgsqVTKydovn7/lqql8BH514gO+jteh6Y/tDJ+Mf3YsfVKW3+PziO/+I1i4Z7We1Yj4fK7puVSUx2fxC5s5+xsZ9KahRqUCSYP84W2inpB3XNJHP6Fm5q4TXxbOrE6Lk4Dglt6fEpAmCs2FRoBA9FcTcZJUY2OpV4Rrn59kGOQQcui0dAQ/KOpH68FUQL1XmPkHtqX4NTHF5t2TWB8tDT2ORnz9TzrlgfISGKGByWgbpJyz1w5y0NmFpOvFebt3jZWCEPHc/c1yBiGYMR+RJWVPtn34h+ZomMcYsC6kDyDnyrwnQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DU0PR04MB9658.eurprd04.prod.outlook.com (2603:10a6:10:31f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37; Mon, 9 Oct 2023 06:02:05 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8%3]) with mapi id 15.20.6838.030; Mon, 9 Oct 2023 06:02:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 2/5] selftests: mptcp: userspace pm remove initial subflow Date: Mon, 9 Oct 2023 14:02:57 +0800 Message-Id: <0d19b716240142a60b551119042bf6b08b73d92a.1696831239.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0015.apcprd06.prod.outlook.com (2603:1096:4:186::7) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DU0PR04MB9658:EE_ X-MS-Office365-Filtering-Correlation-Id: ef59e8fa-a66d-448f-504e-08dbc88d43a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ou2pY4CNs2njJ3Qs01T9eXZ3ywqEQzuRRlB7EpkqsLEC8TjJFBPUqB+RZkpWp/74q/YfJuWp52SFe283O3vKE9aJN7x+qZ6nKEvnj+zCN2NUXf6a2Q9JfUboJ8zcB1tnqwnjzaK6iJ3Y9dP0fkK1Cj6Y6VwzhQ+dqAZWloXWllVHRNsXgMWpT0Z7wZJbKDqTeT8rvm6JmYUcSSK1IuyWs5EIEYotVkWk6IX3OuU9yMt6Zl269m1zUzhIP3lH9KySvwLHL0K+WKBBaPUJHOJsbbN94eiucSvG8FldrIIskWhT46SflBwPwVe8G4+smJIkV6egu3gLQZihAtEx7RBUYaCRqci1W3hB3OTfsVywI7RsqsCCJ8/jx6US0TZSsVzUUc5kE11rNmfuZbrkt/SZCZ0Vd1oTVgvDtMKTTg+cPAij/BFFVp5Nwv+PdzF9RgOJAl0zp0lEDLOFAw9tNcTHHF+9tRcf1v/ug5340a/CnZzC2lMn1gW49854IH/rTYpfWlJ1wd94WdhAk4qnc5dNPboJhH5LMAYvjvTUcnR6BUv69HrXeLhGfObXKRN/+Vb3I+XhI4PUW53WRZ/Gao0RyPO4bk5Zfpro/L+oct9miKE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(346002)(376002)(39860400002)(230922051799003)(186009)(451199024)(64100799003)(1800799009)(6506007)(107886003)(2616005)(6512007)(36756003)(86362001)(38100700002)(26005)(83380400001)(2906002)(44832011)(6486002)(6666004)(478600001)(41300700001)(8676002)(4326008)(316002)(8936002)(66476007)(5660300002)(6916009)(66946007)(66556008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ajunNpOHif2EuKXKCo/mCYnTq2ieFZsMd76lGGeCSxapYCEt3auGelqsloFk?= =?us-ascii?Q?fVoCEqJMV6yUlvQJrigLeyHcFJ+4RFs+8f3rtXVwEQjljOMywzTFeQ6CeCc8?= =?us-ascii?Q?z39W53yIrwc7iouejozivp7+zZgl28sV7Dik6tdAGS9FgpYfG3zCURJHb3iu?= =?us-ascii?Q?HEYlzTaDTKPf/cXR1CPke+UPGMNOkjVCqlunK7lz0VnJ27lSlMgQqnkWCulb?= =?us-ascii?Q?BJC/JSmuwQ36ilgwBEh/TSjxVIv4cHqLQHa3QqNwp6lsf+UK0WTmuGuicAqa?= =?us-ascii?Q?kjtgqaYJ2jEarTX508BAcYcZxKbxyJCC2TGhFzq1hO2G0C7ioWaI5BKSb05T?= =?us-ascii?Q?+ai/Xo+v8PX4VwwxgEqyqdubwbT+uf+kGEhNItoTE2W6aLzvsF5BS94ApWae?= =?us-ascii?Q?IE8eQa/oaSolzhnWYXsHz/bUkZtxtIW9iMTjZ/2UIMSY1dNU1FtXWWyF8Wzc?= =?us-ascii?Q?cJSbigPoTrMDPMSHxQxDyIFzFsjaxpRJv8IzfdOYVq44hpKMB/8ub6WiKg/3?= =?us-ascii?Q?4qs55jhIlsCIjJzXErgjMDxJYxkyrW2FxPEvbNS7FhUhhV5sspF9lFO1Rum7?= =?us-ascii?Q?cxvSfzxsN/q7Dd+YVMeQ1zpSowJaUwSS8HDe7fNp/wAowwOwF2GNPDB94Vmf?= =?us-ascii?Q?XFHO/yhzGk7AjuU8WaD64MVxohqyCIsVbCoyDq5oSr4ZRoigdHpJy9VmPnOO?= =?us-ascii?Q?l6UxukeB6L5VoHJEDReQEJREaJVH4hs0dFH97bbLc7HKFp70Emv7hNmpMlC+?= =?us-ascii?Q?QvfmuAiXdU8lySaOGn8mMKkzpbW9PLPh8PoUJMofIbpFgzR7/XBwb6d2fZls?= =?us-ascii?Q?PqqIKTf7Yrnex/BbDkxrv/RK5By8wE8U+d4TDNcs+HtmTH9RbiXqa6GmhbzY?= =?us-ascii?Q?Ocl1X9hGPl7rNyz4JMweGKpO+7ZozvOD/bklJa5fa/wQ46bh8Kodc477lzG0?= =?us-ascii?Q?9osFOdYpcT9h6oy+RxcDilhQQONxfKsynXCzzk1rV5KatExEsiWOVc83Lk+b?= =?us-ascii?Q?de8/GAJeSMm2j/zbm2nh+U2Y9TCkr/GVOxygh8Fg+mEdepo+3SgkJttxIHR1?= =?us-ascii?Q?0JteaNx56x+pwWVeMQCqhsBoWfZpFTZ+u/SONJjxLsRWFH36TSHE7eehV5oV?= =?us-ascii?Q?CKr4o1rQeJUOGx0nXx/gwQDsdsmldVddsv0p5AVlQedSRMYmUq+bz72sfJaf?= =?us-ascii?Q?YKZ4SNnwhUsXxEO82howB6C9ahu8FQw9HRk3cCfwAKXpmkw36vbzKZBsJHib?= =?us-ascii?Q?tlkbPkGvSUQOxXfbgtjNZCDHg4k22c+TNCyjD9TxRqjz2dSQYBvjNFtMGLDY?= =?us-ascii?Q?zQJAKxufzs56YlkPq2FqUxOH7y+A2bg3PVbu+kIiLT5nmZ7xCU1qrVKdFDUT?= =?us-ascii?Q?G+ho3jtxXY4xo26vOcxRuR9ObFRuEM+ksrIcT3mLF7HtLG4PEUVVXPGUd/IJ?= =?us-ascii?Q?hnbDczUR+F0v3w8J/StHPmwG81y4+hqzgE2ycCRhi7/k1sPTw7yY0jAQvXPL?= =?us-ascii?Q?xFoObnwwfCQu15EH3MnN8Dt8idru/xfWF2+OzDniuhkn5nOx5U7L5wsbJL4f?= =?us-ascii?Q?SzbQpokOmiskjJ2E/1Ka6Gxbz8tYmclSUnLabJ3N?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef59e8fa-a66d-448f-504e-08dbc88d43a1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 06:02:05.4639 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: O76b/914qnwGdUGy2Q11Im5g40kiLCuh9d8hJgNjBk0eGd9P8lWRj36ys5vbP1HqPK/mrVjkgJTItOAUrivnOQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9658 Content-Type: text/plain; charset="utf-8" This patch adds a selftest for userpsace PM to remove the initial subflow. Use userspace_pm_add_sf() to add a subflow, and pass initial ip address to userspace_pm_rm_sf() to remove the initial subflow. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ae38b428e42e..d396b290e20b 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3490,6 +3490,28 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm remove initial subflow + if reset_with_events "userspace pm remove initial subflow" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns2 + userspace_pm_add_sf $ns2 10.0.3.2 20 + chk_join_nr 1 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + userspace_pm_rm_sf $ns2 10.0.1.2 + chk_rm_nr 0 1 + chk_rst_nr 0 0 invert + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 1 1 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3 From nobody Mon May 13 01:18:12 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2073.outbound.protection.outlook.com [40.107.249.73]) (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 A16C79CA42 for ; Mon, 9 Oct 2023 06:02:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="r1aZKPP3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dxbPFrB4MANG+z2lLWmjR0X0q+ZzXfz3Cmfs7yevyDjBzkg0h/zteqgA5RUJgIyynqCRq4OMWjRSHoyhZL4dhNtDJWHg1o6k2wQUzCnJ9aHIBfK3X87I4bUGlzt6Uttam4BX+Ppejy/61L+a3K55ia9fqMDqg4kMrA6uAjlE+zJOsSdGUs91io+S8Bm3xwD1OgGiJMv3VAl13Kt9tIP7h+OsHVXF0Szm+s4gwAn4ep3QIR6va+smfpUIqPdgAsEVKByOI00Km6A+fqPoXtpw3kK9UCuQfqRr2z2LO289pbSW5IDnTsdbtLmyKViS1003rrVnTWhe0u2cVlfYz0V50A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JF9SqZpDHJjR5kQXzGZWWiFtHP5q3yVGiq85xPy6jr8=; b=UfeMf2ODCoaxj/aJqQbwvoNv9RMaDeCi5L6O4cbILsG9w9FnqPRTGFJBnoYr5+uoOsLWtvuvMNKPwG9b2usbxK9Mtn3LT6K5vxnd9+PSz+2hN1lHFJHl0RuaDvZ87Bz2rRy8J815zW1ExAKduK5nWrKI4gaTsfCuRUFVON09/IyZbicsBG1kwDPWDCiupc1MxP9+90Uz3pH/Z6JHIT8gXGufxX1GW3lFI3ZhT98E1mpc5E5GnzovqMnsNfSmyHbNDQA8n3tJTqkXOQnm/nOaj9JYkMgUW9wZ+3MbO9Hdizk6qUnPtSJLEYCLJp7mABjMckUiqDurUjfrBKuPcnvX2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JF9SqZpDHJjR5kQXzGZWWiFtHP5q3yVGiq85xPy6jr8=; b=r1aZKPP38ENBXQNVRlKWWPLUzOUHDubpnhuGTKv+jPuqtYNCo9slUZhOzwMGISmsecGbVqUEghahl0v6urNNYcgv47jXjhZFAesT7jU01xfz8Y/OUjPFG0FzQT0JgihTrLBPri7sbZhJhqME+PJGl7RqMH0bHrIK9AXRIpJ3biPeyswKtkDiZ2FLyRhyJWzBlIDjxCV5QqZ9WWfaUzdWkUd2ovvfck0gHouP1fJaZRUky5/CO/SNMlydaQHRPL+Bx/fW2Ba1KwZnejRCrLIVQFZsTCC2CzVeFuXFQWkncJ3q8kXm6N/cvGqu5XjkRKaqKC2f1M/hMC8FLl/I6ebJFA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DU0PR04MB9658.eurprd04.prod.outlook.com (2603:10a6:10:31f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37; Mon, 9 Oct 2023 06:02:11 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8%3]) with mapi id 15.20.6838.030; Mon, 9 Oct 2023 06:02:11 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-net v12 3/5] mptcp: userspace pm send RM_ADDR for ID 0 Date: Mon, 9 Oct 2023 14:02:58 +0800 Message-Id: <6d3363091007ec414d010dc6ea278aaca682a894.1696831239.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0001.apcprd06.prod.outlook.com (2603:1096:4:186::21) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DU0PR04MB9658:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e8de738-1d42-4761-757b-08dbc88d4745 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lpaX1/XMxeOIeHU2G1X2R8SASskX0IbmSr03ykhpuBZ9XCb7QgsDLMb7UAsMiaWYKvw2qfx2z/Ernq9cNjBkXlll3YxAYQGMgRUQaINRKaBinjIy0ROp6rrj53g4wHugFH830MAEkaxkfso7j0uAie6y2Ak83awAT051I3MqR68yGsY35rsdjHkJalh6Mt+HyXkPgS4R0Bs9VK32uI9flDbtExzfE5mgxH/QU/IretVP//RYttX7cptiOOIhT3i7SbXjdIRjAzn8fPWZrPX6yXI3y9XayN/i9vFDwXZiQYcaxCpECPI512fZhbcVrMuO/t7XQ6ZQEIUuejoqqItM/8EcHGqIVqDv2Xbxxdfn2J8i194orJv7nN3PbO9bZExj2hglr1RlQAD1KN+vuYDZdLn2z01XoCSAHCHanvvH/UgwQL6UD8QIIksT0mrm7D9WuhlQ4FqBogzYEtpzut94k6BJokLREdHRnEmpX77j9uZT0FqAiKDMhsNGOD3501zbFmbQWXqqAYA66NSR6uoOf335m77htjzU96HeCOh5XxIKmjjehIDKgg/s2WuDjcD+NHoDSnIAXE0gbQvlqOB6o6ShEjGcVMHwvaiS015Oivs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(346002)(376002)(39860400002)(230922051799003)(186009)(451199024)(64100799003)(1800799009)(6506007)(107886003)(2616005)(6512007)(36756003)(86362001)(38100700002)(26005)(83380400001)(2906002)(44832011)(6486002)(966005)(6666004)(478600001)(41300700001)(8676002)(4326008)(316002)(8936002)(66476007)(5660300002)(6916009)(66946007)(66556008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IQaBXg/eCwMyfFFDCL6zKqYjcAvO4rTqfjqd/tSu1F861kEGlmrpXajYha4p?= =?us-ascii?Q?WZMw3qNKveI6+txoJ9Ji0CY2KNIx2n7mN+6XpMg1fBPFsUEdgwD4VeANmv48?= =?us-ascii?Q?LDR8tvjjAFassrvBtPrfe8ok810T5HMej+rawFd2ek89P5tNL6KXvm1U6uvl?= =?us-ascii?Q?bsNz593dQ6iCxc5iomUR0Bjh7txB3udPesiKdY1DQ2cEG+yl9oXiR+97NUS5?= =?us-ascii?Q?lEykR2TbCNjmjZEQRx+ZI65ra3mQ7L8SmdNLgQPznhgTKTZ504+COl1PwNth?= =?us-ascii?Q?u0+ExMfNo8bhMa2QZHPhM/XYuGZQidp4aC3B041XrWhUMlL4H9d5aoYtAhHY?= =?us-ascii?Q?lmYkqdPR6j0KxKTAtu7ziax7M7O6HiFREEd6lbyYosAakzY0rsbCFkSsiIc3?= =?us-ascii?Q?flm0BsKuvGfDaPcnqyE4r9tzo1b1zlD6I+pV+lQkHj5cr95DulT8FgjNZMAJ?= =?us-ascii?Q?6qPCKhGIlW4cFA46RxKKXUkOso+rt+z3GO1RHaJYTOshPhvTqLBjwNp/Lt+0?= =?us-ascii?Q?DsEXPjMy9bXEw7epdbDr8S+ka/PAnt7t9p2dnEhQtu2WYCLBeUSbgCvPR+DS?= =?us-ascii?Q?I1nLnf3khiQDvVy6qDDGmyVnuMeqxluhLNfESN9tFb/DrT4HBmcoQOz/Tayd?= =?us-ascii?Q?dF6GAArJCwLSOf928/sJEZ5tqUzVIw5TOt98LUxObAxUbke7N0x8D52L6lWe?= =?us-ascii?Q?FgnWWBeAgQC/96nVa6OAqjJ8LbM4MwTxvNaSsTpRInC36dAetxYZVYddAGJh?= =?us-ascii?Q?a/1+T6cAfTRLx3Go8jT5EVyfAoR+QprUM+nOiw9gWYXCowbpewNxoDAYQWn7?= =?us-ascii?Q?AxFT+UHPzPleyMBvMwJXkETmFlt249WtaTXeYmAFCAOduh6DS+UvTPokXeEw?= =?us-ascii?Q?nzR6AQEGoCPVOCNJaaR4DZw10QVKDP05NM/ggHvAYcIwStje1jZaIg/GwX/w?= =?us-ascii?Q?VsHRZxXF8QaInY/uerItTX9yVcFP9WDk86xTu2gr/erU6R22i+zPmOOYeAi0?= =?us-ascii?Q?Af8BNuwd1KndSmNFGkpPBQr36mFIebUSqBx6pX8EViz6zKP7ijQ88Yojyl3o?= =?us-ascii?Q?b2AXjUwH6D3lo05a9olkAfZgE9uMdRnOwygG4QPlFlzNFOXKIHgGmLPHeKx9?= =?us-ascii?Q?bIKZ8pX8g5fLo9x7x6znLhWMlqgip4BUJs1UNUo/Ovcc1hw13UqCgzJexORd?= =?us-ascii?Q?wviYF4BJDkz3pxFnQwPHeXs7VNK518IDFT0HKmcq5gifILmK1X8YdcZxTARk?= =?us-ascii?Q?Bd38kGjWzMdBl6H5pYcJ0EFa/uBnflUuRLlQZDbUE4b3IXjIyIMxV3WLN8bQ?= =?us-ascii?Q?gMkcDCiZCEBV7gIwj0CRo8f6QUcQPD7/JHl7gPC/54/R91KOzddOzIjVQ1e2?= =?us-ascii?Q?LnuBKNioiVOxRQ7WP0xUf39FGASDBbm5fRSRZ9hdfLaH9268gRBXu0BXWt79?= =?us-ascii?Q?Y6sdh7jdFB57yQ8sRg/CgMX3uSqbxtATRyv4796LEoUAHUFRZyyOQ70wlWR1?= =?us-ascii?Q?LvgrcyHJ7vvjc15qTDXr00AZvJZ9Ab5+dmq4a6/CzDZAAwWBlfDlEqckci6m?= =?us-ascii?Q?PTr/GtqOD1llIW5wH+58ETzbZ9VMB9uFeh/+2zSo?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e8de738-1d42-4761-757b-08dbc88d4745 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 06:02:11.8030 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: S5+9tZ59Zn5BixpXfnT+nYXTn2biCBZi7OlYrnWDg0knaBWJ3McFaJxXctAKuJZLofPs4E8Q2uR3IBmVUlpO2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9658 Content-Type: text/plain; charset="utf-8" This patch adds the ability to send RM_ADDR for local ID 0. Check whether id 0 address is removed, if not, put id 0 into a removing list, pass it to mptcp_pm_remove_addr() to remove id 0 address. There is no reason not to allow the userspace to remove the initial address (ID 0). This special case was not taken into account not letting the userspace to delete all addresses as announced. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 6b8083650bc1..ea50e694125d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -211,6 +211,40 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, str= uct genl_info *info) return err; } =20 +static int mptcp_userspace_remove_id_zero_address(struct mptcp_sock *msk, + struct genl_info *info) +{ + struct mptcp_rm_list list =3D { .nr =3D 0 }; + struct mptcp_subflow_context *subflow; + struct sock *sk =3D (struct sock *)msk; + bool has_id_0 =3D false; + int err =3D -EINVAL; + + lock_sock(sk); + mptcp_for_each_subflow(msk, subflow) { + if (subflow->local_id =3D=3D 0) { + has_id_0 =3D true; + break; + } + } + if (!has_id_0) { + GENL_SET_ERR_MSG(info, "address with id 0 not found"); + goto remove_err; + } + + list.ids[list.nr++] =3D 0; + + spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_addr(msk, &list); + spin_unlock_bh(&msk->pm.lock); + + err =3D 0; + +remove_err: + release_sock(sk); + return err; +} + int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) { struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; @@ -245,6 +279,11 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struc= t genl_info *info) goto remove_err; } =20 + if (id_val =3D=3D 0) { + err =3D mptcp_userspace_remove_id_zero_address(msk, info); + goto remove_err; + } + lock_sock(sk); =20 list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { --=20 2.35.3 From nobody Mon May 13 01:18:12 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2085.outbound.protection.outlook.com [40.107.249.85]) (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 B63089CA42 for ; Mon, 9 Oct 2023 06:02:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="C3zUkyKX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F7Yp/ph/nTNbooc3h+Y4OvBzb8wJ93VwZbWwNeDV0w07NSKoJm++INSvv20gu9h6sOIdCAmzSeJ9y19TA9/dqkxTSu9LcJ+xQAXfEPy7G3g6qD+Ee86yzw3A+sKjENsTGM4Ie0oU3FgHcg+mawtw6MHzePL4+D0HipaZEXhHXwmgjrB9Nk6wVllidmrPz+rod1vkbyK0NlmaynD12sVAOGbMrKtXoC/5ALWFtyA56TkwYz2RDj27Ix0JL9rQ2Ab/2j1uoO0TJwxcVbhvDzoi1HERnm28YTsfxWXIeFIpN+x/vsAGafvTXAJgD4rLO2cnMKacEv0oQthuF6pOUlJnWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ITrTqUSiTFPQLH+n/E4UD7SU+WUhgfcHxzNk2VWjDqk=; b=Dnf4inOTdKvurrB1PsvTriOATYe6YS9jy/Ca1UPBY2lm0y8GsFMnujGjSqex1ukyIsmFliSqulq+QGmP5EIX22d6uy6ySdcid6VKwUxFCRrIJNXsmgbu7dWVi/qrAa1p93mvZGVYshN/Dha7Kcv+fmnabBaY6j6WcjMTGf96EYqiHx9FEphdnwN/yUquq4S6CAazpaoDtpIfQs9NYmwmjhJ+iUclTr2V6Y2klDbuX93pvE0+ibeyyC2eSQqrH5JaU0xx1t9r0L8N2Sz3hFNchjHXrzHsKkF+NKmqCQu1zb56r4Dgqy9OW1uOp1MkLpFHM5cZDS/KpUfX0zzLjSQXIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ITrTqUSiTFPQLH+n/E4UD7SU+WUhgfcHxzNk2VWjDqk=; b=C3zUkyKXoIYTDkRKA6E78lc9+UirzmB6tY+iRs/qH2DBjEruFotqgiWv7DVV7a+hglA4mge98e2kW5VtyGWDGaK0Sx0PzgH9lD9LDQNwyBoRDMNCoH+C/Yre+NRqvgeopOUuJvbKG1u3eiQS/Scc7LAyxycU+ZWxAotdE0ujjMPByBoXbx+ZaLmYuwEbsC3DJWhEy11UxndYzx3Ht/fPpAVsdXWPD519IEnu3HRfdCmBS4EZHtVLgnc5u4iNYt4yeJ8fw0MGIC6JvtQvo0V3ghjTrbtaWzUt5at2JXZSIuzCEztJ84CSU+4pvRDBiptHtxGIyIjVT5bHX1efbVyfBA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DU0PR04MB9658.eurprd04.prod.outlook.com (2603:10a6:10:31f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37; Mon, 9 Oct 2023 06:02:19 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8%3]) with mapi id 15.20.6838.030; Mon, 9 Oct 2023 06:02:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v12 4/5] mptcp: userspace pm rename remove_err to out Date: Mon, 9 Oct 2023 14:02:59 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0018.apcprd06.prod.outlook.com (2603:1096:4:186::8) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DU0PR04MB9658:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ad5ce11-956b-4af8-c5c0-08dbc88d4bdc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gODxcEbsDih8IRRYMJvjdUkPYZJnTgdMOAvAwzt4i41/1BOsd/Axwd+ZWHjXAu8h/pm6oTWhwUfD0PKHy+6MuGjYffjjR0GU6VkfDJwmj5utxx0PqIrxqIBJxzvA5kibrSS4NhAdPHmkj+eZ09i0/Urgopf6mJhuGHoNFF4t9o6cIV/hChaWjRvlySucGySioaxyOWGlTPAi3cPf7UpIUn1MnRvmQpmpRivy39gnzPCExZf44Egh2/1ZLOrULugzCjAsK3I27V70yUBXeffCLszK6Md8wt3x2KB7PIbqeifT3q70dSZrjoj7S/YAtepDvx8AYAKTw0yLkoixZJ+8jCQ/MYqWsJz7/oowPeh1Euu2XKKNeii8FZNJ538sSOhjLfypjdcFWAxI8CEv0PctW67i2XjTfo1H/7aYZ8An4dGD3GJG+la877psNh+sBHp8uXQdvPGNe93PHwFs3Sp6272kRf91bkX/OpW1i6LluBPMz1K76obxGaaSqcWyPLjxJ+wWHjGpxMcXdc3LxG/t7m7hO+Lgsk9bnSbCBb0lxfY5se1FJ01sDZ8A5lQU+OwDUH0emCLuD0k1F8mFOlyU+5/9bYu5NaRY8+Ivcj8amYE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(346002)(376002)(39860400002)(230922051799003)(186009)(451199024)(64100799003)(1800799009)(6506007)(2616005)(6512007)(36756003)(86362001)(38100700002)(26005)(83380400001)(2906002)(44832011)(6486002)(6666004)(478600001)(41300700001)(8676002)(4326008)(316002)(8936002)(66476007)(5660300002)(6916009)(66946007)(66556008)(54906003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PHakUTZmF4lYzvlwI4AXxad+TE1V2V9yAfAOvmtACGZ/wwpLgW1wj4ZSb48P?= =?us-ascii?Q?z/8sjiijjf1cRtIiiCGSC6P1sF0QosusG7aDbQSgPETYV1ueee/XZ4hpt8sS?= =?us-ascii?Q?pt+VVA9o/lNIwZ3mf1/1O/JuHhGZDhTfEzd3PxSNP0MfPnhBW4wocYiF+Mcp?= =?us-ascii?Q?NBD9qXLYjlBYtG4G7SySQj+CgEJN4o9iEpVu5iVXHq7jyXUOSyuBNj7mhJwH?= =?us-ascii?Q?yXoPm8+3TvOBaBiKrHPHSTrR4/e6Xl+9jfxDIzxfK8CmmgL+hHzunAi4sK8W?= =?us-ascii?Q?GcQBI9EJGgk3baA9vftKEY8DqtC9ZURied9t6iG03cZWWcW7mWDHV5Hm1l4J?= =?us-ascii?Q?vZYRkP9do9pcYAxwnLt+aIIps0Do173RCY4SbJ7QY14e2VT9+tPTvWU7JRG+?= =?us-ascii?Q?nD+mQ6a1RkeXoJpE+B6xdfN4xfMfoYw9N/MzSCTzTivx7oMAxUES0fHXFB55?= =?us-ascii?Q?f1fGPbmUFRRS7DVpwBD3AQkNyyIRES/MK/HlCb/GaYZHz3EIl8CRM2rGoHDO?= =?us-ascii?Q?FWn0LPuaL2s9Dp+5+AE0BMsBd4fARCdfrCrXQLaqRwTYpoy2pckTkph6iJGj?= =?us-ascii?Q?HcytZVqyZ4egp9yaCEu0Poj2Y5bIO5/pLRZ73lR1knKvJDm6rM8MVpJyLbK0?= =?us-ascii?Q?Kdie0bfeP+vVqV+O+3XmtAhByRK6uQQMAp1F6ls4JDyTSHKCb03B9jnGLUnu?= =?us-ascii?Q?uwRW/xDmLpF4bbVqAhrFD/ZarB9fVpsBuZ7lwavA7/8q1sEqTbA0XqEOiGS1?= =?us-ascii?Q?StjhYLblwR/+UsKspJzjCDXfGpNUcDkuPGMKyElaZxwSmfOrArgWwEjl39eJ?= =?us-ascii?Q?CrNI9zE3+5+hKQD5PHdg/3GTNTFDn2hPsB9A0PXgX+wEAIIdRJxAEOK2vOfe?= =?us-ascii?Q?KBtZ9WfnTD9dPEIQO1FXU+O1B2qmaYGtIXBGhwsUw8SKPCaw/9+dQ3Y892J9?= =?us-ascii?Q?xisb0BeaLuYkm0ndvVFt/Y5gn6LwJV9azBr8heIc3G7ih1mlfvywKSDx9uVm?= =?us-ascii?Q?zdwgJwm69ICzb/cKoa2fRnWUqP30HBFvVSbjhC2iVPIjcCvXiVHQtjij0SAD?= =?us-ascii?Q?XPzEjjJ5x3JTz1Ie4SKb6RF+CyliUcyFL7asBsp2FBEeQpF/1MxuEF8srmHN?= =?us-ascii?Q?cqgdw7oH9HTWLXcmGGpxLdwOcK4VqMaOKol4r/utBGInt20nd82clVuFuxkG?= =?us-ascii?Q?HeM0HApAdRMN7/nEOZeAmudbgzFOmmz2iOss8E0XVmOSTkIaot4iCHmgp3rx?= =?us-ascii?Q?MRC1XnHT7pcMAxZTCtIUEOkEqYYNidrTAwxJVvljaDgo8WFGhA+bUIKiphrz?= =?us-ascii?Q?xV1dPCXZkdfMkp5U1uod0rNng3joklMwjjylh1h4zIROGafL0p4eiooTt0/J?= =?us-ascii?Q?hqDATZyZXTv4MtUhKyTuHYtApGPe+x2n+XeYfVKVMon+DP2wjNit69UPWozJ?= =?us-ascii?Q?vn64LaUkqm6ziiBJ8QN4Uqkt8rApQriVUm9nVx96EY2+jOeLDPAfYJb0Piwm?= =?us-ascii?Q?emTpXQTLmru5oeZvG9HbUkws+W2HiwM+zwh9vT5dnnRh82z28XyDNU85bnoh?= =?us-ascii?Q?TxZ71DIF3QC4WWRaWN2QsRMd52ed/XbTmzIItULH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ad5ce11-956b-4af8-c5c0-08dbc88d4bdc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 06:02:19.3023 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H437QNWmIUT4BQ7f70s8GMX9Fkkiiy7G/P58tCs0DN3yGS3Pozgbl5K0L/2PoQ3+g5NoaTIHITXWiXy+6eff8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9658 Content-Type: text/plain; charset="utf-8" The value of 'err' will be not only '-EINVAL', but alse '0' most of the time. So it's better to rename the lable 'remove_err' to 'out'. Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index ea50e694125d..cdff3e631d2d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -276,12 +276,12 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, stru= ct genl_info *info) =20 if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); - goto remove_err; + goto out; } =20 if (id_val =3D=3D 0) { err =3D mptcp_userspace_remove_id_zero_address(msk, info); - goto remove_err; + goto out; } =20 lock_sock(sk); @@ -296,7 +296,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct= genl_info *info) if (!match) { GENL_SET_ERR_MSG(info, "address with specified id not found"); release_sock(sk); - goto remove_err; + goto out; } =20 list_move(&match->list, &free_list); @@ -310,7 +310,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct= genl_info *info) } =20 err =3D 0; - remove_err: +out: sock_put(sk); return err; } --=20 2.35.3 From nobody Mon May 13 01:18:12 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2077.outbound.protection.outlook.com [40.107.249.77]) (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 4BF029CA42 for ; Mon, 9 Oct 2023 06:02:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="rwahdy1Q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XX5kwW/tdpbVMnIKS1MYyWHfplwaw4Qa1pPa0JKAFrTimYgreGbveG4/s2xIaZcd+8SVmiLmt1w3ipdrYkk6LN7YYNqj4v20IDfvsEr21NbHl6n3MbbtprN5RINLZe6PHI/792/IpMmSpJRjdd26HfvQEo1nbNSCEluugCCwOB7y6byy15GinwgerwnTkl14n5QBhmQPlKH9BxPK784HgW2sKrc0eKCX/MdAC0uKO9MJ07hhv8RLZM9HDw6C/Ft6f7SNT2qgQKDjQ+ySfLCfEdk30+Z68dTA8ou3CN3aBKdobQqInQgWrlax1jlH7YJNOmciPhzDXt/CNBiQe0BONw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fL+uvMHiK+G3IxrmrSSlHqsSVu7cibWoXZiegABuUro=; b=EsWIPRBz9Q4uEXA1B0dsxrqXK2gxGDBIlVGjJiTrjEFkxqdTNETdBHVqWaOmEca+RJin1+gkggEZwT02qt9t90bfIqbbFrmt8KSQjPJkBJ1veWAD8NPWB5MnGEuz7TBTNTvUbKfU9d9bxpbB6CR5rT48DDEgwhybR0bWVzZax2wfrkQ4LGiptWHgfAa+7NSJcJa1k7aP0dmrL88YINDbu5lFp0vwMKbdFAILNvw8rpZ+L2CZU4q78hE8pXYgfXRCQtlOcbcm1VPmNs2y7+anF3XXbn2VKyKrycFbNkj8gt+Kl1zfvFH8zO17yL6Y/uA4Jyikp7ZYHcgp4ufXaISQWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fL+uvMHiK+G3IxrmrSSlHqsSVu7cibWoXZiegABuUro=; b=rwahdy1QbnR0imrtEjk+Vi4nU7YrNCyBzJRxm4WxxISFkvZhbJpDTtdmRPcmeRyd8F3LSBOzCXGsv59wAMeGW44kRGoWJ97G0upSvdax3eX0A2rGCQjKmA4m2HQLd5i1eT+zc/brhx80p2VoF2mVWzqxBin/YO2aXqlU4OBo9dS3iR1MSxu36LtG7JzjZcG6JVNtoisCbSqpq6/rrYqGG1Z2oh64Xo5UnuMgrptvmw/ebY+OMw36iWJ4evd0xIfERn9cg4Of3oClAjZQJsEHvmKYt/xmRBRBv5w33OeHKvEG0DTHSfPrSAS3wl4I8Kx6A3ZdBoM8sSU8acOKDXgZnQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DU0PR04MB9658.eurprd04.prod.outlook.com (2603:10a6:10:31f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.37; Mon, 9 Oct 2023 06:02:26 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8%3]) with mapi id 15.20.6838.030; Mon, 9 Oct 2023 06:02:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 5/5] selftests: mptcp: userspace pm send RM_ADDR for ID 0 Date: Mon, 9 Oct 2023 14:03:00 +0800 Message-Id: <2d013e9f4cb101e018269da31e3d70b8198482bb.1696831239.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0012.apcprd06.prod.outlook.com (2603:1096:4:186::13) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DU0PR04MB9658:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c4252d7-a9a0-4e9f-557d-08dbc88d5031 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: usZROkP1YbBqxvMU71cWqhWbeLOVGyIzW199QaITLqTUAItHqXc/u+EKSZHXmzS2OoztEWgEJ/e3IEx14fHFog+lNUdp0zlYTievtSa2VyteAZZYko2OLOUErEOXXH+m/+znUXTkGF21kHt2CxRMMrDUDXsQaHiR0iiN3FJPMxD59648OUFW+90lhxVDVUweJyDfOjjfUdTrVvCksMkonDh1uZWi5QEhINOBP57v4NcZ+gNBtrSdfLd2MIITloUG7ByR74wWtvHz4yg2fTOMeVjrBFjvsyCddeZmsttvpUQaSWVC8MAg0D0rhK7baH3ZxKXUQlr/rZ+31Bkp+JNDXA3fhqkNWBYTIya5eaK6/ZGVmK1Sj6HoB7+2hdDFEw6vsySIr2qwUP/3HtlsQVjRcVunnbG7Q5RPuqPvgJtv1Z9oLTdcHOgGuslf+A5hmv/ZhpkAimmdMdtPzmzOs+O1unNCQxDDQNZ/RJEG0lganXlk3ZLJI7ZSb7TgUwPM8q/VGQ4DIPfnx8Qzy8HlGI5EwaQS7pjMDkwY5rt8ZgMCyENymX5JQAMSv5aNVsVizqulMig1GXiZ+SKbHsWu+rYB63AN0LeOYC1uDLPRo1wjJuM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(396003)(346002)(376002)(39860400002)(230922051799003)(186009)(451199024)(64100799003)(1800799009)(6506007)(107886003)(2616005)(6512007)(36756003)(86362001)(38100700002)(26005)(83380400001)(2906002)(44832011)(6486002)(6666004)(478600001)(41300700001)(8676002)(4326008)(316002)(8936002)(66476007)(5660300002)(6916009)(66946007)(66556008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gq8lxXKFWV3m0gcnrV5w3IdintffCA64V9fYNJ9CvOvjIPbQovZmDCmNV8r1?= =?us-ascii?Q?vT2L1kMhOEOsQXHyQwE4vJjicnXaTRU2J7C6riqYTV7BCjSjFrs4CVxJ2FQl?= =?us-ascii?Q?HdbB/ODj3ij0kz6Z5Cm3e0ur6Z+bSid6N6kjq/kTpFrHLNoVqvf3aPx5ZpTn?= =?us-ascii?Q?b+Zyy0cbWbRskijvIIlzssW1slT1xKKqwJz9PQiuzHOqDmGB0gKEZwA+5uzH?= =?us-ascii?Q?gi72qDQsXAfG+ngiAmO/OyojbBLEY1jDxJVgSLaiQgP9ASrcpaVPfwnZSnw1?= =?us-ascii?Q?lVVMRlCYISlHl2ms58XPIIGdVu+xMbHZqu0h9P7r/vnJH2T0e8WPYMS6zvmt?= =?us-ascii?Q?vKOpPYwnKYsUoag8fFT6/TtwbIPjEXLwtQqnjEQwhFCMYkSv6kHgJ28BY2ST?= =?us-ascii?Q?Dud2KqD6q4+U2rGux1F/l9ypUXYAC3Mrg/N/2OvuhmaKR7boOEZsPnzflUYc?= =?us-ascii?Q?qbb/dueG2nDWrolrnjgbVLeYm6YG6t4B0uo86H0LzGkzNFG9QMiPV/EldjWx?= =?us-ascii?Q?rESNxZGDExiZxrXv1hpFaaWBgoW8RGLAe+l2NP9KkCo1bUJStHR3rH6NiNKh?= =?us-ascii?Q?vd5jouPMB5Zh9zmtO3tYHoBbSlyXZZpXPWw45TxX+pX9EqDX1QG6JKidjfSO?= =?us-ascii?Q?G8gfAcpUDKXCJTlXRL446K1ZtKLJOGxVm5/6+V71opw6ANSr96EJm5oKuQbj?= =?us-ascii?Q?8R0kW2lfYSiB3WCNIZH+4wuc5cKB6VGYk0KOJqjPw3Gs2tBPJssjxOjQYBAU?= =?us-ascii?Q?FxcFOPAL7NeOsinF9kWuWl0x2805QzmeqvA7nD6h+8zNq69wl/8Tkz0mMPYE?= =?us-ascii?Q?sPmWI0Lma5CynlpEo/Fxx8KnSIs6D0Mp9J4BBQrvinUn2+yCfPY46uG4p4fl?= =?us-ascii?Q?q2A9oRJ6KrpfkoooOMHMrkliQQ+dlloofD9nW7edJwZ59gM/gNiiVypKT6b+?= =?us-ascii?Q?QWOplUjQi6fcWFVwWQNJI+x8Qq8xGB9dy40EFX+bM4SCiDsJ5Ms2TgMpzP6R?= =?us-ascii?Q?/ZRinV9IWcYZTdw8/G51wAzCgAn4qV+4A13hpQjgGIB8qNmWbvyW7+4DR4e3?= =?us-ascii?Q?n/P4WZd+4ckoqoaD2pXdCwSyVg6ChTeNv9hKqvQykzJaF8G+d11pjgQfs3eK?= =?us-ascii?Q?Ps8byLXeliLfkojMc75OsduZpDanEw9tGseloHf5Vc4J8TkCkVwPoj13+AUS?= =?us-ascii?Q?F6k+Q4mn8KkaS8smk0DV4jnyOmQZ0L4QfCg7jSl/EffnWcOJ4xON8bPrqTy+?= =?us-ascii?Q?QHEGWsLOBedL+Iz91YKKXIqvrzHZO5npvwhNSP3bYcOFkuc5WjwZB/14e6mh?= =?us-ascii?Q?fAtpxdbBOf2Ab470eHcGArXQrML8Wh3lV0CTOo/ne5v4fkTO/x3vqomtmW6k?= =?us-ascii?Q?TaebOo2pl8nfmiADJ1KrH+kXPESue7DfCR9CRXVTm8QOJ14xIs4s5gMLKaMD?= =?us-ascii?Q?Quq3L8rY6eHMwCMjcepRNedPn50ZSKTmVzEvgx3+vGvv9RtA1ATmfhPAjLWa?= =?us-ascii?Q?R5lEXPv8YdTuJ/hnP5OGsnlIywNc5VVH8fZgbN6mCrAOsoMT0ZjzlAsnu0a3?= =?us-ascii?Q?phruJQ/xtw02xbnN/yXYgWffXMjHMzzI6bB3uBJ2?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c4252d7-a9a0-4e9f-557d-08dbc88d5031 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 06:02:26.5844 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1gQ+3xqeU0cDVeWt70lbbAjO1dMn0Z81wjjIkv+NFmMzaDzRWIY1MsJYwblyVxRYQK27FEDAHWXZFRZUBppjsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9658 Content-Type: text/plain; charset="utf-8" This patch adds a selftest for userpsace PM to remove id 0 address. Use userspace_pm_add_addr() helper to add a id 10 address, then use userspace_pm_rm_addr() helper to remove id 0 address. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index d396b290e20b..55aca4e7f051 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3512,6 +3512,31 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm send RM_ADDR for ID 0 + if reset_with_events "userspace pm send RM_ADDR for ID 0" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns1 + pm_nl_set_limits $ns2 1 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns1 + userspace_pm_add_addr $ns1 10.0.2.1 10 + chk_join_nr 1 1 1 + chk_add_nr 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 + userspace_pm_rm_addr $ns1 0 + sleep 0.5 + chk_rm_nr 1 0 invert + chk_rst_nr 0 0 invert + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 1 1 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3