From nobody Fri May 17 06:07:36 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2044.outbound.protection.outlook.com [40.107.249.44]) (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 6C55C634 for ; Mon, 28 Aug 2023 04:35:24 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=npPxSxe8zENi/njguUd2/MUF97gYUI/Arjw9NVP0xks73sJAEmKSf+IVsu8eH/SeEa/XOLtiERTQHSXeACnrkelYEgILj4Kmyml6iFAlHnq9TaUdlcvaEyas57ljaUc2qnnfNhIps1J0em+MzuVc2byMdQwJqmnVmrjrPd9fI8y4ssSJDzV5n7+ZB79qGOIlJjo5GKVXsFog9TryjK7Jn9drJ3paAWLcz0AmFCTmtuQbrR09nBEKKGTZCF5lXtI66P65nGE/HdCBQ6P/tYKPdyzFFiyhgov/dvO1HAps+IQlzho0x2In4NF6OaDqox35A5JEFY3wl9Yh9K6J51HxPg== 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=nR1OPqU6gXFlwK7zO5nLsEz7TgE70MHii4ubpmYAoMw=; b=koc8Y0MjLaYSeiEzUzcmMwDdUEuChd5JLOdsm+xIzn+xSepEQu6Z35IBMXc56lv5OyRd46uOz/GktEs2VVTiqqFpCdYiyp0O+f3DdaIqRtxxQpbWJGBqiR+8tuWbU0TLowdIGRylf0Nc32XYSe5nh860zTj5TY6X9E+D0u6Ddx6MzY9w+EqkwVVw4ecgUlw9sOIbbzd3u4pPXahnxHv5vAArdM5FOLaGnoUd8U0lQPi3MgsaAQhsLt3KhwcjSkyacW5EmDUMZwb9+y+nBrfkk9ZR0rrhTSBkYZQEhUCWwXSumTZ2uxDs/CU/IJW1/43W734XkHcz9Itv1pftoS0Mvw== 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=nR1OPqU6gXFlwK7zO5nLsEz7TgE70MHii4ubpmYAoMw=; b=qlskIA05873aO70auWbqKF88EY2Y0hn/OYalzsnjfT7XIU9D4mfzM4aXa+zzbKnRa6PakhCof6ulgZt8T7G7CNivosyfhIiKmdHNsHsBWgHBzQvGkuJk1pjgFcxl29pTbs9X9RLUh5SeGxGH7AsMMZCBgXweSZ1cEGOUMQx0g6DqQGuMumy27vWA/cyNdFgPkhY70Q5GYDwLNu8Hu2/m5FUj6sHW3iVqmXAz2rJJR8YoFHsHqz3Vw3FRXuqBykKyfpIBsF/66FXZRAxl+2STQipESA1zEnD3Byxy/Q4PXFWoNDa6H0tuwQGc7k8tliuW4d8JkGzAUCRGznx3oGkjkA== 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 DB9PR04MB9554.eurprd04.prod.outlook.com (2603:10a6:10:302::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Mon, 28 Aug 2023 04:35:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6699.034; Mon, 28 Aug 2023 04:35:21 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 1/7] selftests: mptcp: add evts_get_info helper Date: Mon, 28 Aug 2023 12:35:23 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0138.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31b::13) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DB9PR04MB9554:EE_ X-MS-Office365-Filtering-Correlation-Id: c5cde2d7-45b1-4158-ae59-08dba7803052 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2ggO9Jam7/Ftpasvpysa6zYau5skBJvcuwSr3BkSxs2l3UuM20nhMa1UAY7hZ26iQoOwQdS6l6oWfuR3RpL/pDUdOQ3V4mCLa+PfM9DOHiOcYvkSpxhsHZ5QxXup/plR7x/AnUhFv0zQT4iSFtjLIZTuGCYBpoZlnbG6LhxUhkh0ot2+EEye439uapc1L4nNGqapfSDpHkkt/DxymG3F06WgGxqO3pwNfv7K6yGLC9JxrmAOCE0cgWlOjW99Eda+Oab3pqjLCo/CtP34duO1sel0cSxqwmp3+aAzJM8OpcQ3vn3O7uS+mNNjj125OIWMr+LAz5eguEneESK8q7lIOxdCEbtWAQWNne1R2xPvzdmUuW5KFCJsfJ9PoAUh9elbjacgH+Z5gJDIromyxB3YIUD5VS1/q40kpx0PHxmaCOgSpeqNnybzHGvsbOTscSxlZBC3X4kwgGXRI7MlWLlwJhSrjIN0Gw0XuZpYh+8vCANeQrGrOU+oYekEygGEHiTTj5jsVH/u1DtA4aqg1YFJSJivBAZFGuBDv12sLJa5coQrYdicYgTvmiw4oZyazJOD X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(366004)(396003)(39850400004)(346002)(186009)(1800799009)(451199024)(41300700001)(38100700002)(86362001)(83380400001)(478600001)(2616005)(26005)(107886003)(6512007)(6506007)(6486002)(30864003)(36756003)(2906002)(6916009)(316002)(66476007)(66556008)(66946007)(5660300002)(8676002)(8936002)(4326008)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yrn0TbRLuLcs26QfJ7Ffg7HLVW49+MQfb//ucM+lgDdYg4eFvoPpyxqOYH7/?= =?us-ascii?Q?YYMcGdxWTFm0FAMal6T60HvAyj4UE8CC96EpXZBu42Li0GLIGoczVrxg6h1U?= =?us-ascii?Q?4P8TPjC+jce/6LR0Xv5x1vp+MV/90zrqz+I6+ocTyaMMYDjsEfqaHTRzTjpA?= =?us-ascii?Q?GcusURQMjWXpM4FbnC2rJkoEkwNIRU8muTyHnGz+8pDI4qs48Ll033dIL10+?= =?us-ascii?Q?NHcSjPcqL+uvCcCDfGvwswzdJtoagDRyP83bqymrpRSX2Gnb/liMCm4Si8f2?= =?us-ascii?Q?12NqbaRmcFUuphkxMuDGDS31RGgmauaOt91796TbCFnfeaR1yJxx1UzKLD8i?= =?us-ascii?Q?SP0U+koIYcgM5n8TtgvZpDeT5E0gYX9TeQgmsYS8p++Zg+TQ3KCOMoJoriue?= =?us-ascii?Q?dkzGYXq3n6+lADbluCsYmobt/99tjKA8ay/U9AUYRECs3K+LwjLP4qLbhrRg?= =?us-ascii?Q?zUgtUzC+BgI05I5/oh+vDvxBduQ3xiCoXsL9NfXwrce93UhVzFjQTprGTwFp?= =?us-ascii?Q?k+/0w1cQnB+ohWCurjjqx9H3QIwx8aAbo+FvzdntLI57scrPeW6HHo5JX/c7?= =?us-ascii?Q?3z7zdYfb8yfHeO6Y7V6ha9vCKZrCtmFeMx1BahbKayx7zIwcZqzJK51S5BMc?= =?us-ascii?Q?LVyMaNIshWoaDexIEXIM0HdrS6YyWcG5MwSnbYkKn0YFQf25P6KBH3tTnTFY?= =?us-ascii?Q?WNI247R1apMcaCYxHuJKU6UY0YyDxiR49vn+qDVDgNwfx+1UeO+uq4uH23M6?= =?us-ascii?Q?5j3i4pT6qe+rhBiJpXu5nFr5d8IH3Lmc2f7kvNMyqrjDHv4c7bQR2TPRH+UV?= =?us-ascii?Q?dg7uekYzXNQLT/G36qBsacya+T70SHuItsSzfYJQyMAvHltmnSkQc/GLVtN6?= =?us-ascii?Q?Gks/bKe5ZAzmIJ/r34KZbbayGtjFY77HXxo8i71SQ/T3wmD3TE+KESUU6bQo?= =?us-ascii?Q?e6Ikr9sEWEQZ58c4YuVkORcyR3l834d7jb7FASqWrzM2Vq2zXwL9j5pP4kLN?= =?us-ascii?Q?hG4rQ6stvgYnP3LAgkrWYSToFn1KOMwVZJamuEkwjPewvZ0AuqXJ8jxizjsU?= =?us-ascii?Q?20spXKPcyVokROsZoQKzztkT73KwsmXCsjZyj+yk1hx50KroFm/U+kwANjaq?= =?us-ascii?Q?l2Wjso80aF6gr+z3P3v7nteuPAUwdnngdMIJhBFdput9MjMbRe+clYk9Kx94?= =?us-ascii?Q?zDKNXEyPWKjTbL7RvxQyamVYOIHcTgfANtaYcy+1GdsCOiLQo5ylnRNRfpCo?= =?us-ascii?Q?j4uUVLgEpwzAtJorhoqNIyQf1PdYbXuL+0pG0zL0AbIzTveWq2IMw8bSpj6q?= =?us-ascii?Q?dKMMpptS66qjPPdyd2GLO4s6BsSb4ng6kykyWb31ugdR5CREdRE8iEFu5PS0?= =?us-ascii?Q?ASyVD8PDuxpKHxN6aEYaHyHKnDsqV/e7WaAbzn7P8iwpE3II5b+CQ39ivmat?= =?us-ascii?Q?M1O55HyMnSRt1kMBU6/GDbztzODP45lE6BsamIuil/+vkz6jogVUeEoW3O4x?= =?us-ascii?Q?lh8kUHqO9TCDdH42M0kde0xjA6vZk4HbJ3LL7JQNoTxVQuLK9b020cs1oVcq?= =?us-ascii?Q?aa4MRTBRnpapp3I2O/hGrsO1RG0xKhx4mcNamsbn?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5cde2d7-45b1-4158-ae59-08dba7803052 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2023 04:35:21.4986 (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: vT5vw2XDz1NdFfRHd/zzFl2uWS8Hrdnd4p8dPR2iJcYhP6e6CwRBEL+afkJ696l1LprGDHCpbPHR5JfavvG/Ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9554 Content-Type: text/plain; charset="utf-8" This patch adds a new helper get_info_value(), using 'sed' command to parse the value of the given item name in the line with the given keyword, to make chk_mptcp_info() and pedit_action_pkts() more readable. Also add another helper evts_get_info() to use get_info_value() to parse the output of 'pm_nl_ctl events' command, to make all the userpsace pm selftests more readable, both in mptcp_join.sh and userspace_pm.sh. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 19 ++-- .../testing/selftests/net/mptcp/mptcp_lib.sh | 10 +++ .../selftests/net/mptcp/userspace_pm.sh | 86 +++++++++---------- 3 files changed, 57 insertions(+), 58 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ee1f89a872b3..27517ba770bc 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1862,10 +1862,8 @@ chk_mptcp_info() =20 print_check "mptcp_info ${info1:0:8}=3D$exp1:$exp2" =20 - cnt1=3D$(ss -N $ns1 -inmHM | grep "$info1:" | - sed -n 's/.*\('"$info1"':\)\([[:digit:]]*\).*$/\2/p;q') - cnt2=3D$(ss -N $ns2 -inmHM | grep "$info2:" | - sed -n 's/.*\('"$info2"':\)\([[:digit:]]*\).*$/\2/p;q') + cnt1=3D$(ss -N $ns1 -inmHM | mptcp_lib_get_info_value "$info1" "$info1") + cnt2=3D$(ss -N $ns2 -inmHM | mptcp_lib_get_info_value "$info2" "$info2") # 'ss' only display active connections and counters that are not 0. [ -z "$cnt1" ] && cnt1=3D0 [ -z "$cnt2" ] && cnt2=3D0 @@ -2828,13 +2826,13 @@ verify_listener_events() return fi =20 - type=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(type:\)\([[:digit:]]*\= ).*$/\2/p;q') - family=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(family:\)\([[:digit:= ]]*\).*$/\2/p;q') - sport=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(sport:\)\([[:digit:]]= *\).*$/\2/p;q') + type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") + family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") + sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(saddr6:\)\([0-9a-f:.= ]*\).*$/\2/p;q') + saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") else - saddr=3D$(grep "type:$e_type," $evt | sed -n 's/.*\(saddr4:\)\([0-9.]*\)= .*$/\2/p;q') + saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") fi =20 if [ $type ] && [ $type =3D $e_type ] && @@ -3229,8 +3227,7 @@ fastclose_tests() pedit_action_pkts() { tc -n $ns2 -j -s action show action pedit index 100 | \ - grep "packets" | \ - sed 's/.*"packets":\([0-9]\+\),.*/\1/' + mptcp_lib_get_info_value \"packets\" packets } =20 fail_tests() diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 92a5befe8039..def35395a254 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -207,3 +207,13 @@ mptcp_lib_result_print_all_tap() { printf "%s\n" "${subtest}" done } + +# get the value of keyword $1 in the line marked by keyword $2 +mptcp_lib_get_info_value() { + grep "${2}" | sed -n 's/.*\('${1}':\)\([0-9a-f:.]*\).*$/\2/p;q' +} + +# $1: info name ; $2: evts_ns ; $3: event type +mptcp_lib_evts_get_info() { + cat "${2}" | mptcp_lib_get_info_value "${1}" "^type:${3:-1}," +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index b25a3e33eb25..2413059a42e5 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -247,14 +247,11 @@ make_connection() local server_token local server_serverside =20 - client_token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\= 2/p;q' "$client_evts") - client_port=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2= /p;q' "$client_evts") - client_serverside=3D$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit= :]]*\).*$/\2/p;q'\ - "$client_evts") - server_token=3D$(grep "type:1," "$server_evts" | - sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') - server_serverside=3D$(grep "type:1," "$server_evts" | - sed --unbuffered -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q= ') + client_token=3D$(mptcp_lib_evts_get_info token "$client_evts") + client_port=3D$(mptcp_lib_evts_get_info sport "$client_evts") + client_serverside=3D$(mptcp_lib_evts_get_info server_side "$client_evts") + server_token=3D$(mptcp_lib_evts_get_info token "$server_evts") + server_serverside=3D$(mptcp_lib_evts_get_info server_side "$server_evts") =20 print_test "Established IP${is_v6} MPTCP Connection ns2 =3D> ns1" if [ "$client_token" !=3D "" ] && [ "$server_token" !=3D "" ] && [ "$clie= nt_serverside" =3D 0 ] && @@ -340,16 +337,16 @@ verify_announce_event() local dport local id =20 - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") - token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") + type=3D$(mptcp_lib_evts_get_info type "$evt" $e_type) + token=3D$(mptcp_lib_evts_get_info token "$evt" $e_type) if [ "$e_af" =3D "v6" ] then - addr=3D$(sed --unbuffered -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q' = "$evt") + addr=3D$(mptcp_lib_evts_get_info daddr6 "$evt" $e_type) else - addr=3D$(sed --unbuffered -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$ev= t") + addr=3D$(mptcp_lib_evts_get_info daddr4 "$evt" $e_type) fi - dport=3D$(sed --unbuffered -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") - id=3D$(sed --unbuffered -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") + dport=3D$(mptcp_lib_evts_get_info dport "$evt" $e_type) + id=3D$(mptcp_lib_evts_get_info rem_id "$evt" $e_type) =20 check_expected "type" "token" "addr" "dport" "id" } @@ -367,7 +364,7 @@ test_announce() $client_addr_id dev ns2eth1 > /dev/null 2>&1 =20 local type - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= server_evts") + type=3D$(mptcp_lib_evts_get_info type "$server_evts") print_test "ADD_ADDR 10.0.2.2 (ns2) =3D> ns1, invalid token" if [ "$type" =3D "" ] then @@ -446,9 +443,9 @@ verify_remove_event() local token local id =20 - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") - token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") - id=3D$(sed --unbuffered -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") + type=3D$(mptcp_lib_evts_get_info type "$evt" $e_type) + token=3D$(mptcp_lib_evts_get_info token "$evt" $e_type) + id=3D$(mptcp_lib_evts_get_info rem_id "$evt" $e_type) =20 check_expected "type" "token" "id" } @@ -466,7 +463,7 @@ test_remove() $client_addr_id > /dev/null 2>&1 print_test "RM_ADDR id:${client_addr_id} ns2 =3D> ns1, invalid token" local type - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= server_evts") + type=3D$(mptcp_lib_evts_get_info type "$server_evts") if [ "$type" =3D "" ] then test_pass @@ -479,7 +476,7 @@ test_remove() ip netns exec "$ns2" ./pm_nl_ctl rem token "$client4_token" id\ $invalid_id > /dev/null 2>&1 print_test "RM_ADDR id:${invalid_id} ns2 =3D> ns1, invalid id" - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= server_evts") + type=3D$(mptcp_lib_evts_get_info type "$server_evts") if [ "$type" =3D "" ] then test_pass @@ -583,19 +580,19 @@ verify_subflow_events() fi fi =20 - type=3D$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$= evt") - token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") - family=3D$(sed --unbuffered -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q= ' "$evt") - dport=3D$(sed --unbuffered -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evt") - locid=3D$(sed --unbuffered -n 's/.*\(loc_id:\)\([[:digit:]]*\).*$/\2/p;q'= "$evt") - remid=3D$(sed --unbuffered -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q'= "$evt") + type=3D$(mptcp_lib_evts_get_info type "$evt" $e_type) + token=3D$(mptcp_lib_evts_get_info token "$evt" $e_type) + family=3D$(mptcp_lib_evts_get_info family "$evt" $e_type) + dport=3D$(mptcp_lib_evts_get_info dport "$evt" $e_type) + locid=3D$(mptcp_lib_evts_get_info loc_id "$evt" $e_type) + remid=3D$(mptcp_lib_evts_get_info rem_id "$evt" $e_type) if [ "$family" =3D "$AF_INET6" ] then - saddr=3D$(sed --unbuffered -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q'= "$evt") - daddr=3D$(sed --unbuffered -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q'= "$evt") + saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" $e_type) + daddr=3D$(mptcp_lib_evts_get_info daddr6 "$evt" $e_type) else - saddr=3D$(sed --unbuffered -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q' "$e= vt") - daddr=3D$(sed --unbuffered -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$e= vt") + saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" $e_type) + daddr=3D$(mptcp_lib_evts_get_info daddr4 "$evt" $e_type) fi =20 check_expected "type" "token" "daddr" "dport" "family" "saddr" "locid" "r= emid" @@ -630,7 +627,7 @@ test_subflows() kill_wait $listener_pid =20 local sport - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$server_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -668,7 +665,7 @@ test_subflows() # Delete the listener from the client ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$server_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW6 from server to client machine :>"$server_evts" @@ -707,7 +704,7 @@ test_subflows() # Delete the listener from the client ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$server_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from server to client machine :>"$server_evts" @@ -745,7 +742,7 @@ test_subflows() # Delete the listener from the server ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$client_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -784,7 +781,7 @@ test_subflows() # Delete the listener from the server ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$client_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW6 from client to server machine :>"$client_evts" @@ -821,7 +818,7 @@ test_subflows() # Delete the listener from the server ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$client_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -867,7 +864,7 @@ test_subflows_v4_v6_mix() # Delete the listener from the server ns, if one was created kill_wait $listener_pid =20 - sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$client_evts") + sport=3D$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED) =20 # DESTROY_SUBFLOW from client to server machine :>"$client_evts" @@ -933,18 +930,13 @@ verify_listener_events() print_test "CLOSE_LISTENER $e_saddr:$e_sport" fi =20 - type=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q') - family=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q') - sport=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + type=3D$(mptcp_lib_evts_get_info type $evt $e_type) + family=3D$(mptcp_lib_evts_get_info family $evt $e_type) + sport=3D$(mptcp_lib_evts_get_info sport $evt $e_type) if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + saddr=3D$(mptcp_lib_evts_get_info saddr6 $evt $e_type) else - saddr=3D$(grep "type:$e_type," $evt | - sed --unbuffered -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q') + saddr=3D$(mptcp_lib_evts_get_info saddr4 $evt $e_type) fi =20 check_expected "type" "family" "saddr" "sport" --=20 2.35.3 From nobody Fri May 17 06:07:36 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2042.outbound.protection.outlook.com [40.107.249.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CECF1634 for ; Mon, 28 Aug 2023 04:35:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RTJg8He3Dt43H5Qdg+BO0uPQJaTfaNY/H7SUNWRxDTOz3ldj0o+h/udQDhD8rvO64m2m21w0pzIi042lTMlE2FH8pWk62uJvHHkDTf54e4O5jxG8bG1UWOfVuKc0AYuDSWHPkuw2KJfVnnXjE4yizkjJ8CaI/VoVAnAwG+dTJk3nrM7g5Relb7HXhfg4A+HU4WV8+/QifeyKGXZ1sLWRJmnw/PAo7BwAetdkkZTQ3i4m1HYQmr9181EWAZyGhMcFM/mvNFMTU/I7C67N6sRvsBVC01Pvwoxrg3reMk0jY5EgtCnwmv9cEFfQjoR5QnWVrTwVVviL6YyiWbsW3lwe5A== 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=30jQk7COxHDLboAs8epQWAdHgNzUOIQtcJ5xZ11VfOw=; b=FWyehNoHE74qkuGUGmOsg/zBSVx6crcTjGMB1drjFtQXkKh95ENaydlO5Nclfh4uQher69DPLBlpxJdcKs5mh1vfdTYBlbZIEt4KIBLoGZpg6TclD/QYKm83Y9eruGl+7CvWjMdLn7ePAkCmqwpGfH/pYCwPTg0X2GT0MNmhRFf4ZJP2ZyGLVaErm1AfmUSVbcvYU+YxZCOewWq9If/N737nJgjGzgMM6nGNsPOYXgUE4RCnqzOp9uB4+5NX2teMYQF56VkWE7R3AItSEvjdsrrWa8bzFzOMzrD4h4scaU9u+DEm7uEcKmgwltpuAEoy2wC3YO0MuQXr3ktrYJwJxA== 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=30jQk7COxHDLboAs8epQWAdHgNzUOIQtcJ5xZ11VfOw=; b=jm9AXNUEDq4zXwWOBr85z8lPnaO1vesaV+lyReGUgNEmSVtwm/xqZ36JX3lNDEADz/1qDD/eNx3xTg+TRYDGrYFTyZpCQ3vWGuGQFfffjlSMQQiXzICmcXvW5iuGYMR680QoSQMjSUn5JtGF4UXUAoilAKa45mR/Lc1fuMJY9jFxoKZtU4pey+kWGvrtasmY1wc55ZhpKp93YpRv+MqHNnymToy/4sQllLcQi/HjBFHrP8Vx3BOClREAvKnl5R6yHomzgGAohJNHWCvQj8h3El/H/HtzR511v46KoJs/We5DG0OB38jE7oMjH7i58lHWDb/toAZnKVOspPyh3woW1A== 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 DB9PR04MB9554.eurprd04.prod.outlook.com (2603:10a6:10:302::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Mon, 28 Aug 2023 04:35:32 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6699.034; Mon, 28 Aug 2023 04:35:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 2/7] selftests: mptcp: update userspace pm test helpers Date: Mon, 28 Aug 2023 12:35:24 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP301CA0022.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::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_|DB9PR04MB9554:EE_ X-MS-Office365-Filtering-Correlation-Id: 24546771-1cf9-4be5-df3f-08dba78036ba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e3XhmGut68cSJ3XYVgZ2CdR7NR1lF6UTMoUALHCiLOIaRUTpZarQjld2+jBHRFbYEYBzAhA+vxvnt1SvUD7PZcOf35u6JiDWcMI873Sla1pbezFrbGFq6nhVOd/UF31nclkfm4ja40gVGItL1xGT8Ko/1BWFsvvERb2FuBBfDOpcPq0VQoYqaHrKok706Z88ZZOoAfXEJsM3U0dtUAzYKBnxjV2aJpAEmFMML6CNBkVatbyak06utEuAoTQ5DEfQfr9zEtnpBnnLH6k2JwMQ3XoTgP2LV/7Erhv3pGmjKH0yPOGOAqKisUNi4EK3Lw1WTw8IzDhJS3xo8DnRD8lG6R5uEXSfP3FAOPbZPJeCG+qFvjE9TEQt2QniKZc+kr14+tqujXK6hQy6A6WvAjBg2cTP5DnGcegGX9P6MqKl6b8qgjStojJ5HZczpqakDcZKMcM+WTKq8O86pt4xDbCC8oXxj3hAygYwH7bCM95sffdHoeyTkKzm3NycjCi9lz9B8PGkYnYpdJl92PBK9GmX7sIFnkfKpre2PPlUhIzeGKlZ7c4rreoD/1iH3ft/6lUv X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(366004)(396003)(39850400004)(346002)(186009)(1800799009)(451199024)(41300700001)(15650500001)(38100700002)(6666004)(86362001)(83380400001)(478600001)(2616005)(26005)(107886003)(6512007)(6506007)(6486002)(36756003)(2906002)(6916009)(316002)(66476007)(66556008)(66946007)(5660300002)(8676002)(8936002)(4326008)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d80PxZM9aytVnBaSbq/iFQESwODT989Uv+FcwVsw2fm8iBXnc99MXcYbQ5j5?= =?us-ascii?Q?MqSGCSOfsLRQzVY0rB/iLeyJleFWoUHXUi4GBPEF8nPX/gVyQSFVt+1YlD/F?= =?us-ascii?Q?A0NpdL+M2ICNQUzYHhidglM1PNBdCBaStz35Sh9IUjm1ddX9yX9vH0xOrG7r?= =?us-ascii?Q?qw+hq4bCBQMhqOtbskhk/VYekXS+cBi9klldz8fiMivbWqvK76BfylNCp0kZ?= =?us-ascii?Q?ZE3jRarP0UifZwB3naAl0y5x81vn9V28IoghjOPXjbAzD5TsSF+BfXqoOdKw?= =?us-ascii?Q?TBeh0PjFnxomvbl5um3g5YXbFlX0KPpuyPj/Dt3djtiKtZrbnFKAp8dICZGk?= =?us-ascii?Q?OikfUgY8qq4mYorUpLNIK/LAeKid8gbzEUursj+2+3TLN0kvyrzLJ5ZGFvxL?= =?us-ascii?Q?gMi2TPyVRYH7RhdxgTGGI4qmdzroj7qoz9Bk/t8OlEbDAUvFbIOspd/CFlFb?= =?us-ascii?Q?7W1Qpd83RvR/9louFdXv32NXxOcOW0a9gBewE+aTYcuuU8xZfgWU9Kkgmsrg?= =?us-ascii?Q?e+pkKY4ZXUp9k1lDCM8/G7xbBw8Mu8nqUCyZwfN0MhSa0aEC4nTLonBs7ROU?= =?us-ascii?Q?7JkjP4RosyINQ3Ne8XJSNKiIPE14CBzIY01HN5jlXLo69hzbeEQBRh5w9Ew0?= =?us-ascii?Q?CDsYhWaD2HR+qpyG4MZLgm/LrwMSLYupS/jPPt6kjkYFj81Qz+H/fYKxLX7H?= =?us-ascii?Q?WCAzG+7i/j9tnIV1NQ9nAxLbszlcZmxxnCroyXIvw/c3pIX1G7k2MboJlA+6?= =?us-ascii?Q?4xgQXDMBWDZtcVwvDY8XveBbbQU5+G9GzDL1I+aBtCCZFPKQ6w3zignQmF6d?= =?us-ascii?Q?TI4QS3wxemcYg92Kb66TuYRQFWN+nf2ZLLJL8IdFWV9KWOYDVXF7uF7EiIWm?= =?us-ascii?Q?H8ugIEZCHZuhrUsxMPP//9ZkE6lhO1+2f/qJ4/Qh18p28PKaFZ1TGYgAwhQ8?= =?us-ascii?Q?sV/SSFMUE9IBRvoFP3zwdj3/DjdjTkjnIAGEih26Wd5K5pmHH+PRT2XHE8R8?= =?us-ascii?Q?f2FXsc7toeYQ3htLZ7YhXqtn9uHhuUzoB4Hfts4HNy1VNMeUNoyWuz7RZ9Cv?= =?us-ascii?Q?o9VYcixPh0GBN80A7/51C4v5Fq7keLTemqWfiGwlgSpM98UqumZOahFg7Gbs?= =?us-ascii?Q?X1OJx6yFl6GUjRDDCK+x4JFR+0dM91mW+0pZBzTNpKC2/IQMeqtr3pJrRExs?= =?us-ascii?Q?lp9Cx2+FvUk5FV2jyk7CWXghmMGvSnR5f2kpx1vMAN2bAvBMzhwHtXneXd7e?= =?us-ascii?Q?Xx+MlrNoRyS2mXf1mgmXqepWvVon0L9lkSSu1TgdMhxrmU/tRCXsjBcfz/aC?= =?us-ascii?Q?iqdMCR4jVhQ43Dgs63+/BV/D5ojy6Hi3OhklNDx0UttefVYKt3flbMPZpP+C?= =?us-ascii?Q?0Xfl7oYyuUy7x3RXttS049JSnDrN8t6p0i66W5LQr1bVLqdwb40g4Cl2lNZt?= =?us-ascii?Q?wZeanOYjeDCB9q4WNzhJ+wreyDe2mWWZ7ScdaSRouqF9kX0LIMig7QvYHSBO?= =?us-ascii?Q?pMoCiQ0tPoS1cCTo++eNDD79mB+X1tEOBI9RySp4tpbdbYO0ERV0t/v2FbFI?= =?us-ascii?Q?8MpscvPNZe9uALR3VLp+WdijjEsceEPclyvIVQXW?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24546771-1cf9-4be5-df3f-08dba78036ba X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2023 04:35:32.0825 (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: 2VeeP3l1kXqU5by0r7BSuOiixqEEhF3frLhIebk6XcLAI2qwo2AmEh/mGuk2XDyOV5eUDWxdXjNMVWbjWwmOkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9554 Content-Type: text/plain; charset="utf-8" This patch adds a new argument namespace to userspace_pm_add_addr() and userspace_pm_add_sf() to make these two helper more versatile. Add two more versatile helpers for userspace pm remove subflow or address: userspace_pm_rm_addr() and userspace_pm_rm_sf(). The original test helpers userspace_pm_rm_sf_addr_ns1() and userspace_pm_rm_sf_addr_ns2() can be replaced by these new helpers. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 95 +++++++++---------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 10 ++ .../selftests/net/mptcp/userspace_pm.sh | 10 -- 3 files changed, 54 insertions(+), 61 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 27517ba770bc..983fe4446523 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2792,12 +2792,6 @@ backup_tests() fi } =20 -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 - verify_listener_events() { local evt=3D$1 @@ -3252,69 +3246,66 @@ fail_tests() fi } =20 +# $1: ns ; $2: addr ; $3: id userspace_pm_add_addr() { - local addr=3D$1 - local id=3D$2 + local evts=3D$evts_ns1 local tk =20 - tk=3D$(grep "type:1," "$evts_ns1" | - sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') - ip netns exec $ns1 ./pm_nl_ctl ann $addr token $tk id $id + [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + tk=3D$(mptcp_lib_evts_get_info token "$evts") + + ip netns exec $1 ./pm_nl_ctl ann $2 token $tk id $3 sleep 1 } =20 -userspace_pm_rm_sf_addr_ns1() +# $1: ns ; $2: id +userspace_pm_rm_addr() { - local addr=3D$1 - local id=3D$2 - local tk sp da dp - - tk=3D$(grep "type:1," "$evts_ns1" | - sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') - 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 $ns1 ./pm_nl_ctl rem token $tk id $id - ip netns exec $ns1 ./pm_nl_ctl dsf lip "::ffff:$addr" \ - lport $sp rip $da rport $dp token $tk - wait_rm_addr $ns1 1 - wait_rm_sf $ns1 1 + local evts=3D$evts_ns1 + local tk + + [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + tk=3D$(mptcp_lib_evts_get_info token "$evts") + + ip netns exec $1 ./pm_nl_ctl rem token $tk id $2 + wait_rm_addr $1 1 } =20 +# $1: ns ; $2: addr ; $3: id userspace_pm_add_sf() { - local addr=3D$1 - local id=3D$2 + local evts=3D$evts_ns1 local tk da dp =20 - tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - da=3D$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") - dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - ip netns exec $ns2 ./pm_nl_ctl csf lip $addr lid $id \ + [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + tk=3D$(mptcp_lib_evts_get_info token "$evts") + da=3D$(mptcp_lib_evts_get_info daddr4 "$evts") + dp=3D$(mptcp_lib_evts_get_info dport "$evts") + + ip netns exec $1 ./pm_nl_ctl csf lip $2 lid $3 \ rip $da rport $dp token $tk sleep 1 } =20 -userspace_pm_rm_sf_addr_ns2() +# $1: ns ; $2: addr $3: event type +userspace_pm_rm_sf() { - local addr=3D$1 - local id=3D$2 + local evts=3D$evts_ns1 + local t=3D${3:-1} + local ip=3D4 local tk da dp sp =20 - tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - da=3D$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") - dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - sp=3D$(grep "type:10" "$evts_ns2" | - sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') - ip netns exec $ns2 ./pm_nl_ctl rem token $tk id $id - ip netns exec $ns2 ./pm_nl_ctl dsf lip $addr lport $sp \ + [ "$1" =3D=3D "$ns2" ] && evts=3D$evts_ns2 + if is_v6 $2; then ip=3D6; fi + tk=3D$(mptcp_lib_evts_get_info token "$evts") + da=3D$(mptcp_lib_evts_get_info "daddr$ip" "$evts" $t) + dp=3D$(mptcp_lib_evts_get_info dport "$evts" $t) + sp=3D$(mptcp_lib_evts_get_info sport "$evts" $t) + + ip netns exec $1 ./pm_nl_ctl dsf lip $2 lport $sp \ rip $da rport $dp token $tk - wait_rm_addr $ns2 1 - wait_rm_sf $ns2 1 + wait_rm_sf $1 1 } =20 userspace_tests() @@ -3401,12 +3392,13 @@ userspace_tests() run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns1 - userspace_pm_add_addr 10.0.2.1 10 + userspace_pm_add_addr $ns1 10.0.2.1 10 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_mptcp_info subflows 1 subflows 1 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 - userspace_pm_rm_sf_addr_ns1 10.0.2.1 10 + userspace_pm_rm_addr $ns1 10 + userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 kill_events_pids @@ -3422,10 +3414,11 @@ userspace_tests() run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns2 - userspace_pm_add_sf 10.0.3.2 20 + userspace_pm_add_sf $ns2 10.0.3.2 20 chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 - userspace_pm_rm_sf_addr_ns2 10.0.3.2 20 + userspace_pm_rm_addr $ns2 20 + userspace_pm_rm_sf $ns2 10.0.3.2 $SUB_ESTABLISHED chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 kill_events_pids diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index def35395a254..644d732c64a6 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -8,6 +8,16 @@ readonly KSFT_SKIP=3D4 # shellcheck disable=3DSC2155 # declare and assign separately readonly KSFT_TEST=3D$(basename "${0}" | sed 's/\.sh$//g') =20 +ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED +REMOVED=3D7 # MPTCP_EVENT_REMOVED +SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED +SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED +LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED +LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED + +AF_INET=3D2 +AF_INET6=3D10 + MPTCP_LIB_SUBTESTS=3D() =20 # only if supported (or forced) and not disabled, see no-color.org diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 2413059a42e5..91a5a55b2e5d 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -23,16 +23,6 @@ if ! ip -Version &> /dev/null; then exit ${KSFT_SKIP} fi =20 -ANNOUNCED=3D6 # MPTCP_EVENT_ANNOUNCED -REMOVED=3D7 # MPTCP_EVENT_REMOVED -SUB_ESTABLISHED=3D10 # MPTCP_EVENT_SUB_ESTABLISHED -SUB_CLOSED=3D11 # MPTCP_EVENT_SUB_CLOSED -LISTENER_CREATED=3D15 #MPTCP_EVENT_LISTENER_CREATED -LISTENER_CLOSED=3D16 #MPTCP_EVENT_LISTENER_CLOSED - -AF_INET=3D2 -AF_INET6=3D10 - file=3D"" server_evts=3D"" client_evts=3D"" --=20 2.35.3 From nobody Fri May 17 06:07:36 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2084.outbound.protection.outlook.com [40.107.249.84]) (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 4B8CA634 for ; Mon, 28 Aug 2023 04:35:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kJW0CcDyiNEM/775szFYOvNysI6tbtWcIBdyCgyX0w2Jy/aH7hYxF8PyIw/5kat0mmJeLTEzFmaUKabblDXqtk1A1t4RahBauQhE3KSZnVJNOJXALIOz4UTld16N4sJxr9gCwvAW5Ts/Z2m9y23nRgvxE55je9G9xU46bAGbhRl6x89mVv7WQ0rw5WmjZDTr/EO8NNQjJibRPNH3E4Auux18im4gwdPVHzFUBhYhMqWYj8woAWiAQeX/fk++MkqER/qeVff9ngPWVFZwLUz4KUmhRWhzpWsEAZKk3IOo+mX3kgP19I8N5iiwJkiMAl7XUlTIUGUTsT2uacaVNPWC1g== 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=xux4nFgYCh/qOIMGMdOrHF1f3cDNm+P5c7yOsmDcPVo=; b=jmKgpQXDk8J81d/3QDnjUH3IqfbshNbb7A1um/m56p63WSmz1yM2k83wP9Z7swjh+dI0eH8DtT/YdECZ25Qxpkhb1YeD6CAmlPlW+HzPGZqfBa3oEe0Og56eu1+ud2duMceGcZ01JS80PB9uhiQFTsOhTRI/NkvLYCCdK8Cg/Duf8znG1+pdLVBI3kNUXw03ThEKMzsVaqFZYuTeX7npVW32C7vM9N1I1E+7UvAMAI+3q31O42+aaQ21FtFTLjsqRxvgTEZ2UplV9pyZoMNFERdqyl0Ve0A2gMQxM4WAA3neX1l8eRfzlorNjioSyFdE+aT/3I0ixZqlcyWCet5XSQ== 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=xux4nFgYCh/qOIMGMdOrHF1f3cDNm+P5c7yOsmDcPVo=; b=yc6w9+u7Nb0j9z3m4QtsuB5vDPTh2p+TOhBW1HPwmtcVjKOPyYp4IvlkfMbyQlt1bi6tjNEn55A7cEcNev/aXpO5KP72b4mD3jM+Fquj8npdpf6bxBALLKYREXzt9bxHB+ddxaN2NAh2t958+seAIcHgLpUB7O1D2vEr+/7yxOg9V6z5QmlaoN3YZwhvjhF/WZ/6S4UCc7qIGN6bkcM7hsWMrGMN3GOEv2f6rfeAnfhz9rHkVsfi4SEhpw2W2IA6NbBTiZeqxOhTcph1UCcJcwF/l/MyEQkTbRtRQTYWJak5+FFjNPpRCWLC61U48vCtTZ4bfEVV3v1Jbl7wKKSLSQ== 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 DB9PR04MB9554.eurprd04.prod.outlook.com (2603:10a6:10:302::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Mon, 28 Aug 2023 04:35:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6699.034; Mon, 28 Aug 2023 04:35:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 3/7] selftests: mptcp: userspace pm remove id 0 subflow Date: Mon, 28 Aug 2023 12:35:25 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0191.apcprd04.prod.outlook.com (2603:1096:4:14::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_|DB9PR04MB9554:EE_ X-MS-Office365-Filtering-Correlation-Id: df7f0992-6632-441a-ade9-08dba7803bf6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LLE+BeYoq+NKl887ik5yApH+MqpXf6psZwiupqKMjcybHT6m/djHZmqp8+IMXThgAHtDDIekJRuQFSI8hHQseEwERArNth1DbJJnJV8KgI0caKq+Cmb/nXzlpVNPKTcgpaABFIw0yQLIyyVcQXxdFRPG+jvO9EeIBe3mGedMPgnYYKjmGGjjuLfOq07JBgjjB+mU5qI6i4YWFVKZqVPmDLWECsO8Rt9iR0fiEHGVQrkVB2KKdw29D9Ptil9FVFPXdo5nrNFxydhRFUuGyppunLMIr8aLzDfJw8aaLkHHsKi9q98Mfedl4QP1HbnFM7AVxq2vCyRsRCYEoK7uirUAXJNbxbgJTGoDfk65uv5I8tRHjNlJOAXUX2yDHvr30zGc4NYrOCQ9w+pHzoYPCDQxgk9NEgNqbSBxgOS7lvv5kKyoGxs3PFldJ6Aki5oqD2XJOn4jlBYDdC2kDptIMwqjvbW0s5DVN2xhtwUgjw53YvMawIlzgBjOKKKbBb4Kk+uKpcb6On4Yt6REbr/WIeKBFeh16S/laYhPiuAEieloX/Y0DcsZmMzKTKNT9y3/cjoM X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(366004)(396003)(39850400004)(346002)(186009)(1800799009)(451199024)(41300700001)(38100700002)(6666004)(86362001)(83380400001)(478600001)(2616005)(26005)(107886003)(6512007)(6506007)(6486002)(36756003)(2906002)(6916009)(316002)(66476007)(66556008)(66946007)(5660300002)(8676002)(8936002)(4326008)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hecnHeQKtVEyV3bQIQiIsLocRYMX6n31Akv9MlY/xxmt3JHrkLszg31OUiVq?= =?us-ascii?Q?PJY7b6yEDgKAUteplYPw1Cl2OuECam7ZLg3ApNOmT95CDy+537T3XAL2sCYT?= =?us-ascii?Q?Suyr3z0UK9L2PXL4ku0R5FJCgYbQPSCEKj0FGY+haEGMzf+HcMukf+dVskbM?= =?us-ascii?Q?3F8HbcJfHYGdKv50IiuEW4nKHYgNDqMv0IEcw2N3mtcFcYRSlfZf5Rjj7xBS?= =?us-ascii?Q?j31I7P5OFLPkJQG/ruTrlY7uYIdSCnjXuIZ3tPkNAavNyPdeMN3/k1Um2IeU?= =?us-ascii?Q?oz9H2uD4uXu3KercFLtSZdCoJbXVY/DGqsUuGugnSgFJppAh6S8rvjs4PKG/?= =?us-ascii?Q?KMD4KmUfs7JMtnI+PX3oyz7GpJ5yf8Y+33/svmQltO9KbKPG3naRetmBfUKX?= =?us-ascii?Q?iO2RYSP/wra4/hMgDHtqT6XXCalhCpwB+cOEqgNK9F/r6m553hP6+OYt5D1d?= =?us-ascii?Q?rqSsl1CkY1je1gFBTHrGOvGNjWpChOL+7pn2tF7leRcBPAADIZacMYjsMjmn?= =?us-ascii?Q?Iu00/1VzIRMDyv53GugOHmtC2tfIH2I7KCPy870r6yWRB7iKHYEnH14Wqo/2?= =?us-ascii?Q?ezckzxqti+EF4Qn3/LDNFDkQAWLbtwEwaWlxCInHev4Zn8j3RG3LsHKFfL53?= =?us-ascii?Q?/zyAQ6thCQe43QgCpcfcQwKg76sHuI53fJGThHtZY31iezLsH0aaAZ7oVooG?= =?us-ascii?Q?7swT1MBmWyKY7Y9rpJf6TZFl7usQMO4CJuVPXWXKOWJB7svpAm6uBajv23Ey?= =?us-ascii?Q?cSHpRWcouBDU5+XHpZaCsdUe4ji+DLso/W5Ci2rXAGQd6XpvLGffZ0GGpA9S?= =?us-ascii?Q?Km1d83OW2lML2hq7VKwmLknGY5t1Zmxj/JIP60/b+8Ghp1pAFRFA2g/EXVEF?= =?us-ascii?Q?mzRwysaTAv5P63lfx5qnq9hIJLZK/6jTVeCBud5xZkYO3Pr2pnj/2hrUwbkP?= =?us-ascii?Q?9K+jGHfbZg6Pqi+848KSgiL1lZBzsDQd8Z7yQmy75bzDNoKbOkQOlTOHnUPM?= =?us-ascii?Q?uPXlSootBmYBK0+VWW5m4/xWktnEX04EDw5sI+YXp7fVtJDW6mtoSRSFnRMZ?= =?us-ascii?Q?C5K/YXTVghvPj9l/wnEvJcB8841dNHHxw9dieDFiwLm7A6lgPmjOW+Z4u3Ce?= =?us-ascii?Q?sU9gmKkZt5S+gh48jXMDUFItNh3o9cG/+bhgo/SAeGskqeDw7ORCPa4lzuQE?= =?us-ascii?Q?M3aiqi31Y1W2iax3qqNnT2kcguTidVWCX7nm4eXHgpczaJT/S/c19Rec1lO2?= =?us-ascii?Q?AKb4COuhs6szSdAKLTfw3N/X2HjmY71a7gddsCUbD4nPUKulorI9ORkNhhor?= =?us-ascii?Q?QPu8NQa/EXA+wn6fEU+0BHRMTECJeMWf6q/SYNlBbZNrwdaZvBplVbQb5ar/?= =?us-ascii?Q?wB03qstV1h+li8xf5YEqpDIglrSBHixRhdssiohzOztMgJaB+A7449OKL6te?= =?us-ascii?Q?JAncx1mqu5WUDsxuMM5yaT25/YdQmg4BluR9WQQiH+JzFObPg05Dl/8Pw0c1?= =?us-ascii?Q?SPSxxnt6vvEaYovSqk3+mJoqu0MUUg97pMjDT+pLjwLhtc40YWYSMO7aI/rQ?= =?us-ascii?Q?Kwu9hV4sNfRsHOCwOjLII4CzmozJbZPK4BShT45k?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: df7f0992-6632-441a-ade9-08dba7803bf6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2023 04:35:40.8111 (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: 4Zw56RcBMlUndEXRZhlMd6uuaj32cuRBfIbyZSuqRAykIIlz97gSiSe6MQqByOJjvm1tMPWsgIGNUQX2JS1ChA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9554 Content-Type: text/plain; charset="utf-8" This patch adds a selftest for userpsace PM to remove id 0 subflow. Use userspace_pm_add_sf() to add a subflow, and pass initial ip address to userspace_pm_rm_sf() to remove id 0 subflow. Add a new helper chk_all_subflows(), in it use 'ss' command ss -ti | grep -c tcp-ulp-mptcp to get the "correct" amount of subflows, including the initial subflow. When closing the initial subflow in __mptcp_close_ssk(), dispose_it is false, then tcp_disconnect is invoked. This will send a MP_RST to close a subflow on the peer too. So chk_rst_nr() is added in this test, and chk_all_subflows after closing the initial subflow is '1 1', not '2 1'. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 983fe4446523..a0a87b4c8d36 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1850,6 +1850,31 @@ chk_subflow_nr() fi } =20 +# $1: subflows in ns1 ; $2: subflows in ns2 +# number of all subflows, including the initial subflow. +chk_all_subflows() +{ + local cnt1 + local cnt2 + + print_check "all subflows $1:$2" + + cnt1=3D$(ss -N $ns1 -ti | grep -c tcp-ulp-mptcp) + cnt2=3D$(ss -N $ns2 -ti | grep -c tcp-ulp-mptcp) + + if [ "$1" !=3D "$cnt1" ] || [ "$2" !=3D "$cnt2" ]; then + fail_test "got subflows $cnt1:$cnt2 expected $1:$2" + dump_stats=3D1 + else + print_ok + fi + + if [ "$dump_stats" =3D 1 ]; then + ss -N $ns1 -ti + ss -N $ns2 -ti + fi +} + chk_mptcp_info() { local info1=3D$1 @@ -3424,6 +3449,28 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm remove id 0 subflow + if reset_with_events "userspace pm remove id 0 subflow" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns2 + userspace_pm_add_sf $ns2 10.0.3.2 20 + chk_join_nr 1 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_all_subflows 2 2 + userspace_pm_rm_sf $ns2 10.0.1.2 + chk_rm_nr 0 1 + chk_rst_nr 1 1 invert + chk_mptcp_info subflows 1 subflows 1 + chk_all_subflows 1 1 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3 From nobody Fri May 17 06:07:36 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2040.outbound.protection.outlook.com [40.107.249.40]) (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 48494634 for ; Mon, 28 Aug 2023 04:35:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JXQ8ws1d4uXut/xTvFIuSQ3inR/3neNUOVhBCgoSW5sxRAUgqcGufoWgEwWGiNp917RI+Q9ugqFt+44cSk2c4J+Culcm3HgbQvHj56hhglXDpuOIwOvPQl1r+kpLoOamz4syGSDyz4Flu4t7eVQtrtxUzU8rKgDtq6ni5vJReB986gVTTLDGpTJlg30MStihHJz6pRbrmnXjSVfg7WkbFqFLvG02Fo5rifthlgVq3p1Bqmmtf5e5Seqfl3m31B+EY96oVsfcNFcJrBI+sUR/oP+J1KJLt1REzEDdOdmJAEkDi+5nT7hP72fFb1l95KaYt+GFtzO0de2AjqdBMQXPug== 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=NSAF9pVPQMGFCRRIZ2CWkJOpmYr2QAARJNPwTMUnHq4=; b=JE42HeqCCzVkPm6F4wqKd92MjCAhSgtqRioLjhjrmWh5gQ7LAiz28yVKfBfvbWBz6e2NbNjTXD0CYT4D+IH4ffRxZQgJErD0oRBSeHfNeWqNihUDd+Oam0nqhRdxL7V0vcKkj/P4UKk397LmKNq8sFEX/X39cxqPQ9QHmSAp6cTcdFTB2EohCImlmm4lsiYIMCqHiCJASqkq8A0PSNmx/qT2nfDMZ8gKZfqugnUGvz6Wx/EV7fZL0taIL2SdFZm4j7NE01z5tsoUcwXzA0NA6oxRLdYsxl3QBlFFjDJa58urQ3UpEBNuAMZLDWhwDit4pk+3RzeDGCWQYgT8UcDUGw== 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=NSAF9pVPQMGFCRRIZ2CWkJOpmYr2QAARJNPwTMUnHq4=; b=O2FBOU7/DvCJ0wNpXcfU8uL+lCD4ZczRsSVkYZtGcRs6Sqd+BnD7K6Trp9CJPpFWFi0mVyoAktwlfcPRt72UwcPM8P3HJKdFX3ct+F8VE5yW/wn83Wf/SyO6j9l5G7tN2ScT3JdGGjIhAbpRB5X4z/RLeWH3eQidLkV4X5aYUr34IaLOmI9e0/3cUr/Nf0TG5NpqnxgfT+Hi8z7KZzhvXv2D4+FN2RwA8dOsla3IUgvb4pe98ddA0w0RASQCRqH6AICWduVgKdBRScVgD2gtH4NfXk1bf8cnfCnUNwKuH3LzEV/DJzHExEOlu3D+hNRk+gvya44ynPcYKdecgwS6Pw== 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 DB9PR04MB9554.eurprd04.prod.outlook.com (2603:10a6:10:302::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Mon, 28 Aug 2023 04:35:49 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6699.034; Mon, 28 Aug 2023 04:35:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v7 4/7] mptcp: userspace pm allow creating id 0 subflow Date: Mon, 28 Aug 2023 12:35:26 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) 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_|DB9PR04MB9554:EE_ X-MS-Office365-Filtering-Correlation-Id: 885414d4-e059-4c65-931d-08dba7804107 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xObk0md6x7oaZH64jfEjza0zieJ6OOBldSttE2DSjV+Gy+2Vqf/YgIPktav7WxKeDQW2W+xLETFmSu2giHy2L5ndbBhbL9jh4NfOXKA59a8ShthK3/qPusdP1dZe8/uEneE/IFELVoZJ95gAJuBNr0tII0fKmZ/UI1Hw/L+9YojKPflJz9E3Hpu+BOwwpJqcRjwFCckAer8AZPysjyliDM7RuvzgniQk81d9LKmkcv4EGwiPWUmjItVeb0XyFeAvOfQOaSuxPWZC3F6NlAzgRRJrK5gVQYuFD0UB+2OacMAKJ9HITBuf7ApmYTH/sC2hFMEZP0CNzqcaJIuY4REV+hKjwJy6y3CgfNalvvPjnEOpfq1obIsmZmP/iXd3jjwHRjQpDwGgny+U9iaOAjD2Q4FhjZwcmD6FJhO07ezVUwfXgXUz4AWn2R0/Jvxz+yi69CmDyaSx2up0G/luXiS9aiAqmFkXV74rdrIrRLYOftGM+rYmfMAfngtTpnHVA0+UgTgxL2yVTpjhTR392pAs8y7KSf3xD1lJwvy9HdAP78A= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(366004)(396003)(39850400004)(346002)(186009)(1800799009)(451199024)(41300700001)(38100700002)(6666004)(86362001)(966005)(83380400001)(478600001)(2616005)(26005)(6512007)(6506007)(6486002)(36756003)(54906003)(2906002)(6916009)(316002)(66476007)(66556008)(66946007)(5660300002)(8676002)(8936002)(4326008)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GfaFLeRBKWmwFdLGb2MyC7iJia19l0QWXn4vi8Awiq1VhhI/TKXe96qWDXM8?= =?us-ascii?Q?v6qhAdw8mn5YXi/HVtEL/PR1JLI/9ge1czQfTcJ0kIpk1ceCSav0ot+IRFNk?= =?us-ascii?Q?3OB+pbstDoOeazzoayAuDi8feHPO4Mg7NPUwTAekPbVDjP9lI19ce37OKsuC?= =?us-ascii?Q?thV678bt1mZohAKlUlvgiO/1DEisIf/Uq3VaaTMDsfe8/b45R3+j8HAqWlyU?= =?us-ascii?Q?HPyd6GmrkgqIPpayFs5Zu1mH0f05oD7qoZ43m/f1ojRI2LTOSZxeQoAmqG8M?= =?us-ascii?Q?SERIEmKLvjJy1wCNRggBQQP1IiUd1DjGugI1o6PSMquWlRnkNRp/JbIF/7dc?= =?us-ascii?Q?F0nWUj6fKLw+uUEs4I/n19LjUTLRaPZfGLfuUIn0wrN1KF+yE/uCagknl/F5?= =?us-ascii?Q?zY42fEiu/U7kn+gfbZXXH13hgiSqUUawAEAN/vSD5SToqS8XHTHPe/GW98Ik?= =?us-ascii?Q?ubBdL1Kgn3eTYs/fKkNGSXGKji90lYVnh0mTHUUd1p9ooR5ws/Gz7tZWydtK?= =?us-ascii?Q?ofQ1aXetTCX8dtinQeqNlPg7yFqe2Ff0ifYHgFNP08dl9CAEMxZClY9Escks?= =?us-ascii?Q?69WXodo8S346hAtUAYITaanGRcd64sQtAPT9sEyvymqUiY8OiGBocZ5Mp3/q?= =?us-ascii?Q?/PjSbxk8xeQqXBTIRpkCpnQegxIK4we8TrZS7Bqf2qG+4JXzgPzC3YjeOSxs?= =?us-ascii?Q?L4XatI4dQo1Ng3Hmz0fDC+eOQHi1uHy40b4/E1OMqUOl6MfFTDMxwxyMBpe/?= =?us-ascii?Q?UmXJfGc8W18o54OkDRpMe77wWxbC/rf1PMx0+CSHApnzZBh9nLa6DQWMkxAZ?= =?us-ascii?Q?bwCHjlPho3YHh5sSzNbCbw4YlY0geWZfTespGZpBYKnsPn28fgqWFgfgb9NC?= =?us-ascii?Q?mJAIuSxIN4NSNoDBa00u+vYOAYrdKEwGdVa5lWfCROzIpNnaBREqtJDHsbAI?= =?us-ascii?Q?jIz7Ntw+HA1olqEAQV8bDBJ7ef50dj2gr2Ptoo6o7/AuuAEHS87PVi1IqY2y?= =?us-ascii?Q?7hg7sZmIE7Pmf7PM78pjQyAKsHh/OXaB5LpHujZo4Hni+HgUw1ZZCQCGF1ks?= =?us-ascii?Q?JnE3eyKQrzFAPerZ4HHbLpBC/crYj9rMYMu9eA+kxc87sYB1jbhGHEwZ6Qdx?= =?us-ascii?Q?13MyGe8RXXFCcbV+OHNNPwp//6h3lNBfTvIJ459ULOIDq/z0ajcVwn7hgFu5?= =?us-ascii?Q?wrKU6AiU3Xab3ZZrBzuNbouEDryQEU7VVE/Ve+rHi60srX5KLjw9WcrDAunF?= =?us-ascii?Q?7NIDILxY2YnWV/DtTim4NuNqhxzRn9z+o5K4HhdGxVtPVtzfmKg9cDyfaYg+?= =?us-ascii?Q?ewyBTLBv9n+07+wtgfQ9ybjt85VTBsLxxQ7odKo4WVI1o1kReoCNGuACLGEq?= =?us-ascii?Q?4Y5imtfg+EIhZ9WuljyAKVg0L4c/wIc9TNvp3U8xJG9Z/i9usW45dWie2dRb?= =?us-ascii?Q?AJ+0llelmVt6dIof/ajpqP6cY19qPMDIvbIZa8rf8bZaKIVYYd4TUwfAZ1UZ?= =?us-ascii?Q?5hTV4yLYf/4HVM4dfAkPVNDmlAkABZmrz4iscxQGKZKv+NS5la9e2dkOtL8p?= =?us-ascii?Q?nFqJL7UP1bQqdmcaQOQsi3ddK4WwZRFWYZW52Rsf?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 885414d4-e059-4c65-931d-08dba7804107 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2023 04:35:49.2852 (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: MML5DDHGkBRVRGS/3hpClWf0F2mmW73TIOVoxKpLzaPbTM1yvK433TEwJ99e3xquLRCWYY0+Gr50v2jmPCnbow== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9554 Content-Type: text/plain; charset="utf-8" This patch drops id 0 limitation in mptcp_nl_cmd_sf_create() to allow creating additional subflows with the local addr ID 0. There is no reason not to allow additional subflows from this local address: we should be able to create new subflows from the initial endpoint. This limitation was breaking fullmesh support from userspace. Fixes: 702c2f646d42 ("mptcp: netlink: allow userspace-driven subflow establ= ishment") Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/391 Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index b5a8aa4c1ebd..d042d32beb4d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -307,12 +307,6 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct= genl_info *info) goto create_err; } =20 - if (addr_l.id =3D=3D 0) { - NL_SET_ERR_MSG_ATTR(info->extack, laddr, "missing local addr id"); - err =3D -EINVAL; - goto create_err; - } - err =3D mptcp_pm_parse_addr(raddr, info, &addr_r); if (err < 0) { NL_SET_ERR_MSG_ATTR(info->extack, raddr, "error parsing remote addr"); --=20 2.35.3 From nobody Fri May 17 06:07:36 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2069.outbound.protection.outlook.com [40.107.249.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A72F634 for ; Mon, 28 Aug 2023 04:36:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iAjg3xtC8sHTHC7UU6Oke6Lw0Vrgm5t/2YB8krmO1XsYCxGe/S9J/DKnQWlPo+G5D3VzzOVyJpBZQAkVqvxUGoJPMc7/bwj9YNiKx0AWKmNXqyMKaMU+w2Q80io6DSqcT3AnLzbNikgbDzmI6f6rFCCf6n3fGxqjev5yI2g5FsnzBIMbwuHVqBBl1fhl61SznZfW6ucHxT3GJNs7CuO5Kueg1ApzkC9iPvw7lgHRd9Yu5rxczU5iuhcg1pxwiMtONRroKlY8ZaDUb9NYBt84tpGuoLKs/ZxVHs+qu5CP+ld/0OfRrdrvLXsO0AGJ+ACagE55zdlmmCSYyMSHBMBO9A== 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=8JFBY5lMR2WTzOD5Kz94rfRjaXM0SlsKsUv7WDzxWTc=; b=U9eHfMGZcy3rudIMjfzF5rXoNGsQbGeEQ1TskSBIz6G3OqxGsgmOFy3YzwIa02b8xydLlswY+uKsK8xLF1PYYano3HHtX+uu7gcP1BjaJyrypa6GTjdHM6V0I9uNeysgqv4Hn5cQ6BhNgBE+ekFbdCRENurckCfZf9RBV1gVwFDQ7oA+QBhO375dMZHNDzjuYarLuuYjMPxDR1C1NEoXY+AFDVZRwm89+ajxwGqJ39ztlCEdUWHMSBNib6mJi4unaJhAl2zSAEhlJAJrRjrFGPYGbPNTkjxNN/4HxxH8LiA3X3rPP0CjJWH2eg+yL54wC0NOTvo6tx3yRRMcTovZ+A== 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=8JFBY5lMR2WTzOD5Kz94rfRjaXM0SlsKsUv7WDzxWTc=; b=w+HwgVKKafks6qCK11ZBUeUqI6pJMmTFZ89ZeGZB6jDkwcIV49bL/uKGo9ACDF8dXRzLrAqLY8oP5aKWuXer1JWuApYQEL2wE8Jy9hVeCnDN3YrYkIL9DgbrXyyhAJZhjLYQ+hkw9bYtka3SjMvQwTR+mG04W8xSWQvN7QNnVaVPupQPhG2Z4x2hVFw8DU9/1wlZUTB8D3TbBbgC2rO1BBdXEzJoqmQnMTh1BGRUafGGKDkjRYJcQgxa6FAQxy7+V1Yerdbh5sAtGM+gWVkUwpOcKkgNSjmaz0lXCBWy07z+A0UwqhPvTr74aIdVbLMnlGom3JUmpHdv7DhRXqO6fQ== 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 DB9PR04MB9554.eurprd04.prod.outlook.com (2603:10a6:10:302::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Mon, 28 Aug 2023 04:35:58 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6699.034; Mon, 28 Aug 2023 04:35:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 5/7] selftests: mptcp: userspace pm create id 0 subflow Date: Mon, 28 Aug 2023 12:35:27 +0800 Message-Id: <09304926f8b57182e6b0a4268cec16d4af827cf2.1693197152.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0028.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::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_|DB9PR04MB9554:EE_ X-MS-Office365-Filtering-Correlation-Id: e5324f85-9634-40a3-c40f-08dba7804645 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9dXw789wLGcDfUQrIdQdM3w9Y52Ev48glxm0paoMw8rkzZr7xxqGF/j4fWVa9uQ+aJtxDC3vSyAMFAGu/GybqxCTse7UZKGqCTHCCg3MlXXMO/U9D2jjn0VqQYc+aX9C4DyNI0qvy/L0VE7rtDrPAOvpxQmWVZMAT0lT4tucOyhadRsK3XcFLb9epsBBGaJ85l/9vakWCjxwQPKUw6F35/i3vjYiF1JFcXWo1Q4yCbu+BW02trELVJs7CIUhw7VA31lhohEILJOpvY/vLlMcbDzoHxEMWoO01NxZN4E0KSlPkKLwjdGZ7dARoQCr9jCOno0WjDx9XGVkUjFtSo4i74XF5QUnQCFyf03WFmQO9GvPn6CO4Gjgs8Ai1VPCxAkmymqpdbaEgrzo087Mh7oFRzEZIexkog8aBowaRXx8OQVQyBZk0+Lzta0SQWwjHY6Dle+sY2CocjP4puMX4Q+Id6eXTJV4hRPVRz/E9NGoFiPoEch2Hg4OIQswkKel7aNmdTntZxqrpJE73ge4p6Pm1AyEM+78s+S/lH6qQ/I4IcOETqfeHlFVWTPETVtI//rO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(366004)(396003)(39850400004)(346002)(186009)(1800799009)(451199024)(41300700001)(38100700002)(6666004)(86362001)(83380400001)(478600001)(2616005)(26005)(107886003)(6512007)(6506007)(6486002)(36756003)(2906002)(6916009)(316002)(66476007)(66556008)(66946007)(5660300002)(8676002)(8936002)(4326008)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xQpQQckXIQZh2WAnHqZSs+3MrwYkOpM1Z69SJiVerkRw/DsnSh71cAf+kouO?= =?us-ascii?Q?TheqMXvygF5aWnRtPF+ELhU8ZaLXESt7Wuj89zCgYJF3oS/5efEEbpVaq0JK?= =?us-ascii?Q?+FyO0qXO2Q+/4RAD6eY0/j7VexMz0r6m44I+Ao+nysPgjuqsecrXUGg0crnK?= =?us-ascii?Q?yfnx63o81Ldhp+ogiLuPPJaC7YTkt/vq7MP2B3ICxfZ4ryDZqkA8WKflpSX9?= =?us-ascii?Q?6iJiuyyaGTtUlf7XBLLgb9DMIanrS8997yz4ic3UuPiLxaLMUzgc9coNMaVT?= =?us-ascii?Q?UaWlktYv8gmSOVj2qP3712giwWkLUd2C0pqAbvKD+yE1KW7zEU+UyEkdQh7F?= =?us-ascii?Q?JwKu/mXPJIs1xAsz46RrMlcGBeO+uSMuX9O/NjRTJHaQnBjyFe8WfKpZp2gx?= =?us-ascii?Q?DRsgmTzQrLsOKx5G4mpb3d8ir5DaJqkipzypymApsOQDHqvbQipsH+5NuChC?= =?us-ascii?Q?h3cA2KSm7uC2vsDPO3g+zMZZVkixUqfTQzAUfISwA8d9+1ueg3nrgd9C7qZP?= =?us-ascii?Q?y3W+itFQTG+GV2zubIy75zySGJdU2cCrll8XygNycqEDNRbaLrv4MUC44bjt?= =?us-ascii?Q?w8xM/wtd8Jeu2C4HdEVEX5oRAyPPxq5WwDjkRNsdYihe3rX2Utx+mW14qF+j?= =?us-ascii?Q?5xbtmYjSsKmx56j+OzNN9NJfoqedSuT+utnIeyWbyJFdlmg3fcWoqatLuWwF?= =?us-ascii?Q?QlXwJ79PxE/yh9xJduKAoCbDepJvASZ1Kds3KpJQvgqBP3FGJ7Loft/O9ROu?= =?us-ascii?Q?b9a/2hOflhU63GLvGFd7GbPWuiHI9y20ynLRIRXis7wY0k1xuBs7NHlaH9rC?= =?us-ascii?Q?djvrwrbCuKAFB1LeSVLqaBcU0M07FUHiYQfSjBwYBQB85Au4FPv8JE3Tm85T?= =?us-ascii?Q?IhXEzNHcf2/GXKHC+5HxHTlN78zLSR0pJVTF8qFZsmlNweOhAt8i4hut3Gga?= =?us-ascii?Q?gAJg+NcG7b+YJ6X5Sw8abXaySkgu1OmSik+PLL3niOHRooydS++M359ZA1LR?= =?us-ascii?Q?esGs6oZk9rJ90LMKj82dGMDXePbR+Ka0WwFyX+7RJ6aKbAgWZcE93gIrLsMy?= =?us-ascii?Q?vLsEoKvXC+BezhJD855CQQ0su4bYr4F+eF59e1mJr1okjTHU7vZ8xMt7qZo1?= =?us-ascii?Q?AGMHzjtEM6lFipfmuEzbSf8Iu/Ju1I1ZVLiTRfeT2DIfnF9T+7JozjScEXTk?= =?us-ascii?Q?Ro2kFCUPk+pYk1UALlSCw85AtMH3gcKFKUkHygT5PXMyNeCeUI9Jj92U1gqG?= =?us-ascii?Q?E+ZL+2pykM4s/H36oAIuQgMzjoZwMpwkWNQXLLaUIXSuaxhq0g4rcFKdhv0j?= =?us-ascii?Q?8qEfxnkFIIIhCw57U0DN4bgHrdmGuF1H8WiNbHrKHGvWdsKI/CMRZbxDnFr+?= =?us-ascii?Q?chxRGs9fwhFgI8H3EY1O7kq+96kK3s4GY01iDfRAffERmg3cfsHKkjNFCKfn?= =?us-ascii?Q?GHZjjbtZf0JRCo747+kXVd2dWOKDWJj85EFNU3bz2f+8yMllXBKlCGbs4Vau?= =?us-ascii?Q?OkXnOJDNRj5MVTKBhRurlUWtgrvSOnCrThumXm5qImrm1jIau8PG7pvECQG/?= =?us-ascii?Q?sFzMGqcSiKR/49SJlNbhS/a/XgCenrWl5lD1siDB?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5324f85-9634-40a3-c40f-08dba7804645 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2023 04:35:58.0859 (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: dRrdzN7ANaNsWHrStIPg//3Yx4v+EBiDT5udriYpKAyAJYPSmxnSaafUtEtcn5kfNAOO/icZOOOzikLpU5+nBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9554 Content-Type: text/plain; charset="utf-8" This patch adds a selftest to create id 0 subflow. Pass id 0 to the helper userspace_pm_add_sf() to create id 0 subflow. chk_mptcp_info shows one subflow but chk_all_subflows shows two subflows in each namespace. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index a0a87b4c8d36..6a5019d1f95c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3450,6 +3450,25 @@ userspace_tests() wait $tests_pid fi =20 + # userspace pm create id 0 subflow + if reset_with_events "userspace pm create id 0 subflow" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns2 + chk_mptcp_info subflows 0 subflows 0 + chk_all_subflows 1 1 + userspace_pm_add_sf $ns2 10.0.3.2 0 + chk_join_nr 1 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_all_subflows 2 2 + kill_events_pids + wait $tests_pid + fi + # userspace pm remove id 0 subflow if reset_with_events "userspace pm remove id 0 subflow" && continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then --=20 2.35.3 From nobody Fri May 17 06:07:36 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2053.outbound.protection.outlook.com [40.107.249.53]) (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 2039E634 for ; Mon, 28 Aug 2023 04:36:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dyBEAr6sCgXJ/01u97+ClT5aGxRxwVkPlGVG5ZdsJC+NN4We0Hh1CHfpYaGZSFKCgB2pEzAuJREcCEl3AjAlZ2IPXAEcWZ6DsEzkZ1hOBI/XPf0xjhyVxEWa6n2XlyA5jUfT7nclrdU2cslO3JLxfD1TY7bGNnXo4kcwGe+42OXKqxzIbkq7XEr3SprKpkJCBdZryKHKtn0T7D3dSu3kLoiQRDS9UDdQr3/y/G+1Fzf/VXnLWWU+/7Iy53MbKhPBtuG/+zwxcX6p6oaM9KUVVL4zS8aYFkl/53INEm3M5Ow0rg5vfN3oqWlEWQVaYs1YuUPa2Ckd7re7twCWeaUEjw== 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=F/CQTT/sOlkXyw3gswrvOzJBYPjgEls37Yf8JCq+Ai0=; b=FjdfrvvNztfDm/bYE0d0yRl1xl/dBGxKrhg9pc1Fy4v34Hq44uFuAhlyaKmwfRCV4zArGifUST5YgAwTl7HraTU65x/AcN/XJS7R7lKy11T68qao1KpMrMRsprp7p08Ek8yMcosbQU3ttZUwgQN/b2vxFdl/6XArFvmkh0frBdfiegKOvE353bPGC0Dh8rxmiIkCIaGhHUduspVX58HbFEdAJVRdGlBrqV351fFiZ/e0xGWtq4lHLjIIuMSfywM/amZpZR4gpu9Z06+Rcq/3jPmG5HuBiVQOBPnqDtDLidObXRZnBG9sPW7eH0diQL+76neJPVnRd7lmvWAqr3RNKg== 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=F/CQTT/sOlkXyw3gswrvOzJBYPjgEls37Yf8JCq+Ai0=; b=yycWulMnWn/qqYBZPX6rKevtARk0mFmPN8FPXoDfboIlTzNIJqNKX+31RwuWW5Yfjys6XZpWg6dJECBb9lztyEVUJFgn5w4CAe+8U9yEOD8aDqqcjgLfHbMFTPbvArXsDwUPe/N4zB5wcC7+E+t7GzgGOMXps+fV0SBkvBF/99+jPCQ3N+Utip7dR7nZ0hQxXqXxSDeQ9uAKYucZ5TovvnxN+g3+y2INnsgIOgmNtjZohoaPi/Gjb+uTF+w5c+aUh/NHcsNWgK6j4qU0h4/y7MB8PBoUjQnKQ6SX+M6ykvw5Aj84dQgyLrsdx3r/pkYZdnsfSgIdNVzlXz37q32g+Q== 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 DB9PR04MB9554.eurprd04.prod.outlook.com (2603:10a6:10:302::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Mon, 28 Aug 2023 04:36:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6699.034; Mon, 28 Aug 2023 04:36:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 6/7] mptcp: userspace pm remove id 0 address Date: Mon, 28 Aug 2023 12:35:28 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::8) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DB9PR04MB9554:EE_ X-MS-Office365-Filtering-Correlation-Id: 10019f74-d63e-4253-ab49-08dba7804b37 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uxmSmKZZz2x8He1kncYVuGp6wMHwH3i53tfbesIQ7rXi1bWaH6ws8mJ7PZxNuayN5WIZ6zoHzYocRbeDwfF/ScT0YVGsYTSuN4HsAZn58PtQaRLHSlo75NrGDmH5OCsBLEXpVwmdrWfcMUytqXnjnfNbDtB/0HRFmNyMDVex1+Z6+n3mAbA/vKNErydsV2LO7S2/WSa/D4W9z0U1SMTuUXiUB+eR+58CZDmsB65EQtvjnWkbl/gD+M54xv1mXsjdQoIqdL6ZkJCZC0o/jnR+XeBl+I+1MY8gUUiMsco4Y/7Ut/u3vWwYnQ2RLiMr9QmcTe86bS290ruj5HGPm1yIPgFbKDXhSvvRX3JCZvfDjR8P+LY+RW7tHg/09b9eakgi6KKYVDaOm4hpVtTw7vadI7fUnBGs9C7ExNuxdT7q+x5gQ9YcjLvC3i/NfvZE3M99XsRHEJfUH0rLBv9pcccMnKmlrfry7UyaBBSJ05g/egIb8hLtJSHrBsmPezro6dLv/vkINoMT179hORUxbP0IOxe2lVIoUaVuWzKHTR3SAys= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(366004)(396003)(39850400004)(346002)(186009)(1800799009)(451199024)(41300700001)(38100700002)(6666004)(86362001)(966005)(83380400001)(478600001)(2616005)(26005)(107886003)(6512007)(6506007)(6486002)(36756003)(2906002)(6916009)(316002)(66476007)(66556008)(66946007)(5660300002)(8676002)(8936002)(4326008)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?owCLPMks8GY7psIV0fqCCSMmbVOVmo5un4kYpmd31cDdYQfpV2S6N8XJ/C4x?= =?us-ascii?Q?IwlQc5JBofSbeqUJgbPnc844Rk/igWz+zIGoWgKyE6zFTCZB1o96O8odPtpM?= =?us-ascii?Q?/XKNV0JNMaApEolR/lXs7Z5OTIO9/1P3RqkNzrWwU1pd2wgNGhaI3/RVPPdg?= =?us-ascii?Q?j8aDOPimClL7FUvvf9IrlxII3yPoiC52HXCrGibyXIvrrXZLz/LJYDFfBiOQ?= =?us-ascii?Q?YgnUabvfO1gIWoIsfm7HW2N3SWBBZ9kqzGKfpV02/NpxstGIlFFIEtNlfolr?= =?us-ascii?Q?Dbe2JjzfJHCJFrH6ZI9RuhpBVC1Yhem9uZ7bbjiFJUBpW7E0Ybxjimbd8/Qa?= =?us-ascii?Q?q+ssURGowjhN3Gq94V5RfsF00Wbwf6iKvwFCzH9xzy5fL66VqUHUjE9obhbe?= =?us-ascii?Q?71xMZWvmuJdd15y5lNOZ38KtzyeVeZthSgWYfATBxLfdrHwKkzDqy1T1G01E?= =?us-ascii?Q?syiYCvfSk+PQUGMQgEKuG+/3cljwdmJ2Xs0athf/WA8ngpWrdHFsagL2906y?= =?us-ascii?Q?hAUm09TbuT4iPaJjYAcXau7AkQAzVKuIIM+jTJsYP8nlVRTXB4x+leigKjJh?= =?us-ascii?Q?fF4zv4XtvO87owOvzAGfXsJHwQFZVPrcL2pXUCXXfnB2WCHFG88Ij4cKgOPW?= =?us-ascii?Q?SM9lQ5jhJtyWRPtYLEenHr9a/RdIqOFqWoaSSr1xxBDu9zcA9l6U8k7U7Y9y?= =?us-ascii?Q?1cUo3gbpargAwkCV+X+gKcJfk7CJRCl4HPinyq3w4Nz3dabAkSpXiMFbRC+H?= =?us-ascii?Q?OQaB6dNGc+bywItGwExVnXrjm8UO24fTDhfwjNGpGQ4XTPRSa2+aJVJc6o4u?= =?us-ascii?Q?eCERHYRuENxN61KzZ5cyoiyp1Q1H6MPIfZaWVj5wG2WZSsVf9P0ya1Pf3LCh?= =?us-ascii?Q?b1fW1ju7GLtVzWpfbGqtJwJoIUT92eDpNc3TjpTT3i52NbklNRYhuwZQsUVW?= =?us-ascii?Q?bJ8WLEMRNcPlrmrQyOW7NM6rYYUNeY4hcphaJiQFPyaGzCj86rb4Y3q2tPH5?= =?us-ascii?Q?9abcvMarZTfxy9fuadiL2WEUwYZXbXbUI3VflJxrWSqZgHXodcESUC4k5vVQ?= =?us-ascii?Q?h3r07X9OoWaKYpYHbhmYhA8jmhb3q3qirvLRL1aj287skDgrPMGZQi8gfS8+?= =?us-ascii?Q?kJ8/mTRdo3Zp/zTR8utLajEeotridQFh91qZJ/ino6klmTZd9JoTNlYs7ndZ?= =?us-ascii?Q?b+5N6PB2eJeHjwjQKxucnUvLUyVkY+Z7Z8syFmz4Zv5i1Y6duq+yfZ0OBPLV?= =?us-ascii?Q?HpE0A7YCL1zGkyIw9fsdssAjPb7yqmVvuwyylKrcy51lH7cf0rY/UBHIzROQ?= =?us-ascii?Q?fuTh3fCnrzsVq36cAx1B2K6tPr8W66JTDN3LrvhksFgmeiCHpX0aWGF9SVD1?= =?us-ascii?Q?gtEXC9dqSkAGEsKaxw7wPESyNKN/gXMZI3GpANEqFBkDY9Q+oAA5wOXdjD67?= =?us-ascii?Q?7L0UlgbUlK+1CM5vH5lru6B33gECNCmE69o1TkFTwGQNySrv7+NYxTCivHJY?= =?us-ascii?Q?bQrOXM8akR5xhRESkLuVfrhABCNornxvHMcTWpxVz8qD+NxHKaepasOwRLSQ?= =?us-ascii?Q?N+slN5fbxerxlV9mX5SGo2NqXyJDa6xWEvIS8Evs?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10019f74-d63e-4253-ab49-08dba7804b37 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2023 04:36:06.3769 (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: JRl3yNU+crj37ndvKRgivoTFMRvfcSjafiyBrqkal+wnKNq3sLdIAEFNAnEq4fLu9quacE2TFkW3j6M3OpyVWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9554 Content-Type: text/plain; charset="utf-8" This patch adds the ability to send RM_ADDR for local ID 0. Check whether id 0 address is removed, if not, put id 0 into a removing list, pass it to mptcp_pm_remove_addr() to remove id 0 address. There is no reason not to allow the userspace to remove the initial address (ID 0). This special case was not taken into account not letting the userspace to delete all addresses as announced. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index d042d32beb4d..41d2d57b570c 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -208,6 +208,37 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct = genl_info *info) return err; } =20 +static int mptcp_userspace_remove_id_zero_address(struct mptcp_sock *msk, + struct genl_info *info) +{ + struct mptcp_rm_list list =3D { .nr =3D 0 }; + struct mptcp_subflow_context *subflow; + bool has_id_0 =3D false; + int err =3D -EINVAL; + + lock_sock((struct sock *)msk); + spin_lock_bh(&msk->pm.lock); + mptcp_for_each_subflow(msk, subflow) { + if (subflow->remote_id =3D=3D 0) { + has_id_0 =3D true; + break; + } + } + if (!has_id_0) { + GENL_SET_ERR_MSG(info, "address with id 0 not found"); + goto out; + } + + list.ids[list.nr++] =3D 0; + mptcp_pm_remove_addr(msk, &list); + err =3D 0; +out: + spin_unlock_bh(&msk->pm.lock); + release_sock((struct sock *)msk); + sock_put((struct sock *)msk); + return err; +} + int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) { struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; @@ -239,6 +270,9 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) goto remove_err; } =20 + if (id_val =3D=3D 0) + return mptcp_userspace_remove_id_zero_address(msk, info); + lock_sock((struct sock *)msk); =20 list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { --=20 2.35.3 From nobody Fri May 17 06:07:36 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2042.outbound.protection.outlook.com [40.107.249.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4EFB3634 for ; Mon, 28 Aug 2023 04:36:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=izHtLa41yAGCZAXKgsmcpY/5QUJOGMADcQqJA/phqMxKH43zuhB9yK5Plp29DJBAyCK7MblsNebWP2dHAVeyqY5CSGw7UJh3A7oqYn54cEY1OFUbe6oir54kibFoSAvqszcZgAdNH9AeeN4gatgcD/DAA97uvaGbDAMV1j4BWTQiHT9I3Kn+21piwbKqbJe9d10UmlX7GuUXwWjF5ZTrIIZ5wZ0SQ4I3XNeNph34sAABlPg6ddiStjUWhKu+XbUcDcq6kXajW4+fBxupYY6p4lmAmzydRtei1xkzkBQI1hjuk9UKQ3p6eVU2m8i21U15p8z8B1q2tvgF8giItOyxEA== 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=uaTGuf25Ae9PPi/JV9Vfq4U44YpWB2K+4/07fa9Pmg4=; b=Ijr4CN9KqoGDWqvEbZAQ7dRzt99qxEFuJBFWO1O2zcH7COZTjJcTJilliqH+1Zm1/hE2A6qz+AmFSdGEe2FO8ZrbWlxSr5oHAaFThW8GRTvNtJU1tx7GK8m9V2l7yyNj72auPUM/6g2p1pCCM2U1vubKujFA2qmNe8kow4qwkMBob1zk3vHxqpm0OaAmOeAPoe4oipzuv6+warcqHgbNEazHdy8/hLWNMduWv8lI4sJ5Jsmboxm7d1F8K/yXgufKZLr01OYM+JCb7tq0zbVilK+tISAHrwOAwk699BzvounWVrzz0IlpkkbU20Z/HklaH5UNYaxFj8kDbJCT+S1D5A== 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=uaTGuf25Ae9PPi/JV9Vfq4U44YpWB2K+4/07fa9Pmg4=; b=YJmKsPMfsq36z+Lg03RLxw6xY1Sbo1DW2RQT7EGH+2kuRZxTXp/tv6ifs0srxZaOScwAqoJHsVa8CknbQVA55Tdefwy3pZ+vOBVSf1uZV5ML3//FX/ACB2HS2bDXDk/cuQiOFiVLIFufDxNzODrOxOWCQ9OX2s8QfxIhUB/KoKUVbsGiH7qwLSYk4BQOTjvVLOY73XWNhrC7+r3a3wDTEIsP6vKNsjeFppo4hYRRkIBWYs49SvjU3UZ14KNs4jfCXgiGuhUIUyTbpGZ4DVonTN1t77vUBCPbAqc1QDGQJl+MY3TqaYU4paWQv4Ab10xuq7bujF9sylGVMuyKeCXIMw== 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 DB9PR04MB9554.eurprd04.prod.outlook.com (2603:10a6:10:302::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Mon, 28 Aug 2023 04:36:14 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6699.034; Mon, 28 Aug 2023 04:36:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 7/7] selftests: mptcp: userspace pm remove id 0 address Date: Mon, 28 Aug 2023 12:35:29 +0800 Message-Id: <2778378b42d7a74fcef65dfffb80145f19c37eb8.1693197152.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0010.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::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_|DB9PR04MB9554:EE_ X-MS-Office365-Filtering-Correlation-Id: c5cf4a48-58f1-4c36-e687-08dba7804fda X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jIPy1RXhZKPuijYhTbnTQbXdfuO3Z4NK591EW920LP3sLfaB5d7H72jNwJAz3Ar5Uu7nc6/QlE6nqjatw0wy16g0xbSaTxfvpBYbaOuWgaQpFO1YjIx2QGwW+NHxklpLQv7mRYSF3G+VVFCSiIOZUkzfJPCVQn4cu6zS0hWhXI9S8x7mN5Xi15SUymSraBfpFTdCNte+1HMfiNVsmuJUyvsQwVRh/T6jEFiEKeuSAN0xL/sGLAJNUkUbEEb3GB47eUyPcAKvVjk9AHRVl6CjA00KDHjzKM9coKhK/xkLclODFiepNNcRKzbZDGJxg1FYpJf1Wo9iP/OeaDpHTr+3sXK4Ub5WZhXaUTxLD7KwudyoaHD6Kfrb9NP/hERdZCgwvyPsBx7iR20q6uJ1ax4+9tWaiJ/bsQlNPOWQ7+86rQs73ZetZy7eUyWbcFk7pGsw/fwOZiFdyXeUX9MgMDzE2ocQClJSUPjNHUFzwU7qllVcpnizIPg8Xv+YXW6nN3N6SsanYy2PbL0nx6b4w01kX3HWVimBjLW1lLjjvtOoXoAqUe+GLlnUvIOz7HYfI8aT X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(366004)(396003)(39850400004)(346002)(186009)(1800799009)(451199024)(41300700001)(38100700002)(6666004)(86362001)(83380400001)(478600001)(2616005)(26005)(107886003)(6512007)(6506007)(6486002)(36756003)(2906002)(6916009)(316002)(66476007)(66556008)(66946007)(5660300002)(8676002)(8936002)(4326008)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?W2zxe1kH/HbtEemNqDtv4cHdMmP2Blxi+/uw0gECFwE0K4ddE9v6EFUaatrG?= =?us-ascii?Q?iUy27BLagTO7g6XW/h8NfLxyric+a16RFIwguJrjcH4kEzSi/JI4opIH54jl?= =?us-ascii?Q?WIw5GoOagVXN0NEMv271UrBgBw2FHhhmA08gaCIWTsfjw7jVvyyD1a8CU1Vh?= =?us-ascii?Q?SFtD/276o8gACZkznAsj5yuO+HKcQLFoX85WqY3kal4Rsko5TKqLNmjJkJ8A?= =?us-ascii?Q?3b5EL17PLM8Fups4Ux7/+zQehbB57QcNA/cTEfiNDtgc+e+H7ZXfKQWQ/Jxy?= =?us-ascii?Q?Y7uW5SJlLqP58bnhQujVNVRG4nEGWyr+mDHgSrb9ctr3Zdv5jcKoJfhmqo4i?= =?us-ascii?Q?NcJBGSlCYvpKNjnnmNzZYisfM1Hj3QNVh1ndQRsQ1UvNZhR4OxWnkI85ZuPp?= =?us-ascii?Q?JqdVfG16irOSd9uFEKmrraBVhffC3txQZlmNpEKvfyEOQjr4q5rw6iyb63Lz?= =?us-ascii?Q?2WnC3ShumE8sK8YpNxt6EyvGskOH8C5Gtm9h8p+hTeAyYG8sdPIyMRljfikI?= =?us-ascii?Q?Q3CJ2k49iIgP4RzE5NMgYMbSalg6SCJUaDqk7kpJXbeQRocAl7ltdHLI8v/B?= =?us-ascii?Q?S5GBdb6MIDiXfaxjxb1nfKoouKVmct2Bme9zEfWkVtHIi0rJ9oqRdcbKToVk?= =?us-ascii?Q?zxl6PX5urqtkndOI6CdaDLfRlZTrYF+BOWKXyQL3e26dO31PIrSgOPRPu2Pf?= =?us-ascii?Q?6jSLO5eIx/29SXv3S+O8aSAGCAZHJeyRtFgEJeBLafthNUat13AcfiFvwdT5?= =?us-ascii?Q?AyGNkN1W4/7ZFrttzDOoSx7JTHlHY4cP/3zOq9DSfHj4IBufSpoif/VQUQTQ?= =?us-ascii?Q?bK5aXJSGYkGOFg9sRnyzlQZF/x80YgIBn+sD7dEA/vogzxuDyeCz9vWiJkkR?= =?us-ascii?Q?VHMvFYbkemjg4Y6JQxftFDQKGskZCdrNJXSqWcqcbMi+hLrpLYv/ONjSpDPZ?= =?us-ascii?Q?3M9rAytEMlqb47EXZb3pR4sbIHmxarZVwe3g55HxwioJSOGIhj4HYjDj07CY?= =?us-ascii?Q?L/EvIVisy7e/YzQQwIFZIiPxdYhNlOjDZGkF3Z8Ps9QI9zvkr9wQrYO/ueRO?= =?us-ascii?Q?LTMkcMjxhMy1I+8LqF8zD6DXjSIU1EBoHPKNFr6lavWv9jUcIYlHCotqoZPo?= =?us-ascii?Q?E8F0TrGSo4tCi1HfKhkGqiW7+SP+mGwp/RGQmvHa0VRwpEHDH2vBSVcmPUkq?= =?us-ascii?Q?vvZG6lFwZPN+VJtIRvIWxCHCYDGQu5CkKLmpVICjxQ+J3qiTeZacGmowehEi?= =?us-ascii?Q?yVIGoOqu/c9nIbrTVfhnxuYpUSUN4Y2SifNUP6OqllFRTswf8SHhrdxUBbhT?= =?us-ascii?Q?Yfh9oCcdlPc8K5PAe5RqwM1miv9NNy88QtNkXVNv0KSUgAFEOty1a0QXYZkg?= =?us-ascii?Q?4q57p4DnOAJuotah/v8uJKoqPmCJPDrL1zaWn5Xcs6x8GBdo0d9lZoWDteUh?= =?us-ascii?Q?9ViZ/GQ/S/3QGFVMT+Yrfbt8E8ihoFIWNzYszamDqV10gYCMMVXkLQ8lYpw7?= =?us-ascii?Q?D00KRGl1zfG7EJ+YCR4skgM6jL2bmBnr1PNxZnNf/nFKt8csn82DPxw9c31d?= =?us-ascii?Q?ctgOCq7BrmqE37vOMDWJpgi7J8ErmQ34w2GZGj2v?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5cf4a48-58f1-4c36-e687-08dba7804fda X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2023 04:36:14.1856 (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: v3VSreaSF+rghOGTocSkRhCY7YPUqcqO08fZCpGaEEUmq0TkQzMTL0/fTaKvoKRCo6R2UjLsphXuP7WIDdX/Rw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9554 Content-Type: text/plain; charset="utf-8" This patch adds a selftest for userpsace PM to remove id 0 address. Use userspace_pm_add_addr() helper to add a id 10 address, then use userspace_pm_rm_addr() helper to remove id 0 address. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 6a5019d1f95c..c6453f29b852 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3490,6 +3490,30 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm remove id 0 address + if reset_with_events "userspace pm remove id 0 address" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns1 + pm_nl_set_limits $ns2 1 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns1 + userspace_pm_add_addr $ns1 10.0.2.1 10 + chk_join_nr 1 1 1 + chk_add_nr 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_all_subflows 2 2 + chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 + userspace_pm_rm_addr $ns1 0 + chk_rm_nr 1 0 invert + chk_rst_nr 1 1 invert + chk_mptcp_info subflows 1 subflows 1 + chk_all_subflows 1 1 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3