From nobody Mon Feb 9 09:52:05 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp749698pis; Thu, 12 May 2022 16:27:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKHrFK7GfgA3e3rsEhrbztGF6ejykdv/01SQTD5NM2Qr9gyzpvPruaV6Xv8xExWAgPum27 X-Received: by 2002:a17:906:dc8d:b0:6f4:75da:2fc8 with SMTP id cs13-20020a170906dc8d00b006f475da2fc8mr1885352ejc.7.1652398031285; Thu, 12 May 2022 16:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652398031; cv=none; d=google.com; s=arc-20160816; b=s4+wcMxGuAF64oJtqTfKQXIjFsCNdWtHbxolnOLHbuuejB5r1XTchIlS+Y9iWZfIas f4dYfn4iiVc4Kg4UsQtbgJpPpxZtn3cw94u8egJ6SSE+F2Bl7XtS9u6y0UyBXeb1QxS7 iGjatuE4OxbQnT/Dj/h4Y7NmjWC5KJLeF5RoKZy16L6gcClJ1IP5CL9YVF0tDBwglCwE XTVAyfEk4TcEUPUJE2BlLuIKZbr2OzGPnGiOQUOvxh3tb0PrN6SqMY1EO4HKTQHWskm4 nbaxJcsPOPn907kzde2yAf/OPAl80ksMCqda/a2DU5o1UtzqVTSR98dXVcZAmUy2rPYT x/+Q== 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=+XhkcsRFNCaangJdq1nAJkhD4jffhOwGgkPI1jB3g7s=; b=cmLzfXy8FuPBapvRkYAdp7uzkWBuIDcpnD+M2lD0avOMy+9uhjhFCE4OiZKC8IFG6z TT+WtOrmqEylIyeVKp6uvH0JftdA2MR6rrerFRFRLTmxVjZmY95N/Bzc2rRTmM6GFYiR k5GsDNH1FwFrLI/x/A54WbHpqTr0s0N2RWJXi19ss/m7hxwyqdeyjlqvGRSWwzZZ6GnI okRrqxXyPZM3aNHJk50K7fAZ/iO9NJjHUncDWpvbe5zwH0KqNMLs15NXhRZp44gDtJ3i k08ZpCMtRVISm3b2JGKnkASg15Xxta7osSGVGi7OO1BLU4O5lZqrzaDVeyXXkaMVIkCM JJWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dNHZcs3a; spf=pass (google.com: domain of mptcp+bounces-5276-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5276-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id dm19-20020a170907949300b006df76385d4bsi576150ejc.491.2022.05.12.16.27.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 May 2022 16:27:11 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5276-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dNHZcs3a; spf=pass (google.com: domain of mptcp+bounces-5276-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5276-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 da.mirrors.kernel.org (Postfix) with ESMTPS id 28A742E09D9 for ; Thu, 12 May 2022 23:27:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 41E343FF5; Thu, 12 May 2022 23:27:08 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 F3B373FF1 for ; Thu, 12 May 2022 23:27:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652398027; x=1683934027; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y8Kff7elEMZUNQ5A0JvdNuSLQhIb8zXMDvwIJO0oxHs=; b=dNHZcs3aRPFq9jyeeRAXebnJDu9hi1Gf5QEXEQ4Oru9EyF13X/bG7/5i thnckysUrlN3Uefw4Zw0RIeKcVqAY6d2FDToyJVzbrc5H6bAIb4FcYwe4 8MMIlzcnH6Uh62CU+zvBY41Z4KHMUjfCs5oQPzg9mwr3KLR1/6fFiJxps VTYbx6DRFp7+dGNDpJ5v9Zyfoj2bpBLFdFlQMbGZ/DfpEzXTDCC/vKSwh K9causLZwOdI/VgDlqKYoGF+zXfzSWSNtAUXrQTuYQGu6fJqGafCOud9r 4dBrbQL2mOGBbh39TLkYihz9hEk9xnmwyfWrjz/0v7bU6XKAQGSqSW8Ai g==; X-IronPort-AV: E=McAfee;i="6400,9594,10345"; a="356590480" X-IronPort-AV: E=Sophos;i="5.91,221,1647327600"; d="scan'208";a="356590480" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2022 16:26:48 -0700 X-IronPort-AV: E=Sophos;i="5.91,221,1647327600"; d="scan'208";a="739919555" Received: from cmokhtar-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.36.250]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2022 16:26:47 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Paolo Abeni , davem@davemloft.net, kuba@kernel.org, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net 2/2] selftests: mptcp: add subflow limits test-cases Date: Thu, 12 May 2022 16:26:42 -0700 Message-Id: <20220512232642.541301-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220512232642.541301-1-mathew.j.martineau@linux.intel.com> References: <20220512232642.541301-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: Paolo Abeni Add and delete a bunch of endpoints and verify the respect of configured limits. This covers the codepath introduced by the previous patch. Fixes: 69c6ce7b6eca ("selftests: mptcp: add implicit endpoint test case") Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 7314257d248a..48ef112f42c2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1444,6 +1444,33 @@ chk_prio_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_subflow_nr() +{ + local need_title=3D"$1" + local msg=3D"$2" + local subflow_nr=3D$3 + local cnt1 + local cnt2 + + if [ -n "${need_title}" ]; then + printf "%03u %-36s %s" "${TEST_COUNT}" "${TEST_NAME}" "${msg}" + else + printf "%-${nr_blank}s %s" " " "${msg}" + fi + + cnt1=3D$(ss -N $ns1 -tOni | grep -c token) + cnt2=3D$(ss -N $ns2 -tOni | grep -c token) + if [ "$cnt1" !=3D "$subflow_nr" -o "$cnt2" !=3D "$subflow_nr" ]; then + echo "[fail] got $cnt1:$cnt2 subflows expected $subflow_nr" + fail_test + dump_stats=3D1 + else + echo "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && ( ss -N $ns1 -tOni ; ss -N $ns1 -tOni | grep= token; ip -n $ns1 mptcp endpoint ) +} + chk_link_usage() { local ns=3D$1 @@ -2556,7 +2583,7 @@ fastclose_tests() fi } =20 -implicit_tests() +endpoint_tests() { # userspace pm type prevents add_addr if reset "implicit EP"; then @@ -2578,6 +2605,23 @@ implicit_tests() $ns2 10.0.2.2 id 1 flags signal wait fi + + if reset "delete and re-add"; then + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow + run_tests $ns1 $ns2 10.0.1.1 4 0 0 slow & + + wait_mpj $ns2 + pm_nl_del_endpoint $ns2 2 10.0.2.2 + sleep 0.5 + chk_subflow_nr needtitle "after delete" 1 + + pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow + wait_mpj $ns2 + chk_subflow_nr "" "after re-add" 2 + wait + fi } =20 # [$1: error message] @@ -2624,7 +2668,7 @@ all_tests_sorted=3D( d@deny_join_id0_tests m@fullmesh_tests z@fastclose_tests - I@implicit_tests + I@endpoint_tests ) =20 all_tests_args=3D"" --=20 2.36.1