From nobody Mon Feb 9 06:34:30 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:2547:0:0:0:0 with SMTP id l7csp459127edb; Wed, 9 Mar 2022 11:16:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjz5xHZPSwz87f7TrP9Aw83aj91Rs/rvTTCmnHQUZ0fMggMtkjZ41OJtEGZeNaXTI+sXmz X-Received: by 2002:a5b:9c2:0:b0:611:ad59:be04 with SMTP id y2-20020a5b09c2000000b00611ad59be04mr1070575ybq.405.1646853412044; Wed, 09 Mar 2022 11:16:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646853412; cv=none; d=google.com; s=arc-20160816; b=aLOOzsR7LLn2FgU1R3jxDZDvsx02bNKQeBouPYOpyboYSX2EDMIQqYMPcVr6/eQESn bIl9xbfvQoMNu3dEGxg+Dh9K7yfSy/ezFtxMaMgTCtwWeiCUyRZ8AioQu/R1Lx+23lzj afeUoV9J11FkLhhamcEVu5zlNxbGdTgWUw/ATeHqRjw7nuUiMwPW0nikUMdCaOG5cY7X ljYJFJTR5rmLm/xoNlLiYtx/+LN2RCJmuK6s+8IRcbkd0oZszsp1Ke/PMUHN0pfmn1Y+ pCuXUUvaX+eJsVhnI/Ls41Iw+4TCA+LOBksfFAI0JfEMG6aILVv3Xk5BOs78gL/Woohp JFWQ== 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=h4hnu+oBYv2PLqnzRWlJn79sOIUdVgU5bGWHrROnL6Q=; b=ElQeXiv/Txkk2Fn3LvGXClFFSDgAA2ChhXiQL1DhIQN3Y4RBTJZK2G9mJPB5gbpk5K 6M/G2tovc5bCa3OJP6SwRuMHRtclFz7W7p8iZKAWq6MycYDlQ/tr4a2pDhbUNPd6WehE /d39XkI5yWKS3ZQqYDn5vNNn6YKQhyCqH/nH637WenMGy9PuYxCxauj+bdqnYpOQ1qN/ LLW/6yXFojg9JAoL+3WkwwMVybghDqa4zY6SJ3us740kBlnsFdv3HNuuihqlfQNL3aXA LK0vz/nZPY/T5ypW7i06CDDdPDZHPBHiNJMQsVYThjkMcONPcDw/GwGOdap+OsMAkeXI ytyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=egABPi+9; spf=pass (google.com: domain of mptcp+bounces-4190-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4190-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 m203-20020a8126d4000000b002dbfc55ea37si1764474ywm.295.2022.03.09.11.16.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Mar 2022 11:16:52 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4190-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=egABPi+9; spf=pass (google.com: domain of mptcp+bounces-4190-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4190-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 A98C01C0A44 for ; Wed, 9 Mar 2022 19:16:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0A5F15118; Wed, 9 Mar 2022 19:16:50 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 ED3775117 for ; Wed, 9 Mar 2022 19:16:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646853408; x=1678389408; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KjwpKHKPk6DxsM4E4JAU6Iqx3U6k1OqYhwwTVEAH2c4=; b=egABPi+9MyhatTBfKaq4Ktfz28TeJqIyy2OG9dPwIzi/NrAnLog4Jcr0 N3lvWXBDgsjuLTxAS7t+gUIEyIUzAptQXOC25qY63YVJgEQxEsDI50vZB pjc2f0tdgblOQ9ZY+iE6S25p9hPdOs1tFSdUU8ialozQw50A1stm0BcuN mhoNB++blutjDklAzjrXicm5CtQhbikSwx+Xrbptc6W8jEPOXIxsiiL3k ynpBr40wwMLDJL1pxham6TDqk/6rqiqM6vVmxMKmuuYO05PZGkAojzz4Q OpzpTPXyYd0k8hcJ/gALyuJcdGTlJDFnRVSruCUN4lsnU7ull2axJ4Ggp Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10281"; a="255011971" X-IronPort-AV: E=Sophos;i="5.90,168,1643702400"; d="scan'208";a="255011971" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Mar 2022 11:16:46 -0800 X-IronPort-AV: E=Sophos;i="5.90,168,1643702400"; d="scan'208";a="495957052" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.194.198]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Mar 2022 11:16:45 -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 01/10] selftests: mptcp: drop msg argument of chk_csum_nr Date: Wed, 9 Mar 2022 11:16:27 -0800 Message-Id: <20220309191636.258232-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309191636.258232-1-mathew.j.martineau@linux.intel.com> References: <20220309191636.258232-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 dropped the msg argument of chk_csum_nr, to unify chk_csum_nr with other chk_*_nr functions. Reviewed-by: Matthieu Baerts Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ee435948d130..194c4420220e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -16,6 +16,7 @@ capture=3D0 checksum=3D0 ip_mptcp=3D0 check_invert=3D0 +validate_checksum=3D0 init=3D0 =20 TEST_COUNT=3D0 @@ -60,6 +61,7 @@ init_partial() done =20 check_invert=3D0 + validate_checksum=3D$checksum =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -192,6 +194,8 @@ reset_with_checksum() =20 ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=3D$ns1_enable ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=3D$ns2_enable + + validate_checksum=3D1 } =20 reset_with_allow_join_id0() @@ -853,9 +857,8 @@ dump_stats() =20 chk_csum_nr() { - local msg=3D${1:-""} - local csum_ns1=3D${2:-0} - local csum_ns2=3D${3:-0} + local csum_ns1=3D${1:-0} + local csum_ns2=3D${2:-0} local count local dump_stats local allow_multi_errors_ns1=3D0 @@ -870,12 +873,7 @@ chk_csum_nr() csum_ns2=3D${csum_ns2:1} fi =20 - if [ ! -z "$msg" ]; then - printf "%03u" "$TEST_COUNT" - else - echo -n " " - fi - printf " %-36s %s" "$msg" "sum" + printf "%-${nr_blank}s %s" " " "sum" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '{= print $2}'` [ -z "$count" ] && count=3D0 if [ "$count" !=3D $csum_ns1 -a $allow_multi_errors_ns1 -eq 0 ] || @@ -1064,7 +1062,7 @@ chk_join_nr() fi [ "${dump_stats}" =3D 1 ] && dump_stats if [ $checksum -eq 1 ]; then - chk_csum_nr "" $csum_ns1 $csum_ns2 + chk_csum_nr $csum_ns1 $csum_ns2 chk_fail_nr $fail_nr $fail_nr chk_rst_nr $rst_nr $rst_nr fi @@ -2181,28 +2179,28 @@ checksum_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 - chk_csum_nr "checksum test 0 0" + chk_join_nr "checksum test 0 0" 0 0 0 =20 # checksum test 1 1 reset_with_checksum 1 1 pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 - chk_csum_nr "checksum test 1 1" + chk_join_nr "checksum test 1 1" 0 0 0 =20 # checksum test 0 1 reset_with_checksum 0 1 pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 - chk_csum_nr "checksum test 0 1" + chk_join_nr "checksum test 0 1" 0 0 0 =20 # checksum test 1 0 reset_with_checksum 1 0 pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 - chk_csum_nr "checksum test 1 0" + chk_join_nr "checksum test 1 0" 0 0 0 } =20 deny_join_id0_tests() --=20 2.35.1