From nobody Mon May 13 13:44:12 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2054.outbound.protection.outlook.com [40.107.22.54]) (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 BD6601A711 for ; Wed, 11 Oct 2023 09:49:30 +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="DJBi9BgO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CF2zkFokvLEoCN0hQRSluWddrZEu6nEQVzET9tWjc1WEXb75fINNNa8hqvabIw5t+msobZHS41dNAMGVMMEeRdltn7u1m8WFcjFkXA/bcCoCbijVRtthswtD6f4NQItjI4k11qfMo5HMYbYODuEmjgRqlAO4Y7KF2P3QnEYzwCJWhnuxNXtgiAiy8LrYCPzPZYbXie0Q0XFPB+VQjlUlSorGote9QE7OGZuXmp5u+avjF6DvSwwMLhlrUd67FcTjPIfSmMSXEEn2FjSxWFIP2md0F7S9BuTBogb43LiCDDSgz1vJ1sCdsBPHhS9UlcgWv4cTBeVj8qMm67h9Gqmhwg== 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=XKwRmZQpk2L7ta8GCIugb9Hkq8LQ0ALtI/kVzlPXD/s=; b=Qp+w4CtDJfRyl9UwGHm7JHnLyBdiwHeQ4rg8Xbb4vaIy735gO69Omrfqz+lBi1rqWZZWXRiL1cySE2VQvgHOVFmS9FpVl8INBjZOQtD2W9NQZb3VczmsXCjaDucVQiedUHt42j0elgjyR+Us+m8WkiGBSxXOSHdnK+18bV9Z5OQ8wy4tBf2wLsS60C7NY2zyWEiChMsoReW0tX61S5GHpSGA9IXfxt6wthe4XF91OIj7lnqBXPIQLmhnedDrfnLB0nLKieZLupRPV3ti+m85NwwwaakdJGJJN2yjnkeK4FpWitnQMPiIAKxwEQo9lSGtKeEk5yHQWslC4EvXFIqdag== 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=XKwRmZQpk2L7ta8GCIugb9Hkq8LQ0ALtI/kVzlPXD/s=; b=DJBi9BgOAdEfRYyrKU4roibaEx7uPQfXon4KfE1xx3QH4kW7SglVnLKZ5RtjNZTo59u6KVvPRS5SQRH6Qc0eSrkMjpKNDHlSH2BCVa4KCRPiz4wlLOkgFwC+d/pAzutHZpUuv5TJY84+ANXTmSMBZ8Wwy7eXREw+ZFyzSzZOwUION9UZaJh1WdSyZsqjCklpv9Wnvgs6/VX+6nJ3dvao7IeZUMOPX/1sDKfzy5XShfZnLzWF8csmdE7fE9nwhFczA7bmknQfOjGRFHxPo8ZONfC1ejS1XWcTLJ++klSWe2uftOTl9qCKzHqK1BX19KyqoWRau4Y9NS4Q8jmihXXAbQ== 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 VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36; Wed, 11 Oct 2023 09:49:28 +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.6863.032; Wed, 11 Oct 2023 09:49:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v13 1/5] mptcp: avoid resetting when another subflow available Date: Wed, 11 Oct 2023 17:50:25 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0248.apcprd06.prod.outlook.com (2603:1096:4:ac::32) 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_|VI1PR04MB6960:EE_ X-MS-Office365-Filtering-Correlation-Id: 26ae2367-eb4e-40b5-0dff-08dbca3f5c27 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fHrAORl1wNOPKDEGLvj0tHDeJc5xsJUcVZwc9HOjFzJCiTb9IB79txosvM1HPvk/d55hVcKop+mkTkKr2w4zDSgwz9P+Tj/ZPJeksiszZANPsVnrDPbic7wPW4ZjZcB8S0Vicd1ho4j0BvdrRTliqZdvn6zloIJGYgx1UfQzktV0JWRoiyjKG3hGXcz2rnRv/cVDhvzBm3jRYaF27b67/RmdU9yXil6DYAgBAb/6ZJt1BRoTPI3y5j8pDUs4KnIyxQtK4qhOdZjdNwXdKwyh6XXlbKRWd6udjaAn8tLOPLubIVGk/ddlojh4sn+EN7isk6pl1VZnIkYXJpjyPN3rhMNBDfE41kPMbf+GaNFxpqF26VnHhajH3v8oJUKquN7rZD1ssgHLuHTLE/8oNYyWsw7M7lyMQXVdDH4/Oi0N1gGmo/ptqeCPNntBzmLED3bengQsl9eQketo/v5ApFnhuLT2Y2Tx4A+I3pLyVl68p6uFMV49aD2LDpW9ELc+IMWRX01pGZx9AXStDpPsc1sEX3eD85zXhEgMCEm6Sp504rUNMQZFQ+HbliK4V4wy4RBoeKx4gvJO3d2fJg1edDIQifddxceiLoZNhYs+4fiBDUU= 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)(346002)(396003)(136003)(366004)(39860400002)(376002)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(2616005)(107886003)(478600001)(26005)(6486002)(38100700002)(6512007)(66476007)(316002)(66556008)(6916009)(66946007)(6506007)(5660300002)(44832011)(83380400001)(4326008)(8936002)(41300700001)(8676002)(36756003)(6666004)(86362001)(4744005)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?S3/Xc4pq/s8mF+Uiu96XQPeHjIOYMbgvcxKVHTM3BH7v6ZoJrYnQcu1RiwPB?= =?us-ascii?Q?03ECvR9ZvLC3kXGSz0rYCqULMR3yoM4fJ4knxZKlbJUGvRKKXb5Fr1MkzsTl?= =?us-ascii?Q?9C4zm50g70duOLL/XzcgQFVgzvEW8rSy7+Qth5PW7zOsblGqTqIB9hmAItlr?= =?us-ascii?Q?0o3Znpc9XV3sjclnuOH5XkAbtV0iZx48X2QZJJG+W734MKudbASzkaDdhXw8?= =?us-ascii?Q?6Eq/koiuOVGuE3CsIfsMxP2CtWmp1DnwYCCSaWJxqko6K1LGl5F/QgsMng8d?= =?us-ascii?Q?Vhh5kP2euB4WjcQ2VPW/oVRVpHKZjexNjHfLRs6o+hTo4S6HewGyTiWrb3Lc?= =?us-ascii?Q?I3JgJkB0J+6dp4oPfxr+A21pVLL63yE1kGb8tPWOIRztq/px3cFxvzb889jh?= =?us-ascii?Q?E/AuzeW33ngvC+6xA55yJtHqKFsSoakEewDe7Snis5rbY0aoaJX2ubuhHozK?= =?us-ascii?Q?etrSDjWodQYp4ln7aWPUQE9eZUD1JWbQZkw1O4svU671EGDGycuHG5i+1iFi?= =?us-ascii?Q?aj8ABbbib8cxNlXFc6Dy5bY77AgrfY2ajaOx/Z9XXoh6iESqzBAcsNTzczsA?= =?us-ascii?Q?8Z6x0ZoSuuNzkkOPorE+SoDqpeRyUVlVBjNFkfHfS8clV2haQra7bJKkMZ/o?= =?us-ascii?Q?3FdB85QgmomF0E/MU8O3iT0QIl0v6+z0638t1sS0DRznPD8ollSaLE3ZvC7W?= =?us-ascii?Q?TdEHGhsXJvYCu5ruyDWQ/ijCQjvzmTlagZBQD/TN29XQ97L6oNHjNtMiaH39?= =?us-ascii?Q?e4ze2fJtGIfS9Au8xJn6E20TTcVWA/KiPh3I7q6ntrcGFJ8mKeYOKLAubGaf?= =?us-ascii?Q?/5FhkBHaPejyI8SYMjuMoU36ZhAJFwkIKcPFIM6FyQjhywMMwgAdtGISSrdu?= =?us-ascii?Q?izJo6XfUlRDjY+qgBymaYwjHb18L+PwoEnV1PoRK5jg+B8O6S99Qytapx9Jp?= =?us-ascii?Q?oU7WYbXHkAhVUvazqGYo5AHosJHXG2QuaYplMEpxpoMii77XgQMEEV9tvnua?= =?us-ascii?Q?5GzUhFJv5LiLlV31l32vUUi8wG8N7zom3P/GdYfO9wslagH2NDQWgWpGjMh2?= =?us-ascii?Q?AcW49s6CYKcDFbV0hU+0BmcsMwxPDwJ1Bv0Puw7m4fNH4ZkqfLlmGfNH/31+?= =?us-ascii?Q?ug7YW+axjPqvE70MAe86ILHvtzOhmT/zWe7+itNglHg6j+OZ8Qmtoa7ukrIX?= =?us-ascii?Q?EKvwROcXVPtHDfCdZFPYXEyb0X+29Mt/HrNUzflg+847oMAiryT8xcuRtNir?= =?us-ascii?Q?Qt2Va9UM41rsfumxi8RoaFAApIm2hVc6CO51aLOGHGc2jCBr/eYbrZSWlPiF?= =?us-ascii?Q?a3FmtN5gSGMAHo2oS0hjCbWXGu9SLxMVhgRowAP2avncI9f576PETDo0mreY?= =?us-ascii?Q?dpXwypNeVSM5yqNcx7AMvOcpyvZ+n7Aoka9elMiMJSSytV5/lJfcH1L+bEWQ?= =?us-ascii?Q?pD2jQA/LAN6ix4iSrdMpS1cui8zBQfX1RVgHwmDdb3wBg4fKP5wHD9htC86D?= =?us-ascii?Q?cptGpNJZV7JPwHkYqdhlAY+Blvc8SZMpuCE95NoyjkL+aGq/vy5YXFOHeXEV?= =?us-ascii?Q?e9JzcGPCoa1lmdEGA4iADqzAATLCm++WCdSMnkQg?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26ae2367-eb4e-40b5-0dff-08dbca3f5c27 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 09:49:28.1846 (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: 1HEYqMLHUJueADxhQXq2dVMRAYg11EKgstWE+Zb//2dZe9k6z5NcNnt5ZBp1/ndZ5NI4ug4h2xwbxctX60yc3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6960 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, just shut down it. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 30e0c29ae0a4..977bae817e62 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2400,6 +2400,13 @@ static void __mptcp_close_ssk(struct sock *sk, struc= t sock *ssk, if (dispose_it) list_del(&subflow->node); =20 + if (!dispose_it && + !list_empty(&msk->conn_list) && + !list_is_singular(&msk->conn_list)) { + mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN); + goto out; + } + lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); =20 if ((flags & MPTCP_CF_FASTCLOSE) && !__mptcp_check_fallback(msk)) { --=20 2.35.3 From nobody Mon May 13 13:44:12 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2067.outbound.protection.outlook.com [40.107.22.67]) (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 B90B91A711 for ; Wed, 11 Oct 2023 09:49:38 +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="oFAa6c61" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n2xWk/RktGbE3P0pIQm0YWNrEca2Pkf0CybM7dtFEXL0zwTV4ZpYpBOiPz8iuO8MgF1i6nkH4Rj1eZjviXAMnP8UMeWbq+v6vWNw5N8l7jkvQOSKX8axOFPrb8TfITYYmeU8DTM7tGDYUtFb/BjRR42HMAkgcC0U6akwndvpflOsizXFINKEHsNhlkUO6D9bcHmDL5ZbSKnYhMfs9+IkQofchP5G9nOg4Aa183u/hNhk8jXNinQXbTeKC4M/m2beblJo5vjeiorfhYiOfXBA1BnNEJ5MdJMv+g8J9og54KGzgQyRGfZengC6/4NMGLpRCAquFPrm8YY2Hz6bHVwESw== 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=ceX2PLTbPrCQTTfEW+3tgDaXzPkKfL/aXmCq/5Yr/SE=; b=LEkFoclBwj0e7ij9F26oIn30EYmHpHKWQQ946xMPIXVafEbr2IRp7y0AZ2CMnA20CNDQtgiDpaRAXHbp+PSrULcrIyT3+0buY1jnFKgXU7I2r3FDVyyd2crl3tMYdkuBoefO2A+43PqXuvV4X7XFPJ2pKTnN1LshRbdgkXNvmzF5jxb57jVh3eBzbGKD+/JwoPKNlwvRcTGk5VmsDEu5PmmGM2lUfXTE0XszAKmGlo54wbjshkqfcPAb1hCERKxBrGX2XaWyZSOlggCsJEPlOitTt8KPVM/Pnnq/SdR3WsYi9ZcoVRs7oVBgkwMt+QYtQLhIZrBYIlHb7H3cRiytKQ== 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=ceX2PLTbPrCQTTfEW+3tgDaXzPkKfL/aXmCq/5Yr/SE=; b=oFAa6c618MO3niEO0k9XunSna4/1WhLZqCg7vP6osqSkIFEjezc0YHMC+F+RyhTLS/flRe0VSA1sH6mXqU9IAa1WOsr4OjeaR7+Swj0n1VXsp07Np9yNYOegfjjM7t3v/VO2Qc0LXDiuyQk9Zh0ANWrRwc2A0/v2CKpyYSHtOq21g6iEEyZFLqS1SSF1EtpJ4H7x8hBhfHwoP3v5hbWemGWQ4DkqLeywazCJn4KD8BRFEFdSGSdr5jp6uHl4oM6gYXOnTWXXVjXHYDJTYfdPK9sMtyYC0/vXoQU5Sd8M7Z4g8P6Ao0cqYshdyMrAgnFToSX8rdeYKvnM+wex2VPCAA== 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 VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36; Wed, 11 Oct 2023 09:49:36 +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.6863.032; Wed, 11 Oct 2023 09:49:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v13 2/5] selftests: mptcp: userspace pm remove initial subflow Date: Wed, 11 Oct 2023 17:50:26 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0245.apcprd06.prod.outlook.com (2603:1096:4:ac::29) 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_|VI1PR04MB6960:EE_ X-MS-Office365-Filtering-Correlation-Id: 2cf0be64-9a14-4aac-f72c-08dbca3f60f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CdozFz3dTnmqVCxnYvhyNcwmsLSxscZbU81Xzyr5/tyeK/8m7C3BB4owzId04ecs3F18vyqhsvl3hMDO2PAIWgkNHEwypwbYz5rD8Nyz5y26Ei/94sNPEWeskpy8TkQhZME+ZJx9YTrIimidOU6oFJJ3Fvn/7EVWg/rLcdZv0AqHYiNAHGsyBzux0ZZiJD50IsraIDO4gaAqkekXDu/rHC8Cb2tZd5tBQRg38s4Mxpq6jN0PrZ4NPgkwesvaPeqUi5+Fl6eXdO9Iti297f/0O6VE4738yUTnM133b0vWjePFaYs+8ABE6JloCa18k6ps+2DT5/OA+3MiD7+aibROszSwc/lQRE0Evy3UOfQgs/XjuyAAO//s+yC3cYA1Dmzm9o0AxMfFQgfPvCJ1FzLnIY/wGyaL/YxDsnjAgkwFOstP1S8g8vErR3MZXPOcIn+0aRA2lnpqbJX97/LuIiee6B6IgGp6fIvpnDDLvDNWZpH7mLf5xNyIMV2s92aEbaGUUYrT5Hrpdkdc02RD8u0FDjUDqH3DuIzXu9xtFOrwZc3CvqyintEZF80tKtM2BWkno07yHzEkRcJSDfuiBFB0KQjp0glb99o0WWB0VolUR4M= 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)(346002)(396003)(136003)(366004)(39860400002)(376002)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(2616005)(107886003)(478600001)(26005)(6486002)(38100700002)(6512007)(66476007)(316002)(66556008)(6916009)(66946007)(6506007)(5660300002)(44832011)(83380400001)(4326008)(8936002)(41300700001)(8676002)(36756003)(6666004)(86362001)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lMOSvP/q7CExmpb2Z/g1Qm6+B6PGSKM9Xth90lj+qP376ZhQoJFuAeZqueav?= =?us-ascii?Q?sZF8Yxno2QRTi3ww5s/uAeMc9HqgRyL41T+IzxZX/DvF8jRdT0MtUL7sD4fF?= =?us-ascii?Q?qNPa1pj7axyHwtUt1IhqEhjT/rkImGZQc38/RxuBFunatg8kfoBS+JlzjbjN?= =?us-ascii?Q?YyyWR+PgIw9Eq7j6zAYdh+j73e1Q8dHQ+YDA3cwGMq/Cg0EJ0zQWBSWGee04?= =?us-ascii?Q?qPhvWwjDM1xcaJn2V+0++LbvPeyS3qjA/DAbdIZdZtgtyz25djrwMbKykoMs?= =?us-ascii?Q?/cNrWBIqfIbI1OfQGrKeB5QNc1HIQb/HR8gylIJNRGRtBXcJfuzG1MLlDCxJ?= =?us-ascii?Q?EqhxthzDhqlDH5GwPnBtOGfCxB80CGFOMFTqG7PXZ+a2RP4EuIHbmdcTVzTE?= =?us-ascii?Q?4G1oJOB1n0c/DwQKLb7aZmO5jVZrZZFDZ22r/+TB2tiCgbPw+XvL8oBMkd5P?= =?us-ascii?Q?CXSEE/rCaAS2TsUTwXF/J99ExHAB4EHILLXOF4ruvER3uRSomoMLJXmVC6SE?= =?us-ascii?Q?R/S/Tart1RaquM5TpZzx3z0vVtuZI+3iwv/eeZW+PYQwAaP487FSGMqg3AOR?= =?us-ascii?Q?JkaE0E1h7hJVFquRcYGctDskCQRZFoQoEK+4n2q46E6Gn9GuHLRB83DaJHHk?= =?us-ascii?Q?SsCXWWrlmLwFKIY+e6otqCGJ8l2ivLtMD5V5zZYNWPDE+vMxisMXoqyYNGPh?= =?us-ascii?Q?XcMvMZk21SOt45GB0cBSs91RPtjAEwh18eBJF4LdsskRhcHMC6D+wBt9VyCx?= =?us-ascii?Q?m7qspuhxj5wN0wJ/4lb6z2LwhOjWy3OBLd7GGfw1qkmCYn4KAxQ4ytvu19QT?= =?us-ascii?Q?n+BDKqjXBuK6RnqFcFB14pPDUteVMgso0rfUZc0OhSKV//g2Tca3iGWvL+wF?= =?us-ascii?Q?CisITjf25WL1/IqOhdS77ucQe8fQprj/cHwgq2ogGw3c7eoOjDaFWEUfHr86?= =?us-ascii?Q?qPwfghPQRS2xwb7vugNWzIk6yr4qRJCMTq9APRqSGjMc+kEP/oZLZjC88la2?= =?us-ascii?Q?+auMG4gp0WyQBNk/aGITyKrwEhdFafG6fbSKAQxxXLU+DCBPWDdC05peWjKW?= =?us-ascii?Q?dMi0JKbjz7tRk+CwwtRmMo/ACCh8CLa4IPmPfGmKe3iwcVABy2ZFEZ/shEHv?= =?us-ascii?Q?QJ2dpiCpyNORI+gBT+D4ruGGr0pTv2h3AycgZ6+DXpDQRhby5AnpdL/XjwvB?= =?us-ascii?Q?zDlrZdaIoQzldFfHrUm6dM6YyjNPV/18u58KK5hPaqq6ZOZbbozDRheBEGFt?= =?us-ascii?Q?tXhqdWDXWaxXwgT/yP3b1tTOBcNJY7nrwpK7fbWZl7EApEz/t4T3u/rAHjOK?= =?us-ascii?Q?stYffx27N9bcJIEHBQE66pSkmwVe+FqfICVkttQpQ91CZw2WGb20G+bFTfI6?= =?us-ascii?Q?9WDRVJJv5dk2zhsNUwI2zX9TPHahCqIVcAkJLZdC8btJmjI8vtHYNm70E7iJ?= =?us-ascii?Q?2XXqv5dxaTea6aE4YdfiHtzw0sz+gAZsADCmRsm75PL8rsLRsi3/LbYALngJ?= =?us-ascii?Q?tNVwzBnOhEWkFS8BJHcmvvT84y3SXj28/L37LUrN45Wl4EqO6+E1QM/9iK/7?= =?us-ascii?Q?Gp0DF+tlPsPgGVxel+NL8xFn8SpGBImW2o9qY2xm?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cf0be64-9a14-4aac-f72c-08dbca3f60f9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 09:49:36.2852 (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: xIGDXIDNwI6gMJzC/31wfJg/58EW6dBx+MWQKFAfQYPQ90jfLb8ESWmchFJnfJgLvLSPFjaw0su2zYtg2GjK2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6960 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..199ebd0d3463 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 2 2 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3 From nobody Mon May 13 13:44:12 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2067.outbound.protection.outlook.com [40.107.22.67]) (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 7EF101A711 for ; Wed, 11 Oct 2023 09:49:43 +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="4lHzcXLD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YMK+zTt9ZVvZPI2boW/AMBxxUtH3hgVldGLpTym8CIOdA7j6A8zVN+Ve5U1Bw58DVOboA9uyRISufGqWHWenJJFSoYecfGzyd+9tB+TDf/MQKSFOfCI4DqOHF24+qFZaOveeEPLJBgu8Zyt6p0eGKRD2F+hLaAS+ii99Yiec40udwBhAQiKlVMUv6Wi844VQcDo/0j99OxOy8/AE3NWBtUXifODnG0deUmaIa4wgGreHKggKaK6nHPVD8q7rA4rUy7/MEY3OdibXszleCCP6GqPcKeYujWCr0tE0GcmvBb9hK3lXm42mWQDjeGE1x8Kg63pHMacMQrY/5EWhx0mb3A== 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=AHHtdByv+OV2DETO4XcrnDDq23xJXC2U4Ij3FSTu7f2+D7J2SAAD30JWj/jdTVBOL3GrlsWF4hk6ifL3JkXNO3Lgk1dLdArsbw7xozyEsN2lYC1n4bhR/cxk8Nsdl1Iy2GTRN3e/00YxvFvx9mMHa7ZyprBxbzN0g/te3IowPVyppPX1AQ3yW8YYYMtOqkPMiA353PwbfQvZgeLB9h4VR6L1O93IRsmmDR0ES7cjgSe2LTpRNpOLYtvlF5EM/3MTaomZtw45Bp+FmILGfA2ZTlLDJopOv1/5tZIXlONSf0CKWSYfCtcxeCD0+hbuSGMNlMqDsGDJob4vqqvq3z6C9w== 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=4lHzcXLDQ+Rh117FlgE1N9kw8RGOkVCx1EErHX+LtRNfnRLhUSCiUhlisklw1gGySS577EoOuRBR4KIOyZkB1YJFO/Bazs6CEhfz9o5iQnL4QSCsCKp/0i6u7RBLtzSVeinAkb1ePQV8S18EYtAqsU2JrMs2kaeRB6xEdcSU0b1Iz8lpBI3lpV0Xm2F4oqamYudOP+pwBcwuRvTDkWefczLN7xsWDySqIljwwwlHhPyj0pPxThatdIjZUo6xUHdkzu1mYdfa7q4OYiKo2VhhbnSOfWZ38JvFsRzE1mj4FLs68xaLcHm4QLCnjdvGU2ZjSR5WBAhYPxJspyp96SteXA== 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 VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36; Wed, 11 Oct 2023 09:49:41 +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.6863.032; Wed, 11 Oct 2023 09:49:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-net v13 3/5] mptcp: userspace pm send RM_ADDR for ID 0 Date: Wed, 11 Oct 2023 17:50:27 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0139.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::19) 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_|VI1PR04MB6960:EE_ X-MS-Office365-Filtering-Correlation-Id: 99b03555-b517-4d00-5324-08dbca3f63ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4A8x1u8g+x/tcP9U45BOpRSUI2y4wgwst/cY0snzN6GdGpyyHCCNurg3qtjNHOMJhQJ02sdp+fCxb4hLLTYEvmbI8q12KpmdqMEXp8UUnCD5aEmOY2a5NVmnNY6uYUpyAy1bc9NeX3vnW6JYV7hSbUSjr4loKHXfQ50JJw+V09MSPTucGgolmyssf4Ar2zM8PksZA6fR2wKbCtdif2vZP73PKO0fTutkaJzZyvGWv/wCeXVh4F17QUqEfBHym1OMiQlr+HkO8Dy8D1L1rdj9FsrKawowdaGX3xDKNogg4cA0+f9a9DPrSsaMBc/NdOh9G1lbIX9R1xE7NL2sDZvTXb2hcYkwERbccbMCV9hSRbURjhAzkr5BVPclaNmyZ76u1XjR+Bj2XGzoKaN0pJa3OD2WSaXGE7XNVHEJ5gpd1NYSHXbdL8S60Q/7OwzOSESXDr3ixi2kCXqBNw2t3KMdTkP9paE8xws5PuT76WLcHl7ZR2yrj4agt8uL2YrtbOVAO+1456XXwYeloOuRqrlzE8IVQHFaUEvuc60IeefVqSmcrUWnKPOV8U78JlAhyarKhtPZVbIA0LefIj0RLDC4VKZFv2XwulyOyHxgH26D1UI= 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)(346002)(396003)(136003)(366004)(39860400002)(376002)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(2616005)(107886003)(478600001)(26005)(6486002)(966005)(38100700002)(6512007)(66476007)(316002)(66556008)(6916009)(66946007)(6506007)(5660300002)(44832011)(83380400001)(4326008)(8936002)(41300700001)(8676002)(36756003)(6666004)(86362001)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Nj9P92StR/MMBiciub5oZV/3URajudrkLCqlMi/AYxJGDNJHIgmlIa4Ijadc?= =?us-ascii?Q?fgYIz8pC9DbxJlwUlQIAc0vEqO7D04zQ/gHlTHnEhGm4Rp1fNc6C7Xp70bgY?= =?us-ascii?Q?hgaX0Th8GCOAAHYajXtKFFM/Vdl0YcHfSfyEA8ZWLILckdOBAuU25hflgpkW?= =?us-ascii?Q?khkO3vZXNvDuLiK7BmPdDfbDIkcjelWzybbEif4kmPwRpPW3i7B4BugaUopz?= =?us-ascii?Q?VHwJj7VDWR3Q6nJ1AEOZTlK1cdFQ6It2PaK4D8Li0l4H6DoJZ7aXX/maV/CQ?= =?us-ascii?Q?O62fbb0YHHZdDrak5/3XltKQGtWkpzh4ZfQZqlh6A4uyr2UTaJhLqb3BLb/e?= =?us-ascii?Q?gmTzk71Qh8fiOYeehM84cyGOOalM/8PSuwn+93urVPoQzP6DijFYovY37My0?= =?us-ascii?Q?MJovP+apuuci+aG30nFL3Vz/A2N8Q0cCiwWXKZtqb5sx30NY5Ee3UA+AQVSD?= =?us-ascii?Q?7/cuT5/ZDBQ6tpXdXI+IisToNppChXbgKaqDF6sY+Kv10R470/7kijzllZdi?= =?us-ascii?Q?+SnlViLAuEUeyHsrA/5jhm3t3Rn01PHnFntagrLf6VSLyaggmWrmO3MXmKDY?= =?us-ascii?Q?laXb3Q7y3qRTkX9NRBxoBB5MwRzwJdKzn7DXROlKfdTn2OXP6VXBbXE50VUZ?= =?us-ascii?Q?G7vtK8RB7UiSCrWQ93lExj3F7kODgm3GEDsKl+qP6KtrDObDgfc3nnaQs6PH?= =?us-ascii?Q?sdWznG2v5MpF7YnqwZJkSSt1m2OxEIvrjztcHhLu1s9oBt8CmdoqJrJ3PLVe?= =?us-ascii?Q?L5xCeb0ujRRE6NgcEKYYc7UwwWGG+oNIHjAH/IiOJUIef3Fngn3PFyrZhSCW?= =?us-ascii?Q?zUSseqvx1vmANOREazUHUTdxU8UE3WVXmc//GHB1LPGdcst5fmlZZR6dAxL+?= =?us-ascii?Q?6cfWqlhEBPG2SnV+CD54KtpQrL4fJ5S/RLJxD2HJL9r6fU/rCIygt72hHNxv?= =?us-ascii?Q?e6N3Rbsv9iX4wDqdj0edy2428Wi5UbMeN8y2LO27t0Un7ugUq0b5FKdMAQqP?= =?us-ascii?Q?CToFdy2PX/sS0CqoPPyXGRD+1V4nrlKGeSjq5nSJdDBIjXEXZ2L+FKQN+u+8?= =?us-ascii?Q?qf8z4nLvT7P4Xtq2fAyGFU1BXSYdogQ8x8laViTrmSvM0rZ35Wv47woYC8Mk?= =?us-ascii?Q?4ZTnOZOcYm0kpg836vrfJVUs7QU1kwXk9IRliZwLBQTHagLCDi6+EzG08PA8?= =?us-ascii?Q?KcbjHQEorJCrsFGgc/BsXqcp8pWfAozWPK+MS61bEk7kLL4TAzLhj5R0YWmx?= =?us-ascii?Q?HC4g1k03TSh8R5V8nz8UyD5vtdCcXXhkOJLxnW6TQrBYibN1j/dD4K1liDYq?= =?us-ascii?Q?P3vr0yAM9ej2aUFauTr314B8KQw5889PeXUV0gQJWGGVHcKUjtB/rOuflMzy?= =?us-ascii?Q?D//2mRQLcZ4Z9b9/XvzkZX07Cc9qhuuSJZfMHoKlwLNFDdkwPSsFMQUc0hMa?= =?us-ascii?Q?nIFRyRP0KN3nF/dIWaQ/+M4cvg1UL2qBf/EQN+rP36iE1njBqL2Yo9sy/A35?= =?us-ascii?Q?KxzQsO98rzUC3FCynk4Mm2d0ocJi5ySdv9HqcxeVNDLLTtXPqccvoLeljsKT?= =?us-ascii?Q?RJt+mTcPczjAzVTu5s327ezBISv0dcm4W8KLdhSv?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99b03555-b517-4d00-5324-08dbca3f63ad X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 09:49:41.0275 (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: ekqDrvOGaB3fENlS61ED6MrFwNVUStSZ5BW99F2vcbHXFpbKFj/IPwYhi/ktPYzc3uodM2JYKgVA2XwF2GI3qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6960 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 13:44:12 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2070.outbound.protection.outlook.com [40.107.22.70]) (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 61E9C1A711 for ; Wed, 11 Oct 2023 09:49:49 +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="gBBAFl+4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lldGYvK5VNndVdvYJ/6/hjlHmS8hwRKPC68Dfcrd4bDICDRVQPvYBAaM4vn8RvMHEaCZMENg3n7O2Ojm0vVlpq4xxBDRFttfuw7fdCW1Nbif78Y8/H8z3sUEcE9EFpfAT24FTFg2ZrZ8/zWq0oGFyF7Td5LVm+lVpfZcPCYYN8niSdoDz1mcHi+AovWyp6o/dDPK7+K/CD+qgglpmf0giHhnPD48AgPuD8Z3HhSuUxpo2wepKCXkINHYbRWXT39raP0vAFKLTh+jOrnV15z3r2fp6hgrb7TPaS93w4hhSbc2or/eCqIrp0+ssmc1Cuw2Qim7O3Ep1gjGwxRuBUWD2A== 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=IGDfotVFiKZO4ZC6pJndm7QzxOpjIh8mmpEq1aV/hQNDNmbaONeR0YNSBOmrA3BApznHxt41gvIFsa2Zy0T7MhPwRtsHGapojHNHwNE30wL99yD9WHknTtshHwioChwPIHhCxKpa2Ei8mHdg7z+p9gU3wet3pbxyTuotHLb5ABDhLJSsk27SujqlQt6v1pvE9vv7A5kHH6ietRSuP2/xCumj6c+tRQhXF2D8U9aJecBwDDW+8AtgOFwkS8HgHlN7tnCQTR4z+976v3H661GepMDZtVVC/RVTzeeNLt8Ysb0WvIDn1exfClc23NinxEIaD8Cv2zLCDheJfuDoEWH3KQ== 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=gBBAFl+4/ndzL1vnT8q5dOf07EJlkoOQu8KnYLLDKo2fgkEI1oKY8Ni9c4PhvrFVcMNh9yxsb5dBIC25Ud0u4F+SQHe01LfAzZuv2GMUaYgUoCKLEd05qBgrZ/irbJUCmW+mAZsLdYQPS87aUXfsdtry7w+M6g55N8y0IjLi+2P8TIO+DA25mOM+pF5f+sbnCjaGt9bMfRMAio3C8xRIHHD45pS9stTI/bhAlJ6xKrG+VaHlqkBKfRZ+z3cxE8DRbhMv9/Msu8dR1sjKAONsF8+GbGDQWfLBzVLDCQuhWE10iYdpegpbXRS2gavrPtXbJuNtAjTxMPuDiW8amE3ttQ== 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 VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36; Wed, 11 Oct 2023 09:49:46 +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.6863.032; Wed, 11 Oct 2023 09:49:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v13 4/5] mptcp: userspace pm rename remove_err to out Date: Wed, 11 Oct 2023 17:50:28 +0800 Message-Id: <632571ba0b905193b4537b04e612e9ae588bcf0b.1697017655.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0146.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::26) 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_|VI1PR04MB6960:EE_ X-MS-Office365-Filtering-Correlation-Id: 36d14f0a-0325-4455-c9b2-08dbca3f6721 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nHfknG007ZU+XsX225HBzFxVZhZ9Y7HFrRRMaBx1w2O4IZdAtuyetY76dbabeHfgbiX4pu7kGq8nNRRU2TZywvxA/DVgm1c1Rj820dIXh4ff4+J9YF+w87yS1JjToxegkQtlzQ5kmyD9zp1SX+Krq2HcVFhJ0f9m1mCljxF/16oIDclOEV9/2qCbd4zJHwcdhQtg/0jY3L80qLtBqpqKunsGbR9YAqXFecW2fqTy5HCoZ1L45tTEWBVsgpohpEqVewrEeR90LfqGxnn90jrrOujP/JNOmz1tpd5NNzycYz8gouBKy/KTGxfTB5RuuOZ63YoU2KwMVfllDJpZSCqKAPqlW4QPF23OX5hYkRvcg3p68VGRUnvVYmGDEfep7OF3MDjGXO7gE3ukNYMCbZByK5bZFY+sfAQrDoFGLhb+GozCHwZEElVqfq/y9b8ZJevXiHGzIg1FYJVh/f0fH2EMXfmm4QBicqzK1tYvxQ2qi4uqTbO6KFz75NPCF74TZREAiLIv+DYmMHRUn2pPL06hHVYHFvuzZ4MEVf7osYwlPqYpNOClGJD1GFc7iiPmVJT4JUc7BgmLc4hstkljT1t6+DHftYpVea4WAp2hECpeh3Y= 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)(346002)(396003)(136003)(366004)(39860400002)(376002)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(2616005)(478600001)(26005)(6486002)(38100700002)(6512007)(66476007)(316002)(66556008)(6916009)(66946007)(54906003)(6506007)(5660300002)(44832011)(83380400001)(4326008)(8936002)(41300700001)(8676002)(36756003)(6666004)(86362001)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?H5FLsbJWGwbhC8eJOSZl5UCZl6UgGWWTDwRGqzTWG6NO8ytkowGv/kRmLx0B?= =?us-ascii?Q?L3TYmar507qSSBhJ8bH1Hs56LrL9+S8uDUF1AW+GFq9nOdASw3Zh1dUPT390?= =?us-ascii?Q?sOA4EUmFKjxbNNLOk74rRH7pz8UeO8qt6TeDai5JYMTqr7SnbFuKLgT96/RW?= =?us-ascii?Q?9fZqnDF6th3rjbKFTuM3gAWg2dUu1P3COnjJnzNAyfoGmXGGv20wGEUwVMk9?= =?us-ascii?Q?OzA4Cy41cH7m9Ueu8KDv2aNbYr8ql43e5EXLfrI1eQELZNOeYfWpmMfL5T5W?= =?us-ascii?Q?4r+z6tVGIR0BbE16ifu1dTuobohZ4lEvVXRk1AtVBFIlS69m+viYnCDtIuoF?= =?us-ascii?Q?lNdgN704m9O3AyF3SGuEsRPY1TUcLWHY1LFDVFmgUZqPUu0ckj8unkIbrloR?= =?us-ascii?Q?sXUcdSwmMx3QoNRlHrGXAEE9M75XSt610NpHSAnEYZaf2hkD5J4giLQUPHA2?= =?us-ascii?Q?BxAe+3r9x0bg4lXn1Whz6JzKMdSS3qECth/4V07hRuK7RSf2uMBmiWDz2Eqt?= =?us-ascii?Q?7nRooIiWz+A0duWtWMPS6/ZWRN1laYbc1bOGEK5eyo+vd+saqyql/cEyt64A?= =?us-ascii?Q?s3OPg+BHiSvVMDmUQzixcstFEBrTvQGRXwGrTAJ96QdledbUmDSV9ciN5tVA?= =?us-ascii?Q?No56RJrPdZ9Tp15S+Tc9nf4w/LH7byr7bqXBw+lx990Fmc3PjLerVAl1Uvjq?= =?us-ascii?Q?8N0X+N8MUkm9Eskka8turaodXTk8QTcuYb80eW6mkq6VtcEMWXnj09Nlhy5i?= =?us-ascii?Q?4xXyuENM4H06IdqiIk16qpMgEx/tQ11ucSMi0FuHhXKqsa8BU3H85rh1+j3n?= =?us-ascii?Q?6GtqF9DTeiQKe+Kb9MjwBRjW+IBXAteYX3CVPGjy40edHecuKyXevi2kRubh?= =?us-ascii?Q?k91vMtLBuEHvlQ0ls6X56UIFQs6ofC8GIxs9tAtnGybV6H/c/qyrpUWdQXRg?= =?us-ascii?Q?A8OoO0ThItpSoOIZRj3r/B8M9DJKcp24IV1WQUDkMvNhYgflSzhqvrFmX00e?= =?us-ascii?Q?huIPHYQ0VQiAEvHr5DR4NpAt9qYWvkqUMdsPgqc6h2qNcroQXbs3H5Bfb27j?= =?us-ascii?Q?WNIvPmpdHYOPhgC1/H4ItvU5S+gtMckXidTAPAXvypvaMEqkKMyncNyXUXkg?= =?us-ascii?Q?FDoe2xECnkba0zwJ8+NlgA2D1vzKmZx4NUDX6ijBUa4XfoiIAL/tHgAWDbn7?= =?us-ascii?Q?xWXMHAPSTkFZ8kfVYL25+OI3cyA4EKiPe4Btwsn1Xxw6doAQx8MLzbfKZupo?= =?us-ascii?Q?KGQ4jhOtff6xgnTHuU7CAY0bHLBcKp40Jht9Hq7FzG6M+P85wikyyDVl8sO/?= =?us-ascii?Q?On0O6uJAj4wH48imtODBw1u8brSo/t8Q7zo9zbEhTHTwoy8FSjzRvXZXnWyS?= =?us-ascii?Q?r4MSUio/qyc8x91Ik9ly9gNLnh5bekoEkhMm/ewLHCLoARWqa7rHb+jIwUon?= =?us-ascii?Q?rkbc5EIp6Z3pEBvFZBd2L3+7X4KcGjl1OPD/u3H35CjjC8Sa6d7+Irj+WrPd?= =?us-ascii?Q?zfLkS4py0PCacpc1RD/zeiRUxHuKM0tbtvjfXZHQwoBOhVHZYN2BTp8JWTvb?= =?us-ascii?Q?aOIUVIars3CvzXKL6lAqM5wa9pJJDweU/mm/7OG+?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36d14f0a-0325-4455-c9b2-08dbca3f6721 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 09:49:46.6404 (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: ayP6z+roW/fdeNo48MLbQNlEN8toj4COMW1Cw+iCvm/HwlTkQqI2pnTgizQgQAh4Mhs5oOL1nY8+8ETFYt/dtg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6960 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 13:44:12 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2081.outbound.protection.outlook.com [40.107.22.81]) (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 422791A711 for ; Wed, 11 Oct 2023 09:49:57 +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="Oo31nR/D" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GIA3rQ/9tMtWX3UwBWzgoHrjiY71irpbb0Fa3f0Q4LeO0sfGuxCHJepWX4f2HAdgouW01kbuy/LEOabS7kh0FFBgva73FQmrJcaLhO9wD98QVIWx/KS10mSYBFtnTiGRapjSACN70nCWtvDyXIMhHXieFdJskHnMkG1oj10ihheeREsnVmL0ZyEmFWxInDUD4fnRzbHI9TofrQy0Puvegl2elEjZnjWzBsaA5eIzBHnNO+YvsGqlDkSm+12l7OCE4X3RTEzGahoyTVNdKlDI5tzahSilo5zH2ovwOWwezp+phTMNittErajECBwzGCXqJDCbcjdEM5ZKmwqrmSH2nw== 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=ZboU8sZxy30f7bENmDMoKvzQ1EsIW+DN2H1xdFteNzY=; b=LaBUPR51oIPrfUhvV9RBXjX/O7OZLpqLCGhorKE5iM3AX5Jc+RrngScPQXFEeENHWpnGlnpnoqL/nkw3SuAx5KjjaePxl6F50j2fMrKacE3T5u8xpIj8qUM88OmML0IanAIKOiMcJ9b0wKxC4Gtp8sU94ZAMU1AitttJxXhdM4oxJvwWQof+gd4uZd8UXNdVnd6ft+ToGf00cX7+2i+cbsQyizdWPwu81fLVxj3/IB90icgdyCXMCjJbN/gJcc4rAPJupFWb//Emgk0yE6zvWSKKVsQZfgE51/HEYtUW+cseYnT+HiXSDPJYz9L8hDhglU/hAYbDzq76WxPjL51Ctg== 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=ZboU8sZxy30f7bENmDMoKvzQ1EsIW+DN2H1xdFteNzY=; b=Oo31nR/DHCDXGtXLMHQIlhWDsiwkFzb8C0QJmMuZ762n8LYmu3cOedfWxnp/CpMRI68emUoKhVhG+xe+Gl5KfU+7c44SJ/z4t6Cgf53XQMi7ijV/Gdiezo475/X1a21zxmHu74weQegNH46I0z+WLgcmlI/ofcY86TZsWFNa1pTISh4P98uQ1y+Xr2nyB52XPPBioIwYGM+qukUuOML5OV6Yuec+Psos5bGlrgUccCvdCgKuY+s58gCctF3hyj3wM6lUnpelO1+qCYM+vGWANjItPNO4mquyqv4PJ61Eq16s5/SpjM/jKhSdn2A2XZqRxGwsbpLnB4Njlzh1xPDf2Q== 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 VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36; Wed, 11 Oct 2023 09:49:55 +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.6863.032; Wed, 11 Oct 2023 09:49:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v13 5/5] selftests: mptcp: userspace pm send RM_ADDR for ID 0 Date: Wed, 11 Oct 2023 17:50:29 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0122.apcprd03.prod.outlook.com (2603:1096:4:91::26) 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_|VI1PR04MB6960:EE_ X-MS-Office365-Filtering-Correlation-Id: 5579ad8d-7fb7-4cec-152d-08dbca3f6bf7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o43bO6nfQfpMMNsmEwthMUgHRpDDk6nliqECqGP4MA2GmUZBcyBZRjR4Ia5z7nXC8f8ZevMCyZAht8JMqYLjotZn/lyDfyTyhYPpwbAqvVQD7SVW7griCpSBi5boKfOMPpwsj2VMY2bORtjM4Ady5kSL0/B0i7dlfP7Mfj6V9LzMGdodBQZdjHLysxhRh11o7A1gaGnT++7VPRlSa+Idri669cqk5GoRa/XrxvFF/xrYSLjxYEal1c8nMh+X41eYSyI86jUYC78f6FszA16vTyX9VavIY5BBKDAdbwYRqoYEzUpvBaVPrsZ3VMRfnSPl+NXvhcxgv5uv8FQUPchY+Hx5aDfcE1/AmNIsTavD8OEhXEaMKE3uRbngMPHi+FYqtEIzJOgzmew5FULd+bEu4K7+UfPKqN2A4qnAfXYZetJS2qJrR+9UgHA7dgf913T6/dxL4rwH1pej77MJ5q3Qw/ydsMhj59f3/dRTeuzHwAGIBLlEVFcR1NGtbryk48dOkMt6zlwekR5F5/3ZKIA8txeLqVrVszQmqWAcdiJCwbfRqIupj7hLypVLaMdGBg4p3ixzU/5S4Mlr0HyoftD3M909AKeQIAOjNQS8QYeMtJk= 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)(346002)(396003)(136003)(366004)(39860400002)(376002)(230922051799003)(1800799009)(64100799003)(186009)(451199024)(2616005)(107886003)(478600001)(26005)(6486002)(38100700002)(6512007)(66476007)(316002)(66556008)(6916009)(66946007)(6506007)(5660300002)(44832011)(83380400001)(4326008)(8936002)(41300700001)(8676002)(36756003)(6666004)(86362001)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CZm4WXzLV+GU9mYINDTPZNt0MVlcgrYaYArVgJPtjBBGq9y6XZx/DoUm/dT7?= =?us-ascii?Q?J9YO+d/rm7pal3XEBMq6jZEb4WehWjPNJ2XANVwcmn+KWkGTzcJqRxFv5l9a?= =?us-ascii?Q?lVHYFYHMxJjOvVlQa9ShSNyndDisQrZZgB8hVdXlipzB5EB76BvGgufjuHAZ?= =?us-ascii?Q?feDOsQlLJuVdJqClKSHI1LB5tqpz1ok8x0wh96HquafEA8VR/bosrd8hHdgB?= =?us-ascii?Q?TAi64ldTxGQula8TOhLcytMOsge97DZT2eQGZtSztCOnMSNUkuF5pr8rKMfR?= =?us-ascii?Q?0qVLAd6C3SThuhTicf8cto/MlnTsBgq/l6yhmplhibeHT54itV7kQIhnHJa0?= =?us-ascii?Q?GRT/exfztlDuW0bddV3nO3NwhhN87aBJes3xGY4HJp4lzK3Y8wQwBXOwE007?= =?us-ascii?Q?NNqk4SOAdEE6fzHHweW6iKKGf8bEpISVauf+di6oYluhkjB5vLxYlUNO529V?= =?us-ascii?Q?iFXvCk8RK9Nk0KzmQwU3mULQAXpi4uFp+cyMpEDhxj8NsYsUnqHPHnwAEROJ?= =?us-ascii?Q?wvripboe5IzaYlqCr9uWxybUg3hxSIpOfCyHu47alo3rXrK1SLOCT/I1WNLK?= =?us-ascii?Q?PaBsev0iUkoymGlNZAsVh0A3WqntihuRdIeQ85ba0SuKShCOo1gkoeJAStbX?= =?us-ascii?Q?/c3vC4b/q+rTFYOgUaNEzCt5zPcOH+OY8whf6Jsnnh2btGOVlvuBtSk4xc49?= =?us-ascii?Q?9ihe7m8VJ/BJ2Esk22cWBqFxelZ7pXbnTJDxpIikf5uuAstjumsPD12z55+a?= =?us-ascii?Q?d333EMN/yAiPhoTNDKlCe5GS033U6vZuCuzdXOcsx68LHuJG5xl7s0yqEph3?= =?us-ascii?Q?nbKr+dTlE03b27iJILAXL5RMpy8qz7G0UEN7LfWwEg5+C/1knulTVpVeoZER?= =?us-ascii?Q?BjM/e7GQX+njX0sgg9EAS537bEXDBbMVI4y2OabeOtNt3UNH/k5ya/qKBJg2?= =?us-ascii?Q?cHM/3XfY4Wn/dUqOUyNTeEenNHHSOOj9OUK82vNzTjtESijzhXYF2XkSSi5j?= =?us-ascii?Q?fnXQ/tarHq1Uvc2GVHw9oSku7gNojkV9uWUCofkCm8AjvD1fj9bjNLrKOKDy?= =?us-ascii?Q?oIrjLfqIAN74HU0zFndu6ASOrH7fc+FfRwpFOrOhLRx+ffkljYK7SYFHUv9i?= =?us-ascii?Q?jxORk0G+0cGfxbHIt0xFCRMKjzhCvcv9XDkQRxy0V8LN6TUvD+yko1lY+IeE?= =?us-ascii?Q?Z1mvs2alhtn9db6hJhaYxPD8AxdByFT8I9fbT8wgUlU4ATxOn14HkdjtT8K0?= =?us-ascii?Q?LGxq88BfTSC5J15A7GGgDVXwHHUlVIscvmcNTQRw/a1CPx+NfF/hR9GTJJk+?= =?us-ascii?Q?V9vHcQrvduiuRO6hKY38WpQG0w39fctKEC+kfZrNUscmp0kVa+Gr9GBVldxt?= =?us-ascii?Q?QcvrXBVOrX0F1iNSkQvtjOhXTTg413N0VuoKS6GvR9wj2Y5W9sGLRQS6mLvo?= =?us-ascii?Q?KBxM7zXjLn0IfOIA6LFFancD/Bi3Xp8LfK8M5j7+MaUT3kZzRU3aGGFNphQ7?= =?us-ascii?Q?prxBWz2MADDWtBL6kmiTgQK1+SMolFzk9ZTvmL3BmFnGnbQmqEntcIFi7p2U?= =?us-ascii?Q?34++JYP3CVIv0RDwu/vqtKKKBn0WAXRVUKqgSX5K?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5579ad8d-7fb7-4cec-152d-08dbca3f6bf7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2023 09:49:54.9281 (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: Q/SFInUAEh0Ga0zOMdx3efMUn32+QS3SShvApTox8q0QW0Oxf8kHvkKOmORm2/7XsVVVCM49Y9n0fjFjdg+vIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6960 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 199ebd0d3463..3e537ba3a68b 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 2 2 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3