From nobody Fri May 17 03:01:07 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2055.outbound.protection.outlook.com [40.107.104.55]) (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 CB8A1525F for ; Wed, 9 Aug 2023 07:06:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W+ZjP5QK2AJzrQYf0Tqxe7do20566s2Ow71CxLBu9BjmRaYT3Kx6QeQJ/4iUH5B7ZYr3A3J29VSg1B2WqCW6gm0DdQ5pn+yyDNZ1g/fP7yZusBb66lNbjiiduaEdwHRqGN4EYjoPjl4fK2PFiDISML1cNNC7Rj0/g+FQ71zU0lzdDdP6KSJIyvXGFzzAsmd5aezbgL1RNCES3YVhBXmk/HwpTlwdjKCFnych1OFQU0xQK8hH0Ojr1qcQKlPAfb/dH8GwWTgHVLXZ279EPezfGT/IaygcXdZNNQoTastIg5fRXw8fwW9XR6NOddhgYn8zuY7dLJW8O5U/ZNaNlIttIA== 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=P2XXCJd/g3gGPFRi9FigIonSHLoLOG9WdKxj0s63yHs=; b=kbax/DVUU9as2rONDNGKb1+R1AHCY+76AmxSCXvuMand/x9tZJXp1HhEcbO7+zIyQNtxDij6o3ww+9GL1g1gT7BxmHXmiyMtN0tkORh5l83yRPZDrY511a9usrjNgq1yCYj63rBr3IWjCBLI4/YX+6TC8i61OPTTwqgfcadr0wMuaCORKIEiLg7JHJ2T42IidLv63qEuvFzyCDkjqsSmgTJ74TtiTucQBwdzQ0Wr1rpTsyQWWPpZ9EjB81dtd8Cd7crMoDUXkg89V4uLTmFJrTjgvdxUDxyd4Ll0qZ5oT0oIkCp5fqGyV/ubh62FNU5b1C4S/D1RmNqVtoUUPTUTFw== 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=P2XXCJd/g3gGPFRi9FigIonSHLoLOG9WdKxj0s63yHs=; b=riPt/GIeNwHxI/0+co/QEoKDNrmpwF6PujxSh3kcGCq+CiMKgjy63vio5Z50AO/MJGNgxJ8cpacAD6uScazKgNnpH0YfGyWRnqGrjFdDXMaJ4RKysxLX1GiVHQrPOQsu/m26BVrUHkcmbP5TseHvSxcrxwPdLpPGgw2aBkf+p3aXfTkydisz+Ed0zMyhnyIDFy2hlg4ZqDiPNIlZfIhTlj0weGth4rwNCdGlJ4pv6E39EfdHBg9dmi+mlcd8jt5VUmwIC8PT07E8L1+jXLKPp6Yj/EsCCY174UpvgHUsmB4/147EloX3hDpzwit0aqNfN450NYCjA5/CpvtBmKx2WA== 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 AM0PR04MB6850.eurprd04.prod.outlook.com (2603:10a6:208:180::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 07:06:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6652.028; Wed, 9 Aug 2023 07:06:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v2 1/4] mptcp: allow creating id 0 subflow Date: Wed, 9 Aug 2023 15:06:36 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0297.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c8::20) 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_|AM0PR04MB6850:EE_ X-MS-Office365-Filtering-Correlation-Id: ec782c56-d1c9-4633-2023-08db98a72f9c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BBQAIpAtg+TbNqvEnLL6QKb6gVrO/ks+MwBCBL1HLT5oYvy0NZFUDynEbqw9eoCylkoITy/Pey9z15kHNQVQpfjExh+nXO3YERj+ooYYGhjfEFVNhXSL/p+VO8XC26oNM4lwP/ozcS3bkYDb8ZvZufYrBw54YN6ghzWHLsvToFhWvsHH9aqZl7u7l/K7qU6SEpw0xOVly1fcfR2vNeKBhSFAI/+M076YezZyQuaEWd38ALDzVRtFU9vZtRc8JyMsfo1amCc5JQPHBu9EE/FcEQaXv2xbaKvpZzJnjrOJp2EQxB9SVcM+U9F2JX+VeCiVf0WBDTP/yE/QSjgqRkNNVNliVfdL15R5o9QQ3z6WPppcpX4g2S9iE1bNv5HMpiaqq9hGlHNq+aIRBoxX3OXb3JWsvs/m4awe7n19ZWF6FFag5+25xGk9UypJKHATJQNmj97GSnQI6SkCPsQ2ojvjoa1Ul4UH3575/Qysh9PpPs5U2YYlmsCWq5EJTphuObG2lzXApNntWKgbWT+K9Vo+oneLFZ4K/+wXn3n1UlzP+ZIESpv9+szSkpGIJ/mUdDURIbMAPc/j8ufT048q84CMgv+BA18byVKo+yczY4FV9y8= 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:(13230028)(376002)(396003)(39860400002)(136003)(346002)(366004)(186006)(451199021)(1800799006)(6506007)(38100700002)(26005)(2616005)(83380400001)(2906002)(36756003)(5660300002)(44832011)(54906003)(478600001)(86362001)(966005)(6512007)(6486002)(6666004)(41300700001)(316002)(8936002)(8676002)(4326008)(66946007)(6916009)(66556008)(66476007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qKJmXOqMg3IkS3WPf2osPONAaBMTQ1/DLmZt7oLeOKFINWtIMBpxFzY1Ddlb?= =?us-ascii?Q?pWnZiW8zF/hkyTNpyANmmYCiDoK6wtrXrlVXCoPYPYpYAHu0pqJp0+SyoVB9?= =?us-ascii?Q?sUy+tBYRjhazX0H381zuehBpfEh+wx9Cm0ulKpgpWpmZAQP6GikUYova2HAY?= =?us-ascii?Q?M4rv1gRvVJqYUCf50HXWQKm2XWLVZS3uJJ0klqUo4Aj22Ymo3YNr+L45vsEX?= =?us-ascii?Q?yofasMirTyikgqSfo0yE/5i5udqsr8SFGsZob6yzVh4jcI+w8Ztsp8PosQL1?= =?us-ascii?Q?kFEWLxHsL/JDsEZDvPPeGfI0BKjKXNxpNY3vl1KK7lPwNmznXJll4opWiIJJ?= =?us-ascii?Q?CQZSpq+EleQUh9CeetU5ayGU6EdNMgguGEpllnfwNjk/WBUCROzNvHvBdHmr?= =?us-ascii?Q?ncHdZe0kv3KTDZ0EMDHDrCSMFiAFknyMefrYzX+OrIhk/rEh49PXklDtD3ti?= =?us-ascii?Q?kcq6MR6ffVjKShNP7VepB+3rPd2J/v+iSDC2QiEZHHL58FUA16GANIkboead?= =?us-ascii?Q?IrkwYBjF9Vq9jSWgvseT0Qcp/MMKbfRZDsb0qZ4N1huinvGtyl7c2Y2BrpDa?= =?us-ascii?Q?1UlaSsLc9VLAnoHniOOP0eLGb6R433qSrxjrazHMF9RyIOAUfVW0W8LUS2Xe?= =?us-ascii?Q?YeROigrbOpxpvGvpPD270sCDXE74HFlBrOjbaYLwvsESKgOmUXnNIw4fvHHn?= =?us-ascii?Q?Oyh2HPohOLCvIIDcCFvPjBBnewPNOkP09VPLof0K3Q1/joNqW+CtyCmuues2?= =?us-ascii?Q?lW+EX5eWNbdT4XxpdMO0YJ7tE4EDuYv2c7iyt7QLy/CyEw2Qrwf375dsLI8W?= =?us-ascii?Q?8wf+/Ca+b9wFgGpycLRdBe/bEAiS9zs5q3x9REGiZqI5HWqyXH03DpSzqmp9?= =?us-ascii?Q?Xcy493fE8Xm+pWbJ1TGIgWTtscccdfm/948mcjIWGtNkOcEOO/FfFZf29c54?= =?us-ascii?Q?yuL5YaVzuqUKJwpbpLyiTvfQ39SpUtDdK1UyNhfXN3ag6lb1On6s+ynSmkIN?= =?us-ascii?Q?htIxk1/IaDDqfVzcVBGdnhMWl8Ta4bR3iYqZ0svpfbGOehZKFyxaNvUqq+7Z?= =?us-ascii?Q?Rm2ACs8MJxmchlHHxdpMNA03tfwcERC5HTsl/06l2awKCLELL999Pqjai1zj?= =?us-ascii?Q?jPdnjqBOAElon5RfC1G/T0Kr0QNxneZWDTkBWIMtS7dDJEADa2HM29d6/3tR?= =?us-ascii?Q?H/UanMG8AyRyLHhI3EiXggEP2wpnwMoAk/rGoHR/eSpQQ3N00kdE3pyg3DUy?= =?us-ascii?Q?Gr3TC720iskM5pNpCfNHjOTKVddzCTYuU/NfQFieFRrhziDz8/Op6y0Ov/eV?= =?us-ascii?Q?wF5CMfx7SWr7Re7IzPTTrnvfCeYkGONH8Mhq5VJQgTsrJogcrKRZqm3qImq2?= =?us-ascii?Q?jr2iF0Bd9D0W75DvWVunj8DkyWmvJV2fPzcJIFALh2IwVYHb2naSuAXDrLNf?= =?us-ascii?Q?OugTVIpPPBomPo+/DNiPeSxLwoELwfBPH87aen/MK4l+Pe7xicB+TBaLLpLu?= =?us-ascii?Q?OwsC7JE3MOj4gsVwjBhlwhj4OQiItHqNVJr0XEQOZTXadZadto6/b5tiucVO?= =?us-ascii?Q?2aNoZX+gKDbTcuIQLXiGR5vpIah0AMhjLfsvEfsi?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec782c56-d1c9-4633-2023-08db98a72f9c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 07:06:43.1272 (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: Efbr4Q5EIdNLCi2+Zu48d2inCijzh+zeOJkz9h7G9AWHhjxEZ3kVq+I76aGQKzWkOzV1XFKAjRM4HFDDUkYH0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6850 Content-Type: text/plain; charset="utf-8" This patch drops id 0 limitation in mptcp_nl_cmd_sf_create() to allow creating additional subflows with the local addr ID 0. Fixes: 702c2f646d42 ("mptcp: netlink: allow userspace-driven subflow establ= ishment") Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/391 Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index b5a8aa4c1ebd..d042d32beb4d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -307,12 +307,6 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct= genl_info *info) goto create_err; } =20 - if (addr_l.id =3D=3D 0) { - NL_SET_ERR_MSG_ATTR(info->extack, laddr, "missing local addr id"); - err =3D -EINVAL; - goto create_err; - } - err =3D mptcp_pm_parse_addr(raddr, info, &addr_r); if (err < 0) { NL_SET_ERR_MSG_ATTR(info->extack, raddr, "error parsing remote addr"); --=20 2.35.3 From nobody Fri May 17 03:01:07 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2045.outbound.protection.outlook.com [40.107.104.45]) (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 9C42B525F for ; Wed, 9 Aug 2023 07:06:58 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i0aMuXlZBivCTbZ7zCO/BrVmEE2tZgttEJ87YhmoONPad0J0i0sXZJX1aY+mNDdXgSfJXsUJyKN2MW463wBas/RG+197/7beY31WHnC6nufzOB/oDwM4OSH2Hw64C4+nLlYEKbQWqffkET4HroMorbAN9Ra/YqCfXKWqbEjsZ9xf9K6Sj0/+vLY4K12W40U0t3MaSp7LiTyYenLDnW8lf3VMRfsQySTYqOQ0PqukC0m7WM1Dazg74yW0QLVuxHl9iri97D+dhGEoIPsv5GWYxo+UZOHn6VbWSduRw7itBzB5UpDXqxnRE3fEGtdq+cbQwUfbtk9npMJUz7jwXwuPIw== 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=Z3lPi5Wik4xxfUZiWXaVI8p2PmvixO+S4VJX7UJgtis=; b=NoPZRYIIqVWlYGy1Yx1HdYKxMvhCrH1oDOzDVm0ssOdiY84v8bYUX31rnDGnGjYeE9Lb8JV5joErk99WgwD+jStihk3RgetaAbeBV42+831aA/GRVcPZXdI6ICICSzI/Vygm8FRMly1EdJvI3nkv1GBiD70DvsagLMvrWPvfZXq6TeWllL0gYNx8LRKYIDVpbAhAEfEEi2HpQU94P0Z4GlbERtZ+p52ENK9TYHeIlkmH81TyhSNDy56sVrSEUCXktO4WC17THq5y9tq6gGMfVyS/6JukUzCgN2rdsmp/CgzkGL8y/jG3L4wbVleb8wcq0A9P5LIGfIzg/OHdPE0hBg== 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=Z3lPi5Wik4xxfUZiWXaVI8p2PmvixO+S4VJX7UJgtis=; b=tbTHxogtfO1pD+OebptGPCxrWJPOnXkRgEQaKn0zyTEvMVVE0JfdqsV+1TRBGOzbY/Vcy0iFFdHS4zFNmoN55K4Ld15G8YIlHHrYyI0x+SUYW4T8cKIXj+bpKJSzwu/WHp55sxwOkRrqjvMXFD0AzJPkKvTDLNZyRbF/53URHF4A7fhtCDjTKkyCc/HG6YhYlnp+/ZoScO9wGaDGiZ2F+OdoduouW8sRQ7VletMbr6/AsfqieynHKYinTfIEM/1RIHXr7WFIFnSeG4IWUAXtfA7D11E4S4r4B4O0At8hDLxaDMBe4G74M9HW10zOkLcJQTqrQfQYuRobpwzoQO0CDw== 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 AM0PR04MB6850.eurprd04.prod.outlook.com (2603:10a6:208:180::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 07:06:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6652.028; Wed, 9 Aug 2023 07:06:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 2/4] mptcp: remove id 0 subflow & address Date: Wed, 9 Aug 2023 15:06:37 +0800 Message-Id: <03bfb31a8baa468a3cd4001635cd6b7fdc1c8725.1691564649.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0032.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::10) 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_|AM0PR04MB6850:EE_ X-MS-Office365-Filtering-Correlation-Id: 00ea84ab-643d-4062-10dc-08db98a73666 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a2GiAPOm1UOnv0agUfq+vbyalQIiBMNcjuRnZdEQkZhlr0JKNUSVNxvWDgN+j2Kdg2SSl+E23yft7WxWrF3fwUHuPMtEDQEznNRkZ/ZsIjpt/mIUysOu1sx7KylPGaNJbz1HD+w7woGwrKK278gkFkztLn6Ve3kF/mB2OQrBZoOIkMPaQhxXNJNcrtyYopNg/x3h8qZDT77rvIY2ZHWrxT94Izr7Lq2XQURVQsBwojFuXXpgCsivInRX+jzdkH2+PF8PsM7ARgycGyiJG/HhRbG1eEnxo3+6Tw/hCGKYQteI3L6bFG4OJVHv6pxwo3MfS8+ZZ+ItTp1Ak29C90Glw1dG7E+u6VmqEbhHwmCtA/N6B2JCTC1aGrMO+b1gG+d4ppiL/CaVD2yDv6TPMsKJ4bjShBW9CADNoA4YznoaKGw6fpQgQnIVgeiIT2cfZFajdCIwaRk8ViZ7ch/cch85F6I/+WwaOaG0axrlYNs/aEgP4gz4FLhWPpyo5GVvHBf1/VVngep4t15GiZ7XvsGusiCTPiD0y8jUgmKXnx1qZZ1vL8gq5czABfc1LIpwgfeSlqxvKy2VqJU5HSqMpRWIFVaf4YmxyuFmoTVKBfcSilY= 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:(13230028)(376002)(396003)(39860400002)(136003)(346002)(366004)(186006)(451199021)(1800799006)(6506007)(38100700002)(26005)(107886003)(2616005)(83380400001)(2906002)(36756003)(5660300002)(44832011)(478600001)(86362001)(966005)(6512007)(6486002)(6666004)(41300700001)(316002)(8936002)(8676002)(4326008)(66946007)(6916009)(66556008)(66476007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2nvhQ/VBMu98KKmytrjDE5fn4zuxfWPAB8dhpz8KSXBfZ5iJObF3Ij2VGBE+?= =?us-ascii?Q?xRlybknqORUr4p4UHFPyCpr/9dCcsrIIVXQR5gr8Ya3LwrKIBwmvWp6dNpp7?= =?us-ascii?Q?v06mIZuwUifz/NsYZ5tIHGwRQGwUj8VD08FdzpUqyYe1stMuJev18WevLtQ4?= =?us-ascii?Q?ygl2XThOTIwIUDkjLGz6ypbwA+u+7z5ixKENAk0HY3kSKDg2HgeS5zsCdehw?= =?us-ascii?Q?tIDmuozrcWlZ2/+MJ+9D4fp3kw5POStpBFFQhHohHora/r4GZvCBFHmKnhI1?= =?us-ascii?Q?bz3lM9Fcn+snfIBjYd0suKnek6+1kK7T21FgnwS4LEqaUm2d16j1glMA6IFZ?= =?us-ascii?Q?bj5KLXr/3invN/ArPtl7Gv5aEc7Eip73te+a9qMIr6HWkRusWLmgl/0Fl2mS?= =?us-ascii?Q?zxkBClqsH1sK0k4PGBOJdvT8d7pQJzuNEmh2sdhX64WVtB0H9AUnJ0TVF7XY?= =?us-ascii?Q?70Y8AkiYwlY8LOOO5xklDfaFXLxP/d911goZn0xkjqznr1pIwRINQ+KPrvwD?= =?us-ascii?Q?iaYG6/qjttD85oUNMVXttOUFamkZcAoI+tnPW2lqy0/K/SRVDAbRXYraof+F?= =?us-ascii?Q?TbQeRl2/APNZ+RVcAyZYXxI/cUanZxdilajsmvWMI3Jq7Vd7iKGAUKRFqTDk?= =?us-ascii?Q?mjqh+LbtMw7DZExZiiHaJ0GAW5gTw5hpmvDi2MglvuXbqrpnq3Mlpbj29Hm+?= =?us-ascii?Q?31zp4uKQCyfsOtAL+WoTOcOomzlcfAe1AwQ/i7KDuGzaN3QlzXSaVpS9ox7m?= =?us-ascii?Q?yOdPSAz1TQcp0LJClPIj+1GG6vbK5xBYs0Ne0VPT2XqzYNALoad6pXpJ3zvh?= =?us-ascii?Q?otYyenYV5EOOZHcC2R/yqZ2QURZg+mhaxkr+Xm8CWAvCvFSAm1esGBq8BFyU?= =?us-ascii?Q?V791TW7dMGAL3Ifx2ku2lhcVhVZ4vBJM2bM4Ka//RtjiWbqQUgahCZ8uDQHx?= =?us-ascii?Q?CxcM8VVMCfOqsXj7u07afhOtmkA6sN/MPSzMw/u6ugTNhYTx49y9p6EqJ0aI?= =?us-ascii?Q?vMN6U8HnoyOtQcxkqbTK3gUgrI7OFbPtXgHg9cx6XlVT2TK7AFVQs6VYx7yg?= =?us-ascii?Q?iw9FXZZRXoaBtbfUYqZlEn/jwnwHiB496OKk/LohI20+vraEp2FTIFnmCtzr?= =?us-ascii?Q?fgNzHXx+e78++3nNMruDdAoshVJmQpO2CH5MCCIQN5RX7KC3IOfRUjLKQfoE?= =?us-ascii?Q?agffR6Tu50dWr7Ac1reKh0HtJCUvXyFW8VPd1g7RNM2O5dVezs6+1UmoN8Go?= =?us-ascii?Q?m6Z/9/MDdNCa6wxXfn9PUP8V2C3vjRWvjij6RlfjMULztsoMrpxEntnfXjp8?= =?us-ascii?Q?G1iz1tyu9R9hbpWIE2zkilN61YF42xVfkH39jROh+xstWBWnv7fVhPJPlusW?= =?us-ascii?Q?kntYX1NB5wM32NO7WR2zZuF3eXJPKV7+xIurWn3xYPnyWMkj7z943HDI7D4p?= =?us-ascii?Q?krm3FFuC3ks8IE4nh9C4IhUM1lXtXJcj/OxTzenguhpNX8Pl/Z7Z462Vz5Le?= =?us-ascii?Q?TaMNfxpKs5SDatVN4m+phakRf7pQtDhB3jy3B/NgtMNzHuvIKAiKy3a+g7fL?= =?us-ascii?Q?OztqhiLgEyKolIL7uenkwRWSm7UMn4UhXkKBZi9Z?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00ea84ab-643d-4062-10dc-08db98a73666 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 07:06:54.5590 (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: K3ixOAo+Ob5owmuadilVNXj47+dz/v8I6lHMSnt12JLmfVP46bM7Z1jRHMs3y6vx9vWW+Uzx7I+8NRfd9qZdkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6850 Content-Type: text/plain; charset="utf-8" This patch adds the ability to send RM_ADDR for local ID 0 and the ability to remove id 0 subflow. Put id 0 into a removing list, pass it to mptcp_pm_remove_addr() to remve id 0 address and pass it to mptcp_pm_nl_rm_subflow_received() to remove id 0 subflow. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index d042d32beb4d..38629ebc4ec6 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -239,6 +239,21 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct ge= nl_info *info) goto remove_err; } =20 + if (id_val =3D=3D 0) { + struct mptcp_rm_list list =3D { .nr =3D 0 }; + + list.ids[list.nr++] =3D 0; + + lock_sock((struct sock *)msk); + spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_addr(msk, &list); + spin_unlock_bh(&msk->pm.lock); + release_sock((struct sock *)msk); + + err =3D 0; + goto remove_err; + } + lock_sock((struct sock *)msk); =20 list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { @@ -399,14 +414,16 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, stru= ct genl_info *info) struct nlattr *raddr =3D info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE]; struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; struct nlattr *laddr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; + struct nlattr *id =3D info->attrs[MPTCP_PM_ATTR_LOC_ID]; struct mptcp_addr_info addr_l; struct mptcp_addr_info addr_r; struct mptcp_sock *msk; struct sock *sk, *ssk; int err =3D -EINVAL; u32 token_val; + u8 id_val; =20 - if (!laddr || !raddr || !token) { + if (((!laddr || !raddr) && !id) || !token) { GENL_SET_ERR_MSG(info, "missing required inputs"); return err; } @@ -424,6 +441,27 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struc= t genl_info *info) goto destroy_err; } =20 + if (id) { + id_val =3D nla_get_u8(id); + if (id_val =3D=3D 0) { + struct mptcp_rm_list list =3D { .nr =3D 0 }; + + list.ids[list.nr++] =3D 0; + + sk =3D (struct sock *)msk; + lock_sock(sk); + spin_lock_bh(&msk->pm.lock); + mptcp_pm_nl_rm_subflow_received(msk, &list); + spin_unlock_bh(&msk->pm.lock); + release_sock(sk); + + err =3D 0; + } else { + err =3D -EINVAL; + } + goto destroy_err; + } + err =3D mptcp_pm_parse_addr(laddr, info, &addr_l); if (err < 0) { NL_SET_ERR_MSG_ATTR(info->extack, laddr, "error parsing local addr"); --=20 2.35.3 From nobody Fri May 17 03:01:07 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2044.outbound.protection.outlook.com [40.107.14.44]) (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 F1459443F for ; Wed, 9 Aug 2023 07:07:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X3yW/fjT18/LBiRL7DQZ2nEbLSFYMwfcyMcTFaftW5G+WxIiFnP0bgOc1XV75zs70UM6yI/p4nhrtzlGKRlw3Kth4rl4Sj7fLNBWjBq37PcVrG5Mbs/gfuKDOXPVz0qMbyngVXQvavcZMUhkInhQyBrnSUjPlHaUBD4JC0pRqlnInKD2UEdoaCAkDZcCUdIBx2fNqK/OeJDeeJWlKq+OI/PM0xzfQiE7drmj9woPWrQ8vOyLppxIVrOchX/pmFUT3BxTgKdutKORYufnayfACrpFazyjQKICZ0bMHELjKpOBYI1BKDtecWPSZ0F5T8bQYGjD4kCmx6Qr/xIV4gr8Zg== 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=5Ry62aeb39kupNs7F5hNOPItGL5kFfiHuWgjEEqqWdc=; b=KigIQlqeY79LRMeJx5xLCrf5+qzSDlUVAZBSMFLtIpR4GyKWYrueuz7aoGjDHlBnWh7cfixjUAadbeib9V9O8qlxKIDQePcNhxetqno8+yO1p2l+l085eywSrWb44+jzC2wkGrscC1WzRLbwlU+1+Ra2VwsbH255N2beoKP29dz7+nPhzEwGCXyZ6AUXlhmF4xwpJVKjuzBxhXSiQecMpObahc8BxmFdY38+z8Yv2icfWSmclxszfmL5OabziS1iHkyYOlfO5rkNjr5x+kc7EDbj/l+T/EzInXJk9X/ZeMDh4EK+SZE+FbVBMEGn2QyxnmXuZFifa6lxJxHmwvsMLg== 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=5Ry62aeb39kupNs7F5hNOPItGL5kFfiHuWgjEEqqWdc=; b=CudCm7dd/Rd0ILYCMrtU5B1tt/dmjPyD3VMH/EKKrqsZSg8p87CIt4CErmII5hrGu3X70FefasPHD3cc0ifdgcWuyGBXMJqGijAvNwZRboivUyn4lbnJoMFxFYl9/LbdztNDgi4NCAblyppq7OXK/PPD+ruGmTyESYto+TCeDimWfJk36VyIteP/JGnyOF5uDWwi/JKvUiOtcaNrszt5kIK/ofu+773C6HTKCeY6ADvR4fEHBXiR2kWwHVch786TPhtCXTqkLphxQdwtTdA7I5A5nlheoU4ZJWw1ApY7cJV2lsc4WtlSlmTJGm5Gy2/sAQPn3jBWFMuNF+vOy3cobQ== 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 PA4PR04MB7984.eurprd04.prod.outlook.com (2603:10a6:102:ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 07:07:05 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6652.028; Wed, 9 Aug 2023 07:07:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 3/4] selftests: mptcp: add id argument for dsf Date: Wed, 9 Aug 2023 15:06:38 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYBP286CA0048.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::36) 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_|PA4PR04MB7984:EE_ X-MS-Office365-Filtering-Correlation-Id: 6017baf6-b3b1-427a-ead5-08db98a73c30 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xxad9bZ8L8Sc5LkPgcvqBAiBhn4A4XU4N1L92mAL0nWyQ0mo90tYV+5qvRSbCDFmrZoayCUZcT1pqoq1xZ0Zi8o50+Lla2bE25F/xbUkojjzg0s4BCeL9J5/pnx/1U80K/sU9t0+vyuG0OtJrAImRH23GAtxCMXAWFRX5cDJBptkgVRvpRit8vSlryrCzTrPToMeFxn8GEHWhm3EltD1ZshnfCyySXjuoHNBjCoxwZkyESfywWFTew7fngEXUlib78k1kRssfJZnIUuuyM9cdR9YOh8x3QXV5jQ0gIUpf1zuoAkZNqb0Fo5rn9We5Fx8OIlF5DTi76DaNbFgQegxlU75KBGwce917zHqN1jz8vOrdOMWCxcZY5KHRfiVVxOUqtFdAkkq+fQXFhMjKKdWj9MQHVIjQLMoSaeY9Ji1Yms8sRCtQyb1u3lEJwHQbByCGTViZSng5TOt0BoWgKHOfPKpq3xz4H7rWnb3EdZEyMkFjNv0mKN4fe+fZxP0Waeef3rZoodE5lz5G4Dpw1JiETlH5TZyr6O/kZSz0W9Hi3UUuEHcMKdVlYbndopIs7zC16eG049L+AKLZiXwu9t7PsqxFpIS4v/DbK1g8xxZSYQ= 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:(13230028)(346002)(366004)(396003)(39860400002)(136003)(376002)(1800799006)(451199021)(186006)(6506007)(86362001)(44832011)(2906002)(5660300002)(4326008)(66946007)(316002)(66556008)(66476007)(6916009)(478600001)(8936002)(6486002)(6666004)(8676002)(41300700001)(83380400001)(2616005)(6512007)(38100700002)(26005)(107886003)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Hx/AoKu4komYYl3r7ATe7Bevs7i5l7BtR8i0rkaBnbiDkxZIVyP5iqHDLy0w?= =?us-ascii?Q?cs11cOb0scRAFr8PT2BkCDxw4NOrZrwiaLgEbzGROLVg1DnybZW2h6EXs3Zy?= =?us-ascii?Q?tGIPid3QmexQvB11BkE6Ew8IkiLU0gL6QTYqgMDUSaAluAm4k4JArNiHTOMC?= =?us-ascii?Q?/TeKQAe7brgJZBs4uaEGHq1k7bDDt9sTep5vBxOcWTCL8nIGqo8tHIHTyERh?= =?us-ascii?Q?z5R6i4y3R9GO4mwu02cPgc2M/WHL9+p5Hse1Sn2XBzMWL8AcK4ZaebEynOCZ?= =?us-ascii?Q?KskOJ8vgb6wwx3OIyqA4mn4a4jK3OoriLSQxootyfjNo+e3VCNc79+JoUAfu?= =?us-ascii?Q?IchGW/fXWPdJ4Rt0mSeTk6b2JWL4Fx1zWSR8O/YsPE2pOnZaj3LEf0bC+S6M?= =?us-ascii?Q?A1Nl0wW+qXj+xyDFF7wFdrJKi4QZgqWuwZYQr/yxk2soEvBuEfWXkBzFbOLG?= =?us-ascii?Q?MFs8QcAZjsk5MIMtnBV5agcnEcR/pkBidW0jvYFfZntswz7cEivLiPQdMHKw?= =?us-ascii?Q?5/Cg6YMS7QFj36dqbZ6flLOW8vLkKPX/lrELckGL8BWjRKAZVvwybQEnYj/J?= =?us-ascii?Q?DDt2iVPdpdSvUHkR+GPM4WUqBDoVWO2ZcZh2HEfvb0FhRl5KToHWoCcVJE5b?= =?us-ascii?Q?Q6PpxV5gpGSwwT+fmYaCc/XnWecLoWd7tlG0asF/c/WRUwaQfdeYLmUnQd/X?= =?us-ascii?Q?ZIJ9DNUWpYRXO7Th8KMOCthuBSu3087uxlw+bl6sDJL9pdlzEf0gBGoZMnG8?= =?us-ascii?Q?ucfpAMOgydfFDaz3H2ET13s4WARNpxquJqFjxpPdSA8iXm+rywGWM0gBateu?= =?us-ascii?Q?Ap7bkJ8dQ6Zh1HdprlPIK2qsgJBnEj244Oq5lPg4kqrR2X4PMGBMtFlHbe1M?= =?us-ascii?Q?1PWCxwErvXQfNUpFKBdnqGwhrTvL0gRzUOxlCtCUVyfj3y7Y7KyGvM6OVHed?= =?us-ascii?Q?lqWJofFGl7r2mDfcfzCePLt3PdisNM/fbuMe6xkzjSGFpjkAFi4teTWdGZoD?= =?us-ascii?Q?2aMjqHHu2P5j+Ck75QvU2R78N34pmKD0iHxoFquGlOKY/nYnd6iAe6jChfIp?= =?us-ascii?Q?cFQYQqKGbY3QkCH9wjDS1N45K25D4PcGqO7SikiAGZNBFJFfTFs5rL53URvn?= =?us-ascii?Q?PWN0HFdc5r893XmcjvKVcj0DJRzQXQnmlesAi19GIE9k1yDPXbeTD1uThXpw?= =?us-ascii?Q?JhG7W/WYVjGmP7m/HQUWDiAenmiuTRi4T7cCCkKASQwhd+kXvZwWIGEIPjqB?= =?us-ascii?Q?2TRNYX2iHyzHo1PXq2g5uTrZCVCQqZDMxLV+7ZgtBxF2fPCuXDg/jZWc7JL2?= =?us-ascii?Q?IG5raCu1+tMCH3wllzv3G1euGEcMgW02o9r4VuzGIFC+8TWrFcgSvzD1MpMf?= =?us-ascii?Q?+Iex7yqAYKgmcwByryHlGn2VjQNiTyhfuvWN/GfPAWsBt/Q/2sYcMaZnx3Q7?= =?us-ascii?Q?Sf1q79YGuUtlk5pqO8QT9uAqxHK7Kkrk3srb6ONW7/3qqJrwwNZZ1YgsR/fr?= =?us-ascii?Q?dHRnzHv1Vdr9sbrA/oWMviz1OMEFEu4CY+D48xDg3EOMaXsOBfB9o50jSuDq?= =?us-ascii?Q?9IbCeFmVuQADJekLlLm83Jj65pyZiJuk/SOp3/ur?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6017baf6-b3b1-427a-ead5-08db98a73c30 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 07:07:04.3300 (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: hN49FL9s3zjQM1rYmhaDgx4oVvmKRK0Sm5fVxcoNNfPUcTwaLstplyTI3xqbu5OdNK5YIqBUylzz2Vmcl0KXMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7984 Content-Type: text/plain; charset="utf-8" This patch adds a id argument for userspace PM subflow removing function dsf(), to remove id 0 subflow. It can be used like this: ./pm_nl_ctl dsf token $tk id 0 Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 49369c4a5f26..8a5fa655404a 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -347,6 +347,7 @@ int dsf(int fd, int pm_family, int argc, char *argv[]) u_int32_t token; int addr_start; int off =3D 0; + u_int8_t id; int arg; =20 const char *params[5]; @@ -358,9 +359,37 @@ int dsf(int fd, int pm_family, int argc, char *argv[]) off =3D init_genl_req(data, pm_family, MPTCP_PM_CMD_SUBFLOW_DESTROY, MPTCP_PM_VER); =20 - if (argc < 12) + if (argc < 6) syntax(argv); =20 + if (argc < 12) { + for (arg =3D 2; arg < argc; arg++) { + if (!strcmp(argv[arg], "id")) { + if (++arg >=3D argc) + error(1, 0, " missing id value"); + + id =3D atoi(argv[arg]); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ATTR_LOC_ID; + rta->rta_len =3D RTA_LENGTH(1); + memcpy(RTA_DATA(rta), &id, 1); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "token")) { + if (++arg >=3D argc) + error(1, 0, " missing token value"); + + token =3D strtoul(argv[arg], NULL, 10); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ATTR_TOKEN; + rta->rta_len =3D RTA_LENGTH(4); + memcpy(RTA_DATA(rta), &token, 4); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else + error(1, 0, "unknown keyword %s", argv[arg]); + } + goto out; + } + /* Params recorded in this order: * , , , , */ @@ -443,6 +472,7 @@ int dsf(int fd, int pm_family, int argc, char *argv[]) memcpy(RTA_DATA(rta), &token, 4); off +=3D NLMSG_ALIGN(rta->rta_len); =20 +out: do_nl_req(fd, nh, off, 0); =20 return 0; --=20 2.35.3 From nobody Fri May 17 03:01:07 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2043.outbound.protection.outlook.com [40.107.14.43]) (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 D207E443F for ; Wed, 9 Aug 2023 07:07:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n32x6bFio6y7GUohMJG/HnqJCfcAR+OHvmcyThrDasu67JLUhBWTW2HRekcOSXUdWuBkkqCxV7Bvk9qwazeDhxuE3n3BxUpgJ/Moy+3P+FO4UPj4AefSNvDHh5w0uQKwNTzYBY0+bpaxI/QPLy6eYPay0WU4/0cc34WkGY0AqBNPrZRGF8jdjQMYF56PGiEqwOk65So5eNd2uLWJVsiqVayy7/ShGezcI466ceD8we6x8pTw7njGn9OBW+yYvNjdH7qNPy/UZJx0r+S5N1agBwjTuCE+ajL9xhXxKwEswaAybzGbt/qsQ3cutiKyhcplv1oTIKdHHzO+Rt6NBy75gQ== 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=RN7zgSwTL+e7Nt7J0zo0y3Wvy55qGv71xebsI7tbxkI=; b=PvW9jpPeRtWfp1UewwdLfCJxx/Nprw/ZbJM8MC1WbWiJzTM/rMNboMPb8TRGwhm4zYLtWZrogLhR+hWTv7tPgUVXpD5OwGhKvPMhd9MJlkkZmJa4GV1HFkV/D5a+I08p9TdK9jFI3bVfJjl75zvxNS8hQNjpooVwZ32k3PpI/i1DV/192mVvXX4mBtyu2RO4YmktqULCs2TPa8Lz75HxfLQrXwO8/4fHcufHxgf3kDYKQIZqxLxwoL5YiznhaVyA3MPCCdZMorEjw35GPUnt/v490RgKYqVadVyLPLM4X9mLyWpW9g9BPAC4lvsWtRCvsxPK7b2bsiSjCOpoaM/ZXw== 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=RN7zgSwTL+e7Nt7J0zo0y3Wvy55qGv71xebsI7tbxkI=; b=QzYbQb81RfNHpR+b2tTSwQ2DigxalitDJsVmIhd4l5i6RR4E2ipOPTSXSxYBQttNg/JtqPbCXJJ8GjquYvCB5YMhV4ktzKvTQG1OtcrXxZwtZ6ANAN/DbUY+VXP7RuI/PtEUHj3Xvj6zb1/wDupWLBWKsbqQcPP4wcgRWlT7Ge5hJuchSbOwaHo3A/Ly6j2/Pd+LkklFzZFlpnOxyfoiolq7khY4ow2vfR7Q41qYqk9vAXGbpVNvm9A7cayaZ7JXX5x4agFWBwIgfRj0d46YXmEDeNoPjERuzUWou1IoiY0Xm8nZ5jCHo5c/WuRrad4XK2XJ9wtX3i4G/I/AV+RS5A== 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 PA4PR04MB7984.eurprd04.prod.outlook.com (2603:10a6:102:ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 07:07:14 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6652.028; Wed, 9 Aug 2023 07:07:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 4/4] selftests: mptcp: remove id 0 subflow & address Date: Wed, 9 Aug 2023 15:06:39 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYBP286CA0026.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:10a::14) 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_|PA4PR04MB7984:EE_ X-MS-Office365-Filtering-Correlation-Id: dbbbf88b-76b6-48ee-72fa-08db98a7422b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OzJOa1QcKmf27hgdEHWfwptsnCUXmCwiboqwPxL+MbyUoiLj2aTxFI9C5hgXw4HBomlOJQZAhIB7BVqGNuJUt3WpEhB1pw0j/bT/oy4a8Gw0yLzxscLSYMyDq9dzkpJmq3X45nxmjvjhmmdJMgm8CZ5rR32SrP6uhwLSvJHtmXztQNhGc8oQ1rOnmhc5Lwp/ls9NewNMaAhcWmbPYMK/dQmr485LJVCXkckZw8rfSFuEci6RL0aQxxlxYMjRop18BCYX5H5sXeUpKzliqvg4SmsRR+3KDm5jyxbeQP/RqiLcfctmnV1Lo0FIuUeXweoV/+mjx+YJAKS3LyhSDXEbvvicSEmlqAjf3Ck4MTO/B7y7wPjBzM0797LW2DmJJvpzgciPyLphepSiwaTIMiSJcfAuQkjQnKORXt+Qnr2nVx9yzvpuSfGfRctjdG7QVVIla/mMmnAZqaKYKur4/i7HxPQ5ImlH/bWtrXc4BxysSotzz05hSCJFkCrosoKGg1vIh7Oy8R8lC4Pac+o3nlDlVU92Yzzi4Hjnyv725mDpiClUegLMbALEjjFO81VzYIibOKcN7MjMQXMesvozLVhRJvLo67M816nQRzBCey4QfCw= 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:(13230028)(346002)(366004)(396003)(39860400002)(136003)(376002)(1800799006)(451199021)(186006)(6506007)(86362001)(44832011)(2906002)(5660300002)(4326008)(66946007)(316002)(66556008)(66476007)(6916009)(478600001)(8936002)(6486002)(6666004)(8676002)(41300700001)(83380400001)(2616005)(6512007)(38100700002)(26005)(107886003)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZkCPfXqo9w6L8zyBNn1IeY8BWQ4poPLadiW25gsp12jA/Yc6qvFhemQ2jsKy?= =?us-ascii?Q?R3susl9zlDAwN9VNPcBWn4VSRKYuxPkhkV2bUnS2ogouyjLRZdu01xSNZgKA?= =?us-ascii?Q?rgp0kNaft0IWGprT1US8UtzVoJTqeCv6lnYbUM2XBAhYqoVeiEqt+xAATQ94?= =?us-ascii?Q?tjEzqX+59bMOFTKgbg+bmEu908b0CZq5YMcvKaQXSEzWW/G+vVOLqfPK7OWu?= =?us-ascii?Q?GiWcenG+OlLI9jeA56MExnP6Uw3Q0MFAYBSIs4z1ekOnKZpyBd5DjejXZwUS?= =?us-ascii?Q?D9NXjuMr0JDuFIwVzd2cCwPikoj2td9tSJDerZfU/cPmJgkyx3EMdTeGltLj?= =?us-ascii?Q?/Qv7Fg8d5ESL4Kx8/6pJl3gmcEsan8QgA/wHncj1cwITQ0zOpmZUjWZpfc15?= =?us-ascii?Q?yWOGvHJCfNMl4JAlzssWSanTsqPpEY6PF2Mp4k9/PuilLFp4hMCT1DgMFXc6?= =?us-ascii?Q?Hz4OYIRoBzw9iFgw/KvYMECNeKO+wYtrKBSPbMp2lJXB4aCwyrRMOaLURVu2?= =?us-ascii?Q?dS8UhgEi/S751JJsgNWNWiVczlYD1GeMoq2IEbwQ6OJFogHMGKV/owsO5Pms?= =?us-ascii?Q?oui2Xo0oxwcYHH2Mf9qCDuLCwnCtNxBwacU9jBhV4vpK7ZqcB/eWcN30KDdw?= =?us-ascii?Q?ui9P38Uqz9CeAcWWZL3PFl5gTUSVz7ecJ6ZobKbb9AbKSqTqMZWvxT2HnXaK?= =?us-ascii?Q?87oqxX/ztASemvuPpL+GAN1EBJpNK7euqPGopnCrDHsjkdBAKzyQix4uUAGK?= =?us-ascii?Q?nluHuaVCluMDJ2QQp89+cuYSzg+kdobdAlYwB0SnqWeowfBw+mog+SqZdWTx?= =?us-ascii?Q?AUenM0M6soxoo6Zb9ZBpZfJw1/mUj6Zwz0xAw92lcxVf5L7gCUUNFMBFxX8j?= =?us-ascii?Q?vIXI0Q6fbP/cVXYQ0GF+xbDJ/76HDgG3sdjhjHT8+AXv4QW3EbAtvCxXgAZX?= =?us-ascii?Q?bmMfEFUGjODzKn359Iv7UifzrRJy98kxp/iUHzqeAjt2CCm164nDQHq+VVsS?= =?us-ascii?Q?ulDERTtgUm2681pgBe/praDCC8yb+OysY3OAM296+oKE+gNtzX1IElcDYha0?= =?us-ascii?Q?gEkKKsnRySkG5bID+uC+nMGFPw5eoFqNt80zecdTb788e09MAMiwZgvGIgWV?= =?us-ascii?Q?CT30ayJM4mLsHPXaaHzZ9RZgyz3R3a/tzMkYwZarXaAF6NTBiaHK+JrnjWXm?= =?us-ascii?Q?oiGT7v0OeasFFkbDHbxe6cnX3642f6+7JMxKZoqsNNstNMlQWpH0CbxBoWI6?= =?us-ascii?Q?bzgmrI9Q3XhLt/KSp0Vzmz63I50dbqtKkgcovgpvQqTeMPETfNmJC8GIAA9o?= =?us-ascii?Q?SAy9zQk7iow0GiU3+QjvGR3T+opbZrIC2bgxy4ZhBoj8jjgmA0OJvETZpxSH?= =?us-ascii?Q?xJqa1Livu+eL5TqXn4T3UksndHYS6T5/eTYH+Bmfp9eCSVeeRjoeaXTNtNe2?= =?us-ascii?Q?Sxt0VKUc9c7soCtFG+aOEtIeypZxM8s6fTdO0Scy+YtlKq8xUYbsPOtn2Sfb?= =?us-ascii?Q?Ep7nkhdvgJ6RTxb9irvg1VN+r48IMwtXRpy7MihkkRolT/A9gEwvmwNewviV?= =?us-ascii?Q?A+KUAR8MdUnfvLhU4MeaxI717v5reNnWHLJkYLH9?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbbbf88b-76b6-48ee-72fa-08db98a7422b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 07:07:14.3613 (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: 2YluGNp+I5/D5hG+zvRB6zSlHZuSy1EAZ2z/pP8qSRkAYGdGyjGuWeAJNOzA3HbXef3hdnkJwPEZhQsThW6l6Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7984 Content-Type: text/plain; charset="utf-8" This patch adds selftests for userpsace PM to remove id 0 subflow and id 0 address. A new helper userspace_pm_rm_id_0_subflow_or_address_ns2() is added, in it use ./pm_nl_ctl dsf token $tk id 0 to remove id 0 subflow, and use ./pm_nl_ctl rem token $tk id 0 to remove id 0 address. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ee1f89a872b3..52f081738c36 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3320,6 +3320,15 @@ userspace_pm_rm_sf_addr_ns2() wait_rm_sf $ns2 1 } =20 +userspace_pm_rm_id_0_subflow_or_address_ns2() +{ + local tk + + tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + ip netns exec $ns2 ./pm_nl_ctl "$1" token $tk id 0 + sleep 0.5 +} + userspace_tests() { # userspace pm type prevents add_addr @@ -3434,6 +3443,46 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm remove id 0 subflow + if reset_with_events "userspace pm remove id 0 subflow" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 2 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns2 + userspace_pm_add_sf 10.0.1.2 0 + userspace_pm_add_sf 10.0.3.2 20 + chk_join_nr 2 2 2 + chk_mptcp_info subflows 2 subflows 2 + userspace_pm_rm_id_0_subflow_or_address_ns2 dsf + chk_mptcp_info subflows 1 subflows 1 + chk_rm_nr 0 2 + kill_events_pids + wait $tests_pid + fi + + # userspace pm remove id 0 address + if reset_with_events "userspace pm remove id 0 address" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 2 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns2 + userspace_pm_add_sf 10.0.1.2 0 + userspace_pm_add_sf 10.0.3.2 20 + chk_join_nr 2 2 2 + chk_mptcp_info subflows 2 subflows 2 + userspace_pm_rm_id_0_subflow_or_address_ns2 rem + chk_mptcp_info subflows 1 subflows 1 + chk_rm_nr 2 0 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3