From nobody Mon Feb 9 10:48:38 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp701875jam; Fri, 4 Feb 2022 16:03:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwqG75KDUErIFCfkvliLmEKZ9/yCJejIYbwUC9nQz4ZWRKc3nD2h/ytMoanlBL3eUL71EDi X-Received: by 2002:a63:af08:: with SMTP id w8mr1178279pge.1.1644019431477; Fri, 04 Feb 2022 16:03:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644019431; cv=none; d=google.com; s=arc-20160816; b=BTi03GU7zu4yWs9IVQzXENk/tziXmbSyzCGqm5qruqX3LCsv46mWdzDh4eRR8v4mmf J4/+OvY+l+6makpHORPeeyC6ngJrtzxM3LDWLWVxFWfaVwxwYV/uDNWU4Zknma4Lnuzm 4VJ3XT8nlVvdCtZWOfzUR1wUU94OLIaZevVc+AgDkM295RnfTm2YQPM3mUXA/noKg336 9sOnsIGzNYgPIkxvVySZNOyv8j7DC80R+t+nh8yLpB4gI0HfFVBU5XYmPl+hhplsc/AC /8XIwHyEbKRhypipbT/Zp7QffKiHvDZSnXPwf8OhPb8G437NS0yCdGjvOPnnj9zW+Fgx 8rcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=6PG0ZUwcSd+NhX0z5+LlE4REAw4oQaCh3Bx2DobgQ1s=; b=lJAnEAzFa9g4lss6/JlXagu2Q3SZFO9dZAR8RMTeKEcT2qidkSWUi3mZCNzGFsPL79 gjE4iOoqF4jbAzh7MVjyrpp9+h8TdwQaHFt8AcjLqrsiwjhWN90sJlqTD28pY8BwQ1aF JZDPaOkqkbMQKGciLbFJd7fXLR5CMQ11es0TuCL90ftsPQI22C3RmTwusCnMBlhlPET1 5H9jesEMItYoAvPmewrmJVbMt9arZqpN74Sjt70PeDhPdNzy52+7+ETCxY80fCJiiqNu 2AEveRnNtF5BsPH2IapFyXQustZTo6+DjNlcw8br6XkeYKH4tX3JebZwtgScbzqCATzO wyUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lmhS2eE2; spf=pass (google.com: domain of mptcp+bounces-3479-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3479-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id t79si3157888pfc.235.2022.02.04.16.03.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Feb 2022 16:03:51 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3479-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lmhS2eE2; spf=pass (google.com: domain of mptcp+bounces-3479-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3479-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 0F6343E102A for ; Sat, 5 Feb 2022 00:03:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4FC7D2CA6; Sat, 5 Feb 2022 00:03:48 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 DCF102CA1 for ; Sat, 5 Feb 2022 00:03:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644019426; x=1675555426; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5K0GkzhiVhM0zd+gJclgiynKr72PcHxICX10QYU9dw0=; b=lmhS2eE2/p4DQU+ojjSftXZple+XmQlvQYQ0XrXZTvBhRh0oS+U37jGn k570s14t6uFB1Mhr1r9VGEqkXZGSK9d+NsRAHCXbRX7NpEO3+loHoNR81 A+QzZ7AOKWf6WI+qM1S2LPebqwZoZgZxttpveiv4QFicgpiZoqrYZzcNQ g56DoRSIeXcz/ocpVrRHk3G689qIErIcFfiizysvpL2sa3T3RmMQbaaSx WC08httNvGvGfDcGaKQ8C0rvhv/kk/gPCfjQhDqSTJcX9z6CfyTIPZoIc 6B8zGkJC4GTR4zoYSs3Q175soew0taCyq9+8J1w7t/Qi7X4YtIUJYZ9Hc g==; X-IronPort-AV: E=McAfee;i="6200,9189,10248"; a="248678296" X-IronPort-AV: E=Sophos;i="5.88,344,1635231600"; d="scan'208";a="248678296" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2022 16:03:44 -0800 X-IronPort-AV: E=Sophos;i="5.88,344,1635231600"; d="scan'208";a="770097521" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.231.200]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2022 16:03:44 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 5/9] selftests: mptcp: add wrapper for showing addrs Date: Fri, 4 Feb 2022 16:03:33 -0800 Message-Id: <20220205000337.187292-6-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220205000337.187292-1-mathew.j.martineau@linux.intel.com> References: <20220205000337.187292-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch implemented a new function named pm_nl_show_endpoints(), wrapped the PM netlink commands 'ip mptcp endpoint show' and 'pm_nl_ctl dump' in it, used a new argument 'ip_mptcp' to choose which one to use to show all the PM endpoints. Used this wrapper in do_transfer() instead of using the pm_nl_ctl commands directly. The original 'pos+=3D5' in the remoing tests only works for the output of 'pm_nl_ctl show': id 1 flags subflow 10.0.1.1 It doesn't work for the output of 'ip mptcp endpoint show': 10.0.1.1 id 1 subflow So implemented a more flexible approach to get the address ID from the PM dump output to fit for both commands. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 78 ++++++++++++------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 6ca6ed7336d0..093eb27f5c6d 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -365,6 +365,17 @@ pm_nl_flush_endpoint() fi } =20 +pm_nl_show_endpoints() +{ + local ns=3D$1 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint show + else + ip netns exec $ns ./pm_nl_ctl dump + fi +} + do_transfer() { listener_ns=3D"$1" @@ -472,20 +483,25 @@ do_transfer() elif [ $addr_nr_ns1 -lt 0 ]; then let rm_nr_ns1=3D-addr_nr_ns1 if [ $rm_nr_ns1 -lt 8 ]; then - counter=3D1 - pos=3D1 - dump=3D(`ip netns exec ${listener_ns} ./pm_nl_ctl dump`) - if [ ${#dump[@]} -gt 0 ]; then - while [ $counter -le $rm_nr_ns1 ] - do - id=3D${dump[$pos]} - rm_addr=3D$(rm_addr_count ${connector_ns}) - pm_nl_del_endpoint ${listener_ns} $id - wait_rm_addr ${connector_ns} ${rm_addr} - let counter+=3D1 - let pos+=3D5 + counter=3D0 + pm_nl_show_endpoints ${listener_ns} | while read line; do + local arr=3D($line) + local nr=3D0 + + for i in ${arr[@]}; do + if [ $i =3D "id" ]; then + if [ $counter -eq $rm_nr_ns1 ]; then + break + fi + id=3D${arr[$nr+1]} + rm_addr=3D$(rm_addr_count ${connector_ns}) + pm_nl_del_endpoint ${listener_ns} $id + wait_rm_addr ${connector_ns} ${rm_addr} + let counter+=3D1 + fi + let nr+=3D1 done - fi + done elif [ $rm_nr_ns1 -eq 8 ]; then pm_nl_flush_endpoint ${listener_ns} elif [ $rm_nr_ns1 -eq 9 ]; then @@ -520,21 +536,27 @@ do_transfer() elif [ $addr_nr_ns2 -lt 0 ]; then let rm_nr_ns2=3D-addr_nr_ns2 if [ $rm_nr_ns2 -lt 8 ]; then - counter=3D1 - pos=3D1 - dump=3D(`ip netns exec ${connector_ns} ./pm_nl_ctl dump`) - if [ ${#dump[@]} -gt 0 ]; then - while [ $counter -le $rm_nr_ns2 ] - do - # rm_addr are serialized, allow the previous one to complete - id=3D${dump[$pos]} - rm_addr=3D$(rm_addr_count ${listener_ns}) - pm_nl_del_endpoint ${connector_ns} $id - wait_rm_addr ${listener_ns} ${rm_addr} - let counter+=3D1 - let pos+=3D5 + counter=3D0 + pm_nl_show_endpoints ${connector_ns} | while read line; do + local arr=3D($line) + local nr=3D0 + + for i in ${arr[@]}; do + if [ $i =3D "id" ]; then + if [ $counter -eq $rm_nr_ns2 ]; then + break + fi + # rm_addr are serialized, allow the previous one to + # complete + id=3D${arr[$nr+1]} + rm_addr=3D$(rm_addr_count ${listener_ns}) + pm_nl_del_endpoint ${connector_ns} $id + wait_rm_addr ${listener_ns} ${rm_addr} + let counter+=3D1 + fi + let nr+=3D1 done - fi + done elif [ $rm_nr_ns2 -eq 8 ]; then pm_nl_flush_endpoint ${connector_ns} elif [ $rm_nr_ns2 -eq 9 ]; then @@ -551,7 +573,7 @@ do_transfer() if [ ! -z $sflags ]; then sleep 1 for netns in "$ns1" "$ns2"; do - ip netns exec $netns ./pm_nl_ctl dump | while read line; do + pm_nl_show_endpoints $netns | while read line; do local arr=3D($line) local addr local port=3D0 --=20 2.35.1