From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2069.outbound.protection.outlook.com [40.107.20.69]) (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 C9727DDAB for ; Tue, 7 Nov 2023 08:14:31 +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="PwNX2aJ7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f8q3GZaicmpXF9izjlGqsQqaNv1lJLQLeHPmF9yQ835ERL49fG6qTNRAKBDHnNpxVrLzjCutpsWbwTBr9Ir8ZaW7MfTpCaHnDzcL0ylxOTiNDDTGlPnj4AQo6CTGT5jLxQgdRHMG/yYpYwmPrwRru8lfBfryTdNvfXLY8z0dfNURrP7PQUJUSnXIpAmLhCN4Vj97NVlhTP/YMlWyAvxi8zx3SdT4b6hjzFMqVAFvae7nX70S2xq/7y60MQdXkam35AaxaLxH3cVESaW3QIQFC+GxErAvFjxy4L5YdkhDuKhGdT24WUceWRrZwYSatjo3kfJBMyRMqWRsLId3BYLU/Q== 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=ny/YNTV6iAE3ls6l5bZbWBN4WsGQ64owh+fZYjVRzZQ=; b=ighD+g+Os69O47UK+aU1HAuzv+R5zC9hJb6FX+FkUUzO27euP+8Fv/psb58Mo12TfQtmE9jJzpVCyWd03RKh/4fdzvcZ45AHnzIHAtGYISdH4IhMCkf7TTg+nD3vr1meybOeKsgr70bteViwpmnzXQYQYdU2f3O8bKrw0JSTfQssUUOyKdmR8iOXpld6fJWscFPP2e4mP6RGLdWLpbW00yXYIrMgOx9jL+WLcZPUZuQIQLjCn4Xk+hjoBX65TmvObsJ59iaYXdInjd9heW6tXMGqb7EAeQYW8l6+ppCiCwAmvyUOHkj7X1164oyDMuzLaBflF8ZBuCR5T3QNo6hJog== 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=ny/YNTV6iAE3ls6l5bZbWBN4WsGQ64owh+fZYjVRzZQ=; b=PwNX2aJ7R70x2dAkag5SJIW4BST7VwsQBfQ2Lq4Hn4BK+kqYx/N+d4lVvPOksX9MNL0yT0oRcPlZENycNK5ftL0jaF9sPHay9uU0+LQf9B5NmlACK36lhOzU3WmWNZED8anR/TUbtlfKFpzc3qBTndvl+QCv7zCMpYu7fK0/y2G3ty1Ag0Ag/sOpJSecEhXnAhmZFKYYrzohpIJe1CDOuspQc6u/9tdaLwq+LOlgUhRpzImNz9JVqhaewl2IaS15/IhYRoOo/kJO7rdCmSceaP4O9ESpY11FgYGbmuRMRlgEMSpkNu48c9q9QZF5XpFThIP5heTBZQxduS9ra5Ai7A== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:14:28 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:14:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 01/20] mptcp: export pm_nl_get_pernet_from_msk Date: Tue, 7 Nov 2023 16:14:07 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0018.apcprd06.prod.outlook.com (2603:1096:4:186::8) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 4053086b-5ac6-48b9-b492-08dbdf698fea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qq61bagK7z6FLgJ9gNPtxGu79mWPFfShn/YODKxiY1WTcyIvJK1s94apuz1Fg4sfaLN/TI/QUzG5R1ZNcurKuTW1XslPtUBTZ2i9hHsvlOsUG525YqD5MkKoJMdMzp9NoUhORiTCEzXe5In4Vqg3OhIdiI1hpfBJVpAaM+g4C/uk6C9ruN68c0Zp9ppyqRQTRJrPZDZLpV5ojSN1JMaTkcToVBm/d703mw97MHmt/H/x5L3ap/DrI3B7FrcfeyH69GBBZ3x7tNeP60q+tq3bBYnF/cl0Wpi0q0G+QUQZjgKTXvxkp0pjGradkbeAZG3S0hZHnAez1lqJ/7z73/1FvXQqsMgwJsTJxuhiyW621RqDsQrRwRByu0vamYKHdO5WoCNMeHP6iAdBQRXrXdmdxorsF3PJVA5vNM/PeYIn1LHKZI/XS4IGKoRkTNlImaGdyt15P1+k1opsKHJaXqKirbaJLxVHSA9iMGYEhHyZqOQxDalzDv6wvHgX0V5ym3Mruvyo/+8mF1IWeMlk8bTYvm9e2ZEqSRrohsUxe+6M0t8XnaaM+xsC4eFI1l3zLUkg 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6LR7E4kb/upDruT0xPg3JhdlzVBoXS0/3V20P5elaIz2Pgq0cQ1hxmcSkWdO?= =?us-ascii?Q?6uhCXEgi9qhHZxKlovLHplDAIdgG2h52+JTEVIyu9bijL1SbWn+rrugK5EXZ?= =?us-ascii?Q?Jcuhz1WJIDacsXy6BA4hJWLbEosvNPoS1K+TaAzhYGhQNmRjILAvO00V4RsZ?= =?us-ascii?Q?3qy2WkETfmX+GOjbhib+noXf40lyObCqZdt8WVqq0Ul4LJdtzFxL8/1qvCQs?= =?us-ascii?Q?SZroeBNcjvYMvycHEbDTAD27vfZCdN+bfwQj4yu97qqVJ59tSDdadk+D2jTA?= =?us-ascii?Q?AEb/jCkkHpmX4do2gYeNaxnpz4at+ksKpzOax09VG3qr6y1uHsOceQMumx2a?= =?us-ascii?Q?JlfM1WIWrgHCjOu1YFsM/wFnRF8gddPXQdT7EbjA1pBItMqYPY3CFmKMcrLN?= =?us-ascii?Q?YkWtVebV8Gl6Pj0tBKVgc/N8NgY/haUuuEwnypKMTgoO1Vsgq9UZzOczUGcm?= =?us-ascii?Q?o9bdyUju/BZYsML3eKHMlNK87WQAUaek6/BhniCh6G3Hvo4KhMAF0hxYzYqb?= =?us-ascii?Q?NcCxY6bmc/fOi/2ysDKSArHE+s5wqAwbUu1G4iqz3I7+0m5r9cCvFeI55Al5?= =?us-ascii?Q?A1iDQz+h///OSrsbNSi6PtR2CouJOfHfWfsR6B17XJpl20qpbv6/jpm0WBNp?= =?us-ascii?Q?HvDwrnEDE0FtY+vo3gImcSZOS/RFT3fvWoqVGrtsXOZkZW84TbSwGbfGSBsR?= =?us-ascii?Q?YPVTpJoqbi9jFL9W3Go4y+GUXjcyHlSI4KcqYnQyrY0IynZOhCOuXBpk2eED?= =?us-ascii?Q?CrJA8QkNJXTgBcAfzUlgakG/3D/CieVv/1OtvxvVMsA5D8d2895+qUHS+vNx?= =?us-ascii?Q?MVVfmRzuu54jT2QECFlG6Yy0qqc4+VJdsLyjRFf4JyZwYeRuKW4RDa3YrUep?= =?us-ascii?Q?VcQMw85ENe/+Z7E0IJb36KreyjZlTLkYVLbdMCBxj/ZImyU+ukTOzeGpLWY6?= =?us-ascii?Q?O/FZwGBmZKXJFN3XoIg0wUrJEwKsWgeeQQUS8fdUUvSkuUp4qxiOwTh03hoS?= =?us-ascii?Q?tEVrmb/xr+ZdGpAMOw+Zbg1wMHfpHwV/V2Fc2+sK46nSqWozp7QQv3Yq6YHB?= =?us-ascii?Q?XBeeX12gKMA9890Y47f/fSpqtMNDXVQ+Z+vernj5MQ7fzAQILBl/ctxMd5mc?= =?us-ascii?Q?fdnv2vG7i7KitYP0HEh12yiJ5X6Ah7RCE8FfgYbvN8Zg2dvYuGIox607QVfW?= =?us-ascii?Q?xMSjBRjfErASZRjA47QrGa4GBQ9F7hZQ9QCwuj/jfN5/NdS42n4LPDn6I18H?= =?us-ascii?Q?HzFo08SwG8Eaz2iyBwdyXOYPji/SJevJwDm0SzB43jECUucsEOrVgr637xLl?= =?us-ascii?Q?V6mycWa2QulhdoTc+3JsPTnAcdiZWZ1CvAFN2/vA4bkQXrZm+NBiTwfHu27n?= =?us-ascii?Q?3OFXxp4gj5q7l8T1MzbQk3JUq7GUlCwnpcXoyMYWroXf5bnrhZ6YRqkfN+S/?= =?us-ascii?Q?l2uoMnw41dtH58Whd9pqtNBuThThGsMJMS+heepFxbiMi6LXAfhPFUsfQxPc?= =?us-ascii?Q?pvylq26Oo9iRTj+q6jqs5SIczRHKd6zeKBI55rmfsTKxWNxjRjlCtCOTehhM?= =?us-ascii?Q?Y9ZmvzOc0XyzkltsW7DQR79YqU4F0GSZ69jKicat?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4053086b-5ac6-48b9-b492-08dbdf698fea X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:14:28.3339 (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: Uf8epVwZwq2zlKj0kXsthD+NJm+OIUWTGnMSMERj3ufY+sFT7/8O3XryXO+/4KjDI3aV8qlQZ0huvzaPwO1mJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" This patch moves struct pm_nl_pernet from pm_netlink.c to protocol.h, and export pm_nl_get_pernet_from_msk(). Then pm_nl_pernet can be accessed everywhere, not only pm_netlink.c. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 17 ++--------------- net/mptcp/protocol.h | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index bf4d96f6f99a..1dcf104d7a01 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -31,20 +31,6 @@ struct mptcp_pm_add_entry { struct mptcp_sock *sock; }; =20 -struct pm_nl_pernet { - /* protects pernet updates */ - spinlock_t lock; - struct list_head local_addr_list; - unsigned int addrs; - unsigned int stale_loss_cnt; - unsigned int add_addr_signal_max; - unsigned int add_addr_accept_max; - unsigned int local_addr_max; - unsigned int subflows_max; - unsigned int next_id; - DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); -}; - #define MPTCP_PM_ADDR_MAX 8 #define ADD_ADDR_RETRANS_MAX 3 =20 @@ -53,11 +39,12 @@ static struct pm_nl_pernet *pm_nl_get_pernet(const stru= ct net *net) return net_generic(net, pm_nl_pernet_id); } =20 -static struct pm_nl_pernet * +struct pm_nl_pernet * pm_nl_get_pernet_from_msk(const struct mptcp_sock *msk) { return pm_nl_get_pernet(sock_net((struct sock *)msk)); } +EXPORT_SYMBOL_GPL(pm_nl_get_pernet_from_msk); =20 bool mptcp_addresses_equal(const struct mptcp_addr_info *a, const struct mptcp_addr_info *b, bool use_port) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 8529b3ae55e9..c38a2126071b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1026,6 +1026,23 @@ void __init mptcp_pm_nl_init(void); void mptcp_pm_nl_work(struct mptcp_sock *msk); void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); + +struct pm_nl_pernet { + /* protects pernet updates */ + spinlock_t lock; + struct list_head local_addr_list; + unsigned int addrs; + unsigned int stale_loss_cnt; + unsigned int add_addr_signal_max; + unsigned int add_addr_accept_max; + unsigned int local_addr_max; + unsigned int subflows_max; + unsigned int next_id; + DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); +}; + +struct pm_nl_pernet * +pm_nl_get_pernet_from_msk(const struct mptcp_sock *msk); unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk= ); unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk= ); unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk); --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2088.outbound.protection.outlook.com [40.107.20.88]) (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 4EF58D527 for ; Tue, 7 Nov 2023 08:14:36 +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="ROnnRZIq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QUjG5nU0MUItnDL1E/QbbRbxIp8/y5QP1ci+b/NWPZrts9c5JVz1xAB1V5U7nqEWitnB96CGJnK9W5zKYSlgjFxSUSWdMXZu6VLxVv+/RigRpqapgmGVFY3UJ7RJvd8XvyourMwpgVESLd2oX3faMGIaNxUHDxRI54UXBNwoKVL+t6knOvwmgJca0VU+iYQxsvCmi6fCuP5dwic7uxMR7goksAUmC77EbfCUhJvp+KyGzki1HZyWwA032QRjEiCgFVp7OVSucVULoo2QjEwSU3OCRX2JQdMS8dXzOit2CCSn8GsvjY0zQzFprSUnjPSyqVGJ8/IatN7F/Dw5iIZ1Iw== 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=Yw9ZkQ7Xck8HEfDIVhXW7Ml25h8Yy4lGHfnF8ES+7io=; b=XP/o2bsVUABCUpI2s4WRHbvUGjUaXmspCSLfdaxjRBOgHJoqaKQDzPbP6aLqDkg0sz32RDVHR265gFqTolFFOEx1/UBetOkB/lyIC0Fih2PAOnUYjvkm8rMBvl4VqExMLmW+Du0q69x10W6BFK8RdifOJkwT013zc0/8EvdMiwFUSCI09dyLtC0qFbRdcSjW8YBsqMRjNeO45apNJVkH7AcG7rU4PyOGimgWvVkT9exXxFGRC/ttfqrjwS3Q/yFmHSecPtbVNkNh4wcWPhhufnklD9h5+vFI6gnmP7rCTGh0qgL5If3jHY51NvZxMR6gmtl5TGsJKLxJ1FYeQt5yVg== 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=Yw9ZkQ7Xck8HEfDIVhXW7Ml25h8Yy4lGHfnF8ES+7io=; b=ROnnRZIqwPKxGt7cSLftJmNoddMDBGV7FZ0J10j5ghI6mhAIh88Dz7vxsDFMiN8xIAN/PYjSt1vxnlMjDRE1qxdZ6Q7my3E6/zmeTBozQ6rSFAKO1Xb+6a+hpSnnmPPy/lNaQgBiZJHN/mYKZG1RpCxmNhRvlnGBPwdXgLjcDul+tkCLhRKxLNUwG33/gVpRR5re8gSrRY8D0X2cevc+gQawbajh5dj2XzTOFKZGsqqk6lPCP9azRv6WlOqdJcafA0R9JqCDSp0RpUGhEtJVE4b/omsrINIdYDVBqpmrCnxpHnERn1PF9rS6QCwc90+c5f59akYzQGLUX1FCCMNUxw== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:14:34 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:14:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 02/20] mptcp: drop mptcp_pm_get_* helpers Date: Tue, 7 Nov 2023 16:14:08 +0800 Message-Id: <39ec6f7e8576eabf633b871e860bc61b344fe9bb.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0017.apcprd06.prod.outlook.com (2603:1096:4:186::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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: e62a86b4-8643-469d-c25e-08dbdf699387 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AaciCoi8ytCHapL2iWI6gEqoRsvMaAKuvDoB0kBToEg7FtxBni00q0PZ5pw6Yjd1dB6jC/oY/sdxgX7LtT17tUwMbAikNT8DGQgwGf14qRPyPmmQJIXb2o3YKc6LxbtYf9lhvT0fBSift7DCIKQxAvEp1XZbCR1p9UpXUHvDpNRnjNAr16Auu8Oi/6KK+6P+Un7KnjYDlw9SeAnso40ECK1C+d5y3Msr+YDuoMAUKegCjOzeAFHL7/1QKk4Qh1gDdfTUlQoq/6ulCMK373o5n4JjY/3TBHt9p9m6kyOcztTUgEpHo9x0GQfbS0lMYM7Dv64gNTiaHipvnRcBbYMJ/W/arMLoFd96kiDhSQ7mjZlV/betzuV915ErEDVgMT5HcHvyRjSCxyW4K0qeGpqN7TR3zTKVppbJjsmHyYINyy4qyCfENScp49bEkfmUNsaa++Q3izifBtfc0Dgffh2eRuYN6Fmham1rTCqH2naEsPRHaW7Yn29o+LVk49AUKveEUJm6u0M38f3z3hDdjwzCImXKF1uqRroZBPNaSZw5SHPUP6WRzALBja2J/KjFcMMW8efeUOc2UlC7cMe2VmiwiFAr10c4lNm6e/chaEGqOBdSUWUyMNa79j1Opc59JT7A 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003)(309714004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kmWOK9PjAdxmd9Ol4hVMijB67TBaGTMGbUQf3e0z/+5ehMw1UUmZbay7Xfbw?= =?us-ascii?Q?X77kI7L2CY3cpAzhhBXBXVJ67ZidUbfGmuUPs29jWkXvj3FAgRwEiX2XnHuq?= =?us-ascii?Q?EMeT3y9Ri4+IsBUBowqW6/VJeYjVc3FCFPckbNA9DMn4FEqw9wnmmRBnjVAc?= =?us-ascii?Q?Zu7UNdrgI29ZvU2N3ZFYdSfbSjG09lgK9vrIKB8wNQn1luTsh8OshWeqdiWg?= =?us-ascii?Q?VEK6kLnknFANLoIolgq06D1CaIYhcsDR2uxQrdlvwSr4+XdPlmsF9Os3cxYV?= =?us-ascii?Q?kqEeTqGx7z1MLKcPEojuou/zRlUdFWBXjyZ3UoJFt9xL9GXybiF24QkfwFow?= =?us-ascii?Q?6o0RQwGUYlpespGIY6FRWFSZrd9YuASyZe5waHaLZwNnW1dwCsMdpyi8JiTj?= =?us-ascii?Q?br7c+OXX4vnqh/jKyWnbUzZpNoC59+rrcbaETarWMV26K5eZ0lQTc/gauU3f?= =?us-ascii?Q?ebVqofd42Px3rnUag2T/w2YRXpBQ1n/mj1++cdIYzF6jY30jiTI534Ch7JMP?= =?us-ascii?Q?Y/depw/oCpUp63PpJxTI2NWh7ubo0KqlE8ccrnzsPpRvsl9BIr0C3PFSK0Gp?= =?us-ascii?Q?s09jo3QQtqmbHCoAtJGzMdRoFUl4Zts0s2ZZUa6cryTg+oF3utLYa9pEikX2?= =?us-ascii?Q?ycwNBfgAsGZRhL/DDNywALnLK/otMRPfkGtbbjteztjwCXHCHOMKIeWGzfdw?= =?us-ascii?Q?VfGQgRwVOdLQmo5NNCvAnK+rfqTok2ca0t+gZWfDAqZEQ/M/IEAU2zXLK4na?= =?us-ascii?Q?6SQa09da70KTQ5eVTA1e2AonRBhXdhS5PHQ3kQQCq1/myM4Slyh7GF1mkT5u?= =?us-ascii?Q?7bUx8MyVWpl/3J2lgoJlMsUOOn4OJLFCjrvkj40o1Of0CLGsj6A+XbPU69Dq?= =?us-ascii?Q?EEVrbNE045Nx5h0zMl4Vi/Pas3eV8g4626yokq6mXjD68tOAOelvc/ltPyPG?= =?us-ascii?Q?VncsuMSmrrK8DRpiRpOxWlKkoDMGex8U6aCiZQFZDtexQWI69rtsxsB/mko/?= =?us-ascii?Q?mNMyyQTxG7feaJY7gmpjvTEBVK5z9uYoTd1HPJUjKzeYJMjoQvOiS9jpMOis?= =?us-ascii?Q?sJDh3dv8s4ax2e1EPnzDmelTNOfch9iGlr8PLBntL21QMtNhErxAG24prakJ?= =?us-ascii?Q?OD/oBpPIi7boyj5JMPXO5aJz+lVkvVJenJCQcxPeLOlonwaQpnyO5t2xKgkc?= =?us-ascii?Q?ECjkKg0DvDONeyg3y54SMGz6XuBc0QIRFy8i+dhWF+Vakf6fIf5D24xr7zdM?= =?us-ascii?Q?xBSKUkxzSbj+iVhbo81+wTG5YNyg0WGx4Zh0GW1yJICbL+fuV1+RMTLA2vb+?= =?us-ascii?Q?ClaWKVR5FLQlyJ0kYXoUCxBz98zpaElU9cWH+IGx3wStvRO4SFvhQuVZ+vAe?= =?us-ascii?Q?d++yn0Vp2eqfhlz1Y0zOUetyosnyi2WFqj1qDdNhcYfot3FRLrdYT+YxeYrM?= =?us-ascii?Q?rYVGrN/tery1vWyt0eA+AkOgJ7gnX3E1bCusXkh/p7tDpXukg57f4SJ9Wz7X?= =?us-ascii?Q?44axNnjmGgh3wKX+hrSv54mH9qQgo+9p9yMQ2eS6tfPciOeU3QaA3L3ivry8?= =?us-ascii?Q?pNODXeSu6YhNB02JcyuLdrOn+OiSf/JKU+oJ/JKl?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e62a86b4-8643-469d-c25e-08dbdf699387 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:14:34.5814 (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: ZWyyenqUS35GitCrSo/ep4qx7zN9s/361hwMHHLIWeAP3BG7ow0go0rFDj6BWlEZGW6HLcX6oI3fT+B4xIGT3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" Drop four mptcp_pm_get_* helpers: mptcp_pm_get_add_addr_signal_max(); mptcp_pm_get_add_addr_accept_max(); mptcp_pm_get_subflows_max(); mptcp_pm_get_local_addr_max(); The helper pm_nl_get_pernet_from_msk() now can be used to replace each of them. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 12 +++++----- net/mptcp/pm_netlink.c | 50 +++++++++--------------------------------- net/mptcp/protocol.h | 8 +++---- net/mptcp/sockopt.c | 9 ++++---- 4 files changed, 25 insertions(+), 54 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 4ae19113b8eb..48ff7ce20890 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -85,6 +85,7 @@ void mptcp_pm_new_connection(struct mptcp_sock *msk, cons= t struct sock *ssk, int =20 bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk) { + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); struct mptcp_pm_data *pm =3D &msk->pm; unsigned int subflows_max; int ret =3D 0; @@ -99,7 +100,7 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk) return false; } =20 - subflows_max =3D mptcp_pm_get_subflows_max(msk); + subflows_max =3D READ_ONCE(pernet->subflows_max); =20 pr_debug("msk=3D%p subflows=3D%d max=3D%d allow=3D%d", msk, pm->subflows, subflows_max, READ_ONCE(pm->accept_subflow)); @@ -496,6 +497,7 @@ bool mptcp_pm_addr_families_match(const struct sock *sk, =20 void mptcp_pm_data_reset(struct mptcp_sock *msk) { + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); u8 pm_type =3D mptcp_get_pm_type(sock_net((struct sock *)msk)); struct mptcp_pm_data *pm =3D &msk->pm; =20 @@ -508,17 +510,17 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk) WRITE_ONCE(pm->pm_type, pm_type); =20 if (pm_type =3D=3D MPTCP_PM_TYPE_KERNEL) { - bool subflows_allowed =3D !!mptcp_pm_get_subflows_max(msk); + bool subflows_allowed =3D !!READ_ONCE(pernet->subflows_max); =20 /* pm->work_pending must be only be set to 'true' when * pm->pm_type is set to MPTCP_PM_TYPE_KERNEL */ WRITE_ONCE(pm->work_pending, - (!!mptcp_pm_get_local_addr_max(msk) && + (!!READ_ONCE(pernet->local_addr_max) && subflows_allowed) || - !!mptcp_pm_get_add_addr_signal_max(msk)); + !!READ_ONCE(pernet->add_addr_signal_max)); WRITE_ONCE(pm->accept_addr, - !!mptcp_pm_get_add_addr_accept_max(msk) && + !!READ_ONCE(pernet->add_addr_accept_max) && subflows_allowed); WRITE_ONCE(pm->accept_subflow, subflows_allowed); } else { diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 1dcf104d7a01..dbf040e39af4 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -183,43 +183,11 @@ select_signal_address(struct pm_nl_pernet *pernet, co= nst struct mptcp_sock *msk) return ret; } =20 -unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk) -{ - const struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); - - return READ_ONCE(pernet->add_addr_signal_max); -} -EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_signal_max); - -unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk) -{ - struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); - - return READ_ONCE(pernet->add_addr_accept_max); -} -EXPORT_SYMBOL_GPL(mptcp_pm_get_add_addr_accept_max); - -unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk) -{ - struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); - - return READ_ONCE(pernet->subflows_max); -} -EXPORT_SYMBOL_GPL(mptcp_pm_get_subflows_max); - -unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk) -{ - struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); - - return READ_ONCE(pernet->local_addr_max); -} -EXPORT_SYMBOL_GPL(mptcp_pm_get_local_addr_max); - bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk) { struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); =20 - if (msk->pm.subflows =3D=3D mptcp_pm_get_subflows_max(msk) || + if (msk->pm.subflows =3D=3D READ_ONCE(pernet->subflows_max) || (find_next_and_bit(pernet->id_bitmap, msk->pm.id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1, 0) =3D=3D MPTCP_PM_MAX_ADDR_ID + 1)) { WRITE_ONCE(msk->pm.work_pending, false); @@ -404,6 +372,7 @@ static unsigned int fill_remote_addresses_vec(struct mp= tcp_sock *msk, bool fullmesh, struct mptcp_addr_info *addrs) { + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); bool deny_id0 =3D READ_ONCE(msk->pm.remote_deny_join_id0); struct sock *sk =3D (struct sock *)msk, *ssk; struct mptcp_subflow_context *subflow; @@ -411,7 +380,7 @@ static unsigned int fill_remote_addresses_vec(struct mp= tcp_sock *msk, unsigned int subflows_max; int i =3D 0; =20 - subflows_max =3D mptcp_pm_get_subflows_max(msk); + subflows_max =3D READ_ONCE(pernet->subflows_max); remote_address((struct sock_common *)sk, &remote); =20 /* Non-fullmesh endpoint, fill in the single entry @@ -514,9 +483,9 @@ static void mptcp_pm_create_subflow_or_signal_addr(stru= ct mptcp_sock *msk) =20 pernet =3D pm_nl_get_pernet(sock_net(sk)); =20 - add_addr_signal_max =3D mptcp_pm_get_add_addr_signal_max(msk); - local_addr_max =3D mptcp_pm_get_local_addr_max(msk); - subflows_max =3D mptcp_pm_get_subflows_max(msk); + add_addr_signal_max =3D READ_ONCE(pernet->add_addr_signal_max); + local_addr_max =3D READ_ONCE(pernet->local_addr_max); + subflows_max =3D READ_ONCE(pernet->subflows_max); =20 /* do lazy endpoint usage accounting for the MPC subflows */ if (unlikely(!(msk->pm.status & BIT(MPTCP_PM_MPC_ENDPOINT_ACCOUNTED))) &&= msk->first) { @@ -621,7 +590,7 @@ static unsigned int fill_local_addresses_vec(struct mpt= cp_sock *msk, int i =3D 0; =20 pernet =3D pm_nl_get_pernet_from_msk(msk); - subflows_max =3D mptcp_pm_get_subflows_max(msk); + subflows_max =3D READ_ONCE(pernet->subflows_max); =20 rcu_read_lock(); list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) { @@ -664,6 +633,7 @@ static unsigned int fill_local_addresses_vec(struct mpt= cp_sock *msk, =20 static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) { + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); struct mptcp_addr_info addrs[MPTCP_PM_ADDR_MAX]; struct sock *sk =3D (struct sock *)msk; unsigned int add_addr_accept_max; @@ -671,8 +641,8 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_= sock *msk) unsigned int subflows_max; int i, nr; =20 - add_addr_accept_max =3D mptcp_pm_get_add_addr_accept_max(msk); - subflows_max =3D mptcp_pm_get_subflows_max(msk); + add_addr_accept_max =3D READ_ONCE(pernet->add_addr_accept_max); + subflows_max =3D READ_ONCE(pernet->subflows_max); =20 pr_debug("accepted %d:%d remote family %d", msk->pm.add_addr_accepted, add_addr_accept_max, diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c38a2126071b..88f5b422f941 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1043,15 +1043,13 @@ struct pm_nl_pernet { =20 struct pm_nl_pernet * pm_nl_get_pernet_from_msk(const struct mptcp_sock *msk); -unsigned int mptcp_pm_get_add_addr_signal_max(const struct mptcp_sock *msk= ); -unsigned int mptcp_pm_get_add_addr_accept_max(const struct mptcp_sock *msk= ); -unsigned int mptcp_pm_get_subflows_max(const struct mptcp_sock *msk); -unsigned int mptcp_pm_get_local_addr_max(const struct mptcp_sock *msk); =20 /* called under PM lock */ static inline void __mptcp_pm_close_subflow(struct mptcp_sock *msk) { - if (--msk->pm.subflows < mptcp_pm_get_subflows_max(msk)) + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); + + if (--msk->pm.subflows < READ_ONCE(pernet->subflows_max)) WRITE_ONCE(msk->pm.accept_subflow, true); } =20 diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 8d485c40585a..98f39c2a377a 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -890,6 +890,7 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_= sock *msk, int level, int =20 void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) { + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); struct sock *sk =3D (struct sock *)msk; u32 flags =3D 0; bool slow; @@ -907,13 +908,13 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, str= uct mptcp_info *info) /* The following limits only make sense for the in-kernel PM */ if (mptcp_pm_is_kernel(msk)) { info->mptcpi_subflows_max =3D - mptcp_pm_get_subflows_max(msk); + READ_ONCE(pernet->subflows_max); info->mptcpi_add_addr_signal_max =3D - mptcp_pm_get_add_addr_signal_max(msk); + READ_ONCE(pernet->add_addr_signal_max); info->mptcpi_add_addr_accepted_max =3D - mptcp_pm_get_add_addr_accept_max(msk); + READ_ONCE(pernet->add_addr_accept_max); info->mptcpi_local_addr_max =3D - mptcp_pm_get_local_addr_max(msk); + READ_ONCE(pernet->local_addr_max); } =20 if (__mptcp_check_fallback(msk)) --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2070.outbound.protection.outlook.com [40.107.20.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 2E557DDAB for ; Tue, 7 Nov 2023 08:14:44 +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="Wm7JyDNM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BH0O7uDsCykeVSmgFWEIohvWfmY50yJgyg9BFdmOkJWNbJPN/Z7wHirS54rPpgi2K42aC77bglH3/BA2l81CSoBqC1+dVnBoQmORgXSgjYGVhOc9Sd3Tzdbx/ETCcaIJY1o6vPT1UMrLvHtPltA9ygyS9z1H3thJLdKoD7ud9rf2fgBx7OsMC6hc/Ri/n15uFFrG2pS+AsxtPs4gA2ONQfcKQMhCOzm5V+8lfjg26pBcTakf9MQUcfHnhzcBH3LFMcBFEF9Rrg/QJ+YurUeRnlwpGpPZ39pLc6yxfX1dL0nYlTI67IO65lldcvcE4sB4AGUpUcFyv3XYmIQo1/+VbQ== 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=DIHyqT6HE6SN+ei496ifxFyH6B28w5/Nfb2pvs1TXCU=; b=mQIA9KROA6P23Y80DaPowN/7DnUvMiBpbY9F1dTo6yzZVIj6TWgLOSg3PugrwA647aoR2VXap/Tf5x914ptUh1l31/BxC8Y930MgAB5u/2JFRmcg2iVQSFgr8XcqaNHXgGyUhadBDRiqCFLOoxROvKyoznLkTLgF/TZ3fvSmpSJnhGFMQ35hsSYmd9fKzxIle1B4GXXj+l9j3QkNXCbtHBCl8xy7dCGI8CjkAGTn7/SILGm0PMUkWaWJE/GjHHBkNzJ1wd/410ZYF2mZFXsEgtpJ7RU6ftcp+GkvOaJTh6ZQFWXN3jdKxyz8wklkES5yuYxXzjTJ6jVbMCT7NppkjA== 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=DIHyqT6HE6SN+ei496ifxFyH6B28w5/Nfb2pvs1TXCU=; b=Wm7JyDNMmByjuZrO1PC7JQN89qnjC7U3jU73ETedvnuFfYrYkfZhIePXTd2id++9fEEL92vfKd723DkL2QAROJhxcMFTp8eP1gEcjFUKJwDCyi2WvmO4hxCIqmA7uvdxqkgSJhnOh+XT18Q5X51u3Tn7ag0H0yCUgVfd2byFJsxOulqiqYh43vd+CAG7oKlWZ/p3z+oeX1lfCcMf8ucl2w+7WGkv7wd/PsyrUOm1JmgbCnnduAD2GB0uZQPKce7EaIav+4nivIC+PDm5XXgwKXSZtW3kaOa/wnQ7TSF2b3H1o0578sRLbylcMeZLXhM+b2PX4upISVMeOnzRs96L7w== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:14:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:14:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 03/20] mptcp: use pernet id_bitmap in userspace pm Date: Tue, 7 Nov 2023 16:14:09 +0800 Message-Id: <9a08b0b80acd9e3340df4ce56e949f8d307dbec3.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0223.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::11) 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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 386e9616-0c4e-4557-8a24-08dbdf699802 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gnTLKQbjihbAz2bfGkECIpXnXGijybKR1+LGO+wZZYldK00FvcQUbKhrhnurjWlIo5gdZr+joBPvJBOo6nj0/wDTW+4Al6/FnVYQFxMeBW7aAeZgffIyrrEF0Jy6Q3Xf2QU/DPG+dl2KhClRpVq/oimE5+SpcPP94TEUHEkWJLF7Ncw0a+NpSbrGkmgFfb6WWgha3c3yyG34ZGQkrSCH83Wl/fHLpLrJY0XBbQJz6U50tK68PUUB82MyO1gaNKyuVScdR5SGpoEbkUacb0eI1Oy+PqIi+zTwLIuOlIePKeIYxZzcpbhFSaJME5mA0FWdIDbhKizkf+TR/WkQVvegGmTyww9syZBPsEr05RdiYSCIxy5H3XhBDoNbMzTYQoLQt91DQY87mh+Xj/oE2/8TDeCnL3eXeizOe9fGrniunU3ER4K88XeIf3JQNCYZEfHLkWfbhf0XzOSAZnloyXwVgxXFPjE3GXTE6tR/9buMQNKE0TPf40i1EZDabbDFnqI7nxPdg1RHZTjsAzOVzqFTPZYoXlVIucqMP/LS03awpd8lWy7tUG2+NKVusszNGzwl 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vh4T+4yAEyLWJp4ECuYDQY0w7dR6hnV14E9AcSloDRCkzOIKgYzYbABxMHdU?= =?us-ascii?Q?Iuo12eH5BxJE1r5v9DiDPFP5DUmEivPxBezrE510UZk3liR07wwClY7dGNLw?= =?us-ascii?Q?QmIHDN7rASJ7oTEYMgdkb78iGpjvk8XkXp9IYNXp52MWXU+2EZhEHBrRli7O?= =?us-ascii?Q?Wu/ex1OmdHzzBk9knS+V1lrx/vK6TwulBPvHgCSOeVsn8ax6WO5Jfao1BC5J?= =?us-ascii?Q?Q2QSCLQI/MtIT6gmooGUj5oqE+ms3blSD65elHOVuQBQNzxDIgkAdUhp4BdM?= =?us-ascii?Q?CXLwlBP5sI/KD6atu3tc01cSGeNBSzp1wppkdn9P1Igu7uGJ4CbRlA3DlBco?= =?us-ascii?Q?s8LEm0wOB7ZasIKiMoHJZd1THmiyGukdeE2UBa03r3uTTUPxl1KR3pfdR5wA?= =?us-ascii?Q?C0gI56s8U1RG18TzssbaNzE08ess7XqV9nZfcpBqL2uwUVBj9Z0R8tS8NC7E?= =?us-ascii?Q?VZpHdIH4CWOsw1qKl+XrCrHabv2CSr0PborMDIf9D43xFRGXzKtuJ1Xjse8G?= =?us-ascii?Q?6r0y1HQjrnQdFYIzVQECue9hYoN/PlgIAchl2qwGiEI4xQdqsKrufT0RiuSI?= =?us-ascii?Q?pKCr/BYK3G4rO8xWA3UgxdNkGttb/tmrVGAbV3Y4GA8SrXYZqIKnrk2Evr0Y?= =?us-ascii?Q?ZxlGIeSvcJj/n3YAZ5UhQcBehL2nARGE+MxoYul1h4eCp/SEcp/ywbze4eHe?= =?us-ascii?Q?te3p7WJzi7QEIerRte5Zp0z+XrY34PtDioHwmC+kKy11++El7JiAOqFg4hyH?= =?us-ascii?Q?mfVRxxcUH4UF6vtqzZj2iajShx7PLWJF2WK+psFsk5RYr08i8/BHelKjjxrS?= =?us-ascii?Q?o58n0hFfff+42Y+0fLgEgsF/Q6zPqZ/NyZ9R0LmSPuyTS0p0/HcXSWxswpak?= =?us-ascii?Q?YKDuH+Qjgyh24uX5nFYGy76Cqh1hhpykfcPH8Kkq9VoSHN9Ztew0MhZoc9fc?= =?us-ascii?Q?xcvNYwgd3gsbVieUG29rNxOwox3yMOmWkeoedJ9ZFLP2kTkPt8RwZ9FJLHO7?= =?us-ascii?Q?LVIkFUjP7VD2oerARSc0EehsoWvOrtWcLG2ONAQOFEujyIikbX5DxeQuUen6?= =?us-ascii?Q?Vh9pXvSrG1MEjgz/sbB6MdrOPGquMK1YuU+x4RQ0kzBDmcMYRqdJW0/3VXqh?= =?us-ascii?Q?rIfVJ16ULTnPsBqr0j35/6ZSs0Jn0DV0WDYxCArQ4sbJYhh4nL73RW7D/mRu?= =?us-ascii?Q?Gu2EPHqQ/Z1pamio6iLJMs6jZHOEa2vqmtbFduD0ZCPrBz8aL5Ygaoj0mjoC?= =?us-ascii?Q?y1urY3cS2KMNbO5kAYgpQ5JKo94qKySTVPXCPiooNnze0rMf6Vjh9YxuqnyI?= =?us-ascii?Q?HTYUUA0N7JObMbr9OB15D9KuiwknLsEM/1+HMfY0w/KHPgYHE38pk+AVANpQ?= =?us-ascii?Q?EYtLpEM0TKrQLR36n2UDGvfYU39bKMfshIdIlUm22whqNu0cu1I6m4DSR6qe?= =?us-ascii?Q?xV5Ppma9AXMSBvWU4zJzgBlq7HSgEZV5biOushMwOnXqHtEdlN9j96gi6BZY?= =?us-ascii?Q?BJqKN/m3hR5vh3iXxYyFTihI5WhrHoXCBTWzGVYoNX/Exkh4LW/cEEu8irFx?= =?us-ascii?Q?eyxh45Lsvm6h8wNgfv+QHtRy5AdnzCIG+rk3VCG+?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 386e9616-0c4e-4557-8a24-08dbdf699802 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:14:41.9101 (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: W9AMwdw+1AgHgRdL/ek9sC4GvUk/8T8mdU6oVfd54R3hajEGCvc0Ldzkv/SWKzkSlfy3n6ZNLxRWZp5Gae2x6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" This patch uses pm_nl_get_pernet_from_msk() to get the pernet id_bitmap instead of using a local bitmap when appending a new local address into the userspace PM local address list. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index efecbe3cf415..b3a606a5e182 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -28,7 +28,7 @@ void mptcp_free_local_addr_list(struct mptcp_sock *msk) static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, struct mptcp_pm_addr_entry *entry) { - DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); struct mptcp_pm_addr_entry *match =3D NULL; struct sock *sk =3D (struct sock *)msk; struct mptcp_pm_addr_entry *e; @@ -36,8 +36,6 @@ static int mptcp_userspace_pm_append_new_local_addr(struc= t mptcp_sock *msk, bool id_match =3D false; int ret =3D -EINVAL; =20 - bitmap_zero(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); - spin_lock_bh(&msk->pm.lock); list_for_each_entry(e, &msk->pm.userspace_pm_local_addr_list, list) { addr_match =3D mptcp_addresses_equal(&e->addr, &entry->addr, true); @@ -50,7 +48,6 @@ static int mptcp_userspace_pm_append_new_local_addr(struc= t mptcp_sock *msk, } else if (addr_match || id_match) { break; } - __set_bit(e->addr.id, id_bitmap); } =20 if (!match && !addr_match && !id_match) { @@ -65,9 +62,10 @@ static int mptcp_userspace_pm_append_new_local_addr(stru= ct mptcp_sock *msk, =20 *e =3D *entry; if (!e->addr.id) - e->addr.id =3D find_next_zero_bit(id_bitmap, + e->addr.id =3D find_next_zero_bit(pernet->id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1, 1); + __set_bit(e->addr.id, pernet->id_bitmap); list_add_tail_rcu(&e->list, &msk->pm.userspace_pm_local_addr_list); msk->pm.local_addr_used++; ret =3D e->addr.id; --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2043.outbound.protection.outlook.com [40.107.20.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 41048DDC4 for ; Tue, 7 Nov 2023 08:14:51 +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="3r27gDgb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MkAUbYoYxnVEN6BAyQTgfrFo4/tMshPc72dzxcl7xVjUS5AfWNmE4I0EJOSD9q/dV24p7GGbAbEjWdGhW3dyDcr4gLjYR/H80rjnPhjtOgyJO0PhjvJ20jn6UM5AkUE4xfusdLeL3pQ8SvR65fFaTXF+i3qb9cFJV401+F/z+GEDYRWf29OTSlYi7AitNEXRIhVW2tlrxrUrU5TOQGE6tIRYAsXG210BzrOfMSJ+ZJCVcrPPNg2iXetyOBetgWyDR69tDT0fr/G90ZBopE6ETGdY7jG3WE7M3dsgIrWmYNnSsRSHjrvsnjkoS6cBGe5Ub/y5aFOcKLgJepAPHrYrgA== 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=8ASbCxDxa4b0kAoZ+l61pmaA2JVoEpPyDyXXLuM+ktE=; b=gVvkOm2zEFQrJqAyjlFQiiR3o/84+S69jAbdZIgg2N2zE4p92fU7HZvkVN6LIhuiydCzr7GxDb2BjVAgnB8ep9BFrUNDyQgcWauG7rolnpJYo0Xt5LrVJvOzn0Wu9yvkwoRGHMGesHxmUODLPJCVVHmZz7G+Lj1JckDh/i+bVTPcZQvC7L/CT1tXhU1/12gMx0hx0E43kYASxIv4jBuX/X0QLq9PCg45BUHipl6hgtutJpXegu/0QA3JmWfw7ZmkkaU6/rU3rQZCLYHVLq+WZkb34InfHjIPhKxAAGCFulTgvuCRzPjEyooTwSYs1DO8jzWFgoEw6MmmR7V437MSfw== 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=8ASbCxDxa4b0kAoZ+l61pmaA2JVoEpPyDyXXLuM+ktE=; b=3r27gDgbzOne6Aa6EugKH34eH0jGdiz7IGWC40FgdPPfNT99yH3s45BPx+CPF2bytTEic6Y+jESGpAeUvJXYugf1hXp8GRro4qmIAsuDZjFK76dgXbv8Fh9crOUrZQXw4WXqYqKguuWM44G93CAfDQbOpjxd1Ql8G4HVBSutPiqAnFAqy7yWE+dG7o5Q7KDxgBzf1gWObfIeHARSktJRm4GhGZdeXarUiXGLLtJGMz9kN2J+GkG2+BEoaojCtvNWqDZPK5CaQ4I8cjpBJ743IMz1HxW9qLkaZg5mVMqvQ4uUHeJKDuACCx/sCzSxYGcgqo6IerN3YvXtWHTZ8h/Djg== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:14:49 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:14:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 04/20] mptcp: add a prefix for free_local_addr_list Date: Tue, 7 Nov 2023 16:14:10 +0800 Message-Id: <522dd7f4d906d8ff65f78084f2029376aa3d9593.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0219.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 2cbc96f4-4753-432a-8d78-08dbdf699c78 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nwbNPt4MbQE3HZ4uznnjAI+GQth0z8A3HDjGx4a9abFKyLmbOGOmSJg/CipjNhZwy2H7M2lJBTHVhTONy/PwdYz/DF+dMqtFtZtRgfTN/tw2ps/5wv4s2P4qLNpJaWtJP66bozSJuvaCO3H08tE2H8uwv/yRHJ/HQP9vzH79PYut0FykPQD4eLxqKsxEJ8nhoSez3dhK2DOn3wNZXzrxMKMyENiaw2wnDyWyVC+zI80ZUQyr4oeikjF0Xo+G8qJZbM+6yPLwYR2OiK/iItSYeH9vas4ptBM00zd8APngBEI6Rrbg2efBgdDJgffFeFPPE+L6bO44IFS5oAm/CqdiopDUSXOqOlbSCzd4fjY/ge4bNSDNHlt0hBPdS1vHIIGyGqDfWyh5DomzACExtsyFFjk6qse1glxeEePs4Q7nyfKXQWjV+DI5btiAUTLxuDOqKjZbYuZ/w6q0DZb1U7ClMs7C1Aw+rD7luZH+zihRL0ypeFTezHCd/C2Gn4XplULgF4MLm+bWfSa74N3I8mdIxgKVDHWOEYIeIJq9lHWSGHbRGQ3/+VmL4813i9b1vVum 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YljAEhKn4LEEp7U7+15cDdRyl+fgvHvv5pGngNAU161MGdNcGFuZ8fMWRFrP?= =?us-ascii?Q?WO++7ouujjvgxYYBK7E1rWFjPDcHNGCDNzsKJgzvbZPIsNBlQBkYrYDVb2j2?= =?us-ascii?Q?YBRWIOwM2wuUS0O9RXEiTyltko65ZuqsgwiBx6XAicgu6M2xgFLwYtCvBctZ?= =?us-ascii?Q?cB5oQWN+Yqa1SBD762lkSkPkOxIddLhrSnIqQg53RlRjDbtTNfaDilO/g82q?= =?us-ascii?Q?QEfvWjD1nN7vLirjNJ0q1YIU8GIjp4lDE/8iarxuhCjm9Fgj7AFY38TdoR1e?= =?us-ascii?Q?AB9VDpde7yhIfmYC0uJYHwmBuptAPeFYPQ6ozHezq2EkfmS1YJZRrIN91sUM?= =?us-ascii?Q?nC3FSiQIEGfouLx6RAJyNaEhZf7XuRuYzMMorhtPhq5OJOAZR/5lqrSKMDvn?= =?us-ascii?Q?pZ0ib0RfcqNIVHOHsc/iFD6b6IWPHzgmVtccPwNowye2kJywJDu3YSbr3JmV?= =?us-ascii?Q?AZoGKUSHvzy7zUeE/doNXIIVt0LI9M3x0xhB1/Ob1AOhJBQzkUJSJXdnm1w0?= =?us-ascii?Q?7fcM9FCV2vrMLyaOEHT+UpBXvEX7nWK+X+XzxV4+KTk7VGGtLyTnVr/nL/Z4?= =?us-ascii?Q?/8K874jObQPO+NFQAi9yEMlElOkyUOTbU3OpvpEedt6aISd6++SiCFt4j5KV?= =?us-ascii?Q?yT1VsKslpTQfY/HyynHD4DOitf+gI7anXm7nnB/lqxj9om+7q6nEr5a3bLMv?= =?us-ascii?Q?ASIq87NH8LFMaZc4Fh871KfLKLnDPokWsdkckyNnanW7jO9Vie6yscpm67CU?= =?us-ascii?Q?7Jy8z9oJ/PJh26XI1ryE2edHMlGl48VOH2VJBKzbvkezaTGvcReJUlJz+LLB?= =?us-ascii?Q?SJp3mYJm2ghhOU9c38Ng/HfYa2QJeS/nO8GCY4+xK6w9qSoezED3rLTbwoyZ?= =?us-ascii?Q?BuFF+4XQw2Tw8DbJzlYRuKsrsoGyYO5XAffsNmQ2OI1T/c/PC0UD5ONhcrqi?= =?us-ascii?Q?Leb0ksz6BUAnMO3J9TkZ7W1+j2gY3oqqZnc4BW9wmkntg/lge4x7dysQpphY?= =?us-ascii?Q?64T5rAxu1v23Fe04viRWT6RvUxLJAcBaytyLqeTxNg1JC9kP90tRfZo34ocj?= =?us-ascii?Q?XDrdaC0PJPgiseYlbtXIjgbYGdHnN2+497fIGx2auXgqupDIV3MHYwLC3uC9?= =?us-ascii?Q?PLfpo0nggrmQhHf9meFaqRux4Q6JnunEXfapo+FmC9l9dxmZhLWKp7tO5wPU?= =?us-ascii?Q?UisJWfn7w+M30bpnzU+P2cKOGZ7eML0rFZvv5R/HXgUtdFI5jmbr5c9sRkeu?= =?us-ascii?Q?P1HyVwRA3Vx7HzKH/Y+VCLKo4OQlLP+Eqog2V07A+/pI+NZr+9SwlRKNhk3D?= =?us-ascii?Q?ltpdexlulAByjS3H2/XJeRvdfHWBjbdqqWh0b0FbSc4UbwxWc4DOBYrZqotn?= =?us-ascii?Q?xj6Y2Eo9w+c8ig6idzgEHgM4tO8gc84TgK6j8XTyf3QXoTYuXSK+b+uLrdOV?= =?us-ascii?Q?Ds+3+CV9pJnyAmhHfedASlj8TLQ0XimLZq6sL4CrMVVswGCtEvB3EyWdX/2k?= =?us-ascii?Q?5qofIcEtqEFPen6YA7Rv/CZkazOJgzi5P87iL9mxsXITc8OIzIGNCYUBPZsm?= =?us-ascii?Q?LHeEg7D1JpQw7uUzKCp+eIzITVSPmb6gDQ8ZPrWR?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cbc96f4-4753-432a-8d78-08dbdf699c78 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:14:49.5651 (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: i1yRldLelkXme4RRXlxOQIwxiw65hTsFP78wT5s6r0xjX/8KIfD6quMG+Gn4RfgWDE8uGC6h/rXEEOISK6nurQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" Same as other functions in pm_userspace.c, this patch renames mptcp_free_local_addr_list() with the userspace pm prefix as mptcp_userspace_pm_free_local_addr_list(). Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 2 +- net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index b3a606a5e182..321224e09d40 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -7,7 +7,7 @@ #include "protocol.h" #include "mib.h" =20 -void mptcp_free_local_addr_list(struct mptcp_sock *msk) +void mptcp_userspace_pm_free_local_addr_list(struct mptcp_sock *msk) { struct mptcp_pm_addr_entry *entry, *tmp; struct sock *sk =3D (struct sock *)msk; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0ad507ac6bc7..3bbccb53eb29 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3317,7 +3317,7 @@ void mptcp_destroy_common(struct mptcp_sock *msk, uns= igned int flags) WRITE_ONCE(msk->rmem_fwd_alloc, 0); mptcp_token_destroy(msk); mptcp_pm_free_anno_list(msk); - mptcp_free_local_addr_list(msk); + mptcp_userspace_pm_free_local_addr_list(msk); } =20 static void mptcp_destroy(struct sock *sk) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 88f5b422f941..c38350abac1d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -943,7 +943,7 @@ void mptcp_pm_remove_addrs(struct mptcp_sock *msk, stru= ct list_head *rm_list); void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list); =20 -void mptcp_free_local_addr_list(struct mptcp_sock *msk); +void mptcp_userspace_pm_free_local_addr_list(struct mptcp_sock *msk); =20 void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp); --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2063.outbound.protection.outlook.com [40.107.20.63]) (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 09EEADF44 for ; Tue, 7 Nov 2023 08:14:59 +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="zG6/BWgo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BWk/njz3TvBHommQQWNJ1UiuCaJKaA1POwOKhpK7GAVpkY+Dno7fivg4NZmjfMwWBbhcIqDkH9+BPADnQ4aMj0eDIGj+rXN2A64e7jPjbQHpYKa5qsDjJP2I3bifLBnt89VHGl6GSxYGMupiciU9kPbpPkMb3gHoMtjmsnp3VjKgcHgcJintC5wU0sKS5LK3w1tvkk+/lPF0FP03EKACxYfDwFpxER8noSE2aookXprDIYNaY/TjGlCrIKak/g7uXXGAoxvuXguxJlt3/TMr/sVI6EDALNhfGqZd3KChMnMsEEtwV2dxELkRezkw+LqAw8xJvDPYNsIEr4FBWecl1g== 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=JUQd40HfRyC71IKotVEM+O/UYcQI2s9kFoLyew8RFq0=; b=A86tu698JRUbCIimYA2dJp5tzh/L8yGaKii54DuLjvHllzcltDx4b+hoFqqg8oqaYwDeJRQZGf7B5a8TuqZMBkBsJtyODAG1h3ujmcAhgoT0YcVnY+gf/RH2ZDnzbXVTZdIN1WtxYNbMosKqR5AZujki+bfRrp1fv8cVXxcbiTCdruO00RuyWvjl3V2EEWG6cWmxsMRxtHIWUIyLIRc4gYJiWrsUqId/bMJpZ6Mq+zmULMnMQlc8uxfKVi33T++k0LwiueLMMqIvOUlnN8g8657fzFfAHe95lb06vzDQPoT36pnhBZieoppNYi6iUnLn/Dc89CX4Sr3bM0+fEp5mhw== 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=JUQd40HfRyC71IKotVEM+O/UYcQI2s9kFoLyew8RFq0=; b=zG6/BWgor7eC7cbjGsOz4rKfu6PbyylCYxZyiqP99faxuc6J08ADQ1Kxa80vg6NO55g2/d13YjyDeA/8+b4HbHWHL4Wwh0IwI90i8dLVB/bUthHrPZPRJmTVndy4I3chmEJ/vqCdDoA8zwCEB+bUlzQ9cp0Sw8l4kxWJpFV3qKzDp1+6sLGwMxloZbGyW31kAgp4I/2q32fTzZ4znGXyULj8afsNg5y2tlzH7Y7c55vYzuuQcEf2TZgmIeGFmqBhoV1UUddjdKS5y4wjnNxIT0uVVp3ioELC7ZwU28RhXhTB9QPuaHkIxYAsvTCB1ArQSX8Cb1EI21dYlSvNoOmKTA== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:14:57 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:14:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 05/20] mptcp: flush userspace pm addrs list Date: Tue, 7 Nov 2023 16:14:11 +0800 Message-Id: <9156bd4249b44591eb6908b5a243e9bb37c94f31.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0001.apcprd04.prod.outlook.com (2603:1096:4:197::12) 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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 01c2cec1-f812-486f-c8d9-08dbdf69a127 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TXA1IrgMiBgjZek1YelwPlNDUXiCldzwISUXmvJXsEF/XRYQI7VPu2UExfp5dKzwM9hL2XRUWSvyTa6gdpo33QLA5+pxm/7csyXSQhyLIUwqmXaaoMrDGVyORqsQc/NY7KNn955YY1fSUzD9Uo7SdyRWfARIOzkUitgcq8OZ9H0333rrlwU6KmFfQzOnrrZCc1D7O0k+ZUKufXjVQoHhVNXh0TJvzA9IcdMSGlVt6YXkZWL2aUVJG/MMiq/wXHgF8nQJlbiHBT4MjNRzm40JDFCJPnm5Gm5VaUt6xouoOdVveo9crANfOPX6Jsbw7QaK7Ufd+46xT1RsO1vF9dz0Kc/W9ddli7mOwRphKUlN++0r9M8IHyk2U5OJH3Z139NdWRE2At2hhZ8oJewhjYqsfMx5Xf5zIn55iodFtY8wk2wK72CbD/1ixmV4Chf7IdutPUo4+WFAMDAssZ6OKXcSBnjWi1PLM2zdFIuDmhykRR6hqee1ofk3AZUCu5SnvINRoeMrilkliYWEBIi/L7+zPbq28ivwJvQJr2DqrP00koqprkT+52w2ivuiHkdNugCw 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QjwXFS8eLCpBU2Tdw5TFebRpQVKn3jzp+UTravvsUbcDJFO14JBm7oAO4+v5?= =?us-ascii?Q?+9hPoHwNZ9kebtTpSgx5alFKJ6UN8pusvDkTsgi0NG3Max49exdofRZaXc0N?= =?us-ascii?Q?4oEI/TmOWoLlZU7TM8N+ru0vOElxWx0uaSraLGnSA1xe6y7bwliZ74yb6qpv?= =?us-ascii?Q?BEjuM31HY1EuHAAKwWfxetww90pWero5qRmDiK/ac2ylmuPMp10xb6TDRDlD?= =?us-ascii?Q?s1okEC9VXVup07/I67Ukgos1TLJh2MBakONEP8YnI+LVP8eC0iAALRimnh4W?= =?us-ascii?Q?TnqYdccztxZMXTAqBykGAI06wJC8fImSOzSeP/Oxx67JxWYIgagi+KmrFtnr?= =?us-ascii?Q?W+/3GIaEDIQiYEVGPANxsHpMRcg1z6CjaNC9KyaXo8dp16cEEy4bdrTKOsj1?= =?us-ascii?Q?d79kx/FF5/NenVIUmPobCUt7qEWEedRt/3raCjdzeSsJbwFFp16W5zXKt/fw?= =?us-ascii?Q?tEvcsK0y4PYXRGVuJqWlp45tBs7pn6n0Lk+h3lyVQrzjvSpxA/KicxzZXlMa?= =?us-ascii?Q?7+gs35TY2VEUh47vpj4Jkc3I/lWRGfKi3pR9JxLq9RqB6P3EirxfmZ66SS6O?= =?us-ascii?Q?HqHKjkwCQQQx+4q1pF2xMY4N56X9cZyBnAAKS1b07Yxc39kUsCVXgfUJ6B8y?= =?us-ascii?Q?Ghoo6qlPMX2vBkM9Fmi9ZlmODggc+ONIcJmtzNLFsPx0fN9HOSighVp+LZ1C?= =?us-ascii?Q?bah0mIeakwKeGzN0dtB3MrkJgl2vHJt/cI1TTTMIyNKEB+ADQo2CvtIX+amy?= =?us-ascii?Q?58kluY3uhKs+MC/DA04pF6Q7UknGivyEJekdudok5RIgGNngy/t/n9fzO60G?= =?us-ascii?Q?vdGgClDaVsThxQMx9gKUXGciqh76Tk7Kq4mif4m6ianiA+wCjZKddvBrD8fw?= =?us-ascii?Q?KTsERqOqXUO9YKhoF3AgBswPlez+MVWpaux+HT6Ap0368AbphD0lNoQ+vc8b?= =?us-ascii?Q?HhrUgaP9x5zSq0VKtEJDLCi+GkLSRaNzn9lx6JZf+is958qHqP1xYIz0gq9U?= =?us-ascii?Q?nd8pZIkxaxSRL4GFlagfgxDxJRMA71MOzZ8sl5TywlggTT9cNg1Z7mWcBp6S?= =?us-ascii?Q?VyTOv4qNi5wCJ4ikWLxNujLO0RUbzINV5FZc9/v00oW4Yzg/5C2RFrfpPG/o?= =?us-ascii?Q?c4+cx8ifF8Xd7q/Z6/lcv+jTtvTQW4+9E3tsfuKVCJWdvbCB1orrolb0vwFt?= =?us-ascii?Q?CWGFeanFbFcdqVDIijuCZPJilT15p/krgCYbKBQNERUB9G1zP2Kw/5wc+XX8?= =?us-ascii?Q?g6N003HO8LxV/ECMn56dn5/QLIlim+SU1Jf6vG9vQqUbDnWtWsvzPJPJUqTM?= =?us-ascii?Q?ni0ijZRmT2Ab7XETcNPoppj9DPkxDuBdK5ANR+H3R7+emm18YCDUHFRdyT7F?= =?us-ascii?Q?GmSonQORyFCiPKg8BM9V2Nh1J615Mjhghe34fV79r5C4/g7/McvICqkLdkWk?= =?us-ascii?Q?YhgXGbVxAHMk2cN5ZPFIeAp6YAABQ0QqK8k+mjKX+HQPjeCAlF1Wf5Ghg0N2?= =?us-ascii?Q?ILdz5UGiucWa8qYAQIP5yNtpQqhgkktmoOeiws/ODUXeemUSccGbXOvqnN41?= =?us-ascii?Q?0YL4v/JCbjE/OOE2f68xyO3yC6vjI1icFrjI6vf2?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01c2cec1-f812-486f-c8d9-08dbdf69a127 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:14:57.4219 (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: +JzuRymfjLx8U/qJRXHwm61ZTB5hvn4unrEnwvudm4DgxWClEWG1P0438qxtmjl9w7KR6If7U6pYqA7wciOyFQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" This patch adds a new function mptcp_userspace_pm_flush_addrs_list() to free the userspace local addresses list. Invoke it when flushing addresses from netlink commands. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 2 ++ net/mptcp/pm_userspace.c | 25 +++++++++++++++++++++++++ net/mptcp/protocol.h | 1 + 3 files changed, 28 insertions(+) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index dbf040e39af4..95a793c6702a 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1568,6 +1568,8 @@ int mptcp_pm_nl_flush_addrs_doit(struct sk_buff *skb,= struct genl_info *info) mptcp_nl_remove_addrs_list(sock_net(skb->sk), &free_list); synchronize_rcu(); __flush_addrs(&free_list); + + mptcp_userspace_pm_flush_addrs_list(sock_net(skb->sk)); return 0; } =20 diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 321224e09d40..fd74c0092039 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -20,6 +20,8 @@ void mptcp_userspace_pm_free_local_addr_list(struct mptcp= _sock *msk) list_splice_init(&msk->pm.userspace_pm_local_addr_list, &free_list); spin_unlock_bh(&msk->pm.lock); =20 + mptcp_pm_remove_addrs_and_subflows(msk, &free_list); + list_for_each_entry_safe(entry, tmp, &free_list, list) { sock_kfree_s(sk, entry, sizeof(*entry)); } @@ -548,3 +550,26 @@ int mptcp_userspace_pm_set_flags(struct net *net, stru= ct nlattr *token, sock_put(sk); return ret; } + +void mptcp_userspace_pm_flush_addrs_list(struct net *net) +{ + long s_slot =3D 0, s_num =3D 0; + struct mptcp_sock *msk; + + while ((msk =3D mptcp_token_iter_next(net, &s_slot, &s_num)) !=3D NULL) { + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); + struct sock *sk =3D (struct sock *)msk; + + if (mptcp_pm_is_userspace(msk)) { + lock_sock(sk); + spin_lock_bh(&pernet->lock); + bitmap_zero(pernet->id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); + spin_unlock_bh(&pernet->lock); + mptcp_userspace_pm_free_local_addr_list(msk); + release_sock(sk); + } + + sock_put(sk); + cond_resched(); + } +} diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c38350abac1d..54f96e7f7603 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -944,6 +944,7 @@ void mptcp_pm_remove_addrs_and_subflows(struct mptcp_so= ck *msk, struct list_head *rm_list); =20 void mptcp_userspace_pm_free_local_addr_list(struct mptcp_sock *msk); +void mptcp_userspace_pm_flush_addrs_list(struct net *net); =20 void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp); --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2085.outbound.protection.outlook.com [40.107.20.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 620DC10942 for ; Tue, 7 Nov 2023 08:15:06 +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="IzqE2XH/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iSg8ehKOX+VVZiXt/uLmRbZn+9PjGTE8ageldwT/Fnsh44Cyw2Xl4H+ofHPWB9xNIz5fXys+CGg46V9G0FipM7hxXiFn4Yyn9vrlYzn6j6KPrMryvVbYI7/9C1I9MT8CDk3bKxo2v0OsOAJEAcmnFlEFxLZwzDANxW3yn00qqf6QUZKeyHzJ2HYlxd2sKrTT0s5xyLpiAYT6Gt596A3uWTPrufJgJcGXr2uWVZxWgisLxwyrCLPriNheHA4bzJfKpqcfoTw8c4HFUUuguyNGyPp9d6dfemEqRYMUb2C/yyymBAGEtHaDrqw9P+FAxo3pt2xNk8p7UvhX28QxDoWGZg== 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=QoP166l0cxfbdzoTW90KFZp8hVW5a78ALyEg75TjHvY=; b=JArJJmTq/vUskozgXqGsNY+/2aCqajWSVCEMtXksoqYRod8YU0zwJX7liL0GR7gHCtqjw6xDJmz+TCFun2C3sAdxRMYXX8y8640A/uoGDYZ+CJDx3tss9MOKxtZDkV3XVIYcQSWfOrU5iN4VINLLNWG0HWl3Yfao1vnVrqJeKVUwLOPQgyDdv++b7m18BeWY6MBl6mY+oU7JyqpP2WlNYZqU0fhW70RxpSisH3Q/swkjqKSIUmvCHuC2sQqlRBBESbhc7WDXVS1SSiDl31dmtvw1DK1mfHVnS3I9h+u+NEfmHXPuVo83EK3M25oup6gQ7uvbcfwpboePlhs4BbKPtw== 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=QoP166l0cxfbdzoTW90KFZp8hVW5a78ALyEg75TjHvY=; b=IzqE2XH/sEWEmVedMghT3lts5Nu6JRtk7V2CtDp1eqikT2sqz/rc0gX2G/YY1GlnA8pVEz694ODF3pCPL2OhoZvg0NyI6fNbH9MYhvnzli19SWnlmi4nneg6bRrOUyQCjzM7EhwTO76y9gtlt0DXrdBsCFcFch6ttUU8PCz1kb3Q70sYSVpCVmnSR9S7KHIhFuvDucngVygmTGBQk3sOCRYtqL16vDzAG2WRCZUbosV6meImQ2yiDWggM/C6opVTTyb/1xhO+zuU1y9gnbhFyWvhaVt400rOWrKl9taNGzJT4URGY9OTGgd/+GOEBLwzCRGfW4kaRIyUJv2VAujbqg== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:15:04 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:15:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 06/20] mptcp: add userspace_pm_lookup_addr_by_id helper Date: Tue, 7 Nov 2023 16:14:12 +0800 Message-Id: <55cc4091c152c6882880e498aa817c33953a0687.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0008.apcprd04.prod.outlook.com (2603:1096:4:197::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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: f6160d25-b02d-4b1e-24d3-08dbdf69a4d3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iBvWssu8Qb37IE//W1pDyQQPxMasqw0nP7cE9kT/5c98sbcNqRrXESVEbqpXcvMGRWtMwppX4xNUPRRK6y1RsXQe/leE55opCZ8314Hr3itapFyeC8VKSd78zvRI4SU52LhxNH7CUsrAzMEt16ER+soIxMTf+yqfv//aJC9VnYVr/1/xW34/p8q0g0ye4w8S8eNpctuyZd2SyGAK0QHORjih5kdbdAMXEQI71ZgghVU5tdYy4gKYaK+N3OG7GAYY1FVb2p+sMCojObIUGYpoGalD3oAoFm+TXCRJYQenMd2mGJfmmWlR6jsrdZRK/sea1ZE6haTT5NaiJIao8Lg2kGl8nere4V1lTRY3ev6hilLuucrZ3z4uddHTUVGWMt2z1Y1DphHED0c78Pc8gICedV1wh1oabArNiJYPVOB9OCpNvx4Gv8E9kSOnbhlAg1gEpWAAO4IcV5jS9yf44iTWYWO6R4P8Ckso9TGfKYc43EWKxK7D8V8dnwKquwFJOF+k/nkLA7xFKGbJxj4Xfc+A97STu4L2m14SszyW3lsXZtOFz/Zy31Ultj76sTRQJd2V 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NNkQoFACTv6sG2K+haLFPTteBgBJ08h2E8+XLvKeApnx8K+lEsx9GdIWyGA9?= =?us-ascii?Q?Ew24L9RNvKgi+PZ6/Tt/N5u4OOt3wocAgOHrF/Bi0JjgtXZ7cIxXlU8lDNgS?= =?us-ascii?Q?nxVejYRo7ozAenj6sfEaH7WtC3tAx85oHzuiESEwNGDR1ALBD+9rD/uodjfL?= =?us-ascii?Q?9mImY88sGn6RGBByn1h2IvFVEUOpEJHQtQ2QQjKGlugCqK9/EMOEgwu2pb1R?= =?us-ascii?Q?5XvtHA4fRyW3uSBi7MaDwZU3GeaGpXTCi46ACszXXNAxBMnotKhSY9VargcC?= =?us-ascii?Q?QKWu6ypANrHgCF4CvrrCQBVkSqp9AOna5zV928yICiMap89AhkwdOS5Yzjpk?= =?us-ascii?Q?oEUCdCRLptGQxfIR6IDFfLsqUab075bOD8bU22b48hwmehFJ2N5hhIo+zEpn?= =?us-ascii?Q?RY7EJ6guljp/ZVGO4sk1HyWRQwf9wni6xR8URxSQCMWM4oRXIu3MfYNs5VSB?= =?us-ascii?Q?+m2ne5wq7bf2Vsb2qfziM+UeHlOaFsEXLICQkdUkv6uShuy+sbqjUz8MQuFM?= =?us-ascii?Q?sQamNsmpav5FJVtPCdQuI0aoF23TlXmOktx+Xuj7rgQPV4xLfNMTIKyM32kf?= =?us-ascii?Q?HMhhvOOnEqJQP2EbmDz94VPFCe8aSHVcW5DCO2OqvdnQNIxCy+rRTApXRnHs?= =?us-ascii?Q?MWm2f9HNiWAXMHsfU1TSLf3u6vtzmuHWX/O/G9PgoJO3rdabySk+BJm9XSaT?= =?us-ascii?Q?ubFFvninJOBK3FDXOfPcgF6uOjbEOkMfHRL0qDlAsEee9sWFZviiIh61Y8Ml?= =?us-ascii?Q?ANj0K0Zusc0ooe85Nr0pma06WnLdPVG3OsYw6g9vFNofuYZf5ZeSJoEo1osc?= =?us-ascii?Q?afcI8/vxD22MwDmOJPW3/qoloADBovFpUfSVIl6ICHmHH+M48+jkakmiJNNt?= =?us-ascii?Q?bcWePJzwiAnIriLGZE3YmNaMIFN6mt3hQePnNzmUHN3+P9uBtO0kT9tjYcNV?= =?us-ascii?Q?yAMPYY+4sZ49qjoRHktG3SF8sV/gpvz4iEG4zLN+PUgcjlULLiROl5N3eGYb?= =?us-ascii?Q?dfvExYi0HSPydID0ahv7OQMo8wlM/anh7aaMekKSrizTLsFet6lo1PyMSacR?= =?us-ascii?Q?MmvDQzeknc2CkCh1Ojd0o6+LN0sNA06y66u6A/l8DQ2MfatUCmiQJQL2B5k0?= =?us-ascii?Q?AukSRn2VHZQKksEQQkU1TTppYKbl1kKwSGWawAEk6Mv3FpyN1Riy/XtYxl7h?= =?us-ascii?Q?v0wQixyKuCyfAeVxmPw1Qb9q/Ap/DUpC1zqf2EVDoGybk/m45VzA7ShaxWh/?= =?us-ascii?Q?/4m5OVs+dwhgTv1fwMQUcRTM1xe3Goa2Y1I271M+otSAxWUROPE9VdMMDExj?= =?us-ascii?Q?x/Oj8L+j+qRh4/hNIUfJTyyaWsjqDLfoeX7SvkdAKXMJ5CJq3L++dUDJQpHx?= =?us-ascii?Q?np03vOtDK8NtOFSk5d1n7azYbi+LelqMOjddlnearCehFNTDna8Yt+HbPNLh?= =?us-ascii?Q?zYrxgMQ+kFMrIHBpgOoFp6gB8Kba1OvknSVSEpuXZTJFZlTYnwC1CcnPoCpp?= =?us-ascii?Q?lNLVL57Bpy6kwRkTxhGJcyLVxlnifF/Pcaq16Yr1+hddjONlJO18Zebb4Lu3?= =?us-ascii?Q?mTZxw8XYf5Pt4twaE8z+uau5nJ46ZCkiqZrZq22+?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6160d25-b02d-4b1e-24d3-08dbdf69a4d3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:15:04.0890 (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: yOJ4GxF4iZk/gW4DN6i2b/EhNko7vW0Cjg894MwhTqLsmATTVTVaBF2QU4p31VYg7wRS4s3rpaGj/OupOUrVwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" Corresponding __lookup_addr_by_id() function in the in-kernel netlink PM, this patch adds a new helper mptcp_userspace_pm_lookup_addr_by_id() to lookup the address entry with the given id on the userspace pm local address list. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index fd74c0092039..73d16c8006d1 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -27,6 +27,18 @@ void mptcp_userspace_pm_free_local_addr_list(struct mptc= p_sock *msk) } } =20 +static struct mptcp_pm_addr_entry * +mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *msk, unsigned int = id) +{ + struct mptcp_pm_addr_entry *entry; + + list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { + if (entry->addr.id =3D=3D id) + return entry; + } + return NULL; +} + static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, struct mptcp_pm_addr_entry *entry) { @@ -109,15 +121,10 @@ int mptcp_userspace_pm_get_flags_and_ifindex_by_id(st= ruct mptcp_sock *msk, unsigned int id, u8 *flags, int *ifindex) { - struct mptcp_pm_addr_entry *entry, *match =3D NULL; + struct mptcp_pm_addr_entry *match; =20 spin_lock_bh(&msk->pm.lock); - list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { - if (id =3D=3D entry->addr.id) { - match =3D entry; - break; - } - } + match =3D mptcp_userspace_pm_lookup_addr_by_id(msk, id); spin_unlock_bh(&msk->pm.lock); if (match) { *flags =3D match->flags; @@ -249,7 +256,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct= genl_info *info) { struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; struct nlattr *id =3D info->attrs[MPTCP_PM_ATTR_LOC_ID]; - struct mptcp_pm_addr_entry *match =3D NULL; + struct mptcp_pm_addr_entry *match; struct mptcp_pm_addr_entry *entry; struct mptcp_sock *msk; LIST_HEAD(free_list); @@ -286,13 +293,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struc= t genl_info *info) =20 lock_sock(sk); =20 - list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { - if (entry->addr.id =3D=3D id_val) { - match =3D entry; - break; - } - } - + match =3D mptcp_userspace_pm_lookup_addr_by_id(msk, id_val); if (!match) { GENL_SET_ERR_MSG(info, "address with specified id not found"); release_sock(sk); --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2089.outbound.protection.outlook.com [40.107.20.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 2D3DE101CF for ; Tue, 7 Nov 2023 08:15:13 +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="EvwwXpaJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XMPzufsO3Uz4A+j6LLQK7LH+4/XAaKon2nwE+deKnkcOdS2YnHANREi8sKfehxPPJoz2ibE7g3u8srhGPgm8VUzgpZqnXqSqFXuK00le/8ilrMEgCwYBFLvHYbEGjHayvgDbPaxU8vKAogv+t6QW8FYjUKJBedMrvNCX6koqHghpOFqF6/z36ZXbMvvtvNS+hCdggJQ1iTgEpZ3oItDKzjfUAAfF43roLM0UEGgYGbviWzhdvavjo/6b4nz7TZAEQ3beSsEpM2XwnnsYn63tesQEAcZl5gnpreZUVo50tk/EUls4Lf0cGZSkhwtgXJM5Uqx9icITCH6EtsEYoazyWg== 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=Jd0XmH1SYWu9fQnD3nT5KuFwrQBJ0oWIgOJZJRjOnhI=; b=ScwxiJSfYHbFsD6TCkvFtzjqLUSXZ5NkW+IOtE7WnYG9hllbeHAEvGgpYYN0gCepiNaOpLjfJE6jHM7jI6QJVe4sHJ/w33EelZ8MfDP+ViCbAVrsJ3tIUv7eJr36I3TtYNoA3NbLQ9Wx9EO++GgRLj387c6hWAdW4SICiYSMkguL4L+cZxkaydqWQiRc7JDa1UMgC/XyDKGoHURfBFA0r01D0pH7cfyWprDbHCk1/xEiJZrfKvvp1mO2gyKU7OcaLPPuCC/w31gJYSKjaUpuI3xQXF47GB3LnWZ0LDKSIcwGg2lnFxqPjSiBtIGi4Vyy1GQH9tEhQgfeGPWMdhNSrA== 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=Jd0XmH1SYWu9fQnD3nT5KuFwrQBJ0oWIgOJZJRjOnhI=; b=EvwwXpaJwVS9/rN/CYpdHJjFWSmGCO6Ca2lfh1lGK5nfnNebq50rUH9itQiEFdq78PG3PRBtIlyDY2oABNExwQ34cIQG/n8IANyJ5XPpn7zDsz4z0zfy9QRG0Chxr9VTgLC4GziiXzb5Ae2cny2mByJF2WQ51ipURWhHJXJlQCdjFbsIO1W2J+tJvd5Aom4Xlpce8VlB2k832M98pUhHfkOQiaNjrHhYW/Pmz+lkygbvegjBdlr3bOxuhks4T9cvDbL0D5ly1seWfC/D/1RIEtmGeoxsr2YMPblgYzdTwdVukl/dZLoIPEmlxW5UBpyUwBFI7vKKEYbdc8d6/46HxQ== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:15:11 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:15:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 07/20] mptcp: drop lookup_by_id parameter in lookup_addr Date: Tue, 7 Nov 2023 16:14:13 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0111.apcprd02.prod.outlook.com (2603:1096:4:92::27) 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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: e2ea0ded-dfff-404a-2e17-08dbdf69a8cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k2zVihSizV81mKo6SumUUGMCDLK8UDeAPZ63HgctQlPK6hLbKV/qAtpoNV2r54fi/5jf0alLRXLtFjFA4RX9mGdVmIvIc5Mq89qvOZqNhMSp2jFT6MtIYgkj/chUzNclP/IUKTyZq1XtvtrQMEFT6Iq7FYK1Z+xPw6jrlXSDA0Bino+o1qJAxjnFQFga+nUD53iQ+AbogrjcYLefTgEMa17wTDutvAz2zY7vKKUwNlzQb80zpoxwpzDKd8Dr1yA+cvgDfv/oTls6GaJeSfQAZ0259IFeu15keMw7CuYsOstsA+wBr0lZcaS0gMxfC6nHDBBUpLqxro03w3mn6MJeSlgCzEMdVqUf+/QZHtOKaPNbSrSzoywImv2/iKr963KI3AzMcoAMF6ImZ7HA8FEUTY68kQL4sltbLUPZDWiJRxpkdyNITTULGA9GIkzEqmyrVdt2q5hsEwUrAam8tnuqLh/UBEiqnlZVTSDFJqbxaCBeZVP5kr/KM6gMG1xkhG1X28XKzQ6O8YSnCDe6p5F2IWKsXZbQl9Gr+iDIoxrT3zrM1l1+DCbZRW57brCZXxGb 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bSoQKDjISR7ZLJZCK54MdqOgASLJlY7Dvd0/9XqwFcR5b1BXpRxCP3tznihk?= =?us-ascii?Q?mwXn8z/vnfgmgWQBgsSGqS0I2cLLuyaFzkjEYInJYlLnCUAoWh5MgWAPPFff?= =?us-ascii?Q?q3QYd3ciQHfmS1a0CWak+BtKt4hwcaYBdaOxuzIcxPSTt2/bQvo19j09AqGR?= =?us-ascii?Q?Ynph0H3rcJodVF95zY5r5u27WvXjgHjZrkdOOO159OG97ws8RS0nvKednCuk?= =?us-ascii?Q?TfxL8Q8ajEU81Qna2rTYasFbeTx6sq6poNYjcR7g+ADBcp7YBEynKGd0C2ye?= =?us-ascii?Q?CatU86WueGItclk4NpzXD5IMNqUQGnVHPwp2BQTFNri/EhGlTLr71BDcLxT/?= =?us-ascii?Q?ckKyZD2aZe7qS4vAFKp4TW8jjV2tsD2r3Ydw3nkSvwWd0Q2J/gi+pjXHmERF?= =?us-ascii?Q?XOkyZTlGoH6dtKnQpvJAwc41Z2PwwtL0SkooisKtUmjahNORJFgrFnXpFFr0?= =?us-ascii?Q?+2ihADjJzRWa9ryHjf1fqrranA/fp+x9hYdRxTNcaVQ2WYRw0g/JUjz7VQZa?= =?us-ascii?Q?Yy0OGeymu4+asLaRERVA6PiZS20I9nFOkzuDuw2UGRW373LWmiS5JnAwstq8?= =?us-ascii?Q?0cszhezkKy2bw5R+8BqSO0PAULvoT0nVDxcbCi1BgeNu7NDCGcHrTS4qj9kH?= =?us-ascii?Q?eA4V9CaP3N2N8J5p4/H2SUy4/BXpn9mDoybDHU0wDgLUpwKv/jFfRg2JTAai?= =?us-ascii?Q?VkDz268/DFG1Tsggh4aVt3s9EgeEcCneLDCcmeh14M6QObN4P7rLUzKys2NC?= =?us-ascii?Q?6W1x4Tb/EYYiV4ZY003uvo2zFgPybpht0aiFobnAZXN0+bem/zBG2AaPI5FJ?= =?us-ascii?Q?DpiwFtKs1L5PW2hrA5Rdv6z60Ci7emTSOWjTPxdVhH6X7OVzYDJyTstHmCrr?= =?us-ascii?Q?Sv4G0OB7kv2NCv+20O2fqPSwSKeKcYEMGs93b8Fd1CuZdFrpWP6aR/1eeXMD?= =?us-ascii?Q?Yk/JD5g5a+o2yO7b2qZiMCd1Bi+He9q6PPExN0QilqITNjq8jjHjlmdDTSJ7?= =?us-ascii?Q?5eIST0/VtZgkZf+MT1pBNpBSEHd5uoZ4fdDOFJgmabmA2FnikY2+E1+V5N+1?= =?us-ascii?Q?Yitk8RGaUNWmz1SCOQ8tzBoOSkx8PT2oM32SYfF3IQPCJLZRN5ZPYdE689im?= =?us-ascii?Q?ZJNGnliD+tO4N54C6kntw8f8IdERIbEfNMqouHcxHpo96w5mqk80cDckWPWm?= =?us-ascii?Q?PfQMHgrAkdV1cq5OdJqjTWuqPVs1rWgCATPoKb3eX7orwLTAzWZe0qBd8n2k?= =?us-ascii?Q?MzCIz/5HuJ+p0mIPRm9tRVu+CDMHSBHFYxatpRcI4wbB1eaIQx0JVEKSiOtG?= =?us-ascii?Q?SpD/5hoxMOEvLFHuGgETx55dln52EZX54ELCYR4rRqPdsO9FZU35/fPzZ/iP?= =?us-ascii?Q?Iwv3yhf+KQu9WrgYzOjnVWEr+ds0e0AKPLg/p9moj5/Ex+nc2WCGH0wo7vnG?= =?us-ascii?Q?H5XsDOkC5lsIUKvddXdaUfJStyq/8V+YlukSoEF3omVIlAmJ3hvQM+wRVTsE?= =?us-ascii?Q?4fAprDaegD4ZOW7lKypq6BM8/FkHfNvgLDNSB3zu8PwzoQqp6IMIUiG/0oiu?= =?us-ascii?Q?WvaXBGQB3+x23SSRSrYMaDNw1Kd/ldQqR8/pso4L?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2ea0ded-dfff-404a-2e17-08dbdf69a8cd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:15:10.8259 (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: g+6PDWVH6mrju2TBq3lmkEer2mPMhYdqI5ZB2YlpCBARsxLst30JOdzyf0zk/ObEniuN8e8XsnkBfDHGTZ+uwQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" When lookup_by_id parameter of __lookup_addr() is true, it's the same as __lookup_addr_by_id(). Drop this parameter. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 95a793c6702a..5d42b62cc3f6 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -458,15 +458,12 @@ __lookup_addr_by_id(struct pm_nl_pernet *pernet, unsi= gned int id) } =20 static struct mptcp_pm_addr_entry * -__lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *i= nfo, - bool lookup_by_id) +__lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *i= nfo) { struct mptcp_pm_addr_entry *entry; =20 list_for_each_entry(entry, &pernet->local_addr_list, list) { - if ((!lookup_by_id && - mptcp_addresses_equal(&entry->addr, info, entry->addr.port)) || - (lookup_by_id && entry->addr.id =3D=3D info->id)) + if (mptcp_addresses_equal(&entry->addr, info, entry->addr.port)) return entry; } return NULL; @@ -496,7 +493,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(stru= ct mptcp_sock *msk) =20 mptcp_local_address((struct sock_common *)msk->first, &mpc_addr); rcu_read_lock(); - entry =3D __lookup_addr(pernet, &mpc_addr, false); + entry =3D __lookup_addr(pernet, &mpc_addr); if (entry) { __clear_bit(entry->addr.id, msk->pm.id_avail_bitmap); msk->mpc_endpoint_id =3D entry->addr.id; @@ -1834,7 +1831,8 @@ int mptcp_pm_nl_set_flags(struct net *net, struct mpt= cp_pm_addr_entry *addr, u8 } =20 spin_lock_bh(&pernet->lock); - entry =3D __lookup_addr(pernet, &addr->addr, lookup_by_id); + entry =3D lookup_by_id ? __lookup_addr_by_id(pernet, addr->addr.id) : + __lookup_addr(pernet, &addr->addr); if (!entry) { spin_unlock_bh(&pernet->lock); return -EINVAL; --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2069.outbound.protection.outlook.com [40.107.20.69]) (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 224AD28E2 for ; Tue, 7 Nov 2023 08:15:19 +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="GIHczZhn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DsJ61+WQ2Jse5UzHo2KS811Zvp7aniI1EKn8IRaEWz6+XRniCSL4Ndr6ylCiOcpaDm+eBdJuQWdsgGt/cSgMmbdEOQr7hw5UzzcACodQObdeF372gOKV/QpHhsY5HBEhRowbJkWEDtXvJYhhwNU+onnCRMGQ80BGehU/83zYbzRRtWpNyzdZgcOSha81A3tuGkxUR4FLgYGv3U64KSFXtxlSmmpz39dGVTcDhxGOWkpv0nJ9D6J+Elpj3xW/Ut5yJj+8+dOceIeOMFLQfIf2ZCHOkaimd3EGKJeLGNjOhJkXRtc5lf156Whh9LkpEaHLy0I9Qk+pULRJOzZaBJqMQg== 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=ePPCKbrvcYO71HNeRwZE6CAy/2FxyDSgm8y5jFpi/dU=; b=TyO0gMYW2UWlkm103VSlwtCguc1j1HANzAy2APvzki3IzKyvkZIuTxP4/0htP+JOjaIv7uqcsZqExXOWDb0XHI13H1nuPjU2UBB8vqwrKomkvWWK+L9+el6PBFhUJKswnIF3+13X+dR1f29obLRt7KaCovwo8vgcJ81sfmFx+h15YjX5GQbZ37QFDV1bu/0cRhnvOXey4QYPkl8yjpF8aQ6rkOxAcPljqyfmhGnuuiEpgxUrl/BNPesN7/A3GWdQi0MFoCyQk3kEaRWNgZWQr2ctujK/1d2UJ8+NA6s+aeaz6v0Jv89dAJIzdgf7xyPqIoaGPrJ3kQVjv5NB2qwHvA== 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=ePPCKbrvcYO71HNeRwZE6CAy/2FxyDSgm8y5jFpi/dU=; b=GIHczZhn7/DXCFVV4JKsmbD9fZtTlxgkK2qtipRU3L5Cyy7AOsNcODaeMwTpXn4lotb4NWLP/HqIke0KQeC6ZZunb6NPkGEHRfhJQ5ponnNaAK95D4C5zzPzEEiJDBcXg8AjVKI3Kff9MBbqRDbR0rN3ApDFjii1KBfSId4d3+Y4Ezhf/Nx1N7h9ioXksEII+QXe4w5ev1q9sz+b9n94m3FhegaBCCOGUM/Mmr2qkR7+6uMZN8qB4egs99jfCkYNaRPbtniaUjPhszJSLhyARxt3d4z01CuIxQOyBdZeZnkMOF0qu+/QR2160PNliT0jiJzC/0T3kqck/EIx80vPEw== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:15:17 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:15:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 08/20] mptcp: dump userspace pm addrs Date: Tue, 7 Nov 2023 16:14:14 +0800 Message-Id: <87810ebe9149b5592ab6bf90077e50f5b596d73d.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0113.apcprd02.prod.outlook.com (2603:1096:4:92::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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: f0b050b1-9358-4fe1-d1e1-08dbdf69ad02 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6NX1eI3OsUAsIkMwJx/pG/w178JYSBDAIrt4oF+ePmtvh1HFUzfid9eJdc9N1eQ0Pt13s4PczF9CZDr5ZOv///qunXLO4WzGGEeakmY4yPvwGNqvIOpsDc3/cu2XgSGFToWkkkRWUHJ+8xakF9Gk3PeC3I7lQcQmxtUgUEtX4hUANzqqa4/Xvvb9RvOMkT+ZK4dFd1XbsaqcxGPCR8Wf1YJt7al3zf4XjC2+Iy5RZYGmlwvRxr/Os11VqbimzNzMH+XyucOnqY8/7Ur+GhM61pGae8TjxJlirJ8U6ujh8nmR6dallc3zSCinRpxZiIi886LvhdK8ez+LZdXmcLPYS3M2OXbBdyVO6dqXdb8Q1s58PHrvi+pFiOD3W3xWTGhdxKaOxukhC1c8wn90cz0gx44t+Mh/N//MMj7vFw3BaTjGdHlsxd34erjcfINWyJvl1kB4RxSo6ll3hSeERJRb116rttPgucy7H/sReSSNAxeyUyg9axZd39HljQUu9d42ZlxB2xV2BClSq9jA8CFBsdIij+KGQnZ7tGh2Rhr0G9lAio9ujoGZGVrhbsXGsZN+ 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yp+7+Vxey9Eocx2enwXQH/5TjAnMIR7mr7PjF243AsLy+dk+w8a8HCLV3bSF?= =?us-ascii?Q?1IFeXfgAHBNuW7NEnuZAM71CvrOJzThBRxkblycMmQkhCqR0USXE18D7Rzzy?= =?us-ascii?Q?2sGilIQ/1mz/U0iHjxaLbA1faROzx2/yPNHVyHYMvr+gIkjbY0VE3oJlR8QI?= =?us-ascii?Q?Muxp/D45jqnGzvX3ulceOB269AcksXofQFO0rtvz7gA3sRw19Ru2meXBiQ3N?= =?us-ascii?Q?q34lRMcp2p+1uD5onDj6qsAL4REUKc+tANmhFDeUTQ19asP6ttmW+5+CblZN?= =?us-ascii?Q?byw+4ZEfE+Ju3quRqgUVtTE1AzzpGJUI30eXSBn9RgCXyCVgyLoO6ebXUY3h?= =?us-ascii?Q?p4vl0rgWoagwkd7QEIu9nM9K9UTE7m5+PhXwti1t3LUQycr7oJ8/+Q198NcK?= =?us-ascii?Q?JqsFQhaq04opA+WUkGdS/Wtdh0ezqIXZIBFDwi+dGlAtWpHkU1sdkNOOLFFn?= =?us-ascii?Q?AtHTYy67DA0lpxUdkx66EDdLevKZqOdkFX4wP41vgEhstgiUxMnKekuB8vPn?= =?us-ascii?Q?hXlAhTde7t6MP6h0oTXVHNJg6HBPTOVehaMnkyxgy90NIRyE5Oh22IbwSVAQ?= =?us-ascii?Q?rMLVOv4mH9WIXxQHnMBUD1IiYj+9LFYnlfgnGav6t1fuhMZyrtsnrLoGu0+W?= =?us-ascii?Q?IzRqERW+aHonXarIQtP9l3AVurhj8Ng8cmMkv79k5a7W+UOtX2oahEcuWxJ8?= =?us-ascii?Q?mLyUFiOpS+fX8EKTpRO2Ms2bsxYT6tgLotu13VYEw4Gu3pn8LqyM/eiqvDiW?= =?us-ascii?Q?fAEZDWo+Am+yRlEkEyI5faIQLvM5K/3JWlxK5C1MVAHW7Up0lBbJF/tGX3fl?= =?us-ascii?Q?Tk3MSRrjT4qli9YC/gMuH7kiL5Rfg59CSFWjpl3lu3wDzpc1/7Em1wVosZz1?= =?us-ascii?Q?JveavFaZ2ftNoSB85syXm2gZV4et9JmRuNq/rv+MCZfrh+HsMwcMG/wxIMqV?= =?us-ascii?Q?WTUE8rgR2lEdcGXe6jFwshRSldVXTY1J+z4FacYhoYT5g2JeNYiGvE7UJS9w?= =?us-ascii?Q?UJLFLSavC+m5fNovQjxy1zS0/qWjHapo8DtUEvUVENBO6iFcMtdBB2gyUAsJ?= =?us-ascii?Q?5U14JucrlvYPxo2WoraDudZsFcaYBcd06nUonibqdVUgRuKV5Zthc8ZtHIgI?= =?us-ascii?Q?i5xv+OgcKfxY/kG92VWkRmmAX7sRl0/L3A5eAsjac++q4pAUjjmmkKLZYQ4n?= =?us-ascii?Q?BNwBLeK8qEFS4HKWRyZfgr3cc8qVLOzzd9G/8a+GOC7utldBllc+wsDFu/H1?= =?us-ascii?Q?7EE9/PbZbl/ar65t9u8rE5FFU8YO0M5YRmqpONcnvtl6G4RDG4wavfawmksN?= =?us-ascii?Q?VKzEdF5b7OsHoT70cSMDYyO7KuBNgJv/wRCQ+Qy93cT2MQzJpjuPQOnk2hZ8?= =?us-ascii?Q?3wGgkuIUv+MCS0LQZDAQWyHMTYud4hwC5lmi6SRGm4oFHs+PfeIDfqrrc9vt?= =?us-ascii?Q?v8o6PQ59Uh4GJf6Sd81XLzBEduNgs1FI0PLPNnih2P/5S8VbPru9mN+CBrLb?= =?us-ascii?Q?Hf2e0NIxDBbdiBGPQVLHibltDPjREgdXGIhKjOhPuuehkcsSKmH5+Lsg6qtH?= =?us-ascii?Q?60dofmvs28zGvgCz9K8MKgFMz33N0hXoDHVt/ax3?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0b050b1-9358-4fe1-d1e1-08dbdf69ad02 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:15:17.2727 (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: JcL2oReK0YIXBpIVZwTV9JiqRkxqVCwijtEtAiKsdRrcYz2CMd+HsJwcPolphCZYBe/ajKpjvbLwK8gtJ3fMWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" This patch adds a new function __userspace_pm_lookup_addr_by_id() to lookup the address entry by the given id in the userspace local addresses list. Invoke it when dumping addresses from netlink commands. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 9 +++++++-- net/mptcp/pm_userspace.c | 25 +++++++++++++++++++++++++ net/mptcp/protocol.h | 2 ++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 5d42b62cc3f6..b7e4c8d21078 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1675,8 +1675,13 @@ int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg, for (i =3D id; i < MPTCP_PM_MAX_ADDR_ID + 1; i++) { if (test_bit(i, pernet->id_bitmap)) { entry =3D __lookup_addr_by_id(pernet, i); - if (!entry) - break; + if (!entry) { + spin_unlock_bh(&pernet->lock); + entry =3D __userspace_pm_lookup_addr_by_id(net, i); + spin_lock_bh(&pernet->lock); + if (!entry) + break; + } =20 if (entry->addr.id <=3D id) continue; diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 73d16c8006d1..bd491b78171c 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -574,3 +574,28 @@ void mptcp_userspace_pm_flush_addrs_list(struct net *n= et) cond_resched(); } } + +struct mptcp_pm_addr_entry * +__userspace_pm_lookup_addr_by_id(struct net *net, unsigned int id) +{ + struct mptcp_pm_addr_entry *entry =3D NULL; + long s_slot =3D 0, s_num =3D 0; + struct mptcp_sock *msk; + + while ((msk =3D mptcp_token_iter_next(net, &s_slot, &s_num)) !=3D NULL) { + struct sock *sk =3D (struct sock *)msk; + + if (mptcp_pm_is_userspace(msk)) { + lock_sock(sk); + spin_lock_bh(&msk->pm.lock); + entry =3D mptcp_userspace_pm_lookup_addr_by_id(msk, id); + spin_unlock_bh(&msk->pm.lock); + release_sock(sk); + } + + sock_put(sk); + cond_resched(); + } + + return entry; +} diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 54f96e7f7603..089fbebd21d3 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1022,6 +1022,8 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, = unsigned int remaining, int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct mptcp_addr_inf= o *skc); int mptcp_userspace_pm_get_local_id(struct mptcp_sock *msk, struct mptcp_a= ddr_info *skc); +struct mptcp_pm_addr_entry * +__userspace_pm_lookup_addr_by_id(struct net *net, unsigned int id); =20 void __init mptcp_pm_nl_init(void); void mptcp_pm_nl_work(struct mptcp_sock *msk); --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2059.outbound.protection.outlook.com [40.107.20.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 8911D28E2 for ; Tue, 7 Nov 2023 08:15:25 +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="GILz6YPo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CiZ0RnHddHaVxoWq2bRbwGgUjUy8ZjAGpup8Y2oxwzopP5gcVUEx0EjdWHay3Xi0eWGNZ5xIxKjSfmuEbJvnI3F45Q9T03VnFUlHtb4zlP/4Ui2rNOlomE1YG4xt6jvlOvJMadY7tXfRgXZFc6qPLw2EED28k5TNZVCzHZh5FHh1tPoJitYmSIwvAy83wpsTrLZzRE9zu2gU75YCRn+WDfbVzZOiPTEzpVvCKjexQik2yB7CqEFdwpo15t9YsNwaWfjA2cx+WROQrblUj8yHvC5tsFvrs6b8l18p5FrpH6Dat2C1//kf2Y3x1ZMqeIwdrTYl4eGBwFs4xLWWgvn+CQ== 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=YaOiJpN8/A10of1uj1J4n4Tyw9AEpH9fjhLnvT8bhEM=; b=HuyaSViXIlimCaiRr7bs74x+DZ8Ju16trhVeVXM7nl1Cq9/yY4bfnfjtgbLJFDo+ZNxZMfG4TYFdBA6gAWS5XJMCDr28B21Ey8944JLHWuIOubAhzvvya9BoL6vmQIWxDYsWQMp/shU0HJL4lZy3yzi8XxwAYOFnRaGo8hmZwFI/fMwcrYCrlhB3enwwYM5hxVe3pzcF/wG6Y8m9PcbA0nUVVVlXn2Mxl7y1TPpW7NpiQqlY5YLk0JI9cRi8eWmfWqLE8NApQpsX4yqt4+Vo4QA5l/VYc5tiqDF28qPYdmgLsXRbfIiP9DUtv13dTIQnkZ9fRKh8IWeQz0Nirdy59g== 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=YaOiJpN8/A10of1uj1J4n4Tyw9AEpH9fjhLnvT8bhEM=; b=GILz6YPoeSxEfQpM8wFM9LHau2Q0p5CHYbeZtglmshGCBeUS52Kgf82t4SLJGHb4awors8Qao58ysVcNFpYKNW7968r4v1hzYEZ2K+mVNC3sgdscrbmRdy+WWD437Cdh2hcgpZRW8sX8ceAAJ+TWZWOpgYrLVj9Mx+2g+VxjfVRtwGWpahSCOMET96S5VCWuD3y+eD6/qmS449g9zGgmfUKsQ7rtuoHjB7D+/5Jklcu7H9aCeWy2fnowAaIAz5iikP586A9GZUnLTiKIHYzAdTcl0pntnVPG8xE2jOVFeQd8kZF8UfE6/2fc52IV6E21h6/T2IkQalfcrkO3ukmk3Q== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:15:23 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:15:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 09/20] mptcp: check userspace pm subflow flag Date: Tue, 7 Nov 2023 16:14:15 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0109.apcprd02.prod.outlook.com (2603:1096:4:92::25) 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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e1874b0-23e7-472f-6907-08dbdf69b0a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d6ucbWAuvt6XO7LQbDbL4TCkajtYnI4wSBbo/h7YUSOusUY3eUITl4J00URlhC9CqGFrRUwUns9GbSqKq3X4f+mt4SJnPycF2ra6rYdLgI8mDfMOujwlbpexrWun6YeNGeb2KJ65yBU8Chm8Meki9jO6ECJgIslZU6PMRGE0cG7r3K1xpSyhrzWa0vGtD0mI7OcZIWLgzwlUSkAtfc2pgDmuyZFJl8WyOZGBJefQtugxrDXSAS/Rb5Sq+UfqfkU+ow8UYPdOyRSa5wbOo8fP96GgeaAggY8hxgCw7BA5jnsbZPwEZ4/Jj3z55N5wcW5GFdT5r0JqmUjgIlL6zykE8IFH1ASXi13TN7DUUvjYTyUIP/yXRvuOTqenuZxdsrKlPigPXEq/P2UARJoQG0tAvdt8LpWfEi2xaPsYssHu11PpHIb9RBapTQWPSdK7jTrk3P2XueNliYhC7aAmxRzaIsRKzZ3ufmoJEsctaCtFFGl9X9MVdDHwUowdlOrFnYovGHldsAeB/JQBgiE6P1eEyGquULggsEkFQRAYToGTVtcfcW5KxRINFXhjOPwJuW2W 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ISinpJFIHls62w/k5WQ1Ro0ou/KIp9p+fz7VF6l6M7b6SPrGks5LiKl4Lmb9?= =?us-ascii?Q?cMLv0j6qW9brVVe5rfux+7+mRvxiI7kBZ4E8mCYLS9gjLtsX4RtzTO1UR/Aq?= =?us-ascii?Q?T++/+vV7KqwqVtvQzM3Em9rSc+rL4hEy3mT6JP6KiSc7BZVCspL8Ez1ee55K?= =?us-ascii?Q?or3q5ZTaIlFxjDMZPFwcuX8OuttzCAvhx+JuKuj0gXN7et40rP6MDD0PDM/2?= =?us-ascii?Q?pkFoxZxCDNNpAHY3pEA9dw8kiCvqEGbVmm7CrIRtS79Vm7LpROo9vrUeOXav?= =?us-ascii?Q?lESvkasvVIR/dIZeCf3l8FwOT8wy649orhjDezUUsu3xigHWv7VqNdgUVpZb?= =?us-ascii?Q?WIIf9Ab1CjqDL2+8r6o39bV5yC6H6P2okhamgHzi4gStG1jtdP7GdwMs7SV9?= =?us-ascii?Q?hpV+rdZdQVhe7Jy5bEdaV2llqrNLA2FlZBb0zpzsBqPlStuoPRlLWkP9iu6S?= =?us-ascii?Q?t18PKujLLvkkMGTXpla6Jk27dz0Wb7MI4dJiRUDA1S0mdEGeusml7oBr7LdM?= =?us-ascii?Q?Lrl8OmTAWR9DlTvFOheCQ/MGHmnZoRr8/wJlvcGuFB6SBEfaN9YPXuq1uhPl?= =?us-ascii?Q?ISFdmVsdV3hdYWBF3fyTZehuP5Oe+rmQLNmLkXFQttt8bXP4S+KvqE6YKCPL?= =?us-ascii?Q?RuJRL/PW3b4fmWPSZxCPEIahs2qDLD5/tZtbOlatOgwFOYQp7iTnHXTqmXHR?= =?us-ascii?Q?jJ7Lv2V5xyXp3+btfmNk1kyUrC+YCj/auLGzNI99+yMnOWmINDog8v1fzmyh?= =?us-ascii?Q?S/GprGoB0tlGi9yxXTGrqEsvwpjPcYuSLXumlnquOL1GZDLfoTp8dTQOthv3?= =?us-ascii?Q?eJy7XrCoWF9GbNNT7SG1k/AtmvX+PODyU5t93lKXdBMU9T9JacBhssO0whT8?= =?us-ascii?Q?9CyyXlSbgrP9D8GGHu4AeNgpu4peKkyfh/j/ShRRM3DBw3wKQNMC/75Qytl4?= =?us-ascii?Q?bpAllTqDfFnOlidqrwOgNZrGbTuQmtDYQDK2EkkkcZAmb+DiQHUAPvSEbIE5?= =?us-ascii?Q?bcMsDNWu/Iw5ycl2gTzmBJ4Rc166oRXS+o1E8quoU/pVI9SJrGGrUuwPHYA8?= =?us-ascii?Q?6pheIt4lh5Q/Nn2tXPAYk4NKlXwejksH6vEhHdUGahrl53TBSQRWOSBVNDyf?= =?us-ascii?Q?R15lGnSxZw57Jtyb34klWbhBYOuBhSU/9ymLHqvpppWmGZu6HJV2bIDsLvBe?= =?us-ascii?Q?p2BZstDlRzLf5/ubiq3Df1Cd3pKcx8hjyvFgjWt4U5609D/Gw2JLV3K7AOH3?= =?us-ascii?Q?kImcg8CObRoTus+Vtc9PtuAUfYSuObyNYdogTkFteXhT3zL+WgdiGQCRh3pr?= =?us-ascii?Q?Npdmxp0eEEzIeIPiSbcvnWqAcTNJ4ZzNTuQG6Z8kHLgZtXWCSTe8vf9fJTEp?= =?us-ascii?Q?u9cujyQAYTQ86+ZZTThvNDDNhFSxYncxC0JsdOtqCAftDsXnWOxjgDlv9cCm?= =?us-ascii?Q?vB5di4LCs47T459G2Iu+a/u3HME9SRqtIkSzNgF2bc9v/bGL0y6iH5jQn0tG?= =?us-ascii?Q?ww3VFbdS4KlAWL0dht7juc8KwJRDj2aETJyeduNpHkmv3Ms2tjn/vuusT8o6?= =?us-ascii?Q?BL1sajlcsSgaqf0EmwqADhquOP2+4EjgwwYMFFhd?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e1874b0-23e7-472f-6907-08dbdf69b0a9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:15:23.3447 (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: 9upcIIp1g8AewiR4dtRMZqTAUEz1fBqd7QclrWZ1yFr0ZibPWnsITPnAgbMS/AK9c4KcGeszz99pA/gbdhgHkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" This patch uses mptcp_pm_parse_entry() instead of mptcp_pm_parse_addr() to get the flags of the entry. Add MPTCP_PM_ADDR_FLAG_SUBFLOW flag check in mptcp_pm_nl_subflow_create_doit(). Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index bd491b78171c..75ab4d7b9f3d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -349,12 +349,19 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *s= kb, struct genl_info *info) goto create_err; } =20 - err =3D mptcp_pm_parse_addr(laddr, info, &addr_l); + err =3D mptcp_pm_parse_entry(laddr, info, true, &local); if (err < 0) { NL_SET_ERR_MSG_ATTR(info->extack, laddr, "error parsing local addr"); goto create_err; } =20 + if (!(local.flags & MPTCP_PM_ADDR_FLAG_SUBFLOW)) { + GENL_SET_ERR_MSG(info, "invalid addr flags"); + err =3D -EINVAL; + goto create_err; + } + addr_l =3D local.addr; + 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"); @@ -367,7 +374,6 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb= , struct genl_info *info) goto create_err; } =20 - local.addr =3D addr_l; err =3D mptcp_userspace_pm_append_new_local_addr(msk, &local); if (err < 0) { GENL_SET_ERR_MSG(info, "did not match address and id"); --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2063.outbound.protection.outlook.com [40.107.20.63]) (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 0E5A02595 for ; Tue, 7 Nov 2023 08:15:31 +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="XHr33rIZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OOevyBsv99tbZFDm43lDYhvN2f934qva+CdXGOYFhIVPOpMYO5VtYDhC1n1hz3XtM3lsLi/mD680ryAyZ3H33z8+zAfl+slwHBERJ8K6all3S+w3EzUvBuoP6RptMr5JTlAnGae281xtaUfx8txPNnBptejejDWwjUSHf3knrrgzhO0NPeYDDGog3OY3kYiqH758SPlZaxV5GMBH6svn5XBh1pxXRakbQ9PcD4+R581qsAulw7vmJYk/jp7T5UIDrHCD2TXLtvN2aZg/TvE7zgSeyLn2wlrqMmck8GGA5mIgqzH/5wVd315xNON+61Ji2lryyp7fY2k+dSNOfPdGcQ== 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=n5O43D9ijb9BIKPHzYDtIYZdhGtMjEN+dhlKgpEMYVs=; b=HzDy81xfSsifBr1WIN6NDS54V9kTxRmDH0keM6L1SSWyW0c2btUS4Khfd28+Qzg79sXNXDAau5WwflmAZ83rd3FGLAkzHKqGBC2KL7rJtEBNMSFOZi2M31xkAxfQBU0buciXhUrPon/kxxZ9FRK+3pPtZ4rb8FE9n9/1fAaqKTI2xFE78hnn95pmAWulYpM0jMtJAWzlkGuTwX7TnUOtSjAZsM6s8blpVlhB39CHYWg3V/CDvyrONm4vnDHREpfJh8koyk5fqU+x+YWdNuCeXGY3DkEatsRolZe1xiPnhUNj2jJlwKswADvnA3KBOZ7Bw3CvWB+YVx7hm4EvSqbikw== 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=n5O43D9ijb9BIKPHzYDtIYZdhGtMjEN+dhlKgpEMYVs=; b=XHr33rIZ5kaMC2F5ek699KBoZEPNCN9HNrRWWRxPFOMpz5WhZMAtGTNdqxBeGYwjENRHZ2xyaVgD132BCLrIEaylcObwEpIhIU+wbKHj9HZfjLBStdmqOWEIvd037nb7jAtxuBPWaKuC0oSIM3Qq9MI9wSTyrpVeo7aEtBUydOOIuc5AFxpRiKCwG/u/R+6bdHpCI7GHV6JsvZptvAFWSIizEB8xMFLksUmugQKYcbVeh2tm5oE1cQzyi7F29lZZ09BF43pmiymSMIhwUPwTYDt24K6eNb2mKAP1/HMDQRYwJ+XN4ymqPwdQi0Y0zeujz2i1PDihNN9ZtRUFcrhJcQ== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:15:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:15:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 10/20] selftests: mptcp: add userspace pm subflow flag Date: Tue, 7 Nov 2023 16:14:16 +0800 Message-Id: <931d208d6ce5dbcb9cc0a834cf5e7b641be8f0e9.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0032.apcprd02.prod.outlook.com (2603:1096:4:1f6::12) 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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: aaf71a35-5fec-494e-8994-08dbdf69b459 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k6V9sjmSYTxbcthDywWklysmrGIiecEi3dOjCxOWal7c6d5na3VIpP2glClRFqGmgDJcR/yQwasnzZoZeVzchps+jdT1MEA9rmkF6yOyanNY1bawByPQmPlBri8SKP2xrdFiB8KR0rQvIwapfzl/EyZnv0/TOboE7mECm1Xe7B/+6o/RfNOHHR45FwEEuveL0VpnL5KLwxZfh9VenzxNnC5gkQfQuV9Dr89gMn0gxxzNIpUIvsZihu5hA+JlS3ebas8cp7ZQy6rDHT4dP7JZUbRX1SJNnSTR/dB7Hl8qFcOJLxDERsYhWBtq6VcFU3/aYp3wMsGRQv+7+5XihR54HbtdjlI6BMu3+H9tvwE0uVfa0wkTTDTEinyakn9uQn9ornJfwqQh+4vxfDA7Yd2Rmox6aWoRTScnw/7pF3yVzlhOjVjD+cyW1/KODf0CLHzGpeRi0yQOkoxhDJDB6rPDUy55TzMntOI9HWTJSr/lCBmHuq79ZDD2AMk6IHdjsyPE/r41F6p0csUcGazgpj/Hecff8/yjI0qWFtPKj28ULYLXLNKtpZLOM1BUvJqdTdVX 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?O4mMbCmQ8L7kyhxBfm1lA+uLAns/gnkBy/XnQjSDfZc/Wgp70DsXYHm6PMSe?= =?us-ascii?Q?AkYRhdjWtC1gzaFb62k514/oQt1KezuuIao2ZVxvb1qUpk8q56e/eqd/iLPQ?= =?us-ascii?Q?v7jPz6ELlFuSBVNihy//zAodGsxPE8jgoXycIUAN+JvPt7VjyvH3rnmA8zsq?= =?us-ascii?Q?jqJGHfzkhnqhSOy03KhjosjfzrjD3vKPrZE+NcSWet3DP7K9deXSvD+W9zON?= =?us-ascii?Q?YEhanOWxgJGaEWq+yMKGFNpxj0LBNuk8RulEzv6p3zqQDODCPFmoy+t6brRr?= =?us-ascii?Q?jkjlqrirTkFqlz9EIt7JQym4q9NRrwYtSQLlBXeuLPGxuOI+8cnwO8DyiCI1?= =?us-ascii?Q?+FQu4Gnr+xGgoKBlc63YRZYsSaUGjg19RGIXemS8GNRrBo+UX60VMH8zofSs?= =?us-ascii?Q?f3x1TKYAJGjzn3IsdNWVAJ3y0/4HGArWUjNW1H/l7L0Hk931xtseQ/aHTff6?= =?us-ascii?Q?bKk9awG7cEjg4I8nIzjJyaP8lxQ4yoHCV5guv1LKXpr4Blro6qXr9X8Lugr4?= =?us-ascii?Q?WYUzyfbnCh8xtyoEbeRSMmVXUee2AC5CjLca8xLY93EQCVrTJzI+xHZb/ZCK?= =?us-ascii?Q?z83lE6OdnDt7q+V9VejBvqP6iK+2rTcA3lL9kAWFfMggaLZjsK17Ss8H0rSt?= =?us-ascii?Q?DPqgEn+JR9IxaHkhAXbdvj1NKT4RMi80vn7XzbKN40cCKoTZieUVQaNm8lYy?= =?us-ascii?Q?D0AJxKeXYrLa4Lf7lDCmn6oXjq4zhK/bG5P25Aqmj68aRUpGKgws/El097Qs?= =?us-ascii?Q?0Wdjeq2yKxRIXp5yC4N3Bt3oTTXHdt7BRUVkZXmFo32koMW/2ru7ZTQLzFU5?= =?us-ascii?Q?YHzjWqEb0U2X+Sx5yRx8JNwwnYYsg5EA8D6hSjD25c5Mc/5KvwIcrV4FiKHB?= =?us-ascii?Q?1qNk1d/X0SMLMbF00ryM3Zu+0O3VUr6TXyVG9ASK078jeC00Q44lR5KdmTwX?= =?us-ascii?Q?isVuGPel3mk1HIV8x6Vu73t9x+8muHvVZDi0lbIgTNQHk8GaRItNgmu91Suy?= =?us-ascii?Q?fWAYT7OYPOzgqhhhY4NixXyDVSjLn0El+TMxrntPLfoxAzRJ2eb+txXKtqDJ?= =?us-ascii?Q?WWb3mVQk66RAB0t/rQc3N+YVmFzVuDmQWdW0myLGwFaI9rU6dDkoyca2qzZF?= =?us-ascii?Q?POiO6dYHbI8GIcuYGROPFyFkPU+yUH+CzQWQI31ESJDDnu5f00H0jM5ASnBR?= =?us-ascii?Q?BM2rB7SR8H3lXUnAUwX+QY+6cfFxEkD5YGwvYEnbOIbnCqm03ttanrMflLuX?= =?us-ascii?Q?knpH7j6fUtr1l/k91o1n7313DM9mp4GA46MPERVbXmW6JQjlgHdiMRJT35b4?= =?us-ascii?Q?qT/Kg/lBO7ISXAOroXfWdKTeOTawk5tCqOGDhR/cHii1rgHAe5Jfjk5C+T9y?= =?us-ascii?Q?+arsh1yHQ6hocv+WHQrUBzVEdvT1KDkB3KGScGe03Fy54shaVMYNVVZoR4qb?= =?us-ascii?Q?B/pEejudIUpGHyNMWpr5wlaVD7USdebqa8+suNLH3bvspzLnTOvUJwMDdhh9?= =?us-ascii?Q?d2tECMicDLOeIsTuL5/2Fw3JlZ6lEVb/iSISJyC4HTZHwU+GQB0ybZ6bBXOQ?= =?us-ascii?Q?TYxGOmAhA0HvEl1brZaZT60XyOCG+023EaKA7AWz?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: aaf71a35-5fec-494e-8994-08dbdf69b459 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:15:29.7152 (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: 0p7xWfB00/H7UBxj1Ug/jEEjcivuN371kJmvnWBW/xALthNNff06iQGjuLTL4iB8/rbdIuZusXliPDJnlcg5lw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" This patch adds the address flag MPTCP_PM_ADDR_FLAG_SUBFLOW in csf() when subflow is created by a userspace PM. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 49369c4a5f26..e97856323ec3 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -453,6 +453,7 @@ int csf(int fd, int pm_family, int argc, char *argv[]) char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + NLMSG_ALIGN(sizeof(struct genlmsghdr)) + 1024]; + u_int32_t flags =3D MPTCP_PM_ADDR_FLAG_SUBFLOW; const char *params[5]; struct nlmsghdr *nh; struct rtattr *addr; @@ -558,6 +559,13 @@ int csf(int fd, int pm_family, int argc, char *argv[]) off +=3D NLMSG_ALIGN(rta->rta_len); } =20 + /* addr flags */ + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_FLAGS; + rta->rta_len =3D RTA_LENGTH(4); + memcpy(RTA_DATA(rta), &flags, 4); + off +=3D NLMSG_ALIGN(rta->rta_len); + addr->rta_len =3D off - addr_start; } =20 --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2066.outbound.protection.outlook.com [40.107.20.66]) (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 575182595 for ; Tue, 7 Nov 2023 08:15: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="EfDIz/HE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dSyxyjnRxHul90/Nd81D/NJw1FCXgj/BWVU1F05B5ycKZ0vddopSRpfXkvjqvdYdYt4DA8AgX6LKZkhokFkyKGYs84qvF4jWaQheqBW0oZGJg3JUyXLhQhOuesHsN17heWj+egGmdNiz3rNrUSfSoQiya6xbCUgNNfF/Pi7H+6e2i0fm5yASI8L07vSrDB2w/1GHXjG/bCbt7LEaMvQ5WbW31r4C/VypK8itQjSgo/2PTW217+9ZBpSjKBPRlrMzNMYFrIhpIzhu9m2U+tnMu0Az1k3BzBm9Q1vFi/kZNWQE9IV76brqpbZNrqLDT+JjR0Bybatr5O6q0hdgTs/xqg== 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=Ht25oHskR9wkwtkU0ogjZnvAMlFJESvR/VyZMSTaQCI=; b=hfd5nhqO2KeGcJnHNpQQ5saYRZnSMwprw74Lfnfv4J8FV7vcY3eQVv26l7YXwq+fAtY4YYZSM3KtAhvYS2w3UjZOVq/salFgOXTC2NpkmvokJoAsI2efcO4Dkt4h+i1dlDIRO+5dWD0dkB7YAT1bwDKmRsBhIzK6sINXOOfp06xqy5hYarYCA+Q6piTHWPNkfDnm1FV1wgeKvb/8c+WvLdcGCu6uaOIUTzM2keZhzO2ytiihRcMGlU24K4TdTIUBkA0wkUPUMUe6VowFE2jBRn96gAMDWJaVLKAxxb0KQAmbjtg/+crMCCUtKeUsSl+4MYlRMIeY62jykEZfK5z6Bw== 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=Ht25oHskR9wkwtkU0ogjZnvAMlFJESvR/VyZMSTaQCI=; b=EfDIz/HESKmhzPBr4bwhuHabARev0xDDTgb6L87MAa5hIvM+z3erKNjABBPXaNAOLy+TKuaTQFHS9ce07EPTgwMLlAiPuxhoNhJerlqGvAgs5s42/RxHgZMvcjt9Z2EdwSR4ErD4wSEQ4NpNQJhuUKyGTv0rMaFI7f9DIq8yFvnNgyYadwbKXDfTDxMTYlh1y3LOl9hnClUozR2o9yDVfqKyE2IhMXP5U3px7u/3wvnGr7oDFl40ji1GAktsQBoFcdfSodRcTdy5lYujsNo/MbVeEZiqQjagl+5BYqEh04yqwu5S8kiWgvh5LkCe3Ff0pcmfHtw0oyYZzNe5iO2PlQ== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:15:35 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:15:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 11/20] selftests: mptcp: add mptcp_lib_evts_* helpers Date: Tue, 7 Nov 2023 16:14:17 +0800 Message-Id: <0a4a775eacedfa0b489f0d7c40acfacf5c3461b2.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ca83590-e599-4d69-47f5-08dbdf69b807 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Akp2r+huOTvfFZ20pQVAshN+NZRXvHvCAWpnO5/R6q3khI3w7VTw5sKDN/gKJyw0kq43Dd1UETwZCPMFb2OgY9XyKa0vTfcEQzE1TNA0wc6C2uEjHpTK7keQ0QcGNrNSF0IR1O4hYoFnPK0KoSDiufgM7VlmViYnn2gLxnofedDY3jSlyFHjnAes7allCquOpXcfr09EgixAmnkeNreXmu4gldxUOAKV4zKwd1qvmTPB26gbLnaMd3T4pKiVvdQKgLVSnujKA+vd1/+vfg1XwtWkMPu3l6kP97VsYA/+3Dr2j0mKJ8Ibx2+2kbwNMXtZNZ7zkdqCYaqnOLuHhQ/h6EvuXSItYxydHtfj93WHYVJJskfJnaVwF/sW1rf21CmDqXeGxedjjwzF/G6HYlYXQ5EorrpLIhKfKmx4kHGEwnmC24rUyc7yEfJKTq4scMtUcuP7FeE+IUWh+esMSr/dscwXDSnsX5mcJ/jCfIra82S89VLbd1CsGKlkirug5xg9T/TDZoNYsc9rWszqVR+Zgvd9/5zMFAav3GtCkZMvS9lYWxc+pIk+sGF9gVB7bblU 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8xORua1scpE1B9/GfNzhE7aGOJFdNd7V7h0wr418fz0iIdre9cj/kc87mdNR?= =?us-ascii?Q?OuH9ZOwAEkehV1Tuz03xtQss5YyGDzpFNFFzErBLSII0P7c30rce7nzQoc4e?= =?us-ascii?Q?zhHY2R2xyQ61vK7mt3QpVYN61q5jR63S6kKkdvoHgKGIt1t+gxSwd32B2pgz?= =?us-ascii?Q?iOSsjARkxrbnfuNHZBbiBPSRAQJ9S/X5vnubSJrC5BvvnxwhbPnyq5+bQPD0?= =?us-ascii?Q?r/3PydPZno3yXWwbT4UFGS3BG9upvVd8sU8a33bP7Eqqr2MHG8uROcokao4i?= =?us-ascii?Q?t2bujPc11Mqm4dFkOBPrsSVUY6LyGdr59uQAauHFCAKTDjQICuoXuGO+aFXy?= =?us-ascii?Q?1NqZARvnyEJz/8DmUbzrX/hbzVXqMg3kwWGOj9FG9dOd9ZnX00Q3JQ/rYhHG?= =?us-ascii?Q?bu0bC/DkK2IEXSfG0B+7b3ztzsoRZHmY39nQ7dgVGeVM9XM2ScAZpehVgWd/?= =?us-ascii?Q?A/SX/LwTE6iGPA06xuwn6yCT0Yr1tiyrxUEdnmGM6R9bsep6nuw8qzg1/tGD?= =?us-ascii?Q?+wyQawLcUhPJGwNco4t8Ct6L09YKQ/JjgvAO74kqGa83r23GwQQFW6CFctTe?= =?us-ascii?Q?5hjxv0XvmFYdNErz4FfvubSCkn+SVO8h5oKBGwFwSBaoLrGqyrP1WN3D3hDA?= =?us-ascii?Q?XDxmxdfTxoFJks57/XcGqaQ2/r+SgJBS95abOyewdwQLYdqr9Dxw0CZJd9b4?= =?us-ascii?Q?h2odn4D7bXUODTfY9emo1/dezKgFYrQ9281R3sB62ABucL+Fuy04h6AmJi92?= =?us-ascii?Q?d9aOl0TvBpN18L2NVCd4CH+Uq3UxsC9OGabSRT2hihD9NWTReI26MSxyH1tr?= =?us-ascii?Q?38CDuFqUwlG1cxfiqZ8Y/xpDSyS2bkURHcCvjeIA9HZOzTtjIwkn19eUXpe4?= =?us-ascii?Q?5fJTc5zr4qor69s/CXY0nOUwA/97xsuGyFcFvVlzzoNyTo1ds1JQJThmX8l9?= =?us-ascii?Q?VY80KeuzMiTT34BCQCGtTTkljcRCrH6oXVEi7Xy3DVsxgJt6KjwiCUvM98VF?= =?us-ascii?Q?2lUiV56Gy9/UW029ROZpg8ecr4pOULvvFmoDDGNpzlPIxv4yDqD8V5UEMlaW?= =?us-ascii?Q?6cR2I5du4cwlPjLLsNeyJJNjUKsUiJHbV+zJIDdDgKxYBd5nI+PbVpJPlS9x?= =?us-ascii?Q?BtLEVQu61ChGB1pq+6k0isrCihfTHlpflQwqadskU+nJb5/+X3LhOts1/jez?= =?us-ascii?Q?YvuO/n/6v6EcRNm7qK+OCmlfqMv0di7U7OiQuaUE//4lPf2eG2eoPczfGLcj?= =?us-ascii?Q?b/v5Nu9LaDt/hZ+yt2rLRdAR/I3EqOWOyjBetjnppglTfd1DSvPt6wP725rp?= =?us-ascii?Q?egSdnF7WFu3Mn2zLhJqafRcAIHoddxFMfY7sD+KONY8ZgPn6D6zf+yBMRGmM?= =?us-ascii?Q?ExCkA7qZGNqRGQ9fi3wmAZNLGmyk7DbZxIynyctqBjR3xJ4/mdhhWayPtfBt?= =?us-ascii?Q?qN+9n5EJB+e/jyBj70w7nytNFGwWX/cg+HwLw56B9vVaGqtdvvdnHNaXKq74?= =?us-ascii?Q?EvARKEDXxKOawfFVzuELq9UbjGRHXvhK4yQIYFopYAzN0IUoWWU+MqD6nyqo?= =?us-ascii?Q?mZwavmujutsQSOngqp3dGlMVFHhIwMU1CRWoC3tH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ca83590-e599-4d69-47f5-08dbdf69b807 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:15:35.8050 (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: al6sxLQpzaDN6BShW4YMIIh/xbeU9FzmB+Lk9axHhywb0JXEJgJyr+cNQQuARZl7RsVgxj9kb5hbfAw84jWdqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" To avoid duplicated code in different MPTCP selftests, we can add and use helpers defined in mptcp_lib.sh. This patch unifies "pm_nl_ctl events" related code in userspace_pm.sh and mptcp_join.sh into four helpers: mptcp_lib_evts_init, _start, _kill and _remove. Define them in mptcp_lib.sh and use these new helpers in both scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 54 ++++++---------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 63 +++++++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 31 ++------- 3 files changed, 88 insertions(+), 60 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 995280882428..ac7cee3f4dac 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -35,10 +35,6 @@ ip_mptcp=3D0 check_invert=3D0 validate_checksum=3D0 init=3D0 -evts_ns1=3D"" -evts_ns2=3D"" -evts_ns1_pid=3D0 -evts_ns2_pid=3D0 last_test_failed=3D0 last_test_skipped=3D0 last_test_ignored=3D1 @@ -182,8 +178,7 @@ init() { cin=3D$(mktemp) cinsent=3D$(mktemp) cout=3D$(mktemp) - evts_ns1=3D$(mktemp) - evts_ns2=3D$(mktemp) + mptcp_lib_evts_init =20 trap cleanup EXIT =20 @@ -196,7 +191,7 @@ cleanup() rm -f "$cin" "$cout" "$sinfail" rm -f "$sin" "$sout" "$cinsent" "$cinfail" rm -f "$tmpfile" - rm -rf $evts_ns1 $evts_ns2 + mptcp_lib_evts_remove cleanup_partial } =20 @@ -460,12 +455,7 @@ reset_with_events() { reset "${1}" || return 1 =20 - :> "$evts_ns1" - :> "$evts_ns2" - ip netns exec $ns1 ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & - evts_ns1_pid=3D$! - ip netns exec $ns2 ./pm_nl_ctl events >> "$evts_ns2" 2>&1 & - evts_ns2_pid=3D$! + mptcp_lib_evts_start "${ns1}" "${ns2}" } =20 reset_with_tcp_filter() @@ -635,12 +625,6 @@ wait_mpj() done } =20 -kill_events_pids() -{ - mptcp_lib_kill_wait $evts_ns1_pid - mptcp_lib_kill_wait $evts_ns2_pid -} - kill_tests_wait() { #shellcheck disable=3DSC2046 @@ -2882,9 +2866,9 @@ add_addr_ports_tests() chk_add_nr 1 1 1 chk_rm_nr 1 1 invert =20 - verify_listener_events $evts_ns1 $LISTENER_CREATED $AF_INET 10.0.2.1 101= 00 - verify_listener_events $evts_ns1 $LISTENER_CLOSED $AF_INET 10.0.2.1 10100 - kill_events_pids + verify_listener_events $server_evts $LISTENER_CREATED $AF_INET 10.0.2.1 = 10100 + verify_listener_events $server_evts $LISTENER_CLOSED $AF_INET 10.0.2.1 1= 0100 + mptcp_lib_evts_kill fi =20 # subflow and signal with port, remove @@ -3257,10 +3241,10 @@ fail_tests() # $1: ns ; $2: addr ; $3: id userspace_pm_add_addr() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local tk =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts tk=3D$(mptcp_lib_evts_get_info token "$evts") =20 ip netns exec $1 ./pm_nl_ctl ann $2 token $tk id $3 @@ -3270,11 +3254,11 @@ userspace_pm_add_addr() # $1: ns ; $2: id userspace_pm_rm_addr() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local tk local cnt =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts tk=3D$(mptcp_lib_evts_get_info token "$evts") =20 cnt=3D$(rm_addr_count ${1}) @@ -3285,10 +3269,10 @@ userspace_pm_rm_addr() # $1: ns ; $2: addr ; $3: id userspace_pm_add_sf() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local tk da dp =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts tk=3D$(mptcp_lib_evts_get_info token "$evts") da=3D$(mptcp_lib_evts_get_info daddr4 "$evts") dp=3D$(mptcp_lib_evts_get_info dport "$evts") @@ -3301,13 +3285,13 @@ userspace_pm_add_sf() # $1: ns ; $2: addr $3: event type userspace_pm_rm_sf() { - local evts=3D$evts_ns1 + local evts=3D$server_evts local t=3D${3:-1} local ip=3D4 local tk da dp sp local cnt =20 - [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + [ "$1" =3D=3D "$ns2" ] && evts=3D$client_evts if mptcp_lib_is_v6 $2; then ip=3D6; fi tk=3D$(mptcp_lib_evts_get_info token "$evts") da=3D$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t) @@ -3415,7 +3399,7 @@ userspace_tests() chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3437,7 +3421,7 @@ userspace_tests() chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3456,7 +3440,7 @@ userspace_tests() chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3480,7 +3464,7 @@ userspace_tests() chk_rst_nr 0 0 invert chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi =20 @@ -3506,7 +3490,7 @@ userspace_tests() chk_rst_nr 0 0 invert chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 - kill_events_pids + mptcp_lib_evts_kill wait $tests_pid fi } diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 1f8be9dd0e20..980ef3dbb6ab 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -299,3 +299,66 @@ mptcp_lib_wait_local_port_listen() { sleep 0.1 done } + +server_evts=3D"" +client_evts=3D"" +server_evts_pid=3D0 +client_evts_pid=3D0 + +# server_evts(_pid) and client_evts(_pid) are needed +# by mptcp_lib_evts_init, _start, _kill and _remove. +mptcp_lib_evts_init() { + : "${server_evts?}" + : "${client_evts?}" + + if [ -z "${server_evts}" ]; then + server_evts=3D$(mktemp) + fi + if [ -z "${client_evts}" ]; then + client_evts=3D$(mktemp) + fi +} + +# $1 ns1, $2 ns2 +mptcp_lib_evts_start() { + : "${server_evts:?}" + : "${client_evts:?}" + : "${server_evts_pid:?}" + : "${client_evts_pid:?}" + + local ns_1=3D"${1}" + local ns_2=3D"${2}" + + :>"$server_evts" + :>"$client_evts" + + if [ "${server_evts_pid}" -ne 0 ]; then + mptcp_lib_kill_wait "${server_evts_pid}" + fi + ip netns exec "${ns_1}" ./pm_nl_ctl events >> "${server_evts}" 2>&1 & + server_evts_pid=3D$! + + if [ "${client_evts_pid}" -ne 0 ]; then + mptcp_lib_kill_wait "${client_evts_pid}" + fi + ip netns exec "${ns_2}" ./pm_nl_ctl events >> "${client_evts}" 2>&1 & + client_evts_pid=3D$! +} + +mptcp_lib_evts_kill() { + : "${server_evts_pid:?}" + : "${client_evts_pid:?}" + + mptcp_lib_kill_wait "${server_evts_pid}" + mptcp_lib_kill_wait "${client_evts_pid}" + + server_evts_pid=3D0 + client_evts_pid=3D0 +} + +mptcp_lib_evts_remove() { + : "${server_evts:?}" + : "${client_evts:?}" + + rm -rf "${server_evts}" "${client_evts}" +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 8d95ea94c019..34344c481046 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -34,10 +34,6 @@ AF_INET=3D2 AF_INET6=3D10 =20 file=3D"" -server_evts=3D"" -client_evts=3D"" -server_evts_pid=3D0 -client_evts_pid=3D0 client4_pid=3D0 server4_pid=3D0 client6_pid=3D0 @@ -116,18 +112,19 @@ cleanup() =20 # Terminate the MPTCP connection and related processes local pid - for pid in $client4_pid $server4_pid $client6_pid $server6_pid\ - $server_evts_pid $client_evts_pid + for pid in $client4_pid $server4_pid $client6_pid $server6_pid do mptcp_lib_kill_wait $pid done + mptcp_lib_evts_kill =20 local netns for netns in "$ns1" "$ns2" ;do ip netns del "$netns" done =20 - rm -rf $file $client_evts $server_evts + rm -rf $file + mptcp_lib_evts_remove =20 _printf "Done\n" } @@ -186,24 +183,8 @@ make_connection() =20 # Capture netlink events over the two network namespaces running # the MPTCP client and server - if [ -z "$client_evts" ]; then - client_evts=3D$(mktemp) - fi - :>"$client_evts" - if [ $client_evts_pid -ne 0 ]; then - mptcp_lib_kill_wait $client_evts_pid - fi - ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 & - client_evts_pid=3D$! - if [ -z "$server_evts" ]; then - server_evts=3D$(mktemp) - fi - :>"$server_evts" - if [ $server_evts_pid -ne 0 ]; then - mptcp_lib_kill_wait $server_evts_pid - fi - ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 & - server_evts_pid=3D$! + mptcp_lib_evts_init + mptcp_lib_evts_start "${ns1}" "${ns2}" sleep 0.5 =20 # Run the server --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2058.outbound.protection.outlook.com [40.107.20.58]) (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 99FD02595 for ; Tue, 7 Nov 2023 08:15:48 +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="quH3M9d8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gaNpoXcwAG3YBvcbbnTSz9qhCm+owb0RDcHG4rGRyvGQUTBkC0LL/eokOZ3PYWr6Wr/QEtH8lDQgFuQTKC+C09f+37kYFqjeDaEDKGJQj3Qn6hPuVB8RG5cVtm/eOu66nhQxDx7viuEg9GVX4e2bejLDYUGYerdmj6HbMHEYDKCn7YTWgGVrigU31aNM0BLCpEhS0WF9DLuW8sPRgLUCK2K/4cEnSNl3DwC724KOb9Hb+33ujvyFcXTmhZCc8OqwL5DaSXuC3HIMt09pn1Evjg0D5D1dWOssUzBFhBnLZWCbH3AHCw24IUcvxzf/MyGDK9HR4bqd+1mrBkikv/XchQ== 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=W+/ZuAXfHSyv1DrgoNaqFzwvPPcuB347ktDYa5YTh64=; b=aANE6u6dzP6bmY80cXYlvBR2aoFqkGG5Dgv4cR65gkb2GuSwSrayaBSdQG4bU/oRAxNYUkFhjXKG4xdZRbgat94+zbNHxKPKZLqMHs8x/nf4MiK/wptghHnaI9Lnx465WkISS2zBhhft9cIugPUExuGGCKoDdlNgvdiALTE5LzzGr+GFEMSxFSEr9+GMXPLTr+3iQ7DyJgUJYvCxlsS+yuH0MpFzaKVlV3pvOEmcvlMBh+vOMFacGOBTWq0mMFB8z1GMmrqH5kHSXAI9E9R0AHp45l8yRasG2GqVOYVe6cALfEUB2wJSisCCPZ/plhrtwdFSYcpyWrU/0YhhUv250Q== 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=W+/ZuAXfHSyv1DrgoNaqFzwvPPcuB347ktDYa5YTh64=; b=quH3M9d8jdCmGFg7HlpRWrNF7Cssr1rSiWvGQ4Xw9HJldpsFVsYkkC/RBkalR/P4SYptKJ3fQ549JfstjhRx+pOOBUZZB6oaDXp8AenMicqrnILiuOcYk5JECpHqKbI0uOUN6gR8zV0DeO2QrkXhWyNO+8DlqKx78RV78tD+hoJlyZCGTEchiJeNayBNrLL0Ar0vuUwWxrToBhpLL7qgAGGcKpPOVlrU8YlI7ie4pNevoQZ9CYkC+86xfRgBdOmp+/ta8hcQQOfX2b5WAEemu7TuxAPbAFNU2XCYHmJrH4ko/2bayspdmapK6Duk4ioMY4QUeGzB3faGAS+LFWLvyg== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:15:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:15:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 12/20] selftests: mptcp: flush and dump userspace addrs list Date: Tue, 7 Nov 2023 16:14:18 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0045.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 5136357e-36c4-4c47-f91b-08dbdf69be52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: toP7kpzAKvhxDsq1/hTEoJJF11Sy4FywgAVGvBT3Qq4dnVUR5ZhiEzZLuMajWLWVuJftqKHwAXQqUReEEh8rkEIjwQ0F0ozNpsJGAq3qK650jFnagwVcz6XkJlZmbbflvSQkxNSvSkec9+iTCsZhD8SkBpVZPrqCzfptazo6TP1iVw8wfIM8wKrI6kX1jY+TkaH96w0IJh2wJTI2RbG8EzyLvoEw7hgS26yku7QFlkJsM36GMfbIxhWo0hRtbzZFdA/FxfLMeGhzUV0vzv54pgnfoJaOB6UR+I1Yge/kUBLq8lP6l0J9uhQM+q/+N7jOPhKfqYSydsaPNna3mAFUoC026RUrOkFYO01/e2C7+CPosv1hzdeLM1van/nmQ8+aGaBlxPgZgwW5D6psOsmxYnDDKQ1Ad9SgNhqi5Xr9QjAVrKUgJvkub7RRwBMGkXxVoCDJtUk/FEEaswpVGYEMxOV9YI4N9dzomi/ipQfpK+4HD0sw2s8A9pI6wKbXorwcGRy8O07uEuAGMvU6wJl9XmDr3DasaMOQSNKeS+JxKUIt+JWv7g6UqYswS6MmjSp6 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Gz4/mVXbbduMp6Y90iuoFaVg8FFq+FWyCqaaOswtlSE+S0Wmoey9s+UZ4RDz?= =?us-ascii?Q?xOQPZBI+K1d7n7z5Pa4on9Yw7PCYLq7IsfI+0Sv8/gDfHGZYXnQy5kwgQG+b?= =?us-ascii?Q?f1zruKuDcgqBytI8K7Itahhljp+BUpHq1+kkyUj3IwHJyImVv5bRI5oxB8Hw?= =?us-ascii?Q?GwbXLv5S0hfr3oAmwR+hHrB+y9dftXy2i3LnyT+FFO22v7lGzIVkrj1Ru7gg?= =?us-ascii?Q?QWI/u98NuOfeuOlq191Lz2VfeT+q83Zjw9bZU7+nSCbsor0L/AKWi04ryNrA?= =?us-ascii?Q?x579AuZ634zVMzBop6xKWhR1IwHrL5akHCArgt+sn6eLRXkLjQ6Rr7ivWhD0?= =?us-ascii?Q?hThv0YItJm4M5g2R1HEqw+OrtCnLasS1fLYYOHOsXqy6COPVWgmXoe2wqshv?= =?us-ascii?Q?DLAjJzFmMYE2+bWy+jmhKpxHg+Ef0lOLIucVbOp5uQeKJSHUiu6QLRF5ZLOl?= =?us-ascii?Q?X1NyeBiu7xSyC/+TCio43fh+65rX7+pkVavpjE9ll7PXPY/+ujQEQEUiSIwp?= =?us-ascii?Q?0wMEjcGRl45xv/ZI2GS6zSjb/19CaMRq+AJMYlmAau/DpXp9r+s0h6zX+HwC?= =?us-ascii?Q?AjNymX/0WABMZyFk+uFYixPv/cbICeW7mFDpBI7nFIHFHwCqdM7v7iVWdTQj?= =?us-ascii?Q?WbIBYoE6kfNa7iYOh6n5vr6dT7SOqy6UIv9zTSVTXfmpMLhirjdRH3ppOGAB?= =?us-ascii?Q?plfy4H/4pfz6F4JXD0WuvmTZWlhEOixFk5eIKMMAdz+0c3PY2Yua5ciNUoad?= =?us-ascii?Q?vKsv4X7saUjhYvEZ8pOlRTrWp/5nsPkzpj4TPC/NTCvZAs4z4ZxWnbOS58Jx?= =?us-ascii?Q?RRAcXA3CEet3ayGydAWWGJnNy/N9kWvbWngnkeocnvne16hEw3ufem+1fxND?= =?us-ascii?Q?xYeGCl9Nf+R4Xk4n+isRh1Iyv8hjKF6MteURR52HFrROnSDYuyi3cUM+1GMs?= =?us-ascii?Q?df0Fc0Hr6XXFlVCS00anX4Qmt1bCNaWIQEBGClXmT8ZquV6bX08C0dRnt2Um?= =?us-ascii?Q?zQYp/KGtpJx230DG61u5PnDjF+j6acK8NjMM/TN8PR8JVlU1dIubBbQQv6uN?= =?us-ascii?Q?IjVeQ/8lBsRksnGaPKHNTFPrpbQedZWt1OlQSaJJoGoT4r9xgBKp/A++2Fy0?= =?us-ascii?Q?+HadKfeij3blbhQVYc7DjCYhrV32ZBbZ7PIhrOuXGG4UtITDn1k+XpPJ92S0?= =?us-ascii?Q?h9yXstSayxkvwyg3FyGVY6EIfwO9miU2GtCdnnxT0ghRcO6qd1tcmEFCzlid?= =?us-ascii?Q?Dbgn1968fc1uTVU8qGo16ADwTkdbxnutSgTaL6ERMoSLDrP88cOiThmoc0JQ?= =?us-ascii?Q?IhcN6JouMu1GtbDlCt03fKtbOMbOG7TQfhQGUTkPoyqhwmOVjfHBF7flHVdF?= =?us-ascii?Q?MzrDipdY+o8D7oNSvQsDaHgKiE1jlybUYymv7/2hnSpN1U5eQ65+OHxMDhLX?= =?us-ascii?Q?lCJbvaWkUdsgt1ui715fouDTQxbXPZ9a/i2bd0EhjtJsbpWSkxZN6UPC/ASi?= =?us-ascii?Q?0pTiY08DOwEWLGMv5Ae1wYq68WXE8lksF7Wkgtvjj8347aV304lLVox9Iojw?= =?us-ascii?Q?DeEOUlFnbRyR64yOvb67Sgo7YkTHBgXSC81bbO72?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5136357e-36c4-4c47-f91b-08dbdf69be52 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:15:46.4048 (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: YDG/duBmryDqb2rgz+okV23CVhpYRQi84qCalj660sOmBxRaaDJVtcdHhl3iYeIFmJvZTF6nX0c0ZQ9a1xCHBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" This patch tests newly added flush and dump commands for the userspace PM. Add these commands into userspace pm tests. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ac7cee3f4dac..634b51e40435 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3389,6 +3389,7 @@ userspace_tests() local tests_pid=3D$! wait_mpj $ns1 userspace_pm_add_addr $ns1 10.0.2.1 10 + ip netns exec $ns1 ./pm_nl_ctl dump chk_join_nr 1 1 1 chk_add_nr 1 1 chk_mptcp_info subflows 1 subflows 1 @@ -3413,6 +3414,7 @@ userspace_tests() local tests_pid=3D$! wait_mpj $ns2 userspace_pm_add_sf $ns2 10.0.3.2 20 + ip netns exec $ns2 ./pm_nl_ctl dump chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 @@ -3440,6 +3442,9 @@ userspace_tests() chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 + ip netns exec $ns2 ./pm_nl_ctl flush + ip netns exec $ns2 ./pm_nl_ctl dump + chk_rm_nr 0 1 mptcp_lib_evts_kill wait $tests_pid fi --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2055.outbound.protection.outlook.com [40.107.20.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 976BB2595 for ; Tue, 7 Nov 2023 08:15:56 +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="P5TxP4hh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aABigJI96dh5ppYJdhZ4Y+kA5BRD9j53rI656S2ZpqgBRIGptjBItg46ypZ0F/EjpspAr0NizUT39StGo6EKnqqhI9f7pEcgNhMwoJmM1cDTpnGvMMZvmo6IF71I4/4IuIpC0PkEZYJDgLMoKmf+94qk9879xFxOFLsin3t0935ht4FAMErSefLCVeh2ThMw7esg1WHvD6L8CRdpeiJCepLzXF0Ma06Ug1AvDCG6BfNdSBInNSsKT3zsFXACvaxE36IAdxzGG3XI+zJ7PXWVivAmx5ASIaogIOafnAig4xuvGdeX/ifmbdd1UGVn2XWCh26/DJ0LNTAezSVjiC8x9Q== 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=6fL1Gh7xKLxrsLugeoSj6PkpTiuDaochtp5xFXF6b1w=; b=CFPP+1L1jHNG7mwPFOtl0nVMMjPk91/cKVvZvOEBBH0Ztco11b2Abj2okbPsRPsoPRn2iB7XUjxcbSYIKcm1G4MXZMRrfL+aObhsRkU0ORDEUyXWXYP/IDngSb3eSVkEAGCOaqEudBFkJyrzYNuIrYP4Dw3VMUKPJ3S1HE13Tp8mO+MsHkIPRBcF9zyJR/GKlLsNPr9OgPpWWtlm3JYpYiM2qq/UQqLPBxTw37C7QM5rNExDnabfC3DZlr0huW863Sev0Tn3OUdX4+s1amvInK8YcuzxVEDQqj/YeahZQ4zJFxiWDbZ1gimEKGbFeR3ZfdyIRYCEbXmTPHxZwwltUA== 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=6fL1Gh7xKLxrsLugeoSj6PkpTiuDaochtp5xFXF6b1w=; b=P5TxP4hhleCfKnCOfV+2uKrYgIKTbiSEnm/fsnMDDUAPb+Pu0npTpaUQsK5itCi7cjNmXIdrp2D53NrTK9SxfJi7H9yo+PBS7xN9CTmKcV8wnyYSZqMyHhPJKu3TpgjxloP4KQs9P/Q9S11TSFIEDQdpatP7T29KGmlm+DYSQ+wNXGNUcrb+EY8Lx+hLOS8u/4ctzuTOmSylXmwNx/Njee1nFcyxnX4NtPzOy1qojQ0nEWkw+ZwaO8Nmnvu4XCTw/0WKdkuMC1lLAwdFd2fK/gD2Q/SkutjlQMANdbJtC1PgoIDYw2efjN36YV2+b5TGCE8vwwBGtl9E8VXW1UKlVg== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:15:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:15:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 13/20] mptcp: add use_id parameter for addresses_equal Date: Tue, 7 Nov 2023 16:14:19 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0043.apcprd02.prod.outlook.com (2603:1096:4:196::12) 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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 73b0c790-50e0-4eff-b597-08dbdf69c21f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IzXqzS3agX0QpTsgKV6r02k+tHoGPLsLAhkfwiczGZoPfz9ija0OT2QC5r1CSoiG/yTiHfIPMvzsU4Gz1cdg3UzHDliTFyQ89x3/hnfPOdWgFKG/0A7rEU1//hNAShztiWy0V1l5fmlzJqDBWJicI//AXImqlEYHu/6dPsoMbNDWkhqesG3Vxknj2fdlAhsm5FH/SvG4QZvsJBq6wZoq+GvB1gnYS5Xs4Fy2HyomF5JsnU3K0PstXMaCzVUVT4vUITbzSRoUlpq35oOfZ/RgzqqVjZo+2LL1O9KtfrHMLMaLgOqleB0Uercp1fYOdQuxqYD1kja/GJEIjhdMIGaLQdkIpjW/8VUg6WdJjkR6I7vjGGRucWcad4oAW6BVaYHh/65mcFt9j5b4kg62jJF15QyQVPJSZqbc0SdmupicuaEVL4h2pmCtAtoEvX++4WKycsVfy5upmAmI4CPrfRQGQhIaSp5JnovjCsf4pXzTETXV/UngpnFWZSgBvNKxPPg0pQxtCj7GkRc1ZoXwsWZWPueqZ2M9127i43ST6gNWUMjAx25VnSXGP34eelxROX5r 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?N7knVB/VSkSARIvdNJgKlbw1nWvzG0LG4YcJDHteD+5iaUKVhX83udFGxh/2?= =?us-ascii?Q?1wqjfW6GvDjKdm9mBoBVov6mWwb9NzSJLPUv5s6PaRNpBryguERZ2/w3q2iJ?= =?us-ascii?Q?CDgGwxJA8sE0fpXZDZZSQkwvw8gV22A+zEbq0Dqh4AFkTjZRaWIYsE08R8jk?= =?us-ascii?Q?vXIi4tLpMpqxl02m4XZEwAps3dpo0iwlIhvkiFbryrf8cngK8DswCkd4NBNv?= =?us-ascii?Q?wcNwZcswnDjJbgXv1ryeZW4A7tPpDiZQ5R0qMWbChC1qRmRwIwWt9oPqz9a3?= =?us-ascii?Q?sBomvC2Sq8FS0D5Fk6OwDVgiZVZxMOml/KwqK4f8AV6qqgGuDdeFTmQs8hHz?= =?us-ascii?Q?QIf+e10E/FDjtq+HHBPoRC7PKyzlEWkvc0UwTuO5/qg6ZT9e+rSWuvd/GvA2?= =?us-ascii?Q?pBnW+FHC9L4ToIiOVeD71964T9/1T7Id99mBwlDt/6HM0KSXfmXolXvvHZse?= =?us-ascii?Q?x45b+jVWsELSosT/GK9nrs8ekJHsEP6wPGO4BozIhT8ELivjpWL1Otqv3mt0?= =?us-ascii?Q?hKQPptL6m590LhXo/uMoLpSFoyMamd2oMsZJUyTzV4RbU+I/8eZUb6FuIGc2?= =?us-ascii?Q?OlAOTD/HmkO5mAGD3XU03KItxEoyqnk2L5P69aooFzMu657IE7YMvWUzspRp?= =?us-ascii?Q?ECqj5uqGWUyKcs4uLXlEOB6pT+1SZAvOQvB07mQpLHAqPpU1VEokXNlv2pL2?= =?us-ascii?Q?/8ivi6LLfL79Zot/cNI+myP9h8HJZUC69Zy3lLk1kfoBpMINWHcZRprnmCox?= =?us-ascii?Q?9Ybssx5DkpmBh3ea/XkoAuJtBhSLeoY5LuVggGn37Hr0lMEuck4cAb1RBcwf?= =?us-ascii?Q?nujpMUi7O/ENH37u1/PQdnm9GgS5EhOIqaYa581jnOuFnECZz2dy1qs/4/p/?= =?us-ascii?Q?dEQRxfLlA+xLaYrpynScm4fEn+h5jSpudCQEnnb0RaowWX8BRTcAks9w8cbG?= =?us-ascii?Q?K/dNfS1T8RMa1zauaC8+nSxyzhX3SpKvyVtWrVd1uM1wraZDlp5Rl8F3qWqI?= =?us-ascii?Q?KHi4w213QqMg0UCFHT/Q0XcgBpJWjwcrJY6OyAtu+G7A6Ovr8519v/MUcQSW?= =?us-ascii?Q?YxmEDI5Mx2O2l/VOxj42Jri4/PNlmmNWLnP8CwrBXdVzKRp75m1c0fn2NXn7?= =?us-ascii?Q?PKFk49QzQZgQ24vLqNxIh68hj9F4odzEmWzyUWE0h1IdXxUjHLDbsyaTDOPX?= =?us-ascii?Q?94JvNofhx+r4f/riQ+KlE8aKrpFRjhz4hqnxxEWCuLeyK9I55MEy02uSnSKF?= =?us-ascii?Q?dWCDaS6yaWNjU71jFmJv/FeqFhoxhWoT+wgjqbz2djMKGcjQO2XE1t2gKpKj?= =?us-ascii?Q?cVAv+YSi6nOpEkAAW1Ze/WOXbylG5URNjJvCXFVFggJ7+dTPzwkkzyabEFXk?= =?us-ascii?Q?SF3JrRusZzXGuD4sTIdIPsbfFbH+UOArnQVx33xtmDqnv5HGYQ9cYQxlyULy?= =?us-ascii?Q?mNqeQ2jacVzCvY5T+g0xGOjHexl7EfC5plHYvQRr+z33RHJre0MaJebYa0NM?= =?us-ascii?Q?IQd0oSKoNxT1cjas4w+4hBMfxRruqrqcyrqENm6sMeWp6euYEzN+7XHAv01G?= =?us-ascii?Q?YaNWpYXBuSdAXOFGw3uc7w1HEdYb/3+dM69CqEnq?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73b0c790-50e0-4eff-b597-08dbdf69c21f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:15:54.0524 (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: dwIl5oBqxb3ejbwPNVT2eway/nj4OMc8TpGoOmQZ9OhOGCUyZY0QBTtXvTH4MJBqEWTf/KR1KucURICnp5wNQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" Similar to addresses_equal() helper, this patch adds a new helper mptcp_addresses_identically_equal() to test if the two given addresses have both the same address and the same address id. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 2 +- net/mptcp/pm_netlink.c | 30 +++++++++++++++++------------- net/mptcp/pm_userspace.c | 4 ++-- net/mptcp/protocol.h | 3 ++- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 48ff7ce20890..77a0e859076c 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -420,7 +420,7 @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struc= t sock_common *skc) */ mptcp_local_address((struct sock_common *)msk, &msk_local); mptcp_local_address((struct sock_common *)skc, &skc_local); - if (mptcp_addresses_equal(&msk_local, &skc_local, false)) + if (mptcp_addresses_equal(&msk_local, &skc_local, false, false)) return 0; =20 if (mptcp_pm_is_userspace(msk)) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index b7e4c8d21078..cd16535d444f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -47,7 +47,8 @@ pm_nl_get_pernet_from_msk(const struct mptcp_sock *msk) EXPORT_SYMBOL_GPL(pm_nl_get_pernet_from_msk); =20 bool mptcp_addresses_equal(const struct mptcp_addr_info *a, - const struct mptcp_addr_info *b, bool use_port) + const struct mptcp_addr_info *b, + bool use_port, bool use_id) { bool addr_equals =3D false; =20 @@ -68,10 +69,12 @@ bool mptcp_addresses_equal(const struct mptcp_addr_info= *a, =20 if (!addr_equals) return false; - if (!use_port) + if (!use_port && !use_id) return true; =20 - return a->port =3D=3D b->port; + if (use_port) + return a->port =3D=3D b->port; + return a->id =3D=3D b->id; } =20 void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_= info *addr) @@ -110,7 +113,7 @@ static bool lookup_subflow_by_saddr(const struct list_h= ead *list, skc =3D (struct sock_common *)mptcp_subflow_tcp_sock(subflow); =20 mptcp_local_address(skc, &cur); - if (mptcp_addresses_equal(&cur, saddr, saddr->port)) + if (mptcp_addresses_equal(&cur, saddr, saddr->port, false)) return true; } =20 @@ -128,7 +131,7 @@ static bool lookup_subflow_by_daddr(const struct list_h= ead *list, skc =3D (struct sock_common *)mptcp_subflow_tcp_sock(subflow); =20 remote_address(skc, &cur); - if (mptcp_addresses_equal(&cur, daddr, daddr->port)) + if (mptcp_addresses_equal(&cur, daddr, daddr->port, false)) return true; } =20 @@ -205,7 +208,7 @@ mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock= *msk, lockdep_assert_held(&msk->pm.lock); =20 list_for_each_entry(entry, &msk->pm.anno_list, list) { - if (mptcp_addresses_equal(&entry->addr, addr, true)) + if (mptcp_addresses_equal(&entry->addr, addr, true, false)) return entry; } =20 @@ -222,7 +225,7 @@ bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk= , const struct sock *sk) =20 spin_lock_bh(&msk->pm.lock); list_for_each_entry(entry, &msk->pm.anno_list, list) { - if (mptcp_addresses_equal(&entry->addr, &saddr, true)) { + if (mptcp_addresses_equal(&entry->addr, &saddr, true, false)) { ret =3D true; goto out; } @@ -463,7 +466,7 @@ __lookup_addr(struct pm_nl_pernet *pernet, const struct= mptcp_addr_info *info) struct mptcp_pm_addr_entry *entry; =20 list_for_each_entry(entry, &pernet->local_addr_list, list) { - if (mptcp_addresses_equal(&entry->addr, info, entry->addr.port)) + if (mptcp_addresses_equal(&entry->addr, info, entry->addr.port, false)) return entry; } return NULL; @@ -704,12 +707,12 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *m= sk, struct mptcp_addr_info local, remote; =20 mptcp_local_address((struct sock_common *)ssk, &local); - if (!mptcp_addresses_equal(&local, addr, addr->port)) + if (!mptcp_addresses_equal(&local, addr, addr->port, false)) continue; =20 if (rem && rem->family !=3D AF_UNSPEC) { remote_address((struct sock_common *)ssk, &remote); - if (!mptcp_addresses_equal(&remote, rem, rem->port)) + if (!mptcp_addresses_equal(&remote, rem, rem->port, false)) continue; } =20 @@ -883,7 +886,8 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_= nl_pernet *pernet, entry->addr.port =3D 0; list_for_each_entry(cur, &pernet->local_addr_list, list) { if (mptcp_addresses_equal(&cur->addr, &entry->addr, - cur->addr.port || entry->addr.port)) { + cur->addr.port || entry->addr.port, + false)) { /* allow replacing the exiting endpoint only if such * endpoint is an implicit one and the user-space * did not provide an endpoint id @@ -1021,7 +1025,7 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, = struct mptcp_addr_info *skc =20 rcu_read_lock(); list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) { - if (mptcp_addresses_equal(&entry->addr, skc, entry->addr.port)) { + if (mptcp_addresses_equal(&entry->addr, skc, entry->addr.port, false)) { ret =3D entry->addr.id; break; } @@ -1397,7 +1401,7 @@ static int mptcp_nl_remove_id_zero_address(struct net= *net, goto next; =20 mptcp_local_address((struct sock_common *)msk, &msk_local); - if (!mptcp_addresses_equal(&msk_local, addr, addr->port)) + if (!mptcp_addresses_equal(&msk_local, addr, addr->port, false)) goto next; =20 lock_sock(sk); diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 75ab4d7b9f3d..08620b3ca8e6 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -52,7 +52,7 @@ static int mptcp_userspace_pm_append_new_local_addr(struc= t mptcp_sock *msk, =20 spin_lock_bh(&msk->pm.lock); list_for_each_entry(e, &msk->pm.userspace_pm_local_addr_list, list) { - addr_match =3D mptcp_addresses_equal(&e->addr, &entry->addr, true); + addr_match =3D mptcp_addresses_equal(&e->addr, &entry->addr, true, false= ); if (addr_match && entry->addr.id =3D=3D 0) entry->addr.id =3D e->addr.id; id_match =3D (e->addr.id =3D=3D entry->addr.id); @@ -103,7 +103,7 @@ static int mptcp_userspace_pm_delete_local_addr(struct = mptcp_sock *msk, struct mptcp_pm_addr_entry *entry, *tmp; =20 list_for_each_entry_safe(entry, tmp, &msk->pm.userspace_pm_local_addr_lis= t, list) { - if (mptcp_addresses_equal(&entry->addr, &addr->addr, false)) { + if (mptcp_addresses_equal(&entry->addr, &addr->addr, false, false)) { /* TODO: a refcount is needed because the entry can * be used multiple times (e.g. fullmesh mode). */ diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 089fbebd21d3..e66b1fb7b522 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -645,7 +645,8 @@ void __mptcp_unaccepted_force_close(struct sock *sk); void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk); =20 bool mptcp_addresses_equal(const struct mptcp_addr_info *a, - const struct mptcp_addr_info *b, bool use_port); + const struct mptcp_addr_info *b, + bool use_port, bool use_id); void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_= info *addr); =20 /* called with sk socket lock held */ --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2063.outbound.protection.outlook.com [40.107.20.63]) (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 F2F542595 for ; Tue, 7 Nov 2023 08:16:02 +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="M1/HnftM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h/PnCNInnr1taV1tR9fJczAS+jYU6Vg/hF9dpDhyRDuQtZuiN7kuti3MJZJf0N43jfhoKKXmGhBz8CPE0IZtFA9WaXpz+AN4/Yv5zGj6lKYHPzr/Qi4Z3iFiobQOTeAONBFZSlZZDoJ/lCe1Gq405ykLydADGpxhZpOMT8P/k9V31IXgQ/Xi5wFlycucLeE+61/5j4gNt6juqYk01Ol1azutsAoExwLSnwe/yVSUt+qrwDHSpZJDlcz+843b3r77BsUO6+sns5ya2+zhNxxWQkvqnhHix6vYm2SduECRYxAs4sdYpZwPd1npovlGx7AgLsYQpYZFUst7FSdN9ricZw== 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=498iDJROq6xiw1hcV4dV0i/TuAPng2bf0YJz9XaBf5Q=; b=NToSnJxYoraXFXLkZVESreefH0iow0LdSVXXvjyZ1zOInCNl3gBdiME6GpeEQmPct2dHl6/nxGGgCipiGemmQHhBgoYVcgb8JTP71Pscu6eK/TiIRJc1ynvB0u+WrueS+1hZaYxOs05MEHdJC08bz7CDzIXhcL2R9Ote2tbRj+JOuaEuCbsoMf5roOXCW/Zd9mhHLKt1xiBvMjaXYmd0TknOs7rVfe+7pX3VctviOlcJXsan4PFSQlF6uEDLf88rgt+fa1YpFxNe/PBjE3NwVpxr7cV05EtWhdUUTZKxmi0Kuhl3+ANnmBXCA5u0CM4+13x19kK3J+XinonTEm+sFg== 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=498iDJROq6xiw1hcV4dV0i/TuAPng2bf0YJz9XaBf5Q=; b=M1/HnftMycm4FF91RXG9iF8uWpxF5D7Okqf0qAPUBVbSuNWtpQGRFV/7g+9/j2Ibs19HzArTt6484dvsoOpvoRD25htpaR4p1kwLBYA4VTm43/HdeYmq9qGLMS7O1OLxR97ZLX1STfWUhtnt11AYlmuobeJtEYOd6dz96io7ZB3iNGMmZmksAc2VBG0z26B0Xm6sQbK8zHat3WLSCgB7skzU8lgwlGWnRN3RA17N0kaLorH1kTpAoWvR11doHHJ8x9/XS1lcVa0W92QAtexeiks5MKu7LGJQRmTz8pt5gn8Av8yZTawnwxTdnGndgND5pbJbJnaNXPgcUrqq12zN3w== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:16:00 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:16:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 14/20] mptcp: add check_id for lookup_anno_list_by_saddr Date: Tue, 7 Nov 2023 16:14:20 +0800 Message-Id: <586878ab90e021c347c85a2bca423667d6993274.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0051.apcprd02.prod.outlook.com (2603:1096:4:196::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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 8da392e0-96fd-47e0-6dec-08dbdf69c649 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GknejAwdqksOT7L8d9HQPCqB9+N1eqxF9wkYpdm4EM1uEcgE2WKLUEvFZB36fUxMFNUWpp2O5QJGmiqrxg+cTfGBSSaHbgY1iOp9gBDVfPKk6KCubv9Dvz2ANVunIaPcj5JRreFO9Ozut/4rpF2J6YrxyrGGrLZBrxeRVXefHBfGxW6H3wxYKCEO68s2yIrHiKwWwzbz4wSC81/JXq8rFruvesSQ+SnmSu9SasW8PDjCnyAPLTdAOQLfxYad5Me3JsW5RCiVN405Xq96xq6WJPT8hZ0BQiCpHRfYbkAXnNaDywIFEP/HOin8ZMeoV9kIJT0QQqzvfcKL6TkyivIts1Sf7H1HQPCFRBIcUcQEHcO7hMx/+XYs/2xQp9/HzrLr6qXW5I3m9UxL2ZNKSiD/XueMWSgEQVPfTuOkt+b5tLG+QR1wcVBt7C5F/DQpbmOJgqpNwUfp6jepfulnR+vvN0eaN5jp6ucbXFSVdc5lJnrkP8GhUUE0nTVBSnjMgAqLzQaG6lIl7sRVFEWeCI2b81zWGx4ppMhVR6HU9h/W1CCj2pHrgaLC7VvPSL/m1QG/ 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Wpry0zkIiaOy5fvM74SNQE2FoMn8w08E3lG/IfqQGgatmvUAML1PW30jofbp?= =?us-ascii?Q?mERf/a+WNceYAhK/qC3K6+Pglgg6PQzNGCz0XFxXT8BqWO8JqcNOyUum7GKw?= =?us-ascii?Q?xCwR7/ub4z5lGDamN+0rUd0P+P/11NMZSMdGNw1mUeMyb110zDovTYWXco8t?= =?us-ascii?Q?ELZlr53PEo3o8jWot3dAf/pGqyqaW4IAjAL4EmHDrngd2I54ItOg0JdhaP2t?= =?us-ascii?Q?7D+xxfak2L1siuuab3+oRM2M1frmQOLt81SIMh57JQobAO8bY3iTVG0/iwnH?= =?us-ascii?Q?NvdWILzIpU2+AIEyapYjVsSERabxXyx+qr2EzFEB4uJyh5YyVXWYwdfxFHkt?= =?us-ascii?Q?BOjJQovuIky+EafTqCQTw5Moyp63v8ekPlMH8o6WcTFENXDwOkfIGQaDhYzp?= =?us-ascii?Q?AmrqGrUW1glnkM7PJ1A1fPwXw2svLNOnNLmrXskSC/FDhDEK7nXiX2D294bT?= =?us-ascii?Q?K2TCya/Ese++v9wwugWnINpqI+7qjkzeuiaHA8NLZsSkv7W1T+fApAOb4CXX?= =?us-ascii?Q?UCoYmXTUd+/hej3k5Vf4EQuJ4zYTilswblAnQ1g52bD/5k7vtNQptDFnEqyV?= =?us-ascii?Q?XV395muc7ZuUNpck5frZrP9NLaDOgyOfs33ul5MslJOEwqdRHqSHtvs0ew/a?= =?us-ascii?Q?oF3lfhvUU6LLFYMHqZWiAbDBgzmSYnDpt21/l6JVgIyliTbjjOQortrjnc9R?= =?us-ascii?Q?nLrHe8/7WTo7ZyAPtZQwBNYMY/GdzMK7kIONkNtEzHMY3or6ws8pMdQDIpJn?= =?us-ascii?Q?FtiLuylPYSUlyOnlc7mj/oBVJmPDYLHCd+dr/Z/xerLwwBY4E5nYv9WJ01dm?= =?us-ascii?Q?k1uHAH47s5S81heS7z7ZGeG1yXWiYQDTwiifU0ocVZBHRPr6oGMRiwOlcpbD?= =?us-ascii?Q?QhvvJbPbX6fkhyh92XYzbOU1GMvEH74oNp4ykevjeq9yh0/F/aiuMZA9Dd26?= =?us-ascii?Q?4vUxz+Mj08onqr9gsIaStLK2X9+RoRj+G95xy2tPgc4uudilG14lTytoyF3W?= =?us-ascii?Q?OKMa5wdguzJghXKzg1e0PsqxadFTp6Cf9DDaDj0YyO/VyjOlFxzZHkLGJ4rW?= =?us-ascii?Q?Kdh47Cm5fQTO5eQAhRX70Jf2ZRE/0No5Nno1MsIlNvYC5qUVDDXDQ3mdYrW0?= =?us-ascii?Q?2Sski0lJjyv9LPxxOI7oawhM+RIN1aN9Je8bS+t0CIIUY0c7ctVs0dEtRWDd?= =?us-ascii?Q?3z/gprhMG4LKZ2VxZ2kIhOb2kbuGqgv92g0rv/z00GC8f25wtvpKF2qaDZFy?= =?us-ascii?Q?fD6WQ6jkc3x+rOd+xA+l1Y0ADOArGXI3z/lU6+TJ5dceYSNS7k43VAAwoUtJ?= =?us-ascii?Q?8+vd9bCkvvpkknXFQqaj29AOgex0N6LLm+8h0r1p71pTDypHbddAJxk3za8P?= =?us-ascii?Q?Bzi3diCObVIVE+24tbTjkvanK/1KN2IqvNWKe6OJxZrGy3mWp94PFFxOjYkL?= =?us-ascii?Q?Xan03f3Wj7dVJrsHuDSAvomyf0HuRF2SAn7C6PZBHFN5FMdgMu2kJplHdP21?= =?us-ascii?Q?KarURoIr1VVCobRIDoDttPFIHqMmQd1L62zSkYgHpAmBDg5wuis3IbukKDH6?= =?us-ascii?Q?IS6j22h6vD/mofWgIIq7mQye7WpRhNjt7TrN6cgf?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8da392e0-96fd-47e0-6dec-08dbdf69c649 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:16:00.5446 (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: 8bi/oMaFfXi9+hvZeT4v2vTQa088C2kUKX0PiknZea8z4hHlCn99qcgeTXGVDl90aFfPiOTmNH04V9Xbtqi/0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" Add a new parameter check_id for mptcp_lookup_anno_list_by_saddr(), and use the newly added helper mptcp_addresses_identically_equal() instead of mptcp_addresses_equal() in it. In mptcp_pm_del_add_timer(), check_id can be passed as the new parameter into mptcp_lookup_anno_list_by_saddr(). Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 2 +- net/mptcp/pm_netlink.c | 13 +++++++------ net/mptcp/protocol.h | 3 ++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 77a0e859076c..d5ae2e775059 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -259,7 +259,7 @@ void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, =20 spin_lock_bh(&pm->lock); =20 - if (mptcp_lookup_anno_list_by_saddr(msk, addr) && READ_ONCE(pm->work_pend= ing)) + if (mptcp_lookup_anno_list_by_saddr(msk, addr, false) && READ_ONCE(pm->wo= rk_pending)) mptcp_pm_schedule_work(msk, MPTCP_PM_SUBFLOW_ESTABLISHED); =20 spin_unlock_bh(&pm->lock); diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index cd16535d444f..7955b86c6b8d 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -201,14 +201,15 @@ bool mptcp_pm_nl_check_work_pending(struct mptcp_sock= *msk) =20 struct mptcp_pm_add_entry * mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, - const struct mptcp_addr_info *addr) + const struct mptcp_addr_info *addr, + bool check_id) { struct mptcp_pm_add_entry *entry; =20 lockdep_assert_held(&msk->pm.lock); =20 list_for_each_entry(entry, &msk->pm.anno_list, list) { - if (mptcp_addresses_equal(&entry->addr, addr, true, false)) + if (mptcp_addresses_equal(&entry->addr, addr, true, check_id)) return entry; } =20 @@ -288,12 +289,12 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, struct sock *sk =3D (struct sock *)msk; =20 spin_lock_bh(&msk->pm.lock); - entry =3D mptcp_lookup_anno_list_by_saddr(msk, addr); - if (entry && (!check_id || entry->addr.id =3D=3D addr->id)) + entry =3D mptcp_lookup_anno_list_by_saddr(msk, addr, check_id); + if (entry) entry->retrans_times =3D ADD_ADDR_RETRANS_MAX; spin_unlock_bh(&msk->pm.lock); =20 - if (entry && (!check_id || entry->addr.id =3D=3D addr->id)) + if (entry) sk_stop_timer_sync(sk, &entry->add_timer); =20 return entry; @@ -308,7 +309,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, addr); + add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, addr, false); =20 if (add_entry) { if (mptcp_pm_is_kernel(msk)) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index e66b1fb7b522..d0eb7b84a262 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -919,7 +919,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool check_id); struct mptcp_pm_add_entry * mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, - const struct mptcp_addr_info *addr); + const struct mptcp_addr_info *addr, + bool check_id); int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id, u8 *flags, int *ifindex); --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2061.outbound.protection.outlook.com [40.107.20.61]) (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 F41192595 for ; Tue, 7 Nov 2023 08:16:09 +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="Xvxac0F8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W+ctGalqJc2LSI7OAf4YTrVjOwx0/EVL+drhbwc/TyEB6/6uqZWdQcRxjM1/G67/f3vLQBymxKyNUFwPK66CgjmUyu+viUnns9kau9ze5JYB/xKZg0qX9CTwPvn4JAfWIL8mYfjq+f24OJhLacSMkm0ayIdOK5NnjtNQMiOHIdLNf8uvEN06bg+N+aEQYmb036kmD+4aCxDvs997nfQOyajxPwe3FBgDj+YUBbgqI4+2TdVevrm25XQaVHlJHyoLpW+M8/9eyDXc9qHk9MdWFlDQ/xy2ILcaCgp2Wmh4G8sjklEkvvfXi9PtZpbJBWuV2C6ylm7KEYVoQ9uFD7HX4A== 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=RwNDfN17K0LFAMDx3qp7Q1h4GjSywajxnLKO7TC/I1k=; b=jeV6iAAJfVAdbIDEs/qMIfY//5jKFI6rZW7+WOS37K9GsOqM1Ibn62agBjZd6hSeZnDUVtMgkWVe5Pgak/yF4zyXjKer0edDddad7JuI1rw5zIbhN5PnfZkCu7yxR65O4nTnh3cMIL5YzuZWUp2kSODcTRfWMXJlFgT1xe0nVLkEOBOXjPMbWUAbdDeR1mpFWO/EwtPSjwOBib3mpQCT+qxyu3ExpsBaCm2CojXBcY1Gj1N7lgzKqjNGLQ4x8pIH15BmKBMiSs1ziormWhf+5aA0ZP3j4qgvCNVmkkXfa/HIl2XNvf9YClkJxtBOHsMD8OfPxrUrZQwaJnaGVmgFDg== 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=RwNDfN17K0LFAMDx3qp7Q1h4GjSywajxnLKO7TC/I1k=; b=Xvxac0F8ftEWpkqeCXnffRYaNcvfB8LElrPn/R9r4meWXvCKfLwTsYZpLmMYmoms075UGIF3CQhgtBIGZ5ceaE1BiCMLoq82aaRNIECH8v3Uo4fifUZCJQ6kgfTTYpjj69BxvdXPSwGVaTmhwQfVJjGfSgaAHV6AB3QIcTHKayr+NHrtWyCOalyI/U+QgavQNaB2WevlRGgD4XMS5KrssjZbCkO0h3AGSY5Fh8Ma1Tc6IVkbeRg5ykFq6jBz6UluCDZkLLpJR2/FHRZM/c9AYURuMJf4ECEPNUwIWtUmK4Hw2uFY0dDPBR7T2QyJz5QJNJjfjufiArH+l3nX4kLLXQ== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:16:07 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:16:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 15/20] mptcp: add userspace_pm_get_entry helper Date: Tue, 7 Nov 2023 16:14:21 +0800 Message-Id: <4b914e167aa771a5351f4c0143a5d6388265c76a.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0202.jpnprd01.prod.outlook.com (2603:1096:405:7a::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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 06479e43-15a4-4e0d-bbf9-08dbdf69cb0b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 02DmcExuSHWy3ckOl/E3sp9OpYL3/jNZcHzMYP6hICuEzUXGyp5b2MpbEKqC+kOBqk5ZtySwdkPFf94uF2MFayGOIsJKTd8hUwbAF+B2hOOY88tmKs8/Sniz6pzlzbxVpmqxiaiik25I5AFNcIPn6uHFtUtlpKFYtSTzt/mPSEtZ+0FkLA6aHNEelIm56pRPFWMeKzbwOpkb6TZDTJjmcr93n8Vig6zU45U354xZLf4Ko2mC+jWDYMKER+eXjXwcEc7vpKsV6bsWBQMOYS/IjMZKhjHBJiqgbenvocOwkqFl323e1elN8Xlw7MDhpexBcy/GGnZD0hrhFf00x0YHoggryAws8Lmop8HaJ198z/udXkLNvLyrj4mNXx/BJnWuk2JP1AqCHWxydq1IlTT2IKNI2uJ+YYPRCPP3RiPK9gcUQyOOxeND9qrLt1M0XXIMJM4HbIhH/OqS3xzMb+QQJ+chj3r73nXH7G9Ffc5EucsJeQOQQ16mq4Ve4SamMQcQzZ9mYhnnnaV0PNS7SdRH4Id93gbutmM19IwpOtzbX846JvQ781+7neV3ePdQI4/b 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lDGj8ttOnYC49M7hrRPeXkwh0NHDcbpDkICoSxfRCeFxQSvA552/XuuTIwnE?= =?us-ascii?Q?KRzmz1Xc9HbaVU0kcdMHCL3dnWyA64Mkn1EI/rQ19SY1Ny8pbAu6k4824dut?= =?us-ascii?Q?FEs/ThX4DPr6EmWkyngYfvoRa4zrFT4rpGXzE4muvaD2YYxDCL0Yb+6D15I0?= =?us-ascii?Q?86C/dh3YhXiTex+LrswZ/kIXrhJWc9eQJ9vEf+2HESFE7kHBSHgqA8RFAWt0?= =?us-ascii?Q?4D7r9P61oFmTiTt1BEsjbwlFTMXXPByERpqMEvQWFViPYvLcZJUEgscSksSf?= =?us-ascii?Q?GCUtCPQ05I+wWfs+Kqt5Ja13YyJ+kNFgUqacv+A+Z6KF4sG/Ix/HNWwhZdrZ?= =?us-ascii?Q?3JRGRrPbk4DMIMSVjL9jbJg9vNneFW0Qbg17d1dpOFOka7RdGIVgD1/NZjUs?= =?us-ascii?Q?Rk6yGVvU1PmtuSj49ui2o+IQfGiekIpfRGnra+ndQL61TYmtAhdBW9KVCMh/?= =?us-ascii?Q?1Q/FCYGw8AhQ6ve+SwRqqLFd4dW13b7IrSJKPD1FXsqNNmuPyXE1xlnaNAXc?= =?us-ascii?Q?bLJ8XqjftMzerAGxO2INUY8eedLsaZ5Fgv4FCZkxA5oE3v6aVlPwuqaSwT0C?= =?us-ascii?Q?fSuMixBJuyMd9sHQxKvW4Y4S8dR2Ik/jrNwZU3RqMDYx+AaiytlZ4N9GSUBZ?= =?us-ascii?Q?aCADBJRu9V75rgQMVBipWvpf4w2x8C1txw0ieLZcWNSGDgD4p45kNKzxp69y?= =?us-ascii?Q?Lfl6eFgmUW7wEpRcjteeUiJ0ezETTmJT9htBL5fyYh+z/++/t1AYxEogxzaz?= =?us-ascii?Q?APodlUSj4Do62q2sYYbispaVzL5sPWcgebiqVR63+hbQWcuDn1KPtNLaTHye?= =?us-ascii?Q?64p0R4QY4dnJUPZY5OEKeqiZwS3uQbQAE/+MepT0mUto/m2IsdNP6egMo0Cf?= =?us-ascii?Q?rhZdjA/jCW5TaXI8Z76VWT6QEdeptr0Kw2Uv3t8AiRbmzuhtM+eHl0p3gumf?= =?us-ascii?Q?Ip9M5lHa545aTREFLh1ooew4vZU75rrTGlZMIpHVf576vr/e9KSykrqnWa80?= =?us-ascii?Q?bcQjJ9MZS7/hme+Hfm9TRbxL+5E8hF6GjeHJOqOTTaSHfbJyEmrXr2j0DeEx?= =?us-ascii?Q?T98GS2cCo3rdmppD8/YGFGRVdtJxHkJ/bbFO93QUD/LotDgnERZE8IQQd3If?= =?us-ascii?Q?l6ekGi9FzHGSW0Hpcj3Sw8oRdIwbI+7yGBh4h/+k3e7TDxOvXyU0zN5osAQ+?= =?us-ascii?Q?vCw+ZiabOvwjW+EorQRX2gSCE/pGN35a2Qp5NMjw1BUnGzvJnqTP2xSCOIcp?= =?us-ascii?Q?8DMY3bxZNSkJNMNzrUb+KQBL6T04toDooVvSBbTksJLEIiwzovhhHiwhlXLe?= =?us-ascii?Q?w6UV6v14uOz/hXNzXjODSKwI9gq90av8GGKGe3r+8eyU24Vm6Yrq7ksNRM45?= =?us-ascii?Q?TsUzDBGmr+BXdVxbWI6jQl6cbDd7rXhWyKJzKOU98aJbl8deC8wosognBCfh?= =?us-ascii?Q?lMvyzZrU0UNyhCA8MP2GeJ46cgbYR9fycgsQYN+z0BRytPed7WIslEYV9BdI?= =?us-ascii?Q?487OpojoVfjOHoZHcuP/YQyYdObJwS92U5XnIdke55DPwnJm4n4a6/HF466q?= =?us-ascii?Q?3pYq51odRQ/ZoTzuRMCaKHWCInoAUtX1hO4TEXN7?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06479e43-15a4-4e0d-bbf9-08dbdf69cb0b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:16:07.6228 (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: IYeFHatCZWO4y6L5i/lkhb7zumuOfKlbGMGzPI0g+0TXds9L+lD5nO+pjNpFBkUzt6wSuTe9REH4dZaGq3m0AA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" This patch adds a new helper mptcp_userspace_pm_get_entry() to find out the address entry on the userspace_pm_local_addr_list through the given address. Use this helper in mptcp_userspace_pm_delete_local_addr() and mptcp_nl_cmd_sf_destroy(). Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 08620b3ca8e6..465f2c208ac1 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -39,6 +39,20 @@ mptcp_userspace_pm_lookup_addr_by_id(struct mptcp_sock *= msk, unsigned int id) return NULL; } =20 +static struct mptcp_pm_addr_entry *mptcp_userspace_pm_get_entry(struct mpt= cp_sock *msk, + struct mptcp_addr_info *addr, + bool use_port, bool use_id) +{ + struct mptcp_pm_addr_entry *entry; + + list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { + if (mptcp_addresses_equal(&entry->addr, addr, use_port, use_id)) + return entry; + } + + return NULL; +} + static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, struct mptcp_pm_addr_entry *entry) { @@ -100,18 +114,17 @@ static int mptcp_userspace_pm_append_new_local_addr(s= truct mptcp_sock *msk, static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk, struct mptcp_pm_addr_entry *addr) { - struct mptcp_pm_addr_entry *entry, *tmp; + struct mptcp_pm_addr_entry *entry; =20 - list_for_each_entry_safe(entry, tmp, &msk->pm.userspace_pm_local_addr_lis= t, list) { - if (mptcp_addresses_equal(&entry->addr, &addr->addr, false, false)) { - /* TODO: a refcount is needed because the entry can - * be used multiple times (e.g. fullmesh mode). - */ - list_del_rcu(&entry->list); - kfree(entry); - msk->pm.local_addr_used--; - return 0; - } + entry =3D mptcp_userspace_pm_get_entry(msk, &addr->addr, false, false); + if (entry) { + /* TODO: a refcount is needed because the entry can + * be used multiple times (e.g. fullmesh mode). + */ + list_del_rcu(&entry->list); + kfree(entry); + msk->pm.local_addr_used--; + return 0; } =20 return -EINVAL; --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2065.outbound.protection.outlook.com [40.107.20.65]) (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 6ADEE2595 for ; Tue, 7 Nov 2023 08:16:17 +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="Lcw3/jm5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TsVMBtaFJnJ0PyvQoYmeOE1v+iHfRh6em6bjGageevodEgvC1m5W7R08wnMo0PuwiAh3x1ZREll4iXGtDeXE5sDnqLB7KEwvqe9kSsv+aCQLXIZFN4H9uO+U+FkX/jhgQu9cTr7YLZhVZRjtNn9aumaO8LNVBWMITAkS/K630+buPaTooFCr2vRUhCnxSDNaxeVOm/3LoUu1g/NnT37F/P7gHmIhWkhP5yyfUNhhj5veuJiU8r4TzIqISKtrrdgp6xK2wHZM8fPDMIrTEcwyeMUw/r/qlrZUCT8584FiRZEMHn/sX9es+z/idJmmOKXaItWwcSRTaLFxvLFOPOaGsg== 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=UVrBafMbdc/TBfOFgyIUqPEtQCGP0Cpux+OzTVtMkJc=; b=OpV+aS8woa3fmyc6bWMVg+qNR9dHpTKQvIixbnJc1NWgcW2XQDNRunYXEUrcbAACKhyvIvo0wi2UryzEnqoCJQjW+1Gsq62KCSEw0P9Z4gF6+siUU9VqIi3EIageGJHd7e2Xf9BPqf9Lt4Em6M/2OAW6IAs4K8DGgTJV4HUraDsQTnOUOXH1j/QHreHPrahxarlag2HsKJrBPEifCwxDNCrgsNM3RjJbqbZOK+7iYNBhBe1GWm1XPMA168S1iN304T1dqlza6bxjKUUgGTCvwPP6bhp0d5IVs327gbc6sdJZ1UUux1iJB5BlIvu6/ubB2SL5L5aaBeINNWpa/kYWIA== 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=UVrBafMbdc/TBfOFgyIUqPEtQCGP0Cpux+OzTVtMkJc=; b=Lcw3/jm5jC6N9HFAC8j8kAEnt0pttnI4o4Hrf0FftK3axi4JoAMtCmRdRKQfJVQekf+vk+r7XGCm8C/GZNtRar2jvVBmcEw1DIBtmnWSeW947HDDoJ5aaWjx0XAzEiMVQlUUhltfile6fktHidFujuBTrmi7iNXoIw+oOPCYfjRTNP54w8spLGwhiiXDHAj7/rGV90q2/Y1nbi8DB/xzNB8cRixrQcrYDydxhlJCxBQlr6L5qC2G6pxusvOntD1NgvGhEM4aJsRdh+LjkhkWU1Y+L/+n339lD5fGG6cyOu0MmiJbSPAjbtYGE09Siw/aBVd+C8EJaU1GZaAEVs+ORQ== 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 PA4PR04MB7663.eurprd04.prod.outlook.com (2603:10a6:102:e9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.17; Tue, 7 Nov 2023 08:16:15 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:16:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 16/20] mptcp: drop addr_match and id_match Date: Tue, 7 Nov 2023 16:14:22 +0800 Message-Id: <56ff8eaccaa98f2911e2ebc2c7bb8a6fba13b4a4.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0208.jpnprd01.prod.outlook.com (2603:1096:405:7a::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_|PA4PR04MB7663:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d18b62a-5e51-4ee6-ac68-08dbdf69cf6e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rc4JdAfX41vU9KoMyr+vGHTmGkYYItpnIgMQzhAwz6xxE1+t3A4D2lFZkVDirJkvQJyZJjz6QeEw6oc4pkSjinorqZPYml5mCa6pA2r4oMf6aiDthMnK6ICTzhUPVUb7SCZbgm/2qy0FLzHBmL5iZjunjGFAGcFTCv0rZrO+qStDFncKTdUg0l3zdCMEnYt8nEhe3rm5dkW7oEEKLdYLYmp52zdxWaW/GtZ59kwt1CDPL0I34+EVrJZ5pknliy5eG58SakvrkDhGn2BmF8pRBq0uGvUHAG7M/JPHUIvfBEvQG0/psLFnJPRogla6PrHciKRtC87NroNXE0sC/rbmla4I0TK1wWABhqvNmUQNS9mTRtAdGTwNF7a2NOh8LKJRqqgPAYbwMtXgt9yGgU3Bl4eM41wX6aRAiJm616Q+jRJqA0p/oTWlHTeoToHkYHKlZYkVFRz0IUpeJixek45prOgAFFZQOjaW5F+URBej1tS1TYk9m7H2hVYPwUKPu/DZ7EoLADGitGFIEgGXa6vsXDpD3pdbdyj5pyr8Qmck0ikWuS83rk+msYYXB5tKGrMH 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)(376002)(39860400002)(136003)(396003)(366004)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(2906002)(83380400001)(41300700001)(38100700002)(8936002)(478600001)(4326008)(6666004)(6486002)(86362001)(44832011)(8676002)(66556008)(66946007)(6916009)(316002)(66476007)(107886003)(2616005)(5660300002)(6506007)(6512007)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yehd+N+pInvy+C/cXc7WFnrEIHom9zr4bXJ7MuIcqslQzhjE1Btal2ml5KJz?= =?us-ascii?Q?7dkpzaweFnJ0AlnvzDweBwYYRv78tqT7X0V6hq4VEvMbIEQLaVeFZDmJuxn7?= =?us-ascii?Q?elNXAq2xbR2M2lv/LC9Ic2Zz2i3XB+V4723edZl8Cv7ES/U6+aCuzBnivsSC?= =?us-ascii?Q?jZYJ+GddvdUZ1rTju1VzOfZaOtiqZf60zwg61c3sikH3U41MNV/CzjMvxAaV?= =?us-ascii?Q?cHAUDBTHJatq1dDFaM7ZrfQQLRMxNPSialzc7i5zv5nJCq9nl388oFh2dcVI?= =?us-ascii?Q?atJJXi7aoscbyIjXwuPacGhPweEgtoWUdiRFTNXXskoMiM3CYL379nZxyGLs?= =?us-ascii?Q?anuSKC3MB+bkwxd/BBxRqbC+sPzFUYzC39ji7Y+6No70uVgxzbqFWEuv6vT6?= =?us-ascii?Q?wTuJkcq8xeD3bXaZe2JpPf4aZC1z/jOj28c7N1AKvgMvJHsbJsujzu9DTfzy?= =?us-ascii?Q?Z8v1SZIAw6Clm/CN5WIwIOW0t9EBew3WohgEhsiqHsMoone3TuXCZKUJbGqm?= =?us-ascii?Q?xFCxDvjdO6yIxVsY6DTzSplNoi66/gBro1SRNnooRYJGqUMh3BQUeUL/rbHu?= =?us-ascii?Q?d6qMDNo9lX/YaNcTGa5dWA2mwDpFIKG2vPc4TcsS9O48IQELvUrlG3zjlWKh?= =?us-ascii?Q?dx+Ie5U0pl4y/3k09Mc/jdrx/t6xemRTm/tDaFDv4xUNiSfn7Vjpg/MhHYp+?= =?us-ascii?Q?pERhs9YJuARTu7r3KshOW//z5rW20nqH/271EnM1G7SkzXU/j7i4elIl4mhg?= =?us-ascii?Q?axBYIcXezFShwTMewlUo/79Ap146fIoddWksgPdzuEv8g3h3n7No9mzIlMLK?= =?us-ascii?Q?PocuUlL4Kum04IqUh3LZCt1hx3ioVxz4vxZEqlNIsWVBDrZ8EhYK4kQYzyfF?= =?us-ascii?Q?xX6sk7dhUfBY44s0JcFnedspG4i3sI1oFIO5hHdDpsvd2+ghphwcR+vZZsfc?= =?us-ascii?Q?s6MexkORcSfGL1UmuaHg9dD0sh1J1ISeVXNgY+H50ZiRlyi25zP4cNsCsmkU?= =?us-ascii?Q?zaGJkBMLiGTnQPmRktVJSwEJ7ypecp/LCxPhv75g/WAqGVwpGg9axJrMlb0q?= =?us-ascii?Q?lwBh8P9Q2xj4DwzeQ1F90BhevPDwKemjtIz9VJ5XKTuAKpAEsHhFdqbdmbbm?= =?us-ascii?Q?KCUgkvbn9AwxDbtza6wZbGUSG0zMJn+/RsjgAzjgYY7qq/zIv3stKm68pKdA?= =?us-ascii?Q?LEyJtDyR1rVft/p0Jq3GP8+7PNjuwc2HRcdRZFXZcAEvt4SP+1wBSer9MlkE?= =?us-ascii?Q?/aBpYaGI9ZVmrSbhIGUyET+NFOKLOah/tc8uN4ffvAguR/kD78VAlFckATHo?= =?us-ascii?Q?4zSedAeSBXakdiMgNvhV9QJ9EdZIaZKzPLkIQ+wzVcwIRv3jczUPaGAiy4hp?= =?us-ascii?Q?vSSszDZRcnK7IfCyPrhZVud+yeM67QvjzQW6f+z8sQHF8nRTYQTJrKzheioR?= =?us-ascii?Q?dpRiLullIoSXY/Agtl9cRHjU1AbgrE9UTivMf4AsyxzUWE733doXj1ItiirB?= =?us-ascii?Q?iVgRAzn6TqAPcJQqvdCYqntK/dv6yCxU92pg6SCHFMuQAJCLctdkPyvQF3iG?= =?us-ascii?Q?Ncl2q0eTsh2FF40jupUfLevCO856XY9hEcf/w6H+?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d18b62a-5e51-4ee6-ac68-08dbdf69cf6e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:16:14.8878 (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: 2XpUfAAjb67iXy1ncgxBOBhnJvto6fac30Hm6h0t0IeI392GWoGIv6SqDdbcc6KRoKaqyo4Ank96jUClMVEe1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7663 Content-Type: text/plain; charset="utf-8" This patch uses the newly defined helper mptcp_userspace_pm_get_entry() in mptcp_userspace_pm_append_new_local_addr(), and drop local variables addr_match and id_match to simplify the code. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 465f2c208ac1..5d8130581654 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -59,26 +59,13 @@ static int mptcp_userspace_pm_append_new_local_addr(str= uct mptcp_sock *msk, struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); struct mptcp_pm_addr_entry *match =3D NULL; struct sock *sk =3D (struct sock *)msk; - struct mptcp_pm_addr_entry *e; - bool addr_match =3D false; - bool id_match =3D false; int ret =3D -EINVAL; =20 spin_lock_bh(&msk->pm.lock); - list_for_each_entry(e, &msk->pm.userspace_pm_local_addr_list, list) { - addr_match =3D mptcp_addresses_equal(&e->addr, &entry->addr, true, false= ); - if (addr_match && entry->addr.id =3D=3D 0) - entry->addr.id =3D e->addr.id; - id_match =3D (e->addr.id =3D=3D entry->addr.id); - if (addr_match && id_match) { - match =3D e; - break; - } else if (addr_match || id_match) { - break; - } - } + match =3D mptcp_userspace_pm_get_entry(msk, &entry->addr, true, entry->ad= dr.id); + if (!match) { + struct mptcp_pm_addr_entry *e; =20 - if (!match && !addr_match && !id_match) { /* Memory for the entry is allocated from the * sock option buffer. */ @@ -97,10 +84,13 @@ static int mptcp_userspace_pm_append_new_local_addr(str= uct mptcp_sock *msk, list_add_tail_rcu(&e->list, &msk->pm.userspace_pm_local_addr_list); msk->pm.local_addr_used++; ret =3D e->addr.id; - } else if (match) { - ret =3D entry->addr.id; + goto append_err; } =20 + if (entry->addr.id =3D=3D 0) + entry->addr.id =3D match->addr.id; + ret =3D entry->addr.id; + append_err: spin_unlock_bh(&msk->pm.lock); return ret; --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2045.outbound.protection.outlook.com [40.107.241.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 B24672595 for ; Tue, 7 Nov 2023 08:16:25 +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="eWuIxWYt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DJkXeiNQn4b6OQ6olbkure/Ix82Aab5EwiMv82PN9Mj0w4GWuZ+4HfNqjJ8J87yWTpkMzxNXpZqQnWCruAcIa73GbDo7adZlqeC8HApiG11BiMwVijJA2vMUlvYe4Js1W7Xbs+wYblEFx6nBK/3xVWCzMjPu8l6FLDzJ7Kn+X8KT6YjgTJngpQqnwMGhelg4ODTlNUx5iwFPQPK9wM+Gm2G3hxWySdbatqrPLaMP9BmLaiZEQ1Bn5UqUtHnsACMUhHTRXbkWBMhesoW3Pdes743Svbz7770Kla3iBmQTPXLZYszdpNX9D/JrCtttT8crgQFgT32ZtHd7iMaqAOVwCw== 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=+ZwUjDAc+m5T8vrRPL9heZXbcr5c4tkQFHqtSiJX9oA=; b=HxQx9d33zhSttgaqFG0GjKN4wwsq+EGwZ6rdx1e6wb+ztYFHw12cztsRBsWk2e0c7FfP5BQIlpjF6YV3G3HFkZpP4dRoUlI4IH/NzlqnFwv/U4TIKiUIqXYy6vVIRMCT+o4lC00rNheO3JtQqmUW/Zq6D/H3VBuLChdPZu1lb9LBZTDUiiQ9NadUnoSJvIRfAn0FYb80+Flw+nkW1ntYypha7F7idNsM+ogs81Yaujp10kAn2cAvoJlqo5oTV7mv3lhg0c+xi0rEu181AyNMDk76x6xX7E3dkd0gLdzPqCulXi8PLPMNJPESyhX0zdgGqOHRSKFxKV+hPeR5+Dkn/w== 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=+ZwUjDAc+m5T8vrRPL9heZXbcr5c4tkQFHqtSiJX9oA=; b=eWuIxWYtpVSjvEveI8rT8hvSzH3c3FbB1+aky6oCMgSpCZTmOkjFNAwYTh8fP+rKbP/zykEoFy4PzHWj5AbWVI4EamEZJA0973TvZvII3UDsNPri/lw6xjRpnLn6VspCu4oP47SBOzMoX1MteUG5y+jurB7gqSUif28Yxl4TRFWeLyr1E7sKbzj2QrhceGJf4Vw39PLSplwA+MOLQNz6GPC4y8xgAyy1EhwSenrfIwWAPbhfhiaGo9PVSNAAAB5f6zoQum06A5kS8Lp41xD1QQhh+9RThVE/InIBe+umtKJkxoNJtCyUTRjvUThk7VhxcTb4aSngfgFnMA6y9aQ6mA== 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 GVXPR04MB10023.eurprd04.prod.outlook.com (2603:10a6:150:118::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Tue, 7 Nov 2023 08:16:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:16:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 17/20] mptcp: dup an entry when removing it Date: Tue, 7 Nov 2023 16:14:23 +0800 Message-Id: <8118da3b99f46b5e12783018c3c2512e82bec35a.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0202.jpnprd01.prod.outlook.com (2603:1096:405:7a::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_|GVXPR04MB10023:EE_ X-MS-Office365-Filtering-Correlation-Id: a050eb23-cc5c-485f-8071-08dbdf69d2f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9DJBWg/7taXDt/fV7Rf8sk8iMOqM3fFF+ul+wEKOj2YFHT9pTkfYOukD+IKh9AUwxecYvPRciUYZCI9JAbTnREy20OKZt/F/sUDdokw9PZHE5IsnW3HY7l8dQnWXEnXe7BsbekClDJfYH5Z7RCTv6gTkqNiIKvOAn2RNYtcJk8y3+WBb4VQTcRXREM82EQ4slzKdtR9G3fXk+sB/FnfMrcbPYa9svxNw1Z+ZxYsHDMK5JmW38k1PHApi/NlwE7qFARPB7CntCF1e9XnEVcEE4wWZERtZ+reKFtbYQ6NUyNrHLB6Q/ERobvSAtX23/oujUVo3CoTyHZvNQNw274vGhfsHH6banXwJtSWhbyGmfJNWVJsFW/lAziR5OSy5PC01wi6vVKl26wBTEoxJyOJFMrXT4ZiaqobMq9IRfWLjkz4RB7RGzS4eKNT2zohQIl2wKvf4vWrmMYCTzb4r8zPX36gaXMYsBj76oFRlu7cNbS/jSh+pgNc5hEZWJ/LZpETJM/itnI3ICE956qEMAR2LDYtCOr//h+Fd0Zh69+TsxGhHX+9GUHLl5LYd9kVVMRW5 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)(39860400002)(376002)(396003)(136003)(346002)(366004)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(6512007)(8936002)(2616005)(107886003)(26005)(6486002)(44832011)(36756003)(8676002)(86362001)(316002)(66476007)(4326008)(2906002)(41300700001)(4744005)(6916009)(5660300002)(66946007)(66556008)(6506007)(478600001)(38100700002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?x03wvQqv9spHfirARnYShOp7aagNedX8v3VApD9glD0m1zKFULRK1VNqgn83?= =?us-ascii?Q?2Dk/hWCRiEQlbyRZ50CR8RQDo7WtqMT0RBljDJXOQZd6fktsDZFUvmy0XqA4?= =?us-ascii?Q?YM/9L2b2Em/FZTuXqldjD+7UdBwgVO5FMeOoHeYa/34VoN/fIW0Wk2nbRSim?= =?us-ascii?Q?b1DUVXXFjemu4c0wD0EffMRWTZnPxX6e3FZKtYa8a+N0+gtQElXFQG5msgS2?= =?us-ascii?Q?3MXw+yF2+nIwuClufeJn22+PUFnSRECmsCFlztw+kJ8je0Nyv1XrzQfiJ483?= =?us-ascii?Q?V7sF+R3oNNpHH/06D+gsWM0xATJbTr5teKBCaYcGM1x4BoXSZ9CYQUS6lSAG?= =?us-ascii?Q?VeMXUQslma1SE+7e+bW7prUiv7Pj8y6mdh6CQVGblQSh3dR2oXrJbeqyaq5M?= =?us-ascii?Q?cYKjlcQYPo1NqgxQwFE3y/gCgZAFFoRP+95lp2Ob8AuhxhsLpOgCliS3YtYU?= =?us-ascii?Q?8gkNt3emIu/fRiGSAjWitbYkqo2UPVkcff/NI0LjTuy0b+lPa+EhCfjEH8c7?= =?us-ascii?Q?2CJGl79sw+PZ1wYkXO/t+shOhiQOIIlbK2F51iOxcbTPk7cEoWXZQyYFqxFD?= =?us-ascii?Q?7fuC1PDrEjKKtG2+V8y7WrXbrcWASCnDglouiUp+Nj2/Xqjdux1RSlTF+HQf?= =?us-ascii?Q?YKGaP3MjPh2Gx9tOngSJkiaOcmoY8YvgzFT4KH4TRO4hakr33U49ygA9keLF?= =?us-ascii?Q?C8v3uLpSf3J1mBDtoI06c6ybknuRjMYOay8Ij6ENXbB99EXZBLAVo4T80FdA?= =?us-ascii?Q?3w0avGUHtmZSHwud7OP5dEXjGXmgByP7AmirGQXxJMU1dzatXsB4CGoMvKnl?= =?us-ascii?Q?+icg/gE0B6jnF+E+8eMbPY9IcIbB5hg9XLhTldcjEdKeRv/MohiwiOa8f6OU?= =?us-ascii?Q?dvvjaCakV/ArQ/u+4S23r+8CxsYgUgwwPKnk4bLiBnztgHwwjrdykKrGfDuN?= =?us-ascii?Q?xrev+aH9lDAey2D/eRTAnaeA99Hen0VY8DYc+NNmI3c3vPFqdcHxP60r9cqN?= =?us-ascii?Q?DEIAzkEmuOhLR8HTf7wddJGof0XDvufuQyykV6r48IK9css7o6AT8BN/FovQ?= =?us-ascii?Q?/hd2sY4Phk1zmFVk7k4rQR6xgCCZJujlh53DHAWMLNwVg5q5L6FI6xknyvZW?= =?us-ascii?Q?DaouuyefsNopEEv00yRUQw6v7mUCkFoD/d4TFcE2QKxEQ80r3QLX5Skgjn0/?= =?us-ascii?Q?dTG5RHmSgtBlbI5pWZAkgPH/0GBOGj7oyJEypQ1PeSnxF16xA/U5+8YKrfuI?= =?us-ascii?Q?Ts/6xOIPmEnHEG/mO0XMFMNgF9i+A7yRi4ryoSrtyVJVA460DLG7dXjVY5Jl?= =?us-ascii?Q?G7eKUMGQSQ+M7mUdB4g3il9tKpJT3mCJ8ZO7wMGIJKs+SFa5HUH6vhUblpc2?= =?us-ascii?Q?LFbFACEUbtIfWAn/I+NmgSlh7CmMoaRgURX5g31AdwwhEp2uzb7KiswmOORC?= =?us-ascii?Q?KO9xQmd1R9/3EwCP8XaCqV8UwHzrHt7r3rkj+RWuo+yYL4/AH2SQdznqozeq?= =?us-ascii?Q?/St8+u/Gv8dSAvyrMm7pOXCXSOZCuhbb41M2iURFHltzTN7M+gkUjIagVUUm?= =?us-ascii?Q?TC0KMaCApKSJgCQSqY9UNNhMh5ICSzmhK0peetJ4?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a050eb23-cc5c-485f-8071-08dbdf69d2f1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:16:20.8042 (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: bpOJvzeVAbdNX4MHWKhPgKbaw8MkPiEUzDtcpKxxfVOC+WEUXVxorP2ewApXWmmmDQJnZA4pvFZgBfbmIt+66g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB10023 Content-Type: text/plain; charset="utf-8" In some cases, the address entry does not require free. This patch dups an entry to separate the deleted address from the free address, so that the refcounts can be added later. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 5d8130581654..7ba872813933 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -303,10 +303,18 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, stru= ct genl_info *info) goto out; } =20 - list_move(&match->list, &free_list); + entry =3D kmemdup(match, sizeof(*match), GFP_ATOMIC); + if (!entry) { + err =3D -ENOMEM; + goto out; + } + list_add(&entry->list, &free_list); =20 mptcp_pm_remove_addrs(msk, &free_list); =20 + list_del_rcu(&match->list); + kfree(match); + release_sock(sk); =20 list_for_each_entry_safe(match, entry, &free_list, list) { --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2046.outbound.protection.outlook.com [40.107.241.46]) (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 EADAF2595 for ; Tue, 7 Nov 2023 08:16: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="vNPy4Fc2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oVfRqd3Ut0H7Sk3FR4V6AFoSr4WMEpxM1/9mpqYbOqi3FEpTObp1xQcA3kQZIzjRJlX+1WNdutDYoCmuiH9M+DnGSzcGXXYqGphl4f3uzA65xCFKqWlvaS+AUddZMetmjwGsNkw7rrzJWrzX3W6q7IcFdNfv+C8gVPEo/knC6eS/qbkkD0uhIG3negIrI6ehHNwM+lO+UQSTwN7t2CRJtnaa+KT/kfjAkzuUzc+fpOT5IL6sGcVyZZukQP3S0xtrMZ2x4jzONVJfFjQ7Dx7eYyxOeRGw7x9NdXbxpdR8z2wTYSzJtZytPM8cB8SrXEcDImVSFugau5vxQckKvzJH2Q== 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=hu9CrCfDzUavUX2oZKjGvwPBX6f90usa1TcCycyIL9Q=; b=lIxyFz5ZzK7ehEjTCYf7C+63/zrXLewzRWbkfLnVOC8N4FAwYrQZ0pMi/Yjazv4nyH2qJ3woTIKNjTADSyyR/10CLKNqJprYIFGt15B7/aJozZcgH/dZgGsRoGPp0bSnW+KvqTdkHVowwU0iXJtsFR7MMS4I5fDFoklmD4vn6teeLMku6I1fCgWDYVLhkdJZmKb7J0nbYoT4tiEyjvhZ6VNIT9fU/EJvs1kBWfMv6qLBRrjplHZ2WllcsXJMq2wUED9TAqas6VJzcdm4t0u0HFlBBTrQKFw/nnJIPjtaGItaS6fj/7UY9FltUSgzPvyuMcofq/xLOkI5L8vhJB8vXg== 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=hu9CrCfDzUavUX2oZKjGvwPBX6f90usa1TcCycyIL9Q=; b=vNPy4Fc2DhyD+vY7Gf/FQFtO6pKRL2gZCygAmKCs9XtMnHuIGzw3F7KnaeN/Wy0+9KV8rWPFy7BXQjZfzuGfkHC/dLoDpVlNmLZk6Al3h3PomVYUJYEE83X4YO6Yxd9ssQPp0Kw5+HjcAyshaLelhgBW9KIvUwPAetl01+0r3J1mgBygmA6mSDTYM62vkEawymB2+gm+cKIc1y4/9Er/yHbO63N+wbcrWOltk8mw7Doby1KdFdR9bg9wxfL0lJFrGBT6ciAGt16TjE1XE0V7uSRb7AfdKDX8XV8pe4AiOi4e2tbrm+XqbbIdeaBObd5gdalJURo3R1e/C2y7MMTcvg== 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 GVXPR04MB10023.eurprd04.prod.outlook.com (2603:10a6:150:118::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Tue, 7 Nov 2023 08:16:28 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:16:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 18/20] mptcp: add userspace pm addr entry refcount Date: Tue, 7 Nov 2023 16:14:24 +0800 Message-Id: <9af3d9432d2217ccf5e252d9825c2059d9742085.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0199.jpnprd01.prod.outlook.com (2603:1096:405:7a::13) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|GVXPR04MB10023:EE_ X-MS-Office365-Filtering-Correlation-Id: aa6e2cf9-cccd-410a-5e50-08dbdf69d741 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V4yGDthbu0+wlvYNmc0Ttz6SfeILDovG+JWv3RxSE0HIt0LyXiSSZFwBjl1X7vCtbyqsx2vOzD6G16hwoLYGEIRhZ7Pwje41cGjf8+JwnrV5gvvjkhsJGq7wva9DWrx0zvK2MLHKWhMwr55ShOq9M0WhAJcjjGSSJNxz0u/sasaqmqUE1Nj5ewfwzuUN4KV9KTZApKNNJQuIJ9DEgOja4UcyXi9uEWbyC/0JA8qAs60S/W6Bc6hCH4Ai4lH6DRzSFY+vldZU5x8DPVgDvispTU51XEv4BUrAy8hvT6JsNi8SlDxQ+k36TyfZrFpsVLSvl7nlGhXc6EJmEq3bSE/3Tuhv3D8XmHQ9ZT4JGbm3nEm/qCGhTsI99Go8Yr3OVwhTyCaGGnCc/7yMtW548opWfZUXo5XNU89omW13lWik2iCsIS4HTg8/ciWpeF3s9mBDCG/+XGM+G04nOYAFWMkg3erdpRZc+o5RbpUiWvUll9U6K3Kv9Ave7h9lk1zFnvf/329IRyctCpmNVG62qSI8WRK5IMotBQTZOV1kRLiNgEs= 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)(39860400002)(376002)(396003)(136003)(346002)(366004)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(6512007)(8936002)(2616005)(107886003)(966005)(26005)(6486002)(44832011)(36756003)(8676002)(86362001)(316002)(66476007)(4326008)(2906002)(41300700001)(6916009)(5660300002)(66946007)(66556008)(6666004)(6506007)(478600001)(38100700002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SotwaqkLQPu9zQ7rIDxuctZ/tlUFn/2hIv+CEdTka2ftf0OsrWphf07HRqIO?= =?us-ascii?Q?HkZHzUGPvFuJV85xD3ceqlSPQzfj0MQK4JoNH7peEpMDwcSB3dlWS6Mz6bKN?= =?us-ascii?Q?NDEOOphPZXcCmXGMgo2azWSn5LF4+7bYQwdOF9tINeRkwsngDMQ4NzuM96st?= =?us-ascii?Q?fxZsZpwIRiJEodlhu3dyHWWwFH4RASIFzhVbvr2G2Pl8D/qzIo6fj01kCf9Q?= =?us-ascii?Q?kA120OduvdsYKsSOE6ULOQJWCkwnIpFT9zHpTEDxbEKFaKmrYWKk18G5J5rl?= =?us-ascii?Q?p1hIpBsgGRo6yQl8IKhwrIuom05cMon2VvIVNQl/LLs9LZMuOFc3xMhHjjqS?= =?us-ascii?Q?ioX9tVQodxTshTgXjTBjnUs/94BHMFxX2bj+jjvqyaNcElKNGJ7QqT+KuoDj?= =?us-ascii?Q?y3OsrMoAqTuRbTgggcmSRKr1W216wcG3oBUk32EJRFUOjBm6Tld72zqKVVPq?= =?us-ascii?Q?Ap4G83qRNum8ikj1iE4/K3Xq/Ms//DLG3m1jzgSZytMDonesRkaJuQu5/5MB?= =?us-ascii?Q?TOb2OKIJDWIpWZCL9fLaRQT/MmfjyrnOF1l6zN8zayruXzG83vcpcJ0n1A5x?= =?us-ascii?Q?xXS9ExzCl2CCsoCuosJmkTL2uyqgf4vV2Wiu8hjWvd3519KTOkU0OC8lJW3l?= =?us-ascii?Q?zngAR98mvIQ6CFRtl9XyQihFlBqV4JmPWPHZDpSFmNqTpZpXl0PT4+/utKru?= =?us-ascii?Q?aZmNaFfaKIaOv2BWc9Ixpk15NObt2EnNsVKHvq5DYP6sJaraGgEAlCQHbUkI?= =?us-ascii?Q?zcT6iyrz/J7TQseMQNTTVRd/PeZA/nk3SG6HI5RrkGtFPhQsfxO+tzKhylAd?= =?us-ascii?Q?zSx7LPQtxC+xyBXBDjiz4r2k4IASSjZd6ODNJXJNa5jR3bvs0b7StB157j24?= =?us-ascii?Q?SbrsKhtfM9sEfWE2lyXiksZSlgB1DSYEgYd52H9YsYNYfqJObJ5GB1i1CqBK?= =?us-ascii?Q?k7XmRSnEQy7vJLkU7bU9Yegj+BL1Ocdn3twkeYSdaHDA+kdMG4AZ6A7Xu21N?= =?us-ascii?Q?nogku4i7QY6n6kE+T1xrJA1VC0tyyN35fUQu5QIi3rqUwvSVRoM2jnCRtQIn?= =?us-ascii?Q?qWG1sd5KkQOC3gPH2uBKsC2sUDjJMgkRfz4otXECR0sMKYiHtmUnKISsdmK+?= =?us-ascii?Q?8pNBbBtxw7hE/D96d4AsOnD2nfvLWPye3aexs8JZC9EMU2QMV3SvmvI4u499?= =?us-ascii?Q?6j0zBFm9MBcMjJJEtDEm3lHK8dQUCFrMTQVfsnukEv21QDelRMXr8EqB5d/6?= =?us-ascii?Q?VtfwoBqrJU63McHSGlRMgwEcL9mH6hqmAL149PC03iz5hz6WOz/jm20LiGcj?= =?us-ascii?Q?J1kXQLWLKDzyeHNeyqoSWLb2U4LM3+YBIbNc+YzWgQZuPthliuGSiLaN7U29?= =?us-ascii?Q?HK72f/XnF9VFoBeD0T4KfZV2XLvZYKuF0kDF8SqcQiPXS9vDW4QWzao1Nxjp?= =?us-ascii?Q?7UsPVptK9ZfLiYy6EFBIS4QKZ8y2XulhplFRjw0HrjY8niKtKCABZlf6XL4O?= =?us-ascii?Q?ycllUeQW8/IHmvS26KwZ3VP5eJ4yK0qb8FGprmTQtvt9UYsBdG7nxpKlbAL/?= =?us-ascii?Q?bRpFc/hZ2euU8ysOZ2BBtIrz94w7Unu9syU1qgLD?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa6e2cf9-cccd-410a-5e50-08dbdf69d741 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:16:28.3260 (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: 1/XP8jWBeiJFwdsxnBhSeAo41OMvXoob6YuTQMG3JC/5IGnNdKjBCDjKy9lMT1LwC5luN007QtZZhSJNiL3svQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB10023 Content-Type: text/plain; charset="utf-8" This patch adds userspace PM address entry refcount. Add a new filed 'refcnt' in struct mptcp_pm_addr_entry, initiated to 1. Increase this counter in mptcp_nl_cmd_sf_create(), and decrease it in mptcp_userspace_pm_delete_local_addr() according the subflows value. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/403 Fixes: 24430f8bf516 ("mptcp: add address into userspace pm list") Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 33 +++++++++++++++++++++++---------- net/mptcp/protocol.h | 2 ++ 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 7ba872813933..8a2455a2187d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -83,6 +83,7 @@ static int mptcp_userspace_pm_append_new_local_addr(struc= t mptcp_sock *msk, __set_bit(e->addr.id, pernet->id_bitmap); list_add_tail_rcu(&e->list, &msk->pm.userspace_pm_local_addr_list); msk->pm.local_addr_used++; + refcount_set(&e->refcnt, 1); ret =3D e->addr.id; goto append_err; } @@ -108,12 +109,11 @@ static int mptcp_userspace_pm_delete_local_addr(struc= t mptcp_sock *msk, =20 entry =3D mptcp_userspace_pm_get_entry(msk, &addr->addr, false, false); if (entry) { - /* TODO: a refcount is needed because the entry can - * be used multiple times (e.g. fullmesh mode). - */ - list_del_rcu(&entry->list); - kfree(entry); - msk->pm.local_addr_used--; + if (!refcount_dec_not_one(&entry->refcnt)) { + list_del_rcu(&entry->list); + kfree(entry); + msk->pm.local_addr_used--; + } return 0; } =20 @@ -207,6 +207,11 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, str= uct genl_info *info) spin_lock_bh(&msk->pm.lock); =20 if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { + struct mptcp_pm_addr_entry *entry; + + entry =3D mptcp_userspace_pm_get_entry(msk, &addr_val.addr, false, false= ); + if (entry && !refcount_inc_not_zero(&entry->refcnt)) + pr_debug("userspace refcount inc error"); msk->pm.add_addr_signaled++; mptcp_pm_announce_addr(msk, &addr_val.addr, false); mptcp_pm_nl_addr_send_ack(msk); @@ -312,8 +317,10 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struc= t genl_info *info) =20 mptcp_pm_remove_addrs(msk, &free_list); =20 - list_del_rcu(&match->list); - kfree(match); + if (!refcount_dec_not_one(&match->refcnt)) { + list_del_rcu(&match->list); + kfree(match); + } =20 release_sock(sk); =20 @@ -398,10 +405,16 @@ int mptcp_pm_nl_subflow_create_doit(struct sk_buff *s= kb, struct genl_info *info) release_sock(sk); =20 spin_lock_bh(&msk->pm.lock); - if (err) + if (err) { mptcp_userspace_pm_delete_local_addr(msk, &local); - else + } else { + struct mptcp_pm_addr_entry *entry; + + entry =3D mptcp_userspace_pm_get_entry(msk, &addr_l, false, false); + if (entry && !refcount_inc_not_zero(&entry->refcnt)) + pr_debug("userspace refcount inc error"); msk->pm.subflows++; + } spin_unlock_bh(&msk->pm.lock); =20 create_err: diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d0eb7b84a262..3093766dd224 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -8,6 +8,7 @@ #define __MPTCP_PROTOCOL_H =20 #include +#include #include #include #include @@ -244,6 +245,7 @@ struct mptcp_pm_addr_entry { u8 flags; int ifindex; struct socket *lsk; + refcount_t refcnt; }; =20 struct mptcp_data_frag { --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2074.outbound.protection.outlook.com [40.107.7.74]) (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 543A62595 for ; Tue, 7 Nov 2023 08:16: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="q896oLBV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kONUMccUaatsagA3po+KphKVonlCb111446FbAfqsR8XMDrZ5FaxyBTjxLpD1/eBOnOGzLArPjXmreX2D1T9TjGGIYgMYI0j0sLHywocR8rIyHFbmaazm4sEQfAIKKy1KrcTKlRhPwuYEvJMwUDjcMav6/cWcy5DE1WjV9OyXYfbmqV90P1YY4xCCQP1otny7kWsNl+ArDcsfYi6lxe3ZhN93rqs2xjzwR1uoni4BaOX2Ui22XhuRAyXoYDmkV/Ln9AH9q381awxOBj9/EjX92V5cfzxYhFAut6qHKIggNJeigtXW3x8NI2+x3H9XL89J3OZpi8rHUdKWazKYVULJA== 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=0XWVdS4WMVaWZ4WA1qkFSXtjr+/dygOEsK/fiy/+8Y0=; b=KRmoPRvbMFvrAuwpBy9P/5fKbCZOOwZv3UQJt30RYB9ZxRvss1ZHTfemiVMnk9ahuFzm0l3lGb5u+7wCoYHZQ24g3sK1enApE+xlcLHEsq928mND/Vd9Wmy7moRKIf20gVVaRDcQ4WhtEaOC3kGGkAgmYFfsPEyovI8DAISpu6TpdFKrzJSN4OShRXI0blgVhA7/pLWc+gro9SDt3ZjGcwL6cKqpNHd72gkPTfPGB1JXr8sA6oOI8Jo+3Fxw1SiXExqcqmNCFna/XNqHUT+E7cbPvd2SWu8blE4gUsM8d9s96M/9dyUyduLWlTKvE7wSTywyNIkKOeWMOc3hY9+KUQ== 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=0XWVdS4WMVaWZ4WA1qkFSXtjr+/dygOEsK/fiy/+8Y0=; b=q896oLBVaSj99nKQypbQd6ulInahjm5ADdFbA7pU6eZuX5wDIlAR7+vD21t6NpK6kvdoV9/M2uCW5JMb87R3z1mrPC+k0fdb8yXfZIaAZfHsYA75CZXO2ga/GPTv9Ej2gBe1tTPAAhSp4aqUhffG2t5qKRG3WCobnT98OltpebqknEq6lgR837eHzk+rjvDE7ES9WP+cQhao0deZdAB/cPBP71uyFvlAq/s/NM/zX9JPRtSr7MepZx7SXiFfeMbWDYQEkV2qs/qdwT6Hnzmk3GXVyvWUPiri3qj1dKPzXVLxfVeB3jxaVvoDpJyJTm7pncww7H0/5XLXd2eGDMRPfg== 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 GVXPR04MB10023.eurprd04.prod.outlook.com (2603:10a6:150:118::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Tue, 7 Nov 2023 08:16:34 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:16:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 19/20] selftests: mptcp: export event macros in mptcp_lib Date: Tue, 7 Nov 2023 16:14:25 +0800 Message-Id: <0ac7527203cd9809e661981f29bbb55704de8a07.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0054.apcprd01.prod.exchangelabs.com (2603:1096:4:193::22) 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_|GVXPR04MB10023:EE_ X-MS-Office365-Filtering-Correlation-Id: ed3f99a8-d4d1-48fa-900d-08dbdf69db23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LtPYQWz3VWPqW/PQrN6CAcFtlixB72xU+QQE3UD0+ZQepLDkfi8vztpHijDn+JQ/O1H9CEL1FiLmKMxOkef/sNHvJswGyap0T5Lt4fp6/FSssKSG7c9o3I7ZiNE5AaaGu7rN/gyisPKc+49lM0I0ma9WF47ke+PMq9hZMK9nYVr2vkeGkyELLEvhDV2UisI/aUAwbem9HRAUkaHf/6BSa6IAOQfUYvAsP7GI5FLdtZBSbDFbHBI8SB/CuRVbthkrEJc3JF6RKcSE4q0plKaOKzLpaBXOw3ER6vnPX8NafH0RI+z7llOd4mt/gytP8tBDKlEVRsPSR00kTb6xkoknmJmKO8tcbmkYZZQ7wrAcQnpFxv+VOHBS3nTcCGpUgbgyWgie6v1qYuaf8VTjbwGFouUdIHYCWXcOJkALPBtUfr9qc7DKVtIdt7CpLQAdWjpzDE9R6F3GxgJUUV5h145zXbPVyKEzMYQvtDIsFSxzwW/mIieNAxseCwrd+pLV1NqHYgskgJvTcYPaXBooEkLcG8GjVl7iaJwBUIQXcfhlhjAm+lrXh/XwGpY4i1OYAltf 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)(39860400002)(376002)(396003)(136003)(346002)(366004)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(6512007)(8936002)(2616005)(107886003)(26005)(6486002)(44832011)(36756003)(8676002)(86362001)(316002)(30864003)(66476007)(4326008)(2906002)(41300700001)(6916009)(5660300002)(66946007)(66556008)(6666004)(6506007)(478600001)(38100700002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?m4KZvboz7YMACGMn90dLnw0HWVe0iDwJrPDLOZYLR8gukRQVBPuUsJvjdckt?= =?us-ascii?Q?IKrgjiiNwBXIyUyAuRhb/M2j40onbTZ3c/XiqzqRZmaoOfh6KJP2+/FltSuZ?= =?us-ascii?Q?LBV+9sBDDlDNcM/lZwGZve1oQd7GpB/5cFCSBnI9SEVwIZ00qOFY5NryYMyX?= =?us-ascii?Q?WBy4GQuLEkGA3wKBw6yP7qXeYDmFB3DmC1xDlksYpUupTs06hqEo74g7DtOU?= =?us-ascii?Q?utUAez739Hze4YLKIOOvPnltShSe/YH5bR3P1T2BYX+S+4LFbncful5TPbk9?= =?us-ascii?Q?hiH5zGUAb78WBaJZbW7LbR60+k+hAEFTOjzfPHpAJRPvu1JErYuak4OYtRuM?= =?us-ascii?Q?PG3L5mxCAaUMwCm4bGPqZt1Agri+hBR0NSR1sTF0v0iAXXEg9VwDlACCwuqE?= =?us-ascii?Q?JTcGdxutBjLcXizAJllU6TEUxxR4uBQvLaic7xaSWz1Fg+LrNqI6YoY2Qrlk?= =?us-ascii?Q?HCt3cb3FnDWYB4i/MrTUO4N55lXTbetPT9XWEbS2Shv5agUIV5di30cXzV6r?= =?us-ascii?Q?JkoWWWJEAeS8jB/pS5jnLMVqgSUWDxTorlTUyFvnVWEfRKc1En52vMqNAehK?= =?us-ascii?Q?PzRK6gMa1PaUy+yT2mvFNzveygfa7YeWzvpB1XInwUO2kurW7k4OP0XY/d7z?= =?us-ascii?Q?IHaVV/N15ul+9VYlTrv9z2YID8Wsr1S7HBgkmg/UaXfIB7fz1aHJk1OSct22?= =?us-ascii?Q?a4LYCSl/Oj7S9maJf/Kvl0TO+p8iBv6PlKXvLtEL6fp2FRVEhQtUdFYQ2+c2?= =?us-ascii?Q?w+KA3I7DhUqg1x2e11BinMmLtBflooThFnI4TT2lVPcY9b+eot/rXtdU6+SV?= =?us-ascii?Q?TCfuSCYzXYuQ65Umz3Oi5c34ctZmmQsTtOo6dOQ1Mu3hoJ95XJVKJ7vdEE0e?= =?us-ascii?Q?rC0iV4LGkPMz+YAMfEoVg4SQz1q2oaUlXP5jGodcz3d9CyrwMI1VammHYOES?= =?us-ascii?Q?/Ye+qvAPERpHODXGDe31kdk5L1P7RxUFNk/g77g1HPG1koWKF+rpA6UObp9+?= =?us-ascii?Q?0Vh93uZRp0mls+8W5OjRmoW07K9AwXTnn0/sloBRGUVcysmMfNeURcrMUDb0?= =?us-ascii?Q?FJ7QxQu4s/2dHNRa87aCaTTYjiSL+omSpP0gvqN5q5p8GTd8Sdio7IaLTt3G?= =?us-ascii?Q?PEE2IqD/4bhKcWTdlZMEE3D81uR5KYL/6hxPTlpxEoV5gCZjErNuGrHPySls?= =?us-ascii?Q?iyq1varzxgjhDcKq5r16aB3ginoST0T6iNFg6WhxVwfheYmaHuC1FjcZxdFH?= =?us-ascii?Q?M2AocVuug15TJWRKOIEWe147XOQ7OLN+sfD5eJ9sIYcStmnoRsSD8HjjJVdl?= =?us-ascii?Q?g5lFWZ3W8b9AvlEErvz/VzqVkV7ZMxokBHk+gabarFiJIBkKvnIEpVCin+sV?= =?us-ascii?Q?0Vv1IQRTVe4FBz2fmAjmyc4fcxeECHHC0W/+FE1D77rsb7ZuxJSA441Cn9ai?= =?us-ascii?Q?FWr3gDfRdbpoAEL0IC/aNKTAWYbSs98zcFk3d3XMJHls+aNoF/KVOnOj4qFb?= =?us-ascii?Q?RYKSGWh0e8Ceez/iYj+Y4YqsX5o3h6s9Pj9ZfkD/kQX/Ipg3HzNAnkV/x2B5?= =?us-ascii?Q?4Q9l1lriHYWhoF+b/zc9EgAqMXhtsAOJBgPsHAKw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed3f99a8-d4d1-48fa-900d-08dbdf69db23 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:16:34.6259 (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: wVh6BOrsHX1EzNeQGZ5t6td1Rl3DwHEKPwZcgVWh5mMBJFACJpXx/nrUOJYT535j6utjrLCuKFgKwog40Q9FGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB10023 Content-Type: text/plain; charset="utf-8" SUB_ESTABLISHED, LISTENER_CREATED, LISTENER_CLOSED AF_INET and AF_INET6 are defined in both mptcp_join.sh and userspace_pm.sh, export them into mptcp_lib.sh. Add MPTCP_LIB_ prefix for the first three and add readonly for the last two. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 21 +++---- .../testing/selftests/net/mptcp/mptcp_lib.sh | 7 +++ .../selftests/net/mptcp/userspace_pm.sh | 60 +++++++++---------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 634b51e40435..f922d32f4f20 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2777,13 +2777,6 @@ backup_tests() fi } =20 -SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 - verify_listener_events() { local evt=3D$1 @@ -2797,9 +2790,9 @@ verify_listener_events() local sport local name =20 - if [ $e_type =3D $LISTENER_CREATED ]; then + if [ $e_type =3D $MPTCP_LIB_LISTENER_CREATED ]; then name=3D"LISTENER_CREATED" - elif [ $e_type =3D $LISTENER_CLOSED ]; then + elif [ $e_type =3D $MPTCP_LIB_LISTENER_CLOSED ]; then name=3D"LISTENER_CLOSED " else name=3D"$e_type" @@ -2866,8 +2859,10 @@ add_addr_ports_tests() chk_add_nr 1 1 1 chk_rm_nr 1 1 invert =20 - verify_listener_events $server_evts $LISTENER_CREATED $AF_INET 10.0.2.1 = 10100 - verify_listener_events $server_evts $LISTENER_CLOSED $AF_INET 10.0.2.1 1= 0100 + verify_listener_events $server_evts $MPTCP_LIB_LISTENER_CREATED \ + $AF_INET 10.0.2.1 10100 + verify_listener_events $server_evts $MPTCP_LIB_LISTENER_CLOSED \ + $AF_INET 10.0.2.1 10100 mptcp_lib_evts_kill fi =20 @@ -3396,7 +3391,7 @@ userspace_tests() chk_subflows_total 2 2 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 userspace_pm_rm_addr $ns1 10 - userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED + userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $MPTCP_LIB_SUB_ESTABLISHED chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 @@ -3419,7 +3414,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 userspace_pm_rm_addr $ns2 20 - userspace_pm_rm_sf $ns2 10.0.3.2 $SUB_ESTABLISHED + userspace_pm_rm_sf $ns2 10.0.3.2 $MPTCP_LIB_SUB_ESTABLISHED chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 980ef3dbb6ab..ffd78187237b 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -8,6 +8,13 @@ readonly KSFT_SKIP=3D4 # shellcheck disable=3DSC2155 # declare and assign separately readonly KSFT_TEST=3D$(basename "${0}" | sed 's/\.sh$//g') =20 +MPTCP_LIB_SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED +MPTCP_LIB_LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED +MPTCP_LIB_LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED + +readonly AF_INET=3D2 +readonly AF_INET6=3D10 + MPTCP_LIB_SUBTESTS=3D() =20 # only if supported (or forced) and not disabled, see no-color.org diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 34344c481046..024043a00518 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -25,13 +25,7 @@ fi =20 ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED REMOVED=3D7 # MPTCP_EVENT_REMOVED -SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 =20 file=3D"" client4_pid=3D0 @@ -525,7 +519,7 @@ verify_subflow_events() =20 info=3D"${e_saddr} (${e_from}) =3D> ${e_daddr} (${e_to})" =20 - if [ "$e_type" =3D "$SUB_ESTABLISHED" ] + if [ "$e_type" =3D "$MPTCP_LIB_SUB_ESTABLISHED" ] then if [ "$e_family" =3D "$AF_INET6" ] then @@ -582,14 +576,15 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2\ rport "$client4_port" token "$server4_token" sleep 0.5 - verify_subflow_events $server_evts $SUB_ESTABLISHED $server4_token $AF_IN= ET "10.0.2.1" \ - "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" + verify_subflow_events $server_evts $MPTCP_LIB_SUB_ESTABLISHED $server4_to= ken \ + $AF_INET "10.0.2.1" "10.0.2.2" "$client4_port" "23" \ + "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 local sport - sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -620,14 +615,14 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl csf lip dead:beef:2::1 lid 23 rip\ dead:beef:2::2 rport "$client6_port" token "$server6_token" sleep 0.5 - verify_subflow_events "$server_evts" "$SUB_ESTABLISHED" "$server6_token" = "$AF_INET6"\ - "dead:beef:2::1" "dead:beef:2::2" "$client6_port" "23"\ - "$client_addr_id" "ns1" "ns2" + verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$serve= r6_token" \ + "$AF_INET6" "dead:beef:2::1" "dead:beef:2::2" "$client6_port" \ + "23" "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW6 from server to client machine :>"$server_evts" @@ -659,14 +654,14 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl csf lip 10.0.2.1 lid 23 rip 10.0.2.2 rpo= rt\ $new4_port token "$server4_token" sleep 0.5 - verify_subflow_events "$server_evts" "$SUB_ESTABLISHED" "$server4_token" = "$AF_INET"\ - "10.0.2.1" "10.0.2.2" "$new4_port" "23"\ + verify_subflow_events "$server_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$serve= r4_token" \ + "$AF_INET" "10.0.2.1" "10.0.2.2" "$new4_port" "23" \ "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -698,13 +693,13 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rpo= rt\ $app4_port token "$client4_token" sleep 0.5 - verify_subflow_events $client_evts $SUB_ESTABLISHED $client4_token $AF_IN= ET "10.0.2.2"\ - "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1" + verify_subflow_events $client_evts $MPTCP_LIB_SUB_ESTABLISHED $client4_to= ken $AF_INET \ + "10.0.2.2" "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "= ns1" =20 # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -735,7 +730,7 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl csf lip dead:beef:2::2 lid 23 rip\ dead:beef:2::1 rport $app6_port token "$client6_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client6_token"\ + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$clien= t6_token"\ "$AF_INET6" "dead:beef:2::2"\ "dead:beef:2::1" "$app6_port" "23"\ "$server_addr_id" "ns2" "ns1" @@ -743,7 +738,7 @@ test_subflows() # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW6 from client to server machine :>"$client_evts" @@ -774,13 +769,14 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rpo= rt\ $new4_port token "$client4_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client4_token" = "$AF_INET"\ - "10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "= ns1" + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$clien= t4_token" \ + "$AF_INET" "10.0.2.2" "10.0.2.1" "$new4_port" "23" \ + "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -819,14 +815,14 @@ test_subflows_v4_v6_mix() ip netns exec "$ns2" ./pm_nl_ctl csf lip 10.0.2.2 lid 23 rip 10.0.2.1 rpo= rt\ $app6_port token "$client6_token" sleep 0.5 - verify_subflow_events "$client_evts" "$SUB_ESTABLISHED" "$client6_token"\ + verify_subflow_events "$client_evts" "$MPTCP_LIB_SUB_ESTABLISHED" "$clien= t6_token"\ "$AF_INET" "10.0.2.2" "10.0.2.1" "$app6_port" "23"\ "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created mptcp_lib_kill_wait $listener_pid =20 - sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $MPTCP_LIB_SUB_EST= ABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -886,9 +882,9 @@ verify_listener_events() local saddr local sport =20 - if [ $e_type =3D $LISTENER_CREATED ]; then + if [ $e_type =3D $MPTCP_LIB_LISTENER_CREATED ]; then print_test "CREATE_LISTENER $e_saddr:$e_sport" - elif [ $e_type =3D $LISTENER_CLOSED ]; then + elif [ $e_type =3D $MPTCP_LIB_LISTENER_CLOSED ]; then print_test "CLOSE_LISTENER $e_saddr:$e_sport" fi =20 @@ -923,7 +919,8 @@ test_listener() local listener_pid=3D$! =20 sleep 0.5 - verify_listener_events $client_evts $LISTENER_CREATED $AF_INET 10.0.2.2 $= client4_port + verify_listener_events $client_evts $MPTCP_LIB_LISTENER_CREATED \ + $AF_INET 10.0.2.2 $client4_port =20 # ADD_ADDR from client to server machine reusing the subflow port ip netns exec $ns2 ./pm_nl_ctl ann 10.0.2.2 token $client4_token id\ @@ -939,7 +936,8 @@ test_listener() mptcp_lib_kill_wait $listener_pid =20 sleep 0.5 - verify_listener_events $client_evts $LISTENER_CLOSED $AF_INET 10.0.2.2 $c= lient4_port + verify_listener_events $client_evts $MPTCP_LIB_LISTENER_CLOSED \ + $AF_INET 10.0.2.2 $client4_port } =20 print_title "Make connections" --=20 2.35.3 From nobody Sat May 18 17:15:58 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2085.outbound.protection.outlook.com [40.107.7.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD4DB2595 for ; Tue, 7 Nov 2023 08:16:42 +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="Yi8Wx5wT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=INwUzYRKO6hZnUL+Be2r+fQVHijxm36MX9R4puItUBHXGodAEA2OHT7KHJkrtlas6vNCpimPdcZNlHPfejI0xZtoZFUhVnbHRb/y7Xwao2O/5WTX0aD8F6yT5SfCbZd8avGbX8F1Z/UFCLb0FBfz5Nnn+HRYpM436BIh15aQVrDbyHTuevKyvwE2rfFduoPqEqrONIa6VGugwUnJJFZTEI1DwbOuyuKfvUQ8pFZVjWDv6SSEPkBVYPJYa/JSBlMOaB9pFlvmmwX1SZsQjRKoy+8ATA5enPBMyuc5Vkc0a3X+HHn28pX6DAtTm9pMWpVJEHM8B6Acv1of8RZZE1I/Bw== 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=oIp5cD0EI7QTXP0DCZ+EvQq9UnqJZrrDxfcKnTTWKtk=; b=J26OrfrjO/v54UPj/xnLGJC3E+394ERIhaVKnvjmBPLXm8GcC3IOICJhxBGSSMB0hXSR3AxsY6ncWOwcrJqbYt05fOpgbc6JW18KSKPD/2pP/jn9RDJvGt+KvZZSMtdKxGO76ZqLesNbAcmisx8kDCNCMATOMniFatFoWptHmWvm0grqcBlgy3iSMqv1fmkEVBYfQ4TIYmjTsfc5sBXvHGQFpjxYszp96PaPb+zIFrnwJPGNYbFAkxYWwXAKXUo5NDy0yWOP1aQJk1lTYtb9krGgyXCsQoq0RsIIbNlZ86SMlE0nrvRqO/m8M8ciyOF3VuBju/aRYOlnTUmB55cSiw== 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=oIp5cD0EI7QTXP0DCZ+EvQq9UnqJZrrDxfcKnTTWKtk=; b=Yi8Wx5wT4zK7bJp9KokdrJDrJM5G/wkhH1hdlua89Z6UcQ0PQj9GukYVicsHNPlepoQSGHcTnjX4zpUusixnh0cBgzvCEnsG+GiWa50j6S8ZIJHlVWOYNtIoPoY1Mkz7DD4JIz2FBS0j4UYDvkwuuPaMcEM6jqjbWrzv9h3it3AXdyC4m88Z5Ja4jWU2BohvD7nrYNn4FWhr82lvqrNo3DfjDBWwWijD2dOuZLU1TA5NOArNwpVo9FzOEUWJ8NWoAWXifDwNdVEwSmatIJD8T5j7QBoS3F0E3dAnl9CRU80RtPYMXCPSKZ54lxWDbgrne9/PeRJsOX9xOa4yr4s1Dg== 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 GVXPR04MB10023.eurprd04.prod.outlook.com (2603:10a6:150:118::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Tue, 7 Nov 2023 08:16:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7102:259:f268:5321%6]) with mapi id 15.20.6977.011; Tue, 7 Nov 2023 08:16:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 20/20] selftests: mptcp: rm userspace addr with random order Date: Tue, 7 Nov 2023 16:14:26 +0800 Message-Id: <125303e29562b201f1f6f441ba5289b1904bacbf.1699344621.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0049.apcprd01.prod.exchangelabs.com (2603:1096:4:193::13) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|GVXPR04MB10023:EE_ X-MS-Office365-Filtering-Correlation-Id: 63024f06-6671-47a3-eec1-08dbdf69de90 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BZPZ1O/IkRhM+MjxH1UwqqjkMjIqIArl8wenB1IoDRFjZUzmRlGtr5GvFtb4xBZ/1jf+y2upqH76pWzHsiK97F2v1sntSCqIlTTZ7b/Dr5aR3iyGxtk1hIwzneKWPcJSR4sD/DUJ64BYB+d8WH+Cm2QHmI2u5OvEZ7GnqPIQLGkxaztjXLUoVVClfJMojZ25HBXcglPkF2ZW5w+jr9/fmnyDxXp/t3aMjBI2um5QLKAZT80+OI+6vk5yQ6y92SBVo6FnRoT/NqBR/mOzViY72sEk6WKBh4w31PkLbKRRMiC/sjwDnE0eFQV1EgxT6j6mF41gQnX/wsCdyugKKBYyyCiflEix4cbet9H/r8buL0gc/5YPqonuIjGtnzT4O3wQyIcD8pzBcUbiuzHsb1ERLjNHLYhe8sG9/W6dMgyumeVjx/LnmTqQpNqFFLIFlzattT2HQLgByijDCPIV8PW1YWnyGNKWF3rJGjrLgir+ZUXaiKuVmcBBinM76+pV+5BxKK1a1yzmAj0B9AmHR428vh380MMxKjsg0vsgjiHGrQRGGN5VB8XN2s6D2RSLCpb5 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)(39860400002)(376002)(396003)(136003)(346002)(366004)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(6512007)(8936002)(2616005)(107886003)(26005)(6486002)(44832011)(36756003)(8676002)(86362001)(316002)(66476007)(4326008)(2906002)(41300700001)(6916009)(5660300002)(66946007)(66556008)(6666004)(6506007)(478600001)(38100700002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kjNR+3kOVZs2PZXnm9lXXp6kqReCz5f87piOxX1z2ORbSrm5Ew2Kf+uhuh6h?= =?us-ascii?Q?ZuZUTIOA1PSzOh3A2Xhx7HzvNJZLV3ONaObYj64f25gV2BMRPI+VYwz8kkEf?= =?us-ascii?Q?5RhgsTYZTvF5isFEk+ys2ewvEK9giz/DgP+VBeiEcKZ9Ei8hvwwYyvJTqV+S?= =?us-ascii?Q?rrPgFb37WBccguV6GvfUfy13rfTv2M6ejaVi0Q8NQxFbovljmtGAFub6DzZt?= =?us-ascii?Q?kz9KS7c6Q6QdV/q63qRjBG6+ZKVxGhukQJ6BPKvkod7M/sNNqLZkg9rpQ20j?= =?us-ascii?Q?In97p/sX9OFAXVmtNpf5cGI5FjxxGbXtIqFp82om70bbf9YUelvVVrH70sT5?= =?us-ascii?Q?M20AUZEP1Yo26Kz1eHVAqOQ4QGVqlFcfdd1sQa2RkQHd/x+TCgb/RPWUMjzn?= =?us-ascii?Q?7jCqpUpnF6qBDq6PtmD7Wvuvm+jxJfecQ4PenIsj99oGl5oDGgtLcpoG2E4I?= =?us-ascii?Q?wy5EKUG8qNFPcwkVC6LIq01dZEB4XxPyCz5uK8Cf+zLakcSI3BvU/JMFvJoq?= =?us-ascii?Q?gNzUrNzyfILUakpHVFCLEIxbi8So8FaX97wkI7xdYACNkEWu/OHlyqqZC/Ya?= =?us-ascii?Q?n+gJQrTYDVAahYM6whdWuyKMKeJAfKjjNn25vUAzQl1/spXVf931V4sr1Qx/?= =?us-ascii?Q?ikJXR1m+PQddinjZ2gdLiqdlbeV83pX0H5k6KtYoYToVqBSmhUQRK6dhqLBG?= =?us-ascii?Q?ohXinl+mZoDZeOGyD15eaUQ8JPgcSmskWER4hngEBAjZK3orc28AcZdUmoA8?= =?us-ascii?Q?EIq6xNhhhE4aFx8ktJoI1Gr3aU9+9CoK65+lxPHOnaedcUaS/tz+4SX9pWvu?= =?us-ascii?Q?Yd0oqXUb55wGPHJbC+M7Y76gv6kwSc8qm2IpyuDUtTPswU72+Vx36LvT7nw9?= =?us-ascii?Q?ELJ6MGkkJf00CzJSilJnp7JnXBfordK6wRt4UAYzQ7Ua2gnGyXtYO9KOC4yq?= =?us-ascii?Q?5AtZKLXctq4UXDJUawGtzfTY1M2ndhBKotMxhIO4gM8j37qD41FjkzV7blRx?= =?us-ascii?Q?x/1bjIkE9mG7JDJ3tabd9uktmZYm/pjn9iPbNFmOpJqfhVBsQU8f/DoBUpZE?= =?us-ascii?Q?4IlNJi54wwlF8pl3Ls5xB1KvedWrCg6ruwbOq8gJPNazXgr2jx0wKk3KW5a1?= =?us-ascii?Q?CxsHtkRX3Uv89cKYZMI/CC1mQlzBv1GpX7K0AJ6QCyW0mohQKPFc/THbbMeI?= =?us-ascii?Q?8a/viIczAniVtMogxHHWnu4UYRDW5fPNZ7drMbNAtMtI0Qw5X1CbtEelISF+?= =?us-ascii?Q?sPCNcnCA07I1Qowh7OnvI5gWoJOTu8EzcRGooG8XW7xarlLPbYGgW3ha/89S?= =?us-ascii?Q?SAYDHNYZb8bK1V43IWQ55uK2KLVYcnsbWts4KQd6crAtZfrnepZ3ZiL+5V3E?= =?us-ascii?Q?n6/NoOW99AtlDI7RjnpLfQ0HnJX989NiEbOqsRFnFBX18KS+2bJrknep6k+0?= =?us-ascii?Q?shQMKegHEMveIl2/fR9hWD8CcTHiAv5gfWnwDXBKWiPgM1MU2ax58AYw7dDm?= =?us-ascii?Q?aDkkswXSHej/QXebUknG6OKPpiyfdGi/RfrJiG2d9B18SXLuI9JEHXxC33aM?= =?us-ascii?Q?NlEqcGDAMmshfSJtZeeXvhVOVLm/Xtap6mqgO4Bt?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63024f06-6671-47a3-eec1-08dbdf69de90 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2023 08:16:40.2699 (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: FUR7T53UTaMhMRWi4EGPkmlctRXpkV5h1AAlMp1HVAfuCi/VYoHIXfCDQgZCe0jT+QPQhGa01sC7Zcfjs6MXTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB10023 Content-Type: text/plain; charset="utf-8" Previously, when deleting a userspace address and subflow, it was necessary to follow the current order of deleting the address and then deleting the subflow. With this series of changes, addresses and subflows can be deleted in any order. This patch uses random numbers to add this type of tests. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f922d32f4f20..8f7112cb120e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3390,8 +3390,13 @@ userspace_tests() 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 10 - userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $MPTCP_LIB_SUB_ESTABLISHED + if [ $((RANDOM%2)) -eq 0 ]; then + userspace_pm_rm_addr $ns1 10 + userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $MPTCP_LIB_SUB_ESTABLISHED + else + userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $MPTCP_LIB_SUB_ESTABLISHED + userspace_pm_rm_addr $ns1 10 + fi chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 --=20 2.35.3