From nobody Mon Apr 29 12:06:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1057268jad; Thu, 17 Feb 2022 19:03:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJx5gYjYGus+oat8fskjVf4s1A5CXHf45QsNf86KDjc7viYE9tgnBOGsnJKIpBgLQbOMSZyN X-Received: by 2002:a17:90b:4ac4:b0:1ba:3b4:d3c with SMTP id mh4-20020a17090b4ac400b001ba03b40d3cmr10363316pjb.201.1645153414861; Thu, 17 Feb 2022 19:03:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645153414; cv=none; d=google.com; s=arc-20160816; b=DyWI2CkpfOixEgZ7tE30aIESYIUpsRxEiDIM+8gNGmNmeE6f/jJV9z5kUN9Tff+hn9 qhqhicyVvazOp/JgSljcBhWih0XKbgk9mXX1WwiB5zOTPWvvqRbRDjVgKJ4RCMQW4F1T Dl73ALW9ShiI7o7v7fjn8GRFu3D23cdAM5XaD2aV5MWUVQPg8HacldxHFos2TxmwP2Bj yHyarNPV4ZdtABuxbGBmh73KDH7275HEwhdXz0zLU7VApum74lXNVPjshLbOgG4Jy4UJ S5V2Kx6LOfRClqWNq5Fz/GvNN63tc+Sy97i9+6n0whdrSWAMqFxjwE8jolCSB0s+88ux Z/zQ== 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=vgomgTyyYF6iX+E8fc8SrSGNfVrbraOhGDqQwfr3/y4=; b=x3HQ/ezFbH2NgyTmC1dhnsUKUrOOOX0dAYEALo79kJibB1GmFXqIFYxydpYSg7Anob PFZGhbbOqD0wjnJjkTtj5EgNH7sI3CA/VYa+i+2IAAHVJqfgcmUtvbsjfYZkn5OkZjfv nTetaS/NfEHXfSVq1AkMkPYd2jCMOghOSlYa+rhjPxpg7D/QY1D5ONPNtSd9CTQzf0ob s24H6quy4Av7NQWwMoY/jF5vg3nZju+FRBuCS1s0Q2Q96wjzBADv/5LxaXLGToxQtVEc Yo+Un4pU6LrQJ4at3+kCaajS2H8nDA3W8yYdF1zbHCULYtkbS2oxZOaN69VP8qMP8bgV CCGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=L5iXO7N3; spf=pass (google.com: domain of mptcp+bounces-3835-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3835-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 ch22si2427711pjb.183.2022.02.17.19.03.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 19:03:34 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3835-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=L5iXO7N3; spf=pass (google.com: domain of mptcp+bounces-3835-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3835-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 6A74A3E1015 for ; Fri, 18 Feb 2022 03:03:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4823D3200; Fri, 18 Feb 2022 03:03:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 154074373 for ; Fri, 18 Feb 2022 03:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645153410; x=1676689410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rJcUjjhStw1S/M4Ov0UOD4j8IEQ/i/HzgPMq0VdQJRk=; b=L5iXO7N34UQ8/SU40YCBhlKC8amFleVZ9ecK0WgPHcIUCuBAK3bhRB3l seqe9iW9wvu6P9qVzBI+19bCp0dFNz+vG555rqpraU7wEs/O/7wjyBWTL mUa+x/g7S/LAo32e0WT1XCp6jDVrNVMnGN5ovV1xn9ABOlix1KHMVJvL/ Yrh7klYjy4qyjy4sBx/LjySJor5j8T5+F3AD+GQd2BDh5CDATZWIfzgdZ uAqIm6N/7rggn3aCHzaozuV1Yd+L5kn+zaVjfm6Mt2EF5L+NpD2p11JvK VMdRH1+uc4AMpOADHKVEh6NJ1CGi+7F2k2Kt39PhbURyLybcsCf0fPSO+ Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231021635" X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="231021635" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:17 -0800 X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="635431891" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.101.109]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:17 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Matthieu Baerts , davem@davemloft.net, kuba@kernel.org, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 1/7] selftests: mptcp: increase timeout to 20 minutes Date: Thu, 17 Feb 2022 19:03:05 -0800 Message-Id: <20220218030311.367536-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220218030311.367536-1-mathew.j.martineau@linux.intel.com> References: <20220218030311.367536-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: Matthieu Baerts With the increase number of tests, one CI instance, using a debug kernel config and not recent hardware, takes around 10 minutes to execute the slowest MPTCP test: mptcp_join.sh. Even if most CIs don't take that long to execute these tests -- typically max 10 minutes to run all selftests -- it will help some of them if the timeout is increased. The timeout could be disabled but it is always good to have an extra safeguard, just in case. Please note that on slow public CIs with kernel debug settings, it has been observed it can easily take up to 45 minutes to execute all tests in this very slow environment with other jobs running in parallel. The slowest test, mptcp_join.sh takes ~30 minutes in this case. In such environments, the selftests timeout set in the 'settings' file is disabled because this environment is known as being exceptionnally slow. It has been decided not to take such exceptional environments into account and set the timeout to 20min. Signed-off-by: Matthieu Baerts Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/settings b/tools/testing/sel= ftests/net/mptcp/settings index a62d2fa1275c..79b65bdf05db 100644 --- a/tools/testing/selftests/net/mptcp/settings +++ b/tools/testing/selftests/net/mptcp/settings @@ -1 +1 @@ -timeout=3D600 +timeout=3D1200 --=20 2.35.1 From nobody Mon Apr 29 12:06:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1057213jad; Thu, 17 Feb 2022 19:03:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8kUPdgpCLrD/jjwj6kPTWTNhgGAK4pT+GbpCQvMGanO5IsPrHuppJGseVNdrLiZDgQiF6 X-Received: by 2002:a05:620a:d96:b0:60d:f146:4b0f with SMTP id q22-20020a05620a0d9600b0060df1464b0fmr2183575qkl.194.1645153410301; Thu, 17 Feb 2022 19:03:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645153410; cv=none; d=google.com; s=arc-20160816; b=sIl+6bYkN8bL5fJa02CP1/gP+q7hgleAhDBrxDb72VfpRVijdoNUvEXRC1Dq7S+SFg qLOnr/P6PANLM+pdkECIU9ptBfih1eRWM0BA9mxFhtbH4kZRXBMgfvpike2EuSw/Yq1d gdMMDnCPBYNFm8b/SclCqeNTXku4nGVynj2tVgNRS3ShryAq4qEu8y6Y7CrHEi+2JTZY MtSxuy3fVNAslF89UhL/vmPang7YAGR4qOjuAS3vbHpZ0/1wb2bBm3Xay8Ck/QQqCBDa hIWTa31Q11s5qQ9cPNtNpJjLlFfH4jD4+yqguVVoVsq8lgrY4UTme0LmR7AydjYt75Pj LULw== 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=B84kNheiiAJDFCfTwoV9euVO/uNwZcw4QwM6Vv1DegA=; b=rOl8/2lth/Yh5jfESlnCIM3Ro8qNJLhC5ESzPQKnHTIQYUdHbUxh/ox3Rb7+CZhVGX I5tP0FWmKs7AO3u8n02JA13QIFskkUxBT0gFrtNuFNsfm9fqJDQNJcrbj9DZdCyj2xXp ePlo5bN2Xf4/3y8fKE6+tobw5pQ2OqgtnBSRu8pYUIkTdk3vqUo4paFIRifxbwinfxi8 jqyzt8gLXElUN5o+Cg8gM/6qGzQ8m/uiqNVIwK0r7reS/RCYZY/w3XWUgdhNlq1cnEmi 4SRVnRjBsgWXnVjP0gvMqd/ouRC5bH++ifGibFEBBNzFQh1EBXuOBz4ggA2HA6PG75rK rSIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kpHgwyor; spf=pass (google.com: domain of mptcp+bounces-3832-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3832-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id b21si11326565qtb.487.2022.02.17.19.03.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 19:03:30 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3832-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kpHgwyor; spf=pass (google.com: domain of mptcp+bounces-3832-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3832-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 17B851C0D2B for ; Fri, 18 Feb 2022 03:03:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B9BCD38DA; Fri, 18 Feb 2022 03:03:27 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 3EB834359 for ; Fri, 18 Feb 2022 03:03:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645153406; x=1676689406; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WbGXLDoYtJJu27wCa1qwhlZvWNzqWHDcYOCMw2OmxPg=; b=kpHgwyorPHy1LiRL1vqP9mMOst1AliAt86G3sfRXuG7HFTMJgyTsP3Lr xkLkoG90bsdWU/J4dI3aIwTFfILy8q5JKMwkyYYKnKHWTRvFTzbC69wWh lDVgtGm7GRqkkNHamo9M5hpMn5c4hHuzFY49Ga6DPbfr6b+Uf6mjSpJkR Eyx5ImpcHnGu7Q+ebT+m5gu9o1uYbnpGh1PaDLKGsy4QsfuLJHpfOV58L 8pj+tX3y+iWwznKvqT1HjpQ3fuR7ZPPXPpZEN2s4qE3V39jPgmX1uwCCh 5BtYv5bBpenxpqwjGPUX9b4Ii2KEGJHz0eEQVoECA6KMWf+KDM8ByO57m A==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231021638" X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="231021638" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:18 -0800 X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="635431898" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.101.109]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:17 -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 2/7] selftests: mptcp: simplify pm_nl_change_endpoint Date: Thu, 17 Feb 2022 19:03:06 -0800 Message-Id: <20220218030311.367536-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220218030311.367536-1-mathew.j.martineau@linux.intel.com> References: <20220218030311.367536-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 simplified pm_nl_change_endpoint(), using id-based address lookups only. And dropped the fragile way of parsing 'addr' and 'id' from the output of pm_nl_show_endpoints(). Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 37 ++++--------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 18bb0d0cf4bd..bbcacaaf81ce 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -240,16 +240,6 @@ is_v6() [ -z "${1##*:*}" ] } =20 -is_addr() -{ - [ -z "${1##*[.:]*}" ] -} - -is_number() -{ - [[ $1 =3D=3D ?(-)+([0-9]) ]] -} - # $1: ns, $2: port wait_local_port_listen() { @@ -379,16 +369,13 @@ pm_nl_show_endpoints() pm_nl_change_endpoint() { local ns=3D$1 - local flags=3D$2 - local id=3D$3 - local addr=3D$4 - local port=3D"" + local id=3D$2 + local flags=3D$3 =20 if [ $ip_mptcp -eq 1 ]; then ip -n $ns mptcp endpoint change id $id ${flags//","/" "} else - if [ $5 -ne 0 ]; then port=3D"port $5"; fi - ip netns exec $ns ./pm_nl_ctl set $addr flags $flags $port + ip netns exec $ns ./pm_nl_ctl set id $id flags $flags fi } =20 @@ -591,24 +578,16 @@ do_transfer() for netns in "$ns1" "$ns2"; do pm_nl_show_endpoints $netns | while read line; do local arr=3D($line) - local addr - local port=3D0 + local nr=3D0 local id =20 for i in ${arr[@]}; do - if is_addr $i; then - addr=3D$i - elif is_number $i; then - # The minimum expected port number is 10000 - if [ $i -gt 10000 ]; then - port=3D$i - # The maximum id number is 255 - elif [ $i -lt 255 ]; then - id=3D$i - fi + if [ $i =3D "id" ]; then + id=3D${arr[$nr+1]} fi + let nr+=3D1 done - pm_nl_change_endpoint $netns $sflags $id $addr $port + pm_nl_change_endpoint $netns $id $sflags done done fi --=20 2.35.1 From nobody Mon Apr 29 12:06:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1057237jad; Thu, 17 Feb 2022 19:03:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2mfMWJ0nX9RAq5339JSZWKY0jPzRow5b79viU6Q7pN04veRNtEJ4tc6icbwcIVB0GlCM8 X-Received: by 2002:a17:903:2303:b0:14d:5605:28d7 with SMTP id d3-20020a170903230300b0014d560528d7mr5548685plh.72.1645153412995; Thu, 17 Feb 2022 19:03:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645153412; cv=none; d=google.com; s=arc-20160816; b=QCLWqsFl7XSf7iEHg43kXcN1QZsnI7dGkBvc6cEgENrGm2fmHkP7tOU2JPaa8ezv9B 1W6FpWtOqNxMPJJoSnrqZ+4M4TZPRXAW8QKX2fMNWBuKCiY+/bdphDQPXGF/7GuJqWcv PkcpRksCZHBNQsj3tM8STeQBCXBk7rKb2IUTXxVj2iGqR5GH7vV4gxBhfjO3eKWdNeyr iZm2p1n1rnXiLQIJSuJffTaeO7x004UH5TZ9sqMmpyc4mfF7uRyESqOsekW1dX31iWqL RhKCyXGRs0fU52tWCCSv0jx5EsFCCTm5KsZ1A7/2wXwqhBQ6747S/qNxdZChu6Htlndy RDbg== 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=vnQgRY/1qRDnsQ9FeDPrldbSmU8smR6mH5o/wG+8o1A=; b=JYOMfpNiXcUj0neMIH1oiWt6sBisIg5wmddHGEWUaygBeQn9cwIGV+dMagvaxFAYhf n1Sq6teOgjZvdz2A/1t/ozHMg880XcFWJDX6HVTqPrjvS7curbIkWFTnAIgKeXhTK2Ju Jni2G1QZ0HnzRTkkJjZInP0KoetELX9CLZz3INCWBJC8aAuYE7dPeLA5GqzjoqqB19qQ ARTWyGUZBQR7cPtjSzFsVerihJe7LFmQfHMOsk7kIifysxLEaMFMUXYrLWt8kTPwlwev v5gFOQFTx+8WJp6EAH/kd1coVlp5JQ0pldUA6slMX4OGbNiPc0X+frTujOFfpDru4JH1 Pjtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lHXXpuil; spf=pass (google.com: domain of mptcp+bounces-3833-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3833-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 w8si1306660pfc.168.2022.02.17.19.03.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 19:03:32 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3833-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=lHXXpuil; spf=pass (google.com: domain of mptcp+bounces-3833-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3833-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 359C43E0FFD for ; Fri, 18 Feb 2022 03:03:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 561CF38DA; Fri, 18 Feb 2022 03:03:31 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 00F444359 for ; Fri, 18 Feb 2022 03:03:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645153410; x=1676689410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XNSbF2ralo2Cs3IT9LvtSwn9jScnNXYztNFwwiSYUqQ=; b=lHXXpuildDfdsQtkGSEdiX0ArIwhaNWNKSqUbBgoBnKXRbZvFwwJagRZ zegzvz8gSKdK/Uty1IE8AVWCTb5LzgcTbcx9XaUvNRVCFP6UTRDDJxeT9 uxd7dpoK6LQw9JiC8G1v0IP+Bq+Z7BIMGun4Nzv4K5UDbuMQfXRFvyClB Ugdcz+jAU4qEcG4fiJmlqboIY/qJeJFT7TJ1+T/vXzwKG4Zzt4qWnqZj3 QOMX4fPDe2AgV46hg01fMaGa3S0moa9ufLNTrljO8AVaY95lM0/WdvvpR WWf+8Hvo+44DuPQAhuN99y48ypA156nqBvP8eoqXXPAww2jaB7yVnTYcv A==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231021640" X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="231021640" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:18 -0800 X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="635431904" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.101.109]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:18 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Matthieu Baerts , davem@davemloft.net, kuba@kernel.org, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 3/7] selftests: mptcp: join: exit after usage() Date: Thu, 17 Feb 2022 19:03:07 -0800 Message-Id: <20220218030311.367536-4-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220218030311.367536-1-mathew.j.martineau@linux.intel.com> References: <20220218030311.367536-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: Matthieu Baerts With an error if it is an unknown option. Signed-off-by: Matthieu Baerts Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index bbcacaaf81ce..1a881a21e7ef 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2077,8 +2077,14 @@ all_tests() fullmesh_tests } =20 +# [$1: error message] usage() { + if [ -n "${1}" ]; then + echo "${1}" + ret=3D1 + fi + echo "mptcp_join usage:" echo " -f subflows_tests" echo " -e subflows_error_tests" @@ -2099,6 +2105,8 @@ usage() echo " -C enable data checksum" echo " -i use ip mptcp" echo " -h help" + + exit ${ret} } =20 sin=3D$(mktemp) @@ -2187,9 +2195,12 @@ while getopts 'fesltra64bpkdmchCSi' opt; do ;; i) ;; - h | *) + h) usage ;; + *) + usage "Unknown option: -${opt}" + ;; esac done =20 --=20 2.35.1 From nobody Mon Apr 29 12:06:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1057292jad; Thu, 17 Feb 2022 19:03:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJxr9fHddXPHkkmi+TgK1+KxLwZkRmow3XfK/Kh4dL5tijdUhi3EPUAdThaUbd5PQUHiKjlx X-Received: by 2002:a05:620a:2714:b0:60d:fc4c:a026 with SMTP id b20-20020a05620a271400b0060dfc4ca026mr1331218qkp.238.1645153416124; Thu, 17 Feb 2022 19:03:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645153416; cv=none; d=google.com; s=arc-20160816; b=krLG4ZXtR7xl+sFKmAvRhAUA4DWkl1hmU0DrWXbxqhxQ8lmEjSaZv3gKtZEKgsyYZS wDDltstLDW1GYOs2lk3G52wRPB1kNVjXZszXQtXcnce+eXxG69LwUmbOUKYeu4G5ucQm a8bs5X90iNgL3bqcBIkVDSUqZzh8Jmmn1u1o1rpvgj5vR8/myD1A7qktVSKdfCz1N1FP VGvOy0lR8Nnbad1XRu3+rF4GcTivBafHIxgbjMdVW7O0czrdyWkIljTiMU8/QkbvvWzc 2GSGLBU4DY2/+L8LF5eBm/KKd0XJq+inqCLgmhrOHyzCsKhXxA0qxhbraVqRzBmMm2St aLZQ== 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=OzsLvVy2cUTA6NjK76TTrK/S8oQgDtTKnvHtajD1agI=; b=we1xrTmwHh9ID6FCVr2MvjrSF3EkOgXcfNYIDnE7B+jXXgMMLSPHm9vQUHDz6qypou x428sQRYcAD0t5GWAnaSpbFnpxadYb9joFdIE2konnFQENO2Cllg7dExXRmnrOLP1bLB tf6/R26C6yuWmUD1+TSK5Ufv4CDRZznlzx0+cCLhg/k/KEqqahI5gcdUgEpoTATQFhXE X4Y50P0LuZkBs9/XrCxGdoXRCW20+1XsmG3dQEO48HJJt97vxK6dDmw2UwOkjw7bFy5u lJfFxCCXs76rwZah2hp8oFjLH9ZCkufwdgVJegG6KE7dzNfn2mfoEVIFwbddsY5zQjSJ xKXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fXD2a8jZ; spf=pass (google.com: domain of mptcp+bounces-3836-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3836-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id bj36si9728401qkb.370.2022.02.17.19.03.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 19:03:36 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3836-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fXD2a8jZ; spf=pass (google.com: domain of mptcp+bounces-3836-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3836-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 ewr.edge.kernel.org (Postfix) with ESMTPS id E60751C0E85 for ; Fri, 18 Feb 2022 03:03:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9E0DB3202; Fri, 18 Feb 2022 03:03:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 712804359 for ; Fri, 18 Feb 2022 03:03:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645153411; x=1676689411; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U1szUR6pqUI2yP1NLV6igd+jmVjkx9CEqyJEDcke89k=; b=fXD2a8jZjaKL8dl8fjEfTTTRfLDrWCFscBiIvDl59Y5pWoaFQniY8EiU askjTu6ABpEypXJkZHRAHQd5GvvRF3zlv+qQptAz2MumAsBB6CyI5OZWR p9oQx8ZrW7kMMfH1L90Th41yyOnz53RHMh4fd5KkJ1nU1ltjEOR3o4rWc vsGxx3niBsb1l4LHg2jKGafl52SX916KsjOvm2MPOw3p74OhcbDi/Lqun o+Ccs02mOXWfKxaDG6PBDtINSs+DbLsipDfJpaPY+T06/wTWF7E2VGSFS HHQpjl9mYcWfR8ukxZGpaogRNPZDTKkgbzt3r+mERfYuI+lFJYDeXmAl7 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231021642" X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="231021642" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:19 -0800 X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="635431917" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.101.109]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:18 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Matthieu Baerts , davem@davemloft.net, kuba@kernel.org, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 4/7] selftests: mptcp: join: remove unused vars Date: Thu, 17 Feb 2022 19:03:08 -0800 Message-Id: <20220218030311.367536-5-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220218030311.367536-1-mathew.j.martineau@linux.intel.com> References: <20220218030311.367536-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: Matthieu Baerts Shellcheck found that these variables were set but never used. Note that rndh is no longer prefixed with '0-' but it doesn't change anything. Signed-off-by: Matthieu Baerts Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 1a881a21e7ef..c6379093f38a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -42,7 +42,7 @@ init() { capout=3D$(mktemp) =20 - rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) + rndh=3D$(mktemp -u XXXXXX) =20 ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" @@ -665,8 +665,6 @@ run_tests() addr_nr_ns2=3D"${6:-0}" speed=3D"${7:-fast}" sflags=3D"${8:-""}" - lret=3D0 - oldin=3D"" =20 # create the input file for the failure test when # the first failure test run @@ -694,7 +692,6 @@ run_tests() =20 do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \ ${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${sflags} - lret=3D$? } =20 dump_stats() --=20 2.35.1 From nobody Mon Apr 29 12:06:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1057322jad; Thu, 17 Feb 2022 19:03:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyGePQl/DGRdc4Pku9c4try7PdxA+90+Er8DH0LEprunmIoexXt00aw+K5Kjv0TCRcUl68N X-Received: by 2002:ac8:5885:0:b0:2dd:53a5:5650 with SMTP id t5-20020ac85885000000b002dd53a55650mr4088950qta.53.1645153418381; Thu, 17 Feb 2022 19:03:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645153418; cv=none; d=google.com; s=arc-20160816; b=vEFV2T2sV29my6Ev6K/5bHM9vYIk29uGQkpeRXcyAAzhFqW3Ur0OqLbBh2GMlq3wN5 FJe8lgAQBCaxVvEMm1qaOc+mIxmW8aHe76h9VRJLpuAuogs9L3RZ92xoZYDJGmuUJjBD IzP96J16UH0n8DzTQq030V+vUsfOazA071dd/ipOZD3OL5UT7Elm5qzcO/4MMruynelJ JMInMKNgsLwta8IB7tOUhoWYhD7jMzJwezYV97d6SCNIICjHMdfEFJCJ0EtWsVl/5W41 Elt0tYw1nZBAc9/3MjxCBhhdHcxWgBosjuMFXMqSQ12GQRWIDSIz6lWWhvHN7limpId9 +oKw== 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=HNdKyQxDRArLwR7Pei/4kHzezKTimd5dUKs43ypOPsg=; b=XZw6lVQ2ImtXUIjpVXSI9Bv+q6+3G+XaQGVWadlqkGnYFIi/zRFZIl/eAelYMC8j8w R6zV88MhkmD8A8JEqog6fnYkpV/JVWXstxQEx/IZCF6HhphFb6Fe6/YG7ZnR+ngUhqCj hEbMOwMTEUV/jgmKHJGn1t8WNCDHS8H1lBeWvMopjXPl7XrX2ed89u6B9Fy22rqaBV43 LnoZXU2x4fgiQ477uPD+1Rdm/PdyBKMiLvQN2U0CkaGWMEmGzL/Pcm272fL4BnkgwUS9 asMk2FL3ct04SmoQftJLGX9CDQBQMCLn22FPU0+rVxxBhVV9FDe4KXZw9HODkmGdyvtv dZaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=n4B3ArsK; spf=pass (google.com: domain of mptcp+bounces-3838-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3838-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id c21si11173558qte.437.2022.02.17.19.03.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 19:03:38 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3838-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=n4B3ArsK; spf=pass (google.com: domain of mptcp+bounces-3838-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3838-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 1A7251C0F0B for ; Fri, 18 Feb 2022 03:03:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 750163204; Fri, 18 Feb 2022 03:03:33 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 58F603201 for ; Fri, 18 Feb 2022 03:03:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645153412; x=1676689412; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=A4UCyKVS+ECivE7dWa84k+oB0wXq0H5Wl3tdPlE5ETM=; b=n4B3ArsKeMxKl7evzp0RvCpN1Z17Md8OlxQlpxrzLdmPWpz4BC7KLipV mKpPQmqxTntCVtvRNQFNULV3fmsrsxE2ZwkEgKCipm3t8gE3OjS7ST4JZ EDiq/1P991reQAm01lvROMbRv34JPeYVFNFDMlFoJ0QJdCjSHq9am0Z+v WVcM3MjpWkuSdc/0YlA1csxVFcSCzIFNVhO1V3qODw9tx/3OtRHr90grf KUEErL1ihlo3A4FHNuvgywePdlgEz0HCtcvxBj2Ph0xinPkyhCGiU67Jy WjCyCeIrTsRczqriPP2Hq5b68o4ZmOB+vKou3CaS5alogtqwtbCfNGsdx w==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231021643" X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="231021643" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:19 -0800 X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="635431937" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.101.109]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:19 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Matthieu Baerts , davem@davemloft.net, kuba@kernel.org, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 5/7] selftests: mptcp: join: create tmp files only if needed Date: Thu, 17 Feb 2022 19:03:09 -0800 Message-Id: <20220218030311.367536-6-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220218030311.367536-1-mathew.j.martineau@linux.intel.com> References: <20220218030311.367536-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: Matthieu Baerts These tmp files will only be created when a test will be launched. This avoid 'dd' output when '-h' is used for example. While at it, also avoid creating netns that will be removed when starting the first test. Signed-off-by: Matthieu Baerts Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index c6379093f38a..63340bb76920 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -17,6 +17,7 @@ capture=3D0 checksum=3D0 ip_mptcp=3D0 do_all_tests=3D1 +init=3D0 =20 TEST_COUNT=3D0 =20 @@ -38,7 +39,7 @@ CBPF_MPTCP_SUBOPTION_ADD_ADDR=3D"14, 6 0 0 65535, 6 0 0 0" =20 -init() +init_partial() { capout=3D$(mktemp) =20 @@ -98,6 +99,21 @@ cleanup_partial() done } =20 +init() { + init=3D1 + + sin=3D$(mktemp) + sout=3D$(mktemp) + cin=3D$(mktemp) + cinsent=3D$(mktemp) + cout=3D$(mktemp) + + trap cleanup EXIT + + make_file "$cin" "client" 1 + make_file "$sin" "server" 1 +} + cleanup() { rm -f "$cin" "$cout" "$sinfail" @@ -107,8 +123,13 @@ cleanup() =20 reset() { - cleanup_partial - init + if [ "${init}" !=3D "1" ]; then + init + else + cleanup_partial + fi + + init_partial } =20 reset_with_cookies() @@ -2106,16 +2127,6 @@ usage() exit ${ret} } =20 -sin=3D$(mktemp) -sout=3D$(mktemp) -cin=3D$(mktemp) -cinsent=3D$(mktemp) -cout=3D$(mktemp) -init -make_file "$cin" "client" 1 -make_file "$sin" "server" 1 -trap cleanup EXIT - for arg in "$@"; do # check for "capture/checksum" args before launching tests if [[ "${arg}" =3D~ ^"-"[0-9a-zA-Z]*"c"[0-9a-zA-Z]*$ ]]; then --=20 2.35.1 From nobody Mon Apr 29 12:06:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1057246jad; Thu, 17 Feb 2022 19:03:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJzFjIQo3P8tc8VtF2VJR8SrC3vP5Ui9Afsc9ibb/Rk0tGks6fHjfC/YhIJtWyepjoq9G0um X-Received: by 2002:a17:90b:814:b0:1b4:3a19:1b5f with SMTP id bk20-20020a17090b081400b001b43a191b5fmr6301794pjb.214.1645153413461; Thu, 17 Feb 2022 19:03:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645153413; cv=none; d=google.com; s=arc-20160816; b=QPTwth+JYCjnJKFut0cfrUSDgA9cXFxE6jozSq5+EHYSIu7c29c4o97G36aEi+Tjju PNzP0rWyc0dQ/fPer6qi5sKKODQ2x2Z//TI505NWtWnY+ZSKWHV7PKx4j453HnZkiiKr aaS+u66Td6ustVKZr87Iz4PLGfU616QVEYMxiQ2ARvyhI6KP4+n5iv8VsE0aDuxmPpNU JiX5L+b/w6fuJh44YbpY6r0t/c7rsDO2zWi9/I+IlCBM7yBaDbnRnUFiIb6l30BRSY5i w0kLSAW3Zd9TQ890UrOpoWz3BSMjVJuX9SZLfBIuV0uhoGOzWC3yMedeuA55oKOu41rc 7JcA== 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=2agl5jHZdiqR9ZCbwJwvJxCKgFjcDevu+BXQC8E/Sro=; b=n9R8gOLVpoROXbi+J+r6eI38zVauMmkTsq8BgcdssBaX/hJTa7/dL+nNTQ3UBrWnLe 6AgmbgHoyJqAEIdI4TPY40/mrZty1GMyWE9AXPdmY7fNOG9ohdsgHJh84K7mNmDHwSfz VRMPiDnTYKaQSREaLbW5nlTsdJMK9PrDygG/eh9BvNcW/XpYpT7C4iAJyUDQACnoniZu mmeMHYA0gzcCnKi7Yz/7fEjf2hgZdSAkhZ6ft6UheFhzO9aHNWmoqzzylwt5mK40g1E+ AHLFX7qhfyKbpyh7wM0Wc6FaLjShdx1DnWyZYp3HdDvPrVwGWm8fuPwi9mHbnKFcRqJv P3yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=d4vIbnDq; spf=pass (google.com: domain of mptcp+bounces-3834-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3834-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 w8si1306660pfc.168.2022.02.17.19.03.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 19:03:33 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3834-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=d4vIbnDq; spf=pass (google.com: domain of mptcp+bounces-3834-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3834-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 3A0993E0FF3 for ; Fri, 18 Feb 2022 03:03:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 72A6A437F; Fri, 18 Feb 2022 03:03:31 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 11652435A for ; Fri, 18 Feb 2022 03:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645153410; x=1676689410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ChdVtpx2FTn8UBnKC5Z+NGmbaMbZRte5dZCcVFncSNY=; b=d4vIbnDqJ6+XNYosXdc2AoOwKU+7LSDuGo3XYx3qrpCCKMtIJ56eV9lL SfexV+EevKwuhugQZ8BGdn4IEn1RcvBKooga14+8WEKClBXhWlomEw2RE V35gM3GZVOqgH8leB3Q6NtqKSbMsufkvZ8Qc9+ausfotSboGf8K4yyJW8 DISbyuwYXDmREF/rFvTFZbN/3zWcQEOTU6nLEBR+9agc+2CZkSGrGHojU ZxfY1v3me4qCzyZ3tc7BrvGlaml9uHx0kknmcoE8nDBTnOZ4+T898eeu3 L3rThqfY4bgExsZtqQ2D31XpP3rtX7uxR6cAqrNha29JIAq5jYhs0kLd2 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231021644" X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="231021644" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:19 -0800 X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="635431953" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.101.109]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:19 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Matthieu Baerts , davem@davemloft.net, kuba@kernel.org, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 6/7] selftests: mptcp: join: check for tools only if needed Date: Thu, 17 Feb 2022 19:03:10 -0800 Message-Id: <20220218030311.367536-7-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220218030311.367536-1-mathew.j.martineau@linux.intel.com> References: <20220218030311.367536-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: Matthieu Baerts To allow showing the 'help' menu even if these tools are not available. While at it, also avoid launching the command then checking $?. Instead, the check is directly done in the 'if'. Signed-off-by: Matthieu Baerts Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 63340bb76920..725924012b41 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -99,9 +99,29 @@ cleanup_partial() done } =20 +check_tools() +{ + if ! ip -Version &> /dev/null; then + echo "SKIP: Could not run test without ip tool" + exit $ksft_skip + fi + + if ! iptables -V &> /dev/null; then + echo "SKIP: Could not run all tests without iptables tool" + exit $ksft_skip + fi + + if ! ip6tables -V &> /dev/null; then + echo "SKIP: Could not run all tests without ip6tables tool" + exit $ksft_skip + fi +} + init() { init=3D1 =20 + check_tools + sin=3D$(mktemp) sout=3D$(mktemp) cin=3D$(mktemp) @@ -183,24 +203,6 @@ reset_with_allow_join_id0() ip netns exec $ns2 sysctl -q net.mptcp.allow_join_initial_addr_port=3D$ns= 2_enable } =20 -ip -Version > /dev/null 2>&1 -if [ $? -ne 0 ];then - echo "SKIP: Could not run test without ip tool" - exit $ksft_skip -fi - -iptables -V > /dev/null 2>&1 -if [ $? -ne 0 ];then - echo "SKIP: Could not run all tests without iptables tool" - exit $ksft_skip -fi - -ip6tables -V > /dev/null 2>&1 -if [ $? -ne 0 ];then - echo "SKIP: Could not run all tests without ip6tables tool" - exit $ksft_skip -fi - print_file_err() { ls -l "$1" 1>&2 --=20 2.35.1 From nobody Mon Apr 29 12:06:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp1057303jad; Thu, 17 Feb 2022 19:03:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7OqSbCXQ2oylycfnzCp9HdFarDaded6urSYTu7LqvPWaiWyV3KGDPXl+l51o1c8PmzSRv X-Received: by 2002:a17:90b:4a48:b0:1b9:11a8:1cb9 with SMTP id lb8-20020a17090b4a4800b001b911a81cb9mr10395082pjb.7.1645153417116; Thu, 17 Feb 2022 19:03:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645153417; cv=none; d=google.com; s=arc-20160816; b=ITv2zlPrgdqlPDLBNmcmJqsz9n2sCk+mjKm4aEDBszplGZrJMZrazzzWsAXnk3C7sh 55In+lKtd1/B9EdxoZd41xYd2IAqAhGqLVoJZ6iYfDh3mTA0P8rvfq2MMKILdO5l5gjd XOuc9dSWQ15Ok4FixRhGpjApSH52fwBn84JyVjCu7Y5Jptde+tBB24lbAECd68raGiZu X+qGEbFPV/t5a/fsGWc9cGTn2inYNLjPLryVrL0Z5iAgNi35Oxc361D7F1PoHarNMC1a /vfqMoY0Sa427NNb+jSCF6uf23Gr82mYOsraPnjNgG1tOK44ik9JxA22a00iN0N5vagm MB5w== 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=PcElrckjLXmjwaJ8Uy7sOmMkHuanaD0OOLUgIlfexE8=; b=ZdDq7m+wXAaKlALvS785izDKJyqjwu1V1SNZVTW4Wy8MKmsCLuCvZQbm7XFB5Y6Zt8 J4gg/GkqV8WqTjIU0sxkwZhvXOXd3nGe+NUTa1t94UlJJeg8PwO4IEQYHG6sLN3px3vl +tKk6rox4fiw2yESMvH/NSgEInEYDIUb2mvcAwxpdJrwXPmetydxhou9wWZoMTRVxRoY zBYI05s+PKX/PGHEO9n5OAmfIVveP7dBu007l5LEfoyEFPP/Sdv+Xv0mptlMgFhIcg8Z 5o6DH9jGEl2cWFzz4yv0dwODcj9VGdK9EUkJBtumG95JRZlkBewyPJ4xB+jNwlKuRINW uCFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=V8s+MD16; spf=pass (google.com: domain of mptcp+bounces-3837-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3837-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. [147.75.69.165]) by mx.google.com with ESMTPS id g9si20832416plt.80.2022.02.17.19.03.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 19:03:37 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3837-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=V8s+MD16; spf=pass (google.com: domain of mptcp+bounces-3837-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3837-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 A8F463E1027 for ; Fri, 18 Feb 2022 03:03:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B62463203; Fri, 18 Feb 2022 03:03:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 7D880435A for ; Fri, 18 Feb 2022 03:03:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645153411; x=1676689411; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ATRa+uik1AsrOEVB2CM3pwo/U8VGumfyuTnhTNOouXM=; b=V8s+MD16YgKWRjvKw1lCf9BYajgEamg9rRpivPGaJHkunGL7Yq6kGncH cmTk9Le44QwikOvNG8/dUHubhHz+XoW+uPs9BYvNQqDWXwft+DZ2Rr2P7 Yxuphrk3EdfOkvjKvb4MmWfgvEmQvKIpS+zgVIfSm1OIP8b6VWRlD2bNk ZiekJ05mAmEUgTfqKlvcYFs7apbCCme56d9j9mLD08pDBXb22OIOBP4E9 tJzQYbLgsYuw5BAv88smmCsoclA7JGWT4dBQh++ZI6fuyZRjV1dST7v0/ nZ6BOitaqL/oX9J8Yt3G+r4FVGKtIQMmxamNdKyJitnQBZM2004tKV9PS Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="231021647" X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="231021647" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:20 -0800 X-IronPort-AV: E=Sophos;i="5.88,377,1635231600"; d="scan'208";a="635431968" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.101.109]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2022 19:03:19 -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 7/7] selftests: mptcp: add csum mib check for mptcp_connect Date: Thu, 17 Feb 2022 19:03:11 -0800 Message-Id: <20220218030311.367536-8-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220218030311.367536-1-mathew.j.martineau@linux.intel.com> References: <20220218030311.367536-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 added the data checksum error mib counters check for the script mptcp_connect.sh when the data checksum is enabled. In do_transfer(), got the mib counters twice, before and after running the mptcp_connect commands. The latter minus the former is the actual number of the data checksum mib counter. The output looks like this: ns1 MPTCP -> ns2 (dead:beef:1::2:10007) MPTCP (duration 86ms) [ OK ] ns1 MPTCP -> ns2 (10.0.2.1:10008 ) MPTCP (duration 66ms) [ FAIL ] server got 1 data checksum error[s] Fixes: 94d66ba1d8e48 ("selftests: mptcp: enable checksum in mptcp_connect.s= h") Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/255 Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../selftests/net/mptcp/mptcp_connect.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index cb5809b89081..5b7a40d73253 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -432,6 +432,8 @@ do_transfer() local stat_ackrx_last_l=3D$(get_mib_counter "${listener_ns}" "MPTcpExtMPC= apableACKRX") local stat_cookietx_last=3D$(get_mib_counter "${listener_ns}" "TcpExtSync= ookiesSent") local stat_cookierx_last=3D$(get_mib_counter "${listener_ns}" "TcpExtSync= ookiesRecv") + local stat_csum_err_s=3D$(get_mib_counter "${listener_ns}" "MPTcpExtDataC= sumErr") + local stat_csum_err_c=3D$(get_mib_counter "${connector_ns}" "MPTcpExtData= CsumErr") =20 timeout ${timeout_test} \ ip netns exec ${listener_ns} \ @@ -524,6 +526,23 @@ do_transfer() fi fi =20 + if $checksum; then + local csum_err_s=3D$(get_mib_counter "${listener_ns}" "MPTcpExtDataCsumE= rr") + local csum_err_c=3D$(get_mib_counter "${connector_ns}" "MPTcpExtDataCsum= Err") + + local csum_err_s_nr=3D$((csum_err_s - stat_csum_err_s)) + if [ $csum_err_s_nr -gt 0 ]; then + printf "[ FAIL ]\nserver got $csum_err_s_nr data checksum error[s]" + rets=3D1 + fi + + local csum_err_c_nr=3D$((csum_err_c - stat_csum_err_c)) + if [ $csum_err_c_nr -gt 0 ]; then + printf "[ FAIL ]\nclient got $csum_err_c_nr data checksum error[s]" + retc=3D1 + fi + fi + if [ $retc -eq 0 ] && [ $rets -eq 0 ]; then printf "[ OK ]" fi --=20 2.35.1