From nobody Wed Apr 24 18:55:31 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2050.outbound.protection.outlook.com [40.107.8.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 AAE397B for ; Tue, 25 Apr 2023 07:55:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a1HNjfNhyLjg0Yprjc1jPDRdd1nq82U27T5kvaOlk8Og2xC/CTiMz2NWt68PC2wvwABZZoOiMa2jsDFwgnhjQ28JCDamXcRGje/rXf04QXHtNqOLLzvcsjHAvKvmuu9p9yB9CtmYirlwnzZXKUHFUL9U/P3vho3JzTrYMBHjMKF2t2BM/nT3rqoy/ZAp6h8jl7InV5jMmIhpufy9H+8mBS12UmyZ8uOXij6B1MzCpDUYExeJ47hKwhwlKh3oIbc9BijDTYU+INpImuJ3vVpFUzU450OWa+zxAB/VwVt3Z/qu3eboGxpN+P75RUaeXZSN1lEU4M1QCGURS7FuAY0Lgg== 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=MnXvE+3+GZKc9VwgNzabo/RtGn7ViFGOSq9gIpeOp7k=; b=Fmx2jCOZIIB0kea2bTp2jNLrKkz2kLuOfj0D6DOoHusVDi3UcbS8FkWh1BpCZXNk/L3lQ+Vh44iEqcAHWeNq9rB3wI25dKvBS0cAnAp4iiL1lcyHKaDb9PaAqfTofAbXxM7JNodq2j1lvQjfPKvXyV/1jm7bj2PlmWvNoBLNszsnecxlWuLLA1Itu3ThCrpFVSHvQYOan6lkaZZHktSjO02UR6c8CxiRfDss/5hmaeth7itD1IZPLr93+30Vp7ZG0mvmGRomuf828s/RTflKAL2BZX2XJtBJiEUIdSHQezIe52vjHiy51TpMNfUXOfK9miI/hTfJ/PQXZaxcS/HkwA== 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=MnXvE+3+GZKc9VwgNzabo/RtGn7ViFGOSq9gIpeOp7k=; b=aqZdaL+S2mbCXQ96RnN/u1dydAfoUjN9dtL35j6DVni+eOEs3HlK11cSRyWwTztuEpjCpdBhFnjq03hRgyOGImxlGXr9Hc2clNELlw6d9ZVNkNttPlmoU0zENqwBzdZYcRUCmaTQV/fDWqEGpCD44EjIIbRNxmF1z0M6n1qZ1HGqcXejW3YZXrJJ0jmi6+9hzPzOS7iGRc7+jMPs2NS9kO+zyAz2b4ED0f9/okOly2dqLnv+OTiZCkprDS7UFKBCs0SoFKOxvQWSfb5yYlHWFXroHFwLQO2T2qshvJaJH5tLdSmaiYLqUULZ61/5U2B5PjNrJsHZ6FBOzNHuMc/8oA== 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 PA4PR04MB9366.eurprd04.prod.outlook.com (2603:10a6:102:2a9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.32; Tue, 25 Apr 2023 07:55:34 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Tue, 25 Apr 2023 07:55:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 1/6] mptcp: only send RM_ADDR in nl_cmd_remove Date: Tue, 25 Apr 2023 15:55:06 +0800 Message-Id: <51353fdd885e07dd2335320d605ea7c70195ba7b.1682409247.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0058.apcprd02.prod.outlook.com (2603:1096:4:1f5::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_|PA4PR04MB9366:EE_ X-MS-Office365-Filtering-Correlation-Id: 320628ac-4c67-4b23-2187-08db45627337 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cXew6WaFS4RFWEyreksYxdtlvWVVveszi66xa0sYV9X/puT+B4W0CZA2+rdSFuLr98E9O3Zi+ikdqsMwTXpoJz73SJJFTq/NontbhGspQbG0jBfvguNLpRrY9Lz/PEKc9JjmvFChrPMzCNQJXAA0gIXFL1iS8ivHQzw7S7SHQh9BZ6199mzJlWr6NyC06FF4GsdWE3HgsNwf52SVhbo2bjU8OYHjnjaYb8tzIjlD+BYt2Wf1pZz/yrjvl5HOPGQ4GpbtLb8JuCKCAFC7p6teGYZI62D9Pun10iXwe4a4pxFdYMzls5d57BQtREFmAGXlmh4154nEFcvl7FjaI3JxMK5Bg21D8+Q5ld/hGE2bzFClp2LRA29yqRrPjg0P1mG1eU3WDbHOnCj9XmXq8OTOdF0Oa3GgxUEtNyLqZSA0OtgpbbQN6QDCbQWDbFXBy7dzMdd9Rgcl0yJr0JuU9dcp44FX1aEmSZ/6GzigPvSN+oV+S7ECg2+E8jYR2nTIi5IVm9efDttwZAyrvTXdMShLpSFJhrHcqY5PZSIQoL9SvXI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(366004)(39860400002)(396003)(136003)(346002)(451199021)(478600001)(6666004)(38100700002)(966005)(6486002)(107886003)(6512007)(26005)(186003)(83380400001)(6506007)(2616005)(5660300002)(8936002)(8676002)(41300700001)(2906002)(316002)(44832011)(4326008)(66556008)(66946007)(66476007)(6916009)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ip2nrVlTuwZXFlf5Eckmjq1iA2eD9WkhVLD3J10KbUPi6iBZ7g1igCOHAPwE?= =?us-ascii?Q?tBMLgO4cNjJSaHGaCO665l36wVVmG/3yOlhl9MSqu78bR+pL8WbxEWJRtkNL?= =?us-ascii?Q?Tqwmpja3hHtohNOo3DFa6LIbDioH3oYUm8Ro0DNs5vSCtFgoXEiw47/L+5DG?= =?us-ascii?Q?1R7g5Ha5N5zYznEBBLn2ctpon7ADitb5Fwtqipurtu+nfX5gFKipPLJ+CPNP?= =?us-ascii?Q?NC/FbPQrLMX8yJMIgBprfBMqbI673ryKz/k/62jjt8NQjWBJECC85vwWalK8?= =?us-ascii?Q?xp/BFqfs3u4G8BHEU1cKWA/qwOMEZQk1xrQxD6JkP2zoiv3aTQ+qJ0R1lTlC?= =?us-ascii?Q?hlzspjnZtYm2HzaIWxJmrw6V66HAdNOi7an1RukX0R3wRyde99BwpxXH9ZZ1?= =?us-ascii?Q?v4ysgPrdRiWQo8qLZX9MGXqGwxrFLE4EJ5GUS3SttsKwmbNQIuvwuN/CCKyx?= =?us-ascii?Q?YT54lCEbsWrQtMDT88bh6NyojYKpLQeTW7nuBnF8XfMn6tCbXOgryR0+PX9k?= =?us-ascii?Q?YO07KwzTHzHwB5ZthfV3sOqkqJ9TMB9MeawHsb9kYXLznyBPkBXU32ocQXYn?= =?us-ascii?Q?5qcVtqam6m7JcOMbDTaYHsyawCeSpMeB2kqLBvKDonAzvFqrXfftGlnJjrhe?= =?us-ascii?Q?zim/fjUEhIC1qopSBMQI45guK5mKMpRYjRFk1f705G4npHjjTCVJHCvsEbWT?= =?us-ascii?Q?j2ONMdg2i1HuGEN5JzKKGqVAbsYLw0StXj0S1v2Yq9Yce/pTemJimloqdECP?= =?us-ascii?Q?wWtAm/3HJFV1xssSp0AwcEGy1vSFYQCADLSi3u6vubw3gJ/p1LuepFqBqG+I?= =?us-ascii?Q?GljMtTkYkRsFdwcetF9MLi8n8ktI6rT2t9RehsXFpDFfIxRAtc3scsj8AnFZ?= =?us-ascii?Q?973DVF/8Nz6wUk/xSRFn3QWjCUl1/278CcM2hyPY0GG1bI4MGCCZWf8birEC?= =?us-ascii?Q?iQZV+iBaKQc9OtIO8tJooakWnNTzELK5wksu7tx47zDh+Ft3C17upkOnvofJ?= =?us-ascii?Q?rLXPmXykLSmr79DOf7BEjTXRkOqsurXb82oOlf0QBWhEt9ILWeTKr21ObnLS?= =?us-ascii?Q?qIm00JBb50HHp+At1e7JJQGYxe1k329LAAwpdqan6jnM65XQy1qQ27zkzLE2?= =?us-ascii?Q?lqYE3zwC81c/79wBBmQbSx+V8rUAh63Bb/L5fsoqPa8+xdsW9Q7CJs7sAy5f?= =?us-ascii?Q?pLMsNvykvJbnQzjDCqsqisGPTV+Tf3LhRPLCHS8n66k4Tv/S8wbQq7Q1Iwb9?= =?us-ascii?Q?t73U2xyHW8DUrelZFCpgOixUZpC2mAYqAxQCnzAJUo2j0Okdmcz14CvKdEuX?= =?us-ascii?Q?FQXdegrFrPa4NZM87qwLeqawODdsaQa9F1+egPoBRNR8jod1UJUDHzUixH9h?= =?us-ascii?Q?gqafK3jU3EZR8HPMxWYf2hJU1UJmMchwZnQpR8tpG8uPVDlPZ67zyk+GYgqD?= =?us-ascii?Q?FyMkNoUy9AUm2/f57tSDQI+Wkf+NATSqzJcgrsT6oOWXyMEsdgA/ZdDXb0fQ?= =?us-ascii?Q?6Jky3O7PpPaoNoeoYphYxhBkhFErjjcBrTOhhEeYmSHTLQiDKbdtSQY+o0xO?= =?us-ascii?Q?hl+zT4qR1gDZGihFpdxTT5um9xsqDrCAdfhpExQH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 320628ac-4c67-4b23-2187-08db45627337 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 07:55:34.6446 (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: glO0i8J7xXOLYNrE9xBXgszr3E50boDtzWhVRr8qXX3xDDJ/G1nC6awsR1wliGwopcuYOtBmFB59lndrGDF/5Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9366 Content-Type: text/plain; charset="utf-8" The specifications from [1] about the "REMOVE" command say: Announce that an address has been lost to the peer It was then only supposed to send a RM_ADDR and not trying to delete associated subflows. A new helper mptcp_pm_remove_addrs() is then introduced to do just that, compared to mptcp_pm_remove_addrs_and_subflows() also removing subflows. To delete a subflow, the userspace daemon can use the "SUB_DESTROY" command, see mptcp_nl_cmd_sf_destroy(). Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Link: https://github.com/multipath-tcp/mptcp/blob/mptcp_v0.96/include/uapi/= linux/mptcp.h [1] Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 16 ++++++++++++++++ net/mptcp/pm_userspace.c | 2 +- net/mptcp/protocol.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index e8336b8bd30e..d85649bc27e2 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1555,6 +1555,22 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb= , struct genl_info *info) return ret; } =20 +void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_li= st) +{ + struct mptcp_rm_list alist =3D { .nr =3D 0 }; + struct mptcp_pm_addr_entry *entry; + + list_for_each_entry(entry, rm_list, list) { + if (remove_anno_list_by_saddr(msk, &entry->addr) && + alist.nr < MPTCP_RM_IDS_MAX) { + alist.ids[alist.nr++] =3D entry->addr.id; + spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_addr(msk, &alist); + spin_unlock_bh(&msk->pm.lock); + } + } +} + void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list) { diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 27a275805c06..6beadea8c67d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -232,7 +232,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) =20 list_move(&match->list, &free_list); =20 - mptcp_pm_remove_addrs_and_subflows(msk, &free_list); + mptcp_pm_remove_addrs(msk, &free_list); =20 release_sock((struct sock *)msk); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c39e172c95db..1a2772902e9d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -845,6 +845,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, bool echo); int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_lis= t *rm_list); int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_= list *rm_list); +void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_li= st); void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list); =20 --=20 2.35.3 From nobody Wed Apr 24 18:55:31 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2079.outbound.protection.outlook.com [40.107.14.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A410B7B for ; Tue, 25 Apr 2023 07:55:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nEOATBj+qq/g2pL1bfvU3uPFZAF2SoOvdoPYLA+9IMANmyxovOa93VxPhaRzAasWwm0cXbqnZybicKDT4Mzr1GNTjMwlzJNDfYP1Or9BCsyAz+QWmiGEyTl/fGlZ5IuYGMLmnwEOuAxEFIFFhsYz8Cbl8fMQTW6EogrbVfEQ3We76gUGGrrqt0o/slqyCFhNRvvxsq7BJ5E7Kjz8+WbNcznPIlOCemuRB2he0pAiDI4HoJPh/mWbLh1lp+5b9liyUf7iq/Z59ir6dUtfIqcb00Yrk7dsoWR2wpb0HnDSquegxF+1yyLDKfAr+l7MUwrO5kmsMxxEIy0rb0+x6XqAdQ== 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=+rJvvM8/vIqLvXBMOpyCYWvDy/y7zQUtgkKMG2PZXi4=; b=gZ4s8SxuQc+YyP2zM8bl0Xop7iDGkQTaZlhiMD8fSTwC/3thjUd2GXQ01i7PBtNvGYwlbn6bA7b/95aLKQ1y3RYl2CVoMoA0FQO+k9uDi38s9NTfhd8DpHabfUORORrgph2ms1QQ5aH1r6bKanTchv/nJnag0dfIybPp88Yi2JL846Td2NANf0xGKszObP5QHYQ6JWOiFMVMfbpOXZzBvfXmuUO03rHxXKCkVjQfv038Se5ByM5/5ACJ1+XRmPjz8NkrMarsRzRoPE9pDyWCtIqTwnnw2yFFJQ40aVhbA01oGT/OR7PnrgIP5cYNAwytE/cwEgIs3R5m7u7Ok+EZrQ== 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=+rJvvM8/vIqLvXBMOpyCYWvDy/y7zQUtgkKMG2PZXi4=; b=LCkI9q9NpaQlDD90MONPXroeRysocaMkkjiDVaxamRl6oupC4PYZybS+AsPA6xOc8JgFZdnt0omtr9oXchOmD79KQ5C6RbuX6lFIUQsIPyERKmdkUOwgvGgFJMEeOB919iM6qmIOjawsGk4nLGp1nrtPEH3T2BYBVxOLbdUSGNvDtldQP1QSS6zFKZdogbcP4BLr91yOg1Q1G0NgjJr+GH87l7UWmD9hXmEV0YRjEaHqADcQ9OhShykHvQy6qAhMthIsDR6g/fON97zn83NRd4iIPQT2WZRx0G2IGfIOSKQie0NUKF6AzootXb0eHFLbAYYZl9asFecQV68WbMwMrw== 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 PA4PR04MB9366.eurprd04.prod.outlook.com (2603:10a6:102:2a9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.32; Tue, 25 Apr 2023 07:55:41 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Tue, 25 Apr 2023 07:55:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 2/6] selftests: mptcp: update userspace pm addr tests Date: Tue, 25 Apr 2023 15:55:07 +0800 Message-Id: <9538f1e674ae213267d8edbff236bc07cc5a2c59.1682409247.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0050.apcprd02.prod.outlook.com (2603:1096:4:1f5::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_|PA4PR04MB9366:EE_ X-MS-Office365-Filtering-Correlation-Id: 50a5fea2-27f8-4aa7-7f67-08db456276f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zu5jzKQXTMdKxN9V8Hz8o10lj314ilyK8nWs7dujORbwpPyR322/OHQarZVQ0WXc/hIuvJvxktIDO8hrQfVyuzsJ0nrIZggO0IgIuR7KfU+A90qmvxyMuG7U2qWgyqdu5kA4GOe/JK2hooIoBcMiY74m5URudt1l4H9vTsx7nsMypMS2C8Wh8a/97w3uOZf2f8lyutd/ofZJHEVRY3pAFn/+IGu8J/kjF9r0KRD8aCIoMJ05kDWE9Inpn8qkT5WICUQex8+OtOAZmA797CEGu89fcOXtXD6WdNXdbMc5m2hHPZmLjBUufT0jcRY+Vqv82zr6vf0PJQ481Jjr2gMoZ9MZvKHqDrvXIVlV+HsRuseLeaTQTrSuk2HJ7n0kkqrpXZsHF7n802nKRt6RO1ckn7HaGdKY/S2epa9M1u2MdPW+1EXAUm+arlesqfeHw5//EWV7wf4c4t9lv6GiNPyW0XEVKnXpPT2ghWiimtTpddjxj8dZWZk1GdusMF56+9ZOWbC5E/49Rs9iTZmVYDfpVG1KwdAnRSxQFVZ+9Fw82gKKcy3RTUTlDCiGjBBHSK1X X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(366004)(39860400002)(396003)(136003)(346002)(451199021)(478600001)(6666004)(38100700002)(6486002)(107886003)(6512007)(26005)(186003)(83380400001)(6506007)(2616005)(5660300002)(8936002)(8676002)(41300700001)(15650500001)(2906002)(316002)(44832011)(4326008)(66556008)(66946007)(66476007)(6916009)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iAqo/G1vRNeSPHvyp4Ac4sapiveDRnYOZ0U3EaPhsNSnbp2WCO5plhmIVJan?= =?us-ascii?Q?UtN6F4/QTaFstg7BP2AXYHnB5oWwnFIDqcIXYVlj5KJ5ebDlFCCVik56pV3H?= =?us-ascii?Q?L9A7CFrN0e15RZknBqYc3v7dSQBUCTwGpCGVlzzbh0iQZjU/DHzhlwuoYHcL?= =?us-ascii?Q?j3TGodeve7GfMk/e88GnguAqTtHE19180ntI07zb+AmFy8GKkgjous1fe97+?= =?us-ascii?Q?FEyyJlqyLs1BCDW1RTU0BI25dZiCmvQfclvpeio/rq26F2sgT8D1zRFXmRVv?= =?us-ascii?Q?/+owd4WCGgltDOqi8sMoqZDtHSsYEEJE8exWtbwMzBW3jdm/MBPQzH4nlHi4?= =?us-ascii?Q?n1OsACS0ySf0qesMhArS6QxODIprifQYqFACcwPxw8gLjO5VIGAb4pOjeHM6?= =?us-ascii?Q?m6N0XpL+HFFycwuDabJ2Tu3P2/madDvQkrBWZjqdDNdXkvRvRRqcIY04vkOa?= =?us-ascii?Q?GiD8GSczlfG+E70/dVq5eTIPXSgKNxcJB44SPBJl8ruw91Kd/G/Npvzszw0Z?= =?us-ascii?Q?A199+TQ+w/O9b9y9X9KYGFFxNpK5SRiSyRFNWPsDTBGSV72AOpb6L4eiUltD?= =?us-ascii?Q?bpHtmCFoCly9JN/gwE4J0vTVfxomsTa2HR6Uxzk/zJAEQPvqvjOKTqJqzgjZ?= =?us-ascii?Q?SgINuSYE1IHxH7japH6HeVbvsYOVWz/LGPcE2QBumrxcckQth9re7KJZedwm?= =?us-ascii?Q?ZIFEu9LXoRXLOBt4LjaphH4vFwDch59vYblMMG2oUWPriMjgHp0caj6Ogrwn?= =?us-ascii?Q?/0UhFPnPi9QKgYuj5nkKrazW+ib368dltFFuPZc3Jzs8/hVsE4pirld1j33f?= =?us-ascii?Q?LZMApX2UXh+WI78rhBUmS6ZcUIT2NZJNw5Pok29tAhrtVSDhZ/i1PVgugI4I?= =?us-ascii?Q?5EbBoKALmX3MDG6CnUQ3QAHJLZ/nbPKRtOTqNnKe+oQ7QBmzJFKODY6qcOst?= =?us-ascii?Q?pUWSo+cLNXv67lnWU9+eymxTHnZqm7/EUbKBZqnJY1HNh3Vp0K6T+443LiYo?= =?us-ascii?Q?ntHkF1x1l4iUH7R+DEJ15xWsoZvy36HvmYbHo0RDOUu7Y8wEbwzDG6n3hxas?= =?us-ascii?Q?OFiY+tbbQqJGwxztugeY+NRuOiCmB048hks7+5zK8UDiwHfC2N1ygHnXzmR2?= =?us-ascii?Q?fpGgSMR/ixKY44p8vrlpCIywWNbU9Ju4hnAjVTYkFo2Obaj5l65BlBLRPmtg?= =?us-ascii?Q?rulJqNKeY82kQhG9eCXbsXYwZ1lJEHQBf8dokUs7PdzeIlVaw9CvvbVVmkkd?= =?us-ascii?Q?13Jj6B3plq42eLbYLxgcF/uRE71tu+ng4X4gvlf/jXKR14e8Ca7NQtjUiZPW?= =?us-ascii?Q?DpRyJXhdcMcAwdc07tXBGizpZN3Kx2aB0jGfXo/tRKXprqsoxz6xFZzyhhcr?= =?us-ascii?Q?Wrt2N9LmOZ6JepZs7nPbi6nemrZFxalL8Vphkpb9YHrUFkzZEwfJLdcDjIN7?= =?us-ascii?Q?8koAVfSdJT7TdiokmwJEoqpiGqb1HsPjPMlLfsgW2pA+i+ARUJYdofarnHip?= =?us-ascii?Q?5Q3XKcUOBfkRInFMZplUqpwoxDxzyr9viWrr1SNXsrzg+qMDWwE1FSIhoTzw?= =?us-ascii?Q?Jk+nu2unk4qGj4bgISVKfLPD7ta8sCKD2is3pRBK?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50a5fea2-27f8-4aa7-7f67-08db456276f5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 07:55:40.9138 (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: gnTxTXsrLPRpL12raxBXFgTjJBGBOKf6Xxe6PXRJKC1SMgHT98pRy2U2xzs2LuEMcJrt3xfEBJZqqdYv5Plk7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9366 Content-Type: text/plain; charset="utf-8" This patch is linked to the previous commit ("mptcp: only send RM_ADDR in nl_cmd_remove"). To align with what is done by the in-kernel PM, update userspace pm addr selftests, by sending a remove_subflows command together before the remove_addrs command. Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Fixes: 97040cf9806e ("selftests: mptcp: userspace pm address tests") Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 26310c17b4c6..b3cbcf27fec1 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -849,6 +849,14 @@ do_transfer() sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id sleep 1 + sp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + da=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + dp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${listener_ns} ./pm_nl_ctl dsf lip "::ffff:$addr" \ + lport $sp rip $da rport $dp token $tk ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id fi =20 --=20 2.35.3 From nobody Wed Apr 24 18:55:31 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2085.outbound.protection.outlook.com [40.107.14.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97BA87B for ; Tue, 25 Apr 2023 07:55:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RZKiHP6cc93djMtQVv18bZtgQqeSC4uHlvKvMaRjauOEVOnNV+UL4zMijNQHSdIV5Ql4KvA4mPOJ5cLN7+zWGbpf5F2q91IiCBC0NFem/w5jpHHjs/R4dLEXwuSJjpJHSZl7UdOtLDYD4QzTw9euZvYLM4tTVdMt/8zsvsvd1WBHTL12WxcQM0LUNhPgeSLrbscakZLCvLy7zUGhGmFxkeE8RoBytSF1AJJQHL2n/zD2K8zLgPaUxuzn5u4Ybz/lgACV5YBB4sMLEGbGaJjlpkhdwRAWTtvmt2MqSqnHYlK4MjLRR21C0l/EE5N0MElWx7bBTJ54lmbJ9k01dr5YEg== 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=d/hBCS4c4M0g1Tr8q5bd0JpYLG1nDUo4RPsquKFw7Xo=; b=bp/yI2la4iXNKwcJyq2NZbwxPvu5S1mrb9lpGmsCXEjxYb6esyI7Lio3I96qe4717VVDRHN0kHy0qjj6R0OoaksZCnd9Gd+E4NTjNAGzwUhfCmWe9FAYsL9mD9kSMaVVfoEDWylUKylIw2sO6hr/wvXyuK4dC4U97K0yCt3rvys8Qt7eJd/WS8yoLDr28SuAXfk/75834EpRxhrI06vNPB3zfys4GQPojTBplhJMtwwbc1tITNrR4V7kMZlT52JLroYObs3Z8cuMg1V984JcyVbtXNuBGg1v1qq/FRA517NNZdfftpA5Hbb2NsVkPsuv5HYUb3gTexX+zbvF9zHtzw== 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=d/hBCS4c4M0g1Tr8q5bd0JpYLG1nDUo4RPsquKFw7Xo=; b=VcexPT0oCKl9O6G4jRNsa4RHVKqTBhH7Ba2AH+GBfns564qf7Vkq84Cc7Mmj5VJUBP5wBvu0YGJtJyM0KeYM+5B+eFr3URMly4xFdcYRgQpln1PMLAf9xDoTinq6GJ7wBIWO8yKx8p8GJqAkSjqza1cvrHT3SNj0abs3+Kgw2i9exzgvsrrNVrJlOJmllaHUGfOX1NfnNdxlHukn1tISgfmW8MsSa1Wt0q7Sg2RJVZUDyBNXSs/rBS4oNasJV9+tfI/rlxV0U6BKX+DBPfw7w+gxfLW3CjYJrlW+4lzXvuuWZYfp3orMVJ2sNvuh3+CFpgEhdm2GNxZpY4Y6yQAtQg== 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 PA4PR04MB9366.eurprd04.prod.outlook.com (2603:10a6:102:2a9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.32; Tue, 25 Apr 2023 07:55:47 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Tue, 25 Apr 2023 07:55:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 3/6] mptcp: add addr into userspace pm list Date: Tue, 25 Apr 2023 15:55:08 +0800 Message-Id: <2cb2b598ce097ee2e339f819bcb7a7ba2e097c5f.1682409247.git.geliang.tang@suse.com> 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_|PA4PR04MB9366:EE_ X-MS-Office365-Filtering-Correlation-Id: 5edcd577-3fa7-46ce-f3de-08db45627a88 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fg9Iw+iBX3PkG6ohz2QOL0NZpF8k85Vwxi8OQYGDPtOofRJQkn0hNAIqOMrj6gzfa18BTH+oQoM6d0IcSZOsfiEFTQMr9HhDKrzh91ElPCx/7eXLvQlOc5Ueu/IKbsFa2JrLoqslBCyIqabdPYj/Ek29SoNLT4Sr9FICReITeR7BLKOEcuzlbID8lemRejjcpOdgZVXrmqw3qFDq0cnfaBRQttqOK41SjjRPaAGGSiNg7IldjVMXA6xpUJpS0i8IhTf5TBNReISy8yjyQnzswjfrydENa5SHliMyeWxGvvDqBn/hWBal/lI1KZToKoDEAXgMC0VZdNl1gvEGLm5OmMLqFYKFEb2oGMlvFx9+luoltJdYrKDD83MKbHrFMclNEbbMyn76J4fqUm4+psPPNsw0ZhMIWHe25G2FBRf6Dk32XdJgy8/arhLm3ISO10OQskmos5mWQ5LCEoO78ZDapt/Q8fVLX/1rf3J25AGBj0VUU/5T3ksUWpXl5TzxEpC6zI2AIlQt96EKZPq9EGo356m3kftJapkYYe6d1rPgOV4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(366004)(39860400002)(396003)(136003)(346002)(451199021)(478600001)(6666004)(38100700002)(966005)(6486002)(107886003)(6512007)(26005)(186003)(83380400001)(6506007)(2616005)(5660300002)(8936002)(8676002)(41300700001)(2906002)(316002)(44832011)(4326008)(66556008)(66946007)(66476007)(6916009)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mXWXb6+nEXcLNghDiSTFLFoZtbu9Pmyn/0Y0oLzNoTnUnGRXoUiCXTWiykk5?= =?us-ascii?Q?wRnGjvT3dalT2bi37s1tf6/bXkPL2+MKAQbyL7V6k1MFuZe4o20yKxDt3Ve7?= =?us-ascii?Q?O89yuS1wmRffHFo0lrMP3hrh/mn6nI+ivLg9iUvcV49J9SWwXw0ZSyYn+BV5?= =?us-ascii?Q?V4iqBqbPH38mdwQvrIYhDmHh3+lnQf/2e9J5mfWYwQu2Y6Nj3q2lp+tAjSmi?= =?us-ascii?Q?yfStmJpFIfa8S53pluWD/Uno3AtuQBcdW3fdb5azr4o+yTg/1QHe0fCKifwW?= =?us-ascii?Q?9Xrj0kdROvt2IGFlBccgepclv97jsnT3bxlXgRTME3whDOdVUqmyT9ER9+xf?= =?us-ascii?Q?HmNJncZWhP9SHe0ZjbwrtQyF6orzEpviUaEgX3crsXH0fqqdGQqpY9QMvv6P?= =?us-ascii?Q?n9QvuNlH7F5zPHRndEYMwzs6rPxJvOvqrzf7+3Nyz52C0AQZdIpuKnYtJ5LR?= =?us-ascii?Q?Ol4RwVf1Z8onDRqoQiorCghKowaT+hBSpQ4Ag8Bl3bLfndJPoNZy6Kp8sUVY?= =?us-ascii?Q?7q05iYKn++0f2XOjio3c8EaKAiugmOFCcalZD/0ZS+ygMKyCcQLMdy15gxYY?= =?us-ascii?Q?u70xCHn0ZXxtZnqwx6JR+3N6Dr2+fvpGYmLJvSXyYtwVYEumaLXxDm04HBmO?= =?us-ascii?Q?RQQt08yNofDp8RQcBvohc+S4hZPpeNa32WXEBnuw68EQs3+Wc0jJa4EztTg/?= =?us-ascii?Q?sQZVRb11xmw4eoBpUYkeP4nhRHVOeap9SAFPuCdUVMm6o0g0Opbx4/UOV45P?= =?us-ascii?Q?qnFYahG+fvEVF3LUP/0loTDcBPITrfUvxrWnmOY1zWz4+CwhD5DbPBN5xAB7?= =?us-ascii?Q?y8XeT9v2FzSfvbZBxJCILqMegEGs0SjSXt0GfHyVTMcWIUt4MrWZr2GLvia/?= =?us-ascii?Q?IbxkaPfjjZbiIVrMsbCTzEBEPZ0+hgFSwgGZqQoBjbe+8DCmTy72FoDgxrbd?= =?us-ascii?Q?S9HqR2Pt/dnqmtCcJsRSm3BMRhA8H8xOttlCrO6FSyJN3m1eEauI/v4STMbi?= =?us-ascii?Q?MMVaGTHWrKBIJR19eC7//caEUoqGSS0Gim/bxHm8G5cV08fPg4btvzBUQfmu?= =?us-ascii?Q?ZE1ZCHaB648iWZiHhsoTV4mEGtLDjoig14MZHnIaeikfQ1f+lJqIW8tjkKuR?= =?us-ascii?Q?Mn5Y4hD2jT2ybLY4/BjKW0SVP4JlbJ/8AOO/xpG0JAoTe86Z9+E9/Yfp8m+a?= =?us-ascii?Q?wbEJqMZkA/G2LHfoH73XI+8GtuLcQmt9LUcaIHAgjKnKoy7EKNyBrSq/YhLD?= =?us-ascii?Q?bfBv48fyuASmSfkmCZVUHi/KB0OXU4+QkrPMWWdTQrupFPVJtBnpBZ4+VFiH?= =?us-ascii?Q?zZFObydxW8c/eQhUJkY/ZrOvo4XcN3W3RuO2K4e3QzTxoJE3IbXdvIZS1kjS?= =?us-ascii?Q?6XQsECfKADlfCo+EWXWuD7HY0VXb92y9c43uPAwRA3J+PyVoi24kNlzfmNhR?= =?us-ascii?Q?A9oMwpLDb56+vjenH2SZd0Yjn6hWIIDtIm5lAWqU1XZJnQe2ubDadRWyG+Pq?= =?us-ascii?Q?M3Xeh+XvkplJHiLwFFrbZ2489+4dZvZ9jEU1HP+Mm7a86ENNYYBuHAd5nMvm?= =?us-ascii?Q?WxGXMjYZvb8VgiSe8ujrUE0LmqCPYQwi1j5YQRXM?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5edcd577-3fa7-46ce-f3de-08db45627a88 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 07:55:46.9145 (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: n9w5ekLfH+iSssPMHTmchZtJIhLfILyhaZaohinkuR1QFLv9nMOKIWbKrqegTOVa5TokfjdtJCVLgdsSjcE5eg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9366 Content-Type: text/plain; charset="utf-8" Add the address into userspace_pm_local_addr_list when the subflow is created. And delete it in the new helper mptcp_userspace_pm_delete_local_addr(). By doing that, the "REMOVE" command also works with subflows that have been created via the "SUB_CREATE" command instead of restricting to the addresses that have been announced via the "ANNOUNCE" command. Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Link: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 6beadea8c67d..b494c72efe2b 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -79,6 +79,23 @@ static int mptcp_userspace_pm_append_new_local_addr(stru= ct mptcp_sock *msk, return ret; } =20 +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; + + 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) && + msk->pm.subflows =3D=3D 1) { + list_del_rcu(&entry->list); + kfree(entry); + return 0; + } + } + + return -EINVAL; +} + int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id, u8 *flags, int *ifindex) @@ -251,6 +268,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) struct nlattr *raddr =3D info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE]; struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; struct nlattr *laddr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; + struct mptcp_pm_addr_entry local =3D { 0 }; struct mptcp_addr_info addr_r; struct mptcp_addr_info addr_l; struct mptcp_sock *msk; @@ -302,12 +320,25 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struc= t 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"); + goto create_err; + } + lock_sock(sk); =20 err =3D __mptcp_subflow_connect(sk, &addr_l, &addr_r); =20 release_sock(sk); =20 + if (err) { + spin_lock_bh(&msk->pm.lock); + mptcp_userspace_pm_delete_local_addr(msk, &local); + spin_unlock_bh(&msk->pm.lock); + } + create_err: sock_put((struct sock *)msk); return err; --=20 2.35.3 From nobody Wed Apr 24 18:55:31 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2082.outbound.protection.outlook.com [40.107.14.82]) (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 86C187B for ; Tue, 25 Apr 2023 07:55:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DicO9XNvdVtNrDepJ3uvEd6QmXCWP09wjb2M2nmy+IoDAe6dfJqeDY9AMyV8BDr7LxkMPZY34ocJwWo69cotjtC4rJzwos/Yxv3h7Bgppmg5kK5Y0CeiYq6WTFSRJbeqGghGyBIzOzWnPmrt2lq2teqEcLGXEFHye0HAzSwUbcB0RpybqdcyEOrmMEpX1+u9eaXyFMojEgBLDn1j0Jr5omV4RHAIcZ6ZAMhY858PnMp6VyhWoZyi4qGv1lhsSqenqJNEWq+uKwM++9tR2ycT+Z63y7GZxDtyevO85+IaSHqU5bvl5lUrk9gWJDcU69eBYEgHlH0SXLH0mSJKFxFT9g== 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=zyoRuKlfziwGBDgVyC+fbi4y7ALsa0iyF1xMsqcf+MQ=; b=mLrlfCq1jxayDWdeUEp1Pd/xwBWzFwdB1bkGkU1rVHHBHvG3BZEk1rz6CHBmIWcw2rAtgaGiK5i39h7vPW8N8Mv/0Qx2SLXWELErCLX+41WZroqkQof1f5s1rJRXJfHDg0VEBNef2vig+h5wYLRmrkF447OLXmjau4P6yEwumiAU5dJxyALfCG6iA1Y8GuvrhQbxgXNZe7xHMQGNcgckUpbEXQOTZblDx1BhWd9zDXYk9Hjzz41AcMWkJuPUnPpKdYSxp2062GAWHakTa6c5Z0I1loRsms0lr0OQd2cfiAo3tpYMoyz09AoozFaLAS8qVbZodDdsqV4nVsWh5B3aDg== 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=zyoRuKlfziwGBDgVyC+fbi4y7ALsa0iyF1xMsqcf+MQ=; b=eGfrmN/7MiL4Of50z8Xicr/+UkEvxKqDIXyGc5yjgoXg3S7wizCCAUJnzq32oIz3jj49lqhHHgfuw1pZJgUB1BYQv3gC0wgMx8Jqj5Q51cu0KaH3OgYxdg8fF96vDWOHoh1iG6XUJaigi3ht93zc3L0TTi5Mir5eZa/g1csyOfXAeHSXgD0OqK52q3wx5sfUW9vNbUq99SajkInWGBeV6uYeKYyAt8cqMHpsJdiqAPdxT4UytC9rbMTmPu/XMYMX3iNFLz4hYtFCwZFk6+1FA1e9tm2v9ZDyWjEntqiLrNq2NG0kxBOtEB7xTIzLeFalLCohzWbeueMdT+Yy4nN1Sw== 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 PA4PR04MB9366.eurprd04.prod.outlook.com (2603:10a6:102:2a9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.32; Tue, 25 Apr 2023 07:55:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Tue, 25 Apr 2023 07:55:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 4/6] mptcp: export remove_anno_list_by_saddr Date: Tue, 25 Apr 2023 15:55:09 +0800 Message-Id: <1b782af3035e0c727ad25e9a51488b25729f099a.1682409247.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0179.apcprd01.prod.exchangelabs.com (2603:1096:4:28::35) 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_|PA4PR04MB9366:EE_ X-MS-Office365-Filtering-Correlation-Id: 374b0ee5-1067-4803-1a65-08db45627f38 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: alBUJdCvjPschkaoawI4SZz1wIg/bqWilULkofWMNHfUj5dTJ2O+kzue6WAy38dPqLiFVYFaJlY8cuHboneOxR9Q5eDCVmUxxzP4J6yjYlWYZfIBs1NJbKHVrEZz5qgmvisQWPXAMRPvLTzNY60BE+7Z04Ek/v4uoDa3dej7gDWoaDcxdiCor60BQWHLKhvEKhVaqaAWF1ZL5Srpob20sOt7SWGUe2v850dYC2tX0Fc0vtDeSfi9I/Il07rCVmlGALNcfJSWk6O0DinqCqKMc9eEuNmVfQdPksb6TVJrU2QNWsoGArUfyAlz3f6ek32NbE482VOBvTfXalPODXv2HB2XgGjWktLw0q87dLhFTykZjLdwZjGDpLU58Zo/quS/LaFJKnWyMwKlPWTAnOBDHc+5SX8A93q4RELXWgz+NgRkQzEPnevZyIq7Nnnd6/PZ8JbUZ7Xa6QnjY62/MdFZ4MclewUR1XPsjCJZrqQBERc00PrQFHEjbTXhblTAdnZ0FAeKNIAQ625bA4HaGLGx6XGlVqq23j6KDG5YTfse+wdBdgKzKwzoH1pdrpKRVPT1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(366004)(39860400002)(396003)(136003)(346002)(451199021)(478600001)(6666004)(38100700002)(6486002)(107886003)(6512007)(26005)(186003)(83380400001)(6506007)(2616005)(5660300002)(8936002)(8676002)(41300700001)(2906002)(316002)(44832011)(4326008)(66556008)(66946007)(66476007)(6916009)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?m4zyYWpl5ezVeRaaAF4+oRILRhax1qH0plG0azljTCNZSfCozEV6powwqKvu?= =?us-ascii?Q?QxgT29LCekDGc5Pfoy/ADLt6FhrjqDWN5ZqWddXtrm09rf+lopbXsDFkiEOM?= =?us-ascii?Q?rMCt9zgmMW0inZFvTUS2BD3bxC3nGzc2spK0RviwuEe2JEIm/z5FaHJjzD5/?= =?us-ascii?Q?4alPkDDrP/6iptU4k0ZUaHzFPgnD/LkjXgFoKK9Gz6vnlwTd63cdbvdurDNg?= =?us-ascii?Q?gbTh9D5I9V7T4iLzzGn6p/ELvQAvBxuoRZ0aKxcGncAmTFGRPL075lfCZWtF?= =?us-ascii?Q?cxt2pVLCnryhxu0hhIBRvqtMRsagZOr9Y8GbAxvNmIoedtXzLMKj3ZSrCjcD?= =?us-ascii?Q?bPjYsuyLFGeDa7mws2nIHvyXnBE9gZ0PMF/5oIWEx6hdHBC3seArn96qj7Cc?= =?us-ascii?Q?+J7RbvVq/YqgTFTnznLG6xDFqUrHJn/0pcP5PoNySE9iEILXhRP6cc0Ab6ln?= =?us-ascii?Q?mfG60YU96qvQNR0vdjNJNTTeY+Lbn2Tur4sHmHb0mk0168ImFZuzn4yMaMDX?= =?us-ascii?Q?/V/o2QxkaQc7L09If3/hH1nYoblCSrUqc+s1QjkV3Q6DMUgEu7O9dxBNqjHE?= =?us-ascii?Q?Om+iqTV6HHjmmka0WSgDjEo/nQ/Zerennt8mM6kcr+9RIJGueoBUi86B7YNs?= =?us-ascii?Q?KyGLEMe0krhTMXJSewfJeKbPnRX0c4yVcDz+JLRQfW4Mb532ymJ0sa3AXbGX?= =?us-ascii?Q?czbxtp6zrzvp3ErT+oKS6J9IcP+DfQp/ER/A7cs9uDzW8EuRqAcUZMUiO/FM?= =?us-ascii?Q?Xj5Sdv8AZd2zmjfduqaJIPXbCp11KwVEVE/kq4djfdKEpCh11PvsaJCN7Ris?= =?us-ascii?Q?vKsPDZDjd9kKh/NnEa6rJ8HbZP0jaW05QrrSHe6RngpjzsqHBsDMdPH32xYi?= =?us-ascii?Q?9/S+1ozKVXsM/YqvXz3aD8huzHsCoiftnpZCQEJudawi3c9HyQ/pmb8eqngd?= =?us-ascii?Q?0SB1I8OkXgHaYXrqUw3peSw35MLEdjU1zvrXTDfEg7uOSa4UYBpHmxWje31S?= =?us-ascii?Q?r/1xaj22JZPuTamZReURRE6AnT2eEhgHZxhB8LsCcCkY0iOne0H479c2akQU?= =?us-ascii?Q?FNdejmorMar7BnY/TEn2VfyimFpaCQWT7Q5xoRjX+4ZnuipLA71o5K75SP4s?= =?us-ascii?Q?VPuO84vu7DU/H3pXVrrQfa1ewOyX+lBeFHOZaMieNieO3kiltERishmqJln9?= =?us-ascii?Q?oWbvEN9NWLMn2YGNML209RpQUofL9Mqh6s/wFl73Gj+yO72bqRZkw4u0e9An?= =?us-ascii?Q?0MoUli+6Zgv/wgRs0HcnWFUJ3klhjhUjfu/QROETR55cR2rUw/8hhNrQxy2b?= =?us-ascii?Q?4kyTSLe6iYFW+FqJqGmQIjvd6NobwwEz9M2ktPKqDUnRWdKKOlBK4JX15DX6?= =?us-ascii?Q?W5jaCULjHT3ZG8VLzYLOVil+vA1nhT7ZrK9M/Hpv/1KxBzL+KS0lL6DUFQHK?= =?us-ascii?Q?rZF0YTf/+IwYptewf1+R6ptzhJXbpTGtqssSVXL6T6Z9V8ghrvYK3D1zK6x/?= =?us-ascii?Q?62vfGPH0ezE47B/3GtQAKTQbY+kWyNSS55N01yPqJ+7U3x33MykUwavidCMh?= =?us-ascii?Q?eelOjOkcuMklKm+X05ja2QB846PLJYRl8eJNebij?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 374b0ee5-1067-4803-1a65-08db45627f38 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 07:55:54.8032 (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: qvmYfmMUXSyfVX6SXbHK06jok7rd9JfG17HJr0K9z0lW5qc4yPFX0OJgIqwfETmgACDctxzUgF7XMG/Ml9Y5fw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9366 Content-Type: text/plain; charset="utf-8" Rename remove_anno_list_by_saddr() with "mptcp_pm_" prefix and export it in protocol.h. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 10 +++++----- net/mptcp/protocol.h | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index d85649bc27e2..3958b8ec4269 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1399,8 +1399,8 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp= _sock *msk, unsigned int id return 0; } =20 -static bool remove_anno_list_by_saddr(struct mptcp_sock *msk, - const struct mptcp_addr_info *addr) +bool mptcp_pm_remove_anno_list_by_saddr(struct mptcp_sock *msk, + const struct mptcp_addr_info *addr) { struct mptcp_pm_add_entry *entry; =20 @@ -1423,7 +1423,7 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_so= ck *msk, =20 list.ids[list.nr++] =3D addr->id; =20 - ret =3D remove_anno_list_by_saddr(msk, addr); + ret =3D mptcp_pm_remove_anno_list_by_saddr(msk, addr); if (ret || force) { spin_lock_bh(&msk->pm.lock); mptcp_pm_remove_addr(msk, &list); @@ -1561,7 +1561,7 @@ void mptcp_pm_remove_addrs(struct mptcp_sock *msk, st= ruct list_head *rm_list) struct mptcp_pm_addr_entry *entry; =20 list_for_each_entry(entry, rm_list, list) { - if (remove_anno_list_by_saddr(msk, &entry->addr) && + if (mptcp_pm_remove_anno_list_by_saddr(msk, &entry->addr) && alist.nr < MPTCP_RM_IDS_MAX) { alist.ids[alist.nr++] =3D entry->addr.id; spin_lock_bh(&msk->pm.lock); @@ -1582,7 +1582,7 @@ void mptcp_pm_remove_addrs_and_subflows(struct mptcp_= sock *msk, slist.nr < MPTCP_RM_IDS_MAX) slist.ids[slist.nr++] =3D entry->addr.id; =20 - if (remove_anno_list_by_saddr(msk, &entry->addr) && + if (mptcp_pm_remove_anno_list_by_saddr(msk, &entry->addr) && alist.nr < MPTCP_RM_IDS_MAX) alist.ids[alist.nr++] =3D entry->addr.id; } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 1a2772902e9d..bfa7d93a1c1a 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -831,6 +831,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, struct mptcp_pm_add_entry * mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, const struct mptcp_addr_info *addr); +bool mptcp_pm_remove_anno_list_by_saddr(struct mptcp_sock *msk, + const struct mptcp_addr_info *addr); 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 Wed Apr 24 18:55:31 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2070.outbound.protection.outlook.com [40.107.14.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 637307B for ; Tue, 25 Apr 2023 07:56:04 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Weu7vXcTOxnVh5Y3zhe/oetiOwK2tYom642fyb4hRszETPa5S6bpip9arSfPOLdSnWDohqCBQnopTBi2gEDlW8SqcoG8NWqSTmMFHMkj1M/Afsdzbq290cBEilTOLrZz4SHCER3D5KsXVwH4Hpz032UMUau+XHIsk1zKSloBhp/KHHaznPG+ERNY4fOqaKedPPe/feGV8O8YW0/7Ul11Gk1RQm5FyllX6/vTGqu2hN3h3pvIlIWgRBrGYrbGDpSPspIKP775lW14o2D19aRO/hMubrWI99MjyO3DMONdL1xdB04KL3NIl+kwdusJRINnbyEC56fxV+IjyBmm3e/8Pw== 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=kXrnXfX6S0970Esj8M3vN3Oc33NnxMk3LvWQlPs98n8=; b=d9jXtTB8tap7sB5/2PCUCOF8fFnS+knSN+PnDqKkvexI5WlHVFKn3TBbDuFU26SmZNl4JqsjCLgNqsI3MhB1rU3RWIBq80pSz+2DUm3CKPZXIX0EdnEX+6JY+TU73JktEAKg6XKXlDBLlRgFyNHMrwOoD2q3WyXZuvwBxucBLrluDPWpddsJmGHbCAAqNCYtDqayzBT6m+ytUcRistU8a3BQb4r5tu8RoRF/zZg06OCQ/KSfyOfiqscHMpIjXI2hPFf3nuUfKZu6vd4D5UoU1iEpFV8WWRVCJfkFJj7/eSRhxytg38p6X/lGCJLoumq8oy4NsfhfvAXP766uG9yPCw== 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=kXrnXfX6S0970Esj8M3vN3Oc33NnxMk3LvWQlPs98n8=; b=3FmiMXGSP8KaPPn1nzfmCknXduaJqToADOtR8I1G5OUK9Z8W3HKo3h+LL1nXjHZkOg1VkzYM4LSfdCAiRDh0iZOG22/qkr3wVFWoOECy8e5xSF8C+/4dXwTUlkq1ivoW00OHvyBHACrc0CFoCTqlNopRJyWyxZfFZNXADRth9Wxcn7z1aW5N1SmJKXDvWBS92KH7/h6Cw+XbG7K2EMhpMf8b8JVRT+mdwOePn/TADxTVuhxBCqRUV579JWxIOpcf1QembB/1VUKKilQ6EKuQT3s8PDj8HiY6jVtpgO2iiJZAaDGnfUh4QHn96Ois/PGWHnKApfim3xWjpcY2rTdO9Q== 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 PA4PR04MB9366.eurprd04.prod.outlook.com (2603:10a6:102:2a9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.32; Tue, 25 Apr 2023 07:56:01 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Tue, 25 Apr 2023 07:56:01 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 5/6] mptcp: add addr into pm anno_list Date: Tue, 25 Apr 2023 15:55:10 +0800 Message-Id: <9bbb727d7115d7339bfa91bd61ba85386e998aaa.1682409247.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0171.apcprd01.prod.exchangelabs.com (2603:1096:4:28::27) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PA4PR04MB9366:EE_ X-MS-Office365-Filtering-Correlation-Id: 69803ff1-49e1-4a14-5d31-08db4562835f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 86+4gXjB5Lf/TRU05MDl051VJH236fgJGPeH/XcQDWAbUxBIyZzbqVMOyh+RswuqcOlMNqZN5KwNcdwvOE7zDOK8JlvoPTf3C0CNB5MO8k1YI91Q924aOafnTIGQOk6RgYfhKRZiMgZ6+jeJNwAyD2Va5QTqvLZPOIKLStblWGpU7aIP9UQoFOWDxA/B4fxXVjQAbFNC4SOZIhZmCIJms4jtZj4ateB28ufAH9HnSKQxsb8O4JB5vfJeXuaZoC4/JKAqhpOcKahcUBBhRrtsvWWIKA/T7VNYsmOseTieOSDDbS4PlqRNUPxnk5HERRaVlgvXsdVQOSGItVvw+FZ7+Z8TGWJ120RoNXKYKu3O/4hYOYtWCNbyCkitlYy+pDS7mb9kxTzeWZmspPX0HSlR99Mo8Ytc4nqJObFG3sN2YqVMvZIjUGbqW87jodcg+9k91tmwJsNy9xJOJy7d+4SvlIc7n374C734c4LFvEU0laipjYayYjmPrGhL72YGxzVY6VnjDYNRiWySy+0LnOv4wgViWiFJVVb17NFpGyHu4No= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(366004)(39860400002)(396003)(136003)(346002)(451199021)(478600001)(6666004)(38100700002)(966005)(6486002)(107886003)(6512007)(26005)(186003)(83380400001)(6506007)(2616005)(5660300002)(8936002)(8676002)(41300700001)(2906002)(316002)(44832011)(4326008)(66556008)(66946007)(66476007)(6916009)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ewrg/Uf1nURhdUfuIjl52w5wLv75E/VlK1Li86ufAZWRt62BH4kUO+4ZOREG?= =?us-ascii?Q?q5uCP/kvgpr6/Lg6dI7TOm6TGGU+BwgnprXahPTRw6V9wW/32cUWZHq9YBNy?= =?us-ascii?Q?BFliRliz/cEOzXg7pZCPAW25lL21jB4UT/MppcvaTFahJlXH6pYZ1WogYgmv?= =?us-ascii?Q?qiZiuX72UgYj6TDcF5q/NcgMfmMztkOl0psZpDrjWW2Jwuw8w5raQCIVX+rE?= =?us-ascii?Q?mjkXgi0Xn8hO2ir46p3wKIlD2wH8fYBlyiVHCbHua4oM2+aHP66zycbuFk9p?= =?us-ascii?Q?odHKqcHZpF/naqooXTfC4aVrq/xeBHUS4gjzikjaf4WfJ+feCVLap+Ox99z2?= =?us-ascii?Q?EMZcPZs9dNZ9AhcbAxtcyV8TpKcA/QuP8vO+bQEqbWo1utslsZib2kk/kbaZ?= =?us-ascii?Q?ogsdp0khn8tetUqifxUfMyqLUuFuVLTQWki+KqKVmmdQkWVvNr4Wr/duAhYg?= =?us-ascii?Q?sHoG5++FwaBV95Y2A0S9LDweat4HT1k1rtRZ2nojWNIpUU9/uuEcAmSZ7sot?= =?us-ascii?Q?2Sn9SoO7lhEdh/ihxVKh9vD3Hwfbv8GMQ5Lwte8LNiYWqJ3ThtPWTA2qmY++?= =?us-ascii?Q?OlgD/0JWKbqSUFpQQq8Y4rEesD1sJjXQ2dZOYc9ui5Byrdvx5cV24wdEhZ22?= =?us-ascii?Q?MILkq1nuo5IRCnLWmEb/ToAXdV/wASEfLVL/GpQ+f7/hGpvTxIG8X6WAcfW0?= =?us-ascii?Q?uzbqd61w31w6AGhwlFEHffbNWFtoj2xtUTaXlarGAhAdJtOefsL9Ocib9Yfk?= =?us-ascii?Q?KlUa3WfkdpwN6+O2jYSOmnn7yLyZLT+bPNv/FJVWQ4LZVWL2f/K7QlP2AtUU?= =?us-ascii?Q?17yb5yYomRbD1nAQOsZskta6zXmm8dh24LjMQZ0QiP9UF8BZ3R37Cb+4RfPV?= =?us-ascii?Q?YyEqVbM9RKHD8c1aGZ3OH5SJJAqaik9SLC2Lng4KT1aXxx+FCKz6mYo9GuYq?= =?us-ascii?Q?Q5E5Hww+aTojzNGEM+clWg9VFLeyN/lwPZbod6dwdKZPBSjD2Ld0iqAUTsBM?= =?us-ascii?Q?J5TUY/H46seyGlC+HDlLsiYGocZIEUt7U245O2Fwl+UoMS7Gf/Tl/Y95drdL?= =?us-ascii?Q?CDnunsutLpJdAVBH70Ve2S3+7zRef/8SrkY7GRemjEzd85JF9+BGAaqoiKLk?= =?us-ascii?Q?3pGbUdgdRWx30SXhOqVwAn13eKf9Pqj1piK9f2Mrmh7M53VMwu4EEh10Z4sh?= =?us-ascii?Q?Qy4/1GkeWK4/G1Ldxh5csDPeXdtLC2eHbjowZkiyQtm9gevHYnusM42O/li4?= =?us-ascii?Q?yxe8jOGqaqzkzBj/9/mWvA2hpc3ffrLYSGkUBQE7wnWEbZQ0/u2hlidLMZ3h?= =?us-ascii?Q?oTYCOPVheXQ54w6omDGLvFfMthXKaaAhrBkHehKZq3thPtqG4llORnbXEAHJ?= =?us-ascii?Q?ZjrFYwvdoWAMcXr5NDfZt15mX8yP+5B1sROIy6/ppvT0zBkNukd5fVbruApk?= =?us-ascii?Q?l4uMW/Pu7S/0mdRpqfqoOJn/nL7+cC0I9rpQfyB09/kUBIg4uFVs2lPJI/Er?= =?us-ascii?Q?kOx90c5/mJGxt0PaQKjf7BsL6m4AFhVj4trIOmU0T8ShxQ/pCs819poTmKyn?= =?us-ascii?Q?Gx8wjezEmAsIx+tq5KIeamoRItdKcvJp0XXEkCLV?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69803ff1-49e1-4a14-5d31-08db4562835f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 07:56:01.7867 (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: JzOWlRYLngKrNTJirINHyCLVhika4q/Z62T/hKvmlWLqxHQ+SXLmsD2rcy+s8l9H7siJw+99pi1kbJFVhOo61w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9366 Content-Type: text/plain; charset="utf-8" Add address into pm anno_list in mptcp_nl_cmd_sf_create(). Remove it when connecting fails. By doing this, the "REMOVE" command also works with subflows that have been created via the "SUB_CREATE" command instead of restricting to the addresses that have been announced via the "ANNOUNCE" command. Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Link: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index b494c72efe2b..47aea147e334 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -327,6 +327,14 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct= genl_info *info) goto create_err; } =20 + spin_lock_bh(&msk->pm.lock); + if (!mptcp_pm_alloc_anno_list(msk, &local)) { + mptcp_userspace_pm_delete_local_addr(msk, &local); + spin_unlock_bh(&msk->pm.lock); + goto create_err; + } + spin_unlock_bh(&msk->pm.lock); + lock_sock(sk); =20 err =3D __mptcp_subflow_connect(sk, &addr_l, &addr_r); @@ -335,6 +343,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) =20 if (err) { spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_anno_list_by_saddr(msk, &addr_l); mptcp_userspace_pm_delete_local_addr(msk, &local); spin_unlock_bh(&msk->pm.lock); } --=20 2.35.3 From nobody Wed Apr 24 18:55:31 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2074.outbound.protection.outlook.com [40.107.14.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAFB97B for ; Tue, 25 Apr 2023 07:56:12 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aSI/4WGFsRZZTfLHbCc0IzCR49dh8RVCtIuORyAjG1TwORSI50+J80p7quEWsv1WQLPkRILeoajGD4nTKaMS8M9DR1yk24/rC1SToMARVdBWsIlDwupu1CSC9EkL+BYouw9o/rpY/ydJ1geozdIIy8bmNApqgeqoiv7BIezlEge6Qu405Ni2gjwH3Ac5BriNO+02R/x/O8+11cWmRCHf1Sxgg28jCzK7YTdM7bDDbwhZZ/yy46lrdlJvG92m31UQtYceREvt7flgnS1xJMIkDKlJ256rEE8g+tZRy7EaEg+FekzbxqkH7f2G4Gr0xWKJQMzAJRNoQAuzyBlxiFtsBA== 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=Yt7RCWELTXEz8+21MuqBPSLvhGOZYhWPw+is+N54xjY=; b=JUZ9hiw5Ie6Hald/AmhP4ven725yblbPYjhlbqT2NpfyJ7uUE4wzLnFZmOyN9AcCwtESJKtDKJlaU53fslQgRQZnO267ovzhISq50Dv8zWW2CTT9MmVKtZAk+GtN/g38NQZZ23Cr79i1tUwxSMtWja6nY3h6AvOPgZshJNWZDEYk4SO/28XbSgGn4glzD1rbK2vhkSop8CahCwjfezkDIAcBHuqflDrEeJUAxmtsJlyKkB0dc0CwDHTG5TKIc7W7hCscLUfDUYPT1EVeDi3DLNqPtt+0mTwG43cjcOZu8fIrhjXjC1WkK8vF9OlbGLouoIRgXi+C7fKZJeIYt8GqsA== 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=Yt7RCWELTXEz8+21MuqBPSLvhGOZYhWPw+is+N54xjY=; b=Uu2Wx09jAjM/J25fuwgLbkSwgI2xX7Az1tI7jpSSSqgkShjHWYL2SK/tdJNQEMpo7zNj1bJiXovQ1YuHPV8uRAUVruK/1C3qOJsac5CNka9NMq0li37lmvKgZFDS6/MLjR2zJoxAnOv+RactwYhXnN64xChiv/vUIJQfImXspS/1FdQJSo9DFKfTFXmIhJh8frf6iF+9RTwEtVyVXTPRh3t5wLzOXA7c00jawn+XQd5saSg6xWa/Th8atpnj4aU8HxwERxaidDqCUWNNcFqrgKcBxto1UcD8QyE3rY65lajcViL8CgATKM+GT2c+Enc17Vc5OO2jPlRCi3FZvasCYw== 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 PA4PR04MB9366.eurprd04.prod.outlook.com (2603:10a6:102:2a9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.32; Tue, 25 Apr 2023 07:56:10 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Tue, 25 Apr 2023 07:56:09 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 6/6] selftests: mptcp: update userspace pm subflow tests Date: Tue, 25 Apr 2023 15:55:11 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0017.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::29) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PA4PR04MB9366:EE_ X-MS-Office365-Filtering-Correlation-Id: 443d6361-0025-43d4-4550-08db45628832 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kcshAw2XbYKyET+UMTSWp5jg5xLAhd4eGBr0lzCZTroVXDoqy6/9py85Fd+HdUHLHd8HwmkcLmrgSIWD/5xzh2Rn/U0oZM3U0eeLrXBp8jvEjoA3kNbTSoypM/75MJ8JzDjTI570s/6+Cj5qiR9PmrEllF52hpdSh6oQ6VcN15dazsSearWOtjpNRxUZl+1eLrqVVS7C/6P2gTeyOqRpiGan6rDqrP7g1eqVVQI34HUMB67yigTB8QJsLiD93nttOXWiYxQwyjgHIsFt/dBeSrhBntqTR0lnFIm5RNBJpfnE2R8NmieikbcU20A+rPRkMAgi30KNwP6q3yL8rB6o4puqdNj7HvmKE5qAF4c0tv+mjZcv68EfePEgEOaakG/3Cwoj//2ypRLyGUbCyQgoP45aHS79RCk0PuRryj5R5Ym1ZgBjHLum/CrePY/TdeI8USDNsG71OZ7UTnLh+dFvhkkOqaMZ2Sp4icEKA39p06zN1wOhUcO+ZKi3Q+DJLK4IGLfapnWcmxQ1fx9DqvCMCNlZKsMk9jTxkRZZj6VqG/c= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(366004)(39860400002)(396003)(136003)(346002)(451199021)(478600001)(6666004)(38100700002)(966005)(6486002)(107886003)(6512007)(26005)(186003)(83380400001)(6506007)(2616005)(5660300002)(8936002)(8676002)(41300700001)(15650500001)(2906002)(316002)(44832011)(4326008)(66556008)(66946007)(66476007)(6916009)(86362001)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Tpa6xW3m4L49oa0VTUjJnIpm92ScY30K0xZU1oeZc/5RBtqvoQSc+GqwJUOR?= =?us-ascii?Q?sTe0fUAJn4cnpWnuGMlFzicbjvkwSOdIh8h5SaoNFLmr8V7RHe1jvL9c1n2e?= =?us-ascii?Q?7dmg/be40tT9EJyM8b20Sr3SQeLUvyOc1gZpg6BNPxog/5laX9+JRdvsfclv?= =?us-ascii?Q?4In28ZslJ4nDCopQrM1Y7cYLbJeofKDmwV9g/SWGEFNGzvNakAvQM5DbU54l?= =?us-ascii?Q?EU6p8YxARZLylKsPceuSBRVWGLoIdFKUoQgXj1pmOCjyOCFspTSKeCbDBLxF?= =?us-ascii?Q?uCm+68JlNxEMNXm2xK0cT5HZ+8r6ZqPIvnPz51YRTax79pqjehkSMKz9f99I?= =?us-ascii?Q?43Ki7jFQi21PUiohaJhVlCXNhSk+cOHkl0fOJk5qK8XSlkHjQ1INX5A2JUNO?= =?us-ascii?Q?11SiFDSKfygHAac9b0O9vtUo3a4qWjJW/HCpxv7qctMAGjQkhc9CVV9jGoEN?= =?us-ascii?Q?Hy8+XmmriA8xIEcl0Oe5POJw2S8vBHyFKOgWCnu4cGnWCt3tF3OhPwi2Bp3z?= =?us-ascii?Q?OXEvVkXoHLBI/MZjoTTpqx10SKsGGpplHBiC/2rAKZV3y+13bxGKVyUZK0r9?= =?us-ascii?Q?U+zFLQrTcSuMjxMFVUMNNp4kPoPT0ZGZx9AdTFNjFY5KiVr5rRBQq5O92CU7?= =?us-ascii?Q?UKYZMrPNbDhtJE2lMyupRwn0K4yT/xWD2y0pZ3ortbUKahNKBQ5KpBi1WSdW?= =?us-ascii?Q?1m9jPkEXh+OSZ+tF6wdyuD3SgWfuPnxyeQXAiZcVvrR6O/2LItXZm4UnGeLZ?= =?us-ascii?Q?mZljWpjYiYGaGtIF00NkPF36Gn+4nsZdOdzT1R1xLQ9tFb9O90uyZdTrNzbu?= =?us-ascii?Q?wSatvxp7Psw1Mru+89tlnqh7pWZGeN4OK+H8NOuIJm3OHMOMj3apuhXs8AHx?= =?us-ascii?Q?WjNN6YjKcLUn9koBXj5fPsqW+zubeOePsRKa2BVeimGZJi54wYZMcn5D8CNI?= =?us-ascii?Q?OdR+ONbNeaEX9Pcxq+OF59rxHZYG6fJZ/8ES37+Rmr0h3SIe5Wc8+6ZYvdmG?= =?us-ascii?Q?Ue1YFM8+j80SW2HVGsSAir0BY0cW/NJILViVpzssGMs1Pya2jIkbbjdtfxDH?= =?us-ascii?Q?l4qOoFnv2tW9EluV83tJmMZze1oeUZh87GhU324CSOZ0P+6O6i7sJq9zRZnK?= =?us-ascii?Q?UUJjbsMtH1rxqbehdYoUD/m/O6DyS36H3UUmHtq3y7Lwm2dwHldBc5Si/Ger?= =?us-ascii?Q?vQWqlm7jcCPih/X1Pe2W9Laiq10VDtwcSPAtsdc+K8i/5oV+MP61uPphMtm3?= =?us-ascii?Q?GL02/uC66p4tO7XQCwngx+COGDgOEp8OCghDPbzSyRUFd5XxZ/Kd1cCXBAuN?= =?us-ascii?Q?src0s2iJuLArYqEdvZ64inp63zYGgWwN8+QJ7+FTqpqCcqcH7LnJn3PWvKs1?= =?us-ascii?Q?iL7Xxb755/1SGZUyAUuVoYjb13VMfIzHhaCsa5yBRZt2Szo/JiPjEjw2KoZ9?= =?us-ascii?Q?WOFV86KwKfiZdoyTM+lAHHL/AlpPTdxtDfE/COGxjRpu6Sz7BbnFR5lPADn4?= =?us-ascii?Q?YuiogVUhR+kMvD3zdKUqMnzH0p1tshORdI2zmJ360yVsmOLAEDXsJMo9QeHt?= =?us-ascii?Q?vi+CfyztWjQPhBMUwg0oO7XfCY4h48t2tGme7sQq?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 443d6361-0025-43d4-4550-08db45628832 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 07:56:09.8868 (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: kesQhwxwJssqMdzb+z6Hdwdv7YaDYt5aYGZ0VnbVY4GVzhqXS3B10lbOfPC+wI11ouyR14WtpOwn9QScpk2BcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9366 Content-Type: text/plain; charset="utf-8" To align with what is done by the in-kernel PM, update userspace pm subflow selftests, by sending the a remove_addrs command together after the remove_subflows command. This will get a RM_ADDR in chk_rm_nr(). Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Fixes: 5e986ec46874 ("selftests: mptcp: userspace pm subflow tests") Link: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b3cbcf27fec1..878acfcdba58 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -925,6 +925,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)) @@ -3137,7 +3138,7 @@ userspace_tests() pm_nl_set_limits $ns1 0 1 run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow chk_join_nr 1 1 1 - chk_rm_nr 0 1 + chk_rm_nr 1 1 kill_events_pids fi } --=20 2.35.3