From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34186edc; Fri, 4 Mar 2022 11:36:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1NmJWSyXdeP4yszH/m55SK/o6XC907Q683VSfCychSn1xngFFuyR0WR/hePLYLdctjX4T X-Received: by 2002:a17:902:7002:b0:14d:76b9:2303 with SMTP id y2-20020a170902700200b0014d76b92303mr43592569plk.155.1646422610742; Fri, 04 Mar 2022 11:36:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422610; cv=none; d=google.com; s=arc-20160816; b=Ci8iA7AKSJ9JmlwJEHmK9eoaLmgPHikGMMJxxIVclYR7YdUQmpRA5FS8QB5+MMuiZN 8x6lBsWSY5IvwqP6P/wtRCOKbcKe7ohCtq4WOABxqCtXgxr6SLF2Zc6uJAOdHPeASjl4 +SpEC2xJwVgK9WJVq7bw1J/CkBdSQOYGpuEi8+hgggfsGs0w8xB2xB+CrB+SbT75eHf8 z8BXQMn+qkjMuPh78wm0p9K9NxwTExo8BnNUe7kcFLZVb9wnBWvlQbzZ1mpStuxZmJlE JEF5WBtzNjKtIXbdiyHAAZoN7lMsdIpEngro6kEuxyU5t7mt9AAyNa74CUsu7mnOKoSB gq6w== 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=5p4LQm0X/mFZcQ/h61y8JtFSpLJqFaZk4wMXWA6PCjw=; b=RZH/t8TWziHtKKlAEqjYcpXv+sHCl3GZY3U+estSipo0eLMxA+r9NBlCvBvDyBiBwy ZYiCY0amxyPzUTvrVWTKmfa5qM9K8emIliWrEt3bdNT/O+fSbl97zDMucgGo0jz6s0Zm +TKK3mZ5qmASPLBVDyHpLjGpcgHybcUOyz+9VLWlg52XPQBnOF40odYEQjrh/sRonrF4 8VDSvhEDlhVOLMsmawo76rZnpL6P3NbNhSSUT6LDdFAeK/Tjv5sx5FJSNAHJhzZ134hY F9fbynm322bFHMOnETq7WxtWrSNvUXCIPtZIH2tCze5du4VsjIxDq2UqZ2pcdVoZtOT/ aRXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HZRsIktL; spf=pass (google.com: domain of mptcp+bounces-4100-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4100-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 l6-20020a170903244600b0014f84dbf8bfsi5499888pls.586.2022.03.04.11.36.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:50 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4100-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=HZRsIktL; spf=pass (google.com: domain of mptcp+bounces-4100-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4100-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 4D0113E1045 for ; Fri, 4 Mar 2022 19:36:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5278342BB; Fri, 4 Mar 2022 19:36:47 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 AF8A87C for ; Fri, 4 Mar 2022 19:36:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646422604; x=1677958604; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=n0a7Bdid3bZzhZq3B9V6fr1g8ODVox60Jnhrg0u4Tgw=; b=HZRsIktL6WpUrZkqEj2IEfAY2V0sirKQrxCWQKaagtU5akYicYpcE+o+ g/zF5c/VOPIrUe4rFeh7cgtYOfBIBrSrgON6wALUjUiN50M2kmK8cuxpS MyEcpTYYWvpM+BdTFXq+NQ5lMm+q/OijhJhFsuB1VXvmkdLwfE4iRY4jg JfBYq9mmYbCbc9zqpIOWOf7gaQ2QqzsOcFvfW4qtu4qiZ4Ebg9hMSOcbY U0pxbMejJma0abp6x5XeCH3//OCnwVMA0KNGCXBGQaAexyfjUdKEmgcy5 jdlKpPW2HD6nSSMNDzFbPbn/53E6f0wLRnAbvjTBt/9kGvNvq4aKjN4pV g==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739501" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739501" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340777" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:42 -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/11] selftests: mptcp: adjust output alignment for more tests Date: Fri, 4 Mar 2022 11:36:26 -0800 Message-Id: <20220304193636.219315-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 The number of self tests in mptcp_join.sh will soon be more than 100, the output alignment is no longer OK. This patch adjusted it. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 77b359a49a47..88740cfe49dd 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -20,6 +20,7 @@ do_all_tests=3D1 init=3D0 =20 TEST_COUNT=3D0 +nr_blank=3D40 =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -732,9 +733,9 @@ chk_csum_nr() local dump_stats =20 if [ ! -z "$msg" ]; then - printf "%02u" "$TEST_COUNT" + printf "%03u" "$TEST_COUNT" else - echo -n " " + echo -n " " fi printf " %-36s %s" "$msg" "sum" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '{= print $2}'` @@ -766,7 +767,7 @@ chk_fail_nr() local count local dump_stats =20 - printf "%-39s %s" " " "ftx" + printf "%-${nr_blank}s %s" " " "ftx" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailTx | awk '{pri= nt $2}'` [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$mp_fail_nr_tx" ]; then @@ -801,7 +802,7 @@ chk_join_nr() local dump_stats local with_cookie =20 - printf "%02u %-36s %s" "$TEST_COUNT" "$msg" "syn" + printf "%03u %-36s %s" "$TEST_COUNT" "$msg" "syn" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinSynRx | awk '{= print $2}'` [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$syn_nr" ]; then @@ -863,7 +864,7 @@ chk_stale_nr() local stale_nr local recover_nr =20 - printf "%-39s %-18s" " " "stale" + printf "%-${nr_blank}s %-18s" " " "stale" stale_nr=3D`ip netns exec $ns nstat -as | grep MPTcpExtSubflowStale | awk= '{print $2}'` [ -z "$stale_nr" ] && stale_nr=3D0 recover_nr=3D`ip netns exec $ns nstat -as | grep MPTcpExtSubflowRecover |= awk '{print $2}'` @@ -904,7 +905,7 @@ chk_add_nr() =20 timeout=3D`ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout` =20 - printf "%-39s %s" " " "add" + printf "%-${nr_blank}s %s" " " "add" count=3D`ip netns exec $ns2 nstat -as MPTcpExtAddAddr | grep MPTcpExtAddA= ddr | awk '{print $2}'` [ -z "$count" ] && count=3D0 =20 @@ -941,7 +942,7 @@ chk_add_nr() echo "[ ok ]" fi =20 - printf "%-39s %s" " " "syn" + printf "%-${nr_blank}s %s" " " "syn" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinPortSynRx | awk '{print $2}'` [ -z "$count" ] && count=3D0 @@ -980,7 +981,7 @@ chk_add_nr() echo "[ ok ]" fi =20 - printf "%-39s %s" " " "syn" + printf "%-${nr_blank}s %s" " " "syn" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMismatchPortSynRx | awk '{print $2}'` [ -z "$count" ] && count=3D0 @@ -1030,7 +1031,7 @@ chk_rm_nr() subflow_ns=3D$ns1 fi =20 - printf "%-39s %s" " " "rm " + printf "%-${nr_blank}s %s" " " "rm " count=3D`ip netns exec $addr_ns nstat -as | grep MPTcpExtRmAddr | awk '{p= rint $2}'` [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$rm_addr_nr" ]; then @@ -1062,7 +1063,7 @@ chk_prio_nr() local count local dump_stats =20 - printf "%-39s %s" " " "ptx" + printf "%-${nr_blank}s %s" " " "ptx" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPPrioTx | awk '{pri= nt $2}'` [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$mp_prio_nr_tx" ]; then @@ -1098,7 +1099,7 @@ chk_link_usage() local tx_rate=3D$((tx_link * 100 / $tx_total)) local tolerance=3D5 =20 - printf "%-39s %-18s" " " "link usage" + printf "%-${nr_blank}s %-18s" " " "link usage" if [ $tx_rate -lt $((expected_rate - $tolerance)) -o \ $tx_rate -gt $((expected_rate + $tolerance)) ]; then echo "[fail] got $tx_rate% usage, expected $expected_rate%" --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34171edc; Fri, 4 Mar 2022 11:36:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzoJDeCWSciNcS0ORcCGO7Fbo4FkuPhJKjlW+QT7BwSpXy6jkmp0anoaqoJG50kzprwZqZ7 X-Received: by 2002:a81:5789:0:b0:2d7:9ad:44d0 with SMTP id l131-20020a815789000000b002d709ad44d0mr104278ywb.488.1646422607520; Fri, 04 Mar 2022 11:36:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422607; cv=none; d=google.com; s=arc-20160816; b=u5Kg8tyEhYsio1M7wH1nzhtT3DlirANNxvRkDfQRLBPymI4EEqz81E2C6SGWvRBWF/ QBiCfRqlrxqTDeH8cJ9hM5Nuu+XUYg5GquOZuYRGk3eQx5+4+xnVVF6Gm4TiwRCXfZUl uermGXM4Tz/7DwAT58xSiiaWyZ7WHrKtTIhvCfxh8yjlNJk0/XGnrMYShA3mwjz1KRc8 kcPJNqcqXo5MKPjqgNFoUkEmziMbw0hIEnmoI9MJ0psHSPbV8f57qix1igd1OlUXjZ9j 29K5Z9Uz3TbyzPPs+qPKiXV1juwJsF+mcub39uOXXjPHJ2+/g8Vy1PNrM7CHw+f7y1wf 8wYg== 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=5hmQC2X1wlC10n5swD//CncIdMZyrlMTy+4bOVhsois=; b=xsjFlX7FNEx77evVoVhqOdDLxk5DmClCXzq1uRkx3nCMg2H6z5BUc2lBHm9DHJGnXu 8+fb2ClL2ZNhpYMhBDJwkHSevt8F2ObVraSExBv3P+mD0FlEtbCoFlOvnNuA9fUdLSYV cpSDtxXUg7YIAIpfVeluoY1j9R49NAXOYpCGFo80IpkaSrPCbbWdg+S+B8g5f4qDU3q0 Y0tCNbQ+UYLU5pb9YdYahB23ylr3iPNto64DElLpc6m5lrl0r5aBZGh0CKDqUL4XfpT9 yS2O7kB4jxzObeQgMUGZ0tcnIAo3wFIRCvrCfTefBkB01Hjudxhk89AZnsEivLBeqf2L OsyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UNre0mGJ; spf=pass (google.com: domain of mptcp+bounces-4097-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4097-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 x18-20020a056902051200b00628ab22f067si4959899ybs.361.2022.03.04.11.36.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:47 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4097-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=UNre0mGJ; spf=pass (google.com: domain of mptcp+bounces-4097-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4097-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 0A74A1C0F10 for ; Fri, 4 Mar 2022 19:36:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 00F1C42B9; Fri, 4 Mar 2022 19:36:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 B3A2B42B7 for ; Fri, 4 Mar 2022 19:36:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646422604; x=1677958604; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=957fvhFJOCRThfKcjyejNOUcKv2jZZkXSF5cfFEVWs4=; b=UNre0mGJI+kihxVf3xJGM530frA4+XTV31N1a2iVCWxhhHg5751caQN+ ETtVBlRLhS3TNOdywkTyMZlZil0nDsH2EwVgNGLTsliI2gGr7s1HziG3b 17IaZdXymKdCcW8a2oXAeP2sdKLn1wXp1KhkXv3P4nBcBLlggr5q7tI2j WoVuNB6TIWRXH+kAxiF3+c7TmQfP3HF/2nF+pweF7R9P//mMemTB+hUMM BPq5QVEZOw99D7fnu8+27U9Im5R/4vmW5zif92uAe/O+U2iDz5x1nfIBY UWWXX7V7MHNUCleymgV7N83lyPx/KOGkMLv3YHKc0HOrwGV8YoQwxujCq Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739503" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739503" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340779" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:42 -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 02/11] mptcp: add the mibs for MP_FASTCLOSE Date: Fri, 4 Mar 2022 11:36:27 -0800 Message-Id: <20220304193636.219315-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 two more mibs for MP_FASTCLOSE, MPTCP_MIB_MPFASTCLOSETX for the MP_FASTCLOSE sending and MPTCP_MIB_MPFASTCLOSERX for receiving. Also added a debug log for MP_FASTCLOSE receiving, printed out the recv_key of MP_FASTCLOSE in mptcp_parse_option to show that MP_RST is received. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/mib.c | 2 ++ net/mptcp/mib.h | 2 ++ net/mptcp/options.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 7558802a1435..975d17118bfe 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -48,6 +48,8 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("MPPrioRx", MPTCP_MIB_MPPRIORX), SNMP_MIB_ITEM("MPFailTx", MPTCP_MIB_MPFAILTX), SNMP_MIB_ITEM("MPFailRx", MPTCP_MIB_MPFAILRX), + SNMP_MIB_ITEM("MPFastcloseTx", MPTCP_MIB_MPFASTCLOSETX), + SNMP_MIB_ITEM("MPFastcloseRx", MPTCP_MIB_MPFASTCLOSERX), SNMP_MIB_ITEM("RcvPruned", MPTCP_MIB_RCVPRUNED), SNMP_MIB_ITEM("SubflowStale", MPTCP_MIB_SUBFLOWSTALE), SNMP_MIB_ITEM("SubflowRecover", MPTCP_MIB_SUBFLOWRECOVER), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 2966fcb6548b..8206c65297e0 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -41,6 +41,8 @@ enum linux_mptcp_mib_field { MPTCP_MIB_MPPRIORX, /* Received a MP_PRIO */ MPTCP_MIB_MPFAILTX, /* Transmit a MP_FAIL */ MPTCP_MIB_MPFAILRX, /* Received a MP_FAIL */ + MPTCP_MIB_MPFASTCLOSETX, /* Transmit a MP_FASTCLOSE */ + MPTCP_MIB_MPFASTCLOSERX, /* Received a MP_FASTCLOSE */ MPTCP_MIB_RCVPRUNED, /* Incoming packet dropped due to memory limit */ MPTCP_MIB_SUBFLOWSTALE, /* Subflows entered 'stale' status */ MPTCP_MIB_SUBFLOWRECOVER, /* Subflows returned to active status after bei= ng stale */ diff --git a/net/mptcp/options.c b/net/mptcp/options.c index ac10a04ccd7c..c3697f06faf9 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -323,6 +323,7 @@ static void mptcp_parse_option(const struct sk_buff *sk= b, mp_opt->rcvr_key =3D get_unaligned_be64(ptr); ptr +=3D 8; mp_opt->suboptions |=3D OPTION_MPTCP_FASTCLOSE; + pr_debug("MP_FASTCLOSE: recv_key=3D%llu", mp_opt->rcvr_key); break; =20 case MPTCPOPT_RST: @@ -832,6 +833,7 @@ bool mptcp_established_options(struct sock *sk, struct = sk_buff *skb, mptcp_established_options_mp_fail(sk, &opt_size, remaining, opts)) { *size +=3D opt_size; remaining -=3D opt_size; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX); } /* MP_RST can be used with MP_FASTCLOSE and MP_FAIL if there is room */ if (mptcp_established_options_rst(sk, skb, &opt_size, remaining, opts)) { @@ -1124,6 +1126,7 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) msk->local_key =3D=3D mp_opt.rcvr_key) { WRITE_ONCE(msk->rcv_fastclose, true); mptcp_schedule_work((struct sock *)msk); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSERX); } =20 if ((mp_opt.suboptions & OPTION_MPTCP_ADD_ADDR) && --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34184edc; Fri, 4 Mar 2022 11:36:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJykkW4vO4Ym6QJKSoVA4ZeoOlV/gHt+inFqR9h0iBAtDwWXSEw+SBXXxG5MZtl4rCUmALgv X-Received: by 2002:a25:8404:0:b0:628:d650:faa6 with SMTP id u4-20020a258404000000b00628d650faa6mr25441ybk.400.1646422609958; Fri, 04 Mar 2022 11:36:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422609; cv=none; d=google.com; s=arc-20160816; b=0X6gPc4it6CqoyfomytgmZ2S8Z+rV8Fz/I2e+8dg1Iyn0rBzT7NVPfnjDz12bqmbGs eCxCgkVq7OPHcx29K5M0eRscfgu32LtFpBZWnMEb2ZbTao8tqqwkQIQBaJAZPr2xBU7R rrvMb6tyVq3w8Cm91zsO2nmUVl2t4JG4N3tmJLhPcJVO2BAuKNhvyEFt+QO/Bqe0DBrk cCiVNiiy1nN87KomcsioeQl9dFi2VIdpvcAPoEWrm84mbjveh1GY3PowNIT7JlrIsAw5 AKC0oUQqT0x6SRyhYFck2K40iS+Lf+sfTW70sGOyN0N+JpUxIObMkMFfPR+v3AmX8FrL XYKg== 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=4d4S2e9+NWoiFFLUtiGEAtqSfKt0C98oFHFIENH9Yro=; b=DWTvN9joMQtyKNpyCWMFP8UTteOx7mcwDwtam3LF1TE86Y+RRMpyz6e1HTMXozbUZc 1m9L08+qNgML8CW3MEeGJhbf5deYl4foX9K4r+V0ZM6rHj3dDt9pEEJ0NcsKZbr0Gj0C OSvp3gE6bfSVDKmPuxWNxJ9S0w8C+1lCN73O3ahGr+asS10xwG8PlygHC6RMJXcnKi8f o4ug4fJnMlJLSKgn24NPTj/GF9HNOYBBYYv3mTDXL7FgGMQdaP8SCBc9djaq39nWW3im QvfgCUxS+YV244z0kdFZBEFXk/s8RlyX/FSEzMLDGDJxpexsJP1o5bnke5+PqhbMAw/K 6ZzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YyYQ7Bpy; spf=pass (google.com: domain of mptcp+bounces-4099-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4099-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 x18-20020a056902051200b00628ab22f067si4959899ybs.361.2022.03.04.11.36.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:49 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4099-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=YyYQ7Bpy; spf=pass (google.com: domain of mptcp+bounces-4099-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4099-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 8D44B1C0F23 for ; Fri, 4 Mar 2022 19:36:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2589242B8; Fri, 4 Mar 2022 19:36:47 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 0D5C042B7 for ; Fri, 4 Mar 2022 19:36: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=1646422606; x=1677958606; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kZluU2NCyxAed2hBE2ovZyl7Xq48J8RwdT9X6ixUlUc=; b=YyYQ7BpyPVcm/5iLucE3t+HJGR0UcgCSTvy172BVU3lmdL7y68uclJBy Kz77DfWJThse/7j4Jm5HrhmrPzhVXdoc2pkG+yf/aH27pKRmq155WHWg3 tBj18qLYJEhagZ8PZQOFkRWSW++QFgAOlKd/gOHariHL2/qlfcYynsUEO mYFvShYcjS4sjlLSVMVCawFtz55VmVTG2N+7ZpS6h+rkG0x8hpbHHhjMr Elj2pczSIxUUyvXanP0r9XH4BO8zen+k7ZeiH5xg7Xyl7b6xMJrb93Bnw g5Qx4e+NKnrjoI54/XpfMpLJRZN8fr48tCRRFLFV+XVg4GpbcnLZ45qYW w==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739504" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739504" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340782" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:42 -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 03/11] selftests: mptcp: add the MP_FASTCLOSE mibs check Date: Fri, 4 Mar 2022 11:36:28 -0800 Message-Id: <20220304193636.219315-4-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 a new function chk_fclose_nr() to check the numbers of the MP_FASTCLOSE sending and receiving mibs. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 88740cfe49dd..10339a796325 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -792,6 +792,38 @@ chk_fail_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_fclose_nr() +{ + local fclose_tx=3D$1 + local fclose_rx=3D$2 + local count + local dump_stats + + printf "%-${nr_blank}s %s" " " "ctx" + count=3D$(ip netns exec $ns2 nstat -as | grep MPTcpExtMPFastcloseTx | awk= '{print $2}') + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$fclose_tx" ]; then + echo "[fail] got $count MP_FASTCLOSE[s] TX expected $fclose_tx" + ret=3D1 + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + echo -n " - fclzrx" + count=3D$(ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk= '{print $2}') + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$fclose_rx" ]; then + echo "[fail] got $count MP_FASTCLOSE[s] RX expected $fclose_rx" + ret=3D1 + dump_stats=3D1 + else + echo "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats +} + chk_join_nr() { local msg=3D"$1" --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34188edc; Fri, 4 Mar 2022 11:36:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJw1/NkT2wK0LQY1SDUv027Rez7pWquIJYofGOoKQdX/GXBCYsNDjocwx+zT9YdCo2RBRpjJ X-Received: by 2002:a05:6a00:9a9:b0:4ca:c2f1:c685 with SMTP id u41-20020a056a0009a900b004cac2f1c685mr111375pfg.12.1646422612045; Fri, 04 Mar 2022 11:36:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422612; cv=none; d=google.com; s=arc-20160816; b=PuF6q7a55nnma1YEcNh0G9m8naW33DtlfqEbTlADSqPw/5030ESo+IO8o5BQJNIB1U 1gBMRzfxNIQ+rurRhA57K0EM5htqrE16CDNzSdSXMh0bSt95w46Yneo/yjZE4V9OVm0K 2pzlfopOvFReAJpxKBjkGidqRqEbw0B3kV1849I5WWb5f+7tLgaqLSc40ajs22tAKasg eiSBdDvefVmSASq47pO7QLVoUi7DH6mJGvMbzS1f2i/VvjKUGoHUoe/TWVCf7ajXYy73 +JsMGJRxHGHKlBwgt4GhW3SMRjHeJgKlByCRTxys36pBYj7wuqabJx6x2+rbaalKwiAj qKSA== 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=GevVZuXYhA7p2LOyyV7+JAuTceDA8gxwKP+Klhc56As=; b=cWu/dn7llx+SoPamcVeFAlscaDvkViF0lxO8HpPPQ068pjTM98On28w3oDNrQJSl/Z HgrBXGMcr0BrZPQnVhzu0Az0PCY3Y6HDJT8baTqYb1h1wleyFoDc4IJYnB2l5tM6DiTR zglYaLHN2/0hgcNJhJPsxpDoqS8MLFYuzdIWcU31aZ2TjOhzLf6RGrqvtdcIitW1ZwGw 91eKv/yHjEWRc8gjWSDCf8bOdD30rBkHUUVUQWzvqGkB9UDDW5DSBAc5A3L1566VfFuQ 5nGW6zYG/ogn7AdH5GASZgNgROWdeaSqhW18hEJtDPkqvJcYu+/wObEe/uyDcQw6W+kf GH+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LWErbEaw; spf=pass (google.com: domain of mptcp+bounces-4101-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4101-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 m3-20020a637d43000000b00378faa589b6si5685434pgn.822.2022.03.04.11.36.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:52 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4101-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=LWErbEaw; spf=pass (google.com: domain of mptcp+bounces-4101-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4101-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 5F3113E1041 for ; Fri, 4 Mar 2022 19:36:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25F3F42B9; Fri, 4 Mar 2022 19:36:48 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 7368F42BA for ; Fri, 4 Mar 2022 19:36: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=1646422606; x=1677958606; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MHl3tFpaN+fsU4kfWcfNbKp6jA3RKOG/3r8nwwPkxZQ=; b=LWErbEaw8nv8HktIUCwYvqa1DGRkW0uERwf4e9qGOHroGEwUo3q5uKIm /Z9yIMwAtDP/7piliIyTNWvtOGTa28kqu740SDkrEZezzV4CQUMNjCngg EV+Y+mhN4x3fge9Y07FrIbGjYSc4yMDSil1uVSJQaoOrbwpRzBIYkihR3 DWrIci0/90Z910fQsVgc3IKG0fpKfYSfw7sJeXl6Fu8x0hnKhZvWVBJGE OqsrqNJ2tBXwK26b2HwI3DqslRVFHgFRzRrh1MQBJOoC2jtELM9hfb9rh caQPzPpz1UH3ZmyuNhLE4y6yaEjShdxDRVJIRZSIQDMMBoGwrAVkUdiSq g==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739505" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739505" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340784" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -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 04/11] mptcp: add the mibs for MP_RST Date: Fri, 4 Mar 2022 11:36:29 -0800 Message-Id: <20220304193636.219315-5-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 two more mibs for MP_RST, MPTCP_MIB_MPRSTTX for the MP_RST sending and MPTCP_MIB_MPRSTRX for the MP_RST receiving. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/mib.c | 2 ++ net/mptcp/mib.h | 2 ++ net/mptcp/options.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 975d17118bfe..e55d3dfbee0c 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -50,6 +50,8 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("MPFailRx", MPTCP_MIB_MPFAILRX), SNMP_MIB_ITEM("MPFastcloseTx", MPTCP_MIB_MPFASTCLOSETX), SNMP_MIB_ITEM("MPFastcloseRx", MPTCP_MIB_MPFASTCLOSERX), + SNMP_MIB_ITEM("MPRstTx", MPTCP_MIB_MPRSTTX), + SNMP_MIB_ITEM("MPRstRx", MPTCP_MIB_MPRSTRX), SNMP_MIB_ITEM("RcvPruned", MPTCP_MIB_RCVPRUNED), SNMP_MIB_ITEM("SubflowStale", MPTCP_MIB_SUBFLOWSTALE), SNMP_MIB_ITEM("SubflowRecover", MPTCP_MIB_SUBFLOWRECOVER), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 8206c65297e0..00576179a619 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -43,6 +43,8 @@ enum linux_mptcp_mib_field { MPTCP_MIB_MPFAILRX, /* Received a MP_FAIL */ MPTCP_MIB_MPFASTCLOSETX, /* Transmit a MP_FASTCLOSE */ MPTCP_MIB_MPFASTCLOSERX, /* Received a MP_FASTCLOSE */ + MPTCP_MIB_MPRSTTX, /* Transmit a MP_RST */ + MPTCP_MIB_MPRSTRX, /* Received a MP_RST */ MPTCP_MIB_RCVPRUNED, /* Incoming packet dropped due to memory limit */ MPTCP_MIB_SUBFLOWSTALE, /* Subflows entered 'stale' status */ MPTCP_MIB_SUBFLOWRECOVER, /* Subflows returned to active status after bei= ng stale */ diff --git a/net/mptcp/options.c b/net/mptcp/options.c index c3697f06faf9..325383646f5c 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -839,6 +839,7 @@ bool mptcp_established_options(struct sock *sk, struct = sk_buff *skb, if (mptcp_established_options_rst(sk, skb, &opt_size, remaining, opts)) { *size +=3D opt_size; remaining -=3D opt_size; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTTX); } return true; } @@ -1161,6 +1162,7 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) subflow->reset_seen =3D 1; subflow->reset_reason =3D mp_opt.reset_reason; subflow->reset_transient =3D mp_opt.reset_transient; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTRX); } =20 if (!(mp_opt.suboptions & OPTION_MPTCP_DSS)) --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34192edc; Fri, 4 Mar 2022 11:36:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJzIXizM71jWj+IKgJd8BV6LC1I2lZNedSNucIQwMvlG0Y8uGvAoELZbUG9ry6HA2dIUsSh+ X-Received: by 2002:a17:90a:77c6:b0:1bd:5ce1:1966 with SMTP id e6-20020a17090a77c600b001bd5ce11966mr216999pjs.230.1646422613180; Fri, 04 Mar 2022 11:36:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422613; cv=none; d=google.com; s=arc-20160816; b=qXGbhB9a6MogrMH+hDFeYqkhHHOVCusEhtSR0CdMaxWe50A6m1bSuqeC8O4hfnTztW lGjKtfK/Fgpc0XHbVCNc/gcXEQd5fSN8pZCerQW5M+JNJvdyQ+dnkgDoxQBrm4+9BeYa mz3vWBE783x8F1D2y9yItg0bgNbpJOVzqwhz1KxMIfM6wiNtOAxpeIuxHHb7YFcwz+EW Oy5u7huVS+NedA+sWTt/W/kL8SmH09IVZULDytlHbHltHe3kWwxihzOX7F2B6Vhe7gY3 ABJF0VnHF6mSj6Yd+btk4Gh1kQgHZJrCpH1yf8MDACeMAskGjRdcbhzTKO7U9VbIym6p P6tw== 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=wWqeC/cxEnCTBWv2Li8eewSQryEXQxd7tjsQX/pz/34=; b=nuOtCogDeigBsP1dogbC3CmkxGbL/3hwNnPTwcKvBI2rSZlKVAk5pkvh/e1vRHWnBZ YMTDZTfsTo18SHMOVpND8x0UW1NoebwEN9SOXwY98IwHYKHf5Gu+cQIrnRYdvDJs0MWv mlqEFDxFVYZyxSSIdFMP7Ab/EQmvUkjm6nok53Uo/PwheZKHDsuyvNzq2OB3SnC/YNgn vAAPOlE8kEWnPBxbbMQYYZMQ/KgtmRFE+MdAZ8oYkkhFHQd52lHORkpsKcBUOaQ0TvLc VldWiSMwAzS9T/ixAGohafRAReh2ONNh4D7UawwarDhFqQ54mol1G+im/6W/Y3qRlF68 lVSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Gcez1kAF; spf=pass (google.com: domain of mptcp+bounces-4102-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4102-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 f7-20020a631f07000000b003742311bf67si5369362pgf.770.2022.03.04.11.36.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:53 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4102-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=Gcez1kAF; spf=pass (google.com: domain of mptcp+bounces-4102-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4102-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 7BC863E0066 for ; Fri, 4 Mar 2022 19:36:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3807042BC; Fri, 4 Mar 2022 19:36:48 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 312AE42B7 for ; Fri, 4 Mar 2022 19:36:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646422607; x=1677958607; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e4H1NNFEPEPtaUDrXkY9mhWAswryRgKMsLlxBfLPh78=; b=Gcez1kAF7Vj5545ci8pg4fS3eh9Yd6456VQgS8yeGZnuzVoyHrsIbhV0 +m242Hh6eZyEazkAu78d/RA1zNaxzIWMCvk7NMGxwnzxvVi8SrjEJxPel g0PM0BF3LEdThGwvCj4hCSFITDG8LnVF1A4EeAxU/NmcUMxT29RRgMr4D RKF+tGAQbr8iAf2I4Uu24qncDgVgGppvSw5Lpx0rrVJWz5dJfs3eUzER8 dQatjTIA00/UlgVO9bwtgWcNo3IvpduNKpvE2ZNDoP5Wt5FS07YyyTwQc AbUBlMYi9I4GQ3Z55KXlyXDmXFTcQuwWxoczbgeT/uxsnI7It9+x0bjn9 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739506" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739506" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340787" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -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 05/11] selftests: mptcp: add the MP_RST mibs check Date: Fri, 4 Mar 2022 11:36:30 -0800 Message-Id: <20220304193636.219315-6-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 a new function chk_rst_nr() to check the numbers of the MP_RST sending and receiving mibs. Showed in the output whether the inverted namespaces check order is used. Since if we pass -Cz to mptcp_join.sh, the MP_RST information is showed twice. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 10339a796325..12008640d9f4 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -824,6 +824,50 @@ chk_fclose_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_rst_nr() +{ + local rst_tx=3D$1 + local rst_rx=3D$2 + local ns_invert=3D${3:-""} + local count + local dump_stats + local ns_tx=3D$ns1 + local ns_rx=3D$ns2 + local extra_msg=3D"" + + if [[ $ns_invert =3D "invert" ]]; then + ns_tx=3D$ns2 + ns_rx=3D$ns1 + extra_msg=3D" invert" + fi + + printf "%-${nr_blank}s %s" " " "rtx" + count=3D$(ip netns exec $ns_tx nstat -as | grep MPTcpExtMPRstTx | awk '{p= rint $2}') + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$rst_tx" ]; then + echo "[fail] got $count MP_RST[s] TX expected $rst_tx" + ret=3D1 + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + echo -n " - rstrx " + count=3D$(ip netns exec $ns_rx nstat -as | grep MPTcpExtMPRstRx | awk '{p= rint $2}') + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$rst_rx" ]; then + echo "[fail] got $count MP_RST[s] RX expected $rst_rx" + ret=3D1 + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats + + echo "$extra_msg" +} + chk_join_nr() { local msg=3D"$1" @@ -878,6 +922,7 @@ chk_join_nr() if [ $checksum -eq 1 ]; then chk_csum_nr chk_fail_nr 0 0 + chk_rst_nr 0 0 fi } =20 --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34200edc; Fri, 4 Mar 2022 11:36:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJyp3Ht2GHYnH1KiG+K9cIUFpYREsIwHZiyJp0ZEwRR97NI9Fqo0fNcAG0aKOR4iwy/tprBP X-Received: by 2002:a17:902:6b8b:b0:14d:66c4:f704 with SMTP id p11-20020a1709026b8b00b0014d66c4f704mr11877plk.53.1646422614387; Fri, 04 Mar 2022 11:36:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422614; cv=none; d=google.com; s=arc-20160816; b=Bx8U9M67d21mn2akdfdt/Fkq90PfquVUK+OrGqcdnpYTUJxJ3WDbTLSe64wnr0CeC4 1J/Co1U/dcUIB3wQwNksSJSyiJhvxfsCFLCetgeTO1PKYpt2aDqXKyI4Qn3QKfmECMU/ VLsW9NjdIvxb09gikq/yFavIqPcImXIztHJBYRfkzq4/8o0GspTP5VPOKULj+KWddpy5 O8V+9KdgZR9ZxN8EIJvDi3SwYs1fjodWyWD/NOOePp6IIa+wiFoh/zuFUs0UX+8EzdWJ 0WKjVmD7L0NwdImAoCtZazICPJD+nlmUFrp6nR3rb++VTjeidKKkXIXohrCq8UJeGrl2 EDjQ== 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=8qD81ItTa/TQ+a8ULUTVAvlJdYUmAlmXUs+Irk9Nlzw=; b=KfrNPBgjAODR3tkI+ZUOkmAedcOHSVBm3B25eg0NtyO9ACtDmqUEWj1rsnnK0PyuFa MsgEPEFrtycQ6PmsOL4x8gmaXkZ65o4flCxmDg3rWiFEQ0BrppE2J8d9O/1aoHyibVgB 6Xlr0flb6VS9F5kFFmyNu/RzkcrKHCl1sUQKhbC4xLYKp5ueQu8/ThAnAJn6/2RV/K/3 momr7LLXJ01VVLgdyVbzvVmWQZNgvni9Zu3ivVPN9h89Rx0oPa5Z/ve40rWiwLi9jcby UaCRm7zUQPGAGcozBfcG3ScA3ZhF0dH+Le2TiLB3Fel0yonFKZvUEePWHpzWo2YBj2su 4HbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YpTEJKp1; spf=pass (google.com: domain of mptcp+bounces-4103-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4103-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 r9-20020a17090a2e8900b001bd14e030a0si358624pjd.120.2022.03.04.11.36.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:54 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4103-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=YpTEJKp1; spf=pass (google.com: domain of mptcp+bounces-4103-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4103-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 BEDC13E103F for ; Fri, 4 Mar 2022 19:36:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 72B8D42BD; Fri, 4 Mar 2022 19:36:48 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 5FCA77C for ; Fri, 4 Mar 2022 19:36:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646422607; x=1677958607; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1/uBy4xIN/f39gpA+6947idem3xzKvCmx+kAxXLkkUY=; b=YpTEJKp1XFn9PYWF2C10ZNSizcEJJ0Ee0kq563rgC7ZV0FMwGRF45xDy NUxdahQL4C0H/WK/5gqnze5sHHSO/P9CRjqdUOmuIP7dYS6Q2zDZJp++C fmbb91HzXT+j6dtLjuyC31mhnn4TKdxX6Ff2bgnoDpsXrHn1uDHEvOGro OvbTy6yATxFEFXQZSa25lzhavGKmtryFRXOvG8ZqKYi4rJ8DZVYCfYeM1 L2g4oZa1Ja48BDW4gs0rToNMDypkov81pIHeOprMTQS9Q0T0R6mcMFgEB oOVFey9B5pFnGo98FqbgS1RLy+iKlMCC2iVrHZyrsPva4SH1vdOFufnaS w==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739507" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739507" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340789" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -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 06/11] selftests: mptcp: add extra_args in do_transfer Date: Fri, 4 Mar 2022 11:36:31 -0800 Message-Id: <20220304193636.219315-7-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 Instead of using a global variable mptcp_connect, this patch added a new local variable extra_args in do_transfer() to store the extra arguments passing to the mptcp_connect commands. This patch also renamed the speed level 'least' to 'speed_*'. This more flexible way can avoid the need to add new speed levels in the future. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 12008640d9f4..84c21282ee46 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -12,7 +12,6 @@ cout=3D"" ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -mptcp_connect=3D"" capture=3D0 checksum=3D0 ip_mptcp=3D0 @@ -444,12 +443,13 @@ do_transfer() NSTAT_HISTORY=3D/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \ nstat -n =20 + local extra_args if [ $speed =3D "fast" ]; then - mptcp_connect=3D"./mptcp_connect -j" + extra_args=3D"-j" elif [ $speed =3D "slow" ]; then - mptcp_connect=3D"./mptcp_connect -r 50" - elif [ $speed =3D "least" ]; then - mptcp_connect=3D"./mptcp_connect -r 10" + extra_args=3D"-r 50" + elif [[ $speed =3D "speed_"* ]]; then + extra_args=3D"-r ${speed:6}" fi =20 local local_addr @@ -462,13 +462,13 @@ do_transfer() if [ "$test_link_fail" -eq 2 ];then timeout ${timeout_test} \ ip netns exec ${listener_ns} \ - $mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ - ${local_addr} < "$sinfail" > "$sout" & + ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ + $extra_args ${local_addr} < "$sinfail" > "$sout" & else timeout ${timeout_test} \ ip netns exec ${listener_ns} \ - $mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ - ${local_addr} < "$sin" > "$sout" & + ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ + $extra_args ${local_addr} < "$sin" > "$sout" & fi spid=3D$! =20 @@ -477,15 +477,15 @@ do_transfer() if [ "$test_link_fail" -eq 0 ];then timeout ${timeout_test} \ ip netns exec ${connector_ns} \ - $mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ - $connect_addr < "$cin" > "$cout" & + ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $extra_args $connect_addr < "$cin" > "$cout" & else ( cat "$cinfail" ; sleep 2; link_failure $listener_ns ; cat "$cinfail" )= | \ tee "$cinsent" | \ timeout ${timeout_test} \ ip netns exec ${connector_ns} \ - $mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ - $connect_addr > "$cout" & + ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $extra_args $connect_addr > "$cout" & fi cpid=3D$! =20 @@ -1507,7 +1507,7 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 least + run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2 chk_add_nr 8 0 =20 @@ -1517,7 +1517,7 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.12.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 least + run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1 chk_add_nr 8 0 } --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34205edc; Fri, 4 Mar 2022 11:36:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmMFENBKmKcBDGI+lOCT4F2to4SVynwzBWSZQ/PfiEEOjlAPbr5I+FA1QS+Y+LSBGpnMfR X-Received: by 2002:a05:6a00:1592:b0:4e0:529c:9770 with SMTP id u18-20020a056a00159200b004e0529c9770mr91542pfk.54.1646422615488; Fri, 04 Mar 2022 11:36:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422615; cv=none; d=google.com; s=arc-20160816; b=ZTZCMYI67ht4VxExwwEPpv/RJH3celUseWWiMWYuID+E3Fz0lEEbj9Ix3E4HQTJzkq KQE1ZP08XxG1WTfgRRRlmEFrl2SF324Tn631Ao0nVriioCCrvQN5hPcfTeqtnUUD9vgZ rzO7hi6k0vEvatsz92PYn/7QBHc0Z7tHoFhRFMC5wqcGfPhlrVM7WIG9Y1itFxaGkBRN Tld1Jp0+DfO8oHCap1PoqqqfLQA8z6a670/sxnvW3cwzxMZb6yuEXPxXgxkPI78GkzdQ voHTIQfIfcy72mpS4fK97/VB9nu6fm4NZfQi99ciRc7ekWA4x4PeaVoWzW/ehXF89eGR FnMg== 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=Ua2NEqy3Z90wgD9HmtAbnNQH/f93JQDD+E8jb2qjJxk=; b=hKO2wvhkv0EciuX9t3TRIFaUfhB5VKnYYRvHUcFH3lbTGJaDKYvTAPRY4feuXVXR2m jJmGUu8iY8p2KZvUPpui23MugN9YquAmi0pCHw2bdQsSXCUnnOzKg26Jwk2pIFaWpAHf noQ1wrn8/kmRiffUxOYY0D7saNpY4VK5mSm8BblMyiTlW0qurEV5tgylkLOEmvxfsA5V BOuBQXjwuOsEwZ81jCuc3PoPIyQ4Paqz57zpBMM3hNifpn1zCsMgQEjGaK3A76Ud0ak3 V34mgIWB0C3Po8brG2EFo82tp9WPpqJFk+NdcuaPvfrToAjzfEw17gXKPrVMNuMYc8eD HlYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=My2PKxV0; spf=pass (google.com: domain of mptcp+bounces-4104-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4104-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 g10-20020a17090a300a00b001bf315d3476si363929pjb.147.2022.03.04.11.36.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:55 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4104-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=My2PKxV0; spf=pass (google.com: domain of mptcp+bounces-4104-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4104-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 EEE3F3E0F83 for ; Fri, 4 Mar 2022 19:36:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2D86542B6; Fri, 4 Mar 2022 19:36:49 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 2F28642BA for ; Fri, 4 Mar 2022 19:36: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=1646422608; x=1677958608; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qpWcgTy9FY6xxmHVlOf7EsIb68lZRNZlVMoMSI/G4m8=; b=My2PKxV0IhDyVQQum+lsz50oe8Ni6Uz4dwVXjnoG09Wu+rSFn7ynZ3uM stDWrn4D+W0uImgtSBbhm1eXG4s6rV4CYSKiAYv7vMhXZjoH0n0xsf/Ob NxXnyBrK0IL9bGgD3cg+TcBypX4izMoVYrwy9uFrxU+yUlGN3C8VLIWkB qXXCRutw7cUc7u4kJY3UDa/tCkLI3+LKxq5Kcz/6B2qOZGptJnorP5uVU VN3dEn/wt6+WxxnuHhYZTMGGEb6aM98puBMPrV4gb0T5jWZUc6zIArljP 1kYGVGZWwfKimkXOOQ9xnJlx+uwG1e7M0MHYG46s23+9qvzxBdwail45b w==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739508" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739508" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340790" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -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 07/11] selftests: mptcp: reuse linkfail to make given size files Date: Fri, 4 Mar 2022 11:36:32 -0800 Message-Id: <20220304193636.219315-8-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 reused the test_linkfail values above 2 to make test files with the given sizes (KB) for both the client side and the server side. It's useful for the test cases using different file sizes. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 84c21282ee46..1fda29d5d69f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -459,7 +459,7 @@ do_transfer() local_addr=3D"0.0.0.0" fi =20 - if [ "$test_link_fail" -eq 2 ];then + if [ "$test_link_fail" -gt 1 ];then timeout ${timeout_test} \ ip netns exec ${listener_ns} \ ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ @@ -479,13 +479,19 @@ do_transfer() ip netns exec ${connector_ns} \ ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ $extra_args $connect_addr < "$cin" > "$cout" & - else + elif [ "$test_link_fail" -eq 1 ] || [ "$test_link_fail" -eq 2 ];then ( cat "$cinfail" ; sleep 2; link_failure $listener_ns ; cat "$cinfail" )= | \ tee "$cinsent" | \ timeout ${timeout_test} \ ip netns exec ${connector_ns} \ ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ $extra_args $connect_addr > "$cout" & + else + cat "$cinfail" | tee "$cinsent" | \ + timeout ${timeout_test} \ + ip netns exec ${connector_ns} \ + ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $extra_args $connect_addr > "$cout" & fi cpid=3D$! =20 @@ -645,7 +651,7 @@ do_transfer() return 1 fi =20 - if [ "$test_link_fail" -eq 2 ];then + if [ "$test_link_fail" -gt 1 ];then check_transfer $sinfail $cout "file received by client" else check_transfer $sin $cout "file received by client" @@ -690,9 +696,18 @@ run_tests() speed=3D"${7:-fast}" sflags=3D"${8:-""}" =20 + # The values above 2 are reused to make test files + # with the given sizes (KB) + if [ "$test_linkfail" -gt 2 ]; then + size=3D$test_linkfail + + if [ -z "$cinfail" ]; then + cinfail=3D$(mktemp) + fi + make_file "$cinfail" "client" $size # create the input file for the failure test when # the first failure test run - if [ "$test_linkfail" -ne 0 -a -z "$cinfail" ]; then + elif [ "$test_linkfail" -ne 0 -a -z "$cinfail" ]; then # the client file must be considerably larger # of the maximum expected cwin value, or the # link utilization will be not predicable @@ -705,7 +720,14 @@ run_tests() make_file "$cinfail" "client" $size fi =20 - if [ "$test_linkfail" -eq 2 -a -z "$sinfail" ]; then + if [ "$test_linkfail" -gt 2 ]; then + size=3D$test_linkfail + + if [ -z "$sinfail" ]; then + sinfail=3D$(mktemp) + fi + make_file "$sinfail" "server" $size + elif [ "$test_linkfail" -eq 2 -a -z "$sinfail" ]; then size=3D$((RANDOM%16)) size=3D$((size+1)) size=3D$((size*2048)) --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34210edc; Fri, 4 Mar 2022 11:36:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3ao0uFG7++ER5pbvv6blYdvq+HW4BjSTulfS8xjYSrD8P8OSTe9PqKQJX7dwhE9aecGHT X-Received: by 2002:a25:2e4c:0:b0:628:9bdb:b88f with SMTP id b12-20020a252e4c000000b006289bdbb88fmr37901ybn.192.1646422617112; Fri, 04 Mar 2022 11:36:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422617; cv=none; d=google.com; s=arc-20160816; b=mKPgKMscoasa1YtyqKoezxx2/yCUFPQaJOa24A1BlzpOwbRgDV4t7Qg/50jSuQNtJF bOKVF5NBCBCcs+OfYaQFlNnrn5t9vlQA1q6/3hXHCxBTQg+hZfIf+FdA6RQhF/+Gm8S0 htmKqsYRLLwq6DH9rMVrsUtU4wrZUeAgfhE074vMv7+QJbKSFTbtI6qXLdZVPZwnt72K hxmE9YkjU9w3b0il43QDPnGVfo/QLbqn1eUdcoVWw8ueV8QA8GuFGG9RrMgwkkM9jXHr PtKsC7uzP4CDF2UIg4UDF3anyR++K+CxIASTjaq84a6zneJIdlZM/KUvafhK7oQAhur6 8VjQ== 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=ZiTY7IsJ6lz36z5Re4y0Ni+Mb0vC7tAFfNUguMUxmbg=; b=HwhqCADdLmRdNWpsxZi67zVg3UrdHWV++114b9xhQiAmppobmSwtjddXDcvlQcUF9u gEu3ToiiMqcRtEz4XxnVoVmwSEdNOwc0QrfWWrdThYU+VqCQ/toKDx0blC2z8Z0w6UK3 fyuYxIHkUAnomoynUinimTWzT3e8fdLVpzCWKrq+HJarnXG983jbVkFOiAahamjQ+5av MSLoj7AEc7KvoSjk3/vEXtm+22431478j8mXyZb21MFVAOmxax4LiXNlIm6+UWLFhh6I sLDpCO6/LappTde0YE60+ov4KxodedDsKawBNnU2ZHBRqNy0IWpQaQSYOGhndX0FUIUo wdOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eZkiAxMf; spf=pass (google.com: domain of mptcp+bounces-4105-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4105-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 l6-20020a056902072600b00628340547adsi7354904ybt.375.2022.03.04.11.36.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:57 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4105-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=eZkiAxMf; spf=pass (google.com: domain of mptcp+bounces-4105-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4105-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 83BF11C0F2C for ; Fri, 4 Mar 2022 19:36:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 79EB942BE; Fri, 4 Mar 2022 19:36:49 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 46C1742B7 for ; Fri, 4 Mar 2022 19:36: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=1646422608; x=1677958608; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wc9PGwvPhtaF4JiP57AOPUOF9WiO6euM1D/bIVvEp5I=; b=eZkiAxMfVVXSrPcUStSrirWt3+XwMGtDU5N1M/yFB1HxAnBwEB5cQxTv Wr8HTWiTKhR7xFJVTkdWM04q6Y5qABOyXVww9rgx1RBjt5svdxIIWGSZw gTyjEHTFU6C5qyOXjzNgRD6EN+8SVJjRHsi+vllfAWStkIPoVuz7ahMPo qhmEpK2fS6OZNpPUQoEBHwhpVPkDhkYeWsPl0Clv+NEueTVMb/uafBLch wGW4To8XN2m99i8fiAhE9ZNl94lg5AZF36vW19//YYDYgkjsV2ljaVu42 hzU+242bu0Sml2gxyYAP+wlWqNfzIxVvaPs5qH3oRPCa3n6mRbT+I9rml A==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739509" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739509" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:44 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340791" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -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 08/11] selftests: mptcp: add fastclose testcase Date: Fri, 4 Mar 2022 11:36:33 -0800 Message-Id: <20220304193636.219315-9-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 self test for MP_FASTCLOSE. Reused the argument addr_nr_ns2 of do_transfer() to pass the extra arguments '-I 2' to mptcp_connect commands. Then mptcp_connect disconnected the connections to trigger the MP_FASTCLOSE sending and receiving. Used chk_fclose_nr to check the MP_FASTCLOSE mibs and used chk_rst_nr to check the MP_RST mibs. This test used the test_linkfail value to make 1024KB test files. The output looks like this: Created /tmp/tmp.XB8sfv1hJ0 (size 1024 KB) containing data sent by client Created /tmp/tmp.RtTDbzqrXI (size 1024 KB) containing data sent by server 001 fastclose test syn[ ok ] - synack[ ok ] - ack[ ok ] ctx[ ok ] - fclzrx[ ok ] rtx[ ok ] - rstrx [ ok ] invert Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 22 ++++++++++++++++++- 1 file changed, 21 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 1fda29d5d69f..4604dd13a87e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -452,6 +452,12 @@ do_transfer() extra_args=3D"-r ${speed:6}" fi =20 + if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then + # disconnect + extra_args=3D"$extra_args -I ${addr_nr_ns2:10}" + addr_nr_ns2=3D0 + fi + local local_addr if is_v6 "${connect_addr}"; then local_addr=3D"::" @@ -2196,6 +2202,15 @@ fullmesh_tests() chk_rm_nr 0 1 } =20 +fastclose_tests() +{ + reset + run_tests $ns1 $ns2 10.0.1.1 1024 0 fastclose_2 + chk_join_nr "fastclose test" 0 0 0 + chk_fclose_nr 1 1 + chk_rst_nr 1 1 invert +} + all_tests() { subflows_tests @@ -2213,6 +2228,7 @@ all_tests() checksum_tests deny_join_id0_tests fullmesh_tests + fastclose_tests } =20 # [$1: error message] @@ -2239,6 +2255,7 @@ usage() echo " -S checksum_tests" echo " -d deny_join_id0_tests" echo " -m fullmesh_tests" + echo " -z fastclose_tests" echo " -c capture pcap files" echo " -C enable data checksum" echo " -i use ip mptcp" @@ -2270,7 +2287,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmchCSi' opt; do +while getopts 'fesltra64bpkdmchzCSi' opt; do case $opt in f) subflows_tests @@ -2317,6 +2334,9 @@ while getopts 'fesltra64bpkdmchCSi' opt; do m) fullmesh_tests ;; + z) + fastclose_tests + ;; c) ;; C) --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34217edc; Fri, 4 Mar 2022 11:36:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyjyD7cFrkB1/bYS5gY4QTttR6zs1eIF8AK5bTjFoPRSTgnrJ/t1PJ3KyratqVBhSEAYWi4 X-Received: by 2002:a17:902:6904:b0:14b:416a:a2c0 with SMTP id j4-20020a170902690400b0014b416aa2c0mr43599872plk.14.1646422618248; Fri, 04 Mar 2022 11:36:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422618; cv=none; d=google.com; s=arc-20160816; b=DQzxz73ikI+VBHv1WXLKlPnDFMeTrxrfTHhgdZw3LhO/IwdBGHb6KgO5NMpA5NoxIK sZNHwqAYe+u08PHYfnjFVM6fYKnM2r71rji7lzDNvJuiqQVRpVP44I5o3fuKgcWNifR1 oS7BIi0pvn+zVWY7poAgzZuThP8te0MgqMfXXrrQCqxWAheqFx0uONrNn56uncLLMhxv EQ1xWa0svYygSm6a3ZiKSiRF4nXO/FOQIbArzeJNRHStDaLpG7ruM9X+xEQPJ5dgPz6B VcBaAgAOcMnkPzX4VzsjNznGpc8ROsmISuyJ6pCnPM6Vyou2buH8+eltcYn3llmGUrqQ k40A== 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=/iDYkZqYO9+aMliqWdXCmNRhbP3Vognhr5ThWZSZ8Pk=; b=zk3q+Qne/LBsHdQ3zVsLS8kQgvFr+k+b6+bX+djAz7bs+by/waomCNlWAcGS/t6RsH eTx75FZtgwmLO1NGEgZIINnA392Ym6IQUkH39FbcUkZl6FdpbX7cQFzKqtFBocKlyEf2 b0Ffv5VfdQEYTkrC1pH+Yc3IdkvhMLLzRDTjQidZkdLyk1MPPFlv+4O//XPK7Ov4/k2t 1ObK1TR/GAkhM4p9Z9zIfLMSxTcUft5Taft+BWS6dkeaBve9rCeSKYXYcwX1wq0HWGRo FBo3AwdAn7QgvSKpCKhd64gCIZ3vb1O/GygW4nlrngt1icUtjEgJS/h+bzCEpV+OCdLg 50Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mhQFeGN5; spf=pass (google.com: domain of mptcp+bounces-4106-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4106-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 c15-20020a17090a558f00b001bd14e01f1esi375721pji.12.2022.03.04.11.36.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:58 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4106-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=mhQFeGN5; spf=pass (google.com: domain of mptcp+bounces-4106-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4106-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 71D1E3E0F6A for ; Fri, 4 Mar 2022 19:36:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A286C42B7; Fri, 4 Mar 2022 19:36:49 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 88BC57C for ; Fri, 4 Mar 2022 19:36: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=1646422608; x=1677958608; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ROvep7kyVqc+GmBw/uIi6w1KfX09rcAB6oWAZ89yNz0=; b=mhQFeGN5AIBJoMSyQ+7DuW0+8zcZbS/q7bHZBaE3tsvxZXLqK5zZFQ6q 2SH0iHAbU8PfeojZ//w1jZY/mm4UHppIvXOSayE8mulJUU4or6gsWzIUU 1Xw+69+5VxL5PIn66x36uIqDfv6Ky8t4CDGjvvQZpbj6NruaatI0bgwzC 4q36oN/aoS+Eg0vodXVmeaXPYPbOtmuzVgi+NIUXtfetV4Lc4/IdwdEHo Npjo6m0iqPXmASAl87BqFq7p/iCiu3hpGQUMapCrTfqTrRjbiylw8hAek SZ8VtSlYLzO08v5Do9ByM3e7evGPzaVzd7K85PD2880J78VxJCIBS/DVH A==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739511" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739511" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:44 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340792" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -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 09/11] selftests: mptcp: add invert check in check_transfer Date: Fri, 4 Mar 2022 11:36:34 -0800 Message-Id: <20220304193636.219315-10-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 invert bytes check for the output data in check_transfer(). Instead of the file mismatch error: [ FAIL ] file received by server does not match (in, out): -rw------- 1 root root 45643832 Jan 16 15:04 /tmp/tmp.9xpM6Paivv Trailing bytes are: MPTCP_TEST_FILE_END_MARKER -rw------- 1 root root 45643832 Jan 16 15:04 /tmp/tmp.wnz1Yp4u7Z Trailing bytes are: MPTCP_TEST_FILE_END_MARKER Print out the inverted bytes like this: file received by server has inverted byte at 7454789 file received by server has inverted byte at 7454790 file received by server has inverted byte at 7454791 file received by server has inverted byte at 7454792 Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 4604dd13a87e..f4812e820acf 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -15,6 +15,7 @@ timeout_test=3D$((timeout_poll * 2 + 1)) capture=3D0 checksum=3D0 ip_mptcp=3D0 +check_invert=3D0 do_all_tests=3D1 init=3D0 =20 @@ -59,6 +60,8 @@ init_partial() fi done =20 + check_invert=3D0 + # ns1 ns2 # ns1eth1 ns2eth1 # ns1eth2 ns2eth2 @@ -216,15 +219,21 @@ check_transfer() out=3D$2 what=3D$3 =20 - cmp "$in" "$out" > /dev/null 2>&1 - if [ $? -ne 0 ] ;then - echo "[ FAIL ] $what does not match (in, out):" - print_file_err "$in" - print_file_err "$out" - ret=3D1 + cmp -l "$in" "$out" | while read line; do + local arr=3D($line) =20 - return 1 - fi + let sum=3D0${arr[1]}+0${arr[2]} + if [ $check_invert -eq 0 ] || [ $sum -ne $((0xff)) ]; then + echo "[ FAIL ] $what does not match (in, out):" + print_file_err "$in" + print_file_err "$out" + ret=3D1 + + return 1 + else + echo "$what has inverted byte at ${arr[0]}" + fi + done =20 return 0 } --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34221edc; Fri, 4 Mar 2022 11:36:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/FhA4TBVQE5yw+evDNfNv0SCRbuU8Xd9+QSiRg9uSCTm1pG4btlNIJox5BPpFhUfRLUox X-Received: by 2002:a17:90b:4d0f:b0:1bf:6a2:5637 with SMTP id mw15-20020a17090b4d0f00b001bf06a25637mr244281pjb.106.1646422619113; Fri, 04 Mar 2022 11:36:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422619; cv=none; d=google.com; s=arc-20160816; b=0d27yNN7Itr+OW2yJWsW8Z1e82ciojymfs+xYfUlsKDAJFNHvEqPaUpbQdXkHQpWu1 2j49eT9Nv3HxjP9z9Xw9UtdnFMj8E3akaSqXYgJQVcEZHeRHbMthS5x+EgvrHM/593vE V78xnqLBPLZjHRj8mF/5WBUK/8bAdNM0X5/IQv9AZ9PGOCq35UDKBuKhea1loDupom1G qlVPBv2W8VaentirmRApewl3M/4SIeIGFpgTW+e9xHEC9NMEsiM9G5uAmGtkaBHsYahi NZwZDD2rZMf4eDUV60PDYvA7ImYeP25WbbIrpYExHo52fY2/FI3aK1219+drdAppvs6g VgKg== 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=uW6S0qlE/52pEBcXDW5lzVP1Egw0Y7/G2qMyAuKrNkY=; b=KL4P0vDjj20u/VOBwxdO8NI2c0bsJrrqFVzpsrXEC4X/ZRBL8liz1tR+UdYJgPxCjD Ql0s0fjjnLdd1xj2uPFqPL1Fl68NzUxTGshRdjEtEUwKY9FknzpCgQKVo0ICN7PJtgh5 vk1NOrjwNet/XVSMBkgaWnrky69ikDD0yJurajeI1QA7PR67HBpmPgQpkT1T7rYZ8O0w ksORYXwgFnXN4+Bi9Cqkjq1Rn1HXhoeduE00+LegoWE+Xfx61S9eW3sqPRnIc7xh5uQY Wi6xySckwsO2vRvWW1no73k0cdtxXtxJdMivwMoTqbRReRUX5RVhlYstW7zW01BR4QTa Ol2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DxAks4vx; spf=pass (google.com: domain of mptcp+bounces-4107-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4107-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 b13-20020a170902e94d00b001500c602582si5266851pll.621.2022.03.04.11.36.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:59 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4107-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=DxAks4vx; spf=pass (google.com: domain of mptcp+bounces-4107-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4107-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 8F3543E0F54 for ; Fri, 4 Mar 2022 19:36:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4B72F7C; Fri, 4 Mar 2022 19:36:50 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 39BC442BA for ; Fri, 4 Mar 2022 19:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646422609; x=1677958609; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EDyvqzTu29FXtv16eiKUM5mBYmDMZmAQzisbhe1QwiE=; b=DxAks4vxF4XAVoAc1EE+p+n4Mts/7MZDcdkihKVP1w879WGsmR3kqSho OV3XClWJOTFOscp/qk5P8JIp1uyJpPPPGv/ivAo+y54IranZSo1YJottZ vHisWKQlWSsPwBS2TImNFwRMUwrVYHMU2jPRm4drkfflUtIRaYu/sOgtS HURJtV2lQ7DlWoGqAlBSrkmcLNKgsz2rLIjKgNaXcSCbrSCb4dhpCXv56 z7XbVL97Nyln/ZgUZlJjtYbT8aO7pMagVLW7pLU/pGglRQvI7TEFOjw0R uBOw/+VIPgnzfpA205a+5uNN+LCUDdiEFmQsmEk6i9OFzOBxs76a0Ymfp Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="278739512" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="278739512" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:44 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340793" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -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 10/11] selftests: mptcp: add more arguments for chk_join_nr Date: Fri, 4 Mar 2022 11:36:35 -0800 Message-Id: <20220304193636.219315-11-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 five more arguments for chk_join_nr(). The default values of them are all zero. The first two, csum_ns1 and csum_ns1, are passed to chk_csum_nr(), to check the mib counters of the checksum errors in ns1 and ns2. A '+' can be added into this two arguments to represent that multiple checksum errors are allowed when doing this check. For example, chk_csum_nr "" +2 +2 indicates that two or more checksum errors are allowed in both ns1 and ns2. The remaining two, fail_nr and rst_nr, are passed to chk_fail_nr() and chk_rst_nr() respectively, to check the sending and receiving mib counters of MP_FAIL and MP_RST. Also did some cleanups in chk_fail_nr(), renamed two local variables and updated the output message. Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 47 +++++++++++++------ 1 file changed, 33 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 f4812e820acf..2912289d63f4 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -766,8 +766,21 @@ dump_stats() chk_csum_nr() { local msg=3D${1:-""} + local csum_ns1=3D${2:-0} + local csum_ns2=3D${3:-0} local count local dump_stats + local allow_multi_errors_ns1=3D0 + local allow_multi_errors_ns2=3D0 + + if [[ "${csum_ns1}" =3D "+"* ]]; then + allow_multi_errors_ns1=3D1 + csum_ns1=3D${csum_ns1:1} + fi + if [[ "${csum_ns2}" =3D "+"* ]]; then + allow_multi_errors_ns2=3D1 + csum_ns2=3D${csum_ns2:1} + fi =20 if [ ! -z "$msg" ]; then printf "%03u" "$TEST_COUNT" @@ -777,8 +790,9 @@ chk_csum_nr() printf " %-36s %s" "$msg" "sum" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '{= print $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D 0 ]; then - echo "[fail] got $count data checksum error[s] expected 0" + if [ "$count" !=3D $csum_ns1 -a $allow_multi_errors_ns1 -eq 0 ] || + [ "$count" -lt $csum_ns1 -a $allow_multi_errors_ns1 -eq 1 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns1" ret=3D1 dump_stats=3D1 else @@ -787,8 +801,9 @@ chk_csum_nr() echo -n " - csum " count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtDataCsumErr | awk '{= print $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D 0 ]; then - echo "[fail] got $count data checksum error[s] expected 0" + if [ "$count" !=3D $csum_ns2 -a $allow_multi_errors_ns2 -eq 0 ] || + [ "$count" -lt $csum_ns2 -a $allow_multi_errors_ns2 -eq 1 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns2" ret=3D1 dump_stats=3D1 else @@ -799,27 +814,27 @@ chk_csum_nr() =20 chk_fail_nr() { - local mp_fail_nr_tx=3D$1 - local mp_fail_nr_rx=3D$2 + local fail_tx=3D$1 + local fail_rx=3D$2 local count local dump_stats =20 printf "%-${nr_blank}s %s" " " "ftx" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailTx | awk '{pri= nt $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_fail_nr_tx" ]; then - echo "[fail] got $count MP_FAIL[s] TX expected $mp_fail_nr_tx" + if [ "$count" !=3D "$fail_tx" ]; then + echo "[fail] got $count MP_FAIL[s] TX expected $fail_tx" ret=3D1 dump_stats=3D1 else echo -n "[ ok ]" fi =20 - echo -n " - frx " + echo -n " - failrx" count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtMPFailRx | awk '{pri= nt $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_fail_nr_rx" ]; then - echo "[fail] got $count MP_FAIL[s] RX expected $mp_fail_nr_rx" + if [ "$count" !=3D "$fail_rx" ]; then + echo "[fail] got $count MP_FAIL[s] RX expected $fail_rx" ret=3D1 dump_stats=3D1 else @@ -911,6 +926,10 @@ chk_join_nr() local syn_nr=3D$2 local syn_ack_nr=3D$3 local ack_nr=3D$4 + local csum_ns1=3D${5:-0} + local csum_ns2=3D${6:-0} + local fail_nr=3D${7:-0} + local rst_nr=3D${8:-0} local count local dump_stats local with_cookie @@ -957,9 +976,9 @@ chk_join_nr() fi [ "${dump_stats}" =3D 1 ] && dump_stats if [ $checksum -eq 1 ]; then - chk_csum_nr - chk_fail_nr 0 0 - chk_rst_nr 0 0 + chk_csum_nr "" $csum_ns1 $csum_ns2 + chk_fail_nr $fail_nr $fail_nr + chk_rst_nr $rst_nr $rst_nr fi } =20 --=20 2.35.1 From nobody Mon Apr 29 02:24:14 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6402:358d:0:0:0:0 with SMTP id y13csp34181edc; Fri, 4 Mar 2022 11:36:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJyqnQ/XzIxOQqgeKl1yDFbe4x1TfAdpD7pJ4Mjd4fr2JaaRFxRVoJFBJSu7tdKdj9BSuhq5 X-Received: by 2002:a37:9ed2:0:b0:47b:7895:9e3c with SMTP id h201-20020a379ed2000000b0047b78959e3cmr160257qke.12.1646422608862; Fri, 04 Mar 2022 11:36:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646422608; cv=none; d=google.com; s=arc-20160816; b=XaQYvp6I9wc+rilShcTkVIo0MfkUzYf6qJ8vwan3yjWAQ3NpEghBiitmgp9JA7wpnd jLb7iR+5pTK0+s1eNr+I7QURShZXTOh+LDk8lzDy6U5Kuxn0w23Qkn14NrCwgx+NL/uJ p/lGuUHnRMyy9eFIIuBN+CGJZNv/NdnjSduFE0fOWutx0Cmqykv9EX1DIx2XIS2bX3+b lV2W67MarYoKCkJk56hWnMQ6VBLFvMvzT+zHr/Nkp+zmH+/b5MyRXOKLEHcmzuYO6/Nt 3w7w1GeLKMhaI14GTF8Vsimgd11ZtjP48ktPCbUvywXlZrpM5P4AbJqNNjr79tpsh75s iqmw== 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=boIGs8/F/XcJOutruu7zSyz2/IC3mZiTYKxj5AaZae8=; b=HrnjjTtawsLL8Uu4jRCycRN0dA8Fooof1ix3PS38dW07vu4ZzGiy5yNi1IggpB8e4j TlezFDevmoIYKxj37AicLhlh4xpbZTnrrejPuegwdC7RLSsuWnlveVAJ754ClZwyKmdV gy8DcTJv99AQD6DyPQjEonPE9ida4X9rgfHOiDuICcC5Mnwzzzql5J2QAKolddNntU4v utfBYg8o+hDu7719zNb3MYrHvB8Q5EUUGm02+whsevt7Lcuz9Zx4qSBjEA8XRkN8wkN9 gL9hpQLcUfqeVzYTn9INjA7y2AECgJu93dtbPqCyw5tQT+u6A7L5epIgur7vywMXacvQ sXfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="DGaQ/y+p"; spf=pass (google.com: domain of mptcp+bounces-4098-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4098-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 n188-20020a37a4c5000000b00648e8a18a55si1371868qke.735.2022.03.04.11.36.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 11:36:48 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-4098-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="DGaQ/y+p"; spf=pass (google.com: domain of mptcp+bounces-4098-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4098-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 54CC91C0F1F for ; Fri, 4 Mar 2022 19:36:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 05C9142B6; Fri, 4 Mar 2022 19:36:47 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 7C81A42B8 for ; Fri, 4 Mar 2022 19:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646422605; x=1677958605; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7kC064xb6BMbDim0pmnLeLvVczZMRtariLgOphzx/OI=; b=DGaQ/y+pytsj3vBs24ebbe5lUFVq0ofwtiUC3ImdngyswnKJTeSACLHW 9bIctOkpgeskv9d/OxRFCsSRdxeatXWl0VPdPO74ogpLCWjovJrzUYWi5 R4xjc36bOBxOZVUWVG2QQg4MdDTGj/0C3UqIn53UsnZ894et6t5uk+RGP z3NQ9TzVZgSV2h7CZaKg+HFPv+T+8fARGF6FP412OzCwxAkcZ4BFFjM7e mKqfT2xcYsDmWF1kqgOz0L74v/nU85557xaIK+Kwugs+9C+01GSHlUDTk kGjxKWQTVhnwQB+uFqmVZBD+jfAdOruohDm/BOiaSpDr3qqiSTQQHUYeP g==; X-IronPort-AV: E=McAfee;i="6200,9189,10276"; a="251622086" X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="251622086" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:44 -0800 X-IronPort-AV: E=Sophos;i="5.90,156,1643702400"; d="scan'208";a="552340794" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.225.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Mar 2022 11:36:43 -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 11/11] selftests: mptcp: update output info of chk_rm_nr Date: Fri, 4 Mar 2022 11:36:36 -0800 Message-Id: <20220304193636.219315-12-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220304193636.219315-1-mathew.j.martineau@linux.intel.com> References: <20220304193636.219315-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 updated the output info of chk_rm_nr. Renamed 'sf' to 'rmsf', which means 'remove subflow'. Added the display of whether the inverted namespaces has been used to check the mib counters. The new output looks like this: 002 remove multiple subflows syn[ ok ] - synack[ ok ] - ack[ ok ] rm [ ok ] - rmsf [ ok ] 003 remove single address syn[ ok ] - synack[ ok ] - ack[ ok ] add[ ok ] - echo [ ok ] rm [ ok ] - rmsf [ ok ] invert Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 2912289d63f4..45c6e5f06916 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1153,15 +1153,14 @@ chk_rm_nr() local invert=3D${3:-""} local count local dump_stats - local addr_ns - local subflow_ns + local addr_ns=3D$ns1 + local subflow_ns=3D$ns2 + local extra_msg=3D"" =20 - if [ -z $invert ]; then - addr_ns=3D$ns1 - subflow_ns=3D$ns2 - elif [ $invert =3D "invert" ]; then + if [[ $invert =3D "invert" ]]; then addr_ns=3D$ns2 subflow_ns=3D$ns1 + extra_msg=3D" invert" fi =20 printf "%-${nr_blank}s %s" " " "rm " @@ -1175,7 +1174,7 @@ chk_rm_nr() echo -n "[ ok ]" fi =20 - echo -n " - sf " + echo -n " - rmsf " count=3D`ip netns exec $subflow_ns nstat -as | grep MPTcpExtRmSubflow | a= wk '{print $2}'` [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$rm_subflow_nr" ]; then @@ -1183,10 +1182,12 @@ chk_rm_nr() ret=3D1 dump_stats=3D1 else - echo "[ ok ]" + echo -n "[ ok ]" fi =20 [ "${dump_stats}" =3D 1 ] && dump_stats + + echo "$extra_msg" } =20 chk_prio_nr() --=20 2.35.1