From nobody Fri Mar 29 06:51:55 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2055.outbound.protection.outlook.com [40.107.8.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 B3AFA17ED for ; Thu, 20 Apr 2023 03:11:41 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W1ip2gpw5Xu9ny+t3q/CJOg3y+/ofdNNdeJfYSGIejo+ShksRNoU+QeT5bFDtacsmdOrffFIHVY065cywViiv6ayN0PMXrQte8v0BVfUugYSddevQM+KpEHHP1v6dCTqvz3Bq2i8u11l/lXTUJ6WyQB5f/5PrWYttydBbNDBKKLfT8ou/kwBL7RABEsUglrpUYQf4VagzMolrjN5hZlDDEZx+4J9vZg8qSpHApeS04+ey+c0TBmOvWNXVMtU/3dLt23pnr5ZGfAQnCHTzauqoyLy80787i+VHofuDXs4n0nRWW5L5oiNaFNbVVBdF7/KjlNIb9A9iI146o0WiTV38w== 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=CznGByomJnzv7yII5NYMdWTi4MDe0f8yvIPYD7VlJRs=; b=M5aDjOb1VACBCd1BZc6ZPR8ZEQbovgMB71GaIjdz8JzP3Aq1zEX3N/vqZpTs1xpSY6udXCMxOVsjjT0lOCPHCNnmTueSaIdZsztFG5TMc6z9Ld6PXz6DN11lZlIYD3HIBVZyuynmyO1fbwgDdArmV8PYFNKDj+Cgdb6KdEi0EKvqJkQMbrcdhMYo40LMtTweat7e/ci+EouB//XFT+E16znYRwmvpLKXP0zYgq8ol1yPp60NCqNDO9llzCdNy3PenoY/57CsBPQu8YlLaRg1oUXsprIbPo9xj6mgr4Ckwm71Vsz9rczGD1LBgboHsQiLOotdutFQLSewqa/Y90ZzYw== 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=CznGByomJnzv7yII5NYMdWTi4MDe0f8yvIPYD7VlJRs=; b=rnr9TpX/fGFehP9PoyeqkPaI86J1qjkWHwtXK1Pg1ZZceYmAbfInM0XI+sFS1YJxT1L19HasiV2Zjyl+vP7gXQDDHl325OuC6xdXKpRvYElpPmH+5FzsIV0HZWHd+iWDc2KWVBvsppGM00VvM3E8MECOnNIsGCGoA0OhVMoklTy8YBshrQ1urjOSWesi4BbYjSrYPq9NI9kXzSglklasdGbY9V2jiKQKs8xUCpvtDx2QN/Y4s6yIQc0lSku6KKWl3CcRwmMUUXswBy96yfiB5D4cWdas+WkGdJmaeGjLuBqxTwus6eAGfHYQiD2xwx+JZLkvXkety4UKbYpZEsn2eg== 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 GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.21; Thu, 20 Apr 2023 03:11:39 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.022; Thu, 20 Apr 2023 03:11:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 1/5] mptcp: only remove addrs in nl_cmd_remove Date: Thu, 20 Apr 2023 11:11:35 +0800 Message-Id: <8c56e8306c829d6ca42ec34e07448fcee21b5dc4.1681960259.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0015.apcprd01.prod.exchangelabs.com (2603:1096:4:191::15) 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_|GV1PR04MB9103:EE_ X-MS-Office365-Filtering-Correlation-Id: 25a0f5ff-ca4b-4f1c-edc7-08db414cf528 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /D4Hh1sCczlZNDWS5HsPqMkrEz5V24DDeUXw4BdQBtoUG0GMKfobfH/UR02zulbeEKiCT8A9gCgNrYbWyGBRFDecXzLMoaWC/TqISaWtTgmsZQ2V63e9S4QzpM1Nk21OuNXTYdUYhcJno7Io13pJg+GUso6LDebGU+kP+7IbKFJ204rNIF/KwpqB2xOitLwLMR91BUfui6arnniHxXMk+va8Hpa9WQrywQ9xiq/a3UfgB3OjTIcQi5aoAQyOOHn3bAc5Jb7y0TmnLoBwd4IvVMLtbm/KkeHkPAQeFuzHr2kFHLoglLD43tWxWdMXB1FdrNkmPo+IBGcncU9v4KU4sYx8gLgXNluFb1r8zRp9hg1/IxOwL9a+ELZ+oeNemEwOHRRzEekOf/fv6ABe2lEYrNjdvp92TW59V0dluMzCpxhPUWkel3zp3BhB9iBghocwNwXU9ibB0RtFO2MzGaZIk/5qWdIwJiSjlcrwV0VNUVmDphvhjN9r4Wp9m7glHCgzV63xMqy6umkOexsx7hRVHTKiGsrKRF/7AKvA/Y5FnO3Nj/YIs/d01xPZZbZcP84Y 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)(396003)(346002)(39860400002)(366004)(136003)(376002)(451199021)(4326008)(6916009)(316002)(66556008)(66476007)(66946007)(6506007)(186003)(6512007)(107886003)(26005)(38100700002)(2616005)(83380400001)(8676002)(8936002)(5660300002)(41300700001)(478600001)(6666004)(6486002)(86362001)(36756003)(2906002)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Pgw36Hzx/+vWJigQbqNQ7wsAfOLbccfDUesKg1TBzLy/cg5wg2+Y/cnlXLSE?= =?us-ascii?Q?8quvUKdsEKWKZm6Yq1fJMovmbe5kWbB7v6rYYmod3fddA0GX090kEDcD8cmj?= =?us-ascii?Q?38UsXGld0lrBhyhxSO64SAgtiyrQH6xbMoh3UPxfXt15R/5KBAdKNZwYZqOi?= =?us-ascii?Q?sqJu/rXKmMWjLvuzfo3oIeCtg4eBK2t5QkFZtT6ju/N+ajPjiSnAnGi+VZG7?= =?us-ascii?Q?b27T7N9MLYQIw6K3pq+B0yEM6oPm9ZW64lGtXVgbFhwlnmVmPz2ILHXiur51?= =?us-ascii?Q?l5/uUX8IV4Z6u+vy3CKLPOnd6+/4HxigNEX7WEWbPoDzV2eY2GkJidVDiKmJ?= =?us-ascii?Q?1mHp3A7I3bKOfqjM8y3e3k1SgO4tZ2nJUXZmcnTo72FJjLZvFxzELzqn53dI?= =?us-ascii?Q?AWseR6RW2M9PTFBA2hw9T+kUOIKNXmMqf+d1JQjefu3iarlF/tevZx/xovUi?= =?us-ascii?Q?BI9rZFxuEBOe8rozB37phHMsN+41IQGUaDv/wH0FWufRlt2AkpaNZZAE0zzj?= =?us-ascii?Q?CK7bofz5L1czai63/tLeDwRcamHMBUdXx2K8+46YcKNj7Oh3c6Mf+QzNO7nl?= =?us-ascii?Q?LX5aedBUK5AXNgFtydyjEbs/9dVBrAwPaTvf4ReaiBlUwHCh8Rg78xPMLsdI?= =?us-ascii?Q?5vxguT9H2sBCmN3x1omiNIrQKeA1riX3lFJIQKJ+Bqtazht3Bp96W9gCiDXa?= =?us-ascii?Q?sX6bQnF5gA/99Q6HvMiryQ0AgRUXm+Ylt58fE+OdFX7YZ8FomPKsZ6WwD0rX?= =?us-ascii?Q?ynNzz9jIPXQ0pOnBuVuDvSKsO0tJYo7xbOZ/4Kxkry3dLzyyUlgYEEZXgbnG?= =?us-ascii?Q?eg4YQxFnJ/sMv8IpuZyKkrVdTDXLMBuyoqOcs3a9CFh88N2nNXPdgZKHlu2H?= =?us-ascii?Q?tPSfgXAFklyLYC9v069s1fCq5VIC9knstDijvCZwZn39+Cmr9P2IKnTUSbLN?= =?us-ascii?Q?lC6EFK1nG1zm+l4IWio3/Wj+JEp2xGD+TIBMj16por9n91eRdQE7kqD+xWBF?= =?us-ascii?Q?pE4kZGCIG2sYkiDAXsp+WRK00a9sZvUlYfiSSzWiV8fJW5SeNBa40tcrRjr7?= =?us-ascii?Q?qQwf9AmrO6b2xwjJlHERdxugAin4D5o8kCohZgWLEa0SAPTJi6Z4SciFiFt8?= =?us-ascii?Q?ScCRQshj2CBRPT0+09SjePjYZEaVCZc+Ag1aYvN1H01mqojXiPrgNX+VbJNf?= =?us-ascii?Q?Kb79AMKrJtQUruueBxDa6TnpHQpOczNL3E0hKuTyEs1Q5GZ6hijC3m7BwR5P?= =?us-ascii?Q?o5OB2W04MMVx/ADxoqL55TO3ljC8dvmnlz8AEhdFLtIzCkA4hq01/U5f1hXw?= =?us-ascii?Q?7sB+i2yDMr5BXpw2XjlGN+bsuupzULr9kxw+TrZ+5StFl1OgqpGbwhiOnXSa?= =?us-ascii?Q?ECPVbwzORPRiZuZYxBHiqgg6/HbVg3y8WCpi2its0po8g6nh844tx4rXwbbG?= =?us-ascii?Q?J+T36vLY5lqkU7j4qx6qBGTAwNu7uOI4BWjRyquY6JV0J1wdR22JwEaS5xr5?= =?us-ascii?Q?Dxz5CXpvhL/2WMhNmqyxV+7TMt9pDjygyt6EE0ke/4owdrMW/ivoJJyBNeAx?= =?us-ascii?Q?nf/fbhZB61IQOo58Vcz00ALlMvWzo0tvCSxGLZQL?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25a0f5ff-ca4b-4f1c-edc7-08db414cf528 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2023 03:11:39.1087 (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: 3cv4Z5gmLPLXduOhOYzZt7zTJrVSA57DWt0slXCGsxNenA5u6KbG6t4Qg9okQuvEbD7ew4kXOi7PuH9AxqAgeg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Only send RM_ADDRS to remove addrs in mptcp_nl_cmd_remove(), add a new helper mptcp_pm_remove_addrs() to do this. Use mptcp_nl_cmd_sf_destroy() to delete associated subflows. Fixes: 9ab4807c84a4 ("mptcp: netlink: Add MPTCP_PM_CMD_ANNOUNCE") Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 16 ++++++++++++++++ net/mptcp/pm_userspace.c | 2 +- net/mptcp/protocol.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index e8336b8bd30e..d85649bc27e2 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1555,6 +1555,22 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb= , struct genl_info *info) return ret; } =20 +void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_li= st) +{ + struct mptcp_rm_list alist =3D { .nr =3D 0 }; + struct mptcp_pm_addr_entry *entry; + + list_for_each_entry(entry, rm_list, list) { + if (remove_anno_list_by_saddr(msk, &entry->addr) && + alist.nr < MPTCP_RM_IDS_MAX) { + alist.ids[alist.nr++] =3D entry->addr.id; + spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_addr(msk, &alist); + spin_unlock_bh(&msk->pm.lock); + } + } +} + void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list) { diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 27a275805c06..6beadea8c67d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -232,7 +232,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) =20 list_move(&match->list, &free_list); =20 - mptcp_pm_remove_addrs_and_subflows(msk, &free_list); + mptcp_pm_remove_addrs(msk, &free_list); =20 release_sock((struct sock *)msk); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c39e172c95db..1a2772902e9d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -845,6 +845,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, bool echo); int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_lis= t *rm_list); int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_= list *rm_list); +void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_li= st); void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list); =20 --=20 2.35.3 From nobody Fri Mar 29 06:51:55 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2089.outbound.protection.outlook.com [40.107.8.89]) (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 3D88C17ED for ; Thu, 20 Apr 2023 03:11:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g5aSMzByaEHQUCY7jEI3EvVc1u0I5VrtjDliDY6XdVessU1LP6sAve6B4g6I1haKqqhOFFMpx1yWzt8JGiXHtuQqLtAi32k1CMoUwiLQ42dVYaZC4aMkDdsMut/OIUPY8WoFj6CJQaRxS80rEUOSX4BazJiU31UsseCY4e2t53KMF2btZj9h4QV4/W1rnAHffBdFCsX+9cNc3YAjazEzZTONIM0rADZnZuJTTw/W+2kqY8yZgkxkar0le1K5/XR4fevTjxlsYZgdC4exPNPG4q2EN4O5WW3oT+Sb46RyHJfvr0hp4BgltQU4aY4SQs5xkt822Vyv/GJeFuSktM++Yw== 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=THjQE8m94QZ/AJoP5KLuAXBhOvypb16g6JrluXxwWWs=; b=TORtWdj+4HIAUnGBJ3zYo72pmFI2RgHMEcizVpYsw6OPltHaK7A0/HvGQJX9zsGKL22UM8GrErCVRbpqeM1iKB3dZEiWYxqQZ0i4iV+vuBp2deDJEJUb6KoqKydcJYg5M1eElBakTZrWHQkUOxCR54tcc7tu+LuXi1br4LvwrxIh8/gz38rFxEtCnIwqtqxAi5M2MQzu+ywIBOJCDxRcvtVGsndoQf2PHCes+8jocCmy9qjZG7uPFVWw8BZCfrj0xdT94yByFgp6i6Y16zNOP/kFo1ZqcU0M+o13ZjnUkhqxgvbJ9uxw2aa3fMjRjc7OQPr3YEQBo4HvBLAZb1jFCw== 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=THjQE8m94QZ/AJoP5KLuAXBhOvypb16g6JrluXxwWWs=; b=0XqMhwsNN5aUDRWYQ3oKc196swKMPjcBJSLAclwiVGlAmERV+tkAYfwUxN8Wa9/3rRdMLH4knwkFAKzNqSh/JrP0Oe0ius5Qed+AMKuHDSnC+of2md+MzZzzBPkIaENDL9JOuldnm3a9pcU8/S3zrpKGaeWOOMpuaVGn8XO8DInOareEGocPKZJWiLvgg1+IKbURRS/2dZavHPTdVYxrs6m1NJ8e9ddtHWXHjd8qadbR3EUWf4t4j4UBSbeAse2RVqoxTxeW2IceEp8w9tiTPucRfiwV9sOJZpqu4zKK/LAk/AzXwodCegpI3d/Berr9xoneIt/SPDMIJPKtWvn22Q== 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 GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.21; Thu, 20 Apr 2023 03:11:45 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.022; Thu, 20 Apr 2023 03:11:45 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 2/5] selftests: mptcp: update userspace pm addr tests Date: Thu, 20 Apr 2023 11:11:36 +0800 Message-Id: <6c50f4b82533d9499318cad9d8c846823d7e280e.1681960259.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0009.apcprd01.prod.exchangelabs.com (2603:1096:4:191::18) 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_|GV1PR04MB9103:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f051159-ec99-4856-fa13-08db414cf916 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3L6xsr2Aa+//7thRD1qtJPgdxt9b9Pu/FJKs0ZUyHyVnRXd6lmn6VuJcLbz8uREQQ76wCfXG78OyQ+b0POzlT0ecMJVFNOWrTo7TS0FuygAJqDaXeFwWzGlWHgco1qx8YndJE4LHHMRh+IOkWKiyOLGGL/rMOeEAttAfo/SIr282VGcYmggJgO1JjM5oyrVcaYPCaNiDQUD6ADAPklCHBaVGwm0omJbiyUxI2GVhoi19vOJYOWwlg9bmXt6/rr0Jiwg2REX2W8+WvRPiih/HWdiFjRMycWIFz3pB5WESJa9c8SyRrKDxpZ0J25DE0jqK4Xk5KRWx4LQD1y0Oj0k0u0GndFSdCe02e65RzVKj2Aul7gn+TuEa+vYrOVbwTfyaKiaJ1zjd+ib2e6rnVzp80kQkqRzkuKB0uDHxjFmvetcHcS4mybtjuYpLEK+bx8/OAFns+uTzLh17A+YPG/bBglpaADJvY0Os6CADs7kx3b6xZxAQ1M2ITOggBwFq6zykC+whWVq8z+uramysdsINxML7TihMtLR4rjWx8j/xOKCY+0hYMsj/W5OLHdKZ9pjj 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)(396003)(346002)(39860400002)(366004)(136003)(376002)(451199021)(4326008)(6916009)(316002)(66556008)(66476007)(66946007)(6506007)(186003)(6512007)(107886003)(26005)(38100700002)(2616005)(83380400001)(8676002)(8936002)(5660300002)(41300700001)(478600001)(6666004)(6486002)(86362001)(36756003)(15650500001)(2906002)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5GsCWPfsuZoOgUCq4yONuLQQJMmGZ0qZgd0rRU9BGtlsHWpWI0sJGOyBdMEN?= =?us-ascii?Q?RimYiHbslu/xcME6MQEubM2JPgUbw7ImRVWfkSfpsj56VftRGph9gU2NkEy3?= =?us-ascii?Q?lb4UKixFSHQZzjqq2dOiuuRj4cVDE2b59H3GCIFF5ey8LPUaQGlLdBS97tRG?= =?us-ascii?Q?wHsfxP+KFMM6auAJboiBbfIik/xYclmZ9I9TvNxvrFQixkAImHhI0OTqHyot?= =?us-ascii?Q?EoFXIToBAfSJCophiPFS8Ueiq6r/Eo+YFfrtZ+RdRyTdvXj2IQy1FQAy6Dru?= =?us-ascii?Q?RyebRK5Civdw+topD4hKt7RmwK+2IbMU9TKEX097p7wj6d2QYnLjCTSNGHZ1?= =?us-ascii?Q?Y8R2tdjSUNAqli2Ivu+GFQnQw6Hlba9WqhfmqFL4ujgwerrjHzlEA8pIU9Qf?= =?us-ascii?Q?gCrMMzi0+K6F0BYc+aYEWSx77GtbgaOS6GbyrskcZj3va8FT3kX3wSrzQ+C5?= =?us-ascii?Q?Gox17BJdMAwEABLn6oJCzBj99BWIjKCOJBwksX0P7QX3grpUKfEakTRADMyC?= =?us-ascii?Q?tlWP+06gDLViurXF4tRAqg1wBupfW3IRs6lYHkSUctnL+nKlXd96oCSwW4aO?= =?us-ascii?Q?aFbtT1fyuXtUh1QGpXCN5sIhbk1oa+EFSITqdl9F8nMc7TLZZ9mMyt/zaSuE?= =?us-ascii?Q?04Ti9BRKKsdr8lihtCqfUvspTNEQsDPaTQ6gIr37hIGKc5naH+lo42RtD1l0?= =?us-ascii?Q?V6hqbRh/WlOCb8v/cbpyPwS3Uvrb3wA85hVHQppcwYxw0G5X52QYPMQts/Pt?= =?us-ascii?Q?oyCgE7IQElKwn/9EU4EQfplmj18h6o/4nCwArNnNRK0U/UAwiQ9uSrrCVgpK?= =?us-ascii?Q?/fWG0zeRnZ5DecESM6+4+RpKLwyixcHJxqy4EIirAVuV9kzO7DNJUu8cWQ/3?= =?us-ascii?Q?Ror4PHexdQiwYf9nXW9fizEz9NWGRJ/FG8utMzNQDYDfO4SNQBO0ADSCBqSY?= =?us-ascii?Q?Ul20eXw4ocEsAOTiKOdzkN1mQfgD0gwdhizJbUCDTr4BtGkTJy83wcNfkIM3?= =?us-ascii?Q?1zNrbnTivE7hYC+kYzOPbB/RBFPRHiAtqdtJYeNgYDz4qQw8LTFNbeUeR5JO?= =?us-ascii?Q?YmMamEL8xJMx/20NfXNqXFowUeF5iZaCkCd6leDGad6cepjKjskXwTOM5fK9?= =?us-ascii?Q?gkBAEPhK7QdC5cu26xg/XVB0qeeNJcmkPZl5NPhwjJKpgY/JSuBtgPZ1jUCH?= =?us-ascii?Q?6Lj+8ZwxgFlk6FIoXi6KOVx3eoRY9ir3tO4XH3ob9zFRwfsJpCulLl81lgA+?= =?us-ascii?Q?qLsEVvRYj0lr3cnQ0r/+1AqELKL8cXie3Lzj1+VCHvZLuk2Wmhie5q0WiKYu?= =?us-ascii?Q?ND6Seri0MLIMkzjhcXTrIDvv7YXbJl9IhNz6iTlFnVeB+0mYss1Z/q7JJu03?= =?us-ascii?Q?qL1hTWcYPrpPOOaapyvjUpKDUkYsnb6l2mFsJLSlGGih4NOtwqnCvPJI6ENt?= =?us-ascii?Q?/DimZAnXT7wJj0wnf3PsIYmM5bqKRdacUdiegmqR4ucvjv2odUz/pej220BL?= =?us-ascii?Q?lcUWdheJiHYsqqBqqYh9v+Qumvv0izbLnj3yhemafQiYU/ofgTwITAwYsJ8E?= =?us-ascii?Q?BT1H60xZyiWzCjnfZhWfjvgK5pUN+mICbNGIySkC?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f051159-ec99-4856-fa13-08db414cf916 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2023 03:11:45.6698 (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: 9WI5ZhdiykfzvcnTmOQskYvMEmRTZ07A6VfiR0foEciXxj1yTK8y3Icv4tzPWiB8w1+Kh8wOUpH62MvD7Ox1gQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Update userspace pm addr selftests, by sending a remove_subflows command together after the remove_addrs command. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 26310c17b4c6..9a9b6e9b28ab 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -850,6 +850,14 @@ do_transfer() ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id sleep 1 ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id + sp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + da=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + dp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${listener_ns} ./pm_nl_ctl dsf lip "::ffff:$addr" lport = $sp \ + rip $da rport $dp token $tk fi =20 counter=3D$((counter + 1)) --=20 2.35.3 From nobody Fri Mar 29 06:51:55 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2059.outbound.protection.outlook.com [40.107.8.59]) (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 2ADE517ED for ; Thu, 20 Apr 2023 03:11:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kLSmhxGxY5DfLbl8EpB3KDvcNV5KpaDh5Isz27M3duR0INRLHeneD+3KwCRwWbOsgO4fXH36vM3mQpSw/rDiJH3e4JvG/8zYlpB1q3J+nzzxuGtc0oJq/6k/jqQkhysQtMSUs4nGutaD5nuWBoUUE/8bKS5M0mYLrmRfxRJqEw9UUWqd6xh3uP2Se3O6jKp12D4/R213gKJ/Ql72IxjVg6m6/zHDNq0wz4Nqj3yw+TfNuNn5OI7yXn20EZPc60rm0yvE+1lDSE2RDG9RLdiLcXof3/0/ZW2xcanFac5NbcOVZjuotm0kOO3JRRjPKDcj8DFNbYTWbURGeUjjwnmHsA== 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=bPjcY9C+/wdxh5CM0MlfF55m3NBSiHxEQfGYEfFRDYA=; b=QlIM04UUQpQqQOn5ejq6wnrkqs09g6m7Ob+G3snIrRkQFn0EHjIOOJypUfDO1NFwkkzn0D995q+BokqVzaUhTS6NZsTVl7SmIbBwH9IKdgGAvW0GYat9koDk8O/zsjiPoEf1AH1aKLzsdUZF7XB1sY+aMhUubZuAHdZ4lIDWycG8i/ALHdlTpv7legmnwLY63u26zx8pNm1R5wLmfMMBgWgYKUuk4MCEiwKtUFy9Vml6NH8ihFNqBYt5xbgxypa2pr7tFRAq9pUjBvXMEXrZqjfCmOAMl8vtGveFrtH5DlhyqkjEMjTG/SoZyz1BXpfEWH24n1LQnCLaj/nB96Nk1A== 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=bPjcY9C+/wdxh5CM0MlfF55m3NBSiHxEQfGYEfFRDYA=; b=jH/LABR9jxyJ96tgxQDJfM4MNWhlTiNS8GmD3Cn/J3QEXgOUOLpVAVUMsn30Hm9qiFpgN1jvo3Y5zQZVQfIp/+Q1HHwUymh1mgA1kjeEH0sf/3dBuoIgS/5yvcjr4fOC/ZxiIIgd0k2NXg+i6zch+PKfBGkDl6+Gj1iyMzW3uaVdepRX0wy7pkdceeV5XzG3fFsabrSRzzn5k0JmB8nlqSM/8snUrGpZhUs2suZX2hUNPhm0572C5+mneUNb9ZZz4RJEkJScu1DqIkzfLKcHJQhq+NlXhoMzYWf4o2ej4TIcjHfdrC1q9yl8Sz3rM+3pKKJrAmNoRRamYOmWTRhwbw== 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 GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.21; Thu, 20 Apr 2023 03:11:53 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.022; Thu, 20 Apr 2023 03:11:53 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 3/5] mptcp: add addr into userspace pm list Date: Thu, 20 Apr 2023 11:11:37 +0800 Message-Id: <9c4298af79bfbf37412a96f945ff75466c45d010.1681960259.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0008.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::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_|GV1PR04MB9103:EE_ X-MS-Office365-Filtering-Correlation-Id: b5a17844-ff5d-4805-6ebc-08db414cfdd4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HXE6gWE5Dxc9asYexyTGBwqpORZ7YW9XnAZi8X8b4rXNvG6ksfov50aNu6HWp3wc2A/Kd7bMAM9jlVNWm/5/sZo0qANrzFXr966qDwm5FnoZbEG8x6zkGWflcbYzvtgauKfUjp8lCVlZVciXApIni9ON5NZVMniyouIK+4bzgUVwpBDzn8joTZG8oTuz3EqO27WCS3LZT8vWnwoanHoNDDP2nXfu2sTmBsZzFaZM2WQL+a+tmAq+n/+iVLOcq3Lx88mMMfCw2iwRVXWKn2z0Yl1Nqt1BYL7HQLbunzLSMatrVltrlYYPoGC0cxfU90CwtyPYvnd026d6RwSW8f7E7FE2BI8AbeZI/60l6nZQhqLq/zj3wq+gx59ZnklV58UOpSKPafmRcwHrXr4yCOsLBtdhN6SRfXEwlmBZHaYurn9iIPawWCoRpbEk1LyPQIjRHrLoiomCTYiMVmSMzQDjaXywgJYNm10HLkBWNSSUYGXSxY8CnMBUokJp98cRpVrsvj9y+CsUiP59F5928k4vazpmhn7/7f/hHuszCnpb+I4Na77XWEPckD0Dcm5n4k9Q 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)(396003)(346002)(39860400002)(366004)(136003)(376002)(451199021)(4326008)(6916009)(316002)(66556008)(66476007)(66946007)(6506007)(186003)(6512007)(107886003)(26005)(38100700002)(2616005)(83380400001)(8676002)(8936002)(5660300002)(41300700001)(478600001)(6666004)(6486002)(86362001)(36756003)(2906002)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3WtY1OZwRYDQeXL1RbEB7R0mebsXS4OlNuBajyAu2rsYF8lmmw+siBGHaQRP?= =?us-ascii?Q?fLY/xEtlBb3vVrC2WhXfwxiASR95K4D13Ns3QffmHiPV0YH5+HpmtDa+Pynf?= =?us-ascii?Q?PCSCgayQPA34LrhZJVgcvXOyOUKzeivdNyNqe+rGrNTJcw8eLa+JLjkfkaZb?= =?us-ascii?Q?W0DgcYpzsY46icwmd+E/V2v8KjfmHUng8QmnJcvLKcY+rJc9t9DZIgNHCK2x?= =?us-ascii?Q?uCsUxDvLZp0VKoUGiTR4i91M0dJPUqCK5yhks3OTFrQVTejUULbH2CmRC2uZ?= =?us-ascii?Q?P0d8/MhJeqaVDa3oDokIjl6OO384n/QAtCg6HsLRwSYrbtenvc3M9f0kjBYk?= =?us-ascii?Q?Sy/+Ox3+lNzCTW5gnqrpWJne2f5eUsvYwsV4hdfV4/pf4oHUoS9fzpLeYviC?= =?us-ascii?Q?/jJIkE0G9YElSaA9WWjK9QFbNZ9vUDXPpS2yOdMQ8hkrwGNSMrZM43sYEHqR?= =?us-ascii?Q?eb8K1UcJ96EykDVIA0C3IqE/mrDUfd1xm65rulsBYoKRNZ4JZd4ENG8onsEy?= =?us-ascii?Q?XdGkv1AvYzXVQ0Hrn7BNdFctPLUYEIIG5o9/FA0awVYkmHyfEQVBMN1ngTEr?= =?us-ascii?Q?2KNsdvp3Zq1KddptOfUi8HZGJjXUIIK9u6Mw/vbeWuqZm9uVkPo8WOKpig3E?= =?us-ascii?Q?OVhfD0xlE3yOgF27nuLzcH1NW/NWqjU96mx2xiF0yb7mLyUx+B/gI1+TyFvG?= =?us-ascii?Q?OOh4LD+6u6ktzg8G0/gDSL1rBlm/nx1emC/CFCEXD17jutucDaPu0oQhtTaP?= =?us-ascii?Q?3oCk1HpDMAi8AWYvaXKVzhXcRhFtuVDnpeKwT+lqNfcwsLAXzGRW/KvP8QLr?= =?us-ascii?Q?qkWNyPPoLDXnMJKbuyfhvR0vffnoxHeShWhw2WQAFYoEL8Nc9ibJLjwHQufo?= =?us-ascii?Q?XfqvX4wDyl/N1CxdeSEngoeTmke6M64NtalQLskuit/ZVRGHdI/DiDXF2sOd?= =?us-ascii?Q?hZetZ2Lb2bwuAo+p1LewDNp6mLSjfZzM/Yc5RCSdVX4m3yCAyEP52PP9hOxb?= =?us-ascii?Q?aNnmo7EKWM87SRKaTtI09T3FD9HCZzehzMQmc3b+BUaU4AwbQOlcVdS3/6B6?= =?us-ascii?Q?4qGHwqjsunmy+p7rk7gpfVxHHRlU0Mc6HPVrsZcvKs7kx2WI0/1vhz7FveKp?= =?us-ascii?Q?IUCS/a/Kkgy2C1H6tkY84M732CdW1KSjfhlB6llFKDSAkvJnf9WTmBxCf0Oz?= =?us-ascii?Q?3ZP8KLLw1Zd1I6s6+67AxVL9eEdi4a4KYH0fQPFNxYmjT0IVin9mQXgJ+G6S?= =?us-ascii?Q?0w9XGf2cwc5OE5G2B5feOKeieFfEPRNsPzLlZhlwLhOEF8ufQ8CcvRjKNT2M?= =?us-ascii?Q?pVV+YvIyAVGJjFrAkhhv7JejfUuAasqjcftW/TOs9OtiMwWetCwqQ5OGPBOP?= =?us-ascii?Q?z8bFiglOoVQwRt+aUEFYol6P/S9cZFyRTdHE186wY/CbNe/8zpxzTl0C7IF5?= =?us-ascii?Q?qesXL4dq4w6KLcuTnPQ0ROmCzVdF6SaUHqlXxwKzFz55ueRPVAEJshT3jG+9?= =?us-ascii?Q?dquuaol4I3WMNpGeGmB3ZmgokDVe3jm/PAGrC6oyMfGYzwt6jhwzsOp/YcyI?= =?us-ascii?Q?m5QsDMt3dLMgIMZbYw6/ibuYI43qoYQ4b7IwGSo6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5a17844-ff5d-4805-6ebc-08db414cfdd4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2023 03:11:53.6352 (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: Cie6XBOZCdv8f15OUO+zCg4Ta0Y+8zvq3nurvetTM5H8mN6Lboaf0ou8xlQYivJzOBslMRN4cti2VSAJ4PJ7MA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Add the address into userspace_pm_local_addr_list when the subflow is created. And delete it in mptcp_nl_cmd_sf_destroy(). A non-zero address id is needed in this case. So don't clear the addr id in mptcp_userspace_pm_get_local_id(), clear it in mptcp_pm_nl_get_local_id() instead. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 2 +- net/mptcp/pm_userspace.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index d85649bc27e2..bb237abb99bb 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1055,8 +1055,8 @@ static int mptcp_pm_nl_create_listen_socket(struct so= ck *sk, =20 int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *s= kc) { + struct mptcp_addr_info skc_local =3D { 0 }; struct mptcp_pm_addr_entry *entry; - struct mptcp_addr_info skc_local; struct mptcp_addr_info msk_local; struct pm_nl_pernet *pernet; int ret =3D -1; diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 6beadea8c67d..a1f8d2fab08d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -113,7 +113,6 @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock *= msk, =20 memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry)); new_entry.addr =3D *skc; - new_entry.addr.id =3D 0; new_entry.flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; =20 if (new_entry.addr.port =3D=3D msk_sport) @@ -302,6 +301,12 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct= genl_info *info) goto create_err; } =20 + err =3D mptcp_userspace_pm_get_local_id(msk, &addr_l); + if (err < 0) { + GENL_SET_ERR_MSG(info, "did not match address and id"); + goto create_err; + } + lock_sock(sk); =20 err =3D __mptcp_subflow_connect(sk, &addr_l, &addr_r); @@ -420,6 +425,18 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struc= t genl_info *info) ssk =3D mptcp_nl_find_ssk(msk, &addr_l, &addr_r); if (ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + struct mptcp_pm_addr_entry *entry, *tmp; + + spin_lock_bh(&msk->pm.lock); + list_for_each_entry_safe(entry, tmp, &msk->pm.userspace_pm_local_addr_li= st, list) { + if (mptcp_addresses_equal(&entry->addr, &addr_l, false) && + msk->pm.subflows =3D=3D 1) { + list_del_rcu(&entry->list); + kfree(entry); + break; + } + } + spin_unlock_bh(&msk->pm.lock); =20 mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN); mptcp_close_ssk(sk, ssk, subflow); --=20 2.35.3 From nobody Fri Mar 29 06:51:55 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2042.outbound.protection.outlook.com [40.107.8.42]) (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 3327417ED for ; Thu, 20 Apr 2023 03:12:03 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kkav1VKy2eHMh/hCq0BKjYwbQH80i+bZ+Ch8DrRbSqOAvl4KKRLZvrHOWihJCOkxrRK0l3KC9/jigpqEdfTB+IWu3zn7ZdQDAY5ZfIabcsN+13KpGrdjfGGhbLTHu9ocMOURRMPD6l6/u1FaotgsES6aUIfsH9AUTPQAh51SKzfTTu9hIw/+rGprcbLQvLHtovBzPN7k95rt7WH3OAfogWaOb6zr9Dq4nPvXUQSYgkKHJm/ZYlzKP7LFupNMhggkjDS2SAIZT15+fAjv40c0J5c5eUo/whCSgG6L9v4BYOE24wPBMxl4YxoIxYEzst4y4Chng3FI5d2g7r4vsC8RUQ== 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=X08b1gUihvo7AeYfCKBoUQtDsgeERO1iK/g9SyMxhW4=; b=YIWoIs1Y6cnkJlIEF3aQIIdpKQUHf4f+W86t58x/9rsl+UKWyFpT2/cUWJ2/pdDS63KJwbT/D2L/Or09uLQfeYmvGwaz6lVS7lFjC+hOAoQHc1jF2mG6EOMUDcoiS7SXA8ocMiOrqtX3Fo49OlGmY0QR86ZwhkKp9S5tNJojC6dkikpKkHUKRnIKy+ZmhUdGxN2wJ6ZsHyBu65wLfobQAn9eYhSgylDuXymhBBS/8GhOsP0eIdVOvU5o54IaJz7OS68x8tg2Jl4f5KQPo+qAqAo940SuhoOYofDR18aJ38ZQMJ1tMn5eyf/yePheSEGVuRsvVXJX5DeHQs+m9b3cfQ== 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=X08b1gUihvo7AeYfCKBoUQtDsgeERO1iK/g9SyMxhW4=; b=Scpx39m4u+pendXgVjFlXuX167nJYSICxxeWhfGNb8cCxaogUgTs4axC98zUOdxbMvl8Cct5YYCxGQMsg8klf1h7Ocp2bmhG/Kw620EuhRuwH32RpmsbhL2YELw4fsPW3zsoEWJir1XafiTDB30KYw5i0QXv0MBq1giFzZfa+1nkzi79ggF4VQy9EtMqg7c7htEAK9xvvPYF80xW0vBn2l5a8GLWwFgybPoGDavVHVIk04R9vtwywIztH+vYEhMy9/jQdR/8UEwJhhZJT8SvagOP+FyvaMFOImuxsOyYjbrZkpXnNAJCd+BUsrbQpKhFR/JXb3/vnWyiC8FE4BGOng== 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 GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.21; Thu, 20 Apr 2023 03:12:00 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.022; Thu, 20 Apr 2023 03:12:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 4/5] mptcp: add addr into pm anno_list Date: Thu, 20 Apr 2023 11:11:38 +0800 Message-Id: <15a683ff3b3bd04870b0739854ffdd8c01067a76.1681960259.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0004.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::16) 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_|GV1PR04MB9103:EE_ X-MS-Office365-Filtering-Correlation-Id: 37b2d51f-d3d2-4559-efb9-08db414d01d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JvUEjxeBKeHpHjgil/TBQ5jySr2Cl7Vcol9tbayGUE72xuC17ZbXy9yEdUZCjpjfaCxdb94XyNzGPVVSn8mqdBmzKm9z0D5Ad6sH1EJB9bjz2MQSEOm2WYCnd9L9956jFqiksTw++J/W8E+hEhSjDbseXdmbIpVq+k84kUkbqUFzCP1B+ZZSd7Y5pPL95bvPXdWu4eY3VFzxcEFiPJ0uLpWI5z68oxcB9s2oBtl4i+WXtdaDwxJpu5WvvKzPqo7SgYqUX0TbFki12i0ftXCjMX4v7IhQGJosVx5XcoB5jDaMUrGxZuuYkyr/zLC+Sxx1rsjnGyOGzhHjIKhiYVNuL50qnqYWsNmRlvWCWPPWbilUYeW58OmUhKOKx6B8CCat/vH7qcfbJPLtfXbvYRJPTY3BbxLayjYRYTi9jlWctrxP0k1jZ4nXaox+t2mMc+sa9QRSRyqf2/ReqMQkJSMFM2xdCkpllYDQLCdwvoNRFzElHQQcJTndr9xoLODc4Y6ZBU0nm4fGRoE8LjuEOl1SjXftbA2dICqcnvskP2Z7GB24QUbHLYnF50mxkVr+R7Jo 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)(396003)(346002)(39860400002)(366004)(136003)(376002)(451199021)(4326008)(6916009)(316002)(66556008)(66476007)(66946007)(6506007)(186003)(6512007)(107886003)(26005)(38100700002)(2616005)(83380400001)(8676002)(8936002)(5660300002)(41300700001)(478600001)(6666004)(6486002)(86362001)(36756003)(2906002)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XzBxPWW5FJgvOhfYBp7q48xL6piceRYlEE15VmY3WR4jvzUznVP5qx36smy+?= =?us-ascii?Q?SvYX622TVb6X9InnNhynVFvZxvyaW4pvtKzuZ1PP4xlx3cqXHofJKBwqvIQH?= =?us-ascii?Q?HWA5trBLyd64Hle/g9+ZxS8q/1BEbasuRI9dS34kWX4lTGXgGjX+Jabxfxt+?= =?us-ascii?Q?SX6/OZxeoMOVjIoE7rLhuLP08+bQD7iZmS/uROkju/hEHvTNz/WZfyBXb7qR?= =?us-ascii?Q?PPtGjwedHA0gSX2RH5KV8fOpZVQU2DWVFN9tXuKXTXcvuXyTDDwaRaH10fxT?= =?us-ascii?Q?Ha5B4mzMM08TGReB4SXYSX6BWnJoL77ST15kwTpUdObo5cN6hgIKhlWzbbtJ?= =?us-ascii?Q?xwL7brDZvCmDtAIGle9/4hwi9siv+x9jWJz08lpGTNhivN8VCzALCuC5k0A+?= =?us-ascii?Q?7j14MJD/GZGFz8Rf4PRLqZSg5OSBq9XBcpXHDN0gjWAH5qicQGMDf2hocE8b?= =?us-ascii?Q?GFRyTfaDQoWeb6w43pk2OQu+WHSi6Kz6b0Vejb7Uca0hs/Grh9w7OpcRnntl?= =?us-ascii?Q?9BbNMEc25u8o/d2TMfA848FDk16TnPyxgIWsc4maS/rIAmSu0s36X2+W75lv?= =?us-ascii?Q?WudA4yd42mf5wD7idTbppL9YpX0lPvMvKHf/q937D5Euk/Vmu4BJOAtP5jry?= =?us-ascii?Q?OMyBLllqNiRbwF1hVFwOdgicaOmB98lojNqjnW7cggX1HGHr2U+nPfLxMyzz?= =?us-ascii?Q?Jzpq1IohOPq3Kic/sL+bPF8PaoBHV3b14qab5t70vO77hzqSq8JMutKyLLDl?= =?us-ascii?Q?90SHC6K/PEN661NKKq0Sv5ztQkyFMx06dmrrrH1bAG6sMLwTc7Hs9fI5GjpP?= =?us-ascii?Q?a8bKWoGRO1zaV5FgodIosKCSHjfUQyiA4am3SUcveItGNwcD4/MkzTUvKQFB?= =?us-ascii?Q?XJAOlUL0xgO6fXWPdZ5dvavq8mEb2Wbf5cVFW72LGB8Ytf9uSJTyt1OxJ7iV?= =?us-ascii?Q?ErjDQa584roC1gyYoOhYihWfjfgvPMzsngRfTux11ItKfv9P7MZX52MW+TDz?= =?us-ascii?Q?Rl51V6EAbPUQZvSa6cbgw/kDLOf9rAarfcI0TKyAoL/08SOAcA7ZoTOv5E7T?= =?us-ascii?Q?ASodP2Kxcv6KIXwa1FPcVBjeeP3PTWUv+5q/ybAVBu3aOVyLlODL5quXT7++?= =?us-ascii?Q?R+DOtUE+D/94S8Z7lcsynwSkmsplX633f8L3cxGjYUoB9lj1TRr+slEpOgsX?= =?us-ascii?Q?w0EVHfwG1/FqhP0+z02RdV+mCsF2PEkxxqJiGk96xNwGQAKhXvhPkqtdqzcU?= =?us-ascii?Q?NsY+cWk/lZtkbGObLkDf/4x/dU4iYxp/N1LgoqZVeWWfylHL7rjy98FB3hXH?= =?us-ascii?Q?aFCafhoKB0IvZ+xStSZYpRYt5n2hTOkQN0srQmU+3CqVUflrJ4Qy2AVQ3T1T?= =?us-ascii?Q?CWnf5j8JysRNBLT6L4E92Y3OYLoSWIjjRXNBp9D+Nu+z++UUYkBKwOIwOKO4?= =?us-ascii?Q?cBWJmv5XKtvTC+NTyRgsjnk47SY+KvcPyaw2QLvLPjBw0SUlJuwPNnkGBU5K?= =?us-ascii?Q?RguWXsQwtI9Yz8NNAJUQWw/GqXGr0D1YxSXPgMv+5cCbBJZ6YtAi3Je4eBZj?= =?us-ascii?Q?huWv9TxUrVxH2RqD3s+5TI+ruMPFYsZreYNB/vXS?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37b2d51f-d3d2-4559-efb9-08db414d01d7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2023 03:12:00.4591 (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: 9trM58A+0zSW6B6a7WMxvs25sghfKhbP8oPCfgaUr6a49bsX7lVh/LNSMr2zwX4wRZVKWzwD80fOODOifc4C4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Pass addr parameter to mptcp_pm_alloc_anno_list() instead of entry. Export remove_anno_list_by_saddr(). Add address into pm anno_list in mptcp_nl_cmd_sf_create(). Remove it when connecting fails. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 12 ++++++------ net/mptcp/pm_userspace.c | 15 ++++++++++++++- net/mptcp/protocol.h | 4 +++- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index bb237abb99bb..d03c60f54085 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -342,7 +342,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, } =20 bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - const struct mptcp_pm_addr_entry *entry) + const struct mptcp_addr_info *addr) { struct mptcp_pm_add_entry *add_entry =3D NULL; struct sock *sk =3D (struct sock *)msk; @@ -350,7 +350,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 lockdep_assert_held(&msk->pm.lock); =20 - add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, &entry->addr); + add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, addr); =20 if (add_entry) { if (mptcp_pm_is_kernel(msk)) @@ -367,7 +367,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 list_add(&add_entry->list, &msk->pm.anno_list); =20 - add_entry->addr =3D entry->addr; + add_entry->addr =3D *addr; add_entry->sock =3D msk; add_entry->retrans_times =3D 0; =20 @@ -574,7 +574,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(stru= ct mptcp_sock *msk) return; =20 if (local) { - if (mptcp_pm_alloc_anno_list(msk, local)) { + if (mptcp_pm_alloc_anno_list(msk, &local->addr)) { __clear_bit(local->addr.id, msk->pm.id_avail_bitmap); msk->pm.add_addr_signaled++; mptcp_pm_announce_addr(msk, &local->addr, false); @@ -1399,8 +1399,8 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp= _sock *msk, unsigned int id return 0; } =20 -static bool remove_anno_list_by_saddr(struct mptcp_sock *msk, - const struct mptcp_addr_info *addr) +bool remove_anno_list_by_saddr(struct mptcp_sock *msk, + const struct mptcp_addr_info *addr) { struct mptcp_pm_add_entry *entry; =20 diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index a1f8d2fab08d..8c050c118ba9 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -169,7 +169,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) lock_sock((struct sock *)msk); spin_lock_bh(&msk->pm.lock); =20 - if (mptcp_pm_alloc_anno_list(msk, &addr_val)) { + if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { mptcp_pm_announce_addr(msk, &addr_val.addr, false); mptcp_pm_nl_addr_send_ack(msk); } @@ -307,12 +307,25 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struc= t genl_info *info) goto create_err; } =20 + spin_lock_bh(&msk->pm.lock); + if (!mptcp_pm_alloc_anno_list(msk, &addr_l)) { + spin_unlock_bh(&msk->pm.lock); + goto create_err; + } + spin_unlock_bh(&msk->pm.lock); + lock_sock(sk); =20 err =3D __mptcp_subflow_connect(sk, &addr_l, &addr_r); =20 release_sock(sk); =20 + if (err) { + spin_lock_bh(&msk->pm.lock); + remove_anno_list_by_saddr(msk, &addr_l); + spin_unlock_bh(&msk->pm.lock); + } + create_err: sock_put((struct sock *)msk); return err; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 1a2772902e9d..b3942d15ade7 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -822,7 +822,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct mptcp_addr_info *rem, u8 bkup); bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - const struct mptcp_pm_addr_entry *entry); + const struct mptcp_addr_info *addr); void mptcp_pm_free_anno_list(struct mptcp_sock *msk); bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock= *sk); struct mptcp_pm_add_entry * @@ -837,6 +837,8 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_s= ock *msk, int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id, u8 *flags, int *ifindex); +bool remove_anno_list_by_saddr(struct mptcp_sock *msk, + const struct mptcp_addr_info *addr); int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, struct mptcp_pm_addr_entry *loc, struct mptcp_pm_addr_entry *rem, u8 bkup); --=20 2.35.3 From nobody Fri Mar 29 06:51:55 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2079.outbound.protection.outlook.com [40.107.20.79]) (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 79C7E17ED for ; Thu, 20 Apr 2023 03:12:10 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SgLFbFnOUPEcdX3bm/L3vQjNcV5pt4oL7yjXJ049DJJHe2WHdysUiazDXcmm9ciMVo8K+03de+gKvZLDzDmJmA2VDbhEY35qv5dTCiO1gYh93imrJ9cABNBwLHZUfSHA1Klt6kX/LujbS9MowUuKv6HvJ0DGdFVnt7E4Rdws1vT/sMdM1gUEmWR5FypHaz/gB7KYbWDCEIQW7HTSzCxvzW8rAFN+C3mw4YX4Y9lN5cTNAHMuWEccW0azpg5hAjAjGN5H92GoA1rY7hUtczZDTY5WAVyFTKmgzKmyIAnylkenKGugyNUJ0Rp+miywdYXqu8Gn/X2CYzoPLZypVtYYcA== 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=FwYkeFW0gFlNlno+KUMeZuytV9afTvMmrrmn5vS1sUs=; b=GvUejK/8mP+dOXwbfMiVdJ6UQtm7kkHhqRxBXEPWxE1B9vVeBCLwcJHQyzw0P20oJkyb7FpQkJutEfzYel634bHhhS+kf/1q0YH3segiu5cMpFiamOPBlNiyayOGS375tfFCwH7pU5ikqkYQE39ym55zu5PtxyPIYHx4e25dX9x3xkYVKejZRCDjLkkGewiz2W35FxiG9aQJsPg+6v6/b9ekKKTKD0JRN35k6W1oyE6Cqncee0EYRctSrhyz1Zm4r4O0RigtThKGEU0BVc1d130HSnsvuvA69n/tlr2HmEEGaLeDeb9K8ZPqKdmC4Nx53G1i0u2Fzr8fZu2LJ+RAcA== 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=FwYkeFW0gFlNlno+KUMeZuytV9afTvMmrrmn5vS1sUs=; b=oZyCqZiTxC1dd7+9nFgDMbg7aBMi6+U7AItLsZqS7Qz0CwWEmSGiAtcJTPKvgiApE4PzQzsXGJBZ8DkB9aPetLa/pFvD7oyWGrzPN2jxoY//EVQPe/Z2xwRgHpTvcRDbp/TfzW6JNJewTw6HNsV4rchOGbzwGC17EnJTzEHTQaWVdvXaNuqMddTLe50wmMELke4PlqVGOyeeP2qV9fl+P93k9pULdyHMkShb7jZ3QGi96a92guJl62hzUzGhxpEaQGxXL6QnQXsY3NDjgwAMwWerysbykOF2NrWxjFuIm08kdJ2uPm1TlpGjrzWYuawHklPaS/BtjWKpVF+Ld7Rcpg== 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 GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.21; Thu, 20 Apr 2023 03:12:08 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.022; Thu, 20 Apr 2023 03:12:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 5/5] selftests: mptcp: update userspace pm subflow tests Date: Thu, 20 Apr 2023 11:11:39 +0800 Message-Id: <177f9ca7d30f810324bf46705ac7d977461ffc2d.1681960259.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0030.apcprd02.prod.outlook.com (2603:1096:3:18::18) 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_|GV1PR04MB9103:EE_ X-MS-Office365-Filtering-Correlation-Id: a21976d5-da34-4cf8-efa8-08db414d067f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QWnPe5ZU9JRKZtUNbTP8SLi0v/apJEJBQH8/Df4vbynZhymYrihAtdKR+O6DutpYagc//pO4BJ2+vlMl/Oc8ilXRwGJPZxTygsa7GZwxwGIn+y1XTaeUZJe323oeHidA8ixvwtJgPuXLINY5HIvt9vDwxpMRrs5Z85Eww3OhzzleNIJ1wxhgABFWhzsUr/hBvD/ZA/oBYlU3UsDqqMKdvzSY5SQInsQhPOEoohwQ8//E7t8G1aw/liuLgmuGUs7FT6BOXLLyLo84EqwQtUZDePOtXcVWqiPMh19wc0kDQjvzpy0kx3Fe/XKYYXZzU8/yHyFS+f+UhuEXbxNpSbKQWHSvI7N5JIqBj9Es5/edzYH+soyT1NswBsNsX04df1WybonFeVQb/WCMsElXHmNqAXxf10IHNwrB5sLb3wvm8sm/vkW1eAfEkzHdmxMAhnCYOxSri/Yt+Y7+QQgaNYrij5n7qNhkZ2ohYjNDCysisNtVf1CVEJ9866vXBAc3ejlxHdoYrU1PtnnDl2UdSrojBESqamxaeqvBr4ROCcFyuHYbu5mUkHAaKyCh+uKhUu0G 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)(396003)(346002)(39860400002)(366004)(136003)(376002)(451199021)(4326008)(6916009)(316002)(66556008)(66476007)(66946007)(6506007)(186003)(6512007)(107886003)(26005)(38100700002)(2616005)(83380400001)(8676002)(8936002)(5660300002)(41300700001)(478600001)(6666004)(6486002)(86362001)(36756003)(15650500001)(2906002)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?j3WpPpPqly15jIfLekrF7JitMTlzV1+NgJgSs7DwaanuUmrZ8IZFyyCgoCBi?= =?us-ascii?Q?hHSFkq5Y2iTP5Jf8wu23RNi2OzDSz0iRmaAazLgaPV8Apao0dnHeuq1H8ANo?= =?us-ascii?Q?JMCRtn4JypT0GHmUejEINFlqpkz1dw95aOwIrRAIjGnrEczAVg0qra7y8My7?= =?us-ascii?Q?8wJ7ZmhZhnLByvGrBkTVZbPTZdcYO1jXWEIwTOZczIdTEIQpionVyjV3D/3I?= =?us-ascii?Q?Xbf1tJHvtlghWoJ0eCsvh2f9v7R+IN9Kkmot8piAIdsodLpKYXakrkZnRP9b?= =?us-ascii?Q?5P39maQJekNNUTTkPnKSaIA+G6cqdHu5VUEN3R1jpIr5tzcyPBvAIXqgNnpV?= =?us-ascii?Q?56/ht1ils8VegiEpv25n4JptjrPDRJ71EhPzEw3MSFunmc0ETtVn44k7Zhsv?= =?us-ascii?Q?laDh3zRYuVrDzm9tcQkEaW6WLwDW1LIkoUbnLPYzUY5yGCwTO92xka9hReuQ?= =?us-ascii?Q?OiXZ24h9WvuXZbPh/7woNGMFPMn8o4/fZ5k8HgFoINL4yBxYnnY7GbHtlmnp?= =?us-ascii?Q?bpNRaZzg/1eLz8P5OVoaM8xlXrfvADlWqTmBiKzys0gf5ySK/5GnfzWsMD7W?= =?us-ascii?Q?VA+cztaeMOu9yakkXs/Cp1f+Raah79x/OzANij8WJL0U9SQKufBpOW8m7z3g?= =?us-ascii?Q?oyGZ53z4VGXV+Iyl16Ra9AdJE2gqbqUflF76/KKpDarYLYfvvgFPqeiOchGu?= =?us-ascii?Q?47JbrYWACFoH3NbLlXhlbWgb7B3SOvFtR6/mKOaywYM+/gU/b1iQynkN7fH0?= =?us-ascii?Q?jUkMp4kfCXHVvJvzCEJv7ze7X8UicH7AAUPivUBqG+LiweXIz1Xv1dONQ9Jl?= =?us-ascii?Q?X5825K3XV3OM6XkIJrQCRQXjSIvQ1CTdKsN6+7CzU3aAvKiHywwVZPpC2lXe?= =?us-ascii?Q?ZGr9l/HpiSShtG3/TH/JIrLWcWPV8mbjWBiPu4LhAEjHRD+1fAeTU/RezVpq?= =?us-ascii?Q?XEVWh7vqbtToWriSccwQ0/Ay+RwxRssKNFKlWNdvN+/SnxxVkihoTCCuuxUo?= =?us-ascii?Q?C7BeuGTH7XdEj6wYG3gGwPlDeYht+2/+B+kIm8gMIVEfsu+Hmfn/h7dX7NjO?= =?us-ascii?Q?Q58HSxeU9gLLaiKT0ppyK1HfWJhid01jEDv7RXmF2Dr3y/0eHibz9WJposdS?= =?us-ascii?Q?2wlGKYKi853BEAVOLXvUtydeL6Wuzc9yoxQAGYgGfA1q1mhYVzDH8jjku7rZ?= =?us-ascii?Q?i1ggsxhN30E1k2a+V6f40aC72KQDEtR1B+e7Lx4i788SMrKi4JsSW1fPZEe0?= =?us-ascii?Q?ZY0wEEkga17QmcxOKZQ2K0ryDFtDkcNYS0KJhH0Q2EFA6xWcZ57BT3bVVhV4?= =?us-ascii?Q?Wty9DQJwj9cmLXgvNPzlpajqbBC6kU9tzOC0OO3cuZ1FfAYXLatQYcjPmwe9?= =?us-ascii?Q?cCt7a9nTFZyPgK+NgLeo0aRrU7A9the9rMR5qWiE+q5vO+0U8o/E7ZjyZAow?= =?us-ascii?Q?jJddi+TbMBVGqTfJ1wNoiyvRpTnvUoBNoHjGkbb4+bcYaATbM9dKWuSb4BE8?= =?us-ascii?Q?Ej2WLd8aen3IMI4/M2XgzjQY55iiRtMd63kpCZl1j6YuAdaXv9dkxR8ISW5P?= =?us-ascii?Q?IzqBYMyAHGmeTzuPsFGX/qVf4udLiOCGbULGUteW?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a21976d5-da34-4cf8-efa8-08db414d067f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2023 03:12:08.1754 (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: trFnOtwSFPr+1ThGq5LO4ul/Wugu/Zz+B60pL6qAlDKyDqarduMeHLYhfC/DQIryQfIZkkMpWQpSTWVzvqakBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Update userspace pm subflow selftests, by sending the a remove_addrs command together before the remove_subflows command. This will get a RM_ADDR in chk_rm_nr(). Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9a9b6e9b28ab..795c141a11f5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -923,6 +923,7 @@ do_transfer() sleep 1 sp=3D$(grep "type:10" "$evts_ns2" | sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${connector_ns} ./pm_nl_ctl rem token $tk id $id ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ rip $da rport $dp token $tk fi @@ -3137,7 +3138,7 @@ userspace_tests() pm_nl_set_limits $ns1 0 1 run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow chk_join_nr 1 1 1 - chk_rm_nr 0 1 + chk_rm_nr 1 1 kill_events_pids fi } --=20 2.35.3