From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2796469jad; Sat, 19 Feb 2022 15:17:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhOIRe8Qbv3llvJsKTVGhkqHFFJmDPRo/7p6cnlKoaDBB1DhXhwwoujrt0giMp5l7jop5k X-Received: by 2002:a17:906:1b12:b0:6cc:fd05:a553 with SMTP id o18-20020a1709061b1200b006ccfd05a553mr10973252ejg.445.1645312662400; Sat, 19 Feb 2022 15:17:42 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id ds12si7297631ejc.722.2022.02.19.15.17.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:17:42 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3884-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=@suse.com header.s=mimecast20200619 header.b=iiU+HDTW; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3884-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3884-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 4285D1C0966 for ; Sat, 19 Feb 2022 23:17:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0D8DC57DC; Sat, 19 Feb 2022 23:17:40 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 9147F57D1 for ; Sat, 19 Feb 2022 23:17:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5c734vH9cTHk/JRE42w4TCTJ4dFK0O5pcmBB8qcmzjQ=; b=iiU+HDTWl0U9CnACBXPdrQ9ophsHld2Q93keIEc9HtQ3+EHQvnz2YgzFNT0xPIXfFdnYde RzZ0CF5yw0LAv+EhsqKr/sFYRFZa4L/i8qxEFivgVmvN7iek8dveGIvM5YJCsupw5lbJzi 7+0pB3bhR2wzR5aB86bZBM1qSC0TihU= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2054.outbound.protection.outlook.com [104.47.10.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-24-qdOY8A43M_eF2ISJqFS5Fg-1; Sun, 20 Feb 2022 00:17:35 +0100 X-MC-Unique: qdOY8A43M_eF2ISJqFS5Fg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cdYKZk6tMRHLFbs7c1gClI49WrMjDSgUeKXAGF+X/EtN5oofEbVRHvTuH3AnQnETedbmw6AaAlsqW/PkKmqsGSlr3xhXuUPaWCyKCx7FP9p21JaN71yH+5IGNpHlVNDCMvHJa6/fG2owxYA0DULFWgiCh5eU4g896SuZ+VpaYCbaumpQ5BB8t51spg3iTP7wRIZjBT4CIse/ni+EYyicgKmHJ0fhMEdHI4+7t+VH3TKK1IoTBjTIEdOwbHMcIL9JGEF/O5LdCk4FRSrweW58lObEKPpXQMVAD0qWFEgHNVe/EIcZTZ6EMltRrdCZlDCzH1YpFzXOA1qMsLbjrqL8JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dfjcDiFf3ECRZiA9YAq4q5YuiKoHSMxyafqk7EmEy/c=; b=j9m3Jwt5OaMYSJ9ClbhYrqZeEJowsnUrjJbh2giTseV2VSQOHjidWp39/gUERJWntpM5jguvDok29jnJC134MbyqW8ZvNtZISV3w69h3yOEcnUwcxGAUqtHQrqPeHkJZoyMKrQzRNprjHF6S7GMYFue4KFngPFE7MgMOs73NDoFYe8sKtTsqKy6+N997e8ZebvtNowgcrAjW4dV+W0SJbaIQzBSYrqIkoDZ3HjwcsyKoRf+UQ3vp02HY9XfxOxDzCxj8dKWUM0LH3e0THwscivLiqPICC56zygHun7Rp/TF+4Gw3DX00ikMDLmfKn/E9uOdBExqhOFizp5sE2UPddQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:17:34 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:17:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next 01/19] Revert "selftests: mptcp: adjust output alignment for more tests" Date: Sun, 20 Feb 2022 07:17:45 +0800 Message-ID: <9ef5272ae6cd3b5e14a104f9bda4f1b8820a17f2.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0079.apcprd04.prod.outlook.com (2603:1096:202:15::23) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e0147e7-5e18-4f32-1ee8-08d9f3fe028c X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KMD0+lkG1JisQwgeFGek46IF8TVAQegt7Ms1DDL9FaufbTTJpQN7jm243svO/eZXFlgCOr/PuFqzlFe4sRSf40FtvJOgyCm9HAwOCxfzvcYs6Fq1cSOW9MFGc/Cx2nVIOSyaHACo+Do5bSpQKxeqb+AlEo1LGRgMWIuCsH+nQ9dJFwd9Arl+rqnWouAGLRtFcB9n2U7lEvlgv99kwcTNoiJWqd+Zn+RZJkWQhJvkbnMyv70iqj7KIzo+fbCTLL8vGosrdVkTE/rStAGJts/VzaOlkZ3ilOg/rm6TsXt+MY2Ob2fJ34qP2M1Esrr2h/qaReJneGPC5JLwqXrlFdwBiGafyXSwXSWSPoHadin1XaMqE+4zQXEH9oCxdqkxMkWGwgu+n7Hufc/s0EKFXtazgRb2qfnRJ0Lyn8o4xZd/uJE5vluOTVakJw5FK2aEQ+p0qPK1pGfll5g6oULsrcppWQwU7ei5p6awAdlu9+bGQiYDbi3rORqhHfWA2M5l41oNdLFM/QD6WwVAfPVvdBHooXewM+VPdCW5HgxP93uR8grPy8UAufQVpwxsjbQNLGCyVidjUuorkHHrPY3g9e69b2V8Koi8019je+jZSTgcXyCI8gy+TYimzIxcxzu3IMAnMkzsgZ/1/meSCyx3Z2RaHg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(44832011)(66476007)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(5660300002)(186003)(8936002)(508600001)(6666004)(107886003)(2616005)(38100700002)(6916009)(36756003)(6506007)(2906002)(316002)(83380400001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OOVzVkDJU78A/fpmbIkI2hhp7Dp0ESvS4xAdW8upj5YCSX84DuDTvEq+dz/R?= =?us-ascii?Q?3U17l19ZFQuUC/SghFV11hEQ8nDmrbj397kc7AuwzcKFQ3wed6LVaZ81bjHg?= =?us-ascii?Q?LUhO2nk7p6hgBd1jUusZxvLhLNy4EcvhYB1BkplMYPzuVDrbpqKFWCPY7ByV?= =?us-ascii?Q?0k8BepSVHOBrcjTuJqfCsyDurMltRfOb6MNlWxkwnXSLnTSPsVlFCgfPO2s3?= =?us-ascii?Q?ak2kVGqjOy0QGvaJCgo+yngpwHCTxtJU82YlLnqf6sCbp7cM9+DKcenIGO4J?= =?us-ascii?Q?sQKuJc7qdjI8IEoLGUqGSXZdtqA9qvL1amTQv1ZIUDdUKJ/0eGBNty/aHMtI?= =?us-ascii?Q?ycCopdp3V57cuyWDajVes5I/MDed5t4OPnvufj/DbNJ/4qfB3FujLgtdGVHv?= =?us-ascii?Q?n89DNGrioLWYyHIZuY1xxSfcZu5gcvfguXu+5WIo1dIsCObM3QPSMiM3XXXc?= =?us-ascii?Q?K+vXZiK2zjiNgXDWqRfrBxUfOeeL4jz1Rw5Y1tX7VtNLmuHhDFvDkdNt9owx?= =?us-ascii?Q?b1+ZL63qPb+lFUpKqerp7VtvqzmSSixRgU4gIpyFOnRXLkdBHZZu2sL2XodZ?= =?us-ascii?Q?v+5ECGCMFcLA8s3ya/3rhLH+k7lIEDnRZGNQfByq9CuaXuw/t4xJgLUu2l4h?= =?us-ascii?Q?dXveOzCNo00Zzc7vqTCxFKvZbs82nBn6FF3dmry+Vy+pfCKQF0AfVKT+3Mwj?= =?us-ascii?Q?QfnKFJ7yBqq7LuA1D0lPeNgLeRRda3rkzatr8fkj4fv/XsrUJWuZfYrGEWMv?= =?us-ascii?Q?ogTGcVOC8ViWmloJu3NqB4WFRVpw7/a9Tu59dNobVuOJ9XZPUmk3j1D7xZGL?= =?us-ascii?Q?31DS2kN+7vInO7d1OTvik/0qpdccd5+Kn0INrtS/FPRta3raoQrK5dd72NJp?= =?us-ascii?Q?X8TN8VLiM7VKyRR2lISkUhs21sntqE5Txb3FQRsX5lqhnXbC+JvHF5X2Tx5p?= =?us-ascii?Q?Q8+OMPZVIP2v5WuJqZheF8jLANSOigLTUqagQvNKAstCixTs/nnYDz2N/UbQ?= =?us-ascii?Q?DfjejPkX8RsAcshg8yV7QxKlP0XPeDSNCSRLODF44QKF2URUZw6p9VurtCAg?= =?us-ascii?Q?xwG3I9jAZ+1th5UOjQWktOL2mea/nUh1xH7uLk2rXwJLL4Y39KqoLGLI+Khf?= =?us-ascii?Q?bUwLV2o8hh2v8p9g2tqjDrNp4649D1tGqwgtJy7oS07Eb8K8BNRnn+SP5SD6?= =?us-ascii?Q?PSaJf7BXHbCRhznXdX85eFt7u3djglqoMiuFGyW5eWYzlZHWtCs0WWPSiAH8?= =?us-ascii?Q?5VoJTj8YNcZjINu82VkVP+e4jMU/w6SuZ1IHa7EZBDbAiU9peDHC3aj/oj7q?= =?us-ascii?Q?7JUyZeRaDoQOBrDZbZM70ShJ9JVqm0/9VZkjlQIkaBwOvpPQBaVPXbPxpILq?= =?us-ascii?Q?2WgM/ZmJX8NgQUbid80gVs0hfW1N12Vt1yIXLU83vWORnhAODtfvu6GZAjAE?= =?us-ascii?Q?IPUmr76qr/CJ4Gjc2zcXLNX1+YcoQlSP0jQv4BQqaeeg5iNy9dsH8wP24wjA?= =?us-ascii?Q?O0YQp1JHHr4LAM/NsrKdaz1y1q7UI3DpZdBZJpmfJq5pFyzioOjoHmauCjRc?= =?us-ascii?Q?pS3m4rIlzsSRD5RQMxO/hwSgnj5pfgKJ/5fQ2Fetfk24FACcNwDpyYIUDND8?= =?us-ascii?Q?dI2nUPpbKUJ/VLmowgzIByiAguIubVQKbMUnIgN5UVSnIb1SeiVveNOtIc+O?= =?us-ascii?Q?d+CBTRdMQXnXEMmFzpeXQa5jU3g=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e0147e7-5e18-4f32-1ee8-08d9f3fe028c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:17:34.2896 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9zsERRaieOLXOnwMjAr0cCl81DPQnOY1LDZfb3iV6FHVGgYxNKjWvU0zDoOmIa7ShRJ0RtRCb1rDuMWN98/pqw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" This reverts commit 4921e10f98e3e09f7fab58aaa0faf8d8aacbe612. --- .../testing/selftests/net/mptcp/mptcp_join.sh | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 8e6a5292175a..baed1e0aaa0e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -21,7 +21,6 @@ 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)'" @@ -813,9 +812,9 @@ chk_csum_nr() local dump_stats =20 if [ ! -z "$msg" ]; then - printf "%03u" "$TEST_COUNT" + printf "%02u" "$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}'` @@ -847,7 +846,7 @@ chk_fail_nr() local count local dump_stats =20 - printf "%-${nr_blank}s %s" " " "ftx" + printf "%-39s %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 @@ -879,7 +878,7 @@ chk_infi_nr() local count local dump_stats =20 - printf "%-${nr_blank}s %s" " " "itx" + printf "%-39s %s" " " "itx" count=3D`ip netns exec $ns2 nstat -as | grep InfiniteMapTx | awk '{print = $2}'` [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$mp_infi_nr_tx" ]; then @@ -914,7 +913,7 @@ chk_join_nr() local dump_stats local with_cookie =20 - printf "%03u %-36s %s" "$TEST_COUNT" "$msg" "syn" + printf "%02u %-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 @@ -977,7 +976,7 @@ chk_stale_nr() local stale_nr local recover_nr =20 - printf "%-${nr_blank}s %-18s" " " "stale" + printf "%-39s %-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}'` @@ -1018,7 +1017,7 @@ chk_add_nr() =20 timeout=3D`ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout` =20 - printf "%-${nr_blank}s %s" " " "add" + printf "%-39s %s" " " "add" count=3D`ip netns exec $ns2 nstat -as MPTcpExtAddAddr | grep MPTcpExtAddA= ddr | awk '{print $2}'` [ -z "$count" ] && count=3D0 =20 @@ -1055,7 +1054,7 @@ chk_add_nr() echo "[ ok ]" fi =20 - printf "%-${nr_blank}s %s" " " "syn" + printf "%-39s %s" " " "syn" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPJoinPortSynRx | awk '{print $2}'` [ -z "$count" ] && count=3D0 @@ -1094,7 +1093,7 @@ chk_add_nr() echo "[ ok ]" fi =20 - printf "%-${nr_blank}s %s" " " "syn" + printf "%-39s %s" " " "syn" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMismatchPortSynRx | awk '{print $2}'` [ -z "$count" ] && count=3D0 @@ -1144,7 +1143,7 @@ chk_rm_nr() subflow_ns=3D$ns1 fi =20 - printf "%-${nr_blank}s %s" " " "rm " + printf "%-39s %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 @@ -1176,7 +1175,7 @@ chk_prio_nr() local count local dump_stats =20 - printf "%-${nr_blank}s %s" " " "ptx" + printf "%-39s %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 @@ -1212,7 +1211,7 @@ chk_link_usage() local tx_rate=3D$((tx_link * 100 / $tx_total)) local tolerance=3D5 =20 - printf "%-${nr_blank}s %-18s" " " "link usage" + printf "%-39s %-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.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2796573jad; Sat, 19 Feb 2022 15:17:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3tnA16TptD1WwyL6cEUxX73jLwV2Az+bLESol16BeDxoT6jjI9J+PftedhN6G5Q36J1hg X-Received: by 2002:a17:906:4fce:b0:6d0:910a:b68f with SMTP id i14-20020a1709064fce00b006d0910ab68fmr7796646ejw.215.1645312671680; Sat, 19 Feb 2022 15:17:51 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id vz9si2000718ejb.414.2022.02.19.15.17.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:17:51 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3885-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=@suse.com header.s=mimecast20200619 header.b=jHufkoci; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3885-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3885-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 C78E81C09E4 for ; Sat, 19 Feb 2022 23:17:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6086E57DC; Sat, 19 Feb 2022 23:17:48 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 2E55157D1 for ; Sat, 19 Feb 2022 23:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LgLa0k4iwdQV5ovOVyFWqBVgHmak8ag2xn4ZPYSgLT8=; b=jHufkocijrGBXeDV498zsOZpincC0SUCDjWVsKNGRvQ+E4oTO1jgehl3i03b4mC/ZF2Lvy Ox8lg86Ty5De/1vf0pbazmZMw6zL1FVeejlTRuiIihiWgw3zQ5BZu/3Cd9E0+ZY8LqgKzL 5ckXZUfaopcgvRrQAzPzU6BmbJN05vA= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2174.outbound.protection.outlook.com [104.47.17.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-23-zZ3u4xSoO3i_pICtYoJDCg-1; Sun, 20 Feb 2022 00:17:44 +0100 X-MC-Unique: zZ3u4xSoO3i_pICtYoJDCg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hLhsLs/wuAchxbryD8Qj08QWPx776h60yVoQ+EfqkBBHIWiRuPlXZaWzfGYgF+S5oNLCbqD6f3SByvmpL/8ETqTgPC9QkFcgbM4F96TIJNFqONqAN/wkLoZ9g47EejeSySGGmj/cCsaMX4+fCvSafhSfQgQWX8EBhBQwzKbvd1rwW5zydIN+ROzp2nETT0PC+J+Q8fuwJwmYtUZ8BK3GHQ+DHHwYsbYHP8fEwXdJmJcylaYMFdOmnxIzszuYFwIoSCeiOoTByW5h8RwN4KE9akQx21jY4UtZ5qtMXBVsTEoO+mLXLRMkI9p51Mw4jLwMhpyX406SIbh2u8twF5MLwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kCP0cEqF9Lr+c/vb61nD0DcfhluNp1fxg4OfD7zJPjU=; b=SOTI9NOLBrcYw/7cLqOfC58W7ju7gcgSCQwfQtBlOfqn8+Sz+Hnh/LX2CLj4hvdg1Oe3SfuH32QfyNTfa3DYdLwbNgYiTIIl3SoRLDpS7yNmFH5mROJ8RRpMyQCDnKGFeLYrwWCM55rwVUPEstDCgt2y9bDqHjqR1wbmPN3nC/NmaG2Zi2iZR6deMtnWaKUnUfhL39U14UuQo6Nee0iYo2itqUj26RPznLuSEDrmbzp4iEOMf6plvj0kE2VRGrrulAV3I6OmHvrP13shONeRDZUjyG7vSvLVkR3XBPTsIf/F5PkLxt6+WecTQ38uO11hDp2DB+Qz2Tc7I0n+ZINafQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB8PR04MB6841.eurprd04.prod.outlook.com (2603:10a6:10:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.25; Sat, 19 Feb 2022 23:17:41 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:17:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next 02/19] Revert "selftests: mptcp: add infinite map mibs check" Date: Sun, 20 Feb 2022 07:17:46 +0800 Message-ID: <5f31185476db75e2f04205b187ac0d47d894fefa.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0016.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::26) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e5e2351-e78f-4669-5e7e-08d9f3fe06d2 X-MS-TrafficTypeDiagnostic: DB8PR04MB6841:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mTn5lc9Um8fzopvmV/1nJ/GfUXocH6qToytHMQnFf7vvLvMCQa7imqRIS7TyjAmWiqAHG0LzTdzYyFgyBtYCa8hQvQpNgyuuecKZPYmgE1tlVvn9p3BOxaR5HHzwADTb6QQjHYQFCvZMz13Dyi4AQNgAzov9LezyUfntKpUpMNuZz7KJHi1Y4+bsebUG7NuS+Vhqh4BAY5S1xgwdRKW+lgR7S3eJejSNBa0+WfrlWIdO684j/S+2A3kaQ+EpwqjUlA8m8BaFyKpbKitocJa1Mrdm1ggaOm86lwsokOGL/64fUjKsj8unGBAvbG32KaRkNGPbT5dfLguWMVVikqLmIOWJLwX9ZvC7SOIy/Vzqs3wGMiyEKPxTymlhdZz9s9L2HMWs/rAOLFPeu2NRPTD8H9th1euMEhepFmwrJ996kIl0lh3y7ZnA/V+/QA/lbKKHGPx+bIV9w+IPxu562sKMaOcbvWNXyGwFVsx6uOpqwEgMjyzTGT0bXSyxEeXCxVCBn7OwBypxfekJhSEjK4YxVh8Lv+9YuJOeEvUMOszSa0595/EbezB7yPUIu/v6VVaJSuJ67dHauGD1vm/3uqipfWQT+ntkzaYsByKYQtQldqo53fTaYvSxux0OiIh12tHzrk7aR5Zdp+xlOIgE4TinMA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(6512007)(107886003)(6916009)(38100700002)(8936002)(86362001)(2616005)(36756003)(6506007)(2906002)(508600001)(83380400001)(5660300002)(66946007)(316002)(44832011)(6486002)(4326008)(66556008)(66476007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dvmuOSnCdaJxtiEI0SOFjz/wdEmcaGO43XMoZNJnG0BmxDNnt0eFGb/4/hGL?= =?us-ascii?Q?MT5jhCxDJ3TxQ2wqaKmQ+kjd8gzKCKIRbzFusxGB0oUJ94JwZOmfz3hJakwr?= =?us-ascii?Q?5Sw0zgpYJIa16RH00FTysh8y0hrB612uGSq/DaWxIe0fB3x8cdoAmpgglXwE?= =?us-ascii?Q?YZXMHEkO6dkxAYa/cH90QK5S7zVIFlWD7XBFa0zdJsgdOMzTU859iwUYb9PV?= =?us-ascii?Q?eGONcaDMY0cthMV2DFzzeMcwfnm+pYOIPLvYu1bL7j5m+h58T3w86P+/vv5O?= =?us-ascii?Q?TpeA6sW2NT+fvPSVe+07B0YCHzazKbyCFchb54JWm50P+WGAgJ4ayHqtciUY?= =?us-ascii?Q?ssvNTWc4BjFxybISzmWdIaeEx3ZfWwc0EFq0P9MvqTYl6Ktu6V6Y5mXluL7k?= =?us-ascii?Q?DNNfrlc0MGhrqFvY1+/JWnumt1lvbgF7VxE+R0XaD5h65luZ4FXwF8VCg8eI?= =?us-ascii?Q?HdZU1VHWUv4EIrOU1VSBjudSh2pGf8nnIqHtX333gzc7v8mLnuzkrfaYJXAa?= =?us-ascii?Q?4vspqtN61i4Dc3MxIUdYUL86MgreixU9Sgg0axDadJD8Zrbh9EFdvILaQDWs?= =?us-ascii?Q?Ekjg9ESqHspFu6fCuyFXJIPb/LwqLJltaqCB2o4s9gBdTITNTPLC/eotswPL?= =?us-ascii?Q?RuKwn2SzCCi9Y+8ESmCDuLPRtF5aEWUpCzmzNKSS+1nWqK8DA/a2Yce/PT0Z?= =?us-ascii?Q?0hmzHOpITyEfr5tXIyaBncpIFWX8bkaq4GJhNKWrRG5CjZFEgzenX0kyXDwY?= =?us-ascii?Q?z8ZUHMDancLng2Qd5wymz768ccDzKgdlBPpC4uqzLzr6OePwJAgceYarry95?= =?us-ascii?Q?NPTPMxG9pXwjbXH/z+YSSaiXlNkd7aSziuCJRydyMDLW6OPjndXCe8w+5tYc?= =?us-ascii?Q?69y42dmrU8P5dJZR9PswN4gqRt6HfWe5Cqiu/yomhcRGP4SstpRVhQ6gWD+Y?= =?us-ascii?Q?nvVeVjiUed1TGEXP9mGu3cAE+CHUbHIS83zVf0kdeAkWCaDZNnkYEKg8MFhu?= =?us-ascii?Q?Rw8wWbdzzGqEj4c7oG2p/jXx4KdQV7BHbfhd7S/rp2slMNnTNAj8nmBArdH9?= =?us-ascii?Q?eM/p1zuZ8QI+1gDpnTEZyKDxIsjw3Lbh38ROmwR8fbVdb+Miae12gxKI1+OE?= =?us-ascii?Q?PpDQ32cg0alKSjf+3L1ZVVxB/gBslac4x5vnYA5ltT61FUpo8NLx+mEYs1no?= =?us-ascii?Q?2eDcnPM4CLJvFrZlY7WjHSRMISKB4+r6Jm9tRr71cNYPZ5KEQGJVf+NFWDF1?= =?us-ascii?Q?j/4Nebv1wSkEROPQpisQBGnZnonAXTO0BH+CIQE8QZJhK865+55lJR+FJ+dg?= =?us-ascii?Q?Gdrcx0xDiPhG98/qsnkBZyctTCqQCAG+80WCQgdcazgpWqQt2r4dVbegXOmw?= =?us-ascii?Q?Uo5EMBeC8vXuygE1oLMct28fQJ8qIJTmN8Fq2svMtRjTkHH2AYj/u5tVe3Dw?= =?us-ascii?Q?2hV/Yh2NdaqfgziYztLBqvL0AGP1d/ATSp8HjydhSFs3/xXB5xxJX+nsBqpc?= =?us-ascii?Q?gehlxb+p5sNM8PxvwMjf4+jNIdeSwkuIvXMKg9vagaf/cjT62UO5WUgfSv1y?= =?us-ascii?Q?AAG4lIjDzj/AnJIBIOB2Qyl5N4eV/bD2pjU8aa3iWtqS/ifwL8zeJJBEyFqq?= =?us-ascii?Q?6b9aZQOrYZKJ2FqxOF84/EZdOT4Vxg0Uv5AhyRpNl7+CihWwuDn30GrNuIOu?= =?us-ascii?Q?RiY8Dq9wEzGHwuW2JahHlBGCFrY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e5e2351-e78f-4669-5e7e-08d9f3fe06d2 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:17:41.4453 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pjUE+9xTu+TefF9mbDoDGU26F4mjH2su4uc+bg9ptlrXye30rARzvDy4qh55AuPFdw2UvVWEKMXiZCUq7I8Wow== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6841 Content-Type: text/plain; charset="utf-8" This reverts commit 22ee6e6a089b8ad85103e6835ecfd822f4f6e1f9. --- .../testing/selftests/net/mptcp/mptcp_join.sh | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index baed1e0aaa0e..519178dacae0 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -871,38 +871,6 @@ chk_fail_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 -chk_infi_nr() -{ - local mp_infi_nr_tx=3D$1 - local mp_infi_nr_rx=3D$2 - local count - local dump_stats - - printf "%-39s %s" " " "itx" - count=3D`ip netns exec $ns2 nstat -as | grep InfiniteMapTx | awk '{print = $2}'` - [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_infi_nr_tx" ]; then - echo "[fail] got $count infinite map[s] TX expected $mp_infi_nr_tx" - ret=3D1 - dump_stats=3D1 - else - echo -n "[ ok ]" - fi - - echo -n " - irx " - count=3D`ip netns exec $ns1 nstat -as | grep InfiniteMapRx | awk '{print = $2}'` - [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_infi_nr_rx" ]; then - echo "[fail] got $count infinite map[s] RX expected $mp_infi_nr_rx" - ret=3D1 - dump_stats=3D1 - else - echo "[ ok ]" - fi - - [ "${dump_stats}" =3D 1 ] && dump_stats -} - chk_join_nr() { local msg=3D"$1" @@ -957,7 +925,6 @@ chk_join_nr() if [ $checksum -eq 1 ]; then chk_csum_nr chk_fail_nr 0 0 - chk_infi_nr 0 0 fi } =20 --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2796593jad; Sat, 19 Feb 2022 15:17:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfToS1IjkIIL7IGWvyLxPwCMm8DPDGDQYi12cQiFfQq+oXF2A4gLhrB0HUw6/hTkHV6ItG X-Received: by 2002:a63:dc08:0:b0:372:be18:dafc with SMTP id s8-20020a63dc08000000b00372be18dafcmr11156304pgg.440.1645312674425; Sat, 19 Feb 2022 15:17:54 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id m1si7843076pga.668.2022.02.19.15.17.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:17:54 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3886-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=@suse.com header.s=mimecast20200619 header.b="Yrg/mJ32"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3886-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3886-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 E70ED3E0F6D for ; Sat, 19 Feb 2022 23:17:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D2A4157DC; Sat, 19 Feb 2022 23:17:52 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 A727D57D1 for ; Sat, 19 Feb 2022 23:17:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=geooSBKcKNlbZRAlykuOr3kWdEtfzQeHdmvsIJ5Zj/Q=; b=Yrg/mJ32JAg7Lw3guH5XVgtNWkvBa7X2+74LrY1kwmpUgsJPNXgjHMo5EZ4rwxEEzWu8r5 aXFHZsXTlftD8xVTB/BUKsQYK8Z9TpbTopnRegsbHHQGC8ddE1Ptq3ZhqV5dp0Gt0+z0ub vTMXlbbxtzSpqBIhJlJ8pPRb+WR5Odo= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2055.outbound.protection.outlook.com [104.47.10.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-23-S1BTcxOiNcWaVATWgmw7KA-1; Sun, 20 Feb 2022 00:17:48 +0100 X-MC-Unique: S1BTcxOiNcWaVATWgmw7KA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FyBxkqPXXrgfZ9pEUQS5xVvWXsbHp8vUNZ00KpPmvfwDs6D/I5x1Y/mQWiIoohE544anXBAt8P3qxG+vZdpFxy6C9XaY+m06/gVWukJoishEuxpSEiqSk8rNbfXd3O5BgJ7K4KwPlwTPHUk4I2Wcby6zt8DpG7wkj851xXcXawOBmsYG/cTfRCHYAoj8tToZRXvBJlnlAUipvPFFz15BHG0THB5bO3NJh18dEqz8+aeQIUQxz5/yDtB4pgAk3rbD5J86VyHz2iQo6QOw3GHJv1lQgI/m9OLxP14Noru+NOpm7h1rlFSNhGc89bdzG44ho4mrTG5fnErrmseRYOSDtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MjwH0b9VndBZ8HPsz4t/g8VFGRWKbIbuszQiKcmRdIg=; b=QSe8EAupoI7kWaeP082aUDPnj4OLUU8CL+CF7PSL6Bz/i/q32f7Erv/+ELywaZOVIpiqOhBGOOX+krurbfx+jPZrsGpIFXSTxAeP+A72jYQYS5Q1Z8cJm4Nu0LbKd/QhKe6XvJ1F+rDkvO994DAGO7ePhgYd98sSgG9ksDszvyQa3T4iWyYoyzBix5bA8VmjsxXrKU/TrYxCniQzUBKESFLzz2ay9y3fmNupjwA2EudMAv+1Xx6YsUtWsL65UGGLiW72taY5tjlv/dhGimSXw+1/TTkaE7t95oyRpXSW3HbsMY2AF5RrEL1NqBm/ymu837sEY/Piqnp0vUBI5+Sn9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:17:47 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:17:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next 03/19] Revert "selftests: mptcp: add invert check in check_transfer" Date: Sun, 20 Feb 2022 07:17:47 +0800 Message-ID: <795d36d5f54a9237dbc9ce6827511cc7eb4e5fe0.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0108.apcprd03.prod.outlook.com (2603:1096:203:b0::24) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ffcd215-316f-4063-6918-08d9f3fe0ac0 X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PKIQAk2skkVNPehC6p/LOkXYhq0IQc9KJaiNF83HOvVN94oTo/UfsOcA+K2AEIfiIEkiNhrQ3UQ7Tx0bgF9ocH4WhIWCnHIfAKmEbMgRZVflVvO3Hzyh6kke4M24AKoipLW3zDYRRPCfWWyURoT33cWAyP7WrvMPKbQuZv+BD6kWDrZGntqUyY8VIJUz70yz1xvp6x3TD5xpbZqaQmsq3PC6lwLFKFXFjAviUUB8wtqXhz1b30p3qkwKG34RyPFOLyJ+1OAcj6mw6UOlw/7NWjLkqxlLDRN+UQXKVy8ezCX2Kvwbwe3x+hCumIMq7XAQ6aP+V9gUdEaloEIEi5Yr9JGVCkFWMzQ7Fk9TxSW/lgNCt69KOeVHTAx826O12+E6s6xUSHm/3bEPAUJOrPmHsTRuVxPn+NykaCe/BnxsAVKcfWY8I5O8UoYCqrDQSL/OmJRRlbmtE6Bzp7FtrhY6a1hN6u+FYR2t/V2MxZUu8M8uIXUWl0AFuWIWwTk+P0OI4J7eAsCIgiH/JG69fN3cghbU2gGO9iR7/q65fuxMuBQxrz3K/4wfHK6OM6/nrVJDNK1WSC1BT2iQXygK2SaxPimA6op16e8SGegfjWs0SDWEzSXgsEbO3HgOQzKL60Gw1j7kUjB+f4h04M0ha6kQgg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(44832011)(66476007)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(5660300002)(186003)(8936002)(508600001)(107886003)(2616005)(38100700002)(6916009)(36756003)(6506007)(2906002)(316002)(83380400001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LqIn5Fbf8h8epGeRdL5TfWETxbbXmrNDA8OuSfJ8HO9BPebPw5rRaWImHrEy?= =?us-ascii?Q?SHJfE6PTH7VtAnXdy7LwyVbKng6ysMX69GaFbBJ6rAMB42zUoiqQI+jc6NU7?= =?us-ascii?Q?BMq2zhxFTMvutWoOeTh3VmYSubxRwA85o3Kl++Mt+ZiePFGCmlEZCMGc+pP6?= =?us-ascii?Q?qtOSDmybcRawIp5uknwka6zuI9mT4C2B8fEEbvpN00fO6CskHFbrxxvg7rJe?= =?us-ascii?Q?2WfhbOmSNhwVZFucekc3sZkChzjS/HpoXJ9OPSQUWAD4IxeVtEShIfaJDBH8?= =?us-ascii?Q?SbInbY/malw4xDgs30naBhn/cqJUJ0Ta+Qig4XRXl9R/RT2MGfN1zUrEM64p?= =?us-ascii?Q?aCxTlTD1Be4DOSqFfTCz2KqasIeMGmPz52A6qhG+XnThkPMATaIDLvIT7xly?= =?us-ascii?Q?zHH8DSrXn43AIrROZsw+zDLIYnfvz8Xu9FdOmWxRelO0kGhnrrBcIF5mMA0s?= =?us-ascii?Q?xynAcS7qbzYa92vXk09Par2avhRD3CtdVE1W47oc1dN2AVPB90K5NWkQDsZD?= =?us-ascii?Q?GxkWrELLGHhAYav3xTOzKWC2Po4EhaDbcgqRtowIF36Cd6rY8oWdzOdizWZj?= =?us-ascii?Q?IAGvVRSey1+LeDxd2nn8IYndon2TI+fFesbuJ7kZBU8wwRgT0aklBnj9+XsZ?= =?us-ascii?Q?Q47S3Lk8/mpuMFt08iCQ/rbe8KAJtyyfLo0y34jCgNDSb4lPaeLhDJIaIfLy?= =?us-ascii?Q?B+Z8wA71letBhpCDThW77pcBpsUiIwVvAwO2yT6+luUpTxTnudsMYQCX5TiX?= =?us-ascii?Q?0hU3brqSqX002w0O9DZNtFzHyU8nmxc3ybHYQiHYMtSHFwYTdjh0RF1TV8ZI?= =?us-ascii?Q?77/OIqytWv1n5IlZy2pk896gCyM6eVKARhmNOB1vgVOvNzJjpqPldIFYaa90?= =?us-ascii?Q?WwQe4ZSy6PAoAp3XWAKsf3qBk3lVR4CPzcs4tmi1HcMRI8hMa8MbGQVngCUL?= =?us-ascii?Q?7jB4LHiEhuYYZkwg6KR78MHWk1S0W751Jt79DkSr0iDfXHuSoYR9Fl1KpCrX?= =?us-ascii?Q?8ax82y/KmdtaSmYZVix5elIBV0NJsglmXKGnAD/jyDmEhS1XN03XAIUJ3Lhq?= =?us-ascii?Q?Sfty1pJbwlx4FsgytcfnbQv62tOTUnzENnWeKSRtQixzBLgC3C25PaXDwP1X?= =?us-ascii?Q?QJAHVWYwtc5EHtMnKKMTY+K5j6WOFNVhCR78fJ0XRl3dLR1+ThvLpI6ksLyD?= =?us-ascii?Q?MbH+jvq+FDiKTgNP1KGqrj+cMO3G1pKlbE/kIwIDXDn77M/MY7ZWsawt54K9?= =?us-ascii?Q?6UjiX2/H3AcM2NbiJMKrQihrofzfuIjrh2vImhRXxW9PhrV3TWMkr663Zp/X?= =?us-ascii?Q?eRzsbASqvU9B8IZFW4B8Rji07hOlxMoTi4qs87rz7swIljTREXHDPRGZ0Js/?= =?us-ascii?Q?kU4h1khQdVrbPuTha5ynhA4EtXS/UZTCR4FMfsmBJFY0S4indJ0B3ZbCnUJq?= =?us-ascii?Q?WjO3MU6rbfHqNW52OfGw8wq/HlrwNPcTCW+6zJvypD+09nw6y+jbS6Q3UI1E?= =?us-ascii?Q?g/HflhQtqKBMj8hQi/syVZEwAHHWTfn3bCMTXUF6naz2yRL6Fz1+SUOnTJPX?= =?us-ascii?Q?IEBbtm5IJYU3APS49vId2ie+/J2AbtT4POib2gnypTNzWa9ZzYp+JAK0v/sZ?= =?us-ascii?Q?E/AGf7XXZyTsZ3xiN+V3TCtE7+v6Xv6wKVSwxXtomGJVUjSuGM0FxGYozuM0?= =?us-ascii?Q?uoS8l2dDiFUO/+3eFwSYnMRbdWg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ffcd215-316f-4063-6918-08d9f3fe0ac0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:17:47.8198 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tJJsc/QX1mrcnpPpwQGPaMjFG4dQtqz1P5veV2KeZ1MnDrgEtAwQQLGsJVElsr5a5NN5bDbza3G3unYc+SAwSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" This reverts commit adde1b7ffc4d70608d04be74d8a0f3e5e9b55ab6. --- .../testing/selftests/net/mptcp/mptcp_join.sh | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 519178dacae0..46fe7d135e30 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -16,7 +16,6 @@ mptcp_connect=3D"" capture=3D0 checksum=3D0 ip_mptcp=3D0 -check_invert=3D0 do_all_tests=3D1 init=3D0 =20 @@ -61,8 +60,6 @@ init_partial() fi done =20 - check_invert=3D0 - # ns1 ns2 # ns1eth1 ns2eth1 # ns1eth2 ns2eth2 @@ -220,21 +217,15 @@ check_transfer() out=3D$2 what=3D$3 =20 - cmp -l "$in" "$out" | while read line; do - local arr=3D($line) - - 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 + 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 =20 - return 1 - else - echo "$what has inverted byte at ${arr[0]}" - fi - done + return 1 + fi =20 return 0 } --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2796645jad; Sat, 19 Feb 2022 15:18:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwefvKlgQ3I/TA0C5jDK3sV7AfQn3GtQ1q5UJd6xXgHn7F/92ODPC5cTs/TKNOEh3e0xNs3 X-Received: by 2002:a17:90a:4985:b0:1b9:6bda:9e5e with SMTP id d5-20020a17090a498500b001b96bda9e5emr14741102pjh.186.1645312681753; Sat, 19 Feb 2022 15:18:01 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id d2si3882350pfv.175.2022.02.19.15.18.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:18:01 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3887-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=@suse.com header.s=mimecast20200619 header.b=Wmy04VZW; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3887-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3887-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 F22243E100A for ; Sat, 19 Feb 2022 23:18:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 59C9557DC; Sat, 19 Feb 2022 23:18:00 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 06D1557D1 for ; Sat, 19 Feb 2022 23:17:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vjwpqZ5RXh6zNR3XYw7vuW1jigB7kHmxegraNOdGYjY=; b=Wmy04VZW5cCz5nLMlAUfUBztMOmCtMocWkyjg3S0MtXmveKBNjfem747dbTmynThGQeDp7 HPnCnftEGxIEoTxoNb1f7W67eEAg/+qbCac2ilJjeHOzB/iMYZlkFviNjF4jbZD7T3I31B JSU64bItNZBLbSar7V3rU1wAlNxQgJs= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2057.outbound.protection.outlook.com [104.47.10.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-29-ogLlos_ZP0uvYjDMGDtRNA-1; Sun, 20 Feb 2022 00:17:56 +0100 X-MC-Unique: ogLlos_ZP0uvYjDMGDtRNA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XjzfUfH+JDGssXRmuXPnq75H7aUP/H+HBY3aFvvj4vqTqRQ9zU6EfCRSB5hKKyu+UHCBvrjjX6fPE5byR9xa0/FXgbfq/73+sJPuD+Ntv7kM7FPCawIZM4Vrpe3y2wMnLxd0xDQMpzJiePWkjp+QF9K67h6auDM69I3CtCFi68s5x59JwsOUiBlp49Lrs4UhN899YB1T3sl77S9Q2TL2buxKwDfn84IYJDpiVlJtGpRQYftYPh1bxgbLiVf3b94znS3ONskt7M/PX6kMZMw4YlJ6Cb+bJkBiJzjeo35NkqdNO818ZICvlcSZ3F25DFwmIhq+ppD+gGKOT1qcmKnsnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FgQmiqoI+yInR/+SgCsdJBDqKc4fg19Tebq+FnF/288=; b=Vb2rAiIwDP16zGCJUS+2Z+NF/qqF0y8FU9+QVBy6mITF9vt3fSA+V+f7oc/Lo9f8TMqVNNiftRYtqNCL+GvgHS/gFOcA7DYrn9yRThqSLcINZsowJtCwPOfIIVEVzJdmyAvwOn3RFzLvJ1BuaBDyDkrehTHD0yAF/077Wvz5EG/decJ+lJlvIzvgpbNCxGXnTi8h0IeczgfYJBUwcu9OawO9jHupPMVHHFEqABGtzf+KQXDtQCoBHYvkp9UMEWsI9wwQ1WrxHP/7az8BOJXdiO7kw7uvuQQIFmPE5DEUpOsDSY3mdox3fMUtsbC6Ler8h7AGxKqPgcVhPH7abHM22g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:17:55 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:17:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next 04/19] Revert "mptcp: add mib for infinite map sending" Date: Sun, 20 Feb 2022 07:17:48 +0800 Message-ID: <680412277944199d838f1f49ac56abeaa14440c5.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0007.apcprd06.prod.outlook.com (2603:1096:202:2e::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65979707-5d14-4ab8-d1da-08d9f3fe0eee X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qn2WbIcN5Gw6+ccb+ibuRitq7MjA+9C9UHLQUFKlA5a8PBV52iijAy/jbNOxRHYuex4qY59iyHzVnYmeb1Lua7pYgRsoesIuXFx4NwDPCb+qHKirzQ22KaWwZU7WQ3Qljm8qMFYlBkUsFzXlm5YGu4O2O+PotSHjXNF8mX772GU46mmgGgQ8mTFYEFhbMSsdv9ikWWD8ph7fpINbzx7KWWFpgoE/69C8A/y/jDFyiE3/HdUGZynjQ8HxSz3gOIr3G2ie53wArzWUxRZ2VioRTsgrvFWx5qjqLAZtxwoUAe2UsE5ikRjdCP/9m8D46XRnaKAtfJ7Kdi2/7QQbVcw9T/IFAdCQ4SQGZfX1aOOOGCAGJw6er+E3and6OcRzb4ulfDj6ZRlGRQIe1YFyT4MXhog873eWqFXRHDcN3dsoTBt43hMKQfoEcGAxYxE+nojUA3SOy2rMJtqSiEz7ZIOdh/CP3tw9JCB9CR0wgGIEGIHugHQCQjimiF549XvvpprnofOsl3dw7IaeSFVLZorKWYAsjsYHgKgVBiQtEocJDPaxC+cvzV13erKYCh/xD0O7unRbZ8BUeyRAwByO+7QGX7sdmImCTtYjxjvM3GzribXsT5Kj5s8BUpm/We03XugrXxnt4i2ORPcD73Dfn/HbiQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(44832011)(66476007)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(5660300002)(186003)(8936002)(508600001)(6666004)(107886003)(2616005)(38100700002)(6916009)(36756003)(6506007)(2906002)(316002)(83380400001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?K9UACgYClqqZee9bxF16qSx88DCg4UQdpyCh+Hr1rbyJjz4OTSV3kawFlGrE?= =?us-ascii?Q?bLLqU4zGZLIUAq51Ktozk+7DXv/RJCU0nlYBgbUg0AUbwUf8rUUo55ki/hdH?= =?us-ascii?Q?VmUJ36qJVy/nAZXeBgno9f8VeRbVpeJ27nVqDAWGbbeB4lO77psW8Qn7SxT8?= =?us-ascii?Q?SlxGgP2nz98PxGQrm0Kg63lD6XNW7GWXbDG2ybqCM8pgpKUqwllcCuv2cmtl?= =?us-ascii?Q?8SbUDjLslbnF80vZ9INfIJKk/lM1mSPa4gMxPENPQdcH6Ct8AYTM5cT99YcE?= =?us-ascii?Q?j9WUlW437r85L66hoTO6hFQO/JkEwytN4hksgNC2y34f9QELhNzaRuT5asKd?= =?us-ascii?Q?LM/sCIDKL6BZjzQki0NIB1Ri56mHKA9429tC3/2QeklVORF5tjzIHJxq+ww8?= =?us-ascii?Q?umbiw7U72CiUq4ovKLlfN0Trl91hGWSXumzWAV7jj7/oRpIhTEIt2ED7P1r4?= =?us-ascii?Q?ZMmfRMi/PBv/IOHwMBwUjFPw7W3hdBYuOfmFHdQB3PDP67dxb0r/2FAAPzJo?= =?us-ascii?Q?f4jYGgjpRjzA3fyr3AteWoXpzNJhyHAkoIupKLmtT6m6gpBI2h9eworATAUF?= =?us-ascii?Q?DEfK7ghygxvNmbAIQenAfwHDC0AHX9aljMGPbOlSFevH8eNTPvaq2lpgExx4?= =?us-ascii?Q?bDp9qhHQMUZbG2r1Y50vVBJvRdinOZ5kKjI9HOzsd+TQLZcAm+lDMLOQDGB2?= =?us-ascii?Q?Ds+wUQXcmEkdhOYVHeKVI4j2bEwTTIeomaX/XLrSKdeMHbzhLXA52osOEiUu?= =?us-ascii?Q?JVCOWgLLMXgl54lxA7IPkm0XeQkvWzzIYaML73wgVcy3EHF6KZ653eccHnef?= =?us-ascii?Q?gUys16hFl8NzQBXtyl3hZKvLJNYXn8Xh8evb0rUCyCreS2rQdTYaa5jSDRPG?= =?us-ascii?Q?D8rjvIvcRsIAgNdOsLhMHEivDTMn806T/JfWqZWmtHxG8yHG8cxexr4N80z+?= =?us-ascii?Q?sXHL7Abnh3Yz5izKtEsP7Spcmwgy4KiFI6DsJrHiSdXCafGHqKYmTi2VIeJQ?= =?us-ascii?Q?CC6qT4KJM3E8T404taMLwo7juh+8x3FAtVPfTaSW9+Fyw576NHIqNMgIQhN+?= =?us-ascii?Q?yIwLt+L4vIML7+WtdWzdDolmS5cfrNWuvyQ+4aVb639MiAawskzVK3vKme9h?= =?us-ascii?Q?bwVk2kawzJP8lMKyzOA23/EXpTZt389Ca6bKzlk2+PyitdX0PSYtmdNd9d+7?= =?us-ascii?Q?Y70CoOvgi6SR3hkzwV6N8w65SXHW0vsaubLB6sSXnUSC/ojxwdvEnwx481Gf?= =?us-ascii?Q?gsqQNEbeGcveS995qNbg01s7aG/CQPw9XLzijVJq7GBrYBsIih33fC+FOigz?= =?us-ascii?Q?LQNhAMwnDpzCEuk2rvNnDoEya1O6YSFTnkI71R9k6KCHOTlJES/PyT21A2t6?= =?us-ascii?Q?g3VmwT+K8YVp+weGgNcSr1OImJSji4ZOhjH4pni940EPfh0Hfhp9YAvB0pRg?= =?us-ascii?Q?DbSEZ/1VyIUoMUYJO1BCxYMvEiD5pyfMk2EjlyrF1V6kQwJyUMOSU2Vcl8yO?= =?us-ascii?Q?Qbo7vHK4RNiNoYgAahffFoKjuv+cbZpdvWt+tGEakNSTjzPEZJ1H826W1O0I?= =?us-ascii?Q?lF+tmAWkpq8lJwuwoBtV94Amekt6phRBbO4ntsD8dMXl2rHgT4s3ip/7hj8U?= =?us-ascii?Q?HaEODWZi3b9QtAd+yYXYbxsBoEmbhCQisW5AfB0bYobiR6YfrmkiyOWFUyIV?= =?us-ascii?Q?7KTVGpnqhnai8heqXJfoiqX0ik4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65979707-5d14-4ab8-d1da-08d9f3fe0eee X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:17:55.0691 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IL76kGYlUdJZsc/vp60vbMSb3RosERkOJi8mlRLVL9pFnt6E+azBrTQkLlAiE08BW0skNXkBMp7SueP9uYJrDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" This reverts commit 64b8d85c6c3dfb6e87a2670f372046c5d2d4cf6b. --- net/mptcp/mib.c | 1 - net/mptcp/mib.h | 1 - net/mptcp/protocol.c | 1 - 3 files changed, 3 deletions(-) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 7cef7409e300..7558802a1435 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -24,7 +24,6 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("MPJoinAckRx", MPTCP_MIB_JOINACKRX), SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC), SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH), - SNMP_MIB_ITEM("InfiniteMapTx", MPTCP_MIB_INFINITEMAPTX), SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX), SNMP_MIB_ITEM("DSSNoMatchTCP", MPTCP_MIB_DSSTCPMISMATCH), SNMP_MIB_ITEM("DataCsumErr", MPTCP_MIB_DATACSUMERR), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 785cf751e5c0..2966fcb6548b 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -17,7 +17,6 @@ enum linux_mptcp_mib_field { MPTCP_MIB_JOINACKRX, /* Received an ACK + MP_JOIN */ MPTCP_MIB_JOINACKMAC, /* HMAC was wrong on ACK + MP_JOIN */ MPTCP_MIB_DSSNOMATCH, /* Received a new mapping that did not match the p= revious one */ - MPTCP_MIB_INFINITEMAPTX, /* Sent an infinite mapping */ MPTCP_MIB_INFINITEMAPRX, /* Received an infinite mapping */ MPTCP_MIB_DSSTCPMISMATCH, /* DSS-mapping did not map with TCP's sequence = numbers */ MPTCP_MIB_DATACSUMERR, /* The data checksum fail */ diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3cb975227d12..fecf4c36b55b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1238,7 +1238,6 @@ static void mptcp_update_infinite_map(struct mptcp_so= ck *msk, mpext->infinite_map =3D 1; mpext->data_len =3D 0; =20 - MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPTX); mptcp_subflow_ctx(ssk)->send_infinite_map =3D 0; pr_fallback(msk); __mptcp_do_fallback(msk); --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2796676jad; Sat, 19 Feb 2022 15:18:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIQNBBpvzuGe9HrYQQCQp6dGEI0FVaCvFdJd0RU25nkn94d8BZe7hQxOL8DLGiaUbfuiZC X-Received: by 2002:a17:903:11c5:b0:14f:500:e442 with SMTP id q5-20020a17090311c500b0014f0500e442mr13555773plh.27.1645312688298; Sat, 19 Feb 2022 15:18:08 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id q6-20020a17090a178600b001b979ab14cdsi2850097pja.174.2022.02.19.15.18.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:18:08 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3888-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=@suse.com header.s=mimecast20200619 header.b=H5yb778A; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3888-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3888-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 BD04F3E100B for ; Sat, 19 Feb 2022 23:18:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E65BF57DC; Sat, 19 Feb 2022 23:18:06 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 BAC3357D1 for ; Sat, 19 Feb 2022 23:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312684; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S1ebcsTxd1iER8EJPyzqc4w5yHF3FGXKZoMZmYQAYzk=; b=H5yb778AkyJ/oHv1VAA9oXtSFD0zwncIkpWxebKkl1NmUGl5kMVjYuDrslyL1kcu58czoe 1b61KRfFfJ+X0aJUj41NODV3xm+gR3pTajH/zCp8LReuJwULYgNiEQ/q9zoEM355K71++u mZ3JjEKiKRjvlAlXhGVg1gp/unQz3ls= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2051.outbound.protection.outlook.com [104.47.10.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-30-htetd6pMNveMvzie6D-NKg-1; Sun, 20 Feb 2022 00:18:03 +0100 X-MC-Unique: htetd6pMNveMvzie6D-NKg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AvlwBFYhR4i76QkTP9SqarIeD2csy3SQZmAyF8+hrwaXAvWCdrLsBDjiCfHnhxNYMcvcwmF+Ux4Rt3IkP7aFOmFVMXHAzRvUZR0rrWJdX6u9Rx3O2c1e8Mqdyy2kG6lhgt3xmYtLdjp4rIYbFe8co4hs5CnHshwWMoLjsaOW+S6eG11GgmsZhKpTgk04XC7hhcJ+u3UxBqaQOgLQqlCe/go9U9sVewoHF7VgmX7+EsQcN5D+Z0m1/4EtZRf7smh7CQksVHKKfmFs3ePOD+FvoU02t3A12biAwrxQVJsSqkLe2BWR+JRcASvkZ0zQhcCEynPEmudxyzrzC4J3//Jxog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XQlD2HMKAIEWyBHYOTBSdlaBR/AQX27clSKT4uHjRmo=; b=H2pGIy1sVzXGiPXkM1Xxkk6eToxwU3hPVVRSUB1vS/DBIkXZ4Mci7aEhN1Jt02JTkene9+e/Hrjorw+ngT7QCcpmS3WkZqBdj61d6tnbyZZTKQPOdUOZplmVlw482qxfxcak5U3te28IG1vDlbNTD6H8+kWBrzz0AWD3b2DwTRGm+OpN6iyNdR15sedlRoVDtaRZU0AZ+9NI8i8iR15huM/xA24WwZ/wp5qnpC3lilTap1GpPEmGS+XMtqehKkuCRS+AzHgOYzymSMR7ojGEmu+U+t2Czsa0EwAQrk+4PbpwTALen9g7uboiOYJ82OI76mUIyEM4L2LPyE+Lyncg/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:18:02 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:18:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next 05/19] Squash to "mptcp: infinite mapping receiving" Date: Sun, 20 Feb 2022 07:17:49 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0189.apcprd02.prod.outlook.com (2603:1096:201:21::25) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 12e92e3f-3cd3-4dca-e89f-08d9f3fe134c X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ea8qWRH9LAVPOf5TPEmhFV3WkjOllkeQrQwdSp7aOjEZu+yDRBLD+IfiHbcra/EVkfKZCOvuxr0ngsN6Dz8ZkbLNBttk8BdnpA7Ze+FwlEVfXg9OexWY9hxgqadWrfQKuI+FfxwWjlcIXPFGYbwMO5syzBUSJUbjt+Do8/hwqwagmVeAwYvG3tK+UhhFLLwBqRmXwHImcFldLdZEN3oUAhzMIn5OI4bNNspIGoa/heCI0bLokARSRaFSI5znQrWZ7LgT5jRXFvxKoxfyWCWqbdV6LErhkk92/0JPI+glXyR1pH6uKiDKOa0q5VynzHAnpvUvT/MPNR315Zg3aiJBHzMOZbL0zqYgeAgdjLddP4RoTuj9j7MAUnaGP7zzvbHlf9KXNwH7ZmuQ9SeAGyTgMKSK98IojeCqV3ma2F4ffdfUyEfaqjuI3FzJeSMU4/OlZCG+lF6nqddDQViNpVAToUd5Sv4KBRRZYk/NltXxa7BeaWzsmAwglg1M9ORGv4iynGmzDMVuXKI8vVq40rNJBFVCecpbwAHGThu51GrFmtuCoUivMNVKoCmMXY4/FlnoKgwPa8IUNExf6sHDOznW5oj9P/DOfaHwVV4G4v8AgU6AoYbDojbij2Ks1zZn4/il1jEA7IrlNtyxefVmTVBmhg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4744005)(44832011)(66476007)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(5660300002)(186003)(8936002)(508600001)(6666004)(107886003)(2616005)(38100700002)(6916009)(36756003)(6506007)(2906002)(316002)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wy7vEcD3D4tbXotHjwBEbn4lFlwSsacmCpQkoz0SKmftcYf2cJqvzqm2TVSS?= =?us-ascii?Q?+PvZJeyOeWFD2+Lbw/lTRw55odaiLm8VF5sWBNlHH7JPcsY83Xv03ln+1JAy?= =?us-ascii?Q?XpOyw9JlRHQyEYPfKv/u5Y4StWjDLDcpi0VnLCCw2z10MIk06J8XOM3292E2?= =?us-ascii?Q?rV9uhSDaPrCapKUrf4jzQhstg3xKcun3q63RZAZdXEtyVcVtabH1h8UKioUW?= =?us-ascii?Q?0sLGtknvGKxPSGprajJ7X7WKSC9Nw8MO91eDowuZ9uqRUs7tUTXLlKnDz+Fy?= =?us-ascii?Q?fiZuXHFEkOd5QngQn4JhnlCerVqIm8+Wj1YOHvZkalZnaiqZjL8cWvYpyDjM?= =?us-ascii?Q?GkE1t12eligAoWkePmsotBvv/DjHHhpaXZit0VvhzKqimjps1dBA4goNLz+n?= =?us-ascii?Q?HHLACdioQQpsNy3h2jJoLDKiYF8lO+nzvmBD9F7P49I9nxoSBLlZK7I/MHBt?= =?us-ascii?Q?iRIjlNesGG0Cwpdjis4NCzOiS15PdoNW6u9H1v3inLGubURE/3NMMGEn7ATM?= =?us-ascii?Q?pfk0x4DB1O0spHWNySrsgZo/C062Hzg0qsYrh7apoz0y2LXElCcIInVzI9ZT?= =?us-ascii?Q?giIY5LHM7ApPRSV7/Oz6OCz3zYAEovLtQyGwbNw8bNyoe5Z0DVaLpBk4PPCV?= =?us-ascii?Q?PnbCmNyDRICvygtnf4bMVpoG4euOPFDQPucFCOD5i2o0NKY6Kp8exZT56KbG?= =?us-ascii?Q?hnEUbw2Wud/LQ0QVRnE51wxMps0eR3iVbIYuqGVly6j79mRGQ2Y58bsLF9Dx?= =?us-ascii?Q?+zqWf1rMVfDNUgm4OFqJdNsHRxyjLDKCMqYemO/JoiO5hjzCkrSHggGF315r?= =?us-ascii?Q?wLaWFiOTdIieQ826v2UUhtLAiuER31QDd84jWZkrx5ObRjoxtYucGie0io2+?= =?us-ascii?Q?iWSA09aKQd3hmenaeaTRdvFq8YfcQo99b6tYs3yE1FCQF8IBkCZynxTiU1g/?= =?us-ascii?Q?pX8+RV53vAg7WTZjUUMGGi06m8EQeOSYdjEBFt+Le4Af7X65llaBpG38ae9N?= =?us-ascii?Q?5hFkx4iCF3jqH7zXX/GjkSrl7Aux2lGcN0ELIWogTy76WiOcqN8pN26o0YCF?= =?us-ascii?Q?zqmE6t3rRMIakjuU8CJPjlHZ7HrYb5ItU2yS2+Vaq6EqmuIKlf6m2eN1BGIC?= =?us-ascii?Q?34Lt7Ff3+7Bp3iYUFVKZGIj1qK0g3BwqtPvKPpNF/BACMBFgqO9i3mjk14cL?= =?us-ascii?Q?Yde9iMLuIHZKTztwWVFuZGIriSk18GIcn0riuhWC0rs5fXkeJEaTbNIPlqnS?= =?us-ascii?Q?HNjWmcralZD1s5OT0NFO1EzP0Rio+cbFk+w4m+6PyNttiQPVDTXkKYZNyWqD?= =?us-ascii?Q?+jydlGPnbwO5dp7ICZKpEEZg6iClM15U69dq2Su1BDSognfTQ48o2e+RmwLq?= =?us-ascii?Q?DRnucJTim1sFOQFBuXW9RbuseLx7QxFJ9dd9/Mx1gna9hNCZoUG5BX7/Bvu6?= =?us-ascii?Q?cK1RwmHbhUVIuOnEdVYI/+TkMB6w+oecs+YhNGZlyhuhxd51Rdmyra8j6lnM?= =?us-ascii?Q?bB6o9tjQPEuflBhtXxOkNDF9YNxbJH+RAAMbMZvX1T4SupvYQ47DK3kEKBjz?= =?us-ascii?Q?hG63NylHpf2yOIrrRLYQ4awoFwbisXUgHOxqoHJFFMfDriyo6MLpLfHZNg6W?= =?us-ascii?Q?xcl5iE1L9iUYk5+hkIJBmobytQ66DXMVzRMPxhmPFlC4shJLVnddcA4oOrTt?= =?us-ascii?Q?knj46s107sN0h5pCPrNX633NIEs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12e92e3f-3cd3-4dca-e89f-08d9f3fe134c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:18:02.1467 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3P4AGQqqGWa6rqOohUnz0fcrDXBny2Ge7wQ8tv1Y2Wt1vRPk1th4S8YLX1AkDYnJnSpScbH+tSfr3WW8xcPp1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" Print out the infinite map received info. Signed-off-by: Geliang Tang --- net/mptcp/subflow.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index c05c19f92532..30ffb00661bb 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1006,6 +1006,7 @@ static enum mapping_status get_mapping_status(struct = sock *ssk, =20 data_len =3D mpext->data_len; if (data_len =3D=3D 0) { + pr_debug("infinite mapping received"); MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPRX); subflow->map_data_len =3D 0; return MAPPING_INVALID; --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2796739jad; Sat, 19 Feb 2022 15:18:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzb1uIPBpLjsnimGZRpnAcUsQkgnT2FALGkgELpEBK6Skqc+4pE/eUL+BaD1WPvZhmrwz3O X-Received: by 2002:a17:906:459:b0:6cd:2d6d:2f4c with SMTP id e25-20020a170906045900b006cd2d6d2f4cmr10758438eja.687.1645312697065; Sat, 19 Feb 2022 15:18:17 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id jy6si6237368ejc.901.2022.02.19.15.18.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:18:17 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3889-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=@suse.com header.s=mimecast20200619 header.b=kuPWRdqf; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3889-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3889-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 6D9A81C09E4 for ; Sat, 19 Feb 2022 23:18:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3B27B57DC; Sat, 19 Feb 2022 23:18:14 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 D595757D1 for ; Sat, 19 Feb 2022 23:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V3RSYcUSOqx5ymmQlnQTdF/foPlHYSbrCFcZ/ZucgWg=; b=kuPWRdqfoyvj91vhNbTpRzew3l4kbFNNeEZi3a55O02BokdMkbNtQUjuVCbsKIxlhwg9Ro uOyuhoKmPw9t+hBOBB+1vCLXFvZrwbBWfCol1YbHBONUhD1WBOp2SrT+voaQdbHQ6t7maf i8XD1rWUruPdr15AbnLNBSu3Zvuh/AY= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2059.outbound.protection.outlook.com [104.47.10.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-32-XJQGgWW0Noicz0nnZdKN6w-1; Sun, 20 Feb 2022 00:18:09 +0100 X-MC-Unique: XJQGgWW0Noicz0nnZdKN6w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V3rMIC1DF6XHN6Xk3H249EPT6zFuNz0v+JeMW+dDxnGIlDNhRzUlBlWOhOpFBcw06DcLK5YbOXRVoyWKXFFyYrSsw4UYmoTepXsZ/q1lrI2+EHDUFT73MRCdkU2CQuqAVgah5Jw7UwUWxMp7lVuHx6CuxLqx33hkdTwS8BHL4TAQTrq926JTnLqYfwSn8JIwliwS+7uFfgsJ0d0AaIbf3644jCr46cGhEQoaw0X1E98IPP7atiTVf/gFz9vCNCExbwr4YeUQRk8mwld3m9xsyusVBFQeD7JtLCDWC3vLQPRGXH/DnV7m8ERYNRyKvNrZ8vBcxwxqScvcOmydSwGKAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MiZAWUc3AmjtnrzEPxg0eAxXY4YV6iUlMroCXTEm4nQ=; b=M/nuDJyCUz5qs6ew/EUhylvZV46Y4zDdQ4vk4dorTZmG9K+iOuifpX52J28SVkFh4c34WCX2s2B5RkoHHS1QEQWNGN/D9Fk68DG612fjA2RKh5RYashoA6Gs/b3akwAudf0FWpbqssR+UrMV0FFRDGs5c3mZr58eY6/V2f1ZIY9vsq9LAO3NVzjPoDjVk/tsIx82q33ZpdadU9ZMjDixFZrO5rXOgfcMTFRvovELKwYYrvJ19h9WcxzXxM+NjXzCYFYIGkUpdmy0wDA9/f8jrgNfPHhu4AJ0g6Jyfl98ABNmBH98o6Gn1S8+crT6b/V9RZXS6LLCosN5hDny4eye3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:18:08 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:18:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 06/19] selftests: mptcp: adjust output alignment for more tests Date: Sun, 20 Feb 2022 07:17:50 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0193.apcprd02.prod.outlook.com (2603:1096:201:21::29) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 345a67c5-1655-497b-a590-08d9f3fe172c X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bmi7g7IdUGnIdI762i00JAZdL61RIiFwSa/iOsIawl+Unixq+G259phdGyKpCXVSoT1Ky+RH5d+mJuBqWaHDgLmn4Qucb/oWIy/P9zCGzYbFEaQLdLEQU7/AyE+uahl1pZmKay6pK+uzKZqvPuxRj0tnwBcIKwXQzN5ihL/uLlIiICZD+CubinVKrElOnncz4YLI7jXN3mKh1xWjgvCrb6dEqhbCV/SgdTmOlCbAjztsnC91iid+xqbqtSLQ4FdjC5/Jz1LD9kc88axRYgj4RQBiinp9JsymEeQ33hBh+mw5WJ+/SFiyCH9lZg8aHoxA73DyNEKaNFQVTmf/ddwraXXOjhXY+Opywg7ZIM3ssyoDvVENu3fg+4YiviNrZoN1dsRAe4VydJ7JauEUPas3iGe8wRFSZny2wPTJV2EaEzdPSvv0jhzKQ4tK1GBkbjl781Vq6JsODP7QtwgzkdgnE08L1O04zdlnp68gNAn6BoaqOg/aJ3kcVWtdvI2GeJuTqFzoOg/Qiw2RK2LPgFPo9ur1a7F5uIIIwye2VgTRjxN8l28z78i5vkSq01TMRIvAu0NOgeaWxY4UE/hhCNJpgki7e1LQnM3AnAmdjuIoGOrhEQAnAAjKNPNMTfK544W6f6B93xTgc3W21GOD5KOXPA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(44832011)(66476007)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(5660300002)(54906003)(186003)(8936002)(508600001)(6666004)(2616005)(38100700002)(6916009)(36756003)(6506007)(2906002)(316002)(83380400001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?b9LmCt5carVKou8EAhAPA2/0/Uxe4I6kuz/RBVFroeCB9gT84SiginfxXiFa?= =?us-ascii?Q?GEXyy+RThzZWH/D7ZCG3YH6cZC9WDZyY9d36hZk3YGvFtKQIbLzRKtHm1631?= =?us-ascii?Q?VoszZ03jGhh6dibW+0UG4eV4S7qsrlTDYT1gcitmfstIQCIGPjgk/BCjtNTi?= =?us-ascii?Q?9t8dUt2yLFiC8w4iJAr4x6VEW5b0WrIIh2zIiKXUJe2G8Gl9hInOBF/Fkl3z?= =?us-ascii?Q?xlfO2Cwm6krEPT6zJ2caPg2CKSgNzIwTXA2aKH+glwMuqZqSsEWBFbup6ew1?= =?us-ascii?Q?Z8IpF689GmJaV9bhIFkW2eHwckR7v2SmFys4O4ggx7fApxwxOCvRd81d0qid?= =?us-ascii?Q?0L12fM+VO2561WZGKDj0sRD5xQlYZtTGCW8YqkhZWGX4AwgjwyOszTcvtqPM?= =?us-ascii?Q?DFPopTIAPhAz1QGIRMt2nxbpaOfx9/P67gkfKLaanCagxGYq2U4LK9CkMYdg?= =?us-ascii?Q?VFrbHTrwWYcxy1NG2Zm/TC142cwKdT0IH1PO0hjNHZl7UdkYUL509qd8OQJe?= =?us-ascii?Q?+D2EmwoZHVT/eieTsV/TNrGZkDN10Aor1XdMrATRp0SVnpWkA5ft87tZ+aSE?= =?us-ascii?Q?rlLfWhGhU9vCpek+epQm2mhsm06D6jJuh28QEsoMoTQwYj1APMGCZMOfYc81?= =?us-ascii?Q?MC0vXELBENsDkSThAz3ZTR+A9KVY5TTXApkVuQ4Q1Tvyos/kP+OsuEWgPW/Y?= =?us-ascii?Q?6aBxFUPBBF585yhVk+4k5b+gmjGK/lz5crx9Ewjf2PaIv44DlOx7AxLIupe2?= =?us-ascii?Q?M7LUbetD/rz5gZgasS0fFv0Ur507h/KQ7s5zxeMllex2+mchJNi4dlxCzsFH?= =?us-ascii?Q?Xh+2jzPa96ftgmGCXMs9bImlU9EXKy3Fte4HVTtZfy6JUu3sIwt4rwJQS1VJ?= =?us-ascii?Q?guXa/XdRZtbibAkbmZ7ZYRfIYBiufTayfwmSrFn5sbGAE2Wx0LVJBjVmHyc1?= =?us-ascii?Q?vCYZJTx86wAIPqqmXAJy15jsnjCZPZx/B+ch6MYxQgwTEIM2+WFoUmfAe+ki?= =?us-ascii?Q?O+6KdZ7Azo9SGGZDVPCNKi4tPKX9vfzuL6eSvKHVU0P89B1ih+iXNGd5joGE?= =?us-ascii?Q?onGG8UkqmZ7dxVFOqspS01NuwkHzedMhhBvbIyMSJWvwst6Sg3gSZSmfjdT6?= =?us-ascii?Q?sXQ/LH1iI59OS6CuKS2mbEg7XDOZwGON0Ur17xoRH/eA0K20jcW4oxugKvdu?= =?us-ascii?Q?/zdTvZTCj3Sg94upRXE5fncbyQrf4RJc3K/Xm4aYi1wk3k+XN7djnvQHgIDW?= =?us-ascii?Q?Pp2aL6Twab3ShTj0naJMh+IitXNvErsb5lSgG1ukWtn6Mma452zNSkIyNuo3?= =?us-ascii?Q?YezMOhU1Ok85hI5SouS9M08nZcR5TbTkil/+rQwUEyu61WhohHuObmQkXtPf?= =?us-ascii?Q?BGHoNcwG6Xln/B5cdD/8fjxm2CyEffaWnKrgXzT6JfCl835Bq2UxVEHnCBM9?= =?us-ascii?Q?jJ4KVtqZBwGfaUonbcqAsqhFM17yd+HyJUr5nyviHIIxtkj0arK8fz826BlH?= =?us-ascii?Q?7EifOxpy++pUaSWny5QE5nhYLKx+pXU2EbeN125rgLPtxP8hb8tkIB++bsOr?= =?us-ascii?Q?QL/pYed1ceYTJnvuLM6F1UH+ZaY3+zCnraNDSoz11h9aCIMbKT/TxzF8wAqO?= =?us-ascii?Q?BKnE6xnuzj2CSOhZYBRqQn6xYWJypZGTcrj8+ovXqpVwIhwI9EmU/PTw9lmy?= =?us-ascii?Q?IGIn34ACSAwjj6Ce/I0SxjuzjEg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 345a67c5-1655-497b-a590-08d9f3fe172c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:18:08.6930 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3ge8eUhbLCzSpmEvu3Sswe8eY7w1MbItkCKHUObErslKEQRf6u9kexj9zIg5rIBPNyB0ST9gtViojBH+ub59eA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../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 46fe7d135e30..f0f4ff897e60 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)'" @@ -803,9 +804,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}'` @@ -837,7 +838,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 @@ -872,7 +873,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 @@ -934,7 +935,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}'` @@ -975,7 +976,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 @@ -1012,7 +1013,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 @@ -1051,7 +1052,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 @@ -1101,7 +1102,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 @@ -1133,7 +1134,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 @@ -1169,7 +1170,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.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2796798jad; Sat, 19 Feb 2022 15:18:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNwcwRoZckHG0TA3cE0wD8pCKxXttC9kpLZpCjQYlT++5KamDnRKqtrtzt67TX5mjwk3qK X-Received: by 2002:aa7:c789:0:b0:410:dd40:d458 with SMTP id n9-20020aa7c789000000b00410dd40d458mr15300995eds.3.1645312704300; Sat, 19 Feb 2022 15:18:24 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id h19si9730306edt.150.2022.02.19.15.18.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:18:24 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3890-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=@suse.com header.s=mimecast20200619 header.b=bsaXZIXW; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3890-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3890-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 515681C0ACC for ; Sat, 19 Feb 2022 23:18:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0B1E457DC; Sat, 19 Feb 2022 23:18:21 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 B28DC57D1 for ; Sat, 19 Feb 2022 23:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s9LSFGkSoS1RhgCwjbvln2X8anN/c6C/6z0rIvqjNBI=; b=bsaXZIXWsISGsAb5f8w9GZhflUm6ySKRX6YY1QZTdD9beQS4jyD0CGvDqKBPtN3obuQL5h Wud9pukIErm9X62hcSlQt+DapRfByW5io1kf+tj/w7W54Q0flnEP3xUmwjXooXxIgrZ56s ifUqCOaxkYdYcfP9B4IGE6MLANjgUNE= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2054.outbound.protection.outlook.com [104.47.10.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-HpQsb6v8NvSXUaiVHTyLfg-1; Sun, 20 Feb 2022 00:18:16 +0100 X-MC-Unique: HpQsb6v8NvSXUaiVHTyLfg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QtvzOu9/cC0jM87yP57xinG0LzeLOAhVDh+QOED4kyBl9TzafPTdwBnaEnGmHlax3fkRtUQJ73MQ5KntTlknl9xcEUoRUgBCpViH+e66TTrKy+JHuNyjoEeFEZUtgOgW5h0lgRTzAoxh1t4OgsS7jA+7sAtgsyM1iBFmC2ZRfHtIw3AGQGCeh+w5rltkqLV2wvfX854uWyyzlXUnIGv1NZLBUGGDmpTbJf3N6/zJPisIMD1gQJY67EXx9i7FQuLJ8vmEgoU5gQ/JBuNKypTewk9WzDlUdrK0K3keKmpFfCq6uAzemHTvwEgBXF7/FHR51s2/cA5awCP+H8k4hLE1Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gIGD1FL3QhBx17LhpwRYhyRkF1R9LFmHQ0YuVeRYeXs=; b=WAaNiNKmtq3fauWO/1SfuW72fuIITyMHGagfm2dakN8g+Su5dSwummIUDnj78nA9qWXN2va2XlQPJWZbIzhG6px53GDLcXYaslp2wXUYgZNv3ZraanFZ65NDtJgoJFPgdkSWddJHyUHRpJ5ihHY1Ti9Y5YhcmP9gN7hs+DK0OIqt3hNJb+XRb6eglxR9hEscaGMdJK7D+5xsJEFJQTLE53gVoP3lcoVvIKIsBOOZOWZzuFISGYKlEvDcgtpA6I7G+bZ5OizcQQEu67DnVfr7KucUrtuZRbXaylsQDGf4dwm8RMGzZmhA1jwokVV+9eSEOJgPpBbSgXf+C+CZbWXwsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:18:15 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:18:15 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 07/19] mptcp: add the mib for infinite map sending Date: Sun, 20 Feb 2022 07:17:51 +0800 Message-ID: <3270a9d71e0a19f37958e188560732f43d2bf342.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0009.apcprd04.prod.outlook.com (2603:1096:203:d0::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c00237a4-f336-4c3b-edcd-08d9f3fe1af6 X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HT2zZ4gToJhJQdjZ7JCgDO+BMqKaeXGnbENvXcFdyrqG4gJo01I8wuWrFAlHI/dkx0LM43HbxS2hRLissaBfbsyRYlVvCy1RsAJM2JvMSN3NQXPHMT58xswuAvVrGcXW5iWmi8UzfyWlM/KycS+EYnNU/r2jP/SiajJ1fuBwfdTxcS5tYDRZpUwxS/8+2LZ+oyyvie9apj1zlHeg3rz72N4Y0UVoxyCSXJQAdFDJsnESjFI3jyEbvcuW21sLZ9byF6QrPDG9E9HMG7OUUkqGKPsxRLK//98/R7lbWpM64K3oYNFCWZ02QuZ9vcj/KT2q5D/HZl40Z5YycMoudGOtpRK4oDSw9LHRjaz6CuDAV/ZCi7PEBr0Ru5ZOyOxgt5dtA8BwehjvbV2TOPxbWsNXm5J99AyR54cTKRxDEoLZl37x0k2fDRVGBaaNziMycNwG3f7o5CgzKfEo2KkAZmW6H/s9yrdv4VPYNZTNholfJARgK+jQ4ze79DyzXkYwUhRdtK6FXh2KV3yIlrtC8tK3Y53zc2rHJR0t8H1f9OT5GmGkB+K39HbGevKDW/YPsABt6NJMS3CClBWI6e37QqolNlz93SaUvPn1U0xh/k0FXe7hCzn2WLnDgSj7ngIF2PCRMrfX70EA3k82quWQNiArNw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(44832011)(66476007)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(5660300002)(54906003)(186003)(8936002)(508600001)(6666004)(2616005)(38100700002)(6916009)(36756003)(6506007)(2906002)(316002)(83380400001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IfjDhuk0H4w90ymyLGhP2JHtUajY4m6/uHEuG4mQwE5EFTDoIL+Is3HBO3nU?= =?us-ascii?Q?eoi8bSglHxYr0VFHYMhQELI2ZyEwIkZR346/q2NQtOPXWgDeIWFBNZ7cIeNe?= =?us-ascii?Q?Vg6gmuhYgU7eOzp45d1OjVCoLw8MGn0nXSskC2dYed0m8qCHrrLq6lbkdAcK?= =?us-ascii?Q?9cVHRiULgKKHuAR5t1xCNG4h3ZVmSyIi8alhneFodzS48/vq+9fdhr8XmjW0?= =?us-ascii?Q?LgtTJsNTTPldZLqo7a/+YrZeQ1J0EFa/pQ0JOZNmCtuVPcuud6kzaCBaXBAo?= =?us-ascii?Q?suBVJ8kO03tWD4Stp1VVtOc5fzA2Pt3HLdCbjAcpVvZyg3Wwxb7cnCPUjld4?= =?us-ascii?Q?DibRjvoJDFB5n/Ns8J6orU/Y1X5eofjU8GLWrDtqBxvVaU4rSOIaZqYnchir?= =?us-ascii?Q?WOxGVhf9YaFSzJCjIJfskT16nL2HhjJjjko8S5oO6S+b5Xa6KP8eJRMl9YHt?= =?us-ascii?Q?mBbgjoklUbwpDpgIUkwqD29wiWI5edB9QMUnlIZbSLtZOkMO+kZm0tVJ3cT3?= =?us-ascii?Q?hCtNKJMFxyUtQ8+28gZh4WyzLA+cXHB8eBYXludyER5McO6PTIWAgoSZ1F27?= =?us-ascii?Q?1RmEFnwJBAFmc1c2jZNu6MfEG1p6kzoSFBgyj0Mmd3WoAdqOrBPWFTEkFRQX?= =?us-ascii?Q?A791qQqfo3Q2m1yIGQoe3L6ROX2zLWJM4+Pkah4PWXPKOb7gXmwTJuexrozC?= =?us-ascii?Q?c703O56tKg7Vcju6FBERK2rEn2FWht1sZz6QmWTYPadzBuJv9UJlrJl9tgTS?= =?us-ascii?Q?ILDxXeSj8YhNLP/GbTDYK9lzde8Fy5dbEESW8BWdLqH9MvgqXg22X6C3S0/H?= =?us-ascii?Q?x1mp+dAvmMt134vxyXLkd0WPyzKQ31MqCiuCYSUCKZuuZXm0wQx6Juz5OwUU?= =?us-ascii?Q?tcN0bLUxm4A5LCmJ9qQmNycKFe1uTezSUL8xcz/0zO6GYVtfR53SJ3pS2tkK?= =?us-ascii?Q?M1ULeoYWYH2BKZtNdHDW5q5BuUuz+J+SoOdo0nGi1AC0kpo1+OGjGszdSPA5?= =?us-ascii?Q?ujMN+laSuL6Ze1LQZ0VOK7A218Kk7sJ/VrLDun6rhO7DsQ6pnxpD3DIIG2ja?= =?us-ascii?Q?vz7ZjvvEfgnn7KXBp1ZsIWeQOTS/PRIv0UJ9AUwR1FYT9SIUBNJbn5mYStrc?= =?us-ascii?Q?wA5scUrIbkBPRMWsvEriGrNkuqSBerFsnNxMfcR2IjCjuuSFvAe4bsNC4p++?= =?us-ascii?Q?4xyM5SXu8YHlHgoP6lx7VtW6Fmy7wn36kxj1R6rnEsxIEnp8Hh1ysSs+Oi1W?= =?us-ascii?Q?j/8/qQI/xTUUclcH0asOU1UyjT6WkJzy0X0G9dystIXEKHgk/Rygqzp0RfRQ?= =?us-ascii?Q?IBCFjVhzLRla2LWazJaVh96h+rSYp+GnKhcqDZV4SkjXP5EP5d+vwg4YjSA6?= =?us-ascii?Q?7RA6hLqOpI90uu+SCtvBW39WRFv0jZ8DjtODNxPOMmFBa7oqYbwcJjLi/He6?= =?us-ascii?Q?cko1wLqLf6YhkZirGlomiTPQgqD/xf192Rsx1hh58Ad23V6LV2PstXeyktiz?= =?us-ascii?Q?RbnIxW+cTKzpoZCnPVeuv1JpQOE06AYg30OUGQJbdhAKcstR1k8kmkq8d+9X?= =?us-ascii?Q?gkdxnST/+L0BNGhu/XoyUK4ewGPK/+FX5xEnaHDU4k85OGdhv3CamLDtXkxq?= =?us-ascii?Q?a+e0brOSgFD/Gyj2y1E7MwYnvZ6/Rtjts1LHi2SqKK84LWvPkv9DO7BTxkKA?= =?us-ascii?Q?oLJkHZCnEIydDa+vEIdaW/BolLo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c00237a4-f336-4c3b-edcd-08d9f3fe1af6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:18:15.2237 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9CF8GZ7R7K+p4oD3p/YqLQ1vxIlxO1s58dNnAxFlBh8bEBuELcl4FiziEOGsrXDbLDjMO+O6j+wu7hf9eVZ/nA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" This patch added a new mib named MPTCP_MIB_INFINITEMAPTX, increase it when a infinite mapping has been sent out. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- net/mptcp/mib.c | 1 + net/mptcp/mib.h | 1 + net/mptcp/protocol.c | 1 + 3 files changed, 3 insertions(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 7558802a1435..7cef7409e300 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -24,6 +24,7 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("MPJoinAckRx", MPTCP_MIB_JOINACKRX), SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC), SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH), + SNMP_MIB_ITEM("InfiniteMapTx", MPTCP_MIB_INFINITEMAPTX), SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX), SNMP_MIB_ITEM("DSSNoMatchTCP", MPTCP_MIB_DSSTCPMISMATCH), SNMP_MIB_ITEM("DataCsumErr", MPTCP_MIB_DATACSUMERR), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 2966fcb6548b..785cf751e5c0 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -17,6 +17,7 @@ enum linux_mptcp_mib_field { MPTCP_MIB_JOINACKRX, /* Received an ACK + MP_JOIN */ MPTCP_MIB_JOINACKMAC, /* HMAC was wrong on ACK + MP_JOIN */ MPTCP_MIB_DSSNOMATCH, /* Received a new mapping that did not match the p= revious one */ + MPTCP_MIB_INFINITEMAPTX, /* Sent an infinite mapping */ MPTCP_MIB_INFINITEMAPRX, /* Received an infinite mapping */ MPTCP_MIB_DSSTCPMISMATCH, /* DSS-mapping did not map with TCP's sequence = numbers */ MPTCP_MIB_DATACSUMERR, /* The data checksum fail */ diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index fecf4c36b55b..3cb975227d12 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1238,6 +1238,7 @@ static void mptcp_update_infinite_map(struct mptcp_so= ck *msk, mpext->infinite_map =3D 1; mpext->data_len =3D 0; =20 + MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPTX); mptcp_subflow_ctx(ssk)->send_infinite_map =3D 0; pr_fallback(msk); __mptcp_do_fallback(msk); --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2796832jad; Sat, 19 Feb 2022 15:18:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3qAuf9Vxh8zwuvEqfbNOS5wMoVMnELvIC3Y3EjIoCyHPXyZSFpwc0k1j6lUZuW9anFvwH X-Received: by 2002:a17:906:9d01:b0:6cd:2bfd:6cde with SMTP id fn1-20020a1709069d0100b006cd2bfd6cdemr11035489ejc.478.1645312710704; Sat, 19 Feb 2022 15:18:30 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id rv24si6725242ejb.780.2022.02.19.15.18.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:18:30 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3891-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=@suse.com header.s=mimecast20200619 header.b=muy5LXkM; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3891-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3891-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 A229D1C0B8C for ; Sat, 19 Feb 2022 23:18:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4CD2E57DC; Sat, 19 Feb 2022 23:18:27 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 2569D57D1 for ; Sat, 19 Feb 2022 23:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Xg8iYX89Q6jBiBgNZ3FkN/yYujeL/imJT30dF8F3UEI=; b=muy5LXkMBZ3H7o3AkvDjwJO2qGpw6zuoSweRjc7kUN5T9vnPZPDuqwhuuN1WXMHZwjBHyr w1/4pe1FMA7yRwAHdioojDI4U8WL5DYP1YBhuuv/6CSvD2/c7nHTPu6i/nL0zIsPzX8Md3 umavi03Rgy/u/ioi/9LDwrdvrW0q//c= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2168.outbound.protection.outlook.com [104.47.17.168]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-j_s-ADqsN_-CXqmwAefNNQ-1; Sun, 20 Feb 2022 00:18:23 +0100 X-MC-Unique: j_s-ADqsN_-CXqmwAefNNQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bnwvgq38DYTAy7D9tZiMmvq3PVapFQ7usVAv/AxY9rSHr5gFC/ncvKCmvLjYzb2z+w2KwU6W7u55bcE5wy88CgzdJ3pIZbwrEaI0Vro45YbpaQGDBvX+hvyTzxpWRiA2+yNCsrBkQt0CK/6Ity4eLpmWEP9CBmqHfLkeSzKQ6RA+0uPgLg2CXsevbsI22ce/thEUlHK7rAcnq3KnVxunow0DbKo83xUhU4q+IK2v0ZwUtUVKiZdYQmO2HMSOJKxUE3PnefOKZtyU5heSyD/GGvM5hfd8P/qEjKi1HLhKDtLSiEN5roQw4phzDbZ3vbbl1hujXAEdFCqinzpUrQlDbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=acSjlODOFcS/ge2pCV+I/xtqJhuV3+6BwL7EZKsNwIA=; b=YlRyicEghrYTQHbirGylTGfAT07aiKoeP2vqQLqUh7O5mYdbRESpWBRXNzTlm1jzgEcv0l40wbWbRSmA29l6Zeo7mdjvixzoYzLa6+EzUWxMb8BWMxzJSU2kiV91kLqWF0V/faxwTa+5iiuZ2Rmbyw2S6HAMIDN/R5ccIEO3d5e/hT/rCnTE9JCPuuYtS0/y7k6MjCI7/E2TMGAxM4YvfLyVLfhB2pxwuRf/53Y3CKIO+jDNIskEboCNSVklTPFzNWjHFV9/nZ3m2YnDoK2ZFiYI3IktUXiMGXHJRdE47unBB7bss8WQ9/acDAbCQnfwWev/z+fK2h2LybgjrjHmRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB8PR04MB6841.eurprd04.prod.outlook.com (2603:10a6:10:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.25; Sat, 19 Feb 2022 23:18:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:18:22 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 08/19] selftests: mptcp: add the infinite map mibs check Date: Sun, 20 Feb 2022 07:17:52 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0302CA0018.apcprd03.prod.outlook.com (2603:1096:202::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e4e16b5-4929-4bae-cf96-08d9f3fe1efc X-MS-TrafficTypeDiagnostic: DB8PR04MB6841:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rfD+H5JuWcX2PKOKQbNt+lqSjIQB8zN9/MLdRz7RwRneW6T+AHhkLMNv35kLwhm7D/12t86kzCWYztW2vnUdJ/aXybdaqT0+gUXZAEnhLaVZjuzEOFAHXJNdFC8UCxQeTcdK/EpVF8lHEzE7orLsYQpIyAESMuh6w5BY0IQWXuHP2frDqGvNQawPl46QFNvYOnZqGoy2WWgC55MSq+dvbv1PFEkd6h9UNTMfn6+iHKZw/+oCBqkWIamdDwZlvm35aTbhqW/aSRDykU60gAjifH11hioE+t/zBPTpGt6uFMxq5SGp/QjlxD+WnSkI//4Ui+ZD88bFCQ420Tyh4y2nzdAoWIbtFECDG5UpSOGFbhoJpwn3OPa7VxFSKuHiTvARdpjJxQoj0EJrF29//X7QLTdZOTcRpyNNWnBKLpq3W5j2vCwwW1gesrBho2xHtMOJytCdMqaVCDhOgaWUuHbE+WLvakP4AZQyXaqmLgc/bJx3w2M96GZl6EcNKbnABnXzjKw2pl/MWKeZwrMcoC826mtX+e78fRk0OgmYaiqdI7RG4walkzcksR5KGy3Hxe0vG6oK04QaQR4kW/qbNM6ZB+EkTnyxAOUAw8WIqd8eUeEjDpfx3r1rNcag4sG24h3UDNAaCKCv+HGi/6lyHmrt5g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(6512007)(54906003)(6916009)(38100700002)(8936002)(86362001)(2616005)(36756003)(6506007)(2906002)(508600001)(5660300002)(6666004)(66946007)(316002)(44832011)(6486002)(4326008)(66556008)(66476007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gj8uucOrSsd0NP1AxYjvSHaDJszMwyaUJ3uwJ3IXxW3ZUweUrtD5QueYuSZf?= =?us-ascii?Q?DRR01e+wU+x0C2xdbl9rJZ5xv8wzlkcpITHWc4SJ+k3QhJzYU5pUm2u2DFwo?= =?us-ascii?Q?odGQcbW+7yiJEKj0VSGB55hcFlqEJRVf0f+eNKEMzfDdLSZLZBRMaKOTkoMi?= =?us-ascii?Q?BZprlD15+Oprv7Sqx9YXNrC1LfRYU5aSU07MF9kvpP2sugCJT6L67SYlwDql?= =?us-ascii?Q?kieutn7he0pNya7YqYysdO008K9qB/MPbUKm7a3QJVHVjLPVHNfOyX93eKWn?= =?us-ascii?Q?MaOCC6boXeaKsF3jLO0ClNRV1sb+5l62kmG9+EiG+RVG9fVeFCGZrbtytW3Q?= =?us-ascii?Q?JhtSbMUpAGm4cmrODuNm+AcR1Zupa7TOUmxldc180uR5buW5b/3HCO5VM3fL?= =?us-ascii?Q?dekV7FG4qIk3ovvmDfWX1tHGqGs+JhjcT8wbEeq13Uhc9+ga3FiXQBWCo7Ij?= =?us-ascii?Q?aJHcUiCvboCOtyYvBIITU86LE6IzQf5rZ0s7F7wYgsjrdFAqXAu+40HggNsp?= =?us-ascii?Q?RRcm4NMOHxlo6sQcOHm5trgjj83jikmPXf5db+2mgeJZz05aWjdTE4F363rq?= =?us-ascii?Q?VOvtcuOdHvYEZRZZFGklLr1Gd5IgW5QTfYYa+K3R7k/3kIpwnATuM8nUWblN?= =?us-ascii?Q?Vy60m2nHycSDiun172VgxqyZvBlmJdxCHNkaC4C46GUsMzvsExufpCm07UXs?= =?us-ascii?Q?d2jY9KZaNFAoMpy5nhVW53D0Pd/psCG9DQBMTh0H8rsRfvRLPrSr+kIG9GTQ?= =?us-ascii?Q?Awv1yqd9kWj2zz4U5M+xlS4un/bq2hpEj7Dba8admGQgT1HJTNcoMutM4N5g?= =?us-ascii?Q?GsT9wqa0Wx4nWrUlScwmFiH5OPJrsNH4PZ3JNNZtfy5il0t9QLT3oA7eODYV?= =?us-ascii?Q?bUUsHxzkcWNGpXhZc8WvrJx879DjzG3ZrrE7F7ryS/hfFNU9JNG1NaSg23uG?= =?us-ascii?Q?PscK7vNCEeHpWVLt80Ueva46GQpDbyIb6mvzzk7RiYGIaMKA9DGZur4JhvxQ?= =?us-ascii?Q?kHj55/NWIWUGwohL1/biWkMAdolevA5KLCzs/an1iwJ21yINavH2gXukfGLL?= =?us-ascii?Q?jksbMi2yaDTJYq49NALFm/7MueFZJhJvgdwj7HdSCFxT10iGajPl2bDx1yJV?= =?us-ascii?Q?2BjfnFaksdht3otF81/rswvq3xO0NMdBaXfWlo5AphQykw7TerYrxJiU1Rrv?= =?us-ascii?Q?hFP/GGk07nNDY4PmxdI4aCFowJKjn6814x4FvPCNIIH7Pp7xyvT4+AuqKVqk?= =?us-ascii?Q?Dr3RiOuoQPqmZ8MOrNdE+ZxSiH7OiVImTxuy1WpU/WM157CiFQ+oYBWfdQ7Z?= =?us-ascii?Q?xesIKYmB7ouVMciBdsecNyixmF0IwE9y1EIwIRlQhBkWCehTBg0M6m+UfdkN?= =?us-ascii?Q?/+9j28zP49X9Qzz1qgz4I328F43AChvwF3h6EvlxNvhpX0xruUXMNoj41Q+u?= =?us-ascii?Q?7xP+nejTkkbEBXUjRe52IxfICaW5hc7CM49U+qdlQXj/O1tNT5BsSPe/vN1t?= =?us-ascii?Q?QaNaTi0J88c9LEXTIZImxw9rArK0QnNo4qt4Mdj4g7YNcFb54gyN3dhC/ej+?= =?us-ascii?Q?pGEym3n3Ul7KJFfD6RkjB99/uW+2xSTEYp5oxtctSWEOlL9bwmWC13uip5OP?= =?us-ascii?Q?AupsdAR0m9qk3qfbfiR3+lZ+0ttNQjzVau6r4rct11oHnpsNRp2gpa4fvVA/?= =?us-ascii?Q?1K+B5O5RQQbX9SJuOH1Kvjuq3Mc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e4e16b5-4929-4bae-cf96-08d9f3fe1efc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:18:21.9731 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nHes6aD6FrFLvbtjDlvRM9GZGiU8nnaYvBykVi0SkGvCgjSiDeU471TNN9Kt5u20grX3nVTG6eUK0IA+0NV8VQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6841 Content-Type: text/plain; charset="utf-8" This patch added a function chk_infi_nr() to check the mibs for the infinite mapping. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f0f4ff897e60..67910a3645c7 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -863,6 +863,38 @@ chk_fail_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_infi_nr() +{ + local infi_tx=3D$1 + local infi_rx=3D$2 + local count + local dump_stats + + printf "%-${nr_blank}s %s" " " "itx" + count=3D`ip netns exec $ns2 nstat -as | grep InfiniteMapTx | awk '{print = $2}'` + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$infi_tx" ]; then + echo "[fail] got $count infinite map[s] TX expected $infi_tx" + ret=3D1 + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + echo -n " - infirx" + count=3D`ip netns exec $ns1 nstat -as | grep InfiniteMapRx | awk '{print = $2}'` + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$infi_rx" ]; then + echo "[fail] got $count infinite map[s] RX expected $infi_rx" + ret=3D1 + dump_stats=3D1 + else + echo "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats +} + chk_join_nr() { local msg=3D"$1" @@ -917,6 +949,7 @@ chk_join_nr() if [ $checksum -eq 1 ]; then chk_csum_nr chk_fail_nr 0 0 + chk_infi_nr 0 0 fi } =20 --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2796868jad; Sat, 19 Feb 2022 15:18:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjQadaN60TqhoFk3fKPgAGRxpNn7EsWFywnwTbE6zm/vDl41mtB769+xboSBeyplayB4PV X-Received: by 2002:a63:1145:0:b0:373:7f7c:4a22 with SMTP id 5-20020a631145000000b003737f7c4a22mr11280305pgr.208.1645312715858; Sat, 19 Feb 2022 15:18:35 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id l193si17256319pga.636.2022.02.19.15.18.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:18:35 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3892-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=@suse.com header.s=mimecast20200619 header.b=hMRr0iyK; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3892-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3892-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 1260F3E102D for ; Sat, 19 Feb 2022 23:18:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2358257DC; Sat, 19 Feb 2022 23:18:34 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 C0AB757D1 for ; Sat, 19 Feb 2022 23:18:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l+1eAYVORN79OwMVhvIzdOO9ATRjv7NBp4vxeXkDX60=; b=hMRr0iyKcQb/XOC+iqXqqT2zuLU+qTeQI1NX3N6EsDaAqUAm9k24XhG48f25ircOH01B7c hSMSYpx7iPYsebYlKf+9mSNa0AVo6/BSl40+nZs8etYbfUdFbF+txg4Ank9pOPcR9afISJ sy8jvRhTWx3Iu4hr3orFntbJqNXjMzU= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2174.outbound.protection.outlook.com [104.47.17.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-35-yY_DMVbtO4GR_zaGwk3YYw-1; Sun, 20 Feb 2022 00:18:29 +0100 X-MC-Unique: yY_DMVbtO4GR_zaGwk3YYw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ENkj+F4/KtZLUpFsidtvyaqn1rOxId4fRdUrU7wr6FzlCBWP37O2xyUaSTyVKxwvfxCqyur8JGgJz2M36rN1ECgQzelBxUHNRkdO/aT3npysJRk9CTpSzaBZvknbKjMBywlJqJ4N4MqDRlDIojHNNyltjaA5401Usim7+4VbANlb1QWFB7AjgCvZK4kkabHFTJMeqgiW330i7vL5mDNvoyBZ1xjEtCAp7e5PjIIRbPpE3LkIYNU4orEQhXGogyIMT7Bbo4v+6Vyp78zWq/RwrNQqIG0CtbrQvY60JAB8zAArPJjtuxGjXshDxjNWjzQDR5UlARonQmtHLrKiamfPPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=c7aW3DzNPBB7SGAdLa65igWwLydbfsYUy5nUou+VE+I=; b=PEn0Iq1oN5i1W4XiXa31DKeIF1CBa+Pz7LQ3PpUMLuIyvyIhIWcvRwjLydgVSI/QdsM4Rxr/FgwNwJNTtKxn/Zn7qzTPanCaiUkNcLKHbf3HwcUzw+tdxEUP+2AwtiQpX+ylySVCQg4spGGnelm4o7ozevo6W+T4whetv+Mc/J3EP4k01T/II1z1+ApMP1blGhDc2k9ar8QI3+4CaL3Kt72nmlb0Xjo5TVZteJ30eXgA5qvrMlinOWN4I+WWFq5/eCw9z+d/T3RDneXlnqF6OL0Z9cog6wWqkTGw60V39frSBWhRqwM5ljMzszAYOBLeItlJYKeI79KVHxmD1H453A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB8PR04MB6841.eurprd04.prod.outlook.com (2603:10a6:10:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.25; Sat, 19 Feb 2022 23:18:28 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:18:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 09/19] mptcp: add the mibs for MP_FASTCLOSE Date: Sun, 20 Feb 2022 07:17:53 +0800 Message-ID: <342a658b426f47fb069191a88f693fcb6fa6a5ed.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0052.apcprd04.prod.outlook.com (2603:1096:202:14::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a665266a-6caa-4f74-ecc1-08d9f3fe22fd X-MS-TrafficTypeDiagnostic: DB8PR04MB6841:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mxbUzuSsjPsdllKel2sALyzc+Km9f4tWp6O6BGtB2yemX3rHcM2s+Fsc91FBgHGBcksTGiMGNKewJ4uslnVLmJkl1dICx2QSP2XtY3V9ovRlh281QtZmHCgxnE8GOYOjj5gISWpkQhF00MraWEz9aDXCYI1af9yzdtUOhXFhhciyXt7LYEshZsBQm2iOVBTRbcvM/RrtADlo/e6jivtLVaB6HtuuHHc/isYmFt8p5Qaq5nZFpfYFZej4yieh05gMUxyGY7RqGpRusKDmGXDr0Ii4k+egJzQGf0vk8T8Qrurg5mObXHb/CiRAa34Diy+kbR5aILGsikWu4lTZSzv41o0quqyfqn0yMKoxdVcCZUeDsm7pSOp+6iKQGeXtJ+f0WY6flRqJt2tLyz/ClyCyLlVNkqyaNwdVc4o/DsLlgK1Lb2s4TKlJZetTl5U8voKQf3IG0P8DWHx2a3mkW0dTzID1SK4Pp9ppx35ko9L7/2WRHWTAliqv+vremw8svArMl5gjCIdeZGNZvpVW5IPFxxheM853uJRbPlVhWB4zdQG4/7X4QVT3VVdeDO0cktmCUzi81fV1mVXFWnJ0tS5d1PRLRC1laCclUG7q+qLLPqZld9O3b+bB1Wuk+LS5++luVW09sDxvFUF2f3NbxrLnBQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(6512007)(54906003)(6916009)(38100700002)(8936002)(86362001)(2616005)(36756003)(6506007)(2906002)(508600001)(83380400001)(5660300002)(6666004)(66946007)(316002)(44832011)(6486002)(4326008)(66556008)(66476007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wdLNRccXvPYHZMZpLM+R+NVIcAVUb0rKnZGtk7U5o3ITtULBOdTSWkFK7vlx?= =?us-ascii?Q?tW3VfzsrOIsLa2/ccmeg/tU4cedcsieMD8wlEt4PSjxXZeBGFJxGU2yHA1Nf?= =?us-ascii?Q?WOGInynj2aJufiIeHm1MNLqKgmfsD4R5EJbWD7mQtfP0mQYCNUFCAaQrBVtK?= =?us-ascii?Q?qM2Yrik5r3Oz7fwxKkOvlkW+tYiix0g7MbA+KckzeL4QsGIOx7p4mTmctieW?= =?us-ascii?Q?HHSR35O0lHTAc3shcnRZKRPr5QGkIQi3NyzyAXYqlhPJZtk5svAeQ4Qa3gvr?= =?us-ascii?Q?y2l6kFQba3pbC8AVJKd3UgNxyD3OToPzLzj+OPpnV6VAJuAyy7UFt1IG4wPL?= =?us-ascii?Q?RSnx4G8oa656K+5xoiD/c0WSvDcLN1eSVckGp+LaJYaDewr9cuu5HNKgToDz?= =?us-ascii?Q?KvuifT6dNs66BexYb2vGOm8ueT8dsZV7U0OYnZXJv9U2l1N24lX3bikx/2lz?= =?us-ascii?Q?B7dhd1yIeZBVxrkJehHARN4AgWPoETOqBcPro+zBCmKwdX+87dx7dyOGyN0U?= =?us-ascii?Q?qhGR+4DcPRDEt24u4qPk6qvDBJj2aC4zewVZuz5Nceotfdu7uHPFLoD+GF3q?= =?us-ascii?Q?Ls6IzZ85QvP2afA9VjqIp8y59T1oRKnVf3CbXxACZYFOoLyLBYCoryPR1eIR?= =?us-ascii?Q?NJ8By4RytFFTvhZu45e35Kk9ludQa2HKRRcUteX4aI6JmTOplpdSoHOMAOqG?= =?us-ascii?Q?mzlnBDEOhkgKiBARI3apEQgQTCPzkMgQ6reGvo18ES592CJdOkjaZ0Vsf3OM?= =?us-ascii?Q?vg515pzycIKbK3Ed/46lRRqYwAaZjpRrpfLbGdxKDy3RAkAtqKg5ER40ot2m?= =?us-ascii?Q?j7aRS5WXBTRWKAI5KkSugAhfoStVswjWAsbu1GXNYyFtfUuh3VoctaCAMohI?= =?us-ascii?Q?IbvTaB3pE7caXPnOoMd5JMjPidm+jB5M25WhK6WkmzILKMY2TvIhAp/p8fHA?= =?us-ascii?Q?h/4e6kd9ssh7bvkfwk8X4WEixdboc45Z9qg62wJm09MCCTNW+Jn89hlOjC9j?= =?us-ascii?Q?S+r4aUGR6EA9PD3bQBMidZ+JmDQpDYsJr2Q7GEDNndDCO78LbmyCLBNF+Nmx?= =?us-ascii?Q?EjBzbg4uTzGVPWsAAL6nQM9Y9bzGWa59CMzRbo8SBkuxN/gkKTyGU1Ksea97?= =?us-ascii?Q?dKMR5z9RnwkWevm7qF65K3uqP3Noo5ydRXQ0wgJboRd9FJ7HKev96w8WvRuI?= =?us-ascii?Q?tbfYBqCjo6DQ4J4n4Jr4IsXxEl+AJFJ8qPbTLVeshJJrlzTFS/8im3rb0vpu?= =?us-ascii?Q?SA5cl1EPCJ8sINXrRgjpfTGtSPykdLMQKBA0OfZR60/5gux82en3oKa2OPjn?= =?us-ascii?Q?cHybCHDjIPQsDhY3xOgNC1EG+44RxQOLin+J7GflcIrfntgg8scs8gy8tjzo?= =?us-ascii?Q?oCqJaBlx3I/NQBUiLK0qetwwXIjQRYCczKAvG50iWu8WhGc8MzHSFSB6tlzW?= =?us-ascii?Q?NWw0zd9YYuPIYxgJE6tOo5jac4+EedKluDgUPhZ6n3ZmH3RtYW1YXyeLfH2O?= =?us-ascii?Q?JKM7V7pmCZDKppbTqn/E2sRbuw8sZcssRbNt77vqcsv8oJUWs4EQenXYVqAw?= =?us-ascii?Q?3T3Bq7qCwUeXe1zGOHASJ8cP9+XFBXjl7QfWwlujZj1KEgXzr8GIc4Rb11eT?= =?us-ascii?Q?ABMZjvo7TX118pVpc6J2mJ6TmnpNj/iTb4iwsJMQnbkHl+D7r8lVbJrV3hVG?= =?us-ascii?Q?uaiCF+Q3EtjbtaDbjDu4oH2NGHA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a665266a-6caa-4f74-ecc1-08d9f3fe22fd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:18:28.6757 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EghE0egiXi9GuaZqMxYNzfl/7I0+i/DsKtkON/qzc3CAXV11J8wsjA5N2JJV7XYSYy9JfxYZW+RDf963GK01Hw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6841 Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- 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 7cef7409e300..684643f8af53 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -49,6 +49,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 785cf751e5c0..93dd5176fd5e 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -42,6 +42,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 0401b22128c4..e775d75807fd 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.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798001jad; Sat, 19 Feb 2022 15:21:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbXUpiOut2IqKuyELJieeojlQZd5erIFRXQF/uJzepcNWdqdNUECsLzQ6F0f3nD62VRc15 X-Received: by 2002:a17:906:c318:b0:6cf:421:6f8e with SMTP id s24-20020a170906c31800b006cf04216f8emr11641074ejz.294.1645312868494; Sat, 19 Feb 2022 15:21:08 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id cc29si5938128edb.587.2022.02.19.15.21.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:21:08 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3893-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=@suse.com header.s=mimecast20200619 header.b=cE0u+2JY; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3893-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3893-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 AB1EC1C0C4E for ; Sat, 19 Feb 2022 23:21:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4479557DC; Sat, 19 Feb 2022 23:21:05 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 05C8557D1 for ; Sat, 19 Feb 2022 23:21:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1Mx3DBvoBArVxmFlsBlhNMFM5sVMG/NfKoAmqGagxc0=; b=cE0u+2JYp1WeG53pIFT5MW4GL86oye7knAXifpax1vIExoNJiO2JJ16NhHB608ZBVE/q1B Q5tisHwOZSpX31MdiS+kSeNWomcDB5JT9KdDBzwSbUdliz4TYyFw1aUzyBV6/iNpkG/fzv Y3YypDgl0R+prK3OXXu16rD58tnWe34= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2168.outbound.protection.outlook.com [104.47.17.168]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-JG4OBN7APm68C9TJjxIltw-1; Sun, 20 Feb 2022 00:21:01 +0100 X-MC-Unique: JG4OBN7APm68C9TJjxIltw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GZFF+Yg28ADmihUW8Dlzx4BiPAz5WY+eUvYzXHm9moofsScbZ77VfRINTCr/j5Bqn/YZcRDb2CKZQkmJcvmvyDdHFR/az5LqFvukVMnIoHnT+UotwVXbGVU2Icq5IimxCVWtkS4vWXrCjxXSX9K7/wuqTMxNor+zBaKRtJp4ieerq9d7mkL7415EtfqBKW5XwoYCLmtl4Cqyjj9VIbE9uhZrRC0vEjlR2y4PmVAmogtc0i8HM4BDiyi5C3dDX7Kg1NQc27im4hcNUqopS4Ukx2GVeCF/KUDgaqUDxy4TeRTqUBZmWRwtNlKNG3beo3jWr75nf6xMxySWrJtgvUakiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P8rFyMYmaTVUSJEhfXcIcFjr3Zvbyo+shXVTewwrjx8=; b=eaNjSCrcuxzXEAW9vOQaWpSxi9RKrh4ZifkfNvGl7pR6CHaaV9KnVJRQ24xsXe0M10zjcnCBjjnwpxOwbC2PBBkwmt8/IukHeYCqNR0LdCE+xWQda+KsQSk7uHhUK1f81TiW7gNEGAFFj9uDtKqFibUvjMs3B/HM/cdB6XIpQh79bcFW3swjHXK9WMc/+B5ae5nBOKmR21RSq8Ak2RuO1wdCbxrScXG0YLtzITqWM4NApX6DWF358xjKVjornlSBiwojafxO/86yS2x2suEXbQHNEBtlr6vwwaf7clWXh4jcWFN9p7LToof4+uq0ssB9OLq3ztOAToD2AIIyj+98UQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB8PR04MB6841.eurprd04.prod.outlook.com (2603:10a6:10:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.25; Sat, 19 Feb 2022 23:21:00 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:21:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 10/19] selftests: mptcp: add the MP_FASTCLOSE mibs check Date: Sun, 20 Feb 2022 07:21:25 +0800 Message-ID: <2eb1e4339344bcdb0fdf21e1fe546613557daf12.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f10df8a-1f3f-47ed-9e8d-08d9f3fe7d52 X-MS-TrafficTypeDiagnostic: DB8PR04MB6841:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jYAreTdojrGErCxjh9niajV4ZomOYl+5aZN9qVoOjG0+cNviGZ1oyvesr4dLopA4hnPOjsIkckjVYXTkPMcQmdSj0CmTTZvxf0yNfHW1n/DUrZ7BQyIN5XnZboMvZPLNnY6SzE8RvC+X3nYWP87XhOhhnWl1217f0J5EffeW6NYX5LrF1sbQnEwLSRE5NOPwdKCT++XPn++WSjl7+ynzy2mSH8k+fjFeVcPCLGNN3hAp+RIuo0V+GTUjiUitg5Z97iwxS1vPPGFXR8IWhW6rTjmpYxrxl2Xxnt2ZFskFu6hPjIJjftuWJ0ijBjjwDRRWSF0SoxZZ6roj11fhsP0DKf/zlz8vNPoo+h5UMgjTxjJRrsMYdb7GtEMnODcbj9/XUoqhQR/jaMuqY8EGhFYlBT4XPwSC9794GffSjvKnePVliByLSSZmGMpofWQnStGgI9J4RE7KHgUDPqFGjzrBmnzxBAdXOLBahPdqAzG8xbREwskyUkFIIaj5q512DgZm4hEt7rIL3udMZc2mwjptJpOAWsU6YMEbkb7qLzIAoo8XwarkHj1SUVozEZ5hKhrlKgCTbECrKysn2r28/BscufRqRtKgAqZx/11qOYe/kUoDGlYj5bR2GQmUyHGXtP1Lvo1xqM2ohK9ikV7UilW5ig== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(6512007)(54906003)(6916009)(38100700002)(8936002)(86362001)(2616005)(36756003)(6506007)(2906002)(508600001)(83380400001)(5660300002)(6666004)(66946007)(316002)(44832011)(6486002)(4326008)(66556008)(66476007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9rlIeWSpNYQuhoN18BoXtPJqh/59DMPg2z3cqB06cPykdINwcQYqxgA/KqLR?= =?us-ascii?Q?JzutYKAarMl32gG4tIW4rz0j7urFqudvlT2YKIBSttHWpP/4ymIxoKVU3FtZ?= =?us-ascii?Q?S/Wvohzas9lGjsHs9SUk07IGf5hlNHV6aLgWW9ZBTXBQs+aJWljfEcDQHLWu?= =?us-ascii?Q?aUIETNZCuPdJe9uRvH614Qn2AQ46SKG+/AiXJA981sIs1LqIDqJDtsvlOzPI?= =?us-ascii?Q?QnmKqZCA74cJUoaM1c/szvjrX8b8oitQNrVOFt801i4zir9DP+V8uGzPRM6R?= =?us-ascii?Q?j40DI5hmG5dVPCMbwwTUaYqFLe2lipfz2Cpf3T7G25k5b0kdS/LCVJDWX9YE?= =?us-ascii?Q?UaFtuQYbS2G9uMAe91Ei83dEkV63kClYxy/4f7KT1xYl2/xZLuv4Wgvll3Zr?= =?us-ascii?Q?0Elel0Rb/tVwEykUVPCehaNXi0BmnK+UfBpvCyGsj7mkeg64h7lAw9P+O3M8?= =?us-ascii?Q?+PiSw+mylhxI3+0II8fblVQ9K2GJF1BOUJu6Md8IJlzRILT9N371rPZd8iC5?= =?us-ascii?Q?0Wwt3EFmaBrbQiMlTJerMTPolSi8MhLQtpRP/oeiAp2cbwLyhg/WqB2nLZjb?= =?us-ascii?Q?P1hZYm9cH2vf2T6F5nH1F9wULjqgmJja3mxMGvgvb9Ivp1t/sMn4hI6DGqfY?= =?us-ascii?Q?dHrJBUlpABeitbCU2MnzWkh+DXitRuSCzUlRsOwYGR7v5+hV7edq+Nl+N24G?= =?us-ascii?Q?tGy37QGjR92iNlcBYXcy6eaHN1EDhaxaNWJLzUJjhWeh45Y49kmXEDEquMxm?= =?us-ascii?Q?QtmHTOQlupS3R10SaIOesGkOC/1B/d2c4IiQna29X87OIeDCBGchXi9HDkWs?= =?us-ascii?Q?dGG5ofg9ZLgxpXxXkEfTAQ1rNFXCOSqEsr4n2gjxSPE9Q8ITHnKWAuFpPu8r?= =?us-ascii?Q?UrPACiuPu5JJ9TVzhHYz7kbRazTwLPnQprqtIaZh8PQnMM9SahtEWINUw9QM?= =?us-ascii?Q?Ht4fCp8KMoDWGLn18kqehAK6JVIRKQuItU0f1WyAbNBpXI2W54MWwgvQzbNc?= =?us-ascii?Q?1jCZ0u6nyNsI9IKCxdQj4jked51WIPlYN1qFDke1FSubtFIRXZmVK1RK/CNq?= =?us-ascii?Q?Ge9RVZO0hs6LMft3A9zUFZAKqZg7B0tvGLnZMDC31ieJYwSIsVLTqPG5qDK5?= =?us-ascii?Q?mH6iDeq4K3XDk3/WoI7kPr404bQeHNVhilyk1Ot1+4YlWBzPPIxLs7AmY7B1?= =?us-ascii?Q?L6vFp+YOb3bIk6hfnPx97fiwc4dAE3f1jk70m6fG9gXfrL9uud3smJfamAy/?= =?us-ascii?Q?GZ4u/eCUK3nB+VC2clYVBV0rFAnUItvDOUVoEPCIlZ8+P/YvtU9Ngmu2erX+?= =?us-ascii?Q?mKRAHro3yyHgc69DwrfDebMD5hDpk08Ej5RjGKahR4V0hFfD2j1bbkpgDlyp?= =?us-ascii?Q?up4B+NvB6YQnqapauO7Cl6OGMvoezmWP9NvSiknDn7xkszEpN+cyg09y1aql?= =?us-ascii?Q?TVsfQeiaIgsAynnpBaUPSstPIb9AkaV4jQGf5yx3iZsFYtZ6ywogJm40tx4S?= =?us-ascii?Q?vULothBbtWGmA6xjwLWUxfJ3vAbqflnui2Oz252DjDTKFNw0ui0shaMuaPmr?= =?us-ascii?Q?P6Hizzid9qlgM0gKdsJ/z12FrcdkZgr28vgw0tSJBe3GsJAi0Rh5GKqj14Fw?= =?us-ascii?Q?haTMcBJe9UXl+MgOooi5jPyCUQb3XA1uuKRWMufZjguD9ARLo3WJp2XEooB5?= =?us-ascii?Q?mcr0JGDuG0wTghB4T/qH/ubWV5o=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f10df8a-1f3f-47ed-9e8d-08d9f3fe7d52 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:21:00.2413 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XiJk782XPNdOgujwAVtu7cHRTMTjnDm+9FiOA8ORjLeSDoMsobq2oZtIY5JxvFqbDuKZB4dj/xz461bU+DE39A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6841 Content-Type: text/plain; charset="utf-8" This patch added a new function chk_fclose_nr() to check the numbers of the MP_FASTCLOSE sending and receiving mibs. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../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 67910a3645c7..76040c725e12 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -895,6 +895,38 @@ chk_infi_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.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798050jad; Sat, 19 Feb 2022 15:21:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJyV4rlXLeWL6Tan1q6QE9r/antZKveg6C3uqwX6Jgx6cFt6yX/Ot/qtr3hKbyyUfPtVN8E5 X-Received: by 2002:a05:6402:7cb:b0:410:dde2:5992 with SMTP id u11-20020a05640207cb00b00410dde25992mr15041949edy.323.1645312875981; Sat, 19 Feb 2022 15:21:15 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id sg6si5005813ejc.213.2022.02.19.15.21.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:21:15 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3894-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=@suse.com header.s=mimecast20200619 header.b=fs3uZFQo; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3894-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3894-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 E17591C0D4F for ; Sat, 19 Feb 2022 23:21:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 89C4857DC; Sat, 19 Feb 2022 23:21:12 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 5D60357D1 for ; Sat, 19 Feb 2022 23:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DtSIU3UEFkw6SEidnBvb4J8P1OHSFYsyRu+UcNqB2wk=; b=fs3uZFQouyWwPzbdRLp4fBfw1Iynr9V2oSj5DdyXFutXIjXbXKRhrfx/8b/cJ1qJ4DdcAV 0GdqGQOzoz00CbOrC1cO/nDoUaoGI8JN6KMqurSBvogIl7WjDS5t+agViULdt0wUIUFUbh Zqa0t0gCiRqJW9BnkfcxoWmiyYvnal8= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2169.outbound.protection.outlook.com [104.47.17.169]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-35-YFOqupAOOqyNrlDbukAlDQ-1; Sun, 20 Feb 2022 00:21:08 +0100 X-MC-Unique: YFOqupAOOqyNrlDbukAlDQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TDnMJrosxtYGw2NQJwoWhyZIx8YqBAeTrBGOZFhMBfeE4OSUT680rxkaV0vwW23hpz2Uo9PrLMMVBCh6+1hp0RM+rSLSzUMLbcb8d2732IhmohZo5axINf72Kn5e9GKyxzRsyLCXvgb+USF9Hv+o+LGWw571C9jEWc/gesP/VafGU1hKCB34doSTbx7PaIL0+1Cekj8xyOOvJibpw7qnuTMy3CIHz14vSI+3TZw60DlEovBDzQ9hnG1zr3v+QbnML/vpZgRc334yys0yV4Alk+YOk59bU+kRWRPnyrq1mb1dgE3To/XfPkKqlZwbxtELMYZb6qXwi+FSM9p+mE3Ntg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vE+utjFsFCiqq8qjTOQR0uoEev0X4nb9y+t6wfEfbIY=; b=P+ADkGfL4OIEKlCAhq+M1Us+9tAqv2ZOUjm7i9QAD+cBQMWmVIHuDFF8DivRj9wjQINGBghmvg8DMALA8hldU/bKFpd+cnhQlNTSc0jIVcqJpUFDO21e2r3SaB2CHheZxrgA5kXOxnXn+G7BBf1os+w6zqUYJnK8nwaQ5b15Tyeb9tD85VZ2rlA+0fGQLZj09MwE7MZSix7khtBhwwX8TbW9AOZIs8vZTKlT0Q4QtJeNmLDGzWHtts3FiN/FD/FIPbsFftx7Xrjor2/EOQr+aNYgf3k/z2paocGp6ZfFcSZNnbykifjNevumWa65H6H6Riewfspd4qaI7ukIfUXf9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB8PR04MB6841.eurprd04.prod.outlook.com (2603:10a6:10:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.25; Sat, 19 Feb 2022 23:21:07 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:21:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 11/19] mptcp: add the mibs for MP_RST Date: Sun, 20 Feb 2022 07:21:26 +0800 Message-ID: <0ce1a8517b11b594b0561858ad2c8c2d940d1898.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0127.apcprd02.prod.outlook.com (2603:1096:202:16::11) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60b1b9fa-9f21-43e9-4160-08d9f3fe819b X-MS-TrafficTypeDiagnostic: DB8PR04MB6841:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d/c27oZRKQX6UYsEyHjJe3MkI0vnmtycnKd/7rbuzLHURk3s6NPfoUUnMzHMPuPDkrZcr1SMsDojWKiADVtpcjFWNLh6Jw4pU0q20/R5QGvD7uwGMDubn21jYkvJHfpURccmVnYfOfwihargNzOWr04shhyLOwBpnszCKben/OhN3XkDdnFRb3T8MojwPPsVaonFcmjvXXOCNszknDa7YLYJd/EFr+d1kO+V8esgBjXist+6zCTh4hJ8zzGtv0uwQrqtRObp6TZj/hc5bufyKZlphnGG1reLuYnWsB2+5DKZA1E909FGYTf95GYzCwjDRKbLUhWREmZAEYVDH2hWXxatfRD0jxqn/vbty5yiBLnpkJANAekwBwduu/7GDPCulUGTnRklrnGqrb+AXRwRx2yaQyA1jLcy9CeZqAuGZf6NIY5JA+ltR7ku2YOmWZ6tB7gNdbpF4phAOk/FbrVBiMBucvp+7QOr7vn/wyLhJnrh7Bd8DwZWZqmSQ9RQbv+X0FwM386n+9uZbF2H2D5n9VZmhMvkDL5gU3ArIP0Fab1OVxYmNpn9dIy6o16G/6YHpsPLANmirHrhGATxouvxQjUJ9N3EEYnwqHH53fRnjHIJu9mTgHwOIG1eiD3DVR/L2Dhw+vt1VzpWZ1P6JwiOIA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(6512007)(54906003)(6916009)(38100700002)(8936002)(86362001)(2616005)(36756003)(6506007)(2906002)(508600001)(83380400001)(5660300002)(6666004)(66946007)(316002)(44832011)(6486002)(4326008)(66556008)(66476007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IVKkF/6ZPen3HW5fA6yps1AcBdBaJuF6OmJhttWYVoH+nv8iackkpn7EKH07?= =?us-ascii?Q?SU9YKyMvJFWFhsBLybS59WgUO0SC0enI2GslUTu5klI+uYnaTMG4yZIO3+jq?= =?us-ascii?Q?QdaIdQenUkJdl/arNlmzVcSZzf801uSFBNC8nmZ3oCbguuy5jKjTvTPIKCk+?= =?us-ascii?Q?O5+BpnQ4nisp6eH3W6uNtkWKx/3IKrWq5gexgn7XWHklAcVr8pBz7ihEDfh/?= =?us-ascii?Q?+FcTCNAiBfAyVy7Zo/yawVcIujH7R0yqAT9r4qnhpuEPvFImZTlExdNXgXeU?= =?us-ascii?Q?sn05LaKnpd11X98Ioi4XV3xXqH/xPsCKzJPt3b4K8h58ZTRKDsYC/G++c2C/?= =?us-ascii?Q?1/10Bzu5PLbPb3HnihBgm+B0Mm9DxzcSy9rK0sjJTY83gnJ7hQHT8zgXGh1U?= =?us-ascii?Q?W7MypmzAqgXO4Vi2+jnp9g99mQl9DHTZZS4KcV+4yHBJEkpHpRgNzkDlz1rU?= =?us-ascii?Q?2pAaDsa8evzhn83DPw6MgnFApaDz5kMTFtN2cIhlUqJMqC4rIEwQmlm7dXtc?= =?us-ascii?Q?ExxIq4fM4bbK6XhHSyIFqfpHlyJ2tNNojQoz5GCGyJdARcSSMgYYZgdy1a03?= =?us-ascii?Q?CaiMJjzirIqQtzeZ50LFb2/GwlgwRFIETPUjO8p4ALedRKkCKQF4CeZd02ad?= =?us-ascii?Q?egyfCUM6wr0+P+bvVWRXc7yxBUXDttT7iyBncs0FRhzYdn3In6xG7pzEWdoW?= =?us-ascii?Q?PReGS+KxtUcE8WCqMccX4UiTie0vIfCCrBltrJ2GNfkA5A38PfGLT/P+j9cM?= =?us-ascii?Q?RBw1a1vwPDiVcuPqy/LnmSYUD5v6pgD3UXtW7BE+dt+oTIoFkbDZmzx9vd26?= =?us-ascii?Q?d4quXgxejaiEhnXDbbCQjLd6mka/s5oReUOfYMmQnn6/g4ePAQ55QAy0IYvN?= =?us-ascii?Q?vS24odL5+5ao9PYjTLg8qtU7p2AgKPDa3TBEiIiplL2eAhZAcI4z70GSeR4j?= =?us-ascii?Q?8DYaYJwi/FfOqAfkmur2pOpu0JymYG+jz5fMB2MCTlffHG3jx14fCId3ILVv?= =?us-ascii?Q?PFpdmxJTxAWAEwgsEMXhtzfV7P9bHtIvNjNcYX6OLjnHdie7yg3TQLLDbHhx?= =?us-ascii?Q?qiZXylOVwZTSIAlfpMv3dzx46U/4zUjTnuExznEb6w3TDCvtDQUkUFiWH1AT?= =?us-ascii?Q?2UWTZwXNdQSzp1ad9BYrJPVD29vOCQjngULn7pF7alIJD3qKrKXr4hJDJ9uk?= =?us-ascii?Q?rZIWtj/9Fm263+DjgGSnqq2A0PEBFfCHPoIu+Q6kPJIj6YKYtdjrXWAdMvyo?= =?us-ascii?Q?IFGToTM51AZ5Kqvl49r1xzX1+pksbJ0wpRawJOTrOngVtWHtoqMDHBIZJn4e?= =?us-ascii?Q?xgqdttEcllWze868JuCIPwQfagX9HtVa6/l21ZiopNbieY559j8FaKwZ7PMm?= =?us-ascii?Q?XmURE4jgv2vQLE93rz8y5+wvTwXAUHdv/BhPol7MKOlF2gbLuPQIxaGtT5/z?= =?us-ascii?Q?COHYpWje44kD25V73mcGjG4kIoxIwSnCbt/zZPQxxbNFqn9uLUQdQhlSgpt/?= =?us-ascii?Q?sQ6tpIvjtiXFMrfQGQBDY9eRLiNHAcsL+HHo0OEzLF5ChLZyAIDApdyyeF3M?= =?us-ascii?Q?Z9aaJ7DUIg4T5+a1k088tua7UckTvAko4kXC5KXucrAFWMA1LDPKKTUdJqIr?= =?us-ascii?Q?w+kxYDw9HaxSHokANEy+haKbJXISaD5eGdDIzWuxDN1mbywu4Md8X3VFu/Jj?= =?us-ascii?Q?08mNTh2SNgRa7zX9RtVgOhlNPfs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 60b1b9fa-9f21-43e9-4160-08d9f3fe819b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:21:07.2095 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OTDMsMJMF1tN29c+CWFX4a+evtdbHxt9aOdWx6mV74k/JwEylfJjA4EW1jraRo/swn/lGpQGUfyqoJB1fQfPkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6841 Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- 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 684643f8af53..d93a8c9996fd 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -51,6 +51,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 93dd5176fd5e..529d07af9e14 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -44,6 +44,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 e775d75807fd..88f4ebbd6515 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.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798089jad; Sat, 19 Feb 2022 15:21:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHIX/Ck1TpYkYLPO1PwoPNf7YlFts7QsXg61PH9xnqh3Sboe9GXV5mDVSa/oC0E/EYXlUN X-Received: by 2002:a63:b50b:0:b0:373:9242:6b98 with SMTP id y11-20020a63b50b000000b0037392426b98mr10971170pge.553.1645312880358; Sat, 19 Feb 2022 15:21:20 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id d22si1426503pfl.314.2022.02.19.15.21.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:21:20 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3895-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=@suse.com header.s=mimecast20200619 header.b=asQQ+Nr3; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3895-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3895-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 E2DB43E1046 for ; Sat, 19 Feb 2022 23:21:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0429257DC; Sat, 19 Feb 2022 23:21:19 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 9A0FF57D1 for ; Sat, 19 Feb 2022 23:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xYxwQN4EoX9wITIw3qveoBNS9CXs5+tZF6hfM1d440g=; b=asQQ+Nr3kInJr7LPaJGl9aI2QRAM2LwzXkLo4xoGZ788GSnVfaXHUTW8Akru+VkkUaFiQo 2yJwvRSfz2nqfS4Gvx4qHqZjVHTu8o3GaHLjjIKG/UvitdVGJOvfDjy9GERijzkP6JUJ5z BFOF7iDKcrMmXIpW+P5uZ5qwn9CTBEE= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2171.outbound.protection.outlook.com [104.47.17.171]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-36-UvQeQNYoOuKTVFzTgdqgQw-1; Sun, 20 Feb 2022 00:21:14 +0100 X-MC-Unique: UvQeQNYoOuKTVFzTgdqgQw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dBFW4GmpSiJswfLzsL/FtjimRqwHI3R5frg7rgAst0Ro8gRasjR1RT29oFiBu52JjKy/+D4uhiH2phsryJj6kfsa8crVuF6Zhemubs59uruqFdfL/wRcW6UrnpmwvOmEKrjeQumSN7xc2IXXVU2KeZn0BGo2qodHCoSYNnYEbDaQGfVsf0NKrAET2bgOBWF1qSIS30RaPTEEENqZQXlFmSTAxp7oiXLOWP8mBkKRmLdV3vHCycxyCaWr5vHaK4MkMmdDcP6YYvvt3xoTCRSkhjPl8b5UX3qFRxfUS6x9Rzlkog8qhPTe8PYRB6EnssL0Krv9WYfN1Uml8we6wnB4Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nlJZX0r8ApcJ2nEURZ/6bDNq/guUR//f/33UlQOzWEQ=; b=d8ryhUTeeWRY8+HC3aG+qaX5LbVCsqIql+sV8AAccPbSd4knuh8QyCYP49QGeot9dhvsOQUYJ1aUX3mD4eti+uOAopxbgtWeq5Q2VqBF7Ro/xK5SyeJXX6hzYyDj/RL5vzfDtuputfojwnh3xIQsNAEjmtBzdZKGHlDF7d5cshHn0rTGwTLY5K34cw4iACqak2Ctir9dmW8g5GX9g7nek5rJYU1sZj3M1CD1kEfVj7LRN5u498CGVS6osh0Upxwu0SokT/XM5pKiIibsmoxtcRwSlcae5oUW7k6+k58NzeIgTv4BPcbnFh8LGPWeiw3SBP81M3TwgctwE3tPgFA7Uw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB8PR04MB6841.eurprd04.prod.outlook.com (2603:10a6:10:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.25; Sat, 19 Feb 2022 23:21:13 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:21:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 12/19] selftests: mptcp: add the MP_RST mibs check Date: Sun, 20 Feb 2022 07:21:27 +0800 Message-ID: <192468e21efa3142469263504acba66c87d94b05.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0007.apcprd06.prod.outlook.com (2603:1096:202:2e::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fad3100c-7370-44fa-ee97-08d9f3fe8548 X-MS-TrafficTypeDiagnostic: DB8PR04MB6841:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ru9jnIoHM+T7nYEFvkHov2Fzok8dsp7w07YQ0szlDDfduAMpjy7k5PE2hhAHhSlfLvwAZEVe0DUxD8khH/K/9Abu9hirZrRvb8QIGC13KHHuTJuYVU8WzPziH9L67IhpgY+91GvChpm2QG9acAJ8w5EsPRYhl3XLOIvS3aTzlTA4yo2x0LiSNOBcAoWVECcRnCijKbUkCGnPxvAmciRRJ6V0HmUEZlwBVcz2D3JUrgBQJ+Qkk4h1Qs3F0xfqv6DSm3pM9Dr8ufp/QXIZQX0ALu1micRvxENv285ibOiu3KLrnw7qHUKSEp8aHaVw426baY4C82ocIiZN9zeS8lG06jvKPPnVRL3P+e6LCz13x5fKigke2cU78zZL/HJeFgSpfX1341OQ/ap1FZomJNkxJzJtFykcfOQq+TUledtvl5cvUigjghxMcsHbVN0DpOIB5Tes1jryE0jCuUCnbOYsNCu//RU4eCuMx8/x83vKNRS36eesdcIfLbdFjS3bnH+0VYmgFiUPoZcx4CGmMDmlIJCh+QUhyussN+tPMeAHrwYCwPrnAiQ4h0c3F++f0MYfk1yp0Xj+gL5dXmr06O7/ZU+ZxXRDabQGzPB9JfXOhnglif1Xc32uAKoCYnAE30vaFkFLEORD2Jp/wFbAW0TARA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(6512007)(54906003)(6916009)(38100700002)(8936002)(86362001)(2616005)(36756003)(6506007)(2906002)(508600001)(83380400001)(5660300002)(6666004)(66946007)(316002)(44832011)(6486002)(4326008)(66556008)(66476007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YWxBeV+LSUp7GUHSc/UzUGP1P0achRnx3k/8TM33w/Aw7amNQRWqPEs9tYeR?= =?us-ascii?Q?/voLDDkPSCoHXi8F4BCmdBLaGnBEUxMAbnj+Fp6NAMshnZTvKxe74YF2fYHd?= =?us-ascii?Q?Z3l+eTtGOnbm56tC//vGLfNsK1E0zP70xKP0iUVWYY/4DThEqYYw3W6g6vJT?= =?us-ascii?Q?kfjF9lrAUeGhHMVo+/H3XQgg1dlWVOek2np6lK4iTeIDrKuYR0g3ocL0u06Y?= =?us-ascii?Q?2kN4H3Vd9TYY6rvSmziJ9MxINDqyfcuQgUMFT8fJDNB7t056YpyGI8FGq9M+?= =?us-ascii?Q?6JSHmWr+aqPx3khTGTSKsibf4x/6M/9L+4lUW8nxJgX+SwzBfFzx3GF09m7b?= =?us-ascii?Q?qaqpJUQaKEtue0g7pD1NAkqq9TmUOVxaidpLV6DWpYRfR5LHh/CUTh8szcGN?= =?us-ascii?Q?O43cyOPoBT55m3RU2WCUjixWlsxd7NA+1l4YnVdRbVdJDoU9dKNar+ytBhA+?= =?us-ascii?Q?19+hW1JEsbt+JJ7oCniR1PjGKTtlm4KWDEEW90USsnLANv8L4ZhNNdVZRmRK?= =?us-ascii?Q?G55xoJnQi0AVxIbRSRndbsHNBNTGrVRnb6SlICViCbeFUt9HM0c4vdV+D1mu?= =?us-ascii?Q?dII0MYwldummZguQ2ICzytBI7GGXVLZ/JqN8IcLsYrMIwKJfdMazPuFpLu5l?= =?us-ascii?Q?PUhrTOj8lLHDyLpf4Z91NrvZldmznK7CWuKNjw1ToQ1/c5tkca/Jt1bs9vL2?= =?us-ascii?Q?x1NuUt6C9pxUyzCutEVzsPyfR20dYDDWYVqbC1SoG2JkKcU3ZdqOinqGrTPz?= =?us-ascii?Q?TkWxFGrhDcNLg3m9gjsvCCgLUqjXC5JZbV0ol/GTDgJD0jGmSCW1+9OuHkU5?= =?us-ascii?Q?OmceuV7xD1xrrmU0gl6K8to8jazQ7tlKYElQ4OIiC6Zw425xOYI7bffRcTXG?= =?us-ascii?Q?Wcu4m/bswY/+jyn3thNfii+sbBUN/mEaeuqT6X5vDeVNBWJryVKCGCjiiH+q?= =?us-ascii?Q?up1yTwMZE/vwnOjBwmTaz63bXLq63C36uV2wdxJIMgf/UxcrJzpT/AQbDJ7x?= =?us-ascii?Q?88r4n87XZs63JGCAEgpKnCVN8XbRX9sU6TFG8yc/0TivltmT0NH21+6m2/28?= =?us-ascii?Q?s4/xThwuv6R+oVPfXvHeNVK+AsmHAakFuq6EHO80sTmgAPcj3BUFo3ynPsfV?= =?us-ascii?Q?D2cyVwO35yL00IdhN3bO+GoWEGZL2B4r3JLKRAB2CT986lMI7LUhLSsyzN1l?= =?us-ascii?Q?Ye7eD7yWMYh9E+qqQ/kRp9+1iUFwKkd5i1Xc1tMtcfATnoGFKsxoN/moeUCy?= =?us-ascii?Q?b2NZ9fQ4OutkKvoicdIroQx+kgXyvyMj83J+nsPsc048Kgt0Jqr3sl0hAycK?= =?us-ascii?Q?XfdE8Dmep/AOaMDVzN+R6VO6YXNJ7iYVU4e1iVtGakJjgvXuACGTYnW5hsUU?= =?us-ascii?Q?yTJdKauc8QBtpdvl9VT2jQ3VIW1ZrzMwTcAC+b9VBa22ikWBnjFto+mJtM98?= =?us-ascii?Q?aXsh2FKHI6Ll9dUBXeKUop4QbfXG9n1mTJVlGb04fAcFPAhSqzJ2E55+Bif7?= =?us-ascii?Q?6xuk9HkJrPejiSbRFC6drbvNaz9/BLLdbYz9Xnd0G5s0kPORN4htgQ93Jp/2?= =?us-ascii?Q?OON0ZkE+cs0JbSbXitlpxEzcZEiwHSe0ccUCRtDbNULyMKDTopn58Jy3/box?= =?us-ascii?Q?ACQbtT7caUAtSdsMdKHA8jfyJkqOpJ98YfHTxho2wFkZ8LoCC930MBjxJ+8M?= =?us-ascii?Q?SbwlFtE/+QOOixqlgHm/x6FTq20=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fad3100c-7370-44fa-ee97-08d9f3fe8548 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:21:13.3965 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bGboenkVnlYEtUez+FumqvUCMp3CFg1cuZrMsv53ixw2jPBhHrY+oY5s2ZkOE2KBX5ubFRapYPHb6nKPZBWcSw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6841 Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../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 76040c725e12..bef029de5876 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -863,6 +863,50 @@ chk_fail_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 '{pr= int $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 '{pr= int $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_infi_nr() { local infi_tx=3D$1 @@ -981,6 +1025,7 @@ chk_join_nr() if [ $checksum -eq 1 ]; then chk_csum_nr chk_fail_nr 0 0 + chk_rst_nr 0 0 chk_infi_nr 0 0 fi } --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798129jad; Sat, 19 Feb 2022 15:21:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJylic2AZyKUW4l34mtgMfcR0UAIXFjRzx211GtTjl59CB5UFRRKNJaPFfQjwj04q9hPCLlc X-Received: by 2002:a05:6402:4495:b0:410:a171:4444 with SMTP id er21-20020a056402449500b00410a1714444mr14638842edb.20.1645312888063; Sat, 19 Feb 2022 15:21:28 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id 11si6214248eje.377.2022.02.19.15.21.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:21:28 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3896-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=@suse.com header.s=mimecast20200619 header.b=ZnMRBqkq; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3896-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3896-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 286461C0BED for ; Sat, 19 Feb 2022 23:21:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 173EC57DC; Sat, 19 Feb 2022 23:21:25 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 CAD6357D1 for ; Sat, 19 Feb 2022 23:21:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PxQnAhIHInR1WP1NMs9nDPf0YzzQ8KIFp2HDU3Z12Ks=; b=ZnMRBqkqNU0Ji3zn1VNt8+EjABp6kfGZkCbsRjWSpeyVs5XxVdUIYDUPq3zv4O+Y9oOO7X ohduQ+WNpj4KRo5xqh7Vs2anKB3fDOel4xnBI1sJrQ2YP4cn262GFkNcrPFG2HODirQP+B gvcW3VmnOspnOveJSBd8wBCiQa6n1Vs= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2174.outbound.protection.outlook.com [104.47.17.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-36-Xz-Aok_QMPm3z0bDadrR1g-1; Sun, 20 Feb 2022 00:21:21 +0100 X-MC-Unique: Xz-Aok_QMPm3z0bDadrR1g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O/39ts/bD+I9SLrzn0hgVlA+n5ctUCPfx4KuoN/Gdo4G+zgXywhdzBfaCuuca5TtGlZrFf2T8m2pyuM4hycjrCOMCdP6pD6nhbn+DH8sMQCzVUADA1hHOkH9+OIVKSVmCEjTWqFtPS+FH78tjQUIJ5hgrrHW7kLS1++nuDgQaO+hUXjCJlIEW1TPZoAZ8kUVTf6b3dN8nHBvVB9S1dKDxJ1pEhacY2L6Bx78WdiOlUzSyj75UdmSG90N0IGZiFtYzpXZnuycguqjlA8zz97YPMEEwVNIsiEBrIYlg33FaeKMlAhHkiAAGwEupkwXWQJyc9RMkfg/RK2zcnuJoSEwDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TFxn+vdiURcNFbtC4YXwTkMjz6mKH432OaZSLHeNwDU=; b=KcDfbX7os36E8p5mRLUtrzcPqRgmUhB28/AwvwEYN0bkfOlRZmj97BPVuKZ/ytFmtFjymCQSI7fvlo+G8BwIqeZVIPJygk2panP51/wZvEmhCRxGGKTbc6ISuG0vUWK/aoECyIStubsKXvwuUgyhtUJqzFABSOQjxck6ak1qj3xVu9hULENEqUC3MC2mHpoLE1rJ9obw8fzW5aKi1DKImWAOddkaNy7aOaeNeqZRuiakzxdRwwbFpMbMMxUn3PSwdmuGaE4ZwMUc9p8C28+jK+BazduIb8duDUKqKvYFPsjOJ16ryHV6XGphDURdrttcrAzT52Zi1pRf/6p2zYIBOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB8PR04MB6841.eurprd04.prod.outlook.com (2603:10a6:10:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.25; Sat, 19 Feb 2022 23:21:19 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:21:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 13/19] selftests: mptcp: add extra_args in do_transfer Date: Sun, 20 Feb 2022 07:21:28 +0800 Message-ID: <3f40b1a00dd7b75cde9019a2e0f02883f54305be.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0016.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::26) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9424b1a-36ad-4072-12af-08d9f3fe88ed X-MS-TrafficTypeDiagnostic: DB8PR04MB6841:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZVk9Fp7FmVi2qc5gXs58cLP6e+yv/AkWDrTMRFNYFY6Ibe82Oq7pHv9FFF70n5WjwxFqvXfdj/8BChWvcR85QJ3Q9KmsfU10TOMcrbVLqK4OYMO1cFWXGcV+6Etfms2WnIyRwtFUt7grahw/AvAZufuPW70uF0d2BIPQYKwicid+M1DVYJmfNEoYbjUSkKfp9bgj8kudAoNijuKPCB+ALmLOytR5y2iesevzgQ7dDMf7xBICMsxJy8JyspSDcfCDHQvnF5czUMiM41mKKL0EfFBiSEYFqrZAsSM/SRVTt/r9LJPUzRdpGJDAEDHTrsVSSjjX4VuYHPQAHyBCI2DsSqj7oYhc17OiPBGm5hRfREkGmS+KEkGTBLJzODLh59t1Ih/R01Wj4yiNYxyNgqHbNLkG/MDHw7z/kKnpWdJzknIa7BGuXbod5ehBH5TK3q8WjmWfH3U7xHkyOg+iLn77k+KwSOim+3/R/oNwR7h1YqXegd9WTsld+V3q423LNHoEyC7UuraFgKhDkG7n3661FcC4eM/OwL657gsRHXr6I2bVf1QALJIZqfOrMB1sbr7P9PjcUxi0sW/JBcuweGrLTsGrLVjosYhmwM0qsdwnlN/SwthmhkPzkjx6bkOqi/TXfE3HbSpeFvUIuMFVwblRBg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(6512007)(54906003)(6916009)(38100700002)(8936002)(86362001)(2616005)(36756003)(6506007)(2906002)(508600001)(83380400001)(5660300002)(6666004)(66946007)(316002)(44832011)(6486002)(4326008)(66556008)(66476007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LkaNl4/iHoe1glEzIpOEouz4vxpRAJ5jN/futeVoHW8jZF3Qw+9klwUaob69?= =?us-ascii?Q?UXmfzg6jE9dKFKQkCHcwUa/ymhUKJVuLDUrcRZd5/vdb9Bg9lnQYzaNLgfIT?= =?us-ascii?Q?hR+WHkBSGFeAvLa1jOGH5o1LoZyua5tzCtFkWCASRPQLrg3KB83AkyEekyRZ?= =?us-ascii?Q?ckIlppo+YRrbr/NfbxwlknDUcDpRoJL2fE/bZVWCCkyyQ4p0XwikLrTWdOAd?= =?us-ascii?Q?BWDNzSQjRJSygBMHOm7xzH4ppkAdez6ylPhrtwLRsWqW0/qBpXqrX3rZpNLY?= =?us-ascii?Q?qzYSHNV+3HAm4gaYRDpVjxdmTNhQ+zPfp6blHQluv24NdxR3ARhQfLXN59Fh?= =?us-ascii?Q?F7tiXIafToZV2oYiMO720z1kAm12LCrR+XZNh2TJ9fgVGXtjcTdvuhc15AD3?= =?us-ascii?Q?XjOi1YUkVal7yhhr0JfhAQ/cAhY39iC0rcGItMcdvQdRzL4sWHS82M1rgpNB?= =?us-ascii?Q?252sWcl2FiuYijC1a2isbUiq4vX3IgZcK2zQEe7z4R5mTpHtDsx9YMH71Xh7?= =?us-ascii?Q?P/cyLTGaNXEECorHIYXFAeA8gLVxQZ3kSK/o3dUkZ2j42Vc69iyfnl2cAbL9?= =?us-ascii?Q?qfUjLOSq/woPvNjAlpdsnH09Ep+sP5XuGlCWul3JjPZRJ/ysQQIsXry0aV8g?= =?us-ascii?Q?ii4MkH57QYZn/EyIJK1sKNQUvYh/8C2n6Ug8tEyRAE8dfLK/aIWsIOcpfn07?= =?us-ascii?Q?6CI0DYIiMyq+LlRwNDQOonuezRKK+TyrYy1B2Nurg5gIW3zaV2mMvjgyFd7/?= =?us-ascii?Q?LsBEYXxyxrj8493dyOJCjtOZ34DZcNNCEzvDJPBYPRaCRReMVxekHA/GccaS?= =?us-ascii?Q?EsF4peail0kdAwkLBq8oRs1XIwVbZlNBmaxWYHS0+llc8mO4Y1RvO5tR6T/2?= =?us-ascii?Q?1O7q42EMHwGllpAzlj1h9c59D5ZEI3UH66+X0ZNTsNJdwMm7mmBwqxWlFJtZ?= =?us-ascii?Q?DqhUL9z87+9iAgc2Tw+Lf/ZvprZaWyg2GE1n1NAMrQkTmYT5GbY/vCvGjTIv?= =?us-ascii?Q?k21Rw3S1x1TWZLQSfEp5Icn3dkus7IUHmWZ/cijh++ClYm+mnjFB7yv89IuT?= =?us-ascii?Q?zV5aQW5l08m3XESz5TGZgIYze+t2q1EYWC0rpiX2EkpydenZLwvX/OiNa4m8?= =?us-ascii?Q?8yL5wnOtXYENYcvouNrfPnJ8LwzVO6Cf3IQykEvcjTrh/n1EhMPN2TYlC8cp?= =?us-ascii?Q?MFYnaJ2SD4bMXRMWmnJZBuQxIsSCZaSVjwSBZYb94u2lGbnPbBFE1YuIGQR/?= =?us-ascii?Q?zug0mrmwkW5xZsk5TPgK4IIBvuqcYePGgu6WmGNJH98I2w5kLEDTUAstnTAY?= =?us-ascii?Q?zlExriaCNig+1p40rURcA6CEycS5qNpUEouaSM+I5E7XYPN0IkgIlV6RTnBO?= =?us-ascii?Q?xI6jZP5gjjG5NXm+3ZGuylV1yvcxUTDBknl2kVct6NzQoif1D/12yR/X5uEt?= =?us-ascii?Q?XkXa3CsES/JXecPVPBXDDpjnTNE2k4RlRVDg7YsP0EgYRZM5IOiSGvMhb8Ob?= =?us-ascii?Q?DsMKzOvWxCuhHXFjf9ENe2bojFRpdJmhfWHr03B4+J5VFRUlSED+ODcuY+nI?= =?us-ascii?Q?AhrthuH73iWeOLRb6m8vgyohMcXhQQZqJPGaQhVXNqKHkz8NqhqiFOjqzrJF?= =?us-ascii?Q?iv4rci2eDJoIrZ+q5oAeOcD7p9BQzNZqfptvla5OqXOIvbIzFff8IkTXc9Ye?= =?us-ascii?Q?iLoRqFl+szcMM+fgBefJoCH8X2c=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9424b1a-36ad-4072-12af-08d9f3fe88ed X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:21:19.7085 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oSZM4Zg3E8HSvYlYz5qtoMI2XXPoyitJjfLdnFTrAe9Ti6iBjXDqXzXBTLKnn962ukMkGCyjW3F2P+7z4z1Puw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6841 Content-Type: text/plain; charset="utf-8" Instead of using a global variable mptcp_connect, this patch added a new local variable extra_args in do_transfer() to store the extra argments 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. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../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 bef029de5876..4ce578fda369 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 @@ -515,12 +514,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 @@ -533,13 +533,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 @@ -548,15 +548,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 @@ -1611,7 +1611,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 @@ -1621,7 +1621,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.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798165jad; Sat, 19 Feb 2022 15:21:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNG3auUwcJZu7i0cptFkzQ8FGPb2PM+4LKua/gXSm3JBYAJYsghUphVgPo/eDc9ng+UoVv X-Received: by 2002:a05:6a00:1a42:b0:4d1:e81a:64cb with SMTP id h2-20020a056a001a4200b004d1e81a64cbmr14095314pfv.78.1645312893315; Sat, 19 Feb 2022 15:21:33 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id w6-20020a17090aaf8600b001b93a6255a6si2912150pjq.3.2022.02.19.15.21.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:21:33 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3897-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=@suse.com header.s=mimecast20200619 header.b=Cr7faQho; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3897-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3897-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 A5D573E1065 for ; Sat, 19 Feb 2022 23:21:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8F7FF57DC; Sat, 19 Feb 2022 23:21:31 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 5D7EF57D1 for ; Sat, 19 Feb 2022 23:21:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8tbIkHkTiElUDe84s+cYrXPPT5kmzi3Lc3qV4BvYOoI=; b=Cr7faQhoQ/kajDNUbIayhxgw+F3gFp1hGz6BIibpUSW03X6jQv1N7l0tf/XLiwyLSBUcYC 4V7ML2nmlRJGpdgbTYWI5i0fVAo9Sji5q+82hH5/ceA6k+gimWcjqRJtf9jz0vcXQrcURa zFqUY2RLqfLrOTRMkkqdTlzxPa/70u4= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2176.outbound.protection.outlook.com [104.47.17.176]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-37-m5wZwsG9OOupj-yuFmpRvg-1; Sun, 20 Feb 2022 00:21:27 +0100 X-MC-Unique: m5wZwsG9OOupj-yuFmpRvg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NtbVRngczHLpnWc2NCwNlspfEyouFdLhGMqY6Xq+G+8kHBQYEh+wrLt+Z0BenazehWU1FE9eVtFTlwKBmlLl19RKOGzSBd54JxVTzTKhRYkU8Pw39V0vxbg4vkkNffLcH5f6Jcc6G231KJavfx7DgHXPXlX496Kb4izaEFyS9sqAkr8zwXGUMSDseNjOhLXzjf9SzBBHvLMCEodLpRX9fVqJpfv1e9qYw7O3kj8Xz4ZmkmOvsTspjELXbaiIC7jwv9CeWvhtKRSGQtFHnipJxHBTP6Y+LwyEGdwN+K/ziYq8kRiGQJo8ljW/F04zjMPsofkeytyEBSV2MomPgzYmCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Rc2tq/veRVwiIyyPNBhrwigMi4dadOkUO+7tTsIi5rg=; b=jZJv53asWga00xX9Q1yF8jowFDVR6fF0t7m5qRExCq9ctMZjAdr7v1ZBDxhic8wR41CqsImZ8HmUynhGKTk46OGyToFaFVydP6VeAo5Shc0jHUjGzOQtBz1iX4npZfkbyyAi+QSGsgEob/dnnhxNxxCERIXtrxFapHKJLDDrXFDo6kYE9jrodh/YS1q8Yer8adDF5xV7hXEj9OLlLWj04iFx+/yzcSUNI/FM8jUIdSbXPjwOm2dLsXo4SNw65gqwVcqi0i2XTxKPugSK8B87KMkI8/QaK2qAKgSKFXqziRKK2jPy3tbC3IG3nEWuZVCZwdah2q3zqenATkeEsWd/DQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB8PR04MB6841.eurprd04.prod.outlook.com (2603:10a6:10:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.25; Sat, 19 Feb 2022 23:21:26 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:21:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 14/19] selftests: mptcp: reuse linkfail to make given size files Date: Sun, 20 Feb 2022 07:21:29 +0800 Message-ID: <4cc1bafd6d58a743d4cbaafb1ca80b02d71efab8.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0006.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb86dd3f-ba9b-48ce-1e06-08d9f3fe8cdb X-MS-TrafficTypeDiagnostic: DB8PR04MB6841:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sjjTJF9DnfOkmsJHH2KrjS89k3RJO05EJEGt6K8HAvbUlK5M9lRtovFF6NAtnfZi3s25u/yCgz87+fG25DhXvHyZ7uxQh7ivFQ7IfCrXI7NpyDlfzDu09fbTTCwWUJYJ/8UzlBbrjOtwzocjCtA2ytyCvpZfLLDmCUqjdVfVZeZ2JmW97T1vHBq49aRMDQH0SfAjcYaAAYzrOHGhHM7N2eceYxxvshLMBHGL2endm8m8UmomkK2rhTaVuu7dexu/M4bOqKlyXsEW/eWmQVLY0dmLU4ycXtHYQ8tBY0AD1IA6HRlBF0VWsmmMeXvhyNMvsIheXREfqhAD7YYzfrtFVrfmkWFa+Aq7Al5LvK5Gn0X4yV/LQhbaXCn5oXUkTTlUZI1j7j5uiAmkfZtD1jb2ZvsdbRUZwvM7g3lErmj4D1+jdxalhun4T+zBCjnuSylyqZflzJr3kBqXlPCqr61Wci7KpXD+zr6It7mI7sFd6o5Cw7xtQEqHFe0FG1sC3TeMPDQDTjxQZFsSJoAOdgIm78DwjuH3aVdxTWP+hUxVi0RS47y6h3rmS0w9xM7edXoKa5rD9o5yVIlNr3Z//GjSL4pcqlQdDiR3QSdM1qTqvWtqUk8+4R9axea2rtl99tzJyer42EPrTxnmWRJWbbtHkw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(6512007)(54906003)(6916009)(38100700002)(8936002)(86362001)(2616005)(36756003)(6506007)(2906002)(508600001)(83380400001)(5660300002)(66946007)(316002)(44832011)(6486002)(4326008)(66556008)(66476007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?v+hn9CL9zPtNcXmfLDJz5/gFuPg4On1PKtZkYTiLuEpahJJ/Ejiz8JfBPJW8?= =?us-ascii?Q?djFkUf0dSeLEV5HIW7F+FNZlVtvu4XhK6nwWWJN6V9HgJBasQ28iyUqhCylD?= =?us-ascii?Q?D7/kgsC2LmEGKc+I1JhM3Qw/qGhyHZntF/PwcfoQmO5uQd/+EREJUGcKH1Ds?= =?us-ascii?Q?mlmyqDRrGgJgDBwi3Sh19HkeVg9iB0rYINUgaOvkNXTWopKSNw+cUDuJrXgi?= =?us-ascii?Q?K+OqEM8+UQVSHMR5eQ2o7oSlqDttEqpz+1zkYJt8vXaTXGa6Ug9ugH+kFes/?= =?us-ascii?Q?5snr3xKp7xx8sz5qBfi4ziyHP0H12a4Kd3LpZ/XhkpWM0jP+8S8weuNqdJJE?= =?us-ascii?Q?RRz5CLRWQHd/Zwo/qdV2GSP1/c5xgIVMggKEjcF6VfuaGtQYESclSEpZDC70?= =?us-ascii?Q?8KYSeU7gyINL9+iO8X5vxowSXBhMxD78W6QRMJxaVfbJofOxXZOHewxsxtpR?= =?us-ascii?Q?vbgWtBg5VgOFlGFDCY8iPs6HYMUtv4/ypdzlzCSIwZBpAxD6MgjsYYNI9Yed?= =?us-ascii?Q?SGMnLeq/Xo5zpvS6QUeGO4d1pMXop8eoYR2bX5JdeXzj/sNwUiAfXM4TYetR?= =?us-ascii?Q?DCsSuVbflTbNlsjsNkIgXh6J3mcL1V/xXgURix2EGVmb8JY7hEh/u6cmH5N5?= =?us-ascii?Q?kwgN6vrvCjCWBtjebY2dTdPrGIrOIZYx7qBFPtiy/NN9m3TkKvthAjkCkwOU?= =?us-ascii?Q?qGppBf04lwASm+us6INzCc/4jysaWyO4/14cVEUlsV71+DYYWhgilW3ynyra?= =?us-ascii?Q?UPQyEoZXQlhap3fngYsUPDGKpda8Oispkg1vBoc0jYJ7WWXquqUMXjHui7As?= =?us-ascii?Q?18oVHh/RWb57cYFh53YZthJOE2vieCi0FdD7R9iE/UN77rdenJVl46f9f4Xw?= =?us-ascii?Q?CuKnykaIl7cTQHpESHTrK9JkDoQXiqu0hLCtEZ4cpBNN8cmDtiTXIProEDNu?= =?us-ascii?Q?AGf7l3ubE/pXOZu9aVMfaM1O6KsI5Yc+zbWxI4k+WlWOPGKMT62pC+r1Y/Jb?= =?us-ascii?Q?OlWNFu6OrT3XLd7eq1E5ZI+5QRI/FDLX/FQsDwubP13pRmpneAGN4WqrhknG?= =?us-ascii?Q?evb5Jy4tVPncOD7PhfBCytne2AAvt22cAmTnKOCdNTyrEBJA+uV+SiTjN1vq?= =?us-ascii?Q?CwlSDl93b/kP7zRVysY/+249Fc9ddeZ8cTIQty2vtCL7Vl4dOTmmh+x3zDir?= =?us-ascii?Q?aRVd447ISBP39Skguv57nr+PiB83K4wrKad1XTkvF4E5wWcCxr9c7EVc/p7L?= =?us-ascii?Q?CNbxSbuCFfq5/fzn8xbpsxcdtOccVCUD38Ec7EMgyB3um8mOiSl71v5EovD7?= =?us-ascii?Q?YM+dQwhJSiZaWXRbW4a7EWoqko3YHoT0KXTTvrl7bOfu/aIhoDYWYgncNknT?= =?us-ascii?Q?IwRhiXX0loR9DAO3v+kS6Mr9mIghTeim6mjIkxi0fQAGknDqp4EX/1sGMn+t?= =?us-ascii?Q?gW9p0clJkJ/XHNlHDeastChmviYNxo4V3qnpuHqZw8dQKl4YnIKZJTIJz0UG?= =?us-ascii?Q?Gb4oEeImrIztZ8wCrgMNWmqqu6xUFteTYAEZhz5gDS0U3p9LNMNmg+3AwN0J?= =?us-ascii?Q?TU3E+Ft1oH1lSjXuacanqacEShnFJhylDOzU0QrW1m1oRN0ZeBJdnumOj5vb?= =?us-ascii?Q?0Rr01Fu5NBiWS9mByLi1EnsgsO40hG1utqUwujwR6sbOZrOoxNea4kZIdBT1?= =?us-ascii?Q?ZC3qXZxoX4aY8c7+x3s7ExkAtBQ=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb86dd3f-ba9b-48ce-1e06-08d9f3fe8cdb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:21:26.3017 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pK7bktZvmFmQyd0oczioHHNT1XkTl2JJKZGaUWyYZQ4R+lDiQHfDtFMbji/1He9pPcMndA6JMcvHemKpjFjq/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6841 Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../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 4ce578fda369..9a9e84cc3917 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -530,7 +530,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} \ @@ -550,13 +550,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 @@ -716,7 +722,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" @@ -761,9 +767,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 @@ -776,7 +791,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.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798216jad; Sat, 19 Feb 2022 15:21:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJxFB1HF9an4Z2I6PBQwTgv9NiDWg/1WzjJdQ5/oa5+uEclq6vDK6UF/8EKOGM3AyxnhDj0f X-Received: by 2002:a17:906:30d1:b0:6cf:d160:d8e4 with SMTP id b17-20020a17090630d100b006cfd160d8e4mr11301623ejb.265.1645312902056; Sat, 19 Feb 2022 15:21:42 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id fz1si8223557ejc.338.2022.02.19.15.21.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:21:42 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3898-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=@suse.com header.s=mimecast20200619 header.b="EAG1b/hD"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3898-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3898-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 15DFB1C0C50 for ; Sat, 19 Feb 2022 23:21:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D944A57DC; Sat, 19 Feb 2022 23:21:38 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 8E14757D1 for ; Sat, 19 Feb 2022 23:21:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/j8VqoE8G9g4aIfJKCZ8Ffc9EzHMYvDKlF51l76hz30=; b=EAG1b/hD+IY3IYCx+8RTuGmlTSNo8/WkYCv1kp2rKmGCha1mNrIyCZt5Q6LCjUjbWUAweI guZiQhPxi/X0fTvMbbh+omvKUU1ZXA+SgQ0LbQrh5CKmocM6F8Sk0+eiBeczuQ9vGugxaF /sib/qff2JpwWPoVmKPEzGqA8agiObo= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2173.outbound.protection.outlook.com [104.47.17.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-38-HWX3AFW7Mba-1iVRIwlirA-1; Sun, 20 Feb 2022 00:21:34 +0100 X-MC-Unique: HWX3AFW7Mba-1iVRIwlirA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kHkStkYsew9aoCOAYA9Eu5nakxdHqgKJXmEVGeglISJ2f2BFkcK7QcdoNq06TJODLkiytSrzTBGkV+Q6hjiXqmXevPFIShGmjWkipNOjzs5qQsq7aOtrdrPb7sZdiviXue0Kj/75OsSp2hxVX5G0by1uVz77t58Sv5hAHWoqBT0gUXL9SSQRSV4O6mTfvDDIr1CMEIOT7l5TMMKQkSnlfOhSdwG++hlGd3soNR90HnnkFpb12necMRvLtRp7lsroF0FYd+d3WgD0pJSUqsMU8oXr7ueWbvyR8YTibwNyMrq5jdPOELMRQeCR9sQ/ds29N7L0U6ZyII63AcOZJa9Dzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=31B/CTJLVc7fbeCmskwdV6udz5I11M7YiBXiZ3Aqlh0=; b=aOmIyVGkepEubWnutsy+8MdvEiCyZHxdsx3sxl+40kBl6XO/YwkO/lB9Ehz62rY73bZhyKvpjtx6bEeouIV+BisDVEtj4gqfeqSrR8sE5cgvAh7R6Du+UmGqI4brrinO/12h0duVYTYb6q3TZQXn9xoU546eq/Twu6JPHxvGPzMs0Y6q452tOum9gBWFkaTYEXg1tomSNmha3uCokg40ghxqVbc2z6VN++2PK2Mk48MTdPHvaqLI9kZCHFYnTzivsfZYHlxqrP2Bj5qfLsoRFcReAczWlKFomXvTCjCfy0qHEiH6UV1KvqqPahn7EbdnoNjOk0cl+OUeWeRixJORvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DB8PR04MB6841.eurprd04.prod.outlook.com (2603:10a6:10:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.25; Sat, 19 Feb 2022 23:21:33 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:21:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 15/19] selftests: mptcp: add fastclose testcase Date: Sun, 20 Feb 2022 07:21:30 +0800 Message-ID: <34f3d3a75f2ec735514da220046dd7b885223407.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0004.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e9375940-88cf-4d4c-60ba-08d9f3fe9102 X-MS-TrafficTypeDiagnostic: DB8PR04MB6841:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6asZP+L7lZi7P/62h0y7ceng48xecPC/Q3D/ORdQ2pN7sQJ3TmI4uXg1QILTDXjYFQ3mw05Ta152StaurRxLuRtBct1/e50GKCOMEZyXzSNl2miWUi71hf7oQNIiqZo+VdKp/TBtvnhQ1nMsURW1fRCsIc+UVwJeVfoOlipezskToKTazCdeynHyndElzPgYWD1mmK/RPH4q2/pmdijhIEAfb+ZnpQrLhp5eBdSLa8ALd0wEnG4bexS/H6zmTT0hY/NiK5sg9cvylFvdCjeyiktO42llfQVHoQs3Jb+amRKTFQ5hJrDYCoP/d8NkyFuWJMmG0/mfP3nL9N6EZ3n5CImkxA6NdNFgk6AulCemzt4jhc3IAcK/eIj67xYi79amr/cBkYyjiVDq5Zq7A99IxuJnHsMRJHvrtyXOIr+/T2XRTQu5FogZcVd5Q6qR8gnUftWwTemoGFtCdncLggv//OftwrVfzwmZNdpc9Z+BIQi/qvz3wHdkqjg61zd0o2G2UdE37Cci1eWvO4X8ZenCJ1MLeeXtpz6ugrjpLNDe5qTH8NlVD/CuugTWU7kZA9nMj8BsRq8QWO9jYdZUwvFDagND0Kxlbk+f5MLACfjmlo1cxpuL8fTgSA8G4QdzaUK+SsEZzZ9SYJ0NvsMhlgPGzQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(6512007)(54906003)(6916009)(38100700002)(8936002)(86362001)(2616005)(36756003)(6506007)(2906002)(508600001)(83380400001)(5660300002)(66946007)(316002)(44832011)(19627235002)(6486002)(4326008)(66556008)(66476007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DFyrTTheJ+vaeAFDvIEoLIl7zQECIJImVdi06GW6S0XnbqlTJH3AEEnwlPrP?= =?us-ascii?Q?lkHXut7Ze/0Q8eQEAywopZvYUzYg+AwO1LkL6b0wX3wiIrIslu+G3AqiXbQL?= =?us-ascii?Q?Sl/0+pBq/79BqoqstzN1Spib8YrgSLg/ts3Ai52FM7EpdKvE+NNpoI8g0Y7e?= =?us-ascii?Q?AHU2GRyBgJjELyfpL92V4bMVQ8Q7HfB0SupsAV4//7Vy/9JsSZAv3tXlC6Cq?= =?us-ascii?Q?19rdFTaoNeLZ5CyRkLQil+mPJwag/7yLwgO+VpKH5IVP6V4X1R1q2bvcBe+p?= =?us-ascii?Q?7Qbdb9WWDIw61syvWwui/x3NujnwX0z2d22EmMRyWma+vrmViU8ehpruxWL0?= =?us-ascii?Q?kxFtBn+3PkOesKrUGc9FzI5bPF04/FxorXoxjKEnXOJuN33nuen5Ou2hmPNt?= =?us-ascii?Q?aN+Nxtr/l6nU5Tq+DVEyUr4+eWCQrfppA4iTXPPcTYXkPm+KMC/bz+D2U4iU?= =?us-ascii?Q?rkfhDhHVvxBuYBUEdtcsYX3xLAoFhQaRtdv+aBixdrK0wheXpoEqlArfSHqR?= =?us-ascii?Q?imdBn0F79ZvwstjVSJaMQQRnaV/T3yVArNMu9Wzb7bn30OcWNDZseokJKPKA?= =?us-ascii?Q?Rg3/MPcTQGq70DLpK742Eb/5GBT73NEyT64JUqczUn6a8PZr3iSDDnDXt/f7?= =?us-ascii?Q?olUnqeRZdnStkal6XJ7Vbt30BFQhrebGxcJIavlmWVfZhxv9xovTIv+QMD5y?= =?us-ascii?Q?fTf7wqsIg7G+hF1fj+xFlWj1DtnX3zCvkThxOObBHJL6Gq2LTgJeaHTzsbC5?= =?us-ascii?Q?H1ve9bczMd8fgwPSFMoD3dFwjlm+qfYjrcjbdnYPT47LhREiWXzt26LjBCW1?= =?us-ascii?Q?nhdSSz+n6RucJf26TP/4BCr8r8yPG4hQgK7wa8I340kulJGYBxd+bdDevQTP?= =?us-ascii?Q?foB4kB35jKBU57w3XgrrZgqGTawXzkLTpPeOHUrSxuO6otASFfI++Eb7hl24?= =?us-ascii?Q?GKe2ukirRoZ7U07SkO+SobY+M39eA0t/DLpyF/SxXwwMX8Ch1xiSSn6n/nD8?= =?us-ascii?Q?wH2sTeUAcj35u/e745Ks3MbCbcqmWdDepjOwoujd2hy3PkLAsTedh2lGtmSO?= =?us-ascii?Q?bCHUzi75wcJiDhhHFw5KoMhlnBo708vTsCb495MTsnX4PK6lK61vsTqrUJEk?= =?us-ascii?Q?FM7LBmtkHXkxN0K5GRV3ogJ27ZonBKjqVzaiGlrMAmafCZNzIqt/6sdBAMMB?= =?us-ascii?Q?VF/CidCFbFr8KC287mi9WfReQ+XQoeW5t0wC5cy3MVp04EFOkyDfvkJNyaIv?= =?us-ascii?Q?lbf0S8kX7nvXnKSgryCZCe7boDLoziP96hcQBX5sDJNc9y6Qv39JqW5LpaUW?= =?us-ascii?Q?qFOWpZxLQ4b2IAq1/qdEaLWpZbKAW7q0V81c83cOWTC1Ok6Vqvz+WDGZrwfg?= =?us-ascii?Q?NTQyCpY0/O7vCPcljWEXatafT5thZfj5BFmNDvFJQLMo+krH4AkEFeQMmQ4L?= =?us-ascii?Q?6uBHoICh7aSBaaIvyXX0Fattn6m0vufece4sxkgitKuVWUBOCFASwfIsP3eN?= =?us-ascii?Q?nL0lgjDvH3WPc8yb75dXt40ElqJRqlKasEnMoW4MGCuWf2mTEPNE2RvfyAvr?= =?us-ascii?Q?EprtrV4wwp3RGHCxQyqrKJMTDdUOl2o29BcEjUdXPgNqrM51CZKzp1YF8Eyg?= =?us-ascii?Q?S/iipVo3HbMm4cZMPpAt6I3OOsrIaUH/x9AEzOZX6uCjxlc59PidQfTnq77N?= =?us-ascii?Q?fnqXHdHyh4O7zxJbzP6sX7jNqnU=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9375940-88cf-4d4c-60ba-08d9f3fe9102 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:21:33.2699 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pTRURDTSLQEV0w0Kpvd7GZENlh+RT3LzmVauyCh8XW35srO4PUq0czgDgylaPHhRp4RvUKZPhpnCsAiZDPgmNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6841 Content-Type: text/plain; charset="utf-8" This patch added the self test for MP_FASTCLOSE. Reused the argment addr_nr_ns2 of do_transfer() to pass the extra argments '-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 Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../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 9a9e84cc3917..8ceec91933b9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -523,6 +523,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"::" @@ -2400,6 +2406,15 @@ implicit_tests() wait } =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 @@ -2419,6 +2434,7 @@ all_tests() fullmesh_tests userspace_tests implicit_tests + fastclose_tests } =20 # [$1: error message] @@ -2447,6 +2463,7 @@ usage() echo " -m fullmesh_tests" echo " -u userspace_tests" echo " -I implicit_tests" + echo " -z fastclose_tests" echo " -c capture pcap files" echo " -C enable data checksum" echo " -i use ip mptcp" @@ -2478,7 +2495,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchCSiI' opt; do +while getopts 'fesltra64bpkdmuchzCSiI' opt; do case $opt in f) subflows_tests @@ -2528,6 +2545,9 @@ while getopts 'fesltra64bpkdmuchCSiI' opt; do u) userspace_tests ;; + z) + fastclose_tests + ;; c) ;; C) --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798285jad; Sat, 19 Feb 2022 15:21:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJzaoRr79ld97j1NF8NiKMwUpdYlmZoUNbjfNhrK+/8Mum9fh7Ilo1v8J16v5PCnzyVox4am X-Received: by 2002:aa7:cad3:0:b0:410:b188:a49a with SMTP id l19-20020aa7cad3000000b00410b188a49amr14553613edt.416.1645312909898; Sat, 19 Feb 2022 15:21:49 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id x21si8105851eds.34.2022.02.19.15.21.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:21:49 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3899-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=@suse.com header.s=mimecast20200619 header.b=MF9ncjAB; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3899-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3899-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 2DABB1C0D50 for ; Sat, 19 Feb 2022 23:21:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C2E6757DC; Sat, 19 Feb 2022 23:21:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 818DA57D1 for ; Sat, 19 Feb 2022 23:21:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jzwoyUlrTCNgwRpmAoTgdK8CtpMZ7TRst8d0VsivqJM=; b=MF9ncjABOd/7t4QfFeEeOJ/b2Ca0ON7xBFqW/150JI0ditBXLhiERG1HFFY8rCOQ6AwRVe rmFsVGjYsVoIdRyMi2lUPNIctiMwCLAIYb0Mr3ElVeE18fNMnb5IGqQzUBD+CK3caSWRe4 zrsZgrW93VwUGH+0fLgwMsoJuL1Yilw= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2056.outbound.protection.outlook.com [104.47.5.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-41-HD264u7mPTKvDo8FuMLX3Q-1; Sun, 20 Feb 2022 00:21:42 +0100 X-MC-Unique: HD264u7mPTKvDo8FuMLX3Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kudE8We76Ts3OaC6jFDIegUbwM6ZQJIFhm8kYns7OPP5VQHv3AFnKuIm6DAWzqF60Kq+5SFej2ZfdMbAnlkV35DaYiS6jQ+RGkmq/yDY40og9E2zlTw2l49TmuT7i7AX+8Lb1WcjfSz2cNf9xIGWaO6y7qKpdYsyE3C4YTe5+bsXg+d0GZQauWu5nkC2v9rWnjX6Icqq4NmzP0wTk28pl5Swv3DHfdP/eGAzVEkW+0RCEYH+RlYwHCIEVXLALwc1oWL+kxASMY+VkSf8JZ7McAPu6p1ybXe1Z10J1+iR9wQ6S8tQg5ZR1qtWtGKZn5ZuGrt4vZrb4MJhzz2HGSRU7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8jM3MBWbbGoYH7Z9+mX7s0PK6V5kNmwNiJpVickdZ90=; b=C2lYAMZ/ieHvdLflAKB+4WYxvDTQBQowlcinOgti6hs19LBHG+IRKk3LBMIHLQKVR/khKkkAttFBboQkt4O27O0Rx7TGYW+PuNxs9IPIdg5PL6T1CydEd1C1ZR9cq4d2iVJZQD1YMTP5dp0MdbFelqUQPN0fn7UqaLQ8AlxHh/yP2ObMQNVGmZW956/5DMMR1YD4e9dZJYrUt0d5qGRjWT1s5Fv4w0t7w+gdm9EpytTeF9lpl/OXvJCj33fSTzubreUPNImXWEo/wvme17YRdLCHw27umlCHT+5jrrZaZx9Bc4Uc0DSUdxL1FZxCz5ov3i7OgKdM/TPJLICw9pdvXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:21:41 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:21:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 16/19] selftests: mptcp: add more arguments for chk_join_nr Date: Sun, 20 Feb 2022 07:21:31 +0800 Message-ID: <7ef5338fe9c9720c8074c37f65d30a517e69a1d2.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0018.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4aa55689-0e27-49cf-9913-08d9f3fe95c4 X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iVcmjrlGeyDzCG1Mzxvqd3M0UEMsjOPC+17tkQOvAoDwt2T8Pi37axMEAAdKIvClzdOBYsU5MSScsYTDz/b7N74aKFoFvxw6SC/010fOHHkd18H9tHArSrYlosxEeb9ep7VUL4PrDVMl0x6EYEoiP8Uxb1ccnXGTsHRYwg1GQcWf9KWC2SKUg7wiSV30fKZqL1W/TUqI2S7IKKp+rb+qNNrt/tmG2datC0ARFRrFaR6jjK5OYaSEXyF+LHVFq3wIQFVakKyOIjK3PodjXKvjzSGR32p0RxaUYFFbLS4kwb71lL/0iGtrqeX7NnT+52YwC12ovGIepUV/SIN6xhHZITlsHI5gmvjlSJ/xHkrPKnceG3Idg/kanMJFRDncswy8OsF8m8YBnaCjzENNqe8r8/EhyCESGw/CW5xmlwo9XdGhy5zRspyC1FSFEG/ZTFEmR2nfAI+64FJn+2m96Y9ZEtKks3CzBJ3tCbxuYeiOyEfb7xlpY5HcGvbrHG3RX5RHLLHUd1keHVHVrGEAq5cnxJZ07cS29TlzmPeM98cCT/RXuY8wtRsE7rNc/PSFfmBEJRNJ67JIbORGYPhZleIjEYlv/XX+c91qyAn9WUPzQ9F0YL9R1OjaQpJEmyl5vMEiaeVzbtsTjFapbTTLuOov1A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(44832011)(66476007)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(5660300002)(54906003)(186003)(8936002)(508600001)(6666004)(2616005)(38100700002)(6916009)(36756003)(6506007)(2906002)(316002)(83380400001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uy2kIJJdlcR8fPZCYAV3sHiOEPyAb3vIJpJBFY6j1fb4VOGMQSJm9wz4NdLK?= =?us-ascii?Q?vZ+85heD0Tdu+1kGX0MbeukOijaJAemcigsiJtU28XUa+zhiem2756kHd9Wc?= =?us-ascii?Q?EB2J+rWxOQYyGi+e2ZtN/glXMVr87BbBorxMzz0rN3J3jzehwltFkNMJ+dx5?= =?us-ascii?Q?4gy0vyRCVUYJh0VfvqfMv5hq4pFNEGKxGnxd68bJ9r6f1qaQX0UkgkukmDkx?= =?us-ascii?Q?PmXb8/X1N58ZewjnlQ4PeQOwQHL5CVGOiLeUdYeBkLf0i6+4vz2NMQxpNPaK?= =?us-ascii?Q?dKxR5418I+SU7vwLIepazHw9TZNBeyEVsQ3WIr+agb5g0GBfcUULZhNI64JZ?= =?us-ascii?Q?5GqmscN3of1VKCR++G/yhe4mZsI1NUAbENiiwMGdseYgXG6gamJ++fJ8nXqO?= =?us-ascii?Q?w+Zh0wwAjgoEG4/y/pHhel7W5+E7rejsbfNpHiu9jmH8/021IB057YGHSYiH?= =?us-ascii?Q?3rw722kYL6YExfJORtoi0JlF3jNDJOPW2kEdMOvqQc9yHQyKp6snWQ/kWxlZ?= =?us-ascii?Q?rmpN9FZXeX3W1M7xGtM1C3cryfGlQbiKtUFSW8ZCqWn03PJNZ10LxhUF+shU?= =?us-ascii?Q?bJCYlaJhUlR/pIe8sk6XBTPDtDGU/vzSR8heXk4xx9K2XPza1Ayf/Z05RRzh?= =?us-ascii?Q?HZySGKQTclwwDhAgZQPytflVQyYS4TxrvhkAy8rwLGP2qo4DhW7HUhMhXPYS?= =?us-ascii?Q?2o4WPMAyaddyB6zz4KCfensMepJiO/1xbTGrseCFXJfx8h8TGItA7i3wWPnr?= =?us-ascii?Q?cmmGU+JVz3qxI0fITdVUUw4hNFG/sVWZ+LXNEWVxPudYoJP+/eUX+2Q863gQ?= =?us-ascii?Q?+sdLKthb/qCdOdXI4qmS8o7WYUieCTA8vkzejDiqzkeI0qig5eZB2VdeSt4K?= =?us-ascii?Q?Nno7zBgrGINltSopYhx3ToVpW5oKrUzKWU9xG0R3QFkWBOBUZxSvXXr/jQDt?= =?us-ascii?Q?Sca+npXQTM8wgDAMF6qzc9X06vhOYnloAa0HZStS6G7YyjPQWG02ZejBxNTn?= =?us-ascii?Q?LbtEsE4y9CT+nsS7HBM9MAU5zSl+TXF3LPlDb9k/38yEgk7I9a8CN9j9Tnf8?= =?us-ascii?Q?e6NzJwoF9aKu4MiMJaDxu+RpeuJB/ORdiMDtuzuKk0H4GVqpqYxqlvUVZfVn?= =?us-ascii?Q?dmfmQEqvVWrydKLrk9k+60BVhiWgutcgT+SDeko8hFuPSPhf+i03gQG6951I?= =?us-ascii?Q?2W2MtQAPra2xf68faxRarty2qhJkpfSrHnq+Pd/q8aN/fMR8A4BjksuJZe5B?= =?us-ascii?Q?JUFfZDRAgS71l9/1AMmP+XC9ElJMTblUvKIUzP0724WGRgPz1H2IkDAhEYNH?= =?us-ascii?Q?iqcqHvnZPPKWIz+Mh3ZEjdCXh1AnmdOoSJqEDCpDG59OdMguLyLxuPJ0k7TI?= =?us-ascii?Q?wO4zxynQS+lw5vZdrmP9picL3uvNMnJnq+AVNORFPAEjj1U1276oBhBRUyws?= =?us-ascii?Q?TMm//w0RSA9GV/W1gPg4o4fvb2TC74EeZqUvmSCj3jNIKrYwgGPuwJu/BihR?= =?us-ascii?Q?RuiHUwnzu9IUaZYcijdL6U/oLLCtOynYxw5x7AldOlzda8OvZ5ZJ9riWGyJ/?= =?us-ascii?Q?7ondLorpAFvl7n7SqgzWG2pkkkqATDRtLK24ABltvUcGTOhZri1FbWM1n3NM?= =?us-ascii?Q?qmfm0/W2ivg1dkB49EwytfrE5noRJ0xGiDfpJXLdN/PEcJkanzwsql8JgN1f?= =?us-ascii?Q?rx0mdlQB86woqqC4nTBu7+IKiic=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4aa55689-0e27-49cf-9913-08d9f3fe95c4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:21:41.2380 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fIwO93aCo9i6LxWuXwUYI6INA3zJQhc37GLtzXH9dHDfHo1fAT6T84AWEg/n+CoJnLezj0N0LQKLqggTOIE5bw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" 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 three, fail_nr, rst_nr and infi_nr, are passed to chk_fail_nr(), chk_rst_nr() and chk_infi_nr() respectively, to check the sending and receiving mib counters of MP_FAIL, MP_RST and the infinite map. Also did some cleanups in chk_fail_nr(), renamed two local variables and updated the output message. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 50 +++++++++++++------ 1 file changed, 35 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 8ceec91933b9..310988a8acb2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -828,8 +828,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" @@ -839,8 +852,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 @@ -849,8 +863,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 @@ -861,27 +876,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 @@ -1005,6 +1020,11 @@ 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 infi_nr=3D${9:-0} local count local dump_stats local with_cookie @@ -1051,10 +1071,10 @@ 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_infi_nr 0 0 + chk_csum_nr "" $csum_ns1 $csum_ns2 + chk_fail_nr $fail_nr $fail_nr + chk_rst_nr $rst_nr $rst_nr + chk_infi_nr $infi_nr $infi_nr fi } =20 --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798314jad; Sat, 19 Feb 2022 15:21:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwI8VMS7JuslwaTg3uiYQG4uSZQMZM5EtRPDdPBB6EQG4pLL+4AI+oX6kjn7nrLnrPEJ+jX X-Received: by 2002:a62:7c11:0:b0:4e1:7ede:9ca9 with SMTP id x17-20020a627c11000000b004e17ede9ca9mr13793313pfc.84.1645312914622; Sat, 19 Feb 2022 15:21:54 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id bd13si15000262pgb.754.2022.02.19.15.21.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:21:54 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3900-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=@suse.com header.s=mimecast20200619 header.b=eR+kxzWQ; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3900-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3900-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 F22533E106C for ; Sat, 19 Feb 2022 23:21:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1E73857DC; Sat, 19 Feb 2022 23:21:53 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 C362457D1 for ; Sat, 19 Feb 2022 23:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Mh2tg507qcJCqZnIHi1UZoLJ1hU6HQf7cDsPiNFkKtc=; b=eR+kxzWQMvb/qeJJFBtLAIW/s/QXFzz9xIczIqiE8p50onAgBNVaj3/9guqkVXK8zEerkX O7eh03F/ABZeiQELzVKeHeSBRfzeTVGoC9A2GEbkYbuya7Qr0A9t0VYPTtFdMRAFeowRsW aJTITG2GmQmNeMXHD63UkkovIrLlHbw= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2050.outbound.protection.outlook.com [104.47.5.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-41-n7ywSd80Mfq7HZ5ecExjfg-1; Sun, 20 Feb 2022 00:21:48 +0100 X-MC-Unique: n7ywSd80Mfq7HZ5ecExjfg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jm7klxH/FS944YE5vUaLu8WQqzu4IDQnrORa21qmxK+3ScDzeS6BRl/SkAbJKjlRYL1jWx+j/HFaJkNgK6HHK0q5uKObfv9irWvP4KqElOHnfrA5w930ksMFXZDTuVrK4mTdwYFuBCnJ3Jiph5VhDR1RD+mw++AmdPWz5bbzOAc+WyIrBrXpe5f5bR3bBM7ZgatiUORD1wjsS1QUCzplX/3NlE4VfHOhvwNykvyN0vFHP9x022eeOCG+sQBDlx1HidMPNUBOqtKxE4cnytHvvrZPcnSfkf77dBr+arOar0neVOEgeyrifWtil/3e+34J/QoGbkhIFQJX0MIFC+xU1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DhT+R7+o4Yg1g+hFec7xcA+EDCmgGyRfjLfB6Sy8Ddw=; b=KWgyGHowOP0Fng7RKoAqYczYdhYw5HydTRqj4WEJIh04z9vdkIptYpiJyuXUk3wYZYbYnke5yW4N6hHPr2TZZIvDXFzN7rV7cdrh0+Z4Vm6stFXec8dtyRNfHE63ZqMfELYaHvfe/CcCL0PBYwIuZji/yvxTZXRi/WqsV5/r1i1nK1Rrt6JVjKvK4jaRiD7cMW690H//UAcDWEBSFXPJaI6pp9geEG41HbHZSIfjWp+mjd7DprxvluItWHm8fjPvUezlnZQ53vtlSSyZUOdnis51iai1s0yJz/DEcJ9vxWBVHHWTXLN1U7CRp5y+Gyp64t5l8XM8ujuRon8mfjmRVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:21:47 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:21:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 17/19] selftests: mptcp: add invert check in check_transfer Date: Sun, 20 Feb 2022 07:21:32 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0058.apcprd03.prod.outlook.com (2603:1096:202:17::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85d96033-4693-481f-2fe6-08d9f3fe999d X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 46adLUWCjW26FRWoXqdH4DLeE9I40wQzNTYCebYmVD4wGfXxcon4ov/HLsXbxEof3whzK7nM9HVKst/yEbVP1v4oJaDWgylFOeKhpIsFZBDkvI1v+PcwB0wIW3tgKkgu/0/Uo3Pdx7Lkce7Rsgc9u6nJ1wvhzh1w/VWbG6Dp7G+8LtYuodTa/J6B3i6qOZExDE5z6qTHchsb58bwMH+KFotWI17ShzXEwFExEn/bWgbFEiP6CTV499Ell051xjo2yA6aZhcZOF3GtghVJdUon6w6Oq6LV44De2fPWGQDuSL+JLQJqfGDI2Zw7CRlMo0330mCHEYUCJtWwmxD/0H+HjUVTK3xx2uRltMok53M6mqEpLk3ipo3eG6kCYns6WIKnNPSA7fNCBJE4AOS9E6+GgNqxS8I+YrCCUd4UvVJS2ztvLfN/0DfdkoWx8cYY7AmR9fxdz2J8pA3cOWVLT8JFqqj6e/pX74o6K1AUE5iaGmrdPDtVptIHGtFdIZQ9SEae2Ibon4CnXJpZ9VfpH92i7r/5SVto45ONXfzQnM1K3F81rI+mPOu6Yv8k1QhQZozaZs3tUDYkCaYsU07Gj1maaemcRJhIxEq9CO7VfN+g27h451RMKuErKBALIHXQSVMP5bBkgo0n1fakawYtiOu2A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(44832011)(66476007)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(5660300002)(54906003)(186003)(8936002)(508600001)(6666004)(2616005)(38100700002)(6916009)(36756003)(19627235002)(6506007)(2906002)(316002)(83380400001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sxnerI365h5AuxOeZBLnbeTDKvl8za4ed6Dd6kAsnorOERIwhoqXtn/TXFDI?= =?us-ascii?Q?x5rINK6O5tLlK9K7vCuqaBqwLHEhGPLKaPlkXP4Jf3l70O5RsRlk7S140ORX?= =?us-ascii?Q?efW0wOsJC1G/5qBbApNC1r/RcYWiz70DGqhE8UcYe0L3w56RGNQbKbZWuCIP?= =?us-ascii?Q?qg22fi1J+ExjFLPlJpsWD96rrHS3G1WCVlUeGulcQKvf3Cou/ScXkiAbnAtC?= =?us-ascii?Q?n+b3KtJJUEm/0Un6BByhTp9NVnaAfsePo8GXpNwy7inHoDTg33q2SP2KsTnQ?= =?us-ascii?Q?S4rLrPQMYKl0w1nR5x5EcVep1CCFAvQ+uFJdku/VTyTgOa7MTOQafTYoI188?= =?us-ascii?Q?2Y4b4mHQVr1yFWIctl8q5jKJgifjuRWN1cticSBdsQQqCHenJG1VK0dn5vJc?= =?us-ascii?Q?SHwDqa4txHVWB+kABL5JzAgTBeiJYqlU6zji5wY4GpHh8RBwV8O1FWzq8XgQ?= =?us-ascii?Q?mIwibSDx1CkJat+zS9To6q4K5aX2Ok5jCmLeRaptFcn5E5cyFBBbzRaWpoOm?= =?us-ascii?Q?Luv3G1YaL2jrHeIy9a1VKgCrF5TOygi6zcojVsOTvlDy1yn/7v5sWzlZQ5Mp?= =?us-ascii?Q?IxNxZ5DwP9506kd7NlcwJ/VTPj1z2oP7XV/+PZPBaMR7XuPVTUjqepMVmeJ0?= =?us-ascii?Q?NR6eEWsqgpav9F1BxkZ1OsbMoxUZQbt0epvMfC+6/p35aDjNwSucgjuJRQ2E?= =?us-ascii?Q?RP1jcyVlCGYp+597DJl5/M6CnocYpBgedko4mGwbQufkBySlGcR4f0ixJ5e3?= =?us-ascii?Q?/PEODdtt/Hr/fYZHTpv17HTvHynyYA9Kl40NWXzI2onWNasU1pZ9VKmHlA3k?= =?us-ascii?Q?Bf0UpNLmxJnfsBJxdQgWYM3v8ybCLXhghJQp8MNQEIXpxxR8Cfhp7O7Fd8N2?= =?us-ascii?Q?6MJKcbENrJ27Uu0XIANgSsHdeBqjfW9JxJ/JzIzAO1gRcU60md0MolY6XA3h?= =?us-ascii?Q?1Uo3ngS5lb4ITWeVgPysuHuX7gTEwRW65GV12xEUZAJACR6WFJDCUOfRdSr2?= =?us-ascii?Q?vRIgHoGLk3K2KzYyvQ/bCRHtg/pLrWXKPNL7RfRXgK+V/XXnksJ1hSu7lV5n?= =?us-ascii?Q?BX7uvYFeait38GHm5Eu3u1xWjf73dDTvgLDaZL8waKajONrHB2vcPHBbtpW4?= =?us-ascii?Q?iaUOp3p8WVcceht8XdIvXqndIZOJd3cBUpcBTuCeMTdbpW45suEEWzRZ/9Wt?= =?us-ascii?Q?ACgEiBkNab+LfBBjSHJ5GX9mOXmM8RIpOKxgnN9HLWrxOrvPqkQGDGL7mHFS?= =?us-ascii?Q?sPgnIF5niPLB3NzN3VsoYXRqcH4IhIO8j5PxuOmTjsSWV7paXxlt6mxRHO6A?= =?us-ascii?Q?dhDSidOmjAe5o9KZ/oQVUPDBhwwKcjZDwPjFbl761X7fziXifWQAsVMVyFuz?= =?us-ascii?Q?YsJlSzrGe6S2TBSWD8Os4+ASUYjLErIXiYz7YpiEde16NhzSMYBc/tUqJdOx?= =?us-ascii?Q?VLI04hwi5wIJqbO8oVFilZvLOOLkYynaOfnDHUkXhfbmDw48c95CCjNBTLox?= =?us-ascii?Q?jy+J2DzK7URGvosIzrWyq42SLryGJpiZPfIU+a+58Bg5Drz6aGU3qQeKARcA?= =?us-ascii?Q?qV0/SALhQ69rhSr6fx/+MWKj8IuT6s33a1lorfmd4cglFfF+7UNFDhfnG7Q4?= =?us-ascii?Q?gchCqz7SqogQV2qTI7QeZnERp42EllXB0bxUaz9AYBtMZblDJ4k4NWkaxVoJ?= =?us-ascii?Q?gFGdFGICfjA91TPzwgHjnPod0sI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85d96033-4693-481f-2fe6-08d9f3fe999d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:21:47.6906 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7lyC7ign/sAan5bKposGCvdgibFWZfdetLuvnrk9rEwdUkL7tvNNc3wSY8dn3qBfXSHxlMC8ym6Gcjv8DokI3w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../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 310988a8acb2..f33822b28058 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 @@ -60,6 +61,8 @@ init_partial() fi done =20 + check_invert=3D0 + # ns1 ns2 # ns1eth1 ns2eth1 # ns1eth2 ns2eth2 @@ -217,15 +220,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.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798403jad; Sat, 19 Feb 2022 15:22:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfilU3a4JU1IkzLJiHRfMOHR+SwoeXaKELzXNYrj41jyvGO11ZQfakrOVrgTI7I/LEUX0q X-Received: by 2002:a17:906:3e90:b0:6b6:829b:577c with SMTP id a16-20020a1709063e9000b006b6829b577cmr11660231ejj.711.1645312924516; Sat, 19 Feb 2022 15:22:04 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id 5si10261782edx.155.2022.02.19.15.22.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:22:04 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3901-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=@suse.com header.s=mimecast20200619 header.b=HygsMHwB; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3901-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3901-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 961791C0EE5 for ; Sat, 19 Feb 2022 23:22:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0FC0057DC; Sat, 19 Feb 2022 23:22:01 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 553C857D1 for ; Sat, 19 Feb 2022 23:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wJ56PYOxCQQHdk2Vc2PM4dX//ecB4QJmqINqA/XlOJ4=; b=HygsMHwB+n1lll9ujCw3wya7vtFkyvO467diA5wicJ6ADWIy4GttCESJuBejLH4+N6JvgX ZI4fgzxu5i0gCf0xyMSP4MVVsbxCMlfb4ntD3MJ61095SzAQbRQQsqDjKYcjKV94gVERD+ HoR2QgKEQ3+v5HxM7qyTJMd+Nada/0w= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2055.outbound.protection.outlook.com [104.47.5.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-4-tH3lcAu9NoaB5372RjeDHQ-1; Sun, 20 Feb 2022 00:21:56 +0100 X-MC-Unique: tH3lcAu9NoaB5372RjeDHQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ezog/7oU0GD1B36X51wmZh8RBmDAv70o7cFuQHR4gtUJtQ9pfsA0CmzHt768tNT0cQR7l4KiETTVEUsQ9yOFR/5Mg8Xlw+lja7lKBoDB9DE+MKs7GmiwlZ6udKWk5jcGTonCnIzG2wgYww0RneTmCugWfTzTvPY+vLcPuUPrIxOK2FT9P/Ooa62gBeJM1rHX2Sy91zfywNGbt3VMP+vzLPEcm0IhajcuoMgNB732AlqCuwUidExbCNSodUsP6mHMjUKnC68W8KWWlqyFXoJRoD7CqmYnfJexyg2ZR+lDxZ79LHDfJYwfyAPQsumORMS1pgI5sOBuTsT8vdPmLo5YxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+z0fMgpOxW0+ManWxJ7xy1bfqivg+k7dPNaCWZTE5v4=; b=luatMKPorFPz5dxvsTiRj+5w8XRWHF9NRDX758CZKgVtVH1zlNHLyv8JijifH9EKatoBTtVwdEJPcKQsH7i1dGnu8NG0pGlSfk30MgbOA0v/O5jgDqeIrwuczDWzUkbqnHUCuapShjB9QAxMxTSbXTt6KPEFdPy+Y7IDE4bR4s0rA3pXknchdVx96mLEDpE2hDlFeCRgB6Alr9XD0kFzzKSRPgVv1pRjHJkOECQPhEn9Ti5D8SsRXZRhU9pJ6G2LpTkaJgffUIrPU8toy7CNR0PQUgaFgfCGD5JEpxvb34+AFfgSXF7s+lhjzUwZfsC1ykHm9fwJu3IavnnDzCt2VQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:21:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:21:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Davide Caratti , Matthieu Baerts , Mat Martineau Subject: [PATCH RESEND mptcp-next 18/19] selftests: mptcp: add the MP_FAIL testcases Date: Sun, 20 Feb 2022 07:21:33 +0800 Message-ID: <7197fee623285e5878d01f19aaa914eb426a9692.1645311956.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0161.apcprd02.prod.outlook.com (2603:1096:201:1f::21) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 993adb1c-bf2b-40cf-4dbb-08d9f3fe9d9e X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: af6qPUWkimuiQ9td5EgilHKoI0hJ0nh65mXr4SROVc45gD9AZP05GFljCW/g2evp7AYyOluSYdG0RZCuk1f8k+xEeWKrYh+ppzZprVyluNsQJMxr2AMRuEIgf8yglLkAAJZmI0sOq0CWit6gLR5RPMvHshz703gizDRAKROGs8dEM/bYG4fjkghWzH81okCMqamGiXM/xFk2/BTESwFP3T27Q9bDMlSnuQ+35oEfwHCtZWxpQ2edCYQHiPYrCJC+3wOnuhK8H82vbje+ZkPRGqcQSzM/tDi5bEabHb9K9g1KjRcTdtS0FTNAxtQPdw5/qsdzo0tnxt4Vl7yWJQ2rxo1AqUavwvbRDe57S4D6EqeUuJDrI4sru8liPcaP/7igHGawuaa2spTgscI0xNx3hgf9htRg7LhVtDUe51BRwpuXl+d59X/oLwezZmU76R1L43OhcIaRG1d3z+fufsrHIOWkajGbxozhtyxbUTQzIBN/XUlG7gg0QqVK99lDo/gth1Wy30/eFQWQvqnCSjwsElYF+GHF9t98nd+ZMhsZXGYsG19U+JptkiuXICNxEC/QZBw/B2SKLsVh7yt2ydI5tV2iWYerr6vptfE3xpwt74tTpq0G5VOjFP90v1qDoGYbGPAb1QAh6ta88ju/UZstCw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(44832011)(66476007)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(66574015)(5660300002)(54906003)(186003)(8936002)(508600001)(6666004)(2616005)(38100700002)(6916009)(36756003)(6506007)(2906002)(316002)(83380400001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aE9yo6sBn4fcA9ASBwsNImcq1cQUGBEI3idvsEB+DVMJvdYp0NXbvPOsorte?= =?us-ascii?Q?8YLFAogTTev+HTGSw1mY+l06H7+XUnIq/zFaglbSToRtEfQEpZuHIfb0Xhk+?= =?us-ascii?Q?8oZnqC2KfRi20E7YW2MJQ2Iz3bArZfe3NDsDZrO89Q9IaBFsmtYF/mk7RO9Y?= =?us-ascii?Q?HiDR8hBeC95ubXyQ8h2he6fg9BYGXiLxY4VWCuYMy3FdcZv8ZETo4nFJ8qsn?= =?us-ascii?Q?qUSJZfSLgoxTwqoTfr2zauRVVopUFGgXe4VjN4o4N+LhdsAqKg+XiZpdlmk2?= =?us-ascii?Q?6QiuBb5JM6PzUT3zVtU/kKZ5QHcqYjIe4o5IXzWUOfqZ0Kw6fC5/8n8qHu6H?= =?us-ascii?Q?zsseHJNnL5ZTbyQXWDbXwTUDii7ycDKl8AD6Gts2CuizLndCDOqjk/OcpDB2?= =?us-ascii?Q?kGh8OB2YawyOOUJCH0KIcyU/keF6312EXuaooM1I5hxN0K6MnVxsd0PoKGnf?= =?us-ascii?Q?TYKqo3G+AoHMG3KPdqRWCWCdTnSeUT1DqgscQuQkqjf3jJQT62u7wZmCV0r0?= =?us-ascii?Q?ihCjmiJi2iQiePMx106mVKhZjXhrhp6gG6oC+NkKq+WzWhYBjomy21olxg5L?= =?us-ascii?Q?2/xry5GS5xKZuDrIOMAszPE8Xv7T7iaL2zMdu7ZK2SmvC+rHWX3G2W7cnZ/e?= =?us-ascii?Q?fCYMwBRGtvadd9A2lOBOiUY/b9YB9B7XFbzEbquY+3NYY5LSLvrZb1cYjlwl?= =?us-ascii?Q?i2lvUtuJOCW6upeNF8snyCcUV7zfEqADdgt7d3Hc9U53PGGsWDa8/Px2wv/l?= =?us-ascii?Q?G44dINkhEs/us6p/bGsAkciqYUzjCOuyCkTPly44/CMtinkxoCWWzWYZmld3?= =?us-ascii?Q?COkrfPJjBvNrI6ASH6iXlekiBNYacdS5Q0ZycXc6KOsMnw7wdPkH0Zht7Z5H?= =?us-ascii?Q?gXbJx+rYUaeNBNgqmt9G1hgSDyWR9T8Q92//afJNcyLBblOo1PijRhLM0xcQ?= =?us-ascii?Q?wPDB0atlkdWL0earYKXh8Tcwc2tsQNBf/cUK56EZrnzPPL5uN3ztl/m8upUv?= =?us-ascii?Q?4GwuoQMoghpWYvDHfJlI7czyIbWo+jrhIqZHC96w6Y2iXZAf2AUS6+xNhg42?= =?us-ascii?Q?vucEHj+Cri+83eVnKPMYS5q1xs8/34JH9tP3CeA/FOwN2P4EGxvPdx35zeN+?= =?us-ascii?Q?TXP5Z4hfSLKFF/1MTOEl/vr3/36e/333X/IDKAwz6n2WC9yH/A3HAdEJL3gI?= =?us-ascii?Q?U2dVdE1XLQxreLpUB7yIuOgeLzpCOlnAUgEhPx7uv8GotUzlCL/eF2sdnb+p?= =?us-ascii?Q?gvmUHf6aUTuAld5S6MnYW4Ft//MfzSCfI9JpB/bsOU9vbRUeqoCbbn712b3b?= =?us-ascii?Q?dfytLu6yyf3IKaXkBJpXA4/oJ4KZss0kxSfAL8hqK3LxEGsQCFyXTuG/29x8?= =?us-ascii?Q?NTZT2JDTO6FdPHwmf+FeuLm+9w0WLd8msDKqHV4BufBVazoIeG86Un7fZyYn?= =?us-ascii?Q?ZKlYYAw8AE0pyhlSu5gycXGNZX65MupFdtSnblAMHZd+nDte8kULsPAIkkNb?= =?us-ascii?Q?KcvQXkEcltAuxL2T0CVS1gyxhIsDdkaHCpwegrFDEOn8y+oTZgCiNJK0XBxz?= =?us-ascii?Q?6fSVbzfNnioTgyVdVZgGIxIHOMXaA4Ves/X33r0uMrGnPzFMGlXVL1kuM/lL?= =?us-ascii?Q?D/GFEjQ77u6n82i6X8VAaEZJCJYW31rUH3yltT8v9jNm+j8ljuidczTPsKju?= =?us-ascii?Q?AjHx/szxaNLVaTmAiAhdh9t2j/Q=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 993adb1c-bf2b-40cf-4dbb-08d9f3fe9d9e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:21:54.2682 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CyTQ9aka/ZI0R8hAyvfdEJ6SyYLmIrbsi0DniFCKYFIy4F/0tL02KzyWu6mPodDORKz/K+UWrwtMXKXx9mYflA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" Added the test cases for MP_FAIL, the multiple subflows test for the MP_RST case and the single subflow one for the infinite mapping case. The former used the test_linkfail value to make 1024KB test files, and the latter 128KB. Added a new function reset_with_fail(), in it use 'iptables' and 'tc action pedit' rules to produce the bit flips to trigger the checksum failures. Added a new function pedit_action_pkts() to get the numbers of the packets edited by the tc pedit actions. Added a new global variable validate_checksum to enable checksums for the MP_FAIL tests without passing the '-C' argument. Also added the needed kernel configures in the selftests config file. Suggested-by: Davide Caratti Co-developed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/config | 8 ++ .../testing/selftests/net/mptcp/mptcp_join.sh | 98 ++++++++++++++++++- 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index d36b7da5082a..38021a0dd527 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -12,6 +12,9 @@ CONFIG_NF_TABLES=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NETFILTER_XTABLES=3Dm CONFIG_NETFILTER_XT_MATCH_BPF=3Dm +CONFIG_NETFILTER_XT_MATCH_LENGTH=3Dm +CONFIG_NETFILTER_XT_MATCH_STATISTIC=3Dm +CONFIG_NETFILTER_XT_TARGET_MARK=3Dm CONFIG_NF_TABLES_INET=3Dy CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SOCKET=3Dm @@ -19,3 +22,8 @@ CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy CONFIG_IP_NF_TARGET_REJECT=3Dm CONFIG_IPV6_MULTIPLE_TABLES=3Dy +CONFIG_NET_ACT_CSUM=3Dm +CONFIG_NET_ACT_PEDIT=3Dm +CONFIG_NET_CLS_ACT=3Dy +CONFIG_NET_CLS_FW=3Dm +CONFIG_NET_SCH_INGRESS=3Dm diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f33822b28058..6fb883971d46 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 do_all_tests=3D1 init=3D0 =20 @@ -62,6 +63,7 @@ init_partial() done =20 check_invert=3D0 + validate_checksum=3D$checksum =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -207,6 +209,58 @@ reset_with_allow_join_id0() ip netns exec $ns2 sysctl -q net.mptcp.allow_join_initial_addr_port=3D$ns= 2_enable } =20 +# Modify TCP payload without corrupting the TCP packet +# +# This rule inverts a 8-bit word at byte offset 148 for the 2nd TCP ACK pa= ckets +# carrying enough data. +# Once it is done, the TCP Checksum field is updated so the packet is still +# considered as valid at the TCP level. +# Because the MPTCP checksum, covering the TCP options and data, has not b= een +# updated, the modification will be detected and an MP_FAIL will be emitte= d: +# what we want to validate here without corrupting "random" MPTCP options. +# +# To avoid having tc producing this pr_info() message for each TCP ACK pac= kets +# not carrying enough data: +# +# tc action pedit offset 162 out of bounds +# +# Netfilter is used to mark packets with enough data. +reset_with_fail() +{ + reset + + ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=3D1 + ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=3D1 + + check_invert=3D1 + validate_checksum=3D1 + local i=3D"$1" + local ip=3D"${2:-4}" + local tables + + tables=3D"iptables" + if [ $ip -eq 6 ]; then + tables=3D"ip6tables" + fi + + ip netns exec $ns2 $tables \ + -t mangle \ + -A OUTPUT \ + -o ns2eth$i \ + -p tcp \ + -m length --length 150:9999 \ + -m statistic --mode nth --packet 1 --every 99999 \ + -j MARK --set-mark 42 || exit 1 + + tc -n $ns2 qdisc add dev ns2eth$i clsact || exit 1 + tc -n $ns2 filter add dev ns2eth$i egress \ + protocol ip prio 1000 \ + handle 42 fw \ + action pedit munge offset 148 u8 invert \ + pipe csum tcp \ + index 100 || exit 1 +} + print_file_err() { ls -l "$1" 1>&2 @@ -1079,7 +1133,7 @@ chk_join_nr() echo "[ ok ]" fi [ "${dump_stats}" =3D 1 ] && dump_stats - if [ $checksum -eq 1 ]; then + if [ $validate_checksum -eq 1 ]; then chk_csum_nr "" $csum_ns1 $csum_ns2 chk_fail_nr $fail_nr $fail_nr chk_rst_nr $rst_nr $rst_nr @@ -2444,6 +2498,41 @@ fastclose_tests() chk_rst_nr 1 1 invert } =20 +pedit_action_pkts() +{ + tc -n $ns2 -j -s action show action pedit index 100 | \ + sed 's/.*"packets":\([0-9]\+\),.*/\1/' +} + +fail_tests() +{ + # multiple subflows + reset_with_fail 2 + tc -n $ns2 qdisc add dev ns2eth1 root netem rate 20mbit delay 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow + run_tests $ns1 $ns2 10.0.1.1 1024 + chk_join_nr "MP_FAIL MP_RST: $(pedit_action_pkts) corrupted pkts" 1 1 1 \ + +1 +0 \ + 1 \ + 1 + + # single subflow + reset_with_fail 1 + run_tests $ns1 $ns2 10.0.1.1 128 + # syn_nr syn_ack_nr ack_nr + # csum_ns1 csum_ns2 + # fail_nr + # rst_nr + # infi_nr + chk_join_nr "Infinite map: $(pedit_action_pkts) corrupted pkts" 0 0 0 \ + +1 +0 \ + 1 \ + 0 \ + 1 +} + all_tests() { subflows_tests @@ -2464,6 +2553,7 @@ all_tests() userspace_tests implicit_tests fastclose_tests + fail_tests } =20 # [$1: error message] @@ -2493,6 +2583,7 @@ usage() echo " -u userspace_tests" echo " -I implicit_tests" echo " -z fastclose_tests" + echo " -F fail_tests" echo " -c capture pcap files" echo " -C enable data checksum" echo " -i use ip mptcp" @@ -2524,7 +2615,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchzCSiI' opt; do +while getopts 'fesltra64bpkdmuchzCSFiI' opt; do case $opt in f) subflows_tests @@ -2577,6 +2668,9 @@ while getopts 'fesltra64bpkdmuchzCSiI' opt; do z) fastclose_tests ;; + F) + fail_tests + ;; c) ;; C) --=20 2.34.1 From nobody Thu May 2 11:52:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2798441jad; Sat, 19 Feb 2022 15:22:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJyssuGGgEtBZr37MTGkdcS0AqscXFO2jKJ890FIrIzFxEMM6HzbTnP1BE12QRdlu5J5WtdN X-Received: by 2002:a63:e817:0:b0:373:8abb:2c51 with SMTP id s23-20020a63e817000000b003738abb2c51mr11236061pgh.185.1645312928235; Sat, 19 Feb 2022 15:22:08 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id b17si14603288pgj.720.2022.02.19.15.22.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 15:22:08 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3902-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=@suse.com header.s=mimecast20200619 header.b=fse0cfjk; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3902-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3902-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 8C6C73E1096 for ; Sat, 19 Feb 2022 23:22:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AB8AD57DC; Sat, 19 Feb 2022 23:22:06 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 5EB5357D1 for ; Sat, 19 Feb 2022 23:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645312923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eDFf38yVs+fnroJ77VArdIC6sq7WdXiKn3HvTmjPgG4=; b=fse0cfjkz4YLZkiDhsuMalIAXVG6b+Hzn88UFTUV9Fa/x5B/6VaEFJPSX5pmbPFNNF+Uho bYaaARQFqzDGwo54vY3GPQv+sF79puGinunCCYaBQwTOr8AxKtYi4eWnYwvmPrSwSNRJyY ptDtOIltIM9yvFaF1+4F1WhgEpZlNBQ= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2057.outbound.protection.outlook.com [104.47.5.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-3-APzA7CJ9NieFbu9kDXgaug-1; Sun, 20 Feb 2022 00:22:02 +0100 X-MC-Unique: APzA7CJ9NieFbu9kDXgaug-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k+lcBmrA4ZznrKW109FhNFCDruIiazXV9S6pSSgdgwQFv4KWayGwhXlMKtWtFxUsV1mxVcoPap5YLp9zS/WLII2aNaqMoNQcfnLzWnPEuO4RI6KunaIJTH88k/x+RFsVamBbRquRPs+poQhFo+sdKnR5OJTfBXQL3DbIgtdJl4vFZrBb+yE3g1Vh9iVTqXjkLH5ZMfH5QiZEejEXJE277mZxJ23Hafyr3ieIlg+5PwiAxWXV7MWkWm/nM1iygpJzrwo/qs3Lm7cTHatergmCQZKAEYtA1b/vAFpU2RbVY7bd8/RCc7TZb4HVaYWqxhglm3KHc01GD1EUmu379CNkRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gbzQJ4MMOd0a2SJ2/9lDPQFtYW0Nl50iulAsByUFh6A=; b=eE/eGpcAnAQnXqF7OgMc6DCIWNnhoJQvbtWUVq5owyRGJgYyL4sEyULLFHP7v/FQ/SjP5aHo3eNyT5nOL4kZN31zDoJDklVQZGjGH6LpSq5VnP/KtSxP6zwSoPpbei4/1eqmE6NP7mr/iHovspetSf9yJcDkPd26hDg1SE6wdwvjZcWs2Qupyc2x+k7zxfkHGUOi1PgiS/i4WtqylrFBtLN4kjg6nX8jO9wbAHDYLu1jXBF9FywVaa7kKtxK+cVmPtw3kdQ3d6i64Z3VNUdKGsmyKwsa6/pbBV2wuDU16a7ipJOwnK/36daGeQdHE3mF3GYgibUC1qA9lQCOmfhQjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 23:22:01 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sat, 19 Feb 2022 23:22:01 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next 19/19] selftests: mptcp: update output info of chk_rm_nr Date: Sun, 20 Feb 2022 07:21:34 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0190.apcprd02.prod.outlook.com (2603:1096:201:21::26) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 47d977b3-03a0-48ac-cbc3-08d9f3fea1c0 X-MS-TrafficTypeDiagnostic: AM9PR04MB8812:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JuTTekpIeE4tykyZsQ7/P4EYvohTJzLVThQ/2Ecu7OEipES3eS4fkgEC8PBeiq14lJV3SErq+FN8gwl3mgVUNQNq46UPAZFp6J87+IAOdMGrep1PSNOZX+UPLPfR9T6psemXhv2Y/Uglc2GrgpZe2jIOQ0IeHW9FEhkikEEMsn8dN/in5nkh2x7+qXvUg4s8xDUJpu2+PM+JejN1C0h2EA6iWcssGhSysVBeUaOeI+6eYTwKG3SYQYSl5QBRaYa9xrsFbJpc/5zrn3WIWLF9M0KXZL5vGCDkCoy9y9QVSUz0JSQKAz70DcXpB8dTSNZjAGnY1zBPQAZu+IIc9xxh2BYlG8udUnl+oTFF0fjHKkUa3F2ZbWflVSrfwUcLD4b36MOwv66vlIuQvgabld+fDR9JtYSeFnrqNg0f+4dYmjhUR29WA1+asixehqBF4fYIf3oXxmTTQbdcW7Vm6esiMPozrk78iwlaK8N8ussXO+hE0sgbjgFTzGtqwr7qaKImWsr+F7n+sGydIcN9DXH+/WJHIa3HSAr1nZVgGg9oSjLucW3eFFCMwreASnYPctWLzPerPEQdOPLK8a93+SLEDdkZviZntaj2c023QknVrKQyUs+xMToExwP0DMb3Ie3/wy846u5MdU+arlIU68Qedw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(44832011)(66476007)(15650500001)(6486002)(66946007)(66556008)(4326008)(86362001)(8676002)(5660300002)(54906003)(186003)(8936002)(508600001)(6666004)(2616005)(38100700002)(6916009)(36756003)(6506007)(2906002)(316002)(83380400001)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zkCr3yT3mcT+QkkfKxFON2tA6p0fXOWn7IatCtVbK2wGAD0UDNdQYphrOpx/?= =?us-ascii?Q?gK6AgBbUozQ0JZ4SnnOiPOWYAyO6yoLXNPmH9aL9/9rQSNQdgUA5ByoKoF6G?= =?us-ascii?Q?KkDbt0TbHiAzIfIJLByJUs946px2JZJzsuqvz0VlGEI/LXJoJFDj+WSFF0Jr?= =?us-ascii?Q?Pwn59B8Zy02Vc315gI6sh/dRqigd4tPc1Yvg2/VllMXloWP1zLnbGbHXV99A?= =?us-ascii?Q?81CGLaAHMYJxZVE7qrY2OWtKDsL3mX+rZaoWuw0YcH5W4NyP0yVtNN9y7ecc?= =?us-ascii?Q?EyYFEamfKmnGyGnsSJoSjpNVgWMpqRg1U6cO8I169qzd4BgjXkiGTgE13YBn?= =?us-ascii?Q?gSEN6QNsN20b44eydGKBEg4kAUAERrPZWqxWMQtDdHzNMiDgC6E9mmGWDUMd?= =?us-ascii?Q?kG2sHsYcw8/abhDsBjmUlYkOcaAk4XCo5B0Gkbrq9YXxuDsNY2pPHFg83Dc6?= =?us-ascii?Q?NuQfZlgIzxDaPCf59HFgeWmo7YWpIhV6R5EnutkZfnvIQhQKM/RlB53YcXpy?= =?us-ascii?Q?PbrNZrzdtcgU4j56E17oAIZ+gDqWN6GxxTnp4yzBXFGU+JswMJVNqWv9N1rC?= =?us-ascii?Q?qPdM0CnzX7eFpvO5G0ewgOjL3810tFY4S1CLcU92F3fA51zKYDrIHgGkQGKN?= =?us-ascii?Q?2CP3oKgHc93VjcHoO9w0zbEPlat+1nlEar2pZqPEmSNq1ASFuIuUtkNX4Bu0?= =?us-ascii?Q?U0QLsoc36IRP8KtOlYoOTIi64ihTWrZdEkmaPBwO8AzLg7/FC954ROpin6Rj?= =?us-ascii?Q?3HB5XVQcheGyBP0ebPxfAYidiTeSFjY9A8TduMUuan6XehZQvEAhrbkGbObs?= =?us-ascii?Q?wf/3VlX/m383Wu4soMj1zt9Mp5xIVGn2b86NWBHNDmu3+4F5f/GNnzHtp4uV?= =?us-ascii?Q?h4D70JgELL1AR6J3jr7bJ1Csif5gthfkcx7SfTwTW7LaV7t2m0FZD8UU5PJZ?= =?us-ascii?Q?ZHkkoDPmhR/B63ghu/7cl675faB0Y6uYi0qfJv7hKoNqowhPGocf2ompDfHb?= =?us-ascii?Q?KNZ9WpijP3R6h6M/xhWDclDmY4ZjSXZEYGNNakxQu3N1+m5USo7Ns8g/EATB?= =?us-ascii?Q?Isztur1dowc4212JW/TRjBE/5uK+iQQ95/bFMfUoQWInjvlnHbVQxz7XDEvX?= =?us-ascii?Q?exnnC90v3vOrSPHLJC9O95eKpthe+qAY/fRsGutJyBTcidELo7CLePP2WDyT?= =?us-ascii?Q?5ss/334A0mxEsbnuJf0cKjFjhyQBCJGlafAqeeG2IaNQ8umQ3wNfTNJZuJfL?= =?us-ascii?Q?Nqy34Q7npxS6cBHURDzO+fAg+d1L1Eu2GW7SUJZ/nN4Gkr5tPvr/Dsh78eQd?= =?us-ascii?Q?QSHnb4eGuzuy4VlJ4RwgWAOI5RJEC3avTj7QVZe76pM6ekORiYsTcaBq5U1b?= =?us-ascii?Q?EuxhBNBvrSaoX5n4UHbS+tSfpFFFjqNtyOcMm7ESU+d1y+y+GKWyI/ENDE0b?= =?us-ascii?Q?s6Ub9Qffz/NrKHb9i5eRFopms4w7pdKolICifY2WXb5lrY04PYmYviDm0bHN?= =?us-ascii?Q?gQwAHyZrpToDkTcd13sG/VgR3CEVpQkuPik9JI9/ZnJ1h3s86ThONuuBsuQW?= =?us-ascii?Q?7O2oFxvJeWSNOtIywOHGKqd+VHWdUIMuePmVZ3RHJpR5dZWrHArSc+tUpwy3?= =?us-ascii?Q?KAy7cFbd+1EA7OtITi/yYPbmceSjlmK40SO4K/W/58EC4lzyC+LktcbzsJWJ?= =?us-ascii?Q?q0baxQgC4GmdQpQk6eM5f/4/FKA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 47d977b3-03a0-48ac-cbc3-08d9f3fea1c0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 23:22:01.1426 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: joDUDQhKgufZqHBm4S3VrL7YYJem8Jb2SbtxzpsN5TutM5qnoh9NQMw1i8zHFkHBqqLN9BIRI3sj84H/KgajbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- 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 6fb883971d46..3655911667e0 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1312,15 +1312,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 " @@ -1334,7 +1333,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 @@ -1342,10 +1341,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.34.1