From nobody Sun May 5 10:17:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp437113jad; Tue, 15 Feb 2022 03:12:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/dSCt6ABr5CauDZN+XOg06bVodv/S3ig8X4nbR+wvJ0egNjC1cXFN0Feem6yUT9ZI6Ce4 X-Received: by 2002:a17:902:d2cf:: with SMTP id n15mr3813052plc.8.1644923537852; Tue, 15 Feb 2022 03:12:17 -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 d20si35495453pfv.81.2022.02.15.03.12.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:12:17 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3742-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=Sio542b0; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3742-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3742-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 7B48C3E033F for ; Tue, 15 Feb 2022 11:12:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 721D9138D; Tue, 15 Feb 2022 11:12:16 +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 DCDF01388 for ; Tue, 15 Feb 2022 11:12:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644923533; 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=8KpuZVpzF+bAAVys0+PZ/IwynSD0zwCWsUrjCOfjL2U=; b=Sio542b08DfmFGAzLPLvWBgjIWYx3l7/W0ZR2ryD4DOD0b0qxv94mROkmNYCnOQiwQISf6 QgOeCqPnHGffgYxG+aRQQEBNZ8l44gSXCr/TuC2q0rxpQighAt6+RHhzEnv02XUJTXIbWa 65GXwiEeMve2NwIKBcA6NyBTclm3buA= 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-40-QdHwNk0XNvinMnPKaAKvpA-1; Tue, 15 Feb 2022 12:12:12 +0100 X-MC-Unique: QdHwNk0XNvinMnPKaAKvpA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kFlBEFjaQbnH3ppGwFvrBrApxAWmjgyBSrYxxtkfKXIhPAQ9jOTSbGwiKLF2pBt5Y/Sjt4jc2f8w5UBQZZuUN+MFuGlpfs9jp1FFZ/7ER4pJs9fGnP0hzz3/kedrCXG2JjSfsfX6JaXUDHFmghL/gWpK3WDNELa8YMv7QJYOAYm7Z/dx1w8PESaaeLU6ebe3rWog+5+vb2P31MOYY1P/Fw4yZnfZBWF6ZEiqDOzuDWWObXujdsxA12MAtJygbuDyQE+2qNnS7fxOe3neqtQEdXkz+kw0SFlOqrDR2Datjp3DYKbI4GHzS4xc21FFxPzTsou8/qNfWYH4CGVcRPURkw== 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=vlLFFyvqyQbeuKuGk+tzDgmSBzLiDDaUb/+MsZzTQrw=; b=EDxkWLYF/rbkmHvgKByq5A36WXK2n6IjWQFnFeYtV6Orxj9nSeYyEHc+7U9bYJMBwvckHmk/ZKIsjlwekfe3PKab6TMyd1nUIk+5RsH4j/wxjxVmllcpNFS+Stio3JZjxpH9Rpa5J4JDVrBgml6rrYQsMYLHe3jQ95YcppjXxh+rM8lOa/E8F0aY057ZNUZPKcUUlvBR1H+I/UwhfUzffQDYnqYMeVUHFxEss9Q1dCxbcJvS+MTuMSadUobBqbrh9xdLGwjU303zsp3yRxdaVMs8ecREmAR+9m+EO0dfbDUZ4KbKl22gH11m1dCg3wICYEbamxl7l4q/owLfZwsbWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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 HE1PR0402MB2921.eurprd04.prod.outlook.com (2603:10a6:3:d5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Tue, 15 Feb 2022 11:12:10 +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; Tue, 15 Feb 2022 11:12:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 1/7] mptcp: add the mibs for MP_FASTCLOSE Date: Tue, 15 Feb 2022 19:12:17 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0186.apcprd02.prod.outlook.com (2603:1096:201:21::22) 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: 06d14805-7bd8-45e3-82a4-08d9f0740286 X-MS-TrafficTypeDiagnostic: HE1PR0402MB2921:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: urCCm/TJiPYtYqjblqrCmOqdEADaLXqEjMVyEsCDiGJVSyDGbiTL1ngSayEVEReKN6UAcpMd+tlRpRMp7HR2+40TKEX+CTVu3PvgHzvxTmIFA/BevZsIxno7r3o78s07ollI0QvHaNkwbW530Epx3LTXSTdnD6BoU+mCPwBZpq1hmwBxdqdzDBzrjLQlaEzNjUu2cD/c4UfEA3dwLLjHHwAwfkWPuHPQfiTjoEWVyDS5oWlRby9ylOShvFff6Jflr1u9xwWgP67xGwK6/nF7i20mHPCGz3iU9O1FMnFMQ1w8hs8yF57lbVDPHvVX1GAomLIWms2w56Pzx0trEYBr3xQtDVfXjQur2eDnJ9pFPDOTUTFQ7D4Zr7g0cpOF4q1eP8yT8pDyhdhfmfUq8LnspxEFzZZJUPNjTwBSVwnyCz3dlrY1Vgk3iVhJvhTgbPO1RYxbRBIbeiE9ASI1sJiB6KaCzUsZnRRcgnTRGrCYBlkVTXP+KYKoQ+/E0xfDPEHblXE9E4O/wsGAlb6cH+2Iz8a/hjOUFRwX2lZg2WX29DEPrJknxfq+dQ3t2pXrb8/6hDh/wU9BbLzYDMCpwbJIUGi+6gSSBHV3WDvVCEaIPrk0WfN84vDH9cdzeEg05XopCw1bQqYkao7aQzM/4BIwtw== 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)(2906002)(86362001)(38100700002)(5660300002)(55236004)(8936002)(8676002)(66476007)(66556008)(66946007)(508600001)(6506007)(6512007)(316002)(6486002)(36756003)(83380400001)(44832011)(2616005)(107886003)(6916009)(4326008)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?f3PGBiZZdhRJ3mQ85jEBnBXZS73dPR4QDZnpBIoQvXS+nA3WBW23fZmwqNlx?= =?us-ascii?Q?OZ0vPu/ScXVrIWtj1ECpEDIBBSue7B/Eb+q51Yd+RT3gSpZ82KFT1GGODStN?= =?us-ascii?Q?+pUZeCpcdX4Ix007pq/F+5+cto2bI1xVqueyBYaGlo6ZOro4h/kJI3u4Fbb4?= =?us-ascii?Q?nfvEM+9LFBhjyKUPaZNG+hCoxIzlGpa4U/uJHM12jVIOXIp99hMgyyC1jaCn?= =?us-ascii?Q?eL57SGSZOh9wYtIKzC06LnZZaHhxxZ0w5jq3DIxjRyB1LFUmV0XTxDNpRdZa?= =?us-ascii?Q?EL6rodDqb3dC9SMvjVQxVIW7eK7TjjSDHzKyNMmHP+Su8HIa30NMmMd7oA8Q?= =?us-ascii?Q?LFVYG8Os9qNmxA/zMHzypZhE2sFb0jjPJ+pn8NnPqpfNitD3RSfIDJlrPOwj?= =?us-ascii?Q?n6ClUfN4pc7KXHwDVPM/FY6Vfc3lMmIf7K2yjkrlDvB3vVNXfAyvop4Bmu/q?= =?us-ascii?Q?KSIoRAYzvCXKrDePioNtmwYvW2XKe7h4rCskM/HtqOovIYEHcq/W+pRB1XEM?= =?us-ascii?Q?jieAuxgDXCGf/1Mm5+oY0qvNEc3FIRHSA9JJCL5nLYR00CtdwCXp9Ujal3uz?= =?us-ascii?Q?RG8gNL2o25uaJ7ngwEsPus9FuQO8vc2qlCDVdNLvGnz3NbjthgHTI7ItQre8?= =?us-ascii?Q?C3hqnCW6+QztdO3LFzAoG9nCKtn1ooFdDEQwCc1m6LxY171Ec4KGii1OkxJe?= =?us-ascii?Q?Xyh07QnW5DyCn6Vwm9NKL2pys13ZEb+yoGwMVHj2dGni9ZftGZSYw8qi9qhT?= =?us-ascii?Q?wME1bULlXYGafeXN+pYZGMFREVcbEN9J5dHp+apL46kkQX8WLQ3FtUveeCvP?= =?us-ascii?Q?RBf/wVwh72uDRG76wXaYnsk2lGOfbYKdKDxP15RuoDkkK46YlO7hTGU+lyQB?= =?us-ascii?Q?OBK5Vh8Uv+uyQ1sjt5QUOskYmQsBJmXbsZxL4VbAF+fMVlTsL2Nm756NsgiJ?= =?us-ascii?Q?uXz1KR1PXqEp2dUjnNcOPQ/Ck7aFHsv+d/D/U2eDI+j7x0KCaIcgQ48xqudX?= =?us-ascii?Q?KCZ10rZitDc4OB5K7Mcr/QNWyD5tT5omYcWsPcyhEOElCPmB1NVbU3glQUDY?= =?us-ascii?Q?KgDsATQ7lzL94ZgoXM07qIMHOAfzB0Ach4NFsyc8iKWseTaKuH1eCD8zrRr7?= =?us-ascii?Q?EYhfgGjC8lxG+H90GoRCY5/xHG5gdA9nkFR3+d6lCfBUzakDD0sOUx9TdujO?= =?us-ascii?Q?jOj2jTZY1n++QQBsyYL1v9a5/hsihXwVcz4fsmIfuwQSjDA+f5mrLF83GL5c?= =?us-ascii?Q?k2xo6dWBfQdTLxjCH/EWBJgh4hOkWYyIeKYXbGN5ccjJNJoenuIleMMge7eu?= =?us-ascii?Q?LvYjIW3nrcyJWPH+qQqqDk1h4BHJK8WbeesCDvKnG3nVvklOp7quxbunmVV+?= =?us-ascii?Q?8v3eC7uFRIbGovHDjxNo0m4gmuaDXo3sjaEkncpwNR3d3EEcOqNpBmOen1yM?= =?us-ascii?Q?RAjK5jp2Z/czbLDhL/auCF1KWKFW3kOdtv94y7R04GccdaMFz9qGwvj4UQih?= =?us-ascii?Q?I0gftonIbVQsDjDfNtzI/Jwxxa5EN2tRi/Z/SojfRHwbVqlk2fMqY6hPw9V7?= =?us-ascii?Q?He0q0eOc/0mZOgpME/MaTlyBUbVa45HjFSthjHw+eT1SmB2HomlYftA4+egS?= =?us-ascii?Q?K/aluQLkrzfujykFa/7ru70=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06d14805-7bd8-45e3-82a4-08d9f0740286 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:12:09.9815 (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: 1asyH8nhlHWK2o98x0ws1qDm/rOY9v/PL5jWkFT+761TpD+NG/bKlhjcOdNkkcFyxQTUqB8tSJeR/b6p0ZAP7A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2921 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. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/mib.c | 2 ++ net/mptcp/mib.h | 2 ++ net/mptcp/options.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 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 Sun May 5 10:17:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp437193jad; Tue, 15 Feb 2022 03:12:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQtQ1x7vvOMuUeUeuQiPqtWmNFyUhjKB1qjym5xhlRXHJ5Cz4Yve6D0/7xkHs0NyPUKdaI X-Received: by 2002:a05:622a:3ca:: with SMTP id k10mr2252524qtx.272.1644923542827; Tue, 15 Feb 2022 03:12:22 -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 k6si7910376qko.283.2022.02.15.03.12.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:12:22 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3743-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=bC4qLxW1; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3743-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3743-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 72AC71C0A4B for ; Tue, 15 Feb 2022 11:12:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3DE1C138D; Tue, 15 Feb 2022 11:12: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 018941388 for ; Tue, 15 Feb 2022 11:12:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644923538; 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=kmnNQ8I7yi53PgKS5AW9GSIuCr1OpR5vFPtKocG+LjE=; b=bC4qLxW15BBsMjYa9GFuyV28+8KwvMJZ+L9SUDk8alxzN8aJf6weL2TQozxA6wKoSDquXi L1Mi/ORLsxmL2RtVemW8a8mfC6F7y15KKUNk4pCO1J10EkOn1HLqlkgD9LPdrINviPkBUc GMUiYfnSk2KQfZBxYyJmFLfiYo6F1aM= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2050.outbound.protection.outlook.com [104.47.2.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-31-KiG3JdsDPpeIUG0SsphsVg-1; Tue, 15 Feb 2022 12:12:17 +0100 X-MC-Unique: KiG3JdsDPpeIUG0SsphsVg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dfRb4ModvWwx/Q0uvLY4btTN/AmOk6YIUBCiz2v7ojnByN1IAkHhYeGuZUa8ynE89O69O1l70qfHJFz1OHtOu+ubPnhfCqXwxBmvhIN9XeAzK2QU+eV5YARTMkV5y11cFmoXCvw2iJ2tDUj4f74I1YMFziewI0tjGsswCbWrZQ1wCoMb0a20wO/L+2ZyGv+g5MuRAMhdjvkMSHEGIScdegEaYvkWe3AzxhEGaTRpoW7NORfuHqRTtjauHJhbLY6+oIyVmiKva8ym5tex9vtCDC6VnAN9OC2CQlUtpMPmu4IAVEa829MOUXJb03cmQd87PPmlcoGUG07aOMLAMec2uA== 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=/dlZ6mvFvziLhG+/zdShszurzWWe/RgE86pGllWpX8w=; b=M4vXhyhmyMOnUYxb1HHkW+Zu1juJh/3Gn0Dfzv7OrBeJVOPMqOZu356Lo4fCUqIw8wwB/ml+Bn5xHISBDQMMWBOmvO6FgbeeobhjmQesqJiq5IG/ld+rQ9xGs1nbcvs1KVpCIG9+KxM0VYQJHp1O9wEvwrFUZlSifs6JjxvPZYKHavW2XDDgeu/hxfsyRh0fiWfKSwxcfDAB5Ri8yo2KUHE8j+MR5zqp0U7HmfdIQnDTk7pczDxL6orpPHAjifUfSZg8Z7jEgF3BrETtBF7KeMsbMFviEdT/GnUWJpu3sHL6B67sDG+5JA+F9Y6L7L8a4L6fjCRMskgiFUdroJYQ1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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 HE1PR0402MB2921.eurprd04.prod.outlook.com (2603:10a6:3:d5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Tue, 15 Feb 2022 11:12:16 +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; Tue, 15 Feb 2022 11:12:16 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 2/7] selftests: mptcp: add the MP_FASTCLOSE mibs check Date: Tue, 15 Feb 2022 19:12:18 +0800 Message-ID: <57f50b740bdcc7ca145fff3f610f1a357072557a.1644923074.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0186.apcprd02.prod.outlook.com (2603:1096:201:21::22) 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: c1fbaabd-7156-4097-7bf2-08d9f0740661 X-MS-TrafficTypeDiagnostic: HE1PR0402MB2921:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:229; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3hCnnpk1ASn3/T1BSq4bAwQ3huBdphBZZdKEAjbKZwRJ/ETHV+SaVRAw0odd8z+QMIXUVIe+YUdYq60CrO6NQxlzXEJlb+08kcirW5gbJxs7+gtRFFSGMPfrCviLdo83ne/EOkjrLYa4vHczEjpZ/ekLhzp7PC9NUH7cAi5JJaynbkHcUPoWm0xEkWm+8hMgXWwGsssAIctGcBWUEi6bUPbtyV6yRpgmtTL+83s9jL3ZGGPNv4ZqlKUHUEVWMXNCNwFIuMHYMGbcoK+HV+UWA3+Amc70vZcnqE2G4NtSfIUC1cZQqeXHvA88Ojg7NTgxNlH9BCxxa557xFKju9pl37xtKKZWYaRBgmrwE81Ei/96wI+j9oM+r1FG1Tjp3GyLK37gM0D+kvGrz87dEHsaFRljAzKh7qRTw10XeSpNSR6rDsH4nLLQjUofbhYNhElIhHnWn7BnnFBXsx+Vo75RNcqaYuMc+aqg9aBvjvRoOtxM+tuIUcvT/nqbm/7DcXsHaTbxhRYEjjyKmTqHYOKePUpudyL8qHKPmiPRqLP1JmIIKii2z3HXZKdCQK5AZ7W0CFGN+qJke3FAYUzjZWmm0bGqPCnfqu/n9d66lqIyRs5UWYWcs7qXo8OQck3Mb+eQ9uuR6IsqiU1s3CAA8dty9w== 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)(2906002)(86362001)(38100700002)(5660300002)(55236004)(8936002)(8676002)(66476007)(66556008)(66946007)(508600001)(6506007)(6512007)(316002)(6486002)(36756003)(83380400001)(44832011)(2616005)(107886003)(6916009)(4326008)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/s+FMva4FPmBoEII8I5QB3kDRR7pSB7yD7DDxVVhHy8EW6jNdVCSdsUjiFj6?= =?us-ascii?Q?5i5WrQB+KpT0/ZnD5jadv9PpDIi9/T4Iz3zLjcLtrycuuczAz4RiJJ2BzQFo?= =?us-ascii?Q?wzhkwdzSY5pmrWJkuL0t6Hw6YA3/m0cyp17pqiK2k6NIm/uKC/KovHX9opZX?= =?us-ascii?Q?UjkVE4bmYeeLQ0yLPV2GypX5Ntc4HQR8y04odE5yeexWyXqlKjyLVLPxRsA2?= =?us-ascii?Q?rkOr2bNEkbFe/dld+DDOO1zftD+GdtT3kuTD6tyfj+UjPLXz/Ra0bXN4eaG0?= =?us-ascii?Q?+99uXnBf76JzI1yZeM84kNBSYsestLk+IbRBiNwH2f57e8fTegy1rXaINQCA?= =?us-ascii?Q?a7sO5DQhKqqDnb6BcJlN25s1V5Rt9gPuf8N0yIh0D54/45w1oe42qOwR/SJ/?= =?us-ascii?Q?abwqbzzKu04A5cuVhhlhd4MYER3ZwEwVziNSMKDErN30ToV3r/E5aFMHUw0l?= =?us-ascii?Q?gIWlA4sLyNEWYAG4UzZ6QcD9ih/ETtoxm7b+blUxKpNkuNIMBQfxr/dTGHKM?= =?us-ascii?Q?37/qcAJy4o03qo99SVBOB74Q3DyzQFnz0VYn19Z4bWmZ3XT1fjFB9UplpyWR?= =?us-ascii?Q?F7QnUHm6TgUzviEnAH/wlUe/o8xT+315uawEI6GahIcuWCpHsN+7YpKYA8Zt?= =?us-ascii?Q?O6tOuIIzwCnneE+rerHFFwHvZA9AFfKK6FxCOzjkH1H35WH9lD9kieJjMLzC?= =?us-ascii?Q?AoRryirFWjIR+y2ckSX/Ipi/E4lDDn8cRc/6ADQN1DTgl8tZQA1U+lcJMvMK?= =?us-ascii?Q?l7yDHq/ONqzY6qVda9XYng0MApvskrEdnfWCaRXlzgte775bxHRaofRUdz4V?= =?us-ascii?Q?fciFcQOBSayThIjocDzYjURLJ43yw4oRJIRaDYbpsIhDO9K/eFBlGz/6VTMB?= =?us-ascii?Q?p5/Vv8dqueehaTgcWT+qTN0CYmjcxM04jAZCe+QqaA0r4RQNmbpLzZIM974C?= =?us-ascii?Q?mq+EZPbF/aiJ3D3Jn2c3j3JYjTq+M7ChuXod7agq2dpSGCfMmHgGy8UUL5Qc?= =?us-ascii?Q?GOHCbuFD8qgbeeMDe/rkB7YC8YJ7wQDGFPWj7e0oz+owVPScXjKmTZ5oLGcx?= =?us-ascii?Q?fvJ0fY56YgYEA+gNeReMLRijcR/AePlj+/1bJQOkPkAUNgJyJfsIVQ+GGUhh?= =?us-ascii?Q?+pe79WfbJBepDyMtSOWyFizX9CsbucBJD0rsTt5MWd8k39cNz/+LaknIbIP7?= =?us-ascii?Q?RlnmOGQLOFRMgTZOHjMucUUDvOFGAuup8P7uvjialxgyHAoI7v5MK0AfWEMT?= =?us-ascii?Q?lPga0gornrhnN/miPjxeToUNgiod3SeRIm3l4jYuHRhEW7BI9un/IQhafL6f?= =?us-ascii?Q?1/eTGTfubKEkbRNGzbGVZLb8MUnSIIY0ragNFxSNO22QJsKdTGK8G1OkCm1q?= =?us-ascii?Q?+rnVOaEYM0qSP96NpxWyQtskYyCUrdZmGXBdQITJhc8RL0OKDOTTs+p6erGc?= =?us-ascii?Q?7NfUCkRn5QBp2kWS39zZyPH8urKh5/5rqTCb3MdvfuTv4zKZUKfoSIR8Say9?= =?us-ascii?Q?BmLqgSp2nVbg/KUejMtPPiZ/C+wVFq4EyIpXzdZxxk9H7xzo/wps/ugMYogO?= =?us-ascii?Q?0g8kwotNA1wstsUyBx0dFP8lgoDdRNI1WXtKUDCSvQc2HwQosFBJnryZOd1O?= =?us-ascii?Q?utK0OtvA3J3shzl7ZvTucSI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1fbaabd-7156-4097-7bf2-08d9f0740661 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:12:16.4185 (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: oatf6Vym9zYS4RtEVZDDIwSkuFYJfYxWClO+R5vjC6EoH2t6kI3xYHeJKiuQvmTTPmNWIEsbswOynqqCBiG5qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2921 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. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b48b11714817..f71494b87d5e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -834,6 +834,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 Sun May 5 10:17:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp437293jad; Tue, 15 Feb 2022 03:12:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCw3Zd9ARv4piRdsLGNzqhmtGkAOcL7VwHeBexsyvn6VFptt0tXjLrM7OuuO9mM0GuDn3p X-Received: by 2002:a05:622a:88:: with SMTP id o8mr2252425qtw.116.1644923549926; Tue, 15 Feb 2022 03:12:29 -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 e2si7735824qte.50.2022.02.15.03.12.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:12:29 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3744-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=M9XrPmK1; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3744-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3744-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 9412B1C05B1 for ; Tue, 15 Feb 2022 11:12:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8B862138D; Tue, 15 Feb 2022 11:12:28 +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 3F90A1388 for ; Tue, 15 Feb 2022 11:12:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644923545; 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=4jf7ggTN1LT6SG/cNOvhxwM28cRgV+Hw8XKFdOc1RVc=; b=M9XrPmK1D5X8VtD/X0YkSEpeiazurUXek8OrlNgxKzNpxmAVtyu5pPHMUX0sEYVgDP60Tj hfOggytXDvQTnz0rvazlCKkmk0JLvGdvHof1LMw3UfMA8b/u1mcZV2K5+Qsi48s++aHEj4 Iwc7YGtuFbwyBT92C++wSYkUHtvjiCM= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2056.outbound.protection.outlook.com [104.47.10.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-32-aO267zdKNvitDeZREUyuQA-1; Tue, 15 Feb 2022 12:12:24 +0100 X-MC-Unique: aO267zdKNvitDeZREUyuQA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E4+Q63qHvibdvpUWr2HBuFMNdioUjZ4zTlofZsU5Z5F9kdYMaq+AgWbwLb3c3hIVBTwfm7Jipdze7kynqShxlIbDx+G2HwgbyW5Ukf9wEKmzHnNpqOWdruzmRQEdG0xqSpWRQEzNypMQS8wmjG5fEL3wBcZ0y4jKiZQkHJWbxPDEhxVC09VJuDPMnYgVNLmJpkPyascS2uC+d9lAbOJZ13jI38YlDKnUftG9AYvMqAj62fsg7oIAhSx0NVf6SK2ZgT1VpdZg8g0eza3MhqTEIjIybMWvfFyK+ztjyRm7lyzLBumX74NI0wO/+gqHvAITbdt8EVVxWsvc8AeZ7Gp2zQ== 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=ShXKQr5iHgn2fGCuFb4q6GNG7TfB+X12RBs6VH66If8=; b=jaHXkH4NdYUiQ+0dvk+WZ/KW8jH7KZNC95PM/iU5Huo2jdEtLJH26YfPTptbcyRLsbjeURDHO2+SKEcaWyS2nW7INxtjOtvpfAEVOBmEMESNrcrj8awBePdXWX2HmrRJZFNzWBiPR7fXZn54X6G+6IKvVw9KuCQjP+hjcu4BZXKoFxYaWEK2eE3kD/4daM2NZ0QiNkATdu1cqTudpW/V4Yr8sJVi3dJNq8s+rc4gsWP8MIshtU9JjDOrHVD2TBJDlfwLC3osaM+OWeqGEKmNtxpRLRYrp8kNZA54qql+7orQjAjOCSD97oWYdFBTfkYHi0bfx3tvjop2kXWzoMroxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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 HE1PR0402MB2921.eurprd04.prod.outlook.com (2603:10a6:3:d5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Tue, 15 Feb 2022 11:12:23 +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; Tue, 15 Feb 2022 11:12:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 3/7] mptcp: add the mibs for MP_RST Date: Tue, 15 Feb 2022 19:12:19 +0800 Message-ID: <12ae36a6ccc18bee81db5ac8f10f6727167bc5e7.1644923074.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0146.apcprd02.prod.outlook.com (2603:1096:202:16::30) 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: 019696a0-d110-4847-5eaa-08d9f0740a67 X-MS-TrafficTypeDiagnostic: HE1PR0402MB2921:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t6K9v2ZNASDn7TGupU10Vg0VNNJ9aTYCR2TKt67IWOJCruzGDCk/jLruy4dX/vBNu2vp8wSnSJ6Ux2gONbH5sZPnUytMyDFVo82ae8VAcQEgWA+K+dhWjdxpS9Kfq43YOEawlblh1Eo6YSL2IIiFa3Q+7knxw5nT2gPMoZ8oUks/woxvrMM0bIlys2A+KoacunEvXcdKWIzA2QpbJ4vQb+NwaqNP8UnRWDjRI/FBdxEkP0biEZAB3tPrXUoG5njDokJrlcmQ21pFgXSKqgc349K/KN4DVzhp15q3jprdoHA60HlXTvMH3JWZjfp3jCsINRSiJc3sbLjK7o+4EVJAnMVRvtFN860eJx2pgBfYpFP3KB41qWWR9iIf5sXRzEqxQe0oGKveJaDR5X0IrlpKdsPrcQbCDS77U7vbYsD4200Afwr1LhNRz9FZ4TvIFiKWADEdkSVnkZ0jZ36erZ2jjJaPfZYOAYbZw5qTmvCfJn7MbgzdRP/Nb+xK5TjZZl8I/Enp1a8qKJvTwDpwp8wfqYfX2V1Jj9xVntDpFxQramNcBfB7xY/xMBoL8qNcj5x28s36PuCA1KfAKYRsCyGpgweouwMaaXaQOwTwE+t2ySqbdA6D5xU57kfOA6aWysOOQiweE76Dcue6djqZpzPDlA== 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)(2906002)(86362001)(38100700002)(5660300002)(55236004)(8936002)(8676002)(66476007)(66556008)(66946007)(508600001)(6666004)(6506007)(6512007)(316002)(6486002)(36756003)(83380400001)(44832011)(2616005)(107886003)(6916009)(4326008)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kPBlzDRTHIDvN1RDXUd28UVojsk348up7QbzJmmVQe34vumNID1hH+mQ8bR8?= =?us-ascii?Q?JR3KapRtLkQAqj1uo4J/F4DAJcqhVki3RueKwri9ZG6sNL/+4aWn2iaMPOG+?= =?us-ascii?Q?gEIBOSoMLIHEaEp23w623TmF8ciS/VX5IGpCJM/rV5WNKsVNQbwlqA1dj9l6?= =?us-ascii?Q?DOybqV93S42E8rZGjiCHsQU7nd0vNhEDuAk97k1tz62QtjilSi7iKHCwxvU0?= =?us-ascii?Q?jX+3M2IsoCXSFoBvQFi7LlK8wbNRZmajqYSXTCLf9lq/07slvGOMTed/nER9?= =?us-ascii?Q?OOzjdRn7CWjNmtZQQQ31l7Q+muFvJrOvYIvMPvgXG8NR3wC1WPPH+o41kMdm?= =?us-ascii?Q?s5KSr5AzawnpB34t91diy8AjKlIDvGBNEMxRatifDcS22FjvCOOmJ1hLxy1Z?= =?us-ascii?Q?C4aTMOoPR34gMJ7LH5Y0z221Lx5l2s8Bg5wWrGZWn9j8MNhgyVfaJ3KcARaE?= =?us-ascii?Q?YLnioRYKnVscO7TOcUrbaWBTwuaVxLQ9qZc/5ryr8OiXC1wwnhZCVm35BprA?= =?us-ascii?Q?8cihs4b+TxHtWp/Qcequ9hEMlcKoFVXnhkWPjCKwg3B1DiO5QL1O4gHyzvp8?= =?us-ascii?Q?AFuogdRogiPksLPyLULE4q3PqwbvGdFfWSGEksXNEjveBrjZX4cISfC7XGi5?= =?us-ascii?Q?nxnmVGYwremYFV2NYf+Lebu8cvDRZaQ+S79RCj+jvt1fhLZGFhAs8Xhf9V18?= =?us-ascii?Q?rH6Ki6udQfsZwWEYkWElycnzc/pVG8QGIHRAHBWqK89woJAqYCQPFBYoYhzw?= =?us-ascii?Q?+LyzDtZC7zPYey6H/NOTDpBYEtfjldIh2Tm6n5pJyhtEdqRlWA1L8iPbNxWI?= =?us-ascii?Q?lchpswbWV+DUNF4yQVxJoAOtsRxGMdgRH+ijBs8xDNB1y9xCaRbUMUfR7s8q?= =?us-ascii?Q?AjG84/Cjk2W7nrbtr4NwXeuMbCTfPOo/pCqIsKjY8onFa4D9HEsLV36826L0?= =?us-ascii?Q?Q/JtYv6xfiKj0go/gma8nGW2ze/S43Pg17/1PTuR3NyI4MwWEskCsQ7NUZX+?= =?us-ascii?Q?cbXdqYbGnZCDUXcKA67wr6l5oMyjcbO/An25//dNsGjd7tzyDa2QlJch0k8K?= =?us-ascii?Q?qLRSvlAiDFKxh3zvydETzFxos2z5HS2Jddej3Az2VW6ODSR5YDDfyTo46Mwi?= =?us-ascii?Q?kcxJkjB4AX76TOMJ91l+2B8MClq1fBiUDaKHterPBrcIGnx32Y4pw+HcJGg2?= =?us-ascii?Q?nZkj4JAElQXZNuu6jsnCCqHCtYxwUOwEPm9aHmeLaVSoU05ql8ZEl0qcBiMK?= =?us-ascii?Q?lsOubbZHcc+DnZ6nJiFffJWL00Re2hIkKPuEDGuxqaUhVcndNE506JJyunyX?= =?us-ascii?Q?QJpUY+Azzk59dAiN5n9EcbACh7ewHlnMnFoT8rHsGxo5eiWdKp3Vy8dlisXg?= =?us-ascii?Q?a2E0JIMJ/DrqBYar7bG8M/ioibYJiCZCun/OoHf+XuwAPliS/0eo4tMlm7jj?= =?us-ascii?Q?ygxBrGWPHgG1jCFcynrZLPhoVPVOV19EnVTX5Kq6oN1wMoJIgfQWIFYPUmPx?= =?us-ascii?Q?qn6YUZl2hEzFz2at405TyPfKP3tS2s3SlNzCOL3zd4fsXf0tqMXpDcxMPcfV?= =?us-ascii?Q?vqGHGbyrSYGjOuVUlPpLpEv0tVNvwkPwQq3PnT8M8dGMsV5VfugdM+Yb2zih?= =?us-ascii?Q?wRfKgLDanxGppqQt+SG0RL8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 019696a0-d110-4847-5eaa-08d9f0740a67 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:12:23.3867 (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: j3B175bcBZNuO2abtw1TM26tzwOKHaNi55rMJ8mOEhlvdiJKbTgnUJ4rMRhjuq5Wf64EfONQqFw1TpuxvUbT+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2921 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. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/mib.c | 2 ++ net/mptcp/mib.h | 2 ++ net/mptcp/options.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 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 Sun May 5 10:17:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp437379jad; Tue, 15 Feb 2022 03:12:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJw+otsnWa5zHtWIug8SoTOopZE6q2kkGzCtmSPdDIzvo0xbE5ZbPo2dR4Fva4RmpTHeM8RX X-Received: by 2002:a05:620a:24cd:: with SMTP id m13mr1674732qkn.643.1644923557118; Tue, 15 Feb 2022 03:12:37 -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 15si8425190qtp.4.2022.02.15.03.12.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:12:37 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3745-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=bty7BfmY; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3745-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3745-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 A339D1C0A94 for ; Tue, 15 Feb 2022 11:12:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 71273138D; Tue, 15 Feb 2022 11:12:35 +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 3A6B61388 for ; Tue, 15 Feb 2022 11:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644923552; 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=8zbZFV/erLYI6QZrHQHjEqwm/DI9E91hhlD7Enj/b8k=; b=bty7BfmYgcL86pyjqFaNs4T6f5ppPf6LaGxQjbjU8p6vVaAuqqbFOvh5tNrDf4QNtNzbSz sKDhTj1U6OIVyiGWVbnwNH6BVNOQA8M03jKfKCkQ0a0Tf2M9Cmnhdkvv+xVdYFcyYlfDgP MX8tMccxM+5VKElc/nBP333DbmbgBDk= 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-12-uksufHY9OuyhC2Yjl-6keg-1; Tue, 15 Feb 2022 12:12:31 +0100 X-MC-Unique: uksufHY9OuyhC2Yjl-6keg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KZR8yKy3F81cGk+xQ0JdmEthqGY4v6ONwY7KMi0ZwnF+8/4zhywiOqYlhC4re9Yb1/x3KJTJ6UKDO7zkei+MPRjQpOMxKBnMi3gOPntP2YEJ8Bd4HJuTA8xq4fKVP9ksQZXuGSyxn0XPZVs9WMd4X6CtBkinI/l0nxx43SWW6GaCqGYYU6YeMTwJpahuQTTW4JQonS80B9HQINBuS2oVplD7sU1O5r5VAZ+VWSpMDQnkpcbwszBA5SliwTMFx/s0wSNFWyyTSYTz8yc7lzyflgCVS4Lxq2x789LXsWubd+caU4g/IeudIbkn8nOIcqnF9uxGMC28U8mNwtTK8bGxjw== 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=sm2GbnOAbqmzQOzeV3zeYIaN7LymOIzug7wHvGhUnIo=; b=mcjT2ib3IjFCdfi+5d4DmS175hC2k2lPVXupXBz196Ng+RFU5alCwpYA80hSwijYmw0asj7J+g6sMf9jrGKkuvTkEvBmeFsCmdf+2qweY6pjiQQQy9h4pS0Uu4ky0ZHwR/KNO6M/zK8mY8SwF/h/GI5IhHCamfMotHmMJlRbX+F5ea19YSPc9ADjE5McW1sP+mOgh7hBs0LaRs9eE3RLudwlZQRarm0ktNT64VMoQAzrUTqNh1RYumMwXQeE+Zo1RCx6dSdaXnpQz3SEQQGTTES0iXlqwJgDc7oqqDDdGrt1fZSVXQYMeg3IzL/CC4r8MI9nXDFdkoC2FuP76rcuJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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 HE1PR0402MB2921.eurprd04.prod.outlook.com (2603:10a6:3:d5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Tue, 15 Feb 2022 11:12:30 +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; Tue, 15 Feb 2022 11:12:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 4/7] selftests: mptcp: add the MP_RST mibs check Date: Tue, 15 Feb 2022 19:12:20 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0302CA0006.apcprd03.prod.outlook.com (2603:1096:202::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: 3ff63ab2-b853-4c4b-2ada-08d9f0740e98 X-MS-TrafficTypeDiagnostic: HE1PR0402MB2921:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:901; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KfHwhLKHPl6+V+1MubejtdzqUGY44Y/k4tGKk5LeCoev2j4qxsr/W5NfdaEZqDxAGWdDPsaAcid+d180ZRdb/i1fMXH54e2vJ/Zu0sUE+bjRK8YWTl3I0Kq5F+mOGdrIJAcrcFCMGakldI2tIv/OxETyuHD/EVwGwGujeBH2U/TWoSwPFQB7jy0Xum1AAv6+Kjp6B9SSuh9D4nIKGkF1h6AQQIkZ4mmbLUj7wFSdkf1mtsR14J29jCcZ69TgsErIp7CZcvdXEnaEVWwMs6BYEKYqCYseGAduCgQGisQyS+JJsNMro4DrKuhm7ix/8DZ0uUSatZSk3GLseZ6xGSRrgUvw9V3Wi2etNQyp6+pcYmlAZueGFm7a7yywL7dYmJv7S8Z5kzHRPT/SYWo0uTngrYuKxVRm12C6ALs+fIKQBFMLGHeYUVcvdmr5Xl/+0yQfN1hRRkoYda2vZaWbzhYDd0I37HxEillcpVi041q2gN0HY9Vpms2QuhHIJknKUTAxlYgklp5USH5fbH2qi/0z4rLr9oaWDpsMF9WxpK3L+uVGRA5X1z2cAa00TI1WqR7p+QgUaEbFB53lMRxkmjqLln9qfMfMA+G9FkD9ho1RaxsJT/VNyFRZ7tV3M3wI030Mu6+FTh1p1edPbIfhOjJOFA== 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)(2906002)(86362001)(38100700002)(5660300002)(55236004)(8936002)(8676002)(66476007)(66556008)(66946007)(508600001)(6666004)(6506007)(6512007)(316002)(6486002)(36756003)(83380400001)(44832011)(2616005)(107886003)(6916009)(4326008)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jbs4XLbqtMQ4Cy5/X0YNm5f3auqgDKY16hffUHPRWzrxt9CSpjSLmARcgnD5?= =?us-ascii?Q?QoMxo0Wfv47oZmE/PrO2cOKsKAda3fR67Yz2USDnQKPRxnzggVwtfDFz9uel?= =?us-ascii?Q?+gYd/SzaHsGP1JKpybgQSQWknZu3VmzQ2t+YpCyWT/fi4jxiCYX4+ALjHVlA?= =?us-ascii?Q?90Ba0Ogml+s3MN01k4CreO9TLShiPEsczk7oCJ8scC0e2ZgGMCZuCSnrxX5w?= =?us-ascii?Q?RTN0Cjx71CvP2fNRdllpUjIPoQ6p6cHIlbigitlqcBSc0Ye0/dvusDMA5ZfJ?= =?us-ascii?Q?EqTAu1fq4aJuSYPbl+fzUcQ85I0q94CCnwHhrQpO24PE7E5ULSHRKqPpyQw+?= =?us-ascii?Q?i9zBBGBhwAg1pxizdWlDLP0rUNLfTczuhLivbB4dnnFteZUWFrGRTgW1Sy7B?= =?us-ascii?Q?Fms3i+7amQRHwb/1t3xODqsaLuMS9vImdeNML3IWOpBgFFIwMsVVIk/AJKe1?= =?us-ascii?Q?NE29e9AcbnA+Porlbeer7WJc3GYgm06sbmHO0pFps9juLRI+/VC+oLn510Ha?= =?us-ascii?Q?/1EwLULAcyqCHHtgQotFd4LFEIZTXzckw20pVEgG6le8iC4kd6Yze2UlmTeh?= =?us-ascii?Q?bXFAUVlpkV9PyHeBYxkn8vrDiVP4wife16rBlxHrBdfdG7M8oOhkOSO8tj6w?= =?us-ascii?Q?q7c8k6DTJQMf90UfuLGH/1tSZxousEuOWWNnz/q9NFV+5R9QnikM//K3oI/f?= =?us-ascii?Q?Mwj62DGVXJJYph7xfT4GvUPxQb2R3jelB0ayeWBpi2vtzTMIGvDk+WgiqMC8?= =?us-ascii?Q?Hia21hU44iWZpjXVZEqeNrpMip6/BK884FaEf2i4xkKTN9sH9nHrky0p0LN6?= =?us-ascii?Q?8DBN9a/mSkMkb2eEfcm835/2t1owG+ivw7+tN3F0LFi4KkiagjkJ95oB4ojR?= =?us-ascii?Q?MYrwpcQfUVfIFkMVVBf8p6LCod1IkWoUOjx+a1RU5oHge+MXB/K7hStuDI9K?= =?us-ascii?Q?MhXAM9QLc8vJ44PzhrOmhwhaYmAv1OnjA/jkkXF66DYLeOZ8bQ5UIDWmeuxp?= =?us-ascii?Q?IqMCsi//wLCxsHmOHFSRVLfzMzb/d0uVPb1yA/q8rlPKnbfV1WvhZrzU4HTa?= =?us-ascii?Q?x5vhVBNFG9aaePMy9Q8M1WlIOJmaCe8shK3pHVkPxZbDSEFAiHjY/VbEGx6m?= =?us-ascii?Q?wm6IDzgB2qk7ZvlZD+DHdBiH5yyHNN/3diVbCwN71RLQR6ZkBw7ALXXfFgH1?= =?us-ascii?Q?UYce8FtfT6PMIaTP4KfLpMqjadsEgBMmxxeEwX4ffJrznSTbJXR0UcFogbz1?= =?us-ascii?Q?MLOOGbLGil/+090owc8kVOfDlU07kLx7oiqANHtVcCUjkbayHGMnXD2ppBPI?= =?us-ascii?Q?lqOSu8KLWpXx/mgMPtsDNpQFAPLot+OVa7NDwDiX+BKuN3BQckAaXKqqvWls?= =?us-ascii?Q?Usgi+75fsRjnBHhYEq6lauBvdwQN8L5pUtQk8oBbyazg/AT+y9pk6cm3wkEq?= =?us-ascii?Q?ZHxok0HWqyatvySCePNQ5umfHFUAlwTQs2sXNO6Xp66dGJMqC3110RhU/ctb?= =?us-ascii?Q?FnYpwAIPFjFp035DAOGKIjlnALarVcyWdXqRWpVojkgTSxJCp1uRuk36ilBu?= =?us-ascii?Q?2JAw4MMSUqAOnPDFcO+MuLskzZi9RCrE8ZMa79piNEZmSKpOiq6enOY6l3MV?= =?us-ascii?Q?EJ3zGGWtrm68Cm5LLG1xvZY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ff63ab2-b853-4c4b-2ada-08d9f0740e98 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:12:30.1986 (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: /SQNZu0jzaH3qTAHpHsOjHG534v8R/mZA0Vg0ZhT0ab6Q3meE8FTy9wlOi66o6h2ZuV0R9oPeFXLXSzs0ioPhg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2921 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. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f71494b87d5e..3252865352f3 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -802,6 +802,55 @@ 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 + + if [ -z $ns_invert ]; then + ns_tx=3D$ns1 + ns_rx=3D$ns2 + elif [ $ns_invert =3D "invert" ]; then + ns_tx=3D$ns2 + ns_rx=3D$ns1 + 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 + if [ -z $ns_invert ]; then + echo "[ ok ]" + elif [ $ns_invert =3D "invert" ]; then + echo -n "[ ok ]" + fi + fi + + if [ ! -z $ns_invert ] && [ $ns_invert =3D "invert" ]; then + echo " - invert" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats +} + chk_infi_nr() { local mp_infi_nr_tx=3D$1 @@ -920,6 +969,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 Sun May 5 10:17:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp437442jad; Tue, 15 Feb 2022 03:12:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJw6g0FqPt1kWSK/PUXzzzWsOHN1n6+2lQ2sYwnDhrrXDA0giInkrbANLSx9K6OW6dP/WPuA X-Received: by 2002:aa7:9e85:: with SMTP id p5mr3851046pfq.84.1644923563413; Tue, 15 Feb 2022 03:12:43 -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 b6si2499914pgw.490.2022.02.15.03.12.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:12:43 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3746-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=alHV6x+Z; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3746-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3746-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 F3FEC3E0EA1 for ; Tue, 15 Feb 2022 11:12:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1C837138D; Tue, 15 Feb 2022 11:12:42 +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 C30CB1388 for ; Tue, 15 Feb 2022 11:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644923559; 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=UAxbJ3lm6VhLg6Czenz+Qos9TMeti8BNHsAMqQvZhQY=; b=alHV6x+ZkTKDACndt7of4Zrf5Z4dZIy4ubNTztxmz4Ox1xWnNrx+Kb6nWCKZn2ZQPpg+v4 Gf7GQ1+hN0jmT46zTd6xJ/D1hQLkMt8D/XZ3uIttwmhYzm3K6RFQ2W3QN4BsLroL456f3X BQ1oG6hYObyD/UI/FPRBq7euIbkX4h8= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2170.outbound.protection.outlook.com [104.47.17.170]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-24-Y3T1TXVOMK-TMwT73zkTyw-1; Tue, 15 Feb 2022 12:12:38 +0100 X-MC-Unique: Y3T1TXVOMK-TMwT73zkTyw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gmvDJRQCUW4GLQGqIEwhVTs0yIz8z8Qa8MJB45zw+vK52Fr9HHZQJ9PRZ6X+kwh9QrLJ4XZP59c7LnW1vs4xpfmchqSsNlDvq0kEl5PYHp8/7M5V8ghAWnimMhsPkdmTbPkgvPt7lA2ocp717tlcFyNLlvA4X/N5r+qK9zV8or/X1CwiwgYJsz0jqgXnZXS1GhNIhSjxbyfwxOUI6cd7k32lnDTKAyZfOC7/3wylTnqjod+8Seo/ON9+2ITSsNKZSl7Xu1jsFc8l97siarCiO6zd9qOC8fXMfxQboPr0dPYTbWwS/X1bYSu7YxNVfYELluUqWolnuIAyleautEDizg== 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=sorjQj7txn9tkcQBr+ENLkOY4LCKsA1vIsX+H5KXUl0=; b=PVddmtsCFzbUpc+OlZ63bkCVgrQQZWuuxiYmuUUl+DPuCkUEju8vtrVLvRcdMvAnYUu33qJKZziM6+7xiJrNA+TrYld/EoRwS8w1SE5IhFpnuEsTvUcLWbNvP6vlXfcuwCbWe+wTL4+aeYZZfbAdvxYFBAOAHolvIU9ugN0AtQ7GaawUgTsycoYjSDWeKF1VZms7cZVI2S5PINqud4BiO4vvBUagip1OOq55lFmcwFJxA7I5XCcW1JAozY6ElIUM6h6YkF/89u3QMhPiDz0iX31hUFZzXKwJnpSxflvUKtNI2XD72sFi+gEZ5z5JWLr0vkWR0hpH0rwIFQSVhBi5AQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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 HE1PR0402MB2921.eurprd04.prod.outlook.com (2603:10a6:3:d5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Tue, 15 Feb 2022 11:12:37 +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; Tue, 15 Feb 2022 11:12:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 5/7] selftests: mptcp: add extra_args in do_transfer Date: Tue, 15 Feb 2022 19:12:21 +0800 Message-ID: <957c1a8f6986f338a6fbd99d61beaafe593bc3c1.1644923074.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0401CA0009.apcprd04.prod.outlook.com (2603:1096:202:2::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: fbcd1862-8034-4708-0b77-08d9f07412bd X-MS-TrafficTypeDiagnostic: HE1PR0402MB2921:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:635; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YMgsnmm0u6Fsjo9Hn6NtIETgL4ZsSzEDFGdUg30VgjpsH/Tn4UlrnZSW+MxG7p8arZITENOKKlbAqsfHGHh7E0IqE/wY0TkV/PEPnt19g3NEPR8KYapGPgZYnqqYFJnC9bg76npdbqKM9mxUOW1/lEh+lpczU/yWaFkf+ElF5GkNKA6zWbyV8K4alUQoYSsNkdibMosvoZJuvuzoL/w4lopKJH84f6kVZI3Lz4eNBi4Iy5TEEpg4QOQrbx5XR7OFjTNPyCPGXeAKkmgxPuQgCR+2YGOihTJ528TW/gDn6QDLR6UdMfiTo2zDmo/vsn0kPodYjKWF/POug8/SxkSj1xF54yup3S7le3KReqiq4ysY1TeXQNlUQUJ9LtIFST9xqSlxFXggz49ju9+yQY99/bb99htHq6VTUpy9oYW8G2ZbG8zQjsIk6Rwle6S/6Sc28DDGyy5ZGDG0mOsDt2xpoGqlEciLTSqRnPJHkFwtFFfUgHoeFLQwvEJpyfGxEqfYToToLxY399zoDCZ1KraNP0BiqqoXHzu1yntbsWNv4UMx9m/8wC3Y/lU1j8+w36sxBVs7JD0XePvKFk9/5mKVHt3nheyoGTS0yEzdl1DwDekTR9Q/qQDKGxNhPHrV9opk7s9nLqofessXI8TjE79qGQ== 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)(2906002)(86362001)(38100700002)(5660300002)(55236004)(8936002)(8676002)(66476007)(66556008)(66946007)(508600001)(6666004)(6506007)(6512007)(316002)(6486002)(36756003)(83380400001)(44832011)(2616005)(107886003)(6916009)(4326008)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0uOt+mrtQ9FdKOtadWtQT12lVivw5g+9xhOZKGwtCQ/IRZhLoyY+gcYlHiRk?= =?us-ascii?Q?9UCmnuGzN+0Do7bPw4h1W+nExnkRxagES53dnKZ134APcIoE9veRIWSGGYxp?= =?us-ascii?Q?eTtAXIuyKfB6Isy9SGMS2q7axAPCCIURtsGOH5mByTiGM+M1Z/Fvcgext9p+?= =?us-ascii?Q?WKkctmhR/bsATPkyvzKMXuTjA6oRdIaezEQl6XcGwFBDr6DT9tRV4SNYlsNy?= =?us-ascii?Q?YIoBJOHrIbhg3VfqIchwlYOXI+YsGsAdTlXkscrpUAEB8PS7J05R/YTX8KU/?= =?us-ascii?Q?g1UA2EcM7NNDb8s0vjhaXTGrKnmcB+gyNi/x/i/ekQtKZ96wQ9/x+dCJ4aMj?= =?us-ascii?Q?3DG/oF9keuzTVu3m9DTECmZilQd5djWW1lwxLBicqVeaWSCbkrQpe4iLmITm?= =?us-ascii?Q?zC3nEY+3phgVeLnQfHIqOAqfdlt6qsysIz6RAgPMVehqoTqdLZJXhVeCJEV5?= =?us-ascii?Q?yVrcrr+VfSbShTuqtz3B4r/ZP7s0JF/mhCDJGF76jNpkNb9IIqyrBfOveHYm?= =?us-ascii?Q?pwx3nPq2ndnCvpf3yJGXNLbwXfgHPKaD2HPJtV2zFep/093+iSEAsAUMxMRp?= =?us-ascii?Q?kuSXXr6RAB3tVCm8MkByeORzy2IWOtvNQMMnBflXmmm+Oa2yRNnfEwfD561a?= =?us-ascii?Q?D1bzyTkuKcv51tMhLn2+b01x2Q/TXlFyvOraAuTeCr7E+TNTPJY393qriBPU?= =?us-ascii?Q?glwhP702pTnqfXMsCo4LZJop1lenls/hqbhL+2WGAepcP+MHqjPmG71Ai74h?= =?us-ascii?Q?9G+b8ARzd2BNE2USYDG3SgGrj3aUDqUKe5vvdfUj/w4+rZRQT8cXPBzrKLoa?= =?us-ascii?Q?enZ2/Q+/c43EPzYygfh4ZQXtciPOtXxhmGRkmTPSrjEIXHcIbtDoKA+vWemh?= =?us-ascii?Q?nAUuCcgauptgC60Eg1zrEF7p+cbMUqZRaYO+Wo+Bx8PQn2+nKw4hvqbLKbxt?= =?us-ascii?Q?bb2LjHViHmZKoH3WL49Z0ILhrvzf+olmOyUan3tnHs7uhcLLlX9utsI/BAuT?= =?us-ascii?Q?yMjOyPzY/zfiPh5OV310eq5PkZmCOzTHOrCYuUIb0yU7sbnxGpQhSnACyBO/?= =?us-ascii?Q?QXORE639soj27FCjiiq0CzSA4yfup9mMacw5fcanr6bmjnmf51V6ymaAMuYX?= =?us-ascii?Q?AewKgwwVcOsea2vhH8Bk2BbGLagNuUXicxyxdMiHpIdsmD2O3CPhbcCUTq4R?= =?us-ascii?Q?TmHqdiXc97YSiBovFh7HrcLTA20fpH+VM0QPHbjc5P9NA5qGe7OLTSvMf+Rg?= =?us-ascii?Q?f/HUtHNBw06fwBtUHqp9a/uepBhqiIOKw1umSetM4aEiQC6tg9JIvnr9l7cB?= =?us-ascii?Q?HJxrMVHINOyxkmu5rf6afye2f/adrRnXoRQ4DAguTZgGkrSvPUrq64L4r4DN?= =?us-ascii?Q?OuQx+FD5VeAjOify9VoETevHFJO9DszZDhT2WwW3IzlnDhJb+zjeb2+rNc8C?= =?us-ascii?Q?SDWhqkkI8/br4YWeuUfexwBYSJNmdP5YXFSDY3yLx1s2qIP1+/PHJApzyHQ4?= =?us-ascii?Q?j/Ypiepl+HWs78V44sh8zLVTFEHJkC1pwFjTq+D54UkYX5Hp8YOEKcaXPEZW?= =?us-ascii?Q?5xnpLUuO1MSckYvPB7rFXGsvzGC57W90/yNgJt5YojYVFoyHSPtcase7RIAv?= =?us-ascii?Q?TKoi97mVNcl05xD1KuXqejc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbcd1862-8034-4708-0b77-08d9f07412bd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:12:37.1668 (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: JVAj5S1l2jv8YiLcfN3MFQ7cY73PZjRekR97PscdLQPbPcVZjHsKl82JTUS5/JQadnuJdKB7iojeSf6ZSCL5Tg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2921 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. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 3252865352f3..ee747f4a4c7d 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 @@ -454,12 +453,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" + extra_args=3D"-r 50" elif [ $speed =3D "least" ]; then - mptcp_connect=3D"./mptcp_connect -r 10" + extra_args=3D"-r 10" fi =20 local local_addr @@ -472,13 +472,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 @@ -487,15 +487,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 --=20 2.34.1 From nobody Sun May 5 10:17:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp437544jad; Tue, 15 Feb 2022 03:12:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJwqGVMQroXuk4EDqOrfd/RIW2zGxgDMM9QgotrvY4lO90FWKyRQn41Vh89a9vulwwrXeW1Z X-Received: by 2002:a17:90b:4b12:b0:1b9:8932:d47c with SMTP id lx18-20020a17090b4b1200b001b98932d47cmr3910909pjb.50.1644923570543; Tue, 15 Feb 2022 03:12:50 -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 d131si2296416pgc.595.2022.02.15.03.12.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:12:50 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3747-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=EaIOpf5t; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3747-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3747-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 1037A3E0EA0 for ; Tue, 15 Feb 2022 11:12:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2C004138E; Tue, 15 Feb 2022 11:12:49 +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 EE31E1388 for ; Tue, 15 Feb 2022 11:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644923566; 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=Z2BGJBNpRBuiEOOkvfH4fgNyFTtT2cnMyTi/9Gt5RKQ=; b=EaIOpf5tEKBTSRfxcAdYfR6nI2oGhLHX8oCgl8RFRr1Nfp+Td9aqx4+P/ha3G/qtlvXWgJ /zHMaqFzwTf6DclAF/uX6fY/TdSZa5/fgc0/09SuKpr+Me7Ni4FJk+pZqzdAC7nzf1IqWS IocRqzkHGs1iURJo0W/rxj4ErxKoEPo= 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-29-P8K4SiXJOsiiet4d4LdK-w-1; Tue, 15 Feb 2022 12:12:45 +0100 X-MC-Unique: P8K4SiXJOsiiet4d4LdK-w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e5MoqSVQF3NA3sDcHLfqKKKILSK0ySj8EIW24FxQHSKz4eL346Y2/V+s2C7GoMah93VPtjBS1jJqYRlk6O5wJ5G4aqh56gln/Sqd/yHpSPiI+qhWxofCKq1o91ymp7C8VgBWrgWqqj6jI8VIKdmSe7Y506WFi4P8XDqAdT1dOv2pSt+LthcjuFEeaDB4zscpptADFbWoko3z84OPASaGzIpI1ViTR1sGY4I9xNb02MrZh/6fM+cY98h70YOsp/uWDpOocltgWynUbfd8CoQlDrjYI0tVXOX2kHiJXQcE4gf57GDZfF5R/dpEv4RK/dBSk6wGW4Ouw1BR+kAIbC0kJA== 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=sb6nCRE4vbGMMS8rtS5F2HRnKWoTR2ctKv1p1hC7S1U=; b=YmMoZsf8vn5DUsG7GJHquIU1Uf8q+y7PNkl9jtdf1DIVPsC8C9eojVgz3i4VufrXtipNKoZdomYU9lXrJd6u38xkc/4/yVzGAMKRqLsjOq92rlPfnMKKnPwaYSaV1XCzdSy6+XKHg/Bw/brNQKMOVj0xxzRMET9PqPmRbGtd6cOmlgJ9xf32eRmT8KMgcZxqd3hGDpv8DFkurmRnNQKN9RDWzXyziCIvSYaUSB5xtXVHG/M5cB0BIxlUMUwjL/bzB98QmIx83L37C7M989uent3abwqKvPV3D6BjiA5CHQUQ8YI+DyItFJf4HaKK5Z7L1JeVtSz3xHSqe/7j1pQypQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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 HE1PR0402MB2921.eurprd04.prod.outlook.com (2603:10a6:3:d5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Tue, 15 Feb 2022 11:12:44 +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; Tue, 15 Feb 2022 11:12:44 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 6/7] selftests: mptcp: add fastclose testcases Date: Tue, 15 Feb 2022 19:12:22 +0800 Message-ID: <314613f6979364071c139f9e7688bf5976f2da70.1644923074.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0061.apcprd04.prod.outlook.com (2603:1096:202:14::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: d62c5f31-2952-4af8-1528-08d9f07416ca X-MS-TrafficTypeDiagnostic: HE1PR0402MB2921:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uS8dYMtIyR4FYrjo13W8PM01s3RXngy9/ARAX2FujcxoB+Zvwoas8jITngWd1aX9AiKbawLfZIBmCB+edUgYK6hgwiJYTmvBftRCAMxa2GjjSKXkiBYORyIeqO+7UXxYatQEVLDJ7pyc1giEfv5rl4GnZARq7kBZCu40W8gJj8qDSy8KIDAfekYD16uoZB9lmInV3o1snP5ESKc0jE5cuLaguTbPNot2NCYc6bDYSPJ2GpK/8Aj5DCHIx5xkabnBVL4PQRC4x0zFd5wJ6xMk5GALxy+s4AT/I8zfZSe970S6vaGevjskZryXu/B8fX3LAv92i2fePMIxIaTJYaKzWcR0sSCmENrV+PGyk/yOJvM7slVGe+msDHCuFSBv9H5bHLuSF9fCu6/lqcBdXXJzj8wnkCk70X1Ikp9vdHnMy7S0NgGYc6AztgYe7VpnQT7xBt6HbzqA5cmdM/vM0/DLfx75vJ3VrSs9k5lbXcHuL2DQ+aFklr95nlnh2oXB7zrFHXtHHxGk+EP/aoMYFVEJKZ1mK5T74PaWakBvhkN6With6nn+KUXkuto/NnVwVc5VYNYiVnRQzOvvE2KzwMwb/ePak9k3f4rtfpKB0ixdKfudKoe1iJmlRVp+MbaTKPUzbEgN55BRTSmwphEdQvZkFA== 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)(2906002)(86362001)(38100700002)(5660300002)(55236004)(8936002)(8676002)(66476007)(66556008)(66946007)(508600001)(6666004)(6506007)(6512007)(316002)(6486002)(36756003)(83380400001)(44832011)(2616005)(107886003)(6916009)(4326008)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jBAESBcpRQ1HNKiSb0tA5IBSX2DoXlGljofWXisaB/kAZUbtxcD9X5nfSc8z?= =?us-ascii?Q?s9Oc7j5e88O5n7kEAYr5eaJ/d1jHIkuNvZY3aVPdf5IZY67RxzNp1V/Us0vP?= =?us-ascii?Q?QpNBKydVBxjeJvI9frb0IvZnVMqQh4Otg7GfFERRVaS/zoDrfc9s898kc4xR?= =?us-ascii?Q?3UNQu9myrwrhauRrDCzhBIIHtm82IdxeURxbt59j8hia2N+BcAsXCmu29Ts0?= =?us-ascii?Q?HPRaKnMlHWP4zT5sC3XgnlJJnYJcQ5qmEuBYyO3EQDYhebCutfJY4vjboY2p?= =?us-ascii?Q?ZVwegZLYzz53C8WiXStmh1/N3o7M720KAtHeKGbHS7MBQw6tF9kGnEvk7kxx?= =?us-ascii?Q?2658j0neGCbZ+TBpxA+pU9I+uRxtF3rQ0w+RER6QnklgbwQ7jlKXusOmnx67?= =?us-ascii?Q?d0kU8IKTk89WFSXdBr1MCZpv//l3djM4orUIfzzHhbeUbQj857r/EaPRQcoL?= =?us-ascii?Q?nnUPuz0VbDqIbw1+aaWunz3UTRj523gH+8p8nWV1/kq9Iao+YAAthL/j0fz5?= =?us-ascii?Q?0j+svEuxzZYw5lZfIozx5Dc/1qcUExpvByz9mSrVBHiVZE2ImxlMmecAF1A+?= =?us-ascii?Q?G0e63+fib43nsyA0aRhG94XDXp8/i9gT8gxuVB9wCj+lxNx2IWC4N+uvZcJA?= =?us-ascii?Q?PxwdZr7z2GK21adVlopA4YlxgfnDPRJi7FOw4aKgfnBqNVcAKq6uOKngagZ2?= =?us-ascii?Q?c0qDeXP4STseB1GX+ghFbmlz4eB1iQwK3MbaCavSKhV3qobJnoThT5c6P/hb?= =?us-ascii?Q?d14fi18i8FsaIfyETWFEFRdhzS4pPqM88vhgWYnhXJBLdRxB46jnnTLJgiVs?= =?us-ascii?Q?s16FSFKO6Qyadi2YSVHiAFuHGllIE3wcKavAWJaYeEFLgSDxQrchpZ6vmpHQ?= =?us-ascii?Q?dkQzJv3Tv605pPrh7SdCSFTPNfsKqpQL8ElbMbOR2M1fPxjOtvUla7zj/qRP?= =?us-ascii?Q?9BV502obKfBSkJuNlvd/H+4ZtZTUayOD258EwW+HldB892ZZmRoK7miQky+g?= =?us-ascii?Q?4x69xfO5oJLSxgvIU3IPb2PB/mhO/ET1e4vKAPOqO5H0Um3nUkUgpd88bfkB?= =?us-ascii?Q?1TWkq64wYklmxsxKfNsSB2BkHwVlynqbBoCaQvEEmx5wudqMXmoWykR26NUh?= =?us-ascii?Q?b9vyM9+b/ULLKDVulMBU8iJgwuH8QTq9NL3xDooETTibK4jI96ndKFisWfkS?= =?us-ascii?Q?FzEG2wa+Q9HDu0AFXfsc9c9ZZkU57Yzz+77gur9V9ukEAfmYiw2HXIaPlcL4?= =?us-ascii?Q?kGKmTyNAKyMy0cVFAH0zV/BnHywGNaXetJGZatKHHdyavFylrHZ8qCJhU2c8?= =?us-ascii?Q?61J6fzuyFRe3B2wysUk8AtlzgbriMFiSrRqM/jPdTEyiGUNHuqzNYKeZnhzR?= =?us-ascii?Q?M8NlG3oI0P+6NN8yeMzpCi32Cc+cLeLTuT01/KjYHAGNzBK/CMWeFIG92LLS?= =?us-ascii?Q?SsumzvnH8ErVrgqf/zUU9oEq6IxkE14ftI002xwTRIdjkvJ40WQ52stdS7/N?= =?us-ascii?Q?0qAc3bJt3xb2MpYsLWRG9WYX3lsuyDwl8GfDPvuv+Je3Qju8f6w1rb07H6NJ?= =?us-ascii?Q?ibyh56TzqMXGpKVxtwUBIWASIk2YK5eUzjPTYQGR+F4/tNzDH/xJwmYu1qVd?= =?us-ascii?Q?uDzkmJwebQRYVl+41buDBss=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d62c5f31-2952-4af8-1528-08d9f07416ca X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:12:44.1663 (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: 9FnPLDaFpA/qLzoxW6TsNa5WaSw5R/e3uvloEKFRjpIm5m1aecMh5/O7Xu9IXq7AHRtuxFAC8DAgmdYU9XViCg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2921 Content-Type: text/plain; charset="utf-8" This patch added the self tests for MP_FASTCLOSE. Reused the argment addr_nr_ns2 of do_transfer() to pass the extra argments '-I 2' or '-I 3' 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. The output looks like this: 001 fastclose test 1 syn[ ok ] - synack[ ok ] - ack[ ok ] sum[ ok ] - csum [ ok ] ftx[ ok ] - frx [ ok ] rtx[ ok ] - rstrx [ ok ] itx[ ok ] - irx [ ok ] ctx[ ok ] - fclzrx[ ok ] rtx[ ok ] - rstrx [ ok ] - invert Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 28 ++++++++++++++++++- 1 file changed, 27 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 ee747f4a4c7d..00a35601f319 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -462,6 +462,12 @@ do_transfer() extra_args=3D"-r 10" 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"::" @@ -2285,6 +2291,21 @@ userspace_tests() chk_rm_nr 0 0 } =20 +fastclose_tests() +{ + reset + run_tests $ns1 $ns2 10.0.1.1 0 0 fastclose_2 + chk_join_nr "fastclose test 1" 0 0 0 + chk_fclose_nr 1 1 + chk_rst_nr 1 1 invert + + reset + run_tests $ns1 $ns2 10.0.1.1 0 0 fastclose_3 slow + chk_join_nr "fastclose test 2" 0 0 0 + chk_fclose_nr 2 2 + chk_rst_nr 2 2 invert +} + all_tests() { subflows_tests @@ -2303,6 +2324,7 @@ all_tests() deny_join_id0_tests fullmesh_tests userspace_tests + fastclose_tests } =20 # [$1: error message] @@ -2330,6 +2352,7 @@ usage() echo " -d deny_join_id0_tests" echo " -m fullmesh_tests" echo " -u userspace_tests" + echo " -z fastclose_tests" echo " -c capture pcap files" echo " -C enable data checksum" echo " -i use ip mptcp" @@ -2361,7 +2384,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchCSi' opt; do +while getopts 'fesltra64bpkdmuchzCSi' opt; do case $opt in f) subflows_tests @@ -2411,6 +2434,9 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do u) userspace_tests ;; + z) + fastclose_tests + ;; c) ;; C) --=20 2.34.1 From nobody Sun May 5 10:17:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp437623jad; Tue, 15 Feb 2022 03:12:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkGXJ/9ga0Ldw6njFSK0TAs8sw3e2FaJKWbCGnHVka2wtULhi0v2PWjBD0k1oTehIpBwNj X-Received: by 2002:ac8:57c8:: with SMTP id w8mr2232286qta.218.1644923577977; Tue, 15 Feb 2022 03:12:57 -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 g7si3727470qtk.206.2022.02.15.03.12.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:12:57 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3748-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=UrdlQyUU; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3748-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3748-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 AC4C71C0B40 for ; Tue, 15 Feb 2022 11:12:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 74CEA138D; Tue, 15 Feb 2022 11:12:56 +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 432BF1388 for ; Tue, 15 Feb 2022 11:12:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644923573; 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=qENQgcBJVymYHDxiEsVzyDKSgZRD99NlXClgcelEjhQ=; b=UrdlQyUU65izhGs5e9FqTmfE8+iROVyimMx05XNAS1fhMCYndCQpRkDeBSTPVnQLc2fROq xwh5Mn7EKjxDdSzsrZGtu+XgK2xxOMgX0Be7JEDu6HdRTWtPyEJPJxIXwuHeFLjQ7P8WPj EMAf+TxwbZhP+QKLse1n2BAD4szkieA= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2056.outbound.protection.outlook.com [104.47.10.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-wUe1FITCPHOXf-pai0vO0Q-1; Tue, 15 Feb 2022 12:12:51 +0100 X-MC-Unique: wUe1FITCPHOXf-pai0vO0Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y1N/QYdFddfx8TvZ/BFoBFd+zAOCMKP+QBGqaxRvcNk9Ois7hUDsdslUNbvDRu9xFX6I7kEvuVMDbMU2OSYi7GWqJ2/7RmPeGmJ+SzorhMx4JLlM6nSbwYBvADLD5KdpxOzCBfhOt7ZDuJ9D0o3UTgmzuznIdtb7JjrjIaBS+MAMdpQPmkGwMS29NVC14bajAu8HQaSasJTM2+3TurD5INLMN8An49CATKURfqhSqzs985PCNhYZnmt02j/uy/xX3K1yU7Ykv65fkfzhTYcOUUEZ6C7eQ35QouVotJcnLqSpguYiv49obw87BMgpJIVosjtgJQAJLaad1TGVqIBKeQ== 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=LVovz8PKcYuHJPHhUDKRp/hv3gu7gP/cda3u0dABnqY=; b=l/C4zdjxEb++bXzIL4qXLzXBHTsMbbjXJShrQiLAeVIAkCWKaWN5/1rMOMkG6n7lApU7plIxnndr5SfLa4MNaUSytMj5+kKC2nP1xzl25Qh0z3K2CNAOvYGW5kuwCKbCicGTw1dY0XW9JMWS6YH3uZeQxLVRNUEvZcR9h3SysO7Azat7j8QBPLU58MVc357GQcACqckTz2eDAcEbfFDsfQGMdQ9Ck7mZpQ2gMNdxb8hV6KtqvHKtqy2+oHn0oq5M6xGq9PL4cjDeS4h318Waxk8XGJFfGbtzO55A0S+yCbnE8ATLRG3iRCxyhB/HFqdhOZ+Gm2/OCwqiTLmsyts3Nw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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 HE1PR0402MB2921.eurprd04.prod.outlook.com (2603:10a6:3:d5::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Tue, 15 Feb 2022 11:12:50 +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; Tue, 15 Feb 2022 11:12:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 7/7] selftests: mptcp: fastclose check in mptcp_connect Date: Tue, 15 Feb 2022 19:12:23 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0045.apcprd03.prod.outlook.com (2603:1096:202:17::15) 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: 34bf659d-a2fd-4b5e-d0f3-08d9f0741ac8 X-MS-TrafficTypeDiagnostic: HE1PR0402MB2921:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:390; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YGNaPSqakTtwoMp47PreXFqRflJAkWac3vaVnM+SAV71BEy8zd/m73eOfgdmvKjEWZZ6BCj2TFbBWeG4CtznPUxU9vg+AZe3Ep3tVveMW/cww6o0Nh+3Tufux81n33zOcru2yGq9JRFeEAgclAGgHU1m3WKXwBE2Gm9C4/51v2zLrbZ541UwG6r9WLMRk2c0ACpQCBQIxZyoKIoZwMHYIcRD/WxOQ3drrb60CFXAlGJee8N0WwYADAcC4DudW7vl44Ro5QnYB3IOo5qPrOr8U4b8dH6KanDwQHcSkQfqugDhG3cfkqU0WDJ1h+yV2Ip50TfWTV16roByOyky0NzC3eGdnOT4DoIZqfmS3IBl9j7/Kt42BC7KaHNb1lHXWLhw+k5PoGdQlW7XIAH4nbex8/TQK3QR8+7SOH9dzZNf7YPwq3HcYECOVWIR/atdAhbJAsSFGIt0iznPBVVmTKFBVmK2R4rufPKqJJfLiY2CpUHwERKvAZY1VTldgZlxvO1G6EVAotagnEzduUWNTA0ZX4UN8Jy07z3BEy2zfluj5EhX+B3lsShwjcbvk2siECs8Bg8mOdNTRbZ8yGjcDp1waSDULF7c+y5XoMYy98/t7+Rs5cEQKkScJvNd1ykSohBhM7euS1z9Ch5XUkMOsMr7zA== 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)(2906002)(86362001)(38100700002)(5660300002)(55236004)(8936002)(8676002)(66476007)(66556008)(66946007)(508600001)(6666004)(6506007)(6512007)(316002)(6486002)(36756003)(83380400001)(44832011)(2616005)(107886003)(6916009)(4326008)(26005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?i3c9Yo9s/qSKi6n0x44jevnt55qEpfoJoREWHrOMYY3ILGtj2OlWQzsX8XGi?= =?us-ascii?Q?6R7PlfjjOSLBO0YSiHUScevksmY9SOJVOelz052WeTdhVAqd29JWJYpAKck9?= =?us-ascii?Q?K2quOtZcPvSRqePRUURFNcL+8s6bGgyRIBIF4YVc8h6nXOGi7nI3jlgHrvSx?= =?us-ascii?Q?QTQxbek8BI950ztX4n1cr50CuIPUdfAhTHDpRwWuV63pT593lx0WhwKHaV4r?= =?us-ascii?Q?K1fsT/r7PnyRT1ZhUlyPGsDQBB4Kc8l4SweGtmNKVqTOMzIxMDDtK4zMBcz3?= =?us-ascii?Q?5VxhMq4WDnCBXYczLKBsE+n4wDbgOuFE4oTTBE3TmxsGSaBhXj8FDks7z9pX?= =?us-ascii?Q?HStutLNvSVoyKbDSUykiGFm5FKhGPyBQlofRjrz8ug+OnL/p1vLoLss16Ns3?= =?us-ascii?Q?JlVFfu7tbqoxQ/rxCDK4nS1j3LnCZdDy/DHHPPmwSomznDcMZ+nL8Z66JVkf?= =?us-ascii?Q?bKDuvmkpGSVPzsaDspSidkUQtgOQse1CXEhOGjMcpXHIOpCe5KcUwoxmCMa9?= =?us-ascii?Q?yLcswxbZte0EyN1MICXuS9XThkMar8iUolAbMy4t5bAmw1qZDKDIMz73qXXQ?= =?us-ascii?Q?53eFMuTxuRqe0vwSK8eFiUx4Xy1pAxqcVvN4dYFaLPO7QyeiNPoG0A8RZYUV?= =?us-ascii?Q?ZAq4DyXGv8oxf8R/euPH8+92EfypcCPrddIYXMbjYc0j/BzdViI0miC6tEGl?= =?us-ascii?Q?2W+1ilFE1QdbiHFQWuWup1VCzli5wD3NhfU3WU1tLH+jvM9whCy/mSQmRVuv?= =?us-ascii?Q?qDNnE9EbPuaRcu2A3uamhHLncSU6DBrVrrc+3MJLZAft8XqemLEoXg4zhe9O?= =?us-ascii?Q?wLYhC8wNGdznwoZjZO7miDI/Nbl0guTky5DPP1s4HjrelMOPCt2HXopbzzBb?= =?us-ascii?Q?Dr57QNKNKAnwL22AJcFt5fUTStIkkUJumKF3OtfNta3UzTPynKyOKjccdCGa?= =?us-ascii?Q?381mcJygNq1jdmliByZIn3vgFNuloDDBLx/xojmjRI7lzPlbjs8vNIs8rATP?= =?us-ascii?Q?kdoC4RQjhfUfJLMn3Ox8vy3A+DJF4SwPIpG85wGRj0x7v+fdyZAip7s/Dlvv?= =?us-ascii?Q?v92M/J/vMAS7O0+mGhe7NMUnT57QfhnO76dTS9o9vXDo1fDFQeoTil/VPzQz?= =?us-ascii?Q?Z7BHk/lR7x8ROe3vDFWjPClbNjfg8c7TQVWHkmwf1dws7Bs3HHkpXr90jjFv?= =?us-ascii?Q?GQwdyWSRUH1NEfpvYhI26Vfo1f6s7o+qCxOrL5aqZlZ9QzMLnWvUINxjYo2Q?= =?us-ascii?Q?X8gepxe258ywICdj2CgeO0bCywdYV6skIjjUiP3jTR+h6Gv8LqmU3lBcfgPg?= =?us-ascii?Q?Ja14aVYmwKB+CNORNZ8RaiT+pjE0s/gJu05tcii3SFl04CE1eYBcd4TCOwTt?= =?us-ascii?Q?6RC8ZdYAzUGFQLzB8iGkxnpQwKfVendDEKqjBhWoNOnGdb7LHMqor7MJTGI5?= =?us-ascii?Q?X14hgofjzjLH5ETPpvjJCcrKmkAU2ChTP5eTkozUXgqf0jvvy+GsRGYUmi0g?= =?us-ascii?Q?PG61kb2pUx+We+U4we9aQodaTc2k+GsEI2MI/O0Rn5Lql9C8NDWOf/etnZuV?= =?us-ascii?Q?eKU8Rj6FWDFtKOkXn1AZ+m6l+LNK2+56WLOgtguMSCltrI5tx1p//wK7JY+I?= =?us-ascii?Q?A74DsOXN39KnwAcOZawNo84=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34bf659d-a2fd-4b5e-d0f3-08d9f0741ac8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:12:50.6814 (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: qLBMtPkmVxig+fDrCWxsbTv6oZiDtgP8e7zxcAEV6QRWjGTRXpPAzTVcvKPhjIV2g7tSsbKa0go4HdSlUrTQ8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2921 Content-Type: text/plain; charset="utf-8" This patch added the MP_FASTCLOSE mibs and the MP_RST mibs check for the disconnect tests in mptcp_connect.sh. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../selftests/net/mptcp/mptcp_connect.sh | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 5b7a40d73253..b27e2c884523 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -434,6 +434,10 @@ do_transfer() local stat_cookierx_last=3D$(get_mib_counter "${listener_ns}" "TcpExtSync= ookiesRecv") local stat_csum_err_s=3D$(get_mib_counter "${listener_ns}" "MPTcpExtDataC= sumErr") local stat_csum_err_c=3D$(get_mib_counter "${connector_ns}" "MPTcpExtData= CsumErr") + local stat_fclose_tx=3D$(get_mib_counter "${listener_ns}" "MPTcpExtMPFast= closeTx") + local stat_fclose_rx=3D$(get_mib_counter "${connector_ns}" "MPTcpExtMPFas= tcloseRx") + local stat_rst_tx=3D$(get_mib_counter "${listener_ns}" "MPTcpExtMPRstTx") + local stat_rst_rx=3D$(get_mib_counter "${connector_ns}" "MPTcpExtMPRstRx") =20 timeout ${timeout_test} \ ip netns exec ${listener_ns} \ @@ -543,6 +547,39 @@ do_transfer() fi fi =20 + local disconnect=3D$(echo $extra_args | grep "\-I\ 3") + if [[ $disconnect !=3D "" ]] && [ $cl_proto =3D "MPTCP" ] && [ $srv_proto= =3D "MPTCP" ]; then + local fclose_tx=3D$(get_mib_counter "${listener_ns}" "MPTcpExtMPFastclos= eTx") + local fclose_rx=3D$(get_mib_counter "${connector_ns}" "MPTcpExtMPFastclo= seRx") + + local fclose_tx_nr=3D$((fclose_tx - stat_fclose_tx)) + if [ $fclose_tx_nr -ne 2 ]; then + printf "[ FAIL ]\nserver got $fclose_tx_nr mp_fastclose[s]" + rets=3D1 + fi + + local fclose_rx_nr=3D$((fclose_rx - stat_fclose_rx)) + if [ $fclose_rx_nr -ne 2 ]; then + printf "[ FAIL ]\nclient got $fclose_rx_nr mp_fastclose[s]" + retc=3D1 + fi + + local rst_tx=3D$(get_mib_counter "${listener_ns}" "MPTcpExtMPRstTx") + local rst_rx=3D$(get_mib_counter "${connector_ns}" "MPTcpExtMPRstRx") + + local rst_tx_nr=3D$((rst_tx - stat_rst_tx)) + if [ $rst_tx_nr -ne 2 ]; then + printf "[ FAIL ]\nserver got $rst_tx_nr mp_rst[s]" + rets=3D1 + fi + + local rst_rx_nr=3D$((rst_rx - stat_rst_rx)) + if [ $rst_rx_nr -ne 2 ]; then + printf "[ FAIL ]\nclient got $rst_rx_nr mp_rst[s]" + retc=3D1 + fi + fi + if [ $retc -eq 0 ] && [ $rets -eq 0 ]; then printf "[ OK ]" fi --=20 2.34.1