From nobody Mon May 13 04:33:11 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 64E8F368 for ; Sat, 4 Nov 2023 00:26:54 +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="jrkW60T0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wn5l+Ig9FuXqj5rkf9aX4GR1hdOgIB1Dy2Xb8X/sWF6EToMEfkTGOEYswM/HQ5eBIm2CW+buHPkoxxCooJ7m3EnCQ8H1Eyhq+Osfy08tZLP8/eZVW+QTddJPWtoCAJ8DsDMB2997PmVFl4I+SHHkge4JalMx+U5v7o9c2PmInp51/mLV7h6exMmOWCC5wZ1ATSMS5DuQRKTnEd5xYuz8HTpfz4BTXuBtmZ7DufVO2gTUhIfMfe/82qbPWeum2bXpvD11eWmh3w0KF4hcf0M0lEADKNfItlYbunnJ9N/g6bTptkdc+UC+969SrzwvBv/wpwZm8UcVmvsp5Ig/mBGpBQ== 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=PvyPMA/bySFPFIqW2JDW9tr13OIXOzQbjy0djyw9/h8=; b=b6VE++aKJnUTu0dMmPfXBiFa/zEuorZd5BMg+PB+eAxwOGif464aLKJP1/Gk85/cc3iiCmhvxyU9E+BHq0CRc/KQKhDmW37pBEIO+hlFor0kdYYYw22NMH1HJFjsEBZGl8uwEhUqoBJiOel8Q1iP/q2/C0woZTLj2Myl/+nhjmu1Q7PjqliwGoG6lZ+VIKKMW6F/yI2myUYpW+2PVFbNROT5+LnVkFK2BVijvP5xvnuC2BRJwp6wESG2udEMtWDP0wBUrDP0+KdZDSJAYxubjBRCJ4pgr4j6o+lKD+F2CX1Z8AHljfhGPNXLIDXoUlfuxy+R62h2ON/7TrxGHi6lGQ== 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=PvyPMA/bySFPFIqW2JDW9tr13OIXOzQbjy0djyw9/h8=; b=jrkW60T0/Rr1pyNGG6SCa5llZ/+c2X+FJpETRAxdFh6aupzGKnpxycWKDVz/c9gC5H1yC0D9Pn33KxeJcRNC2o8UKFNf6uj+4WSktSJ81145L/8iEyb9mUeTNoU3Z+ytpp0yr14Mm3WE7VPpBPMp9t7x4s75HfOUCeBBultooBDebkeTtxQvb2yAtIaH+o/juv9xnaX1Gv8iHdNVKaZc9eVFk/DA+/SHlOBPRji10KrU8YbU6Tjpg47zjekBseLkEfW0PAIFuEyqpMhKXojgQtFDr+40eWRQ3jW0zemOE33x+9shh+XtA1cMDq/QTdnBSBizrdzPgdj2IcWlWeNQ3w== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:26:51 +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; Sat, 4 Nov 2023 00:26:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 01/12] mptcp: add userspace_pm_get_entry helper Date: Sat, 4 Nov 2023 08:26:12 +0800 Message-Id: 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_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: a4c3a527-c770-4c6f-d428-08dbdcccbd69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y+zer1e+YvS77//DX3Gk0ry5DlQSNc0UAdBm9/s1wU0q9dTTr97C3RaZWEbJwMLRTQjRasVaeJCHGRAmqaFe+iE00fIkCdMe9x5SwF0oafICyyvVK+68InvJjHFn+3FBMqymYUc+crH9YlZLcc1tH2ZfIlXeoYTs188d9P56nnDb2YQhBZDPbcuvtZw0OT/oqM2FvEqyGjAKcE3m4EQcA7vsp+2OqwHjUl7MX520gjcEYwovXu14kIQDn6EtL++/6SEFibr5kN9oJGlphwIKodTvxGS/P2RO68S+u5Ccp6o4o82DCeBjT3ugbAkMlUmfDNN1BCZpNXf77YpeUpELVw/jzHEK6Qru45FnNtBzH2B/Lys6uzMpJLkcOb7yWIlW64X4vd1GSHou7O2DOUoxZIB+/e5m5X2sW0sJsMfma8i3zty9sQPINdPkwnvuYl7ReERfkkG+Va+uqz9MSpbuNBKZJNaY3BA1aWh53n+vTIcNDWagt1wJMIrnvyTfGA+KMUU1Em153BHzowvbpPF/yawTNT5LO0BvJnimu1WWX+WceVnGDhi2S3xuulSPX34xa1wJNEEFbsEdyDKAKnRn78n8ZnmmFLYBLv/l1Z/8nRk= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?t7DBsYptIuumcDSE0NBpayimkLZAUeScbOW2CW0JJGk8emlqo6ZHM6k7Wzbj?= =?us-ascii?Q?txR+udt2f+8MZvl7MrmyP0fB7PL7zhoa0graVawFFkvHlrt0YnsQllApPwfD?= =?us-ascii?Q?z4Br5dkyQVdL/s+11BC7V2zEzPqNo7/ZOfI3A5c3DgEdsNn1ji7/eUylOTd9?= =?us-ascii?Q?xfyTtippvmEFAahjt3XgPieoHZvxrJNRVCYGXEGCu+ox5yuG4K98YAnKwWsO?= =?us-ascii?Q?cjc2ZHBl5umE1akETvc5tl/thRDkAZ+wKgzI2D9s2u/C5fpQpjAGAGcTK4Vi?= =?us-ascii?Q?SYtWXhtyxu9ApWeCuiVYK6Kqen7JPA/7/gZm3tDlT4CEU5dkg3h+fQg3a2mU?= =?us-ascii?Q?xbj7FtXJZZh+ZV3dFSkzTQrnpPGqFMj2lgz9atCc8HmCMV2fMJxozX5WFBh2?= =?us-ascii?Q?afakm12Xn45DEE9f66QbKD7pz+5+vF8n/XKdHPR+EeI4TQtBJDkKkF67706x?= =?us-ascii?Q?BhKF+sXtyQc2AsGSevH2wEMacDz0ew0X7b7sZAult4dqgbQAqm1aO88uYx53?= =?us-ascii?Q?0gSqWa8BT5Nfr5tByFuP9qzjPPy3ZDUqZPAJIlOBC7ppJOrboIHX3f3z6ATm?= =?us-ascii?Q?4s0HOgbPOUcXB/vSNKgfUcBRQuEZD05X7qfJ3GySQl4B7gL/QIHVKNrrsXpC?= =?us-ascii?Q?IBEuobDnxX8I8O0WTscbTK5ujxe4x7VKywX67COX0UC9G7CvRle0JXJ6HJYv?= =?us-ascii?Q?TOaKQ0kcds/bWf29vhImftn+OgtS3rxMqeCmipXOev9lhpnePVaFXgzzZJhg?= =?us-ascii?Q?Y7KdP2B49R+9sRyslT0BIhfyMweJVba9mZPEV4wCw8tFUn9HXsd2gUbZbKSo?= =?us-ascii?Q?OtqOss7mfrsFUZa4DSRD4wG1uurnqyVCqV2fNeTECSGEPmYi8lvuZWk/luUz?= =?us-ascii?Q?CEO0JaqjLwcK4SM4SIQP49IdcvjVfEkRUuBEgKpqRY6F1r4Xn2XnhrbD1sCQ?= =?us-ascii?Q?krncdUkyty36R43o+IyHumTHNTtECwbVS2oFMZkGAO4sonfaTyX30tKrf3g3?= =?us-ascii?Q?d6jSCuTLJ7C9n4XzOcDTw0cGx0GLIl3m0HeEf+LNMCbkryKwCeUzpo16b3II?= =?us-ascii?Q?DQQ3qkUniJ8Dh6IwuWiR9zNkTa9IwIAH5jESVAIkp0ffZ2GQayik8v5qo3mY?= =?us-ascii?Q?iMMo5hVfcxBKf5a1w3wDWd1JPn8UZph0ZOhWBj7Zs8mhVDv6kRNF2ewItlGw?= =?us-ascii?Q?IkSgwvJJ+I3Wts24ARk1y2TRE8ikNrM49pJWK3xJlhqqjkPxNeYakHXohAfh?= =?us-ascii?Q?OyvLsOsIcjCMQkY+7a2PqnAqj2CwvnGMunhYqLiLykC+Pe/D02zUib9SXMvx?= =?us-ascii?Q?seFQe1Sat71kpDT1hi3hEQmNjHPxf814D80zEqQhotLIUGXhl8U5u2f24y+T?= =?us-ascii?Q?97NIOyEE7+9fsuR+18tz6MEFB4oOpvTI3muSxrlzbu9LbRucEoxWS6e72mat?= =?us-ascii?Q?rvW/gQqKssfSOqb+J0B76yZ2dkj1hnzZIUNCPEZbmhAbvU4ZXNpCWysDN96t?= =?us-ascii?Q?w/I14HvXv2mV0Mwkdtev3jA7RJqvKCLllLavwEwChK/htEfkmh2EtHNQaLmr?= =?us-ascii?Q?UWJGIZ0SgsjY9l3CnPVj8mMG7WznaCrOgebvSfnv?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4c3a527-c770-4c6f-d428-08dbdcccbd69 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:26:51.5581 (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: LCcMq2aX7vOWAiIx53OCXIzZjtTCwISx14oahd/4EsaR1zkQFVd0DyKCwyBzkP7CFrslEW2c0lcIuWE4+EC+vg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 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 efecbe3cf415..69733a1a5663 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -25,6 +25,20 @@ void mptcp_free_local_addr_list(struct mptcp_sock *msk) } } =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) +{ + 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)) + return entry; + } + + return NULL; +} + static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, struct mptcp_pm_addr_entry *entry) { @@ -88,18 +102,17 @@ static int mptcp_userspace_pm_append_new_local_addr(st= ruct 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)) { - /* 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); + 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 Mon May 13 04:33:11 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2062.outbound.protection.outlook.com [40.107.20.62]) (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 8881A196 for ; Sat, 4 Nov 2023 00:27:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="e3TGp3eX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W8k3dUfUPj9IAMXVMcVSo/q2pQqvffv5mlEJ4qqdGB8A9YaIO0wnVB5vPpRW5PmV2GrxXbQ9DOuoDQ/ifmbOacxAPWSn5syTqNDKuDcvZZjpthsU+BUAVgUeAdHJZ2SC2AzMSD+ovoQKOcqx56zhjUWN6J8EQTMZ3dbZRmnz2/FKsnuylhcW3k/ZpWvSYD1a3XRPFyyLIphfL/PZJbBRwg28sjje2EcCoZcMmEzfkdizPG1wZqjqmVZqCuPVSvfz8mkF+IDBVxXtTpakyFY+Dqsv7nJaeHbAf8fUIlK/h30JAM9UCOuY3ydEXhBvkzC7EG52FQGyG2jfTp1hqdLWxg== 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=BKXnnJzrR08/qMp8QKkbY67C96F8zeiYUOah2aR3Un8=; b=iS/vZ6ehhOc9Sve6XUhZrqsozAieiCYAtBzMCpanlgeslLcXFWQTVDxw4k6RyEhGYTl9qHRltf2Vzsfrhuvzl4HzYUzAbCnlGsARhltPr29W4qOmWjevNs8ZsKnWJOAl+8zS9g2hm3SgW/Yqr5wjX529WoKlbiYscxTmXVy6fFGMxhJznanY6nPb9dxT2TATr+Dq78KXI+9AM3T8nsR+ZEut8OsvtKgbrRRre6/e02Eh0tG6b3q9pCSzZww+KHMg3g95qCKxAKiAbmVtyhqikNcwRC93mpsBADKaO8YShwDD57X4UMsqoVjZnGSVfK/A1vP1EF1T/DFOoEHVwJUUhw== 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=BKXnnJzrR08/qMp8QKkbY67C96F8zeiYUOah2aR3Un8=; b=e3TGp3eXH1QS6ZbduqAlcgrCTEafkgwWBIYG3/ehf9n629ryKkRxJSEsWDY3pcy7IWVPKXIeXXVcVwKuH00VDgQgYBEMQD8M5uUJGfUb5udkZHKfqLl76K86qMryhMJSQamkHKg37idxt8KDlEY062rxTmdqf75Xv6p+KB6B1aGyixyD0ZOvwueSbC3JrhAAWtzjRaoXdgQKIJbXizkU50gn7/7/JnLQZQCMnhYG/zZBLtTkBXH84YZv3RdwzE+mWuQVN3dOxnmm1ltqtNvAy7ZtK6Ctka0vBg3LY+PX2pD9huI6OnK95vgD0Fkw9t8pGox3QKwOCPhuSS2y1Qhnvg== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:26:58 +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; Sat, 4 Nov 2023 00:26:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 02/12] mptcp: lookup_addr_by_id helper in userspace pm Date: Sat, 4 Nov 2023 08:26:13 +0800 Message-Id: <2e0955e26232b50bdd16243fe442d70801c59f7e.1699057244.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0039.apcprd02.prod.outlook.com (2603:1096:4:1f6::9) 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_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: 28a22024-25f6-445b-1c54-08dbdcccc121 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eUg7OsPBX1V59M3lEjEmW2nj4IZ1Dz8GXOKTc4s/oKbygeqyLDLaTnQLvOBnHJNYuKiHc33xt+Df3us7TT7URZDN8wLGQ/jA/tmHaewXrB9N/Hd4qpZcmM0p586LKjrYJ5ShikZepEHofpYaKC2sh9Io4cnK27/ctB1H9gtm3Mvw8BxeLPpSMXBbf2usaTddvVNtOZFl5ZRrzhvoZxm8tWF7ho7Aaiibyc9IRGDHSkzwU2cd0vDbXfvOP08D8w/+S89dNtWFn8TkKSsGiTUoBFE1DS5I23QGY40jO9JQn9Gp4WYVFbO8qWmD3Sq8cw56PYEBB9sbDYHxy2MSm8HFTXOvSXy3vcX5jd46Noo5uT9yCwuBBu4WlylRcjc8h2qnBbXLmOROncc89+QqFIiwQYQES2NwDvlZuLGxSSXnPCc2KO1bRpS/CzWWh2RZX1OkQA4g5VQFcggn3jBKQFJTb/J5Azaztme9pNpA/LJNnb3vftNr+looQgXtX5pD8PSJjM97lSt58ionbxYHDeF7jlhTGFNmh06aYrWiTKduglaQJxaWhgW51LCmsl99Ce12zJugqI9IFm0EWlDei2Jau53lKxaiVI6lFKpy/xue0C0= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QJyh/yxOwzVmxMd8K5gg5zk+dPni/kemJChwwZKLizXNkcgmZdlSvil2WdZp?= =?us-ascii?Q?8Ip0g7+LTWm/3k4flWPcj8YmxKBDNNFnm//Mhauo0lkr3TKgZ6NVVQKlN01J?= =?us-ascii?Q?hcrfDUZlla4GaCodxhxYVRIZSVVFQVlPTlnjRIeYW9DWEsm5eje+WEEzLbDs?= =?us-ascii?Q?f16WM3SjBISPC+7FSEyZ7gBOFC77ZSYSBgvHRH01OFmuzzGtsD++gyg+rb5o?= =?us-ascii?Q?JuUYVaCnAowp0dgmoct3Isc/Ov+HMc97og4qKJ7DDF04tmapnxMkyZa5i0ZG?= =?us-ascii?Q?vCpw4sMIFfLhx0BO0GRtW7K6HXQVAyZQKzwXyL6bHfL/27nuBudQB2B3ZIHs?= =?us-ascii?Q?FVZ7vnh+FQys5fEk8VtzYMhvwfrxyMUXCPwC5qWloP2Rx9+ICX9WlmgwlHXE?= =?us-ascii?Q?8wruKUPvK1OF7qC+Y70C3vgRnG93cQQdZQ1T9HSRYjnByArb5zn5YpGPETXk?= =?us-ascii?Q?x0EEpgx0wJMJTzKWdtvSHhA0l1CY9ARxm/j0uCcZ7+ku4FQS36LPz+MkW/ZW?= =?us-ascii?Q?x2ilQ4t0srezqDr/D8y34aRzuHVVyYW1y+j6biKq01pIeFd01UN5AbLicdAw?= =?us-ascii?Q?C1yPRX6qSqYfjQTlDqQhCijZJTRJSiNVgwBl6/SepBrPjbTffmUwOUhNiH8T?= =?us-ascii?Q?5ZZeJWX/XlQYwq4q6S89PZ/7uz4/WHErJWe8JzQiGkCdAyn68LkjKN/X4ESO?= =?us-ascii?Q?xWJwlLcxfbN4atm8jfXGbr4gCjKtLP7ZAf0wF+4ULlizFZC2MREfTRGJomr3?= =?us-ascii?Q?C+gU8FQ9uZ9vOry/Wqa5DnhHUVe+VTY6nu+BHrXqpxx2SDjW3hjG5a4k/RST?= =?us-ascii?Q?tu8MoTqzGHKQrFKHIsup5R6elnEfq5By0oKOoAof1X0gmx300i/XCJ9MSzYD?= =?us-ascii?Q?EA4qpZCq0hY7hqDJAf4beCCQ+0NtumlwoUvf1mQ0EFawuhqTs43kBeuuuUX/?= =?us-ascii?Q?6pmGmHakyy6nid+JLCIk9XXo80Ik1Ub+mivBLXxYqifzsGcxxRSuqt3/QuS6?= =?us-ascii?Q?X0RL7FeG+fzClB97xpKPXLZz2GNxtbAQId90ZeDLKXXScdygglHBdy1m9ZNc?= =?us-ascii?Q?yD42xbG89DZQmb8AePsWx2/pIGRnKhgNXWnU8qmkwyHTuwl7wgMobJlIcZwK?= =?us-ascii?Q?vdxZQ/WCS2fnZsyva2JXd9zOefxQclKeHtgPCDpfr76+b5CP0yOXqIxugioG?= =?us-ascii?Q?kmNPepCRvcK0x9+PBPZNFt9xYvheGpysylLrPwe2OQfq1BBJQYUZLTgFnbqt?= =?us-ascii?Q?+rsm2U7YATyWNMAaZt5M0oH5yaHi/re7aE1swzPlSQ85OrUeH2U9Arj9tSEM?= =?us-ascii?Q?/elAfioQHxBNtYvgdYqJ2Nhb8+WXcyIqvrAwJmFjUFfYVkM1Ipo5K5LFUZy9?= =?us-ascii?Q?LzKmIgDi//21eRVnp2Pu2lA8GkE4PdAI2GGwGgoEq0biMNsFf1kmcAcfJ9pK?= =?us-ascii?Q?w1zQ5kA9P/vGoe/EqaLxVGFHY/8hLssb88zLMoktNIvidotRlqwPlLBEO6av?= =?us-ascii?Q?eFuHmsQbFnQugvmqmZR6UYLcbWIPBx+Nn+ymzqH8GixHbCTJy+L75wVMTjZZ?= =?us-ascii?Q?T/qv7gA4uMCDMSsth0+y+DjYQhquNixhjYgwAbM6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28a22024-25f6-445b-1c54-08dbdcccc121 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:26:57.8939 (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: 09F2HNwcSBkS2UMzBUMctsPT2gcU5FhrIbD3z+lWSNwOA0M110CH0j4e6/nDTNcg13h22CzeRWLHr8zw2ED1ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 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 69733a1a5663..b5687578e6ac 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -25,6 +25,18 @@ void mptcp_free_local_addr_list(struct mptcp_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 struct mptcp_pm_addr_entry *mptcp_userspace_pm_get_entry(struct mpt= cp_sock *msk, struct mptcp_addr_info *addr, bool use_port) @@ -122,15 +134,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; @@ -262,7 +269,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); @@ -299,13 +306,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 Mon May 13 04:33:11 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2062.outbound.protection.outlook.com [40.107.20.62]) (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 1A70A196 for ; Sat, 4 Nov 2023 00:27: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="qCfWoOEq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RI8gXOCK/Mj/vuzEoUzxJG7gAcdBl2rRzgPgE8C4oWXZL7W0EMgCnBKZ49Rl01SBn0Qx56c4mhKNc2p72OAbszzej1kDl7ePjnGKpR1onMFGRFamrcpWgNaMm7VJyv3fYn8fvo5k86y2zEQN1H1xmghgMr0fa0/BqScLj4lqJSiS0hyxc1RRMgWbhvvpnCCs5vZCNobeJgIwtcbWg4gQ1Y7PANURIFIOPsruZh38Uu76b38b/aH34zyTGKDB4RkVK6NpFQm6SqmmCN7a4GlfwePJceWtP7m/Q02p/zQg6hXEz7okSFZNyDh9b6/ol2d1Cz+RurZu7kUSBTf8jFAtSQ== 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=Loqvs6NTWF8MRgHnvbu3VYqHVYb7aWxGThhYKOzPDEo=; b=HbJz5V7xh1HGuTs6mJWEZP8+f07+KoxJlMwmoGkmbhNljEVxpbmmeb6YtWFyVQxYBKRLUzbb5xdaqA0dYznGPi0yellXPyY2vUIriTNYFsCvON3KBibNBMd3vhzIPGWCgkJnLFxhzRARmSSXPJb1dbDkyU7jU5a2GiGFKA/QUI8/npMpPy6/zxlQOZ2H4by6j/2R1b0ctjvi96KQ4Ssdg/aThnf6CcqXP+LOaXLecc+lGCoJsb0wx0nAev2nqDf+ExsevyENwbnKza6N8yrLYEybGa2yIFdPr5rZMhf7PnfCdnhSMC+zhSAS+eIURmCXiZ3ER+0WT9sWQlX5OkfRXw== 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=Loqvs6NTWF8MRgHnvbu3VYqHVYb7aWxGThhYKOzPDEo=; b=qCfWoOEqzvzmBnKbFC20hJyg1uQqY4MEF1oTmOAOV8Wbq0+jqTxlPhjfgMHvDq4qAhTxBN44qrutwUh2KGl73WbndFxRaALEj/SlTbTvqk4AJlouXQngulwtzkeZCTfqKXJX+IFYG2YJf18OYXv14SucdllIe4+9JzLykkl7KTUCK/p1QueVlFaIWuAwTHa1Z9SCLaPBdMKCTkn/YQOYcDd4s74xZ++RHUWlRJG9jPbRE6rBAjw9kz6rq5cGkWnDmHHBas38jSBG14/C1InXA549Im81T3cHLy9LS02CFAAcBleUailyVNCeORX0kjWR7rX03zGuFGq0NsdQpAiD5Q== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27:03 +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; Sat, 4 Nov 2023 00:27:03 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 03/12] mptcp: use pernet id_bitmap in userspace pm Date: Sat, 4 Nov 2023 08:26:14 +0800 Message-Id: <650d226aae97d8c2c16aca9171bb325687ad2663.1699057244.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0031.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: a41fb641-5f68-4386-2d90-08dbdcccc480 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WBIo6BrE5IyiQ27wGIztVBUFT5PXfnQ3ymllO3ZeWTJPqWvdb8ev9UyHr7nTiutawuDilMv1y2uOzr5QsKIQZZL5JknqykndGlHCjwZOoCVfL9dXwqdBEDk7U2Ug00hpwsej3N2YLOB2ClR/4ZOvSJGiCDQuXlx3GloY9tVm9z/re8opGI1SnR4CtGA6JPbBA4OK2KHI+2rCob8pHNI/0+Ew4ZF9W1MIfI0+BlwUlXdQLhmOKlQJN2/EvANujFDfIv5pHKK9WGBHy4vDjuqmlSFd6GDSQxK3efaPXo1UUDrLtlkdmoSki/BIViANa8LPsA+JqJJFfAwmtufK5JqmBAcZAuGkSd5t1ZR5282HqJlde6WLZ4CPHOGPNctk7eo2cwC1YZFFOiAAbZpLXAQuXNcolcELRCUVSMsp8FURAKqCS4+6JXJJD2YsOEEulLEv76G9SD/sWicYQ9MfLdhvqmgxLOirqqynmwvCX1L68tinRRJ5Lq0G0J5SkEbftZFLlbuM4cgH3PnWf7DNhhY5jpCacZ6x346+238oLADC9T9kL0AYQ6KtTsU4LOzKGMvuXwz1oRxY93yPa4OmuAo5X9Wt6hEN+Rx4lrqCwjE/J/g= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?R5qe/rF4Qv+8HDa5vMbE1GQQw4i94yON5SMent6HbO4mFiDR/nek+VnbqRHb?= =?us-ascii?Q?fE7vJOxEnQ6v5ljW9xX2zBuYbB48UkXP6Ip14kIKG8DwtjOCCtIWLrtM/vvM?= =?us-ascii?Q?26gshJlQSraZRV9NGaHQFwIUf6t0TIwMq7dRR4rsjRb3UGT325lvjbndVswB?= =?us-ascii?Q?zfpWmLhniLRS8cbbwCT2j6gxmOPNCrydkXCgzgdZJFghXollzJSE+uD/G8OU?= =?us-ascii?Q?ZO5YPuUEI1WntZNKrqnof+IrVtxqbKcyPoA0od+jiNC+SWTUfksShYqruYYa?= =?us-ascii?Q?+wwzw3bWBPPTURzlj5+2ARAYcVAIsMeHjk2ZHJlfnojOl2o8jfTtCM9GnDe2?= =?us-ascii?Q?kBqgHKyJ6nqVxdWsafcHArb0QTkRLqW31LSTHgIVZcE/97NmFh2yCa3Tb0L4?= =?us-ascii?Q?sMrbRfPJXIXfz/59ll4nTU6CtCivbCqkT2e23ekU1FN0uHvuPeh9RFMeA3cN?= =?us-ascii?Q?/ZCT5S/I4C+hgyXZqZ1OX9FEzPUdmaw3zGDwojQpxmf7Y8AmYQE0g8rjUkQR?= =?us-ascii?Q?14eEVBZ8ayv5h2Egsx+34cO0lMzkFJxHbVlidGXS9b75F7sPjZgRqAg5BJt6?= =?us-ascii?Q?jnslyR5GygDl7AmlsvdSnfe6/M+oTxYTMibO+ESQXvEpXMd1KSBGFJ+uTtQg?= =?us-ascii?Q?dFuzQmO/Dk6MKqTdw/eV092ZjmEKbci5MXl9GQDV+9PukMfu/9xubXWJGJ5z?= =?us-ascii?Q?2jjDDYMHYKEnnJTJp8PLUFlvehjOH373XfPU15oi3EJW2m1p4sMeLEEdHpGq?= =?us-ascii?Q?ybw+ljzJa0GVEEJiIo8vBS3Cqgfz7RnoWXzDh08He8GTED5bVQnUdC7SXHNd?= =?us-ascii?Q?hQJZZNljadq8C9GPN/CuYiantuHxMhYg9nD/+g1Q6Esje9/wNNWfAmGgzeXK?= =?us-ascii?Q?EhSNtcFX2R3VdDZtkwLH16IXFwjXYlyA7LTb0BxIwkVpT+jYzefQCFhzUE75?= =?us-ascii?Q?xnbqJnouDiOZIysvxu2ZSOuHZe8MM22rAKHXrc+Uiv1tQaQzskpTWH7h9i7R?= =?us-ascii?Q?NilbsXN4O0zCsdkEIiierHHok7bNyeKrHo5tRLzwSGHqnYUc+tEBdt0wI3d0?= =?us-ascii?Q?9RZ5tOlcN/jy5iwwpgS4E+fc9oguv9Fik1Z/SYxU/nINLOocInBm+jGOWFfV?= =?us-ascii?Q?vqhKO8uTSkcM3/KN4bf8lmLSBiKYIumRhIBDz96Fu7px5gIcumFighqwM0ZE?= =?us-ascii?Q?tAJ5f0JYwE9645JYL1R5LsfazeV89Kz2FrZnGAKMWLwIdbFmKBfF8NDlvAhm?= =?us-ascii?Q?Wz/sZT2ohk9XnRdzl4RyKSw795QZFXurchynZdoQlPWrh8qNOCT+iYNIVxZz?= =?us-ascii?Q?8L6xbMTzE98eDXTFLJYtgh8DKSg0H2h9HDKXuXLmcoZe4hE1wdBsYKIoINIZ?= =?us-ascii?Q?YYJm0UWCEHHltTOCgDcHqSa+Co5RuqfA51uuOhKK4bSVRD1Ow/ZVf4RYVccL?= =?us-ascii?Q?PhTkkawNwZ00E2DQvcfqSsYqyNYq9Flqn7MomoqE27xZfOE377cmIaAwvD1M?= =?us-ascii?Q?oYpRl6L3qIhytewUsW3P4s6kNSoBWSIpS5cdN9L4rH3yvf+b1vzn3T+lx9H6?= =?us-ascii?Q?oCFfdqrngq4ye/yZFLOulUY+bo/nd9q93qf09PQ3?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a41fb641-5f68-4386-2d90-08dbdcccc480 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:03.6065 (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: j+3+9qiVv2GSahYpAfjtK0NFtjcFV7BiFcrYR920hcmbwI6hxn82oB4ohamykSFVWYklBrGA6uDens+H5k+IsA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 Content-Type: text/plain; charset="utf-8" This patch adds a new helper mptcp_pm_get_id_bitmap() to export the pernet id_bitmap used by the in-kernel netlink PM. Use it in userspace PM too instead of using a local bitmap when appending a new local address into the userspace PM local address list. Also add two helpers to lock and unlock the pernet locks. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 24 ++++++++++++++++++++++++ net/mptcp/pm_userspace.c | 11 +++++++---- net/mptcp/protocol.h | 3 +++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index bf4d96f6f99a..d6594fa80cbd 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -228,6 +228,30 @@ unsigned int mptcp_pm_get_local_addr_max(const struct = mptcp_sock *msk) } EXPORT_SYMBOL_GPL(mptcp_pm_get_local_addr_max); =20 +unsigned long *mptcp_pm_get_id_bitmap(struct mptcp_sock *msk) +{ + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); + + return pernet->id_bitmap; +} +EXPORT_SYMBOL_GPL(mptcp_pm_get_id_bitmap); + +void mptcp_pm_pernet_lock(struct mptcp_sock *msk) +{ + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); + + spin_lock_bh(&pernet->lock); +} +EXPORT_SYMBOL_GPL(mptcp_pm_pernet_lock); + +void mptcp_pm_pernet_unlock(struct mptcp_sock *msk) +{ + struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); + + spin_unlock_bh(&pernet->lock); +} +EXPORT_SYMBOL_GPL(mptcp_pm_pernet_unlock); + bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk) { struct pm_nl_pernet *pernet =3D pm_nl_get_pernet_from_msk(msk); diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index b5687578e6ac..6856bde6c74c 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -54,17 +54,19 @@ static struct mptcp_pm_addr_entry *mptcp_userspace_pm_g= et_entry(struct mptcp_soc 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 mptcp_pm_addr_entry *match =3D NULL; struct sock *sk =3D (struct sock *)msk; struct mptcp_pm_addr_entry *e; + unsigned long *id_bitmap; bool addr_match =3D false; 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); + mptcp_pm_pernet_lock(msk); + + id_bitmap =3D mptcp_pm_get_id_bitmap(msk); + list_for_each_entry(e, &msk->pm.userspace_pm_local_addr_list, list) { addr_match =3D mptcp_addresses_equal(&e->addr, &entry->addr, true); if (addr_match && entry->addr.id =3D=3D 0) @@ -76,7 +78,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) { @@ -94,6 +95,7 @@ static int mptcp_userspace_pm_append_new_local_addr(struc= t mptcp_sock *msk, e->addr.id =3D find_next_zero_bit(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1, 1); + __set_bit(e->addr.id, 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; @@ -102,6 +104,7 @@ static int mptcp_userspace_pm_append_new_local_addr(str= uct mptcp_sock *msk, } =20 append_err: + mptcp_pm_pernet_unlock(msk); spin_unlock_bh(&msk->pm.lock); return ret; } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 8529b3ae55e9..cf72a57e6c54 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1030,6 +1030,9 @@ unsigned int mptcp_pm_get_add_addr_signal_max(const s= truct 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); +unsigned long *mptcp_pm_get_id_bitmap(struct mptcp_sock *msk); +void mptcp_pm_pernet_lock(struct mptcp_sock *msk); +void mptcp_pm_pernet_unlock(struct mptcp_sock *msk); =20 /* called under PM lock */ static inline void __mptcp_pm_close_subflow(struct mptcp_sock *msk) --=20 2.35.3 From nobody Mon May 13 04:33:11 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 5A937368 for ; Sat, 4 Nov 2023 00:27:11 +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="CNDAUXku" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z2fHvbI429tkBQNuANB3lmuGCczdwnKKgGdmV0tOQGnG4EpoQ7C2EoR2IdgH8llntvHMMdAvV8fyiPAFq5fbqSv/8b1dXmrlhab/6wZW5UiDP/D1tP4L2Gxi/wNdTywHVLNm1uRiou8pV2cMCgH/bBpML5IZX1SZYf/+9jL3WkcbSjj+t12qt6/EwtgAyb8QB/rbSzrHzblrsEdGTycLdookLDg9zHbJZC0rE3BGQJr5wcnUYXemubqKnZe3FQ5gMb11rrjICpyLMM7KJ//K7bqw5WdNhuBOor9rQS8F8JBpabwOmgYYMlzr7WnbU9Yh0/yEK6Ze83xxfwqnw1LsfQ== 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=7W4siDtsD4ZQBVeJyE3H9+b9FxO7aUsgZwDf4zyMnCg=; b=gy6YucW/Lvvc/1E7IlBCtnfC4Y1pESx9LY5UW0cH84Fw6a3TllEeXtOh7KQDs0RF7IaBsOeTe9YVF6tkkOLHkFJB5I9zKcG3IpLCIGG2pnd8gXfdUM64rEGmk1TQmCSQCk38ILQ2+Jj088Kofkh1ggT9ZwxZ9eMZpHVQJgsRLK6/kUTjd3qQVAUExot6fjQuFpOUCCA2QlX5H7in+JvuGgVx9YpSR0gKA1882z0fv5P3P5MvahAJrYgcxz5ycvFdkPi/vGSMxES0ozFt+97v6jiXRLMt4sPyHYDW5b/SDW173XE+0MwYyrh+YwzMO5h5AmRhPmuR4bELmJGXnu37PA== 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=7W4siDtsD4ZQBVeJyE3H9+b9FxO7aUsgZwDf4zyMnCg=; b=CNDAUXkuSOdAHaxaJsBo90AEv/jrf9iKCkJtvBP16tBh5gVijPfn6HoffaVPuMLvQWV743SkFnoMrB5VT9cv9JthBVtGmOYxATC3a395ye3Nh5KQG6Bu8LxAbo3k1l4aSHPGe8nlf1KVD+4zn0k1so5pkuafQ9xALQ9jQHKtN+qx+pF15HxVt5ETxeYrwxCZPH5KUTeBDQPe6pWAeqkPJHDMt28nRQeuxAhsgZO5VSFkPhPtPbZWRYR15nXBREmp3eaWUCb3WlUwDBoAdLPdWQiBqVhlrsN22g/x9qMNU7T0mXVUNFzirDcDR588f1Rbx3n3CHE0RNRcsyql+R4H/w== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27:09 +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; Sat, 4 Nov 2023 00:27:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 04/12] mptcp: drop addr_match and id_match Date: Sat, 4 Nov 2023 08:26:15 +0800 Message-Id: <6e128edc8d400b52dea1147cd652263a85e49447.1699057244.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0031.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: aad7f6ff-7ffe-46e2-052e-08dbdcccc7c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NfOksxBmxNZVgp+kJ/6ekFBJtkR6BgD2ODSWu7k9TJvk1u6j4Am9hA2sttd12W6GyLvyvOiAQq7n4ovJajC/4aXPFjSnQBJ6rcsWtVuQdHinOPSlE04LRnyraLbD70Wt5ap5JD7c8dTGorTsPvKIgaO4EfIJvFuDwtJOJWN3/jRI1aUeCvWazk2ShSUFSGKnIXNke4lm+b3Yndsj8NxslTE9LEj9P/gVwqIaAqn3JskEpZk23uUwjVy7KxZkJ7199/wlZLqQbmbLs90ak/IHYUQI9xKL3RtDDAwY5lCqtLlpKR8tRLwa8didsz/YqAEeKT2OZFSb8gr75hfK6KH+oheteUPoDlqEa7RyooHZurR3rOIpnRKFAyTdc2ItNIitBjM7RkTKGICdCBVsUHcCw2lNBfVe5xjw/B4WEZM2iUGTSZFSlbdbpy3kg6OkAQqeq2EKNLMAUuE+j4wd47Yf83LKAou9WtKwEn2sBkek7Dkdh6ly1Id1JGTS318g1nYY0AkzvxEqRRLNjzcE2CIpWDj4H0bDnL8VVQSy28BzH1h+GQXEpFgtd//uWEc3CHyW5tiEVBAqt7qXSOdOw2zRsVYQz/rVAtFgAsnc5eIF3BA= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?b+YFoJ4+gMcdW/tjOoGQ/LyEZ2hYhLnaybnbSAM2ffHFoxC4+2yL342oVyOj?= =?us-ascii?Q?SUs5GA66Pkq2h5n9N4RKAxxq/IPx2rvopd1dfHQVTeIzBHmKaMaeJuiJkEx/?= =?us-ascii?Q?wnHDXIU1IYNa8tTl0DGW+PNYeY8K1FxM7XdLuk1UeTPY2zdX0hfn3UxLRAoH?= =?us-ascii?Q?pu6cnx5r8kkrDATuG5Z7qhf3xtirHmNLnh1qod64o3ywhu6Hvam5n4/Cr1dt?= =?us-ascii?Q?IvNTPmlU3ROAw5wONocb+hDJmzH6DOW+vC+q/qc3tCCLVrFHavBu6/4xxhqw?= =?us-ascii?Q?Urx90cAsXz8LRmky79+kLV7JUZds3eS62q+EDDNg4EVaUzm3cAB3fgc84181?= =?us-ascii?Q?dw5PPZ1hM922xVGqC6Csbu18gjJsv6hJ3hHDhZ2k41htv/joRWziYtHUxFPo?= =?us-ascii?Q?QPXe7xqxtrOtkk1x8iy8HecMPpjeu3u5DdxxCttNK2pkuIHDUx/FcK27eSeo?= =?us-ascii?Q?ORLHWQmOvR4+7XlmtX4l775pSdE0A0TpjNret8kOoVwNBj6tO1nn2n5Yt5Yc?= =?us-ascii?Q?l/Clookx0eduEKTVSk4GRhfSImA+2pOeOZgSyDSjmeBnV9QmPFRXd3RFE54s?= =?us-ascii?Q?A7ohe+WP9To+91eTwExP2nQA1jwnjzpvZFfFyAeU9xT2WC0woLQQDfx94zvh?= =?us-ascii?Q?xc6fDnllpzbAzk/tGVomqh4n1mNCk+c3SPFnOmiHLfflke5uQFWZdLASFx5t?= =?us-ascii?Q?kLScJvVyNUKUZTdr9S5cogP9J3iwS2L/AcZu5OfnCco7XZSWA8/fYg5Y5G68?= =?us-ascii?Q?jM+nAGKYu1Qys//RYR7rt013StZJdzGY4npCM3mS3cgrsvodIqnIZMi0w/Bh?= =?us-ascii?Q?1uOt2C0/feh/5O7Yq9SzCwccMImAX4UQ66z/Z9w+P4qD5LruIov1Q5xiCTLP?= =?us-ascii?Q?tTEuhWl94NBLa6IOzlLZ3SV9TNogRYBCKeU1MPF9aovriQp79qw2szouObOK?= =?us-ascii?Q?6g+XPEUjPIaoODjIMH+OykBpElyMIqvdrgJSrueqaE0C41R40Ogxt9qQ65qc?= =?us-ascii?Q?h03nxLNsb/b7zwcyWq2gAkTUlK1uqMDdasxkX9loXKsHgakp+wnnWDyccchW?= =?us-ascii?Q?1ydsf1l5vYFEDA67Nx0MWIbeZS91m4fYvb6FjQAP/PTw4luYNM5vy5KxKqRK?= =?us-ascii?Q?vd1VBd1lGGjYq9fuPQK+vZ1QyfhgfvGJpcDZ8zcRXLbQfTQDjGEW0X17+XgK?= =?us-ascii?Q?KneVIzd0DYkL6glx0av50Louxxrf5VrGrN88CRSkeeSlYHz4a9pKdh9+4oY9?= =?us-ascii?Q?LORzzBbWEyZZj4l8843k2Cg1zNQqSVHvQ/BwRet61m46WW8KxsZ6w1fB2AUo?= =?us-ascii?Q?x9IiWJACMMxhTuqlrTCW7JV9GB4O5k5Pj4Z7dmrNzHQQFKOYqcE5zcPBa8rI?= =?us-ascii?Q?HXnL92kHameM+k+xafXbiwvUQL8GNKAUIcEXqsccR+EJMo5T0gQCZQkA9f1t?= =?us-ascii?Q?4Jm5Ok7IPu8df/5c8jGOrsq+d8BQZ8yc0yPMDoyyFq6Veq4uYww28PaoIKhP?= =?us-ascii?Q?Lho5fD9V7TQM1ggi4/4Rpa4El0cr5nJk2z9oWaUyhFSkyWorAdMl9tn1Wu6B?= =?us-ascii?Q?G2h5btQLoo8pBl6870oih1hHvS9TtWtM4dbl435h?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: aad7f6ff-7ffe-46e2-052e-08dbdcccc7c5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:08.8431 (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: ryFLPvD2pt3/Ub3NZ4ShPBoMLUYRBWeto3I1joh/bGRx2/po6ryA7MFfuGJ40i2mzSJk1GKsIhzGYVHDG5HeFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 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 | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 6856bde6c74c..b7fa9481e3b3 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -58,8 +58,6 @@ static int mptcp_userspace_pm_append_new_local_addr(struc= t mptcp_sock *msk, struct sock *sk =3D (struct sock *)msk; struct mptcp_pm_addr_entry *e; unsigned long *id_bitmap; - bool addr_match =3D false; - bool id_match =3D false; int ret =3D -EINVAL; =20 spin_lock_bh(&msk->pm.lock); @@ -67,20 +65,13 @@ static int mptcp_userspace_pm_append_new_local_addr(str= uct mptcp_sock *msk, =20 id_bitmap =3D mptcp_pm_get_id_bitmap(msk); =20 - list_for_each_entry(e, &msk->pm.userspace_pm_local_addr_list, list) { - addr_match =3D mptcp_addresses_equal(&e->addr, &entry->addr, true); - 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; - } - } + e =3D mptcp_userspace_pm_get_entry(msk, &entry->addr, true); + if (e && entry->addr.id =3D=3D 0) + entry->addr.id =3D e->addr.id; + if (e && e->addr.id =3D=3D entry->addr.id) + match =3D e; =20 - if (!match && !addr_match && !id_match) { + if (!match) { /* Memory for the entry is allocated from the * sock option buffer. */ --=20 2.35.3 From nobody Mon May 13 04:33:11 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 987BD19A for ; Sat, 4 Nov 2023 00:27:16 +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="iPL5fnIc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GFj00YQRtblRsQBEO1XNhzXgByI4KaqVahJZzetMR+ZYXKqNso1I+lKAZfyrrcS6G8b8PfcO87TdZ2vEeQ0RMaA0+uWrfzFrtXs0cJ3nk4g3lOPmHPp6cQSkNN6UzkCjsfk/wHlRdHGcWG/t15AiqTnEvEjQnghHsjQxeD4XORwf0mzXLEzcOewcc7baN1PKZCLRIItEFs6RYRI5+d0piZqHJP5OpbRNudAEZDJsmg+HwgPPhKcPLHd0P7HGXpAPKwmi9BOJrCqX42Di/kuQyBG5NgVpGEEOlpNRojic/AVPgvsUBQC8OggR9fY63EDQ+9VpuTTtLHGoObcBZfNwzQ== 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=swNqzRmRhtSA56A63LL7Rx3QeYb+HtEs+UP5N1gK6n0=; b=AWYrFQfEzDLro6FbT/WsmuhentkSspf1d86PMCaBGXv3m4wz0LruV7bsVlJ2cOg87fuBvc4vFW1neB3StaaDCUc+eEBOcKyl3cJol56urv7G3NHzp10VyukyXISK6PK/lJvg2dNKKhQwU9C+qsx21RqmdOkZMovh5usk8qEtMw6p/JLPSegRcjKHpdhgtZZNNCHsImRCFl8jv+4yhrI9e9WH5Kdf/pVhXnEzQ4tnLk8sfyfVdV+PgEo5OfjWcoRJO3VBahfs1gjw3CRMs0NsEnlUmhplDjIblQ3frGazyTuACzG2qawR3HxC7gAJyZStcwp6d1k1fSVgPkNz3iohhQ== 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=swNqzRmRhtSA56A63LL7Rx3QeYb+HtEs+UP5N1gK6n0=; b=iPL5fnIclNOkXiGkrbLreD4JdW37IpByBFzz8Bnsaa7Ze45jHG3gnYwCVKh2QIatgAAr7/k5JA8I87UjGLjRZCfDjYT52GeWrYn374mBT4vQFTNsFnEPAIPQwAMtcvG+TGl8wtXDb+Mb/pFQhy3N8b0n3rUa57QLRn1FUYBvK3xsVLXyAti3URPbYNpGFlKzudga7KW54VBxmm9ZgH2y8gtjTAhjGBu2XiQaA3Pxv9xfpkoDjDYXszZ3tutPZTnHfTYzYtwwHJPMgFEw8nSbG7UZGXoSFoha5ZHWN7BYHm2DLVtIuOItWcOL24rUOplvuJoWz6d47TJpI0Es5+skyQ== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27:14 +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; Sat, 4 Nov 2023 00:27:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 05/12] mptcp: rename free_local_addr_list with prefix Date: Sat, 4 Nov 2023 08:26:16 +0800 Message-Id: <26d81412b213e636c8cd5972c7ea62f6f53789e7.1699057244.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0036.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: 60ea9701-9d7f-4476-03a5-08dbdccccb11 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y8rrC8/RO/KZf4UI/HL0+LoMHHtyYHvxrLpPxaYigh+fNH1/wzjvFksWCdAPF2GJajlSO7hbF4yxleZaOqMV+aQSzdpVL92m02PcxE0qMItzFhbyD7noe6ehL+GmNh5LQhdUBo3lLw0QeqdC5zJZe9aFh5yoTTDsrLXAjyQI23hFEEGsMwIughOfnnhMHkjHsDjAD3LNwE+f9dUdyGuZUNKhG1bPj8R9DBBwkXCuK4Ta1VXc/ktQeULQ50OQGsmy1l6QWVlmytmdvtebq7EjLqtKXbm3LII7OLGPqzSaIlx9IN+Qekj2cFJ2YL6azzmU/Nhro9SV0lReb4pxL6rKEJO0RE7jm28R7J2yX9S6AujHLUxuyZnuG5dc0ktcAS6AXxIFbIb0n894HOosslJFCDA130+/P3fBt+ta10QgNIc7vPpSxdGL8gfqyEjkjusUOuolv0Wbmo4f2xkgiSh3uSrWSx+MwQtewsoQdfOvc1Rs9waCqsQFPQrN9z6n9XowCtoclU1k4RVfhwP7e2UshElXrL5+z2QYYBZ5teUP3l9JXRtwpmov/l10LOiBTqVB999+SwnRojy911ypeurtNaANKOyE0c3qHXXdyc/1XNk= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AG6+kXiFdz1uIndvT9xcZWq0w3WCedSVOwp6G9t3LB/rSNJ1rkd5ufYpp3NZ?= =?us-ascii?Q?FRTtLLpkNSqDIvr/5TcT/yNNFrI1Av7STy2/+3+8LEhaegRvbZL/fiB4w8qM?= =?us-ascii?Q?V06BChZRl9B2tLLUR6NXj5YTtJpRFgB2oxeteDyIZsEvaDu1jTEwo5tTad2R?= =?us-ascii?Q?F9TCFPjMf2MhNKxVNXXQ9UIU6U+Q4DaytRfa1ydmXqwkVBo1hE6OVvLUSVYw?= =?us-ascii?Q?cjhsdSYuvhx3ctYYqWtMVyEMjzZo0HnzRJNvkg5yIxylpZvNm2fmqMCoxtqv?= =?us-ascii?Q?JA6XALpN1uhyz6nXcK63pvIaP2VzGFavPgUY3HmGu//xav9xjNB7TNXscMO0?= =?us-ascii?Q?ojKA8V5gvDq71OKo9k9iyOCFy+z+WkUuJTZOUbcJ1fmu1nNNFPP9XgH31+Jv?= =?us-ascii?Q?MO75Sa0V6R9cckKikyoIKPznkehZMI9FzPyiLJS4CU/BSjLuZ8KIespKeJFw?= =?us-ascii?Q?frR4Ghy8nk0/F76K9v0yZv70A/ixbietHTmgRcNVhMCCnNiAdSqeTmDTxPGf?= =?us-ascii?Q?cVsNdEKs5+YdcB320zoEmoKKtLYjO8s0Jn1QtRvJxz2MwOXRwy+9xoRn5KaU?= =?us-ascii?Q?pK8271LynCO+ype08hNqbwKGidT6xXYrbVHTO8qGw7/j8X8Cin9LSXmYKpji?= =?us-ascii?Q?HH0rHAWnfSEhkg2YYZuFMPj50CgMdsh0rVR4qzAhQbrHxIOZQz9pcKIgAPXO?= =?us-ascii?Q?dZxF1T+wQo51CShycyrK8NFuVXvKfx+2tacA5lcqIMJiFyBtQRqJiUZmxIj/?= =?us-ascii?Q?7GSUtICeJAc3FQ+KcmDoI6+xVm3jiYbP0T1FLtw6bZTDQZIeOxRpQlX3ZoGc?= =?us-ascii?Q?09IWB5Pqx3GANIMK5HmA8dHgz+BDGIvYjmX6ttyDrqt9GsJgArNzbzzLR7yP?= =?us-ascii?Q?jGrNiiHACcBnbTaRy3RN6nn1UeJyWDEHnLHYdCaKwyH0cei/S9m4+JC0lM1a?= =?us-ascii?Q?zXlmPn7ad5JmfhR9rS72OyQF6B0ImPhATEVfzkFz3Ck8dyehqmwQ0PpQ+HBB?= =?us-ascii?Q?LJfxdc5JR7LDyseuMvG2MletTWZDGgGbop/7k8R1DB0kG1huQyCm/UWNen9M?= =?us-ascii?Q?ZGk6uHpxqw4PdaJl1tPw9T3w4tZpX1qjRPwlrmdfoX5d30OBUXHMBrR99VAJ?= =?us-ascii?Q?8EizNe+gNKf6vbT5k42LFKPxTkATrCsamWyQf1iwHpnZDryMjUqGDpIHzFPM?= =?us-ascii?Q?aAC/A4O4kjGngJasF4h4mcC1i05qjse+58+myEdP+L3toP2E6sOdmsNLlJc3?= =?us-ascii?Q?rysh4DnyrkB5pcrIHPQsRkf7hhW5BH9D/y00gzy3L06m/mS1KaDZreoQDffh?= =?us-ascii?Q?GJ1zlhFc2mLtnLy/kI/qFRNxhAV9HlUCb3lO3xZPOpfOImb+ATHmyXDZAznJ?= =?us-ascii?Q?8Rq64oj5YAI1is/UhNM3GOhKcL/SlKxHXLFJNRUBnJ1Qdn+Zg2rmmWFw/9LM?= =?us-ascii?Q?at/8o75ek4FqkwkZy79twWNkrLDAppLbt+Kv6sB23NNkrlwdOq8Ib3bsMCxu?= =?us-ascii?Q?EJl4UuCGaqbeo5W96Nb84RxpUvXU8udSBKWm4vMwz2X/+q4ckwqX6oGQ92Do?= =?us-ascii?Q?RuwLdzF4yYK6EtJggBFuI97ZvTum6jQjsRTpi/Hg?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 60ea9701-9d7f-4476-03a5-08dbdccccb11 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:14.3279 (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: hIs/+8Bw+WDCACav0NrwSOMgWQ3nyYorEZ8HCAg1xYvAyICKPmVx3XRbfuZdTn3rXvjqp22NlHoNsFNXQcxLrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 Content-Type: text/plain; charset="utf-8" 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 b7fa9481e3b3..86f3809c0b28 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 cf72a57e6c54..2d9e8a78625c 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 Mon May 13 04:33:11 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2080.outbound.protection.outlook.com [40.107.20.80]) (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 EF688196 for ; Sat, 4 Nov 2023 00:27:22 +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="ZNi9wOn1" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K2u09vvdQTnNXkRtm5prBe8KELAvhDqI28sF0LB5nMC4ddnAMoz/M4Xpdr6O3b8iO//yYP4ddx2uYwLYlj+K9qkSfmUR8surzWipiIkzQt5TwOWQkEhsAak0FE/fVwkDk1P1Ou+T45OmIXImQTpSas0TdJQuWJP75Ayt+ZJ8rFJkR7ZnAEPWXe5ryj0AOId7gyrY9pg8UxmQ37foRbeMhU6O+7jN7wNcPyEEF/a+wvEWWF28b0tLoYNsFDaYqizguG6A9fcjVWU5EGOXFQHk6J6yNZ9lb6jljHmq5ISJ5IgSt2OKvzNEgsbMu4nrif+ktGhO91boXKLvFG3YyP+/qQ== 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=8Q43EAhfsY99oF0rZ9IZTikvKCXGZzcvmapxc0beqX4=; b=SZRWnlKKR6e8zMZofkF9odCCJdss31ln2sUAEIRAkh9XLvtmEOgdfhBhxxdSzgP8NemNotPPCdOmGp49pPH0JRuNRhbHMJENXCdunU+IHGSHr/Y1HONdW9o5+Igv6VPTYLSR+X09iPD2LjbQJPCZBm9TP9mWCHIfge/0j1kLZjwizzfEwlj+8CcsK76ot6FW+g4KWt7e9/qynFxFUkUB4hBGvVMgxsHsL5IH3PfUfzkfrvhczDG8EnoEGCLMaagbpCdYv6yEYjvkOwVLAFay/QFQc854yTmXGA5E4i2CjahMRPxgrKixvorXan4kEq6uZVjQDOggBhNxmP5Osy7BjQ== 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=8Q43EAhfsY99oF0rZ9IZTikvKCXGZzcvmapxc0beqX4=; b=ZNi9wOn17aZqVZPZ0iFm76YklBGM6qGpZOky2HBO36fzYyiJUBYe7dgOOffwQw35cmhQ2c1XuUCzUmfpWQ61jd6NEo/rgCAzS0uTaBJOgdIuSvLv2Ov7Jr7axc1Vnu8M0hli1ZgaQ7AZFssxb9eP2VRfnY91X8y/OEswtCHa33VnCLhsROpEn+rJ6zrZ/qi+u7MHqQVccQRBmDp3IRtji4ZG5X+0PDhq1D++xKSgMlsfIrRj24lQaQkP4vDVFRTG6DjzD7djjYfujJaqBifVRbVe8iNN7Ifpr5jX1NdDoTQZ8iwlDwtJHthOexD9q+ufSXR/hSlzYuWVMLwuTyj17g== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27:20 +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; Sat, 4 Nov 2023 00:27:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 06/12] mptcp: flush userspace pm addrs list Date: Sat, 4 Nov 2023 08:26:17 +0800 Message-Id: <24abdc6ee9d125b52ae18d4bab317fc36b1d358a.1699057244.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0040.apcprd02.prod.outlook.com (2603:1096:4:1f6::7) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: abe0da39-2496-41f8-b132-08dbdcccce8c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CFxv0hyUlkofF9b/f386dt3EBFPJpUPCk9EQ/SLfdjih0TJ74Q+Z+n8QCn00B+ZWoKn6n9oVFcfRJ0uKm1/Z++x8SKoKfVDiyysgZMuG31/P3obNnxoCca7Ttlj6jaY0Jur0eF1SEfWCISh9XjWSoMGK7tQaZFCz8/3b29gC1/5xrZxrdXKSDxG+9j7cmfX3ihBheKfaDM9Mcm/zRC3G7cRcZMzLpwe2icQ+eJ2n8J+Jk5Oybi3/U54SEdMkSlZvz90wWU9LVpW0dcW8B0dHlRw20gYvFCzxCSrMiQFpgHkt3UicxiOIU+SYcKyybSL4fwk8KSkzvvYqijpD2OwcQmOhGo5QYNdBv8DDo7YjM3wrUTQRDQ5EMitlnD0Sm8XSWcRhyH5mHARUzv7HJLfVj3zfBkEfx5rb2GEpP3Ex3wP2ELOj5g5c/15dUrd9eOR8tpaKCiMo4KDHmbmZAFbzfw9Eahbs2KTOQN8hV7Jijgo3TJMyAWbu68asemh8WkhPh1gMSs/CffFg3OkPdPKoUnbptbadfvgOekkSyGXGzgUWreRwUbvJpSxgGG97xK61b1ep2H5Dk4gVOJvaiE6BEMINf7FLpgAouLi8+QjZ0aU= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PKLTvWIUCut+/x+yDeLOBv+3u7IVXPN/YyrDNrDKzPSje8O5ydv+2Mu/6lsS?= =?us-ascii?Q?SMchxkjDhpbA3J9AMkYlAKYr0m5ks0znfbrbsRjgNxyUedGcXEzj6P6EsVJc?= =?us-ascii?Q?fys54OEkwSZ5d8BS64r7WYrB0Hzgibr0MQxOx2PPPtsdoHtrJjKoE+ULQ5R7?= =?us-ascii?Q?l7OHxRjxH5I48QcxlOfCrviTf5h62iz2K5hrMcQ/LnNrWiGjWRVFrJuXolcD?= =?us-ascii?Q?1m+EwnGqipGpXe+F7ogXbDBgewajurxyCtT6ZIunCxYKNlVvdtZcQCaqLL4H?= =?us-ascii?Q?OqCpJZw/ArVzMnepw2YaFuCRKDu7WnjGEUR98bfrXnUX4DCAo6zk6n9iLMi1?= =?us-ascii?Q?fqNr6RauRcuIiB++rJYzScFG+/YWlX8v+Y2ZuHpC3IBsrYq8+iwy+I3HU/A3?= =?us-ascii?Q?G2VV/REaMAenSgwrEPONQ/5p3nW/LwvGqK75tSRdUVPReOTs+FxMx/1ZMsgj?= =?us-ascii?Q?u5H2CjhRykjWRtyDThUrQMtb1018Bx9BBvd91/pDyEMy/0dRIdut+gJg4g6t?= =?us-ascii?Q?Gr+voityIrSMJzwk9CtnCyF3pn/bDgBN9Ae8lYR/80Jzu8XyfLSm0UGSn/hr?= =?us-ascii?Q?hJMBDaYfdBZQYyuRqu5dLYEHJh/S+CX5TyIgd0zwPT6m5D7c3Z+MqKLSbBZo?= =?us-ascii?Q?OTAS7bjlOAlaO9ldMrkW3wJrWOj6QiBMmKDqE3/Zko8dwRr6JI0Ve/4uPDOL?= =?us-ascii?Q?63b59ZhtrDtif1MDEyGpl1veALrW3OFeU5R5+711TOUPUdTWBKMpeBBeEfSt?= =?us-ascii?Q?DLX/aaCwCdfeXFYxlbHZiKFquUsC5JVG8dbXIIEaDZB8UFJy1WkCMB3ya3L5?= =?us-ascii?Q?ApQJRZOn16NFFdOTJ537215+a4DgLbDK7EOy5Eure3S+6wZ5meiYCqLcsISh?= =?us-ascii?Q?/T1Ac3KEueFQZEzQMpylRQGR4gJ0NJJUtcIWkjS1/TwiDfxlPn5s+CzHKJBm?= =?us-ascii?Q?IyE78GS/Sy1sN4EBDeAQg9MrHR9txQyJfSciIHFCbxP7J5dUjuq5usJ0OZoj?= =?us-ascii?Q?VBpQiOY4pagHa3bS4xjqnnd/HB9Xou4E1Yj2KX12wZit+5wbc2AiQLuKD/tx?= =?us-ascii?Q?1J2fZ6ocmvZg2cIJnv4uwLa6kcsIXlT9aqgHUY6eEgzbXjgoCF+7vjz+tFup?= =?us-ascii?Q?GGJF1dziKsjoxvoMihjpyjF5JejI9QcLLIzsnWa7NQ7qNKJBpPX2Fmw6UPpn?= =?us-ascii?Q?0KnTaGjeM+viVya6PIQwuoJPxrB6BtRcYULMhKZ1V46mp4Ru8OsPL0bm1DMl?= =?us-ascii?Q?V5wRawAMPBBu5Y1isUmabOLRyU6aoVqo8AOA/slvsw8R1beIPCXZ8K75fkDx?= =?us-ascii?Q?6vRLoZnGg7/Vg36J4fIDgeSP25fStb1EQL6hwmKChwKIUbX34CHlqk3LpUtk?= =?us-ascii?Q?XBvCycqNzx0h+UIwMD+alZStUGavSJ9Kd4MSADHbF3C3PXyK6FtaT9HPk+IX?= =?us-ascii?Q?KaFko0VkpUZ0UCN3h7d1lCnYT7utcc+kPNH4C26j4mtkJwu++AQ4DXT39VI0?= =?us-ascii?Q?1KIVDwom06SjIa1Y1OXxKhj6q/fz3hW6ICERJ/KrW6QqFPh6qcOgjEB0HHXW?= =?us-ascii?Q?4yUHIf59/VY96Qg3MVAj34ZgVQBx62ZRJHAaQYMV?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: abe0da39-2496-41f8-b132-08dbdcccce8c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:20.3202 (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: auZ2DP/oqDzSBFoWeZj4hZ2y34vjXd1Gu5JnwB5Hd3pjDHp92XT0sQeZlZPou/EXm0xDjOBUi4N1DCG/ZoG7hw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 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 | 26 ++++++++++++++++++++++++++ net/mptcp/protocol.h | 1 + 3 files changed, 29 insertions(+) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index d6594fa80cbd..72c7b929c229 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1635,6 +1635,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 86f3809c0b28..1302680388c2 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)); } @@ -558,3 +560,27 @@ 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 sock *sk =3D (struct sock *)msk; + unsigned long *id_bitmap; + + if (mptcp_pm_is_userspace(msk)) { + lock_sock(sk); + mptcp_pm_pernet_lock(msk); + id_bitmap =3D mptcp_pm_get_id_bitmap(msk); + bitmap_zero(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); + mptcp_pm_pernet_unlock(msk); + 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 2d9e8a78625c..9b00eb38b2c8 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 Mon May 13 04:33:11 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2080.outbound.protection.outlook.com [40.107.20.80]) (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 C9032399 for ; Sat, 4 Nov 2023 00:27:27 +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="TO9qVkKH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dzfQ0uUG0GbPZ67v0SqgmVrhioscHolyOzByXPxOx1L3yoq83ZyP0hhWz2DRhg2c1Sro7a9dbhbnQacZfywgp/cUOsybHwXl5YB+1TWzuWP3CoPS5SdXsxFAb/H1wZI2WaC05nQvGndahmADS2GeeC7eZ9nTv9W2gwb4yPrv3sIg4tNkR/oFyY9N60udT1t2yC4urKtcrYHbk03yGLQjH86mTqFcPl5sPPtBkpxpkez9suex800XQ67WQVr3n6X95V2a+T2xdfz/UzDEoUwRQmRR+zbvF+zG78C3fSF9u6oN/Vu58a//g8vS26lxdxWoakRK9VJTdw3ylBFfasTEng== 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=ZhBUlhOPbDC0FcqsKABvR34O4UN3fiyxd936xBJj2zE=; b=ZkFs4kfufHCtAKJhFg4jZvCtHv2MJtTTejgR7jwx+6WheMDTyWmiXiD1WXEZ9+ysBWkRkyUwT5siGCtFIqd5EN/PcUrXSS6ZjE1Is5i/IWKTghmzUlxdLfH8vyZFY4MNrfesA/v09H37KTaHOHCdx8zAEn+UdEfdOm+9kchvP7ShdEgf+mlXWFPLuzLnYbPdOjxBapP5I52buH81YLtizsKar9iQujdG4XQ+ByPNgGts65Qr8uBUnKv4XnUDSyVWMDfLOSkclpn2IsH7BsrC3yFbxm2HjUbMUygw9uBgrbzg7CfS74YBe0S6Zxzvx7mi+EztCJIBx+3QJPsEq6TbcA== 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=ZhBUlhOPbDC0FcqsKABvR34O4UN3fiyxd936xBJj2zE=; b=TO9qVkKHMtibv3ApaZqEqmtd69c1meM8mris6bG0dLm1Ovs2QWuzcZ4fvPe7wqN4tZYPhW0JxSqdjjwIDMFddO5r/O+d0tSWh500XSyWeq3QTRtVuV/c6bsNYBiKqDSNpCNt27DsEVllAzLTqaNtusRJS+73gZG+LlWXnxPZGKI0zFHaE2fn8KBnEKcxIZ7lwCm4BOeQFgTXmQzAEAABeuTNEgHdwMftNI2mCF3kALq+L7C1+yzENdMotfP9Iq/cuwScxWCPmtko28Z8y5HeXohksXCKphx5+xwLRoN22vt3Vwc/HdtNmZ7H1T6kK+CvDnXswVE119EjWGsZyiPgFw== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27:25 +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; Sat, 4 Nov 2023 00:27:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 07/12] mptcp: dump userspace pm addrs Date: Sat, 4 Nov 2023 08:26:18 +0800 Message-Id: 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_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a01d4c8-6258-47c3-632d-08dbdcccd1ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LkFrf9S8SFOxVNpKnXGuqqEhf3pbiwsPC6dU1uRtT629CQj1UWKBvIw9kGFFE65H8F7sBfRoq67nDIKhp75YXAegSufGAxBuPSzRFpf527Lxrsrw0cqFLpJcTE5Jyw9Ia6eQGEgMqskZ5uSo4ZJ5LAMm1dCwksGuLf/1LuTM0vRP8wQ/8D1FGPOEa/3bLbof0IaYf5QKTJXDvFV2ASpIu3jsScRjsOqFLpQNmKJjT2Rq5CFMILfXIaQ00zzU3N5HhXSRDjFmOP3JrmF2bWL9sNyE6ctq4FeAOCxPIg3fckkNrTCKXHBqDOsxlCkrtMy5JsZ810PJiIYnWAUh6/EAJxh7E7e0YIGs8H/geBMsvdNGGzPJcaKQpeP5d2yAgQ4IuH3u+/k4LvroQirNnyQUWA1fXu0qH5mV6kQa0hxX4w90lMmTGPE7WnoQOQWouOBS+fjWKbhp+jAWGLOypgS+G0ffS8lYCxfbx11ufaCpLT5aT/mmsKZIJLQVL0iA+oHzp4BkF1iJvcgYB7BiHZrsTCuGHqxxr4Oz7+t+E3N7S7GrwtxXX8KPu6O4kfG/RL22ftcfRRa+JpqzR4MDtQgcHdWcJP2b3s7AAMbvWhU88Wk= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?O2JVEZwWVVkxY1ycqbMOlFaMNCZ/GmbBjzlat+tSavQiIZpnqAw01OXVWvGW?= =?us-ascii?Q?ldMpiBGbnHRiAzrSNplPAL31G7krsuW93HsBRxdeSW55OUDQU6eyWfo1coKh?= =?us-ascii?Q?UE0g/AEJKxMJZvfpBFXqHUBAhrad7Ci4PzQmP1cU2EX7k/7UxttiWYJj8YKk?= =?us-ascii?Q?TEcrKxUmX2FMnvkk24Tljt4ozIeZSlUrAtEnKmFGe4JspM5kTCD0jw+H1fyi?= =?us-ascii?Q?UBSvR96WWHdD2yx1jOrZWpaLRfVtuL5cIE3H1VpX/sZjYyBcm6dJc1765+BG?= =?us-ascii?Q?VoBrIhx0OmC1086ANMvqJfqSBAEm0rvcJaPkFaCzghZUchUctvbVow7IkyYa?= =?us-ascii?Q?qjTBJaliVyYemmE1IU34u+8Loamr4XC1tQvRavBZJMkiXBVmnRjJPDmlpoFB?= =?us-ascii?Q?7YWDtZGnNvqycol2k12d5S30gB++2HD+1kiioaTplrvthdmjM4TpTSRW5TOM?= =?us-ascii?Q?le0S2V5l2Burj377Y4MxZxWbJKtusM9KvLYWwZpGohLwm0XaEjs+7FOFPfpZ?= =?us-ascii?Q?2fbDZmUipFJwLCdBVPpzXZ7mH7MvLTf7C2ZURGZVWBTsc80bdeuQ4bY891it?= =?us-ascii?Q?umvBSa9nGEMNGhIfQdk3bWlZRKuitFhQvgxeSgodD5oOf6fZ6rD6pSFuMd5O?= =?us-ascii?Q?noRiIcVjp5Ddyz6P4GPjIqY79vtbN+J/epzEt2g4Vr6cYatEpA2UZh4FLjEI?= =?us-ascii?Q?vFjAX6NoHqWZqhPqLOdkyKoFT00BMc/NZYgTa0eyiUFZsbmhWOf0PykCT+/1?= =?us-ascii?Q?VmFdFWZM0bDXrF1sNb4TsuYgArsTP0Zn5oKGs0a8/NHZKq3iVA9DLozBhjV4?= =?us-ascii?Q?ChqD50WUlt7bBAJV6k4+3D7IQDn0dXKxTVQOf+wTYzbbOlOaxRt1y92EQ/xd?= =?us-ascii?Q?zBP8zv0cIW6vBnFpqJ0ojrHlF5vo4kwb9L4x4dnlFhiU1J5fxkjIuOBOBQkQ?= =?us-ascii?Q?eCUxnniOdwG9e1bYTXqjphyezzl7Kax7e9NWkMkimVJWNquz1kNsxYL8qxpy?= =?us-ascii?Q?ll1c5ghqT52DiY4SEY6j+Rb63ZbSbB3lRF3RYU0weOtQGR5n4PQGDWWMdulP?= =?us-ascii?Q?Hbj2q4Xp64D3Gt1Dyo8NpvjvMKnAR4MbmfYv3sjOp9MvJrO9X1eIg9cUrCGe?= =?us-ascii?Q?LJ+Dhm4d+gBUJyAMDpPiHXSTOamJ2qawG6MQI+tKoRntmKtO79I63HHzPo8+?= =?us-ascii?Q?LvwQJYo74T+K5sHtCmh7l2/njmHfz5TWUwCLks1K9sRklA+igZL2QJN1w7dq?= =?us-ascii?Q?SZWBGw55z1p79Fy7xpG2CcaYplgVialUIC2fv0Nom3mmuthg/mUg3xkbBcd9?= =?us-ascii?Q?aWJkaAkoBja9ll+gvDQRG5xwrPISCmd1CFnRjw61Ya9TxJd3a3mYXwH5Rcbl?= =?us-ascii?Q?EaAYAXmdbdfr1AMLbOzbZn0BqFL6IeNaOhnLea6Ydl6zEbb/K8X5tabcqUtN?= =?us-ascii?Q?zYYgOx2pkIIREvuseVJqjStUJHYWqRjsqN8hoZHOLoPUujBYK9yXznNHkrDJ?= =?us-ascii?Q?cPoOXw7MRzqQcbuMXQJK+vSWLpwJj7iFEWhqJxBuMY9q2r9aCbK4k/5+Qwns?= =?us-ascii?Q?xO4cO2TsJp8FDGv9tEBhGdQQWeT2lc6kEJFO0Qm1?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a01d4c8-6258-47c3-632d-08dbdcccd1ab X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:25.5051 (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: pBx82+Ts5mdzxzpWhUKuLnmSDmiFLCaa4Lujb90lbHMCKewzDwITqANwTqg2VcEq4Xh4q8dh0NzOz/6hYP4IyA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 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 | 7 +++++-- net/mptcp/pm_userspace.c | 25 +++++++++++++++++++++++++ net/mptcp/protocol.h | 2 ++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 72c7b929c229..a974e4e8ae81 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1745,8 +1745,11 @@ 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) { + entry =3D __userspace_pm_lookup_addr_by_id(net, i); + 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 1302680388c2..644162928f16 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -584,3 +584,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 9b00eb38b2c8..c8b4969ea43e 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 Mon May 13 04:33:11 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 CB4DE19A for ; Sat, 4 Nov 2023 00:27:32 +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="CQ8ZF4no" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cW9osiTZhB5jrVxrUGUKscyyalfuE0zHLMTZezrpoKhsMFC1w6JIC+dly/A6MRESKxpUJHOieFQQI8B+5wCuMiVSa9ulj/MkaVfdjYj+9PEoTkjkOzOb2TyhYSj3OFWfXqzOGSoXdNs13aKx85ir6/2+zgS8jOvS3Tc41AXchyl6Wzcqcue0tHsqtx4gGx7GzIDFF5mEwFzBAJlj3+tuQen/C7vxCeyNbecMlA55oSruy5WlgwmJv98rfutWZKLD/Jdj4HUJngGrFt3Y4BO3m6gLZG0Z2dYPwIvL7DFwmeJ8PeKy04H+apGLS0WvJL5YOqVvooRu77Ib7FZs/pLGOw== 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=1FdSO0iJpFcc4PaA6xa8Ml/9pNke5vvRL2midkpJe7U=; b=SpqQ1kBkOtgAqJf1mQu20Ekuu9JpT/XLL71BjpuRLy2cVNvT0RGENOWWG3zX54VFyQJzOkNK/Ke6HqqtF282tWtj6j88/pEWKnuFnxLJCw6L21FmNpdvQFfPSIs/Im9/mSXSNpNc5wjSJvML3h4rbARf01KHp4DNGjidxWBsXnt0UFz1o2tvIjzI3wP1cE302WgISQe4VK8bBGeWaFs1eCDOdZCRa6Cq9GtpYNsIluDwdiVu7nTOOtL4mP5Av477PhMrgjYfu260cxKnoyt6Lz2izjBeKB0OQCTaiosXCesfpAAVcIyPkfpIlEn4bw74ZqRdEUSstUHNW6U6XqWOVQ== 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=1FdSO0iJpFcc4PaA6xa8Ml/9pNke5vvRL2midkpJe7U=; b=CQ8ZF4nora4KbhTTP6A05PgYlT89CMRbYiXOYJmrE82DV6l2GOXiXR8P3IuVS2gzehAeoKPndO20rW3ns1OnrChsiki1ycnST8QrNsqNcNeUSs5ttbX5vRtjtCVHhJdHPoWxQ0wSBVxKRb8Zvg44DmIQAmT+bUAWhuvL0D836D64h6a3Xq0tA866Qz4fz5c9a80ksyZc5d/P7rs8JvuptI5Z3nZ9UUvI0DgBJ+hwrQIRq4EBeaaYYduQCl/OB2LKDx7SeHlIWYwcUEquGYVHBfcw3CUpCz2FF/avBskaJ7GFyBN98CaXPRAuqyK2iL2K9TyYDsJ8kAYd7Ov3HEyHgg== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27:30 +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; Sat, 4 Nov 2023 00:27:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 08/12] mptcp: check userspace pm subflow flag Date: Sat, 4 Nov 2023 08:26:19 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0031.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: 1a785d1a-fe06-4117-9ff1-08dbdcccd4b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sHXZn58iC3JRRBZR1gkMZ3zsQU1EUl/RVmVNS8XvurCVAPeHQ+mik+L/D6l8skkzdJBUSE3hf1Un2PZ9Sfst3swrs4LSZXGA1hR+qlmTd0OR9sL+aigAZI63DMmA5jMZdqN/BR27SePydXwLQDkyITocnpsS5oLiwa0ilKppvUNr/L2ZBmZ7geDONUmq/+JxfquZK52wjxSJfshCNTTVxU70fzRatG+lRA4xmPAl7MaVQtWLq4ZurJp/+1FsZfj4NF4W7bjxXbqQi/SqzJ4TzseXbnYuZpYg1CD90Dyd6PRJ/4qFeq85ZFQgPErRmThSDXTOC1ysVH5PsBHjOjWo4ZXkVukoiNW9bf0WlG/9WVlENwmLv4ORf5SUfkPa4JEMiUapMrKxKIBSc6KNoPgfAnUGevnfmRL9L0Bj7+C36yOi5ATPciKCENZRK8dSF2IM+ayXvnQ7PUZ4bv3+07ht3w25/MoPVGGZmQQHJtRykv4EW/IOrbhvN6Ykr5vJCV02fUQFPZWp8eq+VfzJ7bNSH6PYoVNAmyfwrke29LX31kHLX7BzUPsn5tAgfMTAUzcRNy8erxxxkD4ApQzJ8KpYwOhVkY4sy5L99HTzKL1yVUg= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?25vZDwXWmXA1E+rzqfZepq9B1vu+zdgw30/MsmLlsi6Bfc1yyK8qXmJV3dr/?= =?us-ascii?Q?wmI8+urjFeBVmXEvDDKFe9+KUIMvHznD3YKTvY4HVIe6eS11Tp1l27ko5e8U?= =?us-ascii?Q?vUwScAMLNEQnC3LNzn/DL3lz6Hy/pJ91r/tnSWpHxDW46KyyoZ2/Mx09vhwt?= =?us-ascii?Q?yMaMt3rQRuzcmhWy0QKhiNPu/cxpvz7wM3bF/CF8UN16IjQYUbL7rzvwwSYB?= =?us-ascii?Q?ywnnb7o3Up/efrFphzw8tFWIL5hUgHQfGl/QaJq3h0o2gfypfAsp02p8i4ZM?= =?us-ascii?Q?KewD37uiBgudL1GWI1ofVJitX10hQXoBIUALx81Aeoa3fkt3xTQvaIVQxAJL?= =?us-ascii?Q?d08kdaOWqgYAah5ylZaazzXhhTbLjkn5A9WQIYJwaVQH9zSqYmtNN9+TlKA9?= =?us-ascii?Q?XDZ06qT9zj56xfTUUZRcWh///O4Rr+g2tumseKpoYKMAZzqhFqKIk/4FZIH+?= =?us-ascii?Q?KdoDk9w01JsiNX1CWAqw7BqqPDTwsNeueZL6zLCSHCzxlxzKP8mB3HQRBRVE?= =?us-ascii?Q?DoOqEKMMJYYjGkSqGayVfuCCrd7/zMk0lOathSoxrlZkyAPyFvVVHhVxqYAR?= =?us-ascii?Q?UHznJrGEq/8edl8r5KN7ZJVruwVjO48P58gRAEDZ5LxJtpMvw5UYr0RhOdrE?= =?us-ascii?Q?f/X5CE9FC5ZNDDts5YSUur5Uvd74PlyRvFEe/2El91THZkicluu3uNsZ6Cwb?= =?us-ascii?Q?v+C8ts/nwcdFupnCyszkw89E6h1YftUvtix1VUt/0502j1Y4FItRn8h0guhq?= =?us-ascii?Q?9wnjsbuwQvqOfyVUsqk7Uz8qVlIduJ9H3BIxWRjgjUKHIltCvqhbejrfK1qt?= =?us-ascii?Q?Ku8NJZBRYNkW1cMhOND8ZqS9XvV44Uje/VUBZnqTSMyuWnrsKDd/S6dkf6V9?= =?us-ascii?Q?tfdI6p2AJXRcuciRhL8wdARxTisQ14azh2812lo1H+tJxTupGgCJqMuYY2JL?= =?us-ascii?Q?zpfO1kCjh1FoUvtfVnfkqveGMwt5ealA/SMOKLGma5yILPMmXwRtIxV1QMq+?= =?us-ascii?Q?mX0J8TJzUHsprmoO0bEWsmn/iTxnaFPfdXNSAD0I2pHuBM403j4mlyBoQPkE?= =?us-ascii?Q?AwmKVHT6TNMpgdmbVBAmWms5oaK28nXsYgARUe6R6ZeBP3fxAS1Fs5qBNuE5?= =?us-ascii?Q?9PAlKRlr675lMScnGQFb9xt0VpUoMnTEnJaWnybVF52DOVly5wwcevIi8MO7?= =?us-ascii?Q?ZTsalXVOKhXRRKYFVooNRESlZmJpgLMJntAWnFVUzYlX+B7iHItjHI9mBsuM?= =?us-ascii?Q?yuZfp2F2DpKQEhmisIjU94a7Ca6vmseECfTGGiEAFhEg1LYDRnNrNHHrt/0V?= =?us-ascii?Q?adSO3eQDl2d/UwoQHWGybOOPOcpfihpaFh4LZjLDgj+lqUyGrT9Tww2sH2+s?= =?us-ascii?Q?hQWuyV+qSq1x0tfsKt7WDNqp4pOqTddYUHjxNo7cIdDKkCVjfphQUj7yHCMV?= =?us-ascii?Q?KezxOXaHOGRVjjdmMgF4kBCFFXGJ4oU7nLKby5LoR5ikeMavfWZwuJTZjjEX?= =?us-ascii?Q?qzcPXOqWJ3emzsSGuhmWLAhjPY84LOoYxvfZPFsBk8ELF/HYx/m3Q6iBxFZE?= =?us-ascii?Q?uQYPg5PGE7FIXOTO4MHF6I4moUP58EVuitKK/aYD?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a785d1a-fe06-4117-9ff1-08dbdcccd4b4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:30.5556 (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: 74Z3vYYG54t6F4UrnieV7yQp7rJiOMPYeq9gNo93bi/VZw+Vl7jvr3Zq2DRv1Ck2Q3fMmnuXc30xbLtIa26W4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 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 644162928f16..c27cd4336fef 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -358,12 +358,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"); @@ -376,7 +383,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 Mon May 13 04:33:11 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2046.outbound.protection.outlook.com [40.107.20.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 73C42196 for ; Sat, 4 Nov 2023 00:27: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="gQjEILf/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AXvNO/Mm+1WO+wWkP1b52CB7pUhpzrm1N4eCP+Myz0ocMil9yBeupjvZSo/3OrVxGm3+lWY7D0CZYz1JoA738OtWJQpak+H0hxRVe2ziMEerz8RCyYCtUKc5cDsjxysc6Uy6onnlukbYjgMslj1UsrzaFHfJCHrWHNXvdQbhVPqNW7HLJ6AVp9Gl9/Vvzy38MtMQr7GfuE+6VtHLBcki6QUL7DdxrMu3f8bqzokJu14kZcjOcmXPDu9kPX/sUHK2M2YwDdwtmmJsf5zmMr5bPMWwrPaOKWOS96Lzo7ZzZ/6xGtBUXvwkS8hV42Xmxz3nQE2N8ND0m/piJnxi6sXQsQ== 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=ItVbHryjcErPm2NUEBjYGmtLkDMIYLc8hBPXprjZSiXKHN50YoYJKRDuYTDYzS/8J6/B5OOesmG3ERsklNvEFGjbIGHa2LoFxgRVK7XPCqFiKk2L7FD3V7PqAN3YHnDrsr1BU2+ver9eQMbwALXbbw1HYGg4oZUIzzSjHvTfMCEtfWELyU8q2u1m8EuQJsvEh74Y0Vkiv7YHBFgyQOtmrTqZ6U1WEm+yAU1UjNr9Ghmj/VlJWKrtyqIXNw9vhBIde/XUYpWGzsBDAh5VwtLvUm6hQU7DhJO/xsmOnjsolnI8e8hwe60FtTw1WVtEFJPzxqznJEtllZY8elC2V91RtQ== 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=gQjEILf/hk0C/bdTD40/y1G3tgdR9KjecEk0RF2v6EZomny/bK6vIJSI1ZQ4LrvG2pqzFnqI52kiDbLz6bc0JJtOVM8UVAwntXnqVihHFngKFl1OKFltz0Ng4fE0qRPtCZ7uW+9BNgoxMNzDFfa6qTpIT6ROcU+G2LRuQxtry6Vy+AI3HQjvY1/7MMWavoOkiZkHVB87xEczZvIBnT0Bs+l6//myhcrUj0ez4zgYlbzizKQpV6nU/Ze6lO3YZiXIgYuPlAIPQOpOFBhaK4QiS6PnRhh1vRg7psaLhseXqplVul7B6ZXYcZfEDDB4zIlIWV9h0+68aD7uBBECDy0DWQ== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27:36 +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; Sat, 4 Nov 2023 00:27:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 09/12] selftests: mptcp: add userspace pm subflow flag Date: Sat, 4 Nov 2023 08:26:20 +0800 Message-Id: <336fea250fd23e6fdf601c3c3e8d1a9277bb5658.1699057244.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0041.apcprd02.prod.outlook.com (2603:1096:4:1f6::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: d7acbdbd-fddc-488f-9d05-08dbdcccd81f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ObI5Tl/Eotr/iV621LPVcvpRVVcPjSxH/XaDKN50qHm86JeQajf53SruAfbuzcBTLMtOut5pvOC7pA9itJrAgiPgGiTBOAfMEAouavkQcWcCRP4uMeqbVpklRA5c+JI6Dd+anvSJAEgySyBOCF+M1g27SZQjEYHzqsTtNgyUPMhKAE7pTZKhwMmAWFisA5TD6aePvV5B8b2roAdfVbVhKHALjx+afKjZoBBZEKc5zrwXBWVdoc2dEc13Df7T83v3gBwDAHvLbZyuK9VVZlgGCCv5gEh9XZM8JHxxujQesSgdqaRCj7Z1kZsT6kPiXvP6JqzseNbdSshzahW3w1FrAwW/Y1LMgLsFMilvtmj6XrtFpSf8kmWRAhb8ZzJ8CRo0rw7ZG5w82hKYhD3rbTreJ2MkphfQfqXjwZIBDBVH8jmMrytskYtMZdr1TWx9z6BpyulqWZgTVts4HaO+yE7Ny30mUyezKEhcrJqlvtmi+BTIVg1FuSSPobU2FVnOZC952BvdQb9cMLScKY55kcjzNl9DPkCTJCO+bMVqxFocEWLXrbrqrEFoHCUNkFxcqSVWqmOKaFxrKCFOZh2zjyMQD+pdZQm/06X8d49PDtLmfa0= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5IsPVSgWrBPEYsnezbasa5fqqr7WoLrahJFrPfyvXGWVVU5vk86L8uMOVZle?= =?us-ascii?Q?KiPntp1aWuEhfLgons5RZ8ironlPJij89/v+W3jSCnZgGDTR+X+IbavVjzoH?= =?us-ascii?Q?zvm3UFqxYeWL7BhBadk6C8BQgVv7dbllguzVY3E7fmz8eXXgpzIfbA1C9s7u?= =?us-ascii?Q?hleYbz8fBvZQSsXOeQru/nu2K8NHCa8DDs76HzYBy9SLU0/RcwcnfePyAN+2?= =?us-ascii?Q?tE7Www8hWfx9kvEZHkmOVZ0onOvxa6K4eHjJcJY0yf7L8mVE7qjGlc4UUQ6d?= =?us-ascii?Q?f7/Pcmv+vEAqfO+gIFXQfg79SAC/CqG5DCjVSRVxhk2xvvSO+Wwv8DmJS/Oh?= =?us-ascii?Q?HIvK+eY+BIdCto7O0cUBdzhBktkb+ymqC+HU8kYjQKd63of/eL4t3M5zonfc?= =?us-ascii?Q?AH89pJGemxcQicYlDw1eH5vOJznWNi4pc3t2KYqgWdZNitaEaXLXv4GD/VPg?= =?us-ascii?Q?vgUpFCqne8HISmg1N5dhR4baBraoGsGQgGbYA3kllPyn7pIzF8L/+NxL/32S?= =?us-ascii?Q?NcZ/GrGC0JcHl5MvSDVs/SaRg9F2Oovfsag0R0Gph7CHiqUkNaBcTGIdWbVF?= =?us-ascii?Q?trpZXE4HuU6Z9oJsh+KM7H7gI1jScdw2/8s7Pxux5LlLFwLINX+giCLqcVzq?= =?us-ascii?Q?7xe1lBy3I1sY9R/RwhjJTeXzYsh0TjAWe3Gxv/bjP7020TA2P0APoAHn1VMC?= =?us-ascii?Q?gv9Qeubhz/FlpR63nyPuCXRnOPUuNOxdG8CKFD/8Q8PYMiAg9Zn6BNUxIGNz?= =?us-ascii?Q?bZuryogIPUbHY4w2Vw4aSL6D6r62gQtIX5q/XBpZx1T9hf+TGNeaiE4jd63D?= =?us-ascii?Q?eddbvvNJooX9JGwRicFmn8mlDpw4UaeBVdV54hZs66a+iiDblvjINYyqVona?= =?us-ascii?Q?ddcGsYgAXGL80nzyL9EkcbOAQJCf8f4zBcMR6AI2cJAvpNZ2gmkUnw9yCXs1?= =?us-ascii?Q?4fiSSNtgBRXlgSBcoaS2G1bnWO3kpusGZLAWpobsC/IlsPpIZclvsHP0Qnp+?= =?us-ascii?Q?K+4t3w/GtUKmMB/BJVmk8r5zvlFpqU8tkr32aLHr5+skXiT5409KzsI1jm9D?= =?us-ascii?Q?7gOFqlAnuusHslyW/V5AMwAt6Lu5DpIC8+PUu+cCF3Uh/Gu23hLt+1OkvwEU?= =?us-ascii?Q?eZJxY2iv+/suSR0vKOZ9JNtXR3qcd8ZmPNaxw9hHoEzGh8gVYRi0NwaCPdpv?= =?us-ascii?Q?O+6AoKHro5RrRT47EMjwu/nI5aEf0yP1SgosEyVytL+9QaREUjsGIbD+IIzw?= =?us-ascii?Q?x3WP7XPq/FVfhGrvkgAslf4ldvcCrGn8jBDV62a5q3cdKWjKq85YNOSBNJKf?= =?us-ascii?Q?zqVctr9zH0BxQqDrXy50kOZATISWabN+YEt3Tm5CjoPq2n+AxhJVXbXjTZCK?= =?us-ascii?Q?a/6bvEOKLxxqejBomzaxlZWsayPsjg5/qfrI4xr45FL54FG6SFgCfW49arDv?= =?us-ascii?Q?wcp9w6WPf8UadpudSUkN90fqDkFGvO0urdpfZPVmRlvQvfI7ebwEtGzzbFut?= =?us-ascii?Q?Abd/VnKbMRius9zMFynumtA9jywM+ehLsjQV6DOz8Z9pIcTsTqhh5e1Qt+AZ?= =?us-ascii?Q?PyTOQd7kAUJEuzHWfa5eS4PHI0SzkfBeGNYzWSdOVnq4TLiviCJuZAtW3B1B?= =?us-ascii?Q?Uw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d7acbdbd-fddc-488f-9d05-08dbdcccd81f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:36.2448 (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: o0vy+Z49b7nEUbY25BTgrAAFOZK76goYowGANH6X+IYGfW4chsJtDhsSYRjhaVv8omyx5iHvpwU5FhiHdejNAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 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 Mon May 13 04:33:11 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 5BB85196 for ; Sat, 4 Nov 2023 00:27:47 +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="5w2X8/z0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YhJfmxgZH+FD5QjrKPFauZNMC28TPakED0tIlH0WzptB3y109FtRWedRDF4kwBRWXjqQACOjXOikwwJSi9SSXueb2/kWkPMfidFhwX/G/zMCwwSk/hkGuLexFvIdLPeTW36EdcB86QtCkxoZ00s/ndXE2h9+msOmorZ7QqvS6LB6ideq19p1xgGqxRph1wVU8fb+gmfIj7bruORvXTYDev8sPtGUy4wlrjS1zHs8Hblhl4SW3yCx3UiO+57T7tSSUx77wCtKIbgEAKRRuVqg0xOXcggPjIBSCTfOZ/puLaDwk1ifpOBLv/ucQf5nZCX4und9sZNkvzj2QPY8qEkJ5w== 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=PmlG2BtJ5D0TKRdWHuiNmNkxnLq2LDl1aM1UXtI2uQ4=; b=gQq0n9cXSfbIYMb1ylIIIDyqdNq3o8KM+qPpeKLTFYu6ZcXDFKk1Dlx6XMDyjhMoBNfZz9pMVkUWjqj6t/TYpAhA437TL8412bf9XAqa7KJ60HheliI7S5A8lEbB5GJ7bbSJ1mC2Z1xw7TVnOxYyrX4S1aD/i97HRWUh2yxyUXJVz8xYDO3wcp5fLQjmY2se5Y2kLUnuR7rH+0RGYbdpNAtxXI36tISBHkIo1IWYVY1NRT0gEimmLSEDBUqoIkW33Zoe94IIHo5JDEBpluxyWRkOWj/Fz9R6xp/zz9fJ3fjNVa8lQzHvWSi4NzD0qG1S0h8YzLpxDrq86TEcd6kFmg== 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=PmlG2BtJ5D0TKRdWHuiNmNkxnLq2LDl1aM1UXtI2uQ4=; b=5w2X8/z0vJV6X5LfRYic6+LFWexV6G7pcBKNkyG5Omuf/hWiyIDqJbJoB3oxRBf3yL8hbxubmtJVPE29aj5VKVr+VDLnq0rzkM7kBRwL0tr4kc6rQXXQNdEx5d74hYEdqFR1eN88zZmwKknrpV5wA0bgcyDuKuOykCpPtstZuhcZywCZSsFzkHwy/2uS9mFNfWI4hnLEQg6VFKeP7PlYT99SJ/pJ5C+yyYx2iVvPdL+YjjTUheqgmQ4LPmnIms9kg4kP2dB6OHNOm+qxslfuRm985WCq0I1m35LOZkqKQDD+6wp2UmH9zXQa8W32Tjv5UHfRQ4t2MLnISboKZFJM7A== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27:45 +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; Sat, 4 Nov 2023 00:27:45 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 10/12] selftests: mptcp: flush and dump userspace addrs list Date: Sat, 4 Nov 2023 08:26:21 +0800 Message-Id: <1c34ddc17a6533d0ba9d097d2c6c6a4d8084a1c0.1699057244.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0034.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: 76a2e83e-2f9c-4eba-accc-08dbdcccdb9d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nKqRp8zznx/ahu55onuJtaIUiCnZReOaOq3ASrQjSWwQNTF81+1q1pfQUKeDQYEWVq1RnBlHuUZ9DD2Zzjra733By+YKIAORA2Cth60/teckATqsPK/DApmiOkiuypyxlHHFxgUD49AVGUCZtd70DbrAjhjiqLyDbPEkYdMceB8XMH0dViDeCOD2FR7BTjCR66AFSDc9XnbuHrXwcCqRkfWWIgGdiIyWwZLsZKMuEtTijo/wSE/CY0Esxapk6HI2LFzDOlLEChMKZqA+DF4MRo4PhSij+BMYngAVHpqF2dCIzQxKs7GDSs359+jvG9+EKkaQnk9Cz8W7QoCKiyCBu4imwPe+Q4vxjZNE6Y45F7v09vPfohO1raed5/W79BJEANlE1ygde1YoWGU88Lid3luy6cRR/mQ8UvKz6wE/381c4cfL3WgFL4+5HKh8MFPd/+S7lzjMH3B4bybFy26Yl1cY4/jKmjl39g0KQzX/KYVP3qMlUW9IQgLr1svsHMIgMtt2CmJGwHIpNIkJlyo1VUkFflLzAbpRZJCuwTNU0g065kIh/fAF+r5yq6CAEMUjy9puYsGk0gk0aCShIc/2kzvAZO76xf6VGUDNyt29qAU= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dX/GDYytypyhIg16u4VMrUDGy0W+KxUGYDAEJQILL+irGZNqNkRDibJV1HK5?= =?us-ascii?Q?/XCTuX4l96yJc5tNoGB4ujjtNZ4Fmg5/YKujtc3hPueIcPLr6ZmnYZVM3NmF?= =?us-ascii?Q?hcyGwlVKK/gelArJiYNzJ99/IYtZhTMnkLJ8C2/k7XgfiV6CSiamch+okt2D?= =?us-ascii?Q?THoWGWzKOODoyfxXlAQ1vHiVBVeYQfFUL65ThjqIDiXkk5nAm3/6s60sue4a?= =?us-ascii?Q?/2d2IW3LR7YWHwKl0RbXJ9P8goFEUQ7kWSR/uCaOoJP2WjwjDwlZW1UYQfwx?= =?us-ascii?Q?RP4H7rO9HRayXzgQf2yT19mQO1OeYS3+E90UNUtagSATjbLao6uhSOjEaTSa?= =?us-ascii?Q?GXCTmExliVm5pS7IzQKdQMUGVbVNRA5ZQE+sq2Ky61Bl6AaCfeO6PjEVL/JW?= =?us-ascii?Q?4cghO0T5a73OVBErqMGmZRnKCSey0QF4ZZjrndWr+e67uSqoJyKYR+iNXXi2?= =?us-ascii?Q?h5WKAhqkrmsq4f5sLc4Gxx5Fr4usER2Qc3fxcV+BUgAwsXrBJno1rU74Gnsv?= =?us-ascii?Q?NZMYC/QYBl7xAgBER70Do02Y20txc7Ee0Kr3xtUTiu3rfPMG0oXC03IMlWoa?= =?us-ascii?Q?BpPCMBxdP00wQFrPyrqJMMxUXHOq7s3yMdqeMTd4ZZhgHhPj2W5aDZHXzX9U?= =?us-ascii?Q?m5rylQe2M87CtzTCmcw8qIa49n5+FwS6vjwtY0E1JCsmHa+KNLleUg2idCaw?= =?us-ascii?Q?JTutvrFm30hQIhuCgNVrb1sVbRaIpNAbvPjG9+sMFMr1SYpX3NGEaCs+X4S/?= =?us-ascii?Q?66oscEvzHp8SL57gqrW2gcC4rLt65nNFIr002ty2b+kl3xCw1yMvKE4vHCZL?= =?us-ascii?Q?EJR4E9iEJS0h7LhHNBH3y1fO68R//sDzefuUcYBFwHLTvHbX0K+iiRxwMCoa?= =?us-ascii?Q?/tHj0phNjZHcHBCb5XZXZyu4U3nmNUOTa8+jZGCbBjKCcwhmJMWDI/f91J56?= =?us-ascii?Q?Z6WgqtGe9xMpB1KHqA7/Qhy8bRU/F6mzf/HwWZFFjXLbxAFRR75z22ZbudEd?= =?us-ascii?Q?Bg+hIHe2eyW+AgWp/EvIaH8bjFBnfFrfMMih8qENaE2qiLWjBR+oNlgHnKcA?= =?us-ascii?Q?kL/pr1cfS721/FAZHLiyymkaTWNPpqwaTYKWIEUlwOZNfpYcfzuTlmkMmEYx?= =?us-ascii?Q?seVRvDe+E4uinG9UnNaVpl+jOGlyhfdHRqvATO3gNZ8bMfaK/mL064JfLXUn?= =?us-ascii?Q?mVKGg97rEq0b8o4EOBhs4cTBW/9nsaDZka5qM3Q/zrkadjlEdffMUggMJLG3?= =?us-ascii?Q?JH2j+PJqGxGcMGVcl/22Scek6XTxCKkxBriF2yfD0Cy1zuRc0Uo8SRCTnfNP?= =?us-ascii?Q?X9MLedG/t+vC9rBhz5TCNM4ara5bdjb2d2kVtHjEWu/xDZd1xVkIYlfHzlqN?= =?us-ascii?Q?DFMe1/I8vdMsdmcOBEo4II5/fjr/XYnxgqPGJ8jDbRJoQkqQW9SufcEYSVdC?= =?us-ascii?Q?V2XIKBKMLuhUqJNgd4fiQW+Bo6LX3V2PqNc6FVylTWE9at4By4GUldIIb/jT?= =?us-ascii?Q?v/oUqLMEmz7kcVNcf3sfbsZlYePxh4GF2uV9r3ZwsNbDtAqrbvqu50sYhjml?= =?us-ascii?Q?1N/KIz6u5O/58v6/rRFgjmamy6jdEMWcFwgiS8fVlbO7SfSkwZhsZ6YfXwCM?= =?us-ascii?Q?/g=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76a2e83e-2f9c-4eba-accc-08dbdcccdb9d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:45.1909 (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: 73hVSOt2x6il3Ra3Wdw7WMfEWafPQ7+r8DlG2WQgVIAMJgsqOmZbpu2GcgaEAylKERxDTjSKI9AcaA4GsM16Cg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 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 995280882428..b56e141547db 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3405,6 +3405,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 @@ -3429,6 +3430,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 @@ -3456,6 +3458,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 kill_events_pids wait $tests_pid fi --=20 2.35.3 From nobody Mon May 13 04:33:11 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2071.outbound.protection.outlook.com [40.107.20.71]) (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 BE2A8196 for ; Sat, 4 Nov 2023 00:27:52 +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="Seuql0BB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gTZV7Z9fLDUBIjPvIVEEhrO4qnFDTmnHW9kuzLKz4j3z8ebul3jKJ5FWAGLsVcUSAwbXw2je/bc2/NbdzVDhTvhB86YmIJKijUy4Oi4OV4xC1sq1GhVGH0ucdp1TebKkLm4O2KLdipItcCMwg9IEeyu5sTp2tzD724Put4mU4S6Q/PhQLxQG78hLznu6/YxDpOEBh3Bc0jjpDbvLskQh5N1enBizk40215/n8pG5ZL6gOriaFGYiHArdC8uyYbCHfOmjh6/53LgJBGkwngxTjxJ4LVBMlMuB1N87RkY1HIdhnUGyYD7m/+7UWd4qofihO758c4vGXGZ6yaTf9qYKzQ== 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=1sI9KZXdAWa2fbI5vHcI4Z/HLZ2N9d+c0aPDs4t4M+I=; b=lGJyCWebhzz/W9Zq9LpmVmVDCqcy0JfCKH5ppmEB7Azsk7CjfE3cQaP4vYPGuKzO1fODbyN+iWIC+DsuEvb+MTUr3XD0kaWyfyqY851wZrEf0TXRk2Yx8v/NF6I111+jzyc1CWaKP2jqoqVOje2FsHBbwGrBUYaKWVBrxJSuPdit6b13i27ErIfrH0pRQZ0daANKooMDM9mU/p9zyh90Z8YomEgDcOSM6UVjz5y+c1PHHfzoHX3d9qtb8uX1CACVm7fGdv7ccQWVS+Rat1fcr0HPBgexLnIxlBm5JfxCL93QRdDrcRaFvG4HeoQWB4FvrCeMkRYB1mOvDsC+A3/2xA== 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=1sI9KZXdAWa2fbI5vHcI4Z/HLZ2N9d+c0aPDs4t4M+I=; b=Seuql0BBHaAGUsFf1wCDkIhSCfgRUHIHF5qTsxQAIr933BY18EeSz6qoD4taaWIFQ7+QY49IK8+HtdpXH5l+WVCRt6AJUqIWrPMfFo5oaFafbHIiCyjAneCGitC2f18rT1Hnj9DHhiU8rGeuihpOwaK7vrgQxiByfHaB4tyMdu/EDcOUFXZWtZWa87ifnKFLCbnQkrTIRlICpXa81qkaaYGrtXlFQrnsXWNKebarSIQoOcMgyS1UJgqSBXTw6WEchp/TiUuYV4Riqdo5/YCththLKzB9d7Wlmm0wa21EoE/Dy0F5w0nVykV9SyKQIs6QmsIB5i85mDq1/15/ts6BYQ== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27:50 +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; Sat, 4 Nov 2023 00:27:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 11/12] mptcp: add addresses_identically_equal helper Date: Sat, 4 Nov 2023 08:26:22 +0800 Message-Id: <03c1e5cb879e2bc421e500d4f49988cbd0659acd.1699057244.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0031.apcprd02.prod.outlook.com (2603:1096:4:1f6::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_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: 471d686d-2150-41e6-fc01-08dbdccce05f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cf69wb8GR+NLfF5QTl9f92TptKRA74cdptfEXeAbi/wrMbn1v0Mbz0hsM6zZC4KwX4i4zakdAC5ryDYx3sBAZSS9THtEfPFQbBN/wPj6MvNtHIWnciNoyssv+QyYIQxu6bx3vL+mh22BU7AEAucqF3MgL8Ck+bB5aFUnR5Fwb4NYt1vOweyYQ1dLmW1lxheP6YsceZMwc4wN5i9AZBC7dQpfz8avGuNuZiqDZemEa94dfZbfHlp9jGjP/Za9bv8VPnZBAEi+RcGjWpzF+eBHixoniK6V7In8d6Dk/LWSvJKjYZpACBlgeiJFeT0L8Sc6mQKXy1DuhNTKhU6SGC04Mm4rBRM6gIyr78+ikia0pXp1aY48FHiT1Bin8QfCAzsux9ACvTKXnI8Ex6PSxnCEVyTRnNKmraXcKeB4Bq1CownAZ/uPrHctlYyBDrK4KgVYvMlaWP9QhCTDdvAlmzaoQnmAOp3lImVtGWe8g1BIvCgURxNTb1DH0gZ2ZA6rRXc8vpbvP+I0Y3ndAvn5nVwA+XnyUto4jUWKZqCvNueheDZZn5NPnveFeI7o0nlOjfbmvIDWYbikyF1HAZKE3LvHues78x4Pa4B+E6k/NXw82Lg= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YjOhjbPXzHipmIzvChz/k9S+26z549Rob8P4Aw+kcGDJEqCjUXI8PlkMQP0U?= =?us-ascii?Q?TH+LrjMG3SWIpKuwt2QEiuHUfUAIinAOoflGmVpxZ39kSu3KFQJup/rdcnak?= =?us-ascii?Q?73DfXAEYGekn9H8JzmokxPx/+Ym9llyDH6uj0iSzO0f9w8AVIhjT7snxHXPd?= =?us-ascii?Q?1VOzotqw4yEeY0aump+MLO5HWODyZpoQnPyBR00Mz13ibJ/0KypQxZFCoIZh?= =?us-ascii?Q?quEP/5IsZPJgOz3VtcX/pTWc6TBKxSzcR46ZCjSJ6sU7pbt/lod1JhjTGL2F?= =?us-ascii?Q?1qMlFo+B2MVFht5E/6Sk1EnWxjOOoOaS2Vb7pDGdUmAbwWM4Gj0qZ5lvCxrO?= =?us-ascii?Q?ox15tq9MRmiutb+N7Xbqfp9WCM1MrLflgy4gXfxlD8VItCpOh/4tsMjepMzf?= =?us-ascii?Q?QFfB8M6JLSW0kduxmlJwjJWmFEEljjiWGCdwgx/LDQyn3SwW4mKxVKCo2ks8?= =?us-ascii?Q?Pq9H8JDjh6DVkHOPQdsphPxjJiJbnjrsG5vRujQg555ejUYe4WA6p29gvhSW?= =?us-ascii?Q?tFFfiVsmrilmN+rpP2Upi+iH7huEVTZaBFTF17UBsA+qlQkczcRqXX5WQTVG?= =?us-ascii?Q?Y4lGCoroT1XmMzR5WiUDRDrlOcIBoWIpA9Z4XlQLhIak43oQvN+nmp7Ea1Rj?= =?us-ascii?Q?6W7+RO9nICSMCO2bXXqFbspvRNPDqSNETzsODE0ql0oOfNzXZtEqfIV02YVd?= =?us-ascii?Q?q2s6GvtoqZZOsXN/RLH86nvjNPr/16/JaS/GKUB7Kl8pF28abUt+HfseTn15?= =?us-ascii?Q?rLDqTsGNLBonzPp2eqDX1/P5Jvgxt8/hU0SSoCE+MvozKSesJYrtkRuvz4Kw?= =?us-ascii?Q?RzHstqFrdwleErxDFuJugupyrw+W6tTqYWLMyerAAtSNggXnFXCd70cKEuMI?= =?us-ascii?Q?1cyXQllWJi1cPLaCwBnluevnqraunD96sAavDW7RFC5O+g/ldLftt74KB6I3?= =?us-ascii?Q?oujrrmnugYyQ52i+Ok0Cpx5dnYg8vAAQKucXstqfPmg+b18LNGybtSNgf37X?= =?us-ascii?Q?JbBUi8Rg4zmftDKEm1mIIHX/B5wXcM1N2Ky1y64fD5LstKaPJKdegg5+Pcdj?= =?us-ascii?Q?HDFFzAfBrKxR3lQk+/+wqtJGCHD/g2bVTRjSLZJDhyzNpwrIIWKka14FTkpE?= =?us-ascii?Q?GMwp1sOi34yw8AfR2SMtbPb79V2aNRld9LZ56LZhRzMTBogUvok9MtF7GXJw?= =?us-ascii?Q?vt0+DlXYllA/0sPdPK/8bgBeC+pYUWIJZOeGsjFWt22ajk4wjD5Z+nz0Gn7B?= =?us-ascii?Q?KYhlrm/iIJBEjDAQ9apU35wgc4EG7RP//OwnPsRM0R6HzlQoOyHgj442RD18?= =?us-ascii?Q?1y78iNrNN597PkTWlMvN19MXnUk0LUc6bEf3a44N16cclYPBvAX9IVAQaD/X?= =?us-ascii?Q?YEqzm9pmPv85+48IHzrwmqxRlql5wDaOu4j/NaXR5Mq/8NUgN4pw5A9h3knw?= =?us-ascii?Q?KktKrY9MMAWcV1diYDPi+W5XczJS8t2DKjuYmLrnUVDH3K/Akkv6MuiJFjiB?= =?us-ascii?Q?wFCqIiuDp0kC/YtVx4NBADLXzPa8fmACICiF3m6giDz3vkgy+X5wjM0VkvKz?= =?us-ascii?Q?Y/zXdLgmnmq+EzL2pLkn2LOcViudHpIkKkP7mJtaN2qQqYlkwdL12acBSUNH?= =?us-ascii?Q?lA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 471d686d-2150-41e6-fc01-08dbdccce05f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:50.4540 (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: i+CiKL7098ln8Tzvcb0LFAmaOvH3WD8cxOk8Qxj9XpDFD8Ezefvx4DGE87i5CW8aVSKeOGdsdnzimMywWo0mFQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 Content-Type: text/plain; charset="utf-8" Similar to addresses_equal() helper, this patch adds a new helper addresses_identically_equal() to test if the two given addresses have both the same address and the same address id. Add a new parameter check_id for mptcp_lookup_anno_list_by_saddr(), and use the newly added helper instead of mptcp_addresses_equal() in it. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 2 +- net/mptcp/pm_netlink.c | 25 +++++++++++++++++++------ net/mptcp/protocol.h | 3 ++- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 4ae19113b8eb..6da3dea5a9fe 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -258,7 +258,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 a974e4e8ae81..3499442a9db6 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -87,6 +87,18 @@ bool mptcp_addresses_equal(const struct mptcp_addr_info = *a, return a->port =3D=3D b->port; } =20 +static bool addresses_identically_equal(const struct mptcp_addr_info *a, + const struct mptcp_addr_info *b, + bool use_port, bool check_id) +{ + if (!mptcp_addresses_equal(a, b, use_port)) + return false; + if (!check_id) + return true; + + return a->id =3D=3D b->id; +} + void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_= info *addr) { addr->family =3D skc->skc_family; @@ -267,14 +279,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)) + if (addresses_identically_equal(&entry->addr, addr, true, check_id)) return entry; } =20 @@ -354,12 +367,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; @@ -374,7 +387,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 c8b4969ea43e..6e8ca3d453b3 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -918,7 +918,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 Mon May 13 04:33:11 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2048.outbound.protection.outlook.com [40.107.20.48]) (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 B8FF4196 for ; Sat, 4 Nov 2023 00:27: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="RZE2mrfG" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sp0WTuk4rgTF9oyM2I0Adbv9A8NyveRsv6BI7650HbSTvjDMoK+aNm0F/emamTkypdHaF+/f88tPQOj5sDUm3PkNwn+WX8WhwLiH+DrNrfsioBXbZqGlt+DEQskDAKvh5Gbic0sip26p1tCJyfCGpOBYwa9aJ3n6sXzQg3vOa4NrhFagp1aEHbiV4dmBvOS19QhDWID4jOUBZux/HyZhW/0zxQlxIUWxeBuOzVUWBoeCV4mzIHz7ERFl8YdXqRFkgBWHiHKMXgtnmCfhSZnwrfe73AAUM96osBPOofzJeA7V6QPnDbkXmS5lMh0hFhN/7zJyVGc16fFwBYmJrVfwzQ== 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=9M5FinEGfSq14lJIJACyytPQQd8wrgeus94ZGGb4+dY=; b=m59HciKTnhmWAfoxWwbEV8dSCaz6iaNwzoa69I5QCjAZOV1cpA2Y7Bci0ZX2GnYM4UnimIWvWmv3FnOlT6lPgCq1DieHtIrAFk1+SBFi2HrGtAFVw83V7iOE91oMCDTOKL0kFwHdMxPldZ5+EoPFCbAt3gEud1OtDpkIcw1rLRBr6QhrTRWXnAdNrBviLBBN0pJeX+koQeKtCHhFS5yOG8vmWOb2xWbm1UFiBJKT6fL1SPGQbPvMcwNwF92BLLaVb92TCnB8vg5bPaAK2ByMZ0aFMKoZThdBOa3W6/hEFA1URKPxFhTE37NjrJuvccEbpN/5kF0dcwMtpdk33AyZ0Q== 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=9M5FinEGfSq14lJIJACyytPQQd8wrgeus94ZGGb4+dY=; b=RZE2mrfGOmVI4yqyHBbnv/aEZyYSlNA80abxM25C8+uJg/S6VN9vAoav/5tPnWGeZ3oWHoE/fEuW8LJGV/A8nGCct6og6t9OYGxFeU3Y3Xc3uAFvEvIUbSf3K4kY14l4nMcXFWTc/WHbo9tkUS4ZcYRPN7Cs4QtYOIN1K5Slpa6sNRqKhgDvbUKWPJ6REPtlx/kT7xIlLBa+CtvQILA53QhYdXm/dh7KPaMhRIElFkPLizDXhSMjZcYHFnQU3JZvTdJQAmw32lQ8JV7BRMH4exzvrabXCZV5bVBSc+UwxYAj9gByRe2TPrYhCyTFisJbWCE/KtY4H8QgUe+2w/q+Ng== 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 VI1PR04MB6989.eurprd04.prod.outlook.com (2603:10a6:803:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.10; Sat, 4 Nov 2023 00:27: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; Sat, 4 Nov 2023 00:27:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 12/12] mptcp: drop lookup_by_id parameter in lookup_addr Date: Sat, 4 Nov 2023 08:26:23 +0800 Message-Id: <7492afacaedb042947485e17c1797558634ba60e.1699057244.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0007.APCP153.PROD.OUTLOOK.COM (2603:1096::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|VI1PR04MB6989:EE_ X-MS-Office365-Filtering-Correlation-Id: 453c8799-9ed2-4ef5-636e-08dbdccce4b9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VPRZweeauGxmvAruKfTML/h7DYfPq1IXZLdEEcl8eVbmd7iSBa42ILoHtFItYlZ9nC2pi+aaidqwbXAlHdX5R5tuv7MiNPabmJZhcHzQFoHkjtXUdbkSAMt0AqGDl2k7m5KMNqeYY6MF6MRzze5YSCiXZuc4aSIZIukfzP8N1LhdyLDGOPlcz8RZEN+pJUbmYjnFmx31/6aP3gf1Na3kjvaSzbdwD6JGkmcinyfHXCGzC4m6DMR/JuFqXZ/cES+TD24/6s+MCf0I+4qT4cRiveyrB7ueKbXE8VeYKS39YN3HgZJ9VhAN2JdOQ6GjhxNCyl5V9pGPs2SXwdaLcjWiqp4WQM8LxTYcYBJ1dhm0C/vxxTzDi5rWwp7b25Iw/Kv3Cu3TFxTSqFeh8KoTaJrKHNHSpi1F3aJM82YkDcQyBccYlVz96ez//nuqxhdcgcPliv3nDQoDG9IahOvrOqngdQXAQzDrMdaqiujE4ikfMnuh7M0fP6s4m4PuZfkK4Y/KkdQM/jituAZNi77EEDQ6sQeXwDGG8VA3aOifUU1wW6ZAo1rFdd1Sn3pPfFXkzritpR/mixYy5OQP6W7J4xN6KKAU04XifIbsz2B1KeOJ0iI= 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)(396003)(376002)(366004)(346002)(136003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(6486002)(5660300002)(66476007)(66556008)(6916009)(8676002)(316002)(4326008)(2906002)(8936002)(66946007)(6666004)(478600001)(44832011)(6512007)(107886003)(41300700001)(26005)(2616005)(6506007)(83380400001)(36756003)(86362001)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8b5RCTJW5ebOPptOnHZI0ncK7hzv+tyBxz5Btqay5cjYKd6YjMVsPds3dG4f?= =?us-ascii?Q?PaK6MAFYF1xIaJsqr0J8rP0iSwR6/lFVMce2Whf5pX1ri4y2OgO//qKrhZGV?= =?us-ascii?Q?7K8SlvsUcEkt5gSOsc0NbRLdTYYi8AfwBoE6NXkKWOuQAokt6PpuRZ8xNBK0?= =?us-ascii?Q?/B4BTdk9b9TNCUf6SiqYfS0vWrSii8g85VQ5Th+l+si+FmjUTgWvC6HWrUUc?= =?us-ascii?Q?ioXDPEZ5umuLYJ1FYEmQn5NwA/5TsePz2DLZgePx3cwSEYZUV2ph6KHMA/4B?= =?us-ascii?Q?QeIbrLmKGMqYAMmCMiZn4kqGV7zbvZIXG7eP/UNHGDWbFM4+Z5wSKgdw1gHH?= =?us-ascii?Q?qpZChjPeM1jaSLkEJnrnMR+3jmUiQzNlW+mDTMUv4ZhRj0NY+xcP0cRPupSt?= =?us-ascii?Q?iR+fBRth2y48iFJ7qQIStqzA1Y7+wIkl1qC37unYWZGyrY5E0UB9IA9cfJ6R?= =?us-ascii?Q?Yk0RveZTfuQVxJSzMBvHgwpI2cPmzoppToKqLWuxVVEAnuUZH7zjkfs7eMt+?= =?us-ascii?Q?BgtE/SQuwmvUp941SHsOW4i7oHQ5P2U98/4WxiOsx5M6xxIIYQG75V98yelJ?= =?us-ascii?Q?RHY8K3U9LeCEPWMsIIsmfHrgWN4Y4D3i8mb6m7LDB8xkUUgQH/xrYg0kFd3C?= =?us-ascii?Q?n59j85dAQY6Qf5m7vkCjXZDUsUrrezeVXbWalaweMR++XKDt6ZP2iUyTYMD0?= =?us-ascii?Q?vj98KY87djGvCVDRF0q7hlLqmXWSSbByQmVIwRVCWiK9Ghj1JtzSqXVOgXOj?= =?us-ascii?Q?KtXTs5NYUw3dVg4lcMbQXgb+nuNEPZDbbzJ6FAXVcXrS+xCI/TcuBTPcQcny?= =?us-ascii?Q?IlCenNWgoAq5NHPYAtfy9coOLf5E4iGCrZWvA5a5D5+EkRAZ3i2Pi+Loa77n?= =?us-ascii?Q?jL6tvUproQwM/3Cr9+vy8LPXxzdudBZgs0UDpj9ypq4paYhHfSBONWMxfEjB?= =?us-ascii?Q?IBFkW45jzhyO6SAMh5BYgcOSKGhQa2wfcsNfalva15PjRLZreOcLM7q/eKmQ?= =?us-ascii?Q?u31Kg/dNgIxNMy1YkX7y9gWiJqps1DnyydgihZ9/a5dgSh9FQRTTDjspgZ7V?= =?us-ascii?Q?2gXyWw1yTpxZ0WZWmMP7t5WeIJAEJNbVqr94t9+J00Sh9SlM2X008/E6SivN?= =?us-ascii?Q?FA0D1kHStkPWZOOCEXOZNWv58F1+ljIhqDUFPeIS1u2Zy3IGTFCvwhIuOXNI?= =?us-ascii?Q?p6QjaRYOTf8777Tw6ooksJ+RZORjRgydtYmDOq8FPP7tbUCK3LEb9Fj5drAv?= =?us-ascii?Q?ldKYs4b3C2ksFVdaHbXz9a7V2OafDmeX8ffBQXLyDKFjgg7KDd18G2boa/4I?= =?us-ascii?Q?LqpyHe5oMAVhKqBKatk0zM0gy+E1PMBe6VXbxZfQ07Duwryoy3TTzYEp8GhF?= =?us-ascii?Q?WLddbXnbYenoYi1QRKgvH+GAEbeDpmPDj2tlxBv1x4julvrVPyjuJ/SrRE8x?= =?us-ascii?Q?zKTBC13uSvBLrZxtms4j4dG7Pv1ZKGoJEPs9LnRVhY4l7XHEm6JSxcCRziYo?= =?us-ascii?Q?OIGR7vjuqWzZtgzViOjjpAJat4oKFlKKOm5hw/RVx3lkXiUTuoa8+DiCKmOG?= =?us-ascii?Q?0WqbjE7MTE+emDeNfHnqGc+eQomA/NLhm7V5YIzNaK5cF3mWBkNr7ZBrGpDD?= =?us-ascii?Q?Zw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 453c8799-9ed2-4ef5-636e-08dbdccce4b9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 00:27:57.2791 (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: fRL6QB0iJVMMLEPyCrvU/0nTQg/yLU1Di6crP9jXTFyTfgAJ6wqIe3/ic4eNFJg2fvZIaqXmXkK8Qavn/6vOlA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6989 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 3499442a9db6..1a66de9127e2 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -539,15 +539,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; @@ -577,7 +574,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; @@ -1917,7 +1914,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