From nobody Sat May 11 09:29:56 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2054.outbound.protection.outlook.com [40.107.20.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D475329A5 for ; Thu, 13 Apr 2023 09:12:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KvObf7aWHHCnCPkIP+f8qRAnrJtZ2FNOphrIZWgIVDuVvk8UX0td4OkFzGgZ0BATzKCKAD6ONvg7CI8Iws/Bz1jcr1KOwXwhPnHbJJJxi8qcITs/J287dNb/IpBFFNCPpIficbA+A66mb5MguHLc4AK15IgAoedU36naz5CziAprCHPaK6lUBvfBM2G5YsXAwp5UIatz3sz3bsJCzsLMIqGZQ7ubWKhmQYeWsuck3YluUsJrH2DsMZGkuY0RhfUuxyS+M6qW3/kbQRsWGIY+MYV3lQECobU22MwevSiibWZ+McdBeiQL0EyDDi7SJCtwtea+tku9klXwl6UWBGvRyw== 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=rvWXY+rcygsHpFQ0NjObfWxPO8Dfl1bxguZBZoojt+g=; b=euVdhNLM6HbWlWGmeq79JxYPF+IEjLvMiGMi/1fsuwTlIbhi9gQE2TELjYcWuJU84wSatqfUwkhMsW9Vz8vuY/Yc6M/c2Xgdanh1NwJnOIeSHQqA+mBk8uDg8GQwV0ClNVWEI6rncSdEN+5JWee4hVk+qvhdzXP6wCbcaZcrNEYIqyzu9868dhSxxX4cW4zlqEUlKl9rwAL3HKrL1hOqr1tOPY0kBAXbR0DcpP6uouIIOVICXcUFli0HhMosiKcdYYZRbq8V7EPf5Mq63l0oI08L2x8I4Menm0UUFP3eZBz7q1J8gBlM2z/GK7pzAedTiUEaXHZ5QiccXmVWxZe5Lw== 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=rvWXY+rcygsHpFQ0NjObfWxPO8Dfl1bxguZBZoojt+g=; b=tcM8asB/ynISqauvLXuze4OnlBI2y93o6+WqYVoEkX/OSCsjyPYH5dy69Evk+n/LB6W3I4B2B5kk5l216NqeB9/Y55LumiM/m/fJfv42BEzdmMYzqIYINQPR01cczWae7UKjQf8Vzp7fYa5ZV8hA/n0kV3EuJIQHbp/bjHfuA/YvtpHuoiq3vxNZmPSg5aUpea+6cEhkcOZnswGv0NjMlf1CJgmciOIiixqQQdYMX0kzEW1Ls4jN8e+ml6IK4i+zUv300cood45KvFXdKXpXwYFtAo1qHFzICFqEd2UBC5PZUWxdIISNciYEqGJc5BN6SlxlDT/6ZIR9I43SVxH9lw== 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 AS8PR04MB7559.eurprd04.prod.outlook.com (2603:10a6:20b:295::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr 2023 09:12:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Thu, 13 Apr 2023 09:12:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 1/7] mptcp: pass addr to mptcp_pm_alloc_anno_list Date: Thu, 13 Apr 2023 17:12:36 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0024.apcprd01.prod.exchangelabs.com (2603:1096:4:192::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_|AS8PR04MB7559:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ecf4cc8-3df7-4430-700a-08db3bff437f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iEGtkBj5Fvl3Ebh4d+hJ9ZTSyGYrifzOgkl4svqxV68GmskGIrAmkFwQwH3aWJTAWCVyK56cfcp2S+Ahl58MOfhPIcpD4cjJ1Brrvux6QTkzZ9kxxD7jTn1LpzA5vYoUl4bD5TnJwM4eAFg5E7er1/ZRhX2wURfhtB/ccmKtfRQmtC0YU5xWEnSEMOML2mUTCqu90NMCUr4nsyI8rCA+OXhYsfHt2+YWFvTuBYGMfA/0nEW1QA+nppxm9G8PBdDqQn6H42fbeptrlzZNPJSxEHjTm2He8WJT0TLZhNXK0qV4RmV4NSv258E2gFhHlFOqXqrTHd8gX7aXoE1WC4KFPAywGAh/di/z0Iq66O+Hn8QL/2OHwZ01d3KSCBw8GCPrJ5NzItVsCg0qa9AXWGmKnV/yVeuISEo/4XtcJ0FvZe9QTu9n1mAs5G4B4lkIHaXJ7z7WaUFweQeQqQNjODWXD8C/0kjq5nRxq7DRA4irKlPgQXeKG5U20o8evuOmw9yBdph0OkwzDaBlHfMoLsLQj2WRRPwlC6K6esOgILU66CAr+x/q8c196W27E0//mQzU X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(346002)(366004)(376002)(136003)(39860400002)(451199021)(2906002)(8676002)(8936002)(5660300002)(44832011)(478600001)(41300700001)(316002)(66946007)(66476007)(83380400001)(36756003)(66556008)(6916009)(4326008)(186003)(86362001)(38100700002)(6486002)(6506007)(6666004)(26005)(6512007)(2616005)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ziZ+vk7kBlZ6n3t+9R6AhHZePC9wx34WS32/sF4jpnn5oTJB4j4X3qD36hhN?= =?us-ascii?Q?0nnckY8QnbPUCtFIY0eyvvKE+kokRosPk7Mz+7bEgik0q3MacKXQPWBlKNQR?= =?us-ascii?Q?FbjsnX2impOcKZbZvErrgCXcwR7aAqLqFfOy9waOkKc7D91/PjjJsLd82n54?= =?us-ascii?Q?4kj3VaMVaJWzgc/cxscCLPmvOhky19nVCyvLb2atjqEVtWsjyjH/ertEMStt?= =?us-ascii?Q?P0HKhZbvaktK+rYuFEPFzLKqv5/1ln+FwsQQHwY4AC9lZwDpTxicvywFlyLC?= =?us-ascii?Q?/RD/FIlIu1OHGymjdWAIfyQUcvgfJQn+PYFKxWvY1vAcNTJ9TCoGF9PD0Jfl?= =?us-ascii?Q?VG1A1WUqWzpf0pBtctQdU6fZ2jbmqJGjZoGZnMW40MkXQRCLHTRnSaDCtQ7m?= =?us-ascii?Q?5YvtSETYYE7kuVmOMiukT3Ig1HK1xIugZfOLSLdH7twlgirrxQR5p+UufTh8?= =?us-ascii?Q?FWYbiuio1BkA9NOJEy9lx/WHuMGfgHj8vGtGqsVK3/BbdNQ0l+0W+0XjpHO5?= =?us-ascii?Q?bJirn3tvsv8tM9nO5Qsp2nJCm+fgsZGr5gT7oEqTxlSpDmeD3YNzQlVczLPq?= =?us-ascii?Q?7CVAxCY2WcVMGIrVNuvfgjEDbcXAE5GwCd5nZD2izLnIQx+N0M7fR5pdhnhJ?= =?us-ascii?Q?HQRtamyq87v+VXHbguM7ejNOq7PNpH8CnAnnMypNb+rhhh6NUc3/oMLpUmp/?= =?us-ascii?Q?kp7k3TTgaAu37padfULruIcRl4Xw0cjVa5yYxhMRHO8VUAd37VNMWMKIYXtQ?= =?us-ascii?Q?cOtHUuJGqRbPA/UYcSK2WQvhadZuyeSv84PhBR7jYXGYk1gn+XJiKANIpcTF?= =?us-ascii?Q?0Voc+h6i5QE9x0zjlOb4l05zMUcz91UggzxlrArP0PTA1dRfg/7ylsTMN5wB?= =?us-ascii?Q?uhbQLz8fxtAqkebv/Iayu5jsUYWCzHeBgEqrID7mJc3pylZzr5TNK3YmlmjV?= =?us-ascii?Q?D+mLqIzv+fpXp0YIcJZpXS2he8ms1qEYU1/gFsaAyFWFqhuo8fzFQ+naqjBf?= =?us-ascii?Q?7JG2lON9b+m6gzl3ldDykkqjLJ2mt/1fZGb5EpyAdcOthusU9iQ2mGmOP7NL?= =?us-ascii?Q?LgvsjawWzHbQ1poVzzfqSVTWcolVyycdfh1hG8D1OST9oWyC02bxzqgnfcLZ?= =?us-ascii?Q?vWJ2mDMb0Wzh2MCzRUHI9mcQEtQpfO2jRobS1VoynmjBHmPk3PxQRQJgFilo?= =?us-ascii?Q?BH1IGyhDchKpB4ALYVkxeprZUJJRlW67Ll/AlLUlJ+iMKjnYSyC4GQLUYKMQ?= =?us-ascii?Q?1gCJYuvX+wJ1mrq+DDqr6tWoB0R293/ORIyBNeXn+gfHk1bjRzFFh854fYY/?= =?us-ascii?Q?NB5x3cX9+PXkkRWLcUNfiszKVKaxLBn9uD+nWxcLoHcXyGT91ibnauV24h/9?= =?us-ascii?Q?RMBrSb7j7MK9Fc/vsXbblheySX/mdIAp+gQMhyofk2E1KXHktJVok4kKYC/C?= =?us-ascii?Q?NxrMJWKLuXCgaJWV92L1567nW9X+QArCnV6DBNgoPRGZL9019wpTS3EBgWGM?= =?us-ascii?Q?5Kgev5RkzO/ovAjPbxv0XsO/wHYeUD7cRVFDIRG2eLH5sphZDKWy5Bs3LKlB?= =?us-ascii?Q?qIL0hOMz0IldxwQ2bMX27NgJpipOiwpFkcatpiTV?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ecf4cc8-3df7-4430-700a-08db3bff437f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 09:12:54.0335 (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: YfK5NHWyGm5lm4Rv8veiEPvvqwjabFtDS+LSlkeIMY07eFktvhPfy44mwC7leZS8MMbGwc27SWOKGiqqzHiP3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7559 Content-Type: text/plain; charset="utf-8" Pass addr to mptcp_pm_alloc_anno_list() instead of entry. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 8 ++++---- net/mptcp/pm_userspace.c | 2 +- net/mptcp/protocol.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index e8336b8bd30e..a02822111218 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -342,7 +342,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, } =20 bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - const struct mptcp_pm_addr_entry *entry) + const struct mptcp_addr_info *addr) { struct mptcp_pm_add_entry *add_entry =3D NULL; struct sock *sk =3D (struct sock *)msk; @@ -350,7 +350,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 lockdep_assert_held(&msk->pm.lock); =20 - add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, &entry->addr); + add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, addr); =20 if (add_entry) { if (mptcp_pm_is_kernel(msk)) @@ -367,7 +367,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 list_add(&add_entry->list, &msk->pm.anno_list); =20 - add_entry->addr =3D entry->addr; + add_entry->addr =3D *addr; add_entry->sock =3D msk; add_entry->retrans_times =3D 0; =20 @@ -574,7 +574,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(stru= ct mptcp_sock *msk) return; =20 if (local) { - if (mptcp_pm_alloc_anno_list(msk, local)) { + if (mptcp_pm_alloc_anno_list(msk, &local->addr)) { __clear_bit(local->addr.id, msk->pm.id_avail_bitmap); msk->pm.add_addr_signaled++; mptcp_pm_announce_addr(msk, &local->addr, false); diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 27a275805c06..4d0e54fab5cf 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -170,7 +170,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) lock_sock((struct sock *)msk); spin_lock_bh(&msk->pm.lock); =20 - if (mptcp_pm_alloc_anno_list(msk, &addr_val)) { + if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { mptcp_pm_announce_addr(msk, &addr_val.addr, false); mptcp_pm_nl_addr_send_ack(msk); } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 5a35c77723e3..990c21a97975 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -822,7 +822,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct mptcp_addr_info *rem, u8 bkup); bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - const struct mptcp_pm_addr_entry *entry); + const struct mptcp_addr_info *addr); void mptcp_pm_free_anno_list(struct mptcp_sock *msk); bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock= *sk); struct mptcp_pm_add_entry * --=20 2.35.3 From nobody Sat May 11 09:29:56 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2089.outbound.protection.outlook.com [40.107.22.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 D953D2CA5 for ; Thu, 13 Apr 2023 09:13:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RhUDPsqXSL1EgaUVt94C94CHc5pGJA7vMFX0fudSGbWOxkGtAafv1ARsgsFaRD8MS9N/vbFrqAdMN0p4Xxkxbz9MWqDALnYV24DEaWklnzWZKbUWWQ/HVb5yxKUwYU3nLx7WgOJoc5sq3V497NhO2OJba4wRv3SozQHNz7koNhRWITSRc3TILjA50RJ5VSeEH2aUKcj0k2Y+GHvsi7eqMHkPak4HYg1korwMP/tpRGldK4QGKhWZix52J4jQ8yDYLU2wqUaZFijOD7djsQ2NjwRMY+NUoiE2Zk+/OVC2PXc6fa8BGTiuisu2qbix+Vr4muC29pO8TEmPVq7/57sl4w== 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=GwYZZi3UaJEDX2AA7lYIdVIAeb4TcTejwNKMOH44UV4=; b=jI09QDziW0jAvt8qNQqElm36ZXELcYhlSOjbM/7ljQ5CkgVfz8D0z/B4F+Y1BbVGKjTiXirHnMaDAMNyY5pNUrxa7uIjt6Zi3IEkXC2NWUej5sbVz9pRHwwd0UmrJZEnVt62JXFxkELqDpiKfOStHgEqWf0KSq21TC9STAdkBfe+jn3Q/+gpGgXrgAhXOeNP7jStwN+6jIzKzXJNEb1jfT/xk9ykiwj7K82EGtaktSLG7PCgOCJ4Yh2SrpQZvBKvOXA3fpcG2hHQL2uM4U+kHK4/sF327z4aUcdEmbBMWKBom9ysVelsri/ucZ3r5vO9YWWQIAZwFTFj7RVv5aVPuw== 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=GwYZZi3UaJEDX2AA7lYIdVIAeb4TcTejwNKMOH44UV4=; b=Rmf4CRcYmxaS9Q9WV/ktZCOhx3ZMwjaWa/iozL93oO1hOvcJrFR4zeqokrBfUD+P44H0w6qiWUVaCLneyQocis1qterxYaBC5jWQZz15EzSEVMKkWTRdJnTCE2CX43oVgMekPurNaNRj5d66VhM7+FxCTfBwHHP+cTIU/0t7l2tefzCASzBZpXvfMdqZJbhb2+kJytzkO7OhYZZR788G6PNzZXr/V1BOXL/5fruIf2oFQbt3IsmyPzmp0ml5JBuMdWQ5eqXUFAPMW7+BlaM8QjdqGFDA0+H301JGBlrxYLzhs2AExcRHPJLrlV2tXx8tvD2v5BTD2d3Tgh//NpAKhA== 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 PR3PR04MB7339.eurprd04.prod.outlook.com (2603:10a6:102:8b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr 2023 09:13:02 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Thu, 13 Apr 2023 09:13:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 2/7] mptcp: don't clear userspace pm addr id Date: Thu, 13 Apr 2023 17:12:37 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0036.apcprd01.prod.exchangelabs.com (2603:1096:4:192::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PR3PR04MB7339:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d541670-5f82-4c31-30b7-08db3bff486a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fDeOs06pBMK2tN3BgWx/DsxB4mPtjX1i5zVWS78vMaup9oM/mUOpN1heJCoTli/pNHVOMk9d2Ltqxfujdi8IeUiOsJXIu12upu+WZcSKpe1w0VU5sjhg0rIANk9OxWnLj49FqtPMUi8a1E2R0Q81fxPl+FJ0LDDIJy4XiH/awhqXeK1BMYCikoNpkoJivNtT9f0jCd5ZMELqb030vmWB0tXEqMuTbaTa4VoS9L7es2+zyAmhB388zC8ZNLgigdOC13YdSs1c8eIfoS297zxtz5WTYbQXPABRCsdt08O105J/Ye/O5GaTJoAS0uAi2UKfDYA5n4FODnWPXBbRul/2cq/dqeT2GVaxhlxgs4gaFgIW5859y4f/scEDF3BZ7sg74iJkMJhlJ67i4mNR9bWKw4tE6L/VVdWx8Wsojlv43kmwjFtb1b0oJNlE9MYlIZXRug99Q6yqIBqwCuls2Flix9H5ugPL/hdYfHg2YR/cFlKGFSgOf1M8qticIteeje5tQ1HPcSziLubuEjfp5aH5O2kBhKJ6a5plDgUOX+5ssOOW+1F/LEmwmU54L88tbZ+F X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(136003)(346002)(396003)(39860400002)(376002)(451199021)(86362001)(478600001)(6486002)(36756003)(2616005)(83380400001)(26005)(107886003)(186003)(6512007)(6506007)(38100700002)(6666004)(316002)(6916009)(4326008)(66476007)(66556008)(66946007)(2906002)(8676002)(8936002)(44832011)(5660300002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qBOoKEhFeJebTI5Htq+SCRw7HH+O0t/7PZgmkeeHGr1KvqKjnNUwKv2yd4Hk?= =?us-ascii?Q?lPALizbQdU9n5IlrnD4BUwPuU0TMi+aDwiEC4hIl6vT1Rp3WxfNk5M3a5byg?= =?us-ascii?Q?M2Ri8HO1s/eoltwHkEwnvMVjWYhT1d+VWoMcQ1L9tiT4c/z/KpzodbDd8NHM?= =?us-ascii?Q?Vg2RNNSBL17tFhPR1tnWCvx3OTopXrPYzobI1CpEuHPXiydazpREycnj8Eo5?= =?us-ascii?Q?TL28jI4lN2ZUwzJtTldCg0dtBffLmCqz7uI6oNM+ZzjK0U4ghp4hNsPU4+YB?= =?us-ascii?Q?DLmN2e0v2x2omilMjqjEd1fuTo6bjiKYhcJluJiXkwUXpfkc+0cFT4DVuLvT?= =?us-ascii?Q?llxxv7L6duQsyk9/8c/ihVKd2Y60aMrYW7kdqKqQuiDFvzuUj1wF7ewfTIYU?= =?us-ascii?Q?GI2Psh4pnYFTXFoKIawUbhrY4T0yyUTJ1juiGdq/TH5j0MW3zHVLadAjbS07?= =?us-ascii?Q?1wzyT//vCgd3Y0i98Pz9y4i5pnkzyBEnZyMgucvNGB3m91W1/pBTATfgxHGE?= =?us-ascii?Q?Vx8hKiAq2V5fk9Hs5IFnJdt6h8n96xnV5kJDuRuZhHxvIm1ebuKQ520ok8WC?= =?us-ascii?Q?0Iu0c6UhJZDFzN7iHIdAW2rvkAlQoDvqj9UG9rloLgaQzzRaCiSSwqDghoyW?= =?us-ascii?Q?YDc/DcGXW6Rznl/csBde9ezJPki1uiA8bl1mvrb6oGNk4u1PCxVORn5z6Iv7?= =?us-ascii?Q?E5YFAXCx3g0OH1fAPOvgTQMGzZ7hdU3DkrmSEEt+s2+j4orDeqpx2xBtbIb0?= =?us-ascii?Q?JZoccc+IUONXJDLWUn42uRgapNeoQY0MW4VVq4le2IBewVhK0nQzvILrLnjl?= =?us-ascii?Q?Q3dn4CR50qJlOyFQBe2xwpAv7L4PX3r5hyZ6AoX884YV4KijSL3wnZ0+60CF?= =?us-ascii?Q?WM9QJ81PTY7ndgKS91lzQVusNJW0a2JzGhhtc3GBcM7wHkPh3DuL3mA//wLk?= =?us-ascii?Q?iKdfpPkqKgwbcaHDxO0C3KTeFdbduLhXoOFXndtl+jv2n/sWtHsql/arqRnL?= =?us-ascii?Q?AiqnHxelSvMAGl/aNDQvo8NWziU46K+ZTpetGzmQG/4EirYF8p/G19pyEVf/?= =?us-ascii?Q?2Aaq0ZF/FmsdJyISftYbSMWXmFmMyrlhcSUfCxDaQkXbbxjaP3eveHhvjDDy?= =?us-ascii?Q?3JXab3oEJSPWl7aOfCW7YNvAVig8Tlv4u1K6CDD8b+zgkMv1PPeckxAehgmo?= =?us-ascii?Q?cbJ2WEKth2nnM/5VTUtpatnHEQo15fSjwBgm2nqq/F5NHM12w0OmkPvzrAhi?= =?us-ascii?Q?HAWNuXZrZ2oPC+JoQX6x9ywDY/nUsdjKVpUW1yDZ62ABHxIMKJNaCYKQyWqx?= =?us-ascii?Q?qDbMLA4edENvHkbUwpOsZEEt/Gx0S2TPUIEEXUrqOYZ9NJF+HLxouZT6poMi?= =?us-ascii?Q?ZciynMkbHFxtNo6YGmCp/XCfEJuZRiJPCSoLXKoX6o2YZ8IbgYVPWWFAD6CY?= =?us-ascii?Q?f5NbXxSbsU+A/1kHpVE8+mPUgxHO7oVHSe5VLNDeT1HFdtIuEfapuOtkmUD3?= =?us-ascii?Q?lUINEgP1KZIMGoViJSHvp02P72F5Lpl9NwWbsvakNXhnJSLYd13MQdUYjMdM?= =?us-ascii?Q?haTfmesTHyxV9xzVzeJEi5sS06tTVa/jOF4gcskY?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d541670-5f82-4c31-30b7-08db3bff486a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 09:13:02.2403 (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: Ar2b6nsxNL4v+ryjIY5TmlmMZrOIdyb2mYICsc2czKVYkIQPkr1D2So3IAQimqrPAuwT3ZPllcOIxBQEcy0iUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7339 Content-Type: text/plain; charset="utf-8" Don't clear the addr id in mptcp_userspace_pm_get_local_id(), clear it in mptcp_pm_nl_get_local_id() instead. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 2 +- net/mptcp/pm_userspace.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index a02822111218..ff27c9f1f843 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1055,8 +1055,8 @@ static int mptcp_pm_nl_create_listen_socket(struct so= ck *sk, =20 int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *s= kc) { + struct mptcp_addr_info skc_local =3D { 0 }; struct mptcp_pm_addr_entry *entry; - struct mptcp_addr_info skc_local; struct mptcp_addr_info msk_local; struct pm_nl_pernet *pernet; int ret =3D -1; diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 4d0e54fab5cf..4a8ebf87ef02 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -113,7 +113,6 @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock *= msk, =20 memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry)); new_entry.addr =3D *skc; - new_entry.addr.id =3D 0; new_entry.flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; =20 if (new_entry.addr.port =3D=3D msk_sport) --=20 2.35.3 From nobody Sat May 11 09:29:56 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2077.outbound.protection.outlook.com [40.107.22.77]) (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 DB2F02F25 for ; Thu, 13 Apr 2023 09:13:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NMzXmVE8pzmtUAC0nBLOZD52vRfSu5ioiiKEVLqhTS3LjRE3d0v8zXcW0QDbrIs4H8eV69HkgwRpRvGGH4GbYtgw03BW/HvVJesnpae5Z4O77qqIob2OSqcPgenVMoakGuCuxEO1VW1BwolGbAFAvrN55ZuxFk7yupofWYB7PsyYstGunEnT7VVx3kpPCdDEukFbjwTNLdsby4KFDUp6e8TFUKCJPDSp/Ipl6OSIk6uSeoSWnd2HiHCONRJrmoeASgqlw8Rcn3CFWVYUp/vwKHq9zcWNBNpqBTsEOHHdQ0FHppowzvrvG6hwF51rv7SfiN1S1TkDWss9sGe92tgBDg== 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=MS4ZyHw5r40SFRe09mK3DxbaB4VjfUR/gphp2MTc9eY=; b=R9DT5SR0kO4UEU/e8iYaAR9A0dTibuJ8QjK3RjGBjDF4gT+gWDjtN5mfhWSD1hCm37rPb7/MdEVVtQbpyK/eSE+Y8FzdOvk3RQO/NzFKTjB6VVgyPuzK9ViXzWDQ0zxTiGSmHK5+qnLtRNz1vpogvaED4K0Uant64uxFkrbDwmS6i4V7A1GAN5nPboaudKl+TLTAPJ2jSR3X+u6mO3EnIvEEUGra30vRV62b4W947hT8XQkQ6oB15ZqW0tIdRO3HBbCsfCqAtAkILetzv5amt3B2a41abb0OSrMI8+ft7NM34IYtRzRs/2xu9AsHQ8lmy8llup4ljwcJSFe/GNLrLw== 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=MS4ZyHw5r40SFRe09mK3DxbaB4VjfUR/gphp2MTc9eY=; b=P3wMZiXjlQBPId62TmdOez/sE5nIpVqejbKWyj7J+cFuZ2OiMWOwSNS88kYOq1RpYtb8WNVVGK4g7wguFJVz4Mg1xFa8qS22zUrRWe4cCvn55zhgp7a56v2xPoLc4wu8+MJMSJ8ftJ2nWN9NnUBVR1hj/xrDti3dQWNDgqWcdPGYOCUyNjgkqsSpX+GvY1rVy5fqmcgPXUjNCA0jgWR7LrJOr89Sp9bKx4SBj7Lo/+7pt5otGKyYo9hAHDt0Ue/fTJyBBJbOc2iS8JL6sauBE5CuZWuux1mSXsp4hgGQK+r84ZVrnrb6VlhSytaMWG5xuudFEThZEvOMlc1cfJXKjQ== 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 PR3PR04MB7339.eurprd04.prod.outlook.com (2603:10a6:102:8b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr 2023 09:13:09 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Thu, 13 Apr 2023 09:13:09 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 3/7] mptcp: add addr into userspace pm list Date: Thu, 13 Apr 2023 17:12:38 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0059.apcprd02.prod.outlook.com (2603:1096:4:1f5::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PR3PR04MB7339:EE_ X-MS-Office365-Filtering-Correlation-Id: ea0438b2-3e09-49fb-1221-08db3bff4c8f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wmAI3wJ9XVC3nSNibgivavPcm+qdH1rDeHyLi8DSZOsfYpjGk5w9D3W31AAV3Tlex2pk72u+keylShM65ZWqg49APeNmcYIaQyazzytV7z+gUWnlnO8FUG2PX52RWYXei20wRczixl6cSYlGjpMjVecuSf8TmSUlZ1at4I19h52H6s2aVihrSp54I2VBH9MamMiqvWmbuEvOz9xjBiiAHWPbbtg9h42UkrgrXYjJtEReRpOF1+RP5Oy3T2bq9i5KvMpy3NaU7B42t7FTwRoLZCJGFQz0GiLGV18YU+aypgL0BbAGDusrMHY2yqSumn08UmYv2IMTb1IyrlDZRqO+jGd0KBo+n9pY/ookze+qqd4ncWwvT3eSxhbfKCPvg7XfPUUarpWpukXG0mlLBGa+9bsbgrNl4k+Ygw0c3OLJkp8J5MqERc+md65mZW/R0SlCwe27XqivBwgmdOO1ZaK+BWzLSLQrWNHgVRshpgh9HDxwzuhNGpgPFXqDWdSokeQa/zRpdU4e37xARxiWZJ3s9/ixBIeHCmIrixlwEjOxz+zK4CvaUKH1afFWXqINMTRo X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(136003)(346002)(396003)(39860400002)(376002)(451199021)(86362001)(478600001)(6486002)(36756003)(2616005)(83380400001)(26005)(107886003)(186003)(6512007)(6506007)(38100700002)(6666004)(316002)(6916009)(4326008)(66476007)(66556008)(66946007)(2906002)(4744005)(8676002)(8936002)(44832011)(5660300002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tJhhjiHwfy3qYaPHhAtmNirEabRTqEWcnjsiDrWAtNfU6PLYNhfciL+UoP/t?= =?us-ascii?Q?I7kxdtWXfFCCW6p+m5t3TFuhEfNFRzg87b1n+t4I9e+1f8ZXEwM5ye3Q7Jri?= =?us-ascii?Q?9M3jYkkhSpfGhIYVnv8IUD/izjM8mdgzRoVIH9yeIlguCAtcG8+B0E3MryNL?= =?us-ascii?Q?C7v6NrNqcreHoGRsq6+L9iTrRsuoeyAIzElnV8NY7xTIqmHnHI0u3HfRbe89?= =?us-ascii?Q?S/333DX4cmlVGVEKxAs0H9hbw/7Hri2CiuRnnQ5TKxgdCcbtybKelMblWgcr?= =?us-ascii?Q?k47aE39+RAT4MAnS8wLfNAldFF6fmentpo7s3JR8tk+m7z2XWln9od4+gCn4?= =?us-ascii?Q?v6Z5wkmSRUSrcaSk2z5kxlG7GKlpyyJYX9Jg/faIjHQ7g1CYbd7EkyI0cgtn?= =?us-ascii?Q?uiVZpBxiGu3T7ZJ3LQwLs/0H6Le5wd+HchCx2ZxkbZ+OC6i74/H7oU5M3ag/?= =?us-ascii?Q?Y/Mzu01KK0PBrgTrj2B/ZN8EcLY0hYDVIB9MSROnqG9Vp9xnMCsIDldLAE1r?= =?us-ascii?Q?MbLG3LZBCuoeJPwWzQdm36lYg/tRuduNk4XDiMxV0BVkAXj2nFeBTlilIN++?= =?us-ascii?Q?Uc7DWAmkyUPFtr4Mn2bBs7QEPJuzEeTaax4vcFhrkOfbkmG9GUDI3mBoqjKy?= =?us-ascii?Q?xScUinwkOef7kRoEx20ugbHZtr69AXh2VtlrhpJnE6LIIhIPdElrLapy3pRJ?= =?us-ascii?Q?MHjKI5QF8uLg1RasPl2dzqj1BzFxXgpg759lWLtZHt4dD5t2XK7dtKOE5abW?= =?us-ascii?Q?CC9KndCHeMX4oOxnrHBv9uHm8IrD3qWpwrHaNpb0is18dBaQ5FzyUN/6ZiAe?= =?us-ascii?Q?ezHwZsHTxPKix5+ye2C0o40xuFWanLrBu/D98c+x6WXV/laQo9bhemhpGunT?= =?us-ascii?Q?cZAAfrLejpDrDIgLKm+0afUDrysN8qQh5u6qi2kHDbn+TCb/ONtWmoWhRfPw?= =?us-ascii?Q?q367L4+uq9GsMwdBMs4EH1RAYBjFmka8l9JwM+OWGwPXNXOqp/aWUfFeZnnP?= =?us-ascii?Q?HAztUpIMYcoGxfMNMDrzoh1gkMdceVPPVOlZUjjEQWtMjnsZtLYB+fghK01C?= =?us-ascii?Q?014eupBcQrpdD/z3RtOHLxFybzx1Yg3USlcYtaBTA+JLdaBRXFAL2dAUDEAW?= =?us-ascii?Q?0ln5KVbqzOGOIqow7HKI3o46jL17c9MA+jhbzuhIxiMCZLk2s6xebXketurt?= =?us-ascii?Q?UAJCN93C1zXS4zf7zo7U5CxydUOOOV8Py/SFIADRCGt2CUgpej4vPGK+F4xQ?= =?us-ascii?Q?kYvncMFOJttZJAFWrxnY7e7YnKd3mlrZDF/bh4J0eDOJl/oJK7+VsulUKBXE?= =?us-ascii?Q?iXCIqizbS8fw8bRrot7FMNqHI1oWQDx74ET8AN5ZmAhA+ZEiTd7FU3aqMvSR?= =?us-ascii?Q?Amsmq4NON1ldrlyTzfOimZcfD4coTSpkVR3z7MqtwiszGAnx8VwBmhEnC90U?= =?us-ascii?Q?PY6Dxle5QwErOViQ7PB0MpC1Apdx8RenzVf94TTGqKzTj3snz+cionv+2z7s?= =?us-ascii?Q?SLTiJsMurxaiNm8zXzjZRIqPwJWZ/ywvPk/IDV74H+oWeXf+apwWOLDT1PXu?= =?us-ascii?Q?72ziH+wX4ee51R5/NhH9FaapmkL5qOJ8UQ4qYr8f?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea0438b2-3e09-49fb-1221-08db3bff4c8f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 09:13:09.1761 (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: xFTTlu0Kt1J8/S9oPtKr5RrztmdyJ4DkvM3yN0f3yoW4tIbyPe1Xg90O2qd141PFAAayNFO/Hx01qSWKYs2BkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7339 Content-Type: text/plain; charset="utf-8" Add the address into userspace_pm_local_addr_list when the subflow is created. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 4a8ebf87ef02..176c77a2a79d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -301,6 +301,16 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct= genl_info *info) goto create_err; } =20 + err =3D mptcp_userspace_pm_get_local_id(msk, &addr_l); + if (err < 0) { + GENL_SET_ERR_MSG(info, "did not match address and id"); + goto create_err; + } + + spin_lock_bh(&msk->pm.lock); + msk->pm.local_addr_used++; + spin_unlock_bh(&msk->pm.lock); + lock_sock(sk); =20 err =3D __mptcp_subflow_connect(sk, &addr_l, &addr_r); --=20 2.35.3 From nobody Sat May 11 09:29:56 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2048.outbound.protection.outlook.com [40.107.6.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 AF92A2FAF for ; Thu, 13 Apr 2023 09:13:18 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zcl9/1g9vV+TG8p58zMG+qsuPf/frqS2lB6j1MgvapT8zFgD4YpWXq38o1gtT6CRAhCork+M8A4M3QABUVznHR8o4Eig97oxB5UXZ5j/Wrz8gbxX6Rka8OQcKR8wJAjeq8jnKX/Sq/tnkK86bFl2horw31jJysWipRsGa6a9G5OeaRWWre7fiJe+r6ybg/xHhHqP+TCmN98u0/NhaFcjEbdxnB6QQDwQFccab5qHvTlBDKuSPxCPdj68N5mAeYgUw+OpoJXvwXpF9vS5D6QHEs34S9MoxfChGRcrMCoa+o/pQgFbWa/h13ILC6Ae2qvDXcCSUruL7ubvt22lCWT6vA== 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=8/tbAZGdMbQiUpSqZmNLapLDAcEBHf3PpcZ48ZqJqHg=; b=RzbPFuSpppiq4cD49zvamGvaYELwPvwHyTLNSbZrJ6SbVTFfEpdBRwQ7y9fO3XFjZOZ2pwrq6e9IsJaXLt3zZIfiLTXtxsWvIEbL3QezMQuQGmsGbCF9Na9Ol5qhwMg3PIDFW0TpdVCy8+ZiJpwD+OXCS82kd3/Me3ofmc/kJkZw/dzwbbFRklo+SYYDf3+i1slLj+4QCcECc1T5faRirj3dP7XaeZ2J48dsRpffoQBTZizvShG3Ixb+eJAaxicxSVeZRg7a1Z8c5dTGCMvQdy5/DFY6yfQfS9UeROO++DuBckMS6S2YmVwU7XG19/tOkPOiSduZgtHf8kjTSTBkJw== 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=8/tbAZGdMbQiUpSqZmNLapLDAcEBHf3PpcZ48ZqJqHg=; b=DeifU7ZPjZT5A8eH5GpdMyau1qlBxS7SJsavFA4KdcVhzK1lT2gy7U8LVkA+8OLpDvH2C7OyxKByc1FtlqZq3K4Ujsb+to8tPtiVWLqFGFFEDuelcLTyRZV5Lm/sYxi0vp5I03Lph0vCvslSRhXIUtv4O3zeRHKnYr9YPtpTAvOcNH0qWlHu0Dp0FkhXGiJQ+miH4Y8UojzHGrJmXbuJgbespP0MOB1dmQ28A/LoSyMWFu4W1b8IX5FrJ58Dl/cS/bylu3ZHvFlQLSfsUPsS7ItMebPnRJOROvTop1gc9I+Hc+d04TadV26YXkCzbxT3BU3nCm2JuuBh+SRBcadBQA== 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 PR3PR04MB7339.eurprd04.prod.outlook.com (2603:10a6:102:8b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr 2023 09:13:16 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Thu, 13 Apr 2023 09:13:16 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 4/7] mptcp: close remote subflow when destroying it Date: Thu, 13 Apr 2023 17:12:39 +0800 Message-Id: <149863aa23cb737836bc119b2165ca7baf4f52a5.1681376983.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0056.apcprd02.prod.outlook.com (2603:1096:4:1f5::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_|PR3PR04MB7339:EE_ X-MS-Office365-Filtering-Correlation-Id: 3960c3f5-086e-482b-f3a9-08db3bff50b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 39o0oyuvGqLnQhIidbmynihvRLbpNcCmtxPPSXk2EujaXhIe9piy7T+Mv/eXFNFFN1fTdTzyYew/N0LWVdpJ+5rVBxEaTRLGKvGNdy6qYjSFGDLoJ8svc8fKYmlR5/vnH9owmBYv1sotM7IVSqC2VKmx0t88PUlcGQHKC0HOWqwwV1vojsX2yHufXGDSfFQFH5cZ7Pcqz0c/nUMA65aP8mcX6BfrQ7oYFFP/nIsjXz16sjw/BSzSe/cTYMFKXA1MWlAjmT3dM2ZupdpxMjAKIIKQo0MpA2sBu+hyf/lp2ZYn4emRWvxqs/PmQTtatDmHGIOzy6jchSsl3qR3F5bYKW2iANoSZTWPAXXiYuR++AUWkGNJ+Ve9tG/PvGqax8WOQ922QrpxPyy6vKNO6/M9wCjxMCTmp/Ogeamdgh4TLZaSvIC+rqkqEj3gU5qTL4tEIAXwr4ZX8eMGGXOPdfNAz974hzR/ftkHUQPSRU+vj5oN9N96J1SF+tCTXTy/fMxzt+uqeerMPCppuQhTy2ZzPfoG3anyuI1Df+oZ6kroprTXqn1hy+v7vHUzmGp29B81 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(136003)(346002)(396003)(39860400002)(376002)(451199021)(86362001)(478600001)(6486002)(36756003)(2616005)(83380400001)(26005)(107886003)(186003)(6512007)(6506007)(38100700002)(6666004)(316002)(6916009)(4326008)(66476007)(66556008)(66946007)(2906002)(8676002)(8936002)(44832011)(5660300002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Bg69PdKMRloxIMAAerxTmwNXDh9yFstKEGg07qLWmeN+sf2eI+FEjbUO2Pyf?= =?us-ascii?Q?7OY4GWINx3W+IfElfKEsfC5T2a3LPfCptYvq1Uys7RUgaChU5yyQ390fx4dy?= =?us-ascii?Q?KOjrD1UBj5mF32WaY/quz8JGng0hsMhKi+pft8uybsIsaVkW1zknViBjHcGy?= =?us-ascii?Q?eCnboelMnqMq1WyrccYOcS86LL9NgpZ++LDjuG5vqBMxNtFoWZ+Qs6u6X6OW?= =?us-ascii?Q?AVssXEDBOtbrZCuNqnALtJ31MEfKH4c7ebT+hvFudmKv9bXVZgrNCgSwBePb?= =?us-ascii?Q?K4gD9plunxuJwVd2FRe89lUSrsHn9pVdHoipdSeVydi0Iur2fBcPQ13d5rKA?= =?us-ascii?Q?VLF3jnR2wbXTtnmGXKc9DAzTy5/50dXNyqCc/Ps3SJvnhs2v/eJX2++DVEYt?= =?us-ascii?Q?CrHRONHFgFeTs2zi31gxBHEXrJiRg4Rjpaj1BjgEg+jA1Vu/wUAqF5a5uIRH?= =?us-ascii?Q?V4V6tqN3gyBtBUOGEdbC/1mm7xRD7IIL2PfU5Voki1l0q8iwTz8P+De83/qS?= =?us-ascii?Q?fEQpB4uzFchpBLReNbKymwlcXedDffvRvp63J83442SdaxhQSjkAkWU4GbpG?= =?us-ascii?Q?A+JiswhwBC46qA0HifYhKJx3R6dh6BwFaCNY03u3LSUzcU0+YFbhODh6GMRb?= =?us-ascii?Q?eLYylbm3D4i+tXNbO54hpbR1BIjE0U2n9Fk/6JGZxsMud1Dc4F4PeXfOaNvf?= =?us-ascii?Q?sNQaIlF0GniGK4ASpihEwVY6UWOdCBvuZSn9OW5vegaJ0M2xUEhMniIiY7X8?= =?us-ascii?Q?VMT3itOIW5nUnORcD5Z7afSrwJPNVl/vlNrr9wEbMVQ0kYxErAZNQTbfM0Df?= =?us-ascii?Q?N3yoVO/k6H35v8+4UVbyaAFDyY2XjEhE9dJsD82CHtRtvVOeXkX6eTdVVPXh?= =?us-ascii?Q?1PG/InkHNKZOkhzs9LcEMWRZxl4ANntiFjvD1DdT2EKVmtPApHTXaTh4reuB?= =?us-ascii?Q?usIQovqGCycCyEnimKQf8ICj3o0gsOu2eSEwVeXwAws3MCSz/MOKyCFKTvX0?= =?us-ascii?Q?6+DPKfBALBNaUhifk9k/129XrqbE9OFCx58ukwiX1THwjYBYsWCeI3uxbu9V?= =?us-ascii?Q?ZPC07JH38eNLepJXc3ny7fCAJMgmoF5ltGaJuVVebh2ZfYqojt4EQEOaaK/8?= =?us-ascii?Q?T5nM4+q9D/OzC5a6pLA777F3zjaRGsUTuEi8ZLjRh/8mjKc1Q3p8sZmruvvg?= =?us-ascii?Q?+rmZduvC3FRfjijXUo8Bd1RGzuOMpI060KJi5a+I0NYRDntCk9bg1x+YSUel?= =?us-ascii?Q?x0GpKf2LU6SRt5SefE1HvPFqA2L60MOpiF8isahP7DMxWd4ooRvszXGNVdJJ?= =?us-ascii?Q?PysDMQq24Eyc/fJ394dCUlxVpv3Cq8KTv7vDlyqc4/CousPb3WFmjZ7NWTCv?= =?us-ascii?Q?br1osAx75W3kWqrVCgzM5IuKoPwWFclyepVkHL5CRHPMMjKJKbG/OFO1sgFI?= =?us-ascii?Q?mCjLYU031U24uxmndrHa87lywXm2xXQPJcH38uB+21QnJn0wzO0sRnnx8xdI?= =?us-ascii?Q?OR3NTHjxjxgP5tiXy/zDrP4Dcp+TX4dkp6eth2191sfNRdGrmmmkNe3dSsQZ?= =?us-ascii?Q?2KV8/sKSkzPPpJ9zUXBefItA8FLOxgQ8p01Y+R1c?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3960c3f5-086e-482b-f3a9-08db3bff50b3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 09:13:16.1632 (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: u+6qvuvbCi7wkhxI6iKwGa7ocxp2JPd3lt8wf7xUtwlEM7vK0LXwEScToQRQ0/mdtcj0DFOHJwddcxnggmVR7A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7339 Content-Type: text/plain; charset="utf-8" Not only close the local subflow but also send RM_ADDR by invoking mptcp_pm_remove_addr() to close the remote subflow when a subflow is destroyed by userspace PM. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 1 + tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 176c77a2a79d..7d676daa89ba 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -308,6 +308,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) } =20 spin_lock_bh(&msk->pm.lock); + mptcp_pm_alloc_anno_list(msk, &addr_l); msk->pm.local_addr_used++; spin_unlock_bh(&msk->pm.lock); =20 diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index fafd19ec7e1f..072f77b6b206 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -911,6 +911,7 @@ do_transfer() sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ rip $da rport $dp token $tk + ip netns exec ${connector_ns} ./pm_nl_ctl rem token $tk id $id fi counter=3D$((counter + 1)) add_nr_ns2=3D$((add_nr_ns2 - 1)) @@ -3123,7 +3124,7 @@ userspace_tests() pm_nl_set_limits $ns1 0 1 run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow chk_join_nr 1 1 1 - chk_rm_nr 0 1 + chk_rm_nr 1 1 kill_events_pids fi } --=20 2.35.3 From nobody Sat May 11 09:29:56 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2072.outbound.protection.outlook.com [40.107.6.72]) (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 91E3133CC for ; Thu, 13 Apr 2023 09:13:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vd/DRS9z12bz7lBJNiDVp1m1Ah8U99yii9mNpHeBeAh+8VfdtV9vT4EpTw6Q2Y3qzIlcvjshNmH3cqZFc/bOjBCJxxC5/YtFNQlAmeyRC0ZpwL9RbkVpkE4ewfzdaw7XWp757F2l20uNIJGpUR5CliS03MKy5q4yx50LvZ5hJsaUVC4t2sha9A7pz+SyxkgcgSX0D2I64d9E0CJ/5/0fDm20K19xXbpKvtKm9YHhjoVMqAFpqA7r9CFkJqs2SrB+60UeaDkCOVZFZlvkXG13tGM/o0OsVWtblAJkIhC5OmuBJ/Ke8PfNFqVHPWCEhRNndZaiUryYI2mX1uJutOX60g== 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=Stt/gmdwaCaCNey46Fj4wJE+HEtvPPRlhBozHbioAzc=; b=jZi1cfETRpghR3OiBy8KvOgDmqdr0byOH4ZW9dr9yE3Vi3+92ob5YrmGY5Op6A9xRpuiTHoUPBXYxPXyOm3fIKOKDM0TShinUX2p9mMvbywH1uofcLt3QtEhm0jKN+mzPBvQ3dgwG2fbRu1Xb2ZRLNufW616tb2qm2SAlfQYYlgLuK+OmC4UHdyE/c8pOYfKOhR5wME+tMLyP0VJJ48nhzb2WFSd5owISWvjZrsiaw2u8S7wWjzwQsnJiOp0sQZ0NTVQC91z0RQv5kVOSrBJs7rbdJJhKWN5/DIGJOPlHYsJw2O68n1LaRZLEYBc1P4HuSbJY5l6EUe2ne8sh351jg== 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=Stt/gmdwaCaCNey46Fj4wJE+HEtvPPRlhBozHbioAzc=; b=PmgXZaRLxZ3KOfdolvaZuUcTqgnXJeX7RFjpBSQAccDNodJXdd3tuteBQDXaSZpqGHTMkuw2rzo65YryaS8cwxkLT88ppXXkoAtoe8dy4io1ADrRzV3CB77o/t6npZXm7srRulHna1D3HpGr266227QTTohoMegGBqK2PZtkQztZ0jYD4xK1fFILg+37efWgkm+5dBoE31QxlgPSVZfPZGpIYpwR69qRN5iEzt6BmjGueYcjmIO7IKGhfByOGle4iI0YI5UBLmzcjQObjCvEM4W/9hwaVDGlHMyZRVwFteJ74mM4VqdciUvX8wuzP6B2UxuhpJhMViP8b1/YjiEwuA== 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 PR3PR04MB7339.eurprd04.prod.outlook.com (2603:10a6:102:8b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr 2023 09:13:23 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Thu, 13 Apr 2023 09:13:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 5/7] mptcp: increase userspace pm add_addr_signaled Date: Thu, 13 Apr 2023 17:12:40 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0006.apcprd01.prod.exchangelabs.com (2603:1096:4:191::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_|PR3PR04MB7339:EE_ X-MS-Office365-Filtering-Correlation-Id: 20637ff8-0b08-4ccc-0c73-08db3bff5512 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1TiIrhP8eOsHQGAxgJO+tp2jRcYi/pEChNDTBs6gZKczBCLoxphpvdLnWdKEi2yUZZ7GBXc1uZh+49/eyZnrCI8ihXwjNU1JEqXb/kon+py1kGin55PyUHT5QCY6+ITiwhtA3Zu0mpyk2WpcVVYqZWok7rQi4ynJg0d1svtp7pSP1/v/UlOqFIWuxuQJeOtuJhOBxkmA7saGqL9QV2qKG1W1bEJ7S2X2fQbIowy6IXkjM4mBMHE8Yh17CjfUKOcnNZqBk27cK8eKsdPI+MIrE7b8+4UgnXTREkr+4t6SSKJE42XovJioGWpdhxpmapUGWlRZpzq9tXZ/HGrHxDReDvL22HwmTSfq278gDyK3tFJDZX7vsXA2sfJDLuCqQd0PBCAJ983XDwrc/YulTeGLwEFrGNPP03xtCTqKAGp0MhuDBdmahZoAMq4ODjnnvI1iLvP/59+O+3OfAF2ygR3OXNMvKI4GSyNgRRShj3z5hbgxurvB87vyetAVIcPSvhiu3dM0BfcTxCfA3x+BOLSqLl4plbepikaeNNmQlxIbpRVaLGuaXtogtKCTmTGQ3WSi X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(136003)(346002)(396003)(39860400002)(376002)(451199021)(86362001)(478600001)(6486002)(36756003)(2616005)(83380400001)(26005)(107886003)(186003)(6512007)(6506007)(38100700002)(6666004)(316002)(6916009)(4326008)(66476007)(66556008)(66946007)(2906002)(4744005)(8676002)(8936002)(44832011)(5660300002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TEcHBRHt9n2PsVEQmMMr56+IgO3YISf0n06b1LG+eRZRy2uW//rJjvuOr6Fk?= =?us-ascii?Q?TEZTjRFfboG13PcSre4ykSjzYxb8ATng5Zx0BqqfDeIyyxekJOSINABGnHcH?= =?us-ascii?Q?JwfCUYD4/FijWnBuaMZHKu2LnOPudTQpkRd2oftODzSgZ3Fu+8KhK3OyFciX?= =?us-ascii?Q?1TDX4ACwPZNamFT5AZLuDySSIePXL+/SlEjSgrEuVaKubDRsLrWVDDmzGorn?= =?us-ascii?Q?LAWZKjVdXjjt6xQZlg0EZVrScbx9b3mZgWLqXsgjfD6MuArJPkA+AoIfoBkB?= =?us-ascii?Q?f6Zsq/oJ/a5fXVUuECK6mhH2+hqWfm9HNFgm/ubeHkolOKNEwV+yCJXW32lP?= =?us-ascii?Q?IfJEELL7WnpACI83BtZvIdE1VGqaSmsCLYelmurfQriAXkDgFLxTacATG6Ti?= =?us-ascii?Q?y5Vcw+NAwm1ZgEzz9M2MAC2SWUF18IRkMc3fCYqGVP31PrKgyjuay5OAAP6X?= =?us-ascii?Q?3H3Io2wCvjFFh5gsTB77ArpC4OzqY7PFaCLaWNp+k9gje7WGszo9/nXAZKBA?= =?us-ascii?Q?cpv0TvNS9pY+95xZKOooI8Z6SxF7jcTF0sLQuclsHnloQdd0EHvb2ZH3tZKG?= =?us-ascii?Q?Yj4omGtND7LwMWNJ1G+zs+Na8mSGseXniSaYL/9Lcv46vMbyrTG5ktxK+I3x?= =?us-ascii?Q?neUP3R/4dDzomVrd3EK047bIJBe+jvG11pI120pPNF2PqOLrZR0i50ej08Kh?= =?us-ascii?Q?KJ0eGfUSL1CZT1caSDx21WN4JGWbfqCerH4nHWRoyYb3egIKtNKuG8ShwTWv?= =?us-ascii?Q?ID+bIQZVsm+cW2l/TeExg9pG6lmcI87uqk23KK6kfjGIzV2JzsAceqbkbonf?= =?us-ascii?Q?YT/nsisd3ULpxhzHlgkaM9oQ0nMzJconpmXpiaelEqblG/mJgqiFnKZOTih/?= =?us-ascii?Q?agN5ZbwUGwOyF4jDpFTlHtruJJjWRoVYh8ynFaV/PXt632/xu3cifN++RNuw?= =?us-ascii?Q?I6Vwl4zEXStlIPSA+ynU8B/MXbAjw64cRK9KhIOF4RpEUNzLSiPHYpFEP0OH?= =?us-ascii?Q?/qw1D5Stecy+wFnHym6o2LgJhTYLERv10C8vjLybZ9calz9oEUYnEeCovtcp?= =?us-ascii?Q?rIc/Yti5pqxOPd1HDmZYAYPoA5mLBrcPZazNF1dIZ3SlONEbKZjdYeKJQ1pZ?= =?us-ascii?Q?Vp+CAEC+C8E+g/sLPt6XzTH3Eqt83KTIoXwW33Dx7ayduShhjAKIy5aDXA7b?= =?us-ascii?Q?fiMKIjCpR+kW5CO+UxTxLQAPE9lZThYiYrgdGSiFW8bbxgzf4tJWAZaDH/p2?= =?us-ascii?Q?8l/nF0spNmk47k6cvcrkKAXyseVj8tMpFv/bfDxsBloQD4C46g2vRsMl24gU?= =?us-ascii?Q?gAgpCyBq5+LkWRg45aq/ghRnegZI+v6pmy1Tge5FQ89y74nwsMX1KL1+82Kx?= =?us-ascii?Q?w17lMgftDwAf+elZzox5phW9csSEXc/BKS6tr1tDYCffHs7oiVIN/UFaMsHu?= =?us-ascii?Q?hWpw2FxQejm7D2bN/hrn3cd3eyHE+sqERpn7k9zW94HsGAgkj8BdCTZnUiK+?= =?us-ascii?Q?//Fr8NhHMjcEdJ0oICgiqfbTy5KC/3859LvwzqOUK4DiNViq7NxihI5j1Cur?= =?us-ascii?Q?4dLgDZaRFF0vtA/OsswpINStId6mcWWrc2fSJRt1?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20637ff8-0b08-4ccc-0c73-08db3bff5512 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 09:13:23.4286 (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: mHwsdLkLFIDdipE2uegIaogsfqzfRdl7c5owEzsnvIVxS93Uc1pqO2Ge6EvzYe9WEQLlnSxqvm+Pzc+ZXl8gLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7339 Content-Type: text/plain; charset="utf-8" Increase add_addr_signaled counter in mptcp_nl_cmd_announce() when the address is announced by userspace PM. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 7d676daa89ba..817b6f1eb013 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -170,6 +170,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) spin_lock_bh(&msk->pm.lock); =20 if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { + msk->pm.add_addr_signaled++; mptcp_pm_announce_addr(msk, &addr_val.addr, false); mptcp_pm_nl_addr_send_ack(msk); } --=20 2.35.3 From nobody Sat May 11 09:29:56 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2050.outbound.protection.outlook.com [40.107.22.50]) (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 D20C633CC for ; Thu, 13 Apr 2023 09:13:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TwCAnFh8RaQXoe4sYcG+rUSKTOXMe1yuDrpPgg2Ncl1v9N2PDHVXJDN+1UCiukR5k3VtB1pnV24+DNyeKiG5WtZ7cMdn0AzWmeRPrdg+rTH8uEGCBb6W28ohl48twXVx6KJbs2TrM01Q2hL/qz+zqX28n8Y0Qt1u7dzCDy/VxJsN2MwfDbSfj5ReGOkju9AhGWRqFeoEWcImnWBCWaT+Sje/RSTiTwm+flFEcrEZb3KcyFz6ESQpyJcf73YNCEdk0D4DYLRsaPPBh4V/AFrTd+mCaHdAqHXCsrWRyhkI4q96TqsEVFC8dazmInRM8Qcuki9A/ZJZzG5pDBRgXw1STg== 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=+lVcVblqNuIDWKRsCZqhY148D5MACt9HxE613t2RKO4=; b=V+KBtAP1AyBcdTfwhptI5SLtG/jWi2wSoxJvr1EVWWCSUSyDoAKqD1u1Ee75Gahcu3Purf+7nr08cBzPpgHSkri9sY1NUjE++xqvx29YWeRr1xM3xWvaGA+Qf3BCzfwx5Z4m68q6qKAj1jHSGgmTYbM1QF8QurHUXMq/Nf113gVqa+0B7Fg1THL0aL5JxH3Ly2Mu5uL4ifHjOUnAgKqRVhs+moHYwjjZdmBG/vWbSlNyYGXR+QxFXwpTilPAgiomDXi4vqpy5mTntuUqi6wWHUQqNjXCBYQ2RcM0G6FaNhXxaTweSru9rrXeNQz2JmWZ10ivCci2HzLcHZad70TFEQ== 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=+lVcVblqNuIDWKRsCZqhY148D5MACt9HxE613t2RKO4=; b=KPXsEBHXcvBD+QuadMk2rDpefHyLBk0ExA7HLW+N3rBYk0OGU+EYBEOjg1PpXKrdYWmqhDf78+Hk7hGc1HuS7cMo+EDYCkojmUF8TfYqUcIvqsDNP306+cMQGpDYJr2/RKin6ziZHzqlNcSbtOVE75xEHMV37uTYS/YtpJtK5G2vC1nTct+dIUvuivdYZTAGHK0L/eKM0uwNt8RI0s9nLoh99oMJuDtBcRf8Nd4qFULF7rFfPBuQ4Du3epg6XVdGZVKfigbGmYWaM5kTmdiIaYjWsUPsD7TfgQ0D1eIW8t4zarDvYpJGSC9xgkR7xA5KKZB6WjaQoeOw+rvSHWBJGQ== 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 PR3PR04MB7339.eurprd04.prod.outlook.com (2603:10a6:102:8b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr 2023 09:13:30 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Thu, 13 Apr 2023 09:13:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 6/7] mptcp: update userspace pm subflows Date: Thu, 13 Apr 2023 17:12:41 +0800 Message-Id: <4002840f35e2c1577ce323921be3505dfc4bf16e.1681376983.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0018.apcprd01.prod.exchangelabs.com (2603:1096:4:191::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_|PR3PR04MB7339:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d7ad93c-da0a-470d-3dd2-08db3bff5926 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CHQ9H/ROvVV/9NO9slFTKak9T4nmiEcUqls7VmunTSgd0ZM6JEqnZGFpu5IvyYKuUxAguA+SFDdgWM5SLZNZay/FARI3N5AMlQ7VLSqik2ZCqqyYFlDKfM47QK0FAm34tnQCI7o5w7pW6SExH3iWhvEaYqXlqpEtBjy9gzcQo+4C3TguoFqR3/GJGkBaV9sLsWj8VzvPRhvqbTcxrA0Mil0H/0kuz65AbfA4I2Z/Ai6eHtTgmYzzGBo1v8JRjXQoIHi8rzGl+3QJ7TP0+l1EwIWRZ0251WQ58NyoB4CYr/y68ro0T1j9o1LGBm3meeMsq5yfBV24A7GY0Hl+Vv7p4jevirgvrniza33qJoHFCPZXH0DUFJvU0iWcOUWyUv0hLKu4O6zusyHRkPtU40SDJRdquO9mD4vmSqDeOuLeUSAJuH6SppX995AJIO2EX6sQKfkrBmbhFrJwjp3F9J5UxDNPg+05eEBE5QfuorpBgmyZ+N2Lr28J3OHUubBVAfvGIxYahupseXQlX5FYewAI+Xq4739apXwpEWPyghohqHvNSYEw0LC+zL47X4K9vqqK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(136003)(346002)(396003)(39860400002)(376002)(451199021)(86362001)(478600001)(6486002)(36756003)(2616005)(83380400001)(26005)(107886003)(186003)(6512007)(6506007)(38100700002)(6666004)(316002)(6916009)(4326008)(66476007)(66556008)(66946007)(2906002)(8676002)(8936002)(15650500001)(44832011)(5660300002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?692kuv+MU8B5GfyGw+m0fF4vqRoViylJz6D9iTFZNWCbpzYCqE77c5hrSu0E?= =?us-ascii?Q?ULKA9jZOWI/Z+R1aIPc4Sp8074t0hTjQxwJvuUB2HvSiFpTn/NOp2wxL1bzy?= =?us-ascii?Q?o+hKvbi9ZM9h0sDA9+rsbDYyJNXbhjMAv4eYjA1KpI+HvJUiewvwvaTneIMi?= =?us-ascii?Q?wsP+8J8J3A3XN8EgiOPq9irOElWZazUUz26IoVaMeIowV0n6Sqnj32Zy/1lC?= =?us-ascii?Q?qo/QI4sJxeYa2pUBkWi424/IZNlD4rab5VNL8ZWir6MC4AGCX5jXK2AlVMOj?= =?us-ascii?Q?OmBlK0tac0DAGCMvJIBV7WlK/C1lIv1FU/gmH1HkKJfVqsTe2Y8+kWTvJ6c+?= =?us-ascii?Q?FvK4vz1zNLmGhwxMdBChH/rfrjVqI3iCQuwwQQraqg51MV/6EDkTcEnk15ev?= =?us-ascii?Q?KKqGbf9A2ZDyw7MvFIzT5zHUXLwmMkEJgf6/3zSJM6rZACuYtAZOWii0Z7qj?= =?us-ascii?Q?krhOUWFWzGDxwaUtGdgnAxpxqxTDca6/XXOuzqx5mvNhgAqx3yGs+r4ILYq4?= =?us-ascii?Q?jNvlPa+eC1Gq+XncRc/Ycjgk8Gk6AGsCCLqxl3L029ttaG5wj8BPS8jyfrJX?= =?us-ascii?Q?BJHxDtEnS9d31D+mTBBPrt4czv4xGst23Xxl5iYPNBO0s/ES90OXsYAN9A/W?= =?us-ascii?Q?lD2AAec5ZSW0Mbmms51pqwb6hP/P0+bLtpFbvC8fIFZv+iiC/yCcP7y6EKvm?= =?us-ascii?Q?R6NpJRrV7Ms5nDEZAGU1ZDg7jTc9VLHQrqu5CSOav7Oc1tBBVc/ZqKyOdGkF?= =?us-ascii?Q?Crf7mfOb/oHvJ8F2eawg920NCriUOspzpY7Gx918xqQqXRvi8i1Dr3RtsMr0?= =?us-ascii?Q?1BlddGUw8LSCWfb8WOeMPa+2DTZFP8UXjWcVVD9SGS/xSwxPm5lwBEMfv4jl?= =?us-ascii?Q?8Z/YM8bUUJlGdFLMTzt3JcPf/McIA2arptrJjjwPOuVwKzHN3AOXfu3nId2l?= =?us-ascii?Q?jOamYDf7Dd93ZDzDc7VhyIzVcRIvuIXd4aItIX9FOQh170G+pvT/Eq4IvFZw?= =?us-ascii?Q?eaNNi5APD4xoM4mC9amUEbOH1Z54+b4R6b5x8mWCoGndkWROC5SgxXM6CcjR?= =?us-ascii?Q?aPZowf5sfEYbTGPSdPRetEUaIwJzDzQDppeCFCNExe2c9Pjh5S+RWDGTgH9w?= =?us-ascii?Q?aTwCWEHEGqUn2SVxXSGHlS/W5cBk0BGW81zYMYiwxgjgKZdasiUnjsOhPp/Y?= =?us-ascii?Q?rgH9SKSykVY2lmeYTEBSjIVRGU87nF4ydw6Kte3H01UqORSQK2wD8m/tLO3o?= =?us-ascii?Q?CoIiu3uACOWhLRdowjl32d4qCfnsSY+NxbxQzVnBURzO7TwxPuepkJbOkQVj?= =?us-ascii?Q?FL/4ILV29yoorVYsaJ9hL8ndpa0/0qzpdE9yAiE7Mgob2VEtxr0Zjj+5PCrG?= =?us-ascii?Q?BkpwOWEUi5ugTgK7haHaVU+XVSkj50dckmeoNF5uRGXhJKsTcPEhxCSZUPvL?= =?us-ascii?Q?RheX7RGOEV7ZJuiaKdInXl54zZRr5d7X5d/LmTs6E35P6Yc/g/LXYM7MMyAM?= =?us-ascii?Q?iw9ttElFecQg1vwGgSqay+6zbUL0AeUuREvnd+7Th/RQQjADCcViAeUuLbgS?= =?us-ascii?Q?Q93q+AfWuKnCUew52Qrr3U1+EtSRtnVXH2bISgQ5?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d7ad93c-da0a-470d-3dd2-08db3bff5926 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 09:13:30.4614 (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: ceijLG6/No8WvtvSd70X3Fq5YnUCBkqIVm3ty8YEsv8M3mqBWlLK/1kKVi0hPZiSRqBL7LCYdFH+L5D5eLa4xA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7339 Content-Type: text/plain; charset="utf-8" Increase pm subflows counter on both server side and client side when userspace pm creates a new subflow, and decrease the counter when it closes a subflow. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 21 +++++++++++++++++---- net/mptcp/pm_userspace.c | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 4ed4d29d9c11..bb01f15d8e0a 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -87,8 +87,15 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk) unsigned int subflows_max; int ret =3D 0; =20 - if (mptcp_pm_is_userspace(msk)) - return mptcp_userspace_pm_active(msk); + if (mptcp_pm_is_userspace(msk)) { + if (mptcp_userspace_pm_active(msk)) { + spin_lock_bh(&pm->lock); + pm->subflows++; + spin_unlock_bh(&pm->lock); + return true; + } + return false; + } =20 subflows_max =3D mptcp_pm_get_subflows_max(msk); =20 @@ -181,8 +188,14 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *ms= k, const struct sock *ssk, struct mptcp_pm_data *pm =3D &msk->pm; bool update_subflows; =20 - update_subflows =3D (subflow->request_join || subflow->mp_join) && - mptcp_pm_is_kernel(msk); + if (mptcp_pm_is_userspace(msk)) { + spin_lock_bh(&pm->lock); + pm->subflows--; + spin_unlock_bh(&pm->lock); + return; + } + + update_subflows =3D (subflow->request_join || subflow->mp_join); if (!READ_ONCE(pm->work_pending) && !update_subflows) return; =20 diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 817b6f1eb013..db063a6956bc 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -311,6 +311,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) spin_lock_bh(&msk->pm.lock); mptcp_pm_alloc_anno_list(msk, &addr_l); msk->pm.local_addr_used++; + msk->pm.subflows++; spin_unlock_bh(&msk->pm.lock); =20 lock_sock(sk); --=20 2.35.3 From nobody Sat May 11 09:29:56 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2051.outbound.protection.outlook.com [40.107.21.51]) (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 21D0733CC for ; Thu, 13 Apr 2023 09:13:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y01p9EYORjTfEU4hIdGdVAGzdrMRFvoHB2fgo07+ltdNGPLnIFTwmuU3Kl/OFUORp9Gz+xKZWljAOLpdO5wJHz3vnaNJ98lz2K5/NOYkgsCUdKGIleSJNc5to6FnK3MRoBcsgnEFJIAArzrwPETTCP+eNJiwhtlbQiSjFj5dH3kmjDS0voeCQQS1K+V70c1txhIUX+JWMVRvFjxBUGqs9n/TbnoCK0Ui31/9SqXpjWkQJhrW1GI0uO+aZgt19COE/nU4erzNyY6J/Kr/4Hv8wgoDzgam2DfYhjdEp9UbSLpZacXpEjFsfxUBYkP0BHIum68WVR1cvrWXXuqp99e6Yw== 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=fu9brzMo/aLzDSz2mDIvZnOPM7uvP7JXP/Rw1h0K828=; b=eig0u9i9KCLoj4hh/A6PDJR2P94SAPMQiLqpwwdXEUP/GnAR3znTr2Red81cA8tdWymKPyYGXg2y7IoPQt86K7AvUJTYxYuAFsaYSQ65w9qh/Jc4jHzcb0z8ktQCWQUtC8UPG1FrTajkvbvs/DKWA1KjUDCY+rrT8S3EC7zp/Ww7wF/2gk/JCm4N/J7Ef5Dwk274OkL5eEMr9TczXTk0M+IP9HMfxuqKLbV8OQY8bjn0UlKYCOJm0UMR675YeKUe2qRwdqTVXm8j/4lLjefUazrF5HbOJyq+VPCQ3ftnDFvuSki96J59abBGelDzb9EAXtBiA3q0kGbyjTK78RNJvQ== 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=fu9brzMo/aLzDSz2mDIvZnOPM7uvP7JXP/Rw1h0K828=; b=ptW14mGDV26aMntgn4oHMndTD0ilox2nGJCEuv9Zb63EyBUFIZYv37FAQI4+B8sXq5QgNXaCOxrspjr30afnuT32AxTp2/k4bVFOzDnvFWjORDsOkkp5fG67+15VPH8V7VDsk6NVBjOu5z5c0knzYYNgw3wnmxZQAfR3HLenRCpAqESDqyGSWMR3352Bz3X+gtrAeQNS4qu57/46JjR+tbqXuvy2nvKwTeAcTktLSeSz5f5B2auxOIOo5iS4tHJHMJAnMo+aP8WQqjhA2hE5dLkh0XmyisCqslD35eRTUklzuO9FurElT7ROgQxIeuAgtwO1rVqb2QbXZTLG+wkmng== 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 PR3PR04MB7339.eurprd04.prod.outlook.com (2603:10a6:102:8b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr 2023 09:13:36 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Thu, 13 Apr 2023 09:13:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v6 7/7] selftests: mptcp: check userspace mptcp_info Date: Thu, 13 Apr 2023 17:12:42 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:194::6) 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_|PR3PR04MB7339:EE_ X-MS-Office365-Filtering-Correlation-Id: 84e3f74d-8532-4658-9e4b-08db3bff5cc5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CMGmnMD04MarUKr8AQC1v5xt9XPkDp6dYTIAaGUgVf+1Gm5DibfH3rts1JVgNxxuYbmKTBiktGoI+g8QBwwD5Av01kq+jz2OVeqexiqETZQ2jqTxS72qR13qa9seIKjZpQWHdJhFl6ipJDKJTaLhRtccmM49T37loUkJlV3qvo24NUzVvvPFTHY5xV9G8RPZUeb8GKG5YHOd2nhX2/00nMBg7TyYntNfsKOgRwBaCYiyQuiQ2d76IZ1hoVPUIRKOpUSdcR+LQ47tmDkqjY75Zk/fcHt/cPNFC3SKLGPzTOwjHTt9Nfa6M/SHtpXW7+T2TgxyWXZNPMzDJKfM5EvqUfaBSfG2SAumbVzDSl0amvnDTpoAI7Ef8FC+4+/KrZZjWYpnUi90yCB+1swhqkq2hDTNp9+7/Nq6CJ47a2yex67EAK2Y2Hy6ij3Vaaq5h9iFUcEzR+n12+h2xrNe/wtRju/R0sgyWyLtD7sXp2SQYIV6qxyhuFlWobIsddX4tlLcrIbrjQ3Z9GwfqtAR18oTdkG4NxVX54jyIAzozmIdJ33ixggaPsoOel1fe2yH1Dmy X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(366004)(136003)(346002)(396003)(39860400002)(376002)(451199021)(86362001)(478600001)(6486002)(36756003)(2616005)(26005)(107886003)(186003)(6512007)(6506007)(38100700002)(6666004)(316002)(6916009)(4326008)(66476007)(66556008)(66946007)(2906002)(8676002)(8936002)(44832011)(5660300002)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aWd5c3+nIe+7QtkT9mHMTEjEjCaCr6XerDhHxbxVxlc+HzTfB8huasydIvIn?= =?us-ascii?Q?81ptaS62GOP3zllTm6C2JGi80lbkjdjdv3rY5yqLgMSRHMrggxVGN5qCAv+F?= =?us-ascii?Q?lBHSqB0szkiBwmZqpW5DLiTVOIesi28T25SL0A31wKUcV7FXWIKb5jkIlJ+s?= =?us-ascii?Q?ZceTQvigLX1YHFQ1z0KW4F6RaLO+xWj2DY5ZgmudJduH4GYY6I7PQiXPBgpn?= =?us-ascii?Q?IQoZygMMJCng9PjoNFdntIBHRuQX2HVBnb5yjH5f37pL8EVTw6CUMIvw0YT4?= =?us-ascii?Q?ZbCSLoVxvundO367uvqUzaA+oYzTJrH4qkQvlRSguFM5eT1bict9iHBIzXOm?= =?us-ascii?Q?6DJo0QuyMPlzx5IPYSpIBfXu7Q5FGckjJJr4fWBSYvMU4SSm1tCd7nkfJ3wN?= =?us-ascii?Q?Bb8nw2y9wsTbJTpGIMkCOnsksbNkfzZ9//DV7cVDBcuuMxr2YclPM0rdSPUv?= =?us-ascii?Q?Jpoo4cRaXBqZiE/bXqkf3jjqFyKfLDUYcmutzbiqLjVGeaoTMvEy7dDwZ3yO?= =?us-ascii?Q?mUAkGZgX3S/x09AnCXjAxr24p9eGFCWxuQEhQyj9piWHYBBsOKpff3ddRGvS?= =?us-ascii?Q?T3XPhNIlTdxwq6Y2j7SC3Wqx9yVsS3zUQQtOoWIXPv11ruh8xdA2O0M3c2P/?= =?us-ascii?Q?MlDTLgAntst3Z+QAjol90N2N/3DAwrZGWbkm46wjhMvn8UnC+M8KnE0Tt+Ol?= =?us-ascii?Q?EdE28f/7iU82cEWv2FghvDtFpwdPDSco5CtOyHokkYBoBXnARRSXPUIF5X72?= =?us-ascii?Q?6hi6icMjXB+JsvOO247JgIGk/pB3HGZcMt48zh0Fy1KvD8Z12EhBRjL5IVu+?= =?us-ascii?Q?THcnq1duC5mKsSum2IzHyXS4bGIgYuqBX3kTHuMV6b/OVw22orpipJuvlERI?= =?us-ascii?Q?5UMaq+x0hNgfolGKdFjDjoOktHUi5O0QiUsNPiq6ye5cMdw4+ZxSZc/cUyIa?= =?us-ascii?Q?lpEOjYQ2DkBaL/TNfJTvV4Ycw02yV9rD9rhApg7QFob3vWjqr+9OHTzkoB4f?= =?us-ascii?Q?L+S5ItnviNI/UR3sELMtrCX3siqQjJTfqKEe6HEDBAPM2I0LbWAmmu9l3sV7?= =?us-ascii?Q?fRiYg+BNjtgfX85ZsukZpntKFsH9qkov4amuvuCAY60qGR7M4Zr2mBZZHsQC?= =?us-ascii?Q?r00TTBNzkxXri3EBroio4cp28nC7KkDEuZcS5pTabUuBYX4PjuzDkrY7FbIE?= =?us-ascii?Q?IkuAuDXqnuJ20ejTP+KXG11BH+/9Np2FYJ/+swwpHZyk2tUBANiP0BS6GGSY?= =?us-ascii?Q?LFGTH4fn4cxMld1AOnLLqfCHpS0mKzpaBHqa33ZD+ZqNEIpzHdQ7/mbBb4Vr?= =?us-ascii?Q?oL+WsARR/qWUp1lqky9CbXjrhc9s7xL46X0WdYSOzHsGYou2BhwCK00fSlXL?= =?us-ascii?Q?TD0t03hcAC9Yz/cm6F+w2udD/Gh0qRkd1K9ZD1rJ3w9Xdd68TmPi9cr/vAGc?= =?us-ascii?Q?Lh79M0OIL78RainGvaeA7p+9Rg0sc6r1SFSz0ylgxyFncWGxK+jRUz8Eb7aC?= =?us-ascii?Q?gBeIhLLP+nviDtj+dV5/XCN8O7D8yzHf5i/t/1urNMfJQoYeQlNyaNgspgle?= =?us-ascii?Q?4sZ80hclL9pqbqQjrvfh0jQvZsjs6XPc4PMnB0E6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84e3f74d-8532-4658-9e4b-08db3bff5cc5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2023 09:13:36.3654 (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: TQ23f4oCcN6zSyeGAHzQwha5ebV57K8rC0Wl5RKBYPPvP5BHk/pRm6L6TZjvARh7qU3K8+34+8toJUvH56uCrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7339 Content-Type: text/plain; charset="utf-8" This patch invokes chk_mptcp_info() to check mptcp_info of userspace PM. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 072f77b6b206..a5dc64129422 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -842,8 +842,11 @@ do_transfer() tk=3D$(grep "type:1," "$evts_ns1" | sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id + chk_mptcp_info subflows_1 sleep 1 ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id + sleep 1 + chk_mptcp_info subflows_0 fi =20 counter=3D$((counter + 1)) @@ -906,12 +909,15 @@ do_transfer() dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") ip netns exec ${connector_ns} ./pm_nl_ctl csf lip $addr lid $id \ rip $da rport $dp token $tk + chk_mptcp_info subflows_1 sleep 1 sp=3D$(grep "type:10" "$evts_ns2" | sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ rip $da rport $dp token $tk ip netns exec ${connector_ns} ./pm_nl_ctl rem token $tk id $id + sleep 1 + chk_mptcp_info subflows_0 fi counter=3D$((counter + 1)) add_nr_ns2=3D$((add_nr_ns2 - 1)) @@ -3149,6 +3155,10 @@ endpoint_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags signal pm_nl_check_endpoint 0 "modif is allowed" \ $ns2 10.0.2.2 id 1 flags signal + + chk_mptcp_info subflows_1 + pm_nl_del_endpoint $ns2 1 10.0.2.2 + chk_mptcp_info subflows_0 kill_tests_wait fi =20 --=20 2.35.3