From nobody Mon May 6 21:52:15 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4873997jam; Sat, 12 Feb 2022 08:15:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/JzjwlU4hoK/bqcOy5nbIVpMtODkjin3ZZ2u3z7huN9bxGG8Z+VtGiAEtNf9P8pLNLpgG X-Received: by 2002:a81:56c2:: with SMTP id k185mr6809050ywb.314.1644682536088; Sat, 12 Feb 2022 08:15:36 -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 a4si1677507ybg.796.2022.02.12.08.15.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Feb 2022 08:15:36 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3695-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=K9OZJdfd; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3695-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3695-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 9C4F61C0E71 for ; Sat, 12 Feb 2022 16:15:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 250D52587; Sat, 12 Feb 2022 16:15: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.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 8CBD8257E for ; Sat, 12 Feb 2022 16:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644682530; 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=K9OZJdfdug7sZXStCd3MsTmX6ZQyDXz/pw7v4MRQ58BQfTV0/7KZfZeQA9zyf7F4pNGCZa WNmwHFlXl7Byk5dEr4I35abIr3I+twE1Mgc//zuaZWn2qBy/uSWcp/EUuKjq9/K8NsrpsQ WDMhY9GfO3J4QqiLgSimlhmIiXePO5U= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2109.outbound.protection.outlook.com [104.47.17.109]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-38-7FiZQWSTNn-_FQ3EA6pLwA-2; Sat, 12 Feb 2022 17:15:29 +0100 X-MC-Unique: 7FiZQWSTNn-_FQ3EA6pLwA-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FNNEt3CSfN3y/p1ODiTmSLMvhikjNMQQrElZEa70iEGR69+uptW2Q+3CLi7IEIUcmw+cP/CH33iPrWd8d+esH7ixJ/JucH8KsZ1EuvUO0tZqwlN5UF3S5hxvqFalGQjw4JVH88r00c5f1QPez7kwei9tpdpqaENU29rqQDnPXpBYBOSlHrF1YeoNZwkiT7h1YL32DxcpObK5eMWFtwzv0ou2Y44djVguot8J3HCgSjPFwO4OJrBbyG6n49z3Llg4YJDOriPZ1CmET8FwW08aHbHh6Hd9upCgdhibUX/ULb1Y4IBYGAhq5JNfnUGTP6tN8nWQr6liIGDQ5JQyYdux7Q== 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=FC3amyoHtg6iZ71zx7sTnDhwOUgymnwChn6BJ3xxQUt+g1/HNa4tmvZcw9ZlgJeR+Qkj+9NrFlUkW3vO9nRLUBje75k+NLSDpDy0x6gKoZ3vrL+mqmj2cMY+hIS+4hQbUlHA8zR1KGBGYzx82YwQGNsFajsOh/KfeAyUtyAvDoxBcYQQZxBXhoaV+nrlcPawD79aXHKeZMiigqg17Aq5icpNfbV04mRzx+9P8oGw4q7ifdj67vHe7HKdRl1btKINklcR5BAgzpP+z05IGNGeS5UiQ9nuGA9rxhosnBhQhpSBmvA8Lt0nM+iD8cyRl2j5NueHL67CC5/w/YtH2vY+EA== 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 AM0PR04MB6548.eurprd04.prod.outlook.com (2603:10a6:208:175::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sat, 12 Feb 2022 16:15: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, 12 Feb 2022 16:15:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 1/6] mptcp: add the mibs for MP_FASTCLOSE Date: Sun, 13 Feb 2022 00:15:35 +0800 Message-ID: <84edb0aef28c74422d902474216ad7add42c440e.1644682054.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0148.apcprd02.prod.outlook.com (2603:1096:202:16::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: db99244c-5385-466d-e231-08d9ee42e268 X-MS-TrafficTypeDiagnostic: AM0PR04MB6548: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: 8mXLWBzaTnQySb/WtrR+nfg5HI0NdM0W0mIXOcO73L/GRDKlipVrKevv/pvCBssbqyHl80icK+qaJT4Y0KZdW9/kUV3ORRLo816tB1VY2ZR7FR21ATJdYMghI47oX6HSe/lQCEGoh7GYG6WFXmUSkl3+SAI9Gr967GY3f0DT0/QNEgwnZLvtJOh67f6kyIAUTAP8jc/rVJIhOCjAJ5fi2GiwfSdY3WdQ6n9gP8HwXTJjMSog9rdFo9PB+k84FKqklMPJt5CqhIHmjgl2YqcgiRJa4eYGQ9SmoqDvCDIwgmWWL34gz5Q/Kjd6Pdt9hze1d8syWgQyesiy1xkH/B3Mux4Yc+6NfNXktnZNycLiSyq36OrbCVHZYvjzDvSpl3N7N8yktvF8/fGNImAaJNCBBIx92zOhWVdJgPGuGeGQ746Qxygn8/fsBcKOiXdEEOHipkaO1kaTVWP0FNlEqbncCl9gpt7j9OCvO9acLGKQFYs63XzhqZvIMQ8DwhMS173upEaFxXCCpFMoUHo4rrFiHgwrts+8Ve+AGIANu9iyDdvtc/gxHTtbDbPGzkDjSq42r73gW8F1PKj5KEQ34tx8vI2+7E4rjUgnsJcBYpYK6SQjhg2D6t7eC1SZLgS6P3LetvtrNTu9va0J7xhpc8ci0I3Uy4GfNISCTTA9t7jF9qsdyGgMShI3LBNOFlbN4FLK 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)(6486002)(6512007)(5660300002)(107886003)(38100700002)(8676002)(6916009)(316002)(2906002)(36756003)(8936002)(6506007)(66556008)(508600001)(66476007)(86362001)(66946007)(6666004)(186003)(26005)(2616005)(83380400001)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o/jL3MuzjNZMNC4pbFLbapI0PCX19ZB10dlaEWmWQFI9wyoyImbto/vcgl/l?= =?us-ascii?Q?7OnN1iyxH+ZGKDjqQupvqBIkhXS6a8W56uJV7FVj59Kceg3B2lPxLL33Br1F?= =?us-ascii?Q?eIAoZ4gRSvV+GNsKOmwRldfS/iyuUIslvYRHBQF1bcednIOJ8eiIIgBoMtqg?= =?us-ascii?Q?ZlnHChNzQKSeZx7/hYKY2VIlT8JeFVD+Nj0jZaz1p1hEKs/hfKJP60SU2Yv6?= =?us-ascii?Q?T3NiE8fXywjD3FTdvQAtDI7A3VzOX/WbGRvJJlEb5MCoo7eLG8MNlzdWZmta?= =?us-ascii?Q?F5QX8rYA41Hbp0Bvz6haViW2FgZD/aOlp67rV7tGPzp6iPNc0vJj196sETvg?= =?us-ascii?Q?JqGKKNkmR5/EN1Ug9JnRAzaPqSbBkaH5Qz3ScbuQkF1LtBqZgW/t4UH6SRoJ?= =?us-ascii?Q?iYyykEjdoA12oMVcSyZkbLwWvS60cVCe2WEvcOxrC4CkB96vZs/8AqDJSbbU?= =?us-ascii?Q?+Km2yOEWX/wj3yrqKmjXo2NSOyJHaRL9P85i43a7m1PKZFDbKaOtAwp1b66q?= =?us-ascii?Q?XZgoVi3DGXgzqy2yOqDsq1r5FuP7F/GHVVGC0IhzzIysWn8mwmJ4sKka1NfS?= =?us-ascii?Q?mctb3oxsVJ8gvA63lHDwGXy9bdp2enghOwggq6zQyHPoog2CrihaWER1Dcoe?= =?us-ascii?Q?MCzvx8z6klqj8jfRD/HKPBRaSTRD4lC02pGsz3TcLafPIn5jriAv7n6vIykR?= =?us-ascii?Q?q9GehdciwikTCnqC6qSKfAM5KtTBWDMdPoaCC3W1nOAn61sZhJWlQ/SFT4eE?= =?us-ascii?Q?mb3/p2e4GatGpYGf1we8rDvtDgggobEVX0b2Oi5a1gCYKBvfXXNFkZBhwI1B?= =?us-ascii?Q?T2riSLFYHSciLtlCdnqbucTZDJ+5HijrGRyKFPIg6qFrU8vxhDRrnQbTfKcJ?= =?us-ascii?Q?EexXGQ/ZrqHbNYHmXjKPsEAgvnl961wpQttx7mc9NUanRxTRqI7T6fmpD29I?= =?us-ascii?Q?iDBVIYYOEFG4/TA2+FpMi/32aGqahTDHDbDCpBef2fkR/mv6zENMxSkSjBK6?= =?us-ascii?Q?ywFlAb5whhKvmrqNmXVdfLNdM5Lgo330W/I1nxZKwEU5afU8dhYTs54E+WBJ?= =?us-ascii?Q?kUaAA85SM8AQ32WApJb1dZxIjz11olJsez4Nfucpv2LygYAR9PesOtxUBGtd?= =?us-ascii?Q?axiWcq/YOi4HomIAXhpX+ROvA+fHJqvyU7XdcYV9KoiyIJAzcsxP2h3NSNEh?= =?us-ascii?Q?WAe1snwzNJ9UqO7BgFttgXVNSs1J5IWMwtM+tp1gf5rWXpjKZxrgYPwlaQ8n?= =?us-ascii?Q?RUGPkLOlrSD952KCFvUwbvS/N3ca+DXGBnliw+MW7S/HgL3l3KIU0OgcF7+J?= =?us-ascii?Q?dnJfqvjgc4eqvfjzQwlPLfzw1r+P20+UJz0R1n7Eb2rnfX2wLGNZPg41PMyG?= =?us-ascii?Q?lKzrBS3kOGh2MOuHdr26QL5kzA7eQuQ3VOlk8iEpPDhh+rMoc+50ve1rmp8g?= =?us-ascii?Q?Ny/u9+ho/GRlrClNzaNhCHL4YKxWzYgqDu30560+6EzT7A28v2zeZfb4uuxr?= =?us-ascii?Q?bzmqJlrxWWs3W2rOVSHCqOdwcazITXSKPTqNPI3mYSdlsGEaG1aVLbkKWPGc?= =?us-ascii?Q?NSfA6KRBmAOFoWf+sSbAbCmVXVQV49oGVSDJGxytmZJaC5YkYpWKT020qGJ4?= =?us-ascii?Q?bDy4SFsUCEZfHLFJxSxtOpc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: db99244c-5385-466d-e231-08d9ee42e268 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 16:15:28.6849 (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: 2Ymy5w2Xkxt7Hjk7Ltq1xAXieTTlGZqFkRFdzVf+sa/0dUSHKXe/lpXyi7HKWwTCiTYe7cyWAbKR6uwYzKoa5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6548 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 --- 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 Mon May 6 21:52:15 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4874082jam; Sat, 12 Feb 2022 08:15:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5abMcKHJFpxMF0SJJEourn/UNxikS4+2Kt1mrzCFo55+2ogA1kZPE3w1JE+WoD5sh5rq0 X-Received: by 2002:a17:90b:4f46:: with SMTP id pj6mr5958646pjb.43.1644682544080; Sat, 12 Feb 2022 08:15:44 -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 y16si26328845pfi.371.2022.02.12.08.15.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Feb 2022 08:15:44 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3696-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=cGJuvm4h; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3696-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3696-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 A14573E1071 for ; Sat, 12 Feb 2022 16:15:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AC33B2587; Sat, 12 Feb 2022 16:15: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 81346257E for ; Sat, 12 Feb 2022 16:15:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644682539; 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=cGJuvm4hiVafg1zi52/pQ5/8xPc6o5U07saY1a/5RSui3CAbpqNmWztvjnTKmrZ1f9/xtP H2sjcJOpsvXm2BrCiRjo0QMVhTM20G5pklwiphdUiNFSA94Jf9hH3DlsBoA1iLdHoMeGta YoDqShhi/Wm+ozsmgEZ1V9mzI/Rbpo8= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2053.outbound.protection.outlook.com [104.47.4.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-2-bHBz20xVMcuVELeMDKy_Ww-1; Sat, 12 Feb 2022 17:15:38 +0100 X-MC-Unique: bHBz20xVMcuVELeMDKy_Ww-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HzTa1X2ehySippNfg1cWgjp6SIY7ItBgmzorK1Ast6fvFvG46qxjg8+EVhn/J72E16GK2w52aASnH7+thEucYWsNJZiHCdz5vWlu+dQywL9QrMZnetojp9S673sn4HBKDi1DXN0wOXTpRU/T6pGJ5h4xNJ11w8/7mUJGpikprnNJJutGLbYG0w7cj4kgJQtz9VsMkcQOkxDc9wjo0frgo6EIPubCvCYghgyMJz/qESmxTzlp8twt8RM2qmVMWnCovvSDazBB85nQwdJfQeca6SqguRvKY6wQHqCwGFm1QK/LuplBD1v1REsZhYrjAATCI5GLkcVYDupYBJ6LpT75PA== 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=Cr5+6j+m5CMBd95LFGQXdNo80QcPXQrLdj5AWzkefZ8oFImrZOwdZNcTHO2kPMG7TQZLUrd8QUKmz6zRVsdK3wM2CgQSedrccL/wGfAu1VDVSIK98nn/7x9ctKyMsWi/TZ9FjScZ1LlOONQcn6AGIvekA/GoiFlgVEmwYpZB147Vr072VB5wm6rEsoKtFseK4u3i1oQKVCmlw7eH9oeAWkt7JELeqO1oTai3fUmTBbt5CUeAzdFH7Gg4XL8nFMdf3MsYAHGE1eTIfTDH4Mz5PWF5sPCvlqoxGAzmhmfJWEI5I8Sp5EJE+6pzJc1dZDg0J/GCrkMlawqaXbOLBh76Mg== 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 AM0PR04MB6548.eurprd04.prod.outlook.com (2603:10a6:208:175::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sat, 12 Feb 2022 16:15:36 +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, 12 Feb 2022 16:15:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 2/6] selftests: mptcp: add the MP_FASTCLOSE mibs check Date: Sun, 13 Feb 2022 00:15:36 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0135.apcprd02.prod.outlook.com (2603:1096:202:16::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: 5c3c2766-cc51-4e50-11ed-08d9ee42e6ed X-MS-TrafficTypeDiagnostic: AM0PR04MB6548: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: zt8TbVheIOgS10JHANJpta+037V095smenyfj+WnFK+jJhkQALyWf2NUsKHwdehOnEoJk1mjpzdeTTLUAe+8EG4uPurb+F/AKwA6x0YqWHf+fnjQlP2SAJRbryL2Mk6AgVGaWF8Ut3IZFPgAz8viCl0L1MRaFy3pv/H720oaBvz2hSiiqqmEfXL/Fmv0+M6RizL1IW6te6ZWs06GQZ3LrCn82jDYUyOBT96Ulk9l0HEzD6fzPnA+vIn85+j2d9CUbv9jpmCCqV1Z0zTKX/zyvfjjk5il6ivXq0z+y4iM3Jjdc7x1p5gn2GWhjr4jrIlXgx/8dpnSUlhjHhSIRD0bLbg+Na9Jk1pSb52TEENwQUDz4wab2sWSrawwXanYoT40fEzz6n6RE9/D1kJCW43BcbmnbDthssm5Aw9MxzZKcBFnq9dGgOPhsAT8gNy47O/zUErrcYF9zuufzU5ZCvAdl2T4UNof80VxWW/HPR9NmxVtvMqdIsK9r/qiGizKRWqDp0wy+Y3QAVNesLOKkxJh7aeILN+WSiYqm8orGu+vguGVf9//gLKVWQXR2xF/6eW1FJaV3fweeroj4DxXUOhvBPFk37JvdZBrc77e3m2NLLcAJ75/t6dFFg/gIahSrDhKs8RYyrwYF7wApxaB2msGD2AWnsioJR7fiAiG9pg0mMqHU7NZCKdLBaaCRtslZdQNVQ0uAg8sn90+VbqFDViQBg== 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)(6486002)(6512007)(5660300002)(107886003)(38100700002)(8676002)(6916009)(316002)(2906002)(36756003)(8936002)(6506007)(66556008)(508600001)(66476007)(86362001)(66946007)(186003)(26005)(2616005)(83380400001)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7jA5imHboP/g1UaKnLi9X4N19z0uMbsqMdZNXjEZW2YzJG0S5r5NNM1nM912?= =?us-ascii?Q?klUjfl/rp+SBdJnjNogvd1E5ycrZp5pEzXdTAWwWGXHFzGBy1Xo7juLw6TUV?= =?us-ascii?Q?KGpSlK1K0mB70iEjJnVMmsHsZy+JkuiVQspfdhz0khtqU3iZLS2zWnszp6EU?= =?us-ascii?Q?JOIJ+2lzqysfKkuiLg1DXKn3T6jT3BkgqnZ45En+QbzlzX8cK8dmUaFSf3rk?= =?us-ascii?Q?dWFdP+7B9doWbOWdtPCSk7WHjbDepLTYX/Kw8mvLS0NzUKGW9caZRYtyPOmo?= =?us-ascii?Q?GRiU3CIUijWTzhbDNRmIw5nIyqDOnwb00Al5Fdyw2QfDD5vruLzZIZ9ee8PJ?= =?us-ascii?Q?0kWKUTWkq04OWOaxuWXEhXTaIkp02ChVY9viPnX+HbKMXVdvPewYofQMIxkV?= =?us-ascii?Q?ScXlCPXBN8NtyVuUtsaoO4310rug3B0D0alY+w1lB/imUeeZIbJXZ2Mk19Ed?= =?us-ascii?Q?z4Ek/qBPXlqwsIghv+0d2NEMGNLcTFTOM7y+s74s5I7752CtEM9q9g88WLTc?= =?us-ascii?Q?fOY2Y0UTIS0lg4Kh7nYXhhIKNGxgBD4DpdXYgwNxY+qHOmA8ISuo6T4LcoBd?= =?us-ascii?Q?cxF/RYuQu4UqqoJrLAjKjq1BD0Go3Qf9yc6zs5zSEozaVXWknBVnaTNc2QaN?= =?us-ascii?Q?ZwQA7MgxzeCQZyPFYQBJhmcOK5VQWrdDbdcaQcgg07S7i4SM/k0zBWNRDP7J?= =?us-ascii?Q?lL3z3JO/eh0X/LSQPEXVlOgC4tEpNAJe9997Naz3wcdv2nDTvhvZmo7mbEw0?= =?us-ascii?Q?jOSkSFkFneGGBF3kcCbqeITA6dUoao9EHrzdzRTlVZOG3XbiMetRwHOVIwgC?= =?us-ascii?Q?GCZEybAIqFN9uZ3aF3H9GxB02B+fbeYBSQF5K5Ua5PKJw4vOFcfI59mKWFRi?= =?us-ascii?Q?hWSpR4IMVQAMJ2R2qwchZjIPDt+9V/MomWfoUIEdBwYQVBwdQFb8hGLa1/kG?= =?us-ascii?Q?tdcrti/FskYj0SfOmbfM2GmcbS4SlJm1sVlI22HECzmJ+HNRgEPv2F2lJaRX?= =?us-ascii?Q?GLUWH4+KX3+jdyiYR0+ayZYiC4JNJbBpe7gVOsek8QTJ28ZdAGF1Hm1701EN?= =?us-ascii?Q?0o0X9HQta9fFgBWTMt8KCTvWv3+JYBu3TCFtnADjIx4QBEoZ/K7lehsgKkQL?= =?us-ascii?Q?JfPusswn3bf8UvqjOh20GQKrwRoWHYUbicCP/OIcuusNOw+VZ/u2EGZSNZmf?= =?us-ascii?Q?kPoSUTtMrkcrFafgRsoRohu+hysvUetRn9daIuRUTvvUmvmlBilVnFfLa5rs?= =?us-ascii?Q?uXPAqdeZWGERSepFpKMAjyDzrsUmkmfVnALrGKff7MoXSCGDRbpNTp4odm0y?= =?us-ascii?Q?0ODBkI1FLkRHY6LrmD4nQUbIediPzZxPtEhI04RhOZqpwXe5tFV6rJqnN9k0?= =?us-ascii?Q?H0mlBJwcYoncyJ6rtyhpMYrg+1p3cpdU1pknqeOZqpzPM7cuQKiV2J8XlH0i?= =?us-ascii?Q?2tjO9CHrv2yvDBovScxFOrjcxcsbnNZ2Bm83Ku2Q7B7PTMeTlHVDBmUuCFff?= =?us-ascii?Q?lHPKc9afvXhAoEY7Rt24vSrUsysXWyBDKI2XBG3ys4dE5tCxk89BnsGuz2j4?= =?us-ascii?Q?iOuJxXwDHHXpBfFxmWLBs7jf3avP6wVf0Qyq0SJYyRhZJvTcMYgAGhP3O1af?= =?us-ascii?Q?CsV8ifKlmj8xNg+kAYOcwr0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c3c2766-cc51-4e50-11ed-08d9ee42e6ed X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 16:15:36.0434 (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: i7I4U3hJvZt0qrI41hCny0uinfaZJUxEGMGyo/o63twAhb0rxpxiYQRxLZsgXgZitYrAt1iKYU6dbwIO85ysLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6548 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 --- .../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 Mon May 6 21:52:15 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4874164jam; Sat, 12 Feb 2022 08:15:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkBmKQzf43wpi7iVVfb4hGudsX/36b40lsuz19KVJxiSR8CAQ8WWctq9HTW0CrZWOVtSv2 X-Received: by 2002:a25:8252:: with SMTP id d18mr6181758ybn.688.1644682550037; Sat, 12 Feb 2022 08:15:50 -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 79si16089150ybf.447.2022.02.12.08.15.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Feb 2022 08:15:50 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3697-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=ig9c7tqD; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3697-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3697-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 A06EE1C0F09 for ; Sat, 12 Feb 2022 16:15:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6CA6E2587; Sat, 12 Feb 2022 16:15: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.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 22277257E for ; Sat, 12 Feb 2022 16:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644682545; 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=ig9c7tqDdIj+hOkv/ISmKUPYxhr+k2a8B6ueZtSzYNf6Q7R7lsyhV9KBgWEBZSjx49MZhA sIjq1K2m0HgC5YYvPEIk+jZOF/LIJlam3UvGZ5kOC5lJHrpiKfzUL8fUw9v5Ocz4xiLw0+ hbAPfDFMIw7p5jjthTdpoOP+W+osM04= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2052.outbound.protection.outlook.com [104.47.4.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-4-VvSFzIt_O2KRzB5_uhAuOQ-1; Sat, 12 Feb 2022 17:15:44 +0100 X-MC-Unique: VvSFzIt_O2KRzB5_uhAuOQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KneEKLrdD91c0s1szliQsj9m619X3M+h+uLuZHpAK2zOMu710g16sGVp+bGcdPi9FWxWxi1mqMUQzY/MUAYLtJF2JGgY9UegWVL/t/mHLsWEMBvkt4OxuVE96WCf0UA3GPZhauXOGGpGOCB9p6dvQfMthEmIlmly2EBk1kTk3GH5xDK5Yu/ontyimK+dRQRWik3AVft4LdtwAdpzGprAL8L2SFGf7pKBhVmYOZm3STqDsNxjZEGgQV6j1dos/Lr4oqspZOj/oGPPJ2DY82ZC0964BS6tPjgLXE4quy//SaS8TaEAyVweCEqHdTp32A9DR4ekmPM5B8NM5mF8ZMQGLg== 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=LgvvXDgsmwb0ideMHawTYiS++rPiJLu9r8wXa9IZ4Qw3xOiZMM4vqT4641pYTL4Vz/MysxRG0brMfS7QY/otyfmozq2XUi3HLuFu6hktUWMtgLtqNegXMmnDXvK9yLbN/s/ouXnpFhoRIRleip/B5GOzYeDZAj2L3x1eHA4Fzv0ERe8cvsyY97i6ruo1A1IzVPcU5tbZFRU9VIrmWhprRwYbZwooGmChWYUBmECqS7EtaUwQ3DulLagf4vhgK4E9KgXCjK27m/cisNzuIhjr70HD9ddSJOXbQ7BNASy8v5En6ONggnzia/zb65EJ6ebv9MYb9cMlHi5Km119cTOjfw== 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 AM0PR04MB6548.eurprd04.prod.outlook.com (2603:10a6:208:175::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sat, 12 Feb 2022 16:15:43 +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, 12 Feb 2022 16:15:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 3/6] mptcp: add the mibs for MP_RST Date: Sun, 13 Feb 2022 00:15:37 +0800 Message-ID: <4bebea741f83c861ea8d95d4d319e19a3199474e.1644682054.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0211.apcprd02.prod.outlook.com (2603:1096:201:20::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: d3ad4719-b00a-43cb-bd71-08d9ee42eb29 X-MS-TrafficTypeDiagnostic: AM0PR04MB6548: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: NCqVZy5lSDdRDjfWWFcgz/iAFKlSt3z6LK4yI4n6BiUUd0jM8hk7+aRwFNu5xcueUuaE8BsIgXffROBkoWXnv+mbolgDft9b5DEqKPBorLj7TKWRZQyY5LPj79bR55ZDPn3CinWNL+IYHBkO8tsRDldVRFU/Vnba9lr9NLCyCPHpEmbEazjW4VeB51UXxN++BdapscK6VSu1egTQLdZFPYmdPUnbfRnupfmfjVAbxciSbGf6ctuYItYg9EBaloZioJ7b4KYazjjQxy1LMn2MoujZbenGa0uqWJF62x7b3IjUT8bXTriQojY8yyfIzlKPNfzw6sNHe9JXqScpilGxIXka7Vy1WQfc37tCduszScp43Uy3/FAkUko9Z/dyjuaSVxql3SzTcJlsqfGXfwp9ghqLqSluNvpTSO1BetVlJqsl5YEel0H/t9q3OVKvcJ7VuZjKyIMOb5rxjnj51+UvqKDTuWwcCLPBeAcZX0k+bkiCGZ7JP3ZWT4H9ULLvjSiD+gbPnuqW0ZXgsIoICfwoKFEt0Q+IO0VDb9J39VdrXLdBhGy8TiqVoTiVoBoXaGu7HNPIGM2qQaNBRXnuUHVV46GZ+2RuKAr2N9XqIYIPapXd7qvQLCiPYIbVUc/Akqlj0hydETkIryx1s97tBLPhODKowrdHTB2gikVbgCOhy0qzLxmKgGsWzviiw8+eN6K0 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)(6486002)(6512007)(5660300002)(107886003)(38100700002)(8676002)(6916009)(316002)(2906002)(36756003)(8936002)(6506007)(66556008)(508600001)(66476007)(86362001)(66946007)(6666004)(186003)(26005)(2616005)(83380400001)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6lJrInt9kSQau90edDpoM0JshUaDCKvjYq41agR+cKlL2ULVr7HuQZUp0+gR?= =?us-ascii?Q?UtsX/7LTZMdCfS2XCi1qs8mJy4XQH+MynXs9xN49viHK/MVfy1dCu3pqNWk3?= =?us-ascii?Q?QBEudMpncfPv6Ox/FhSfqVUwIdOmLrLFwbSgV0Qfeo0bR7OjZFCmjDegIXqs?= =?us-ascii?Q?NoUzOeYXBYytYhzEAlNmhLxXU90bU2kITuUyvloeRHHZHUxcYQcP/j77Qi2h?= =?us-ascii?Q?nuio4HtlUqzp7ySsEqNFTNVISvGvlJXVE/l7GGr6t8CA/YMr9jIhp3drm7wv?= =?us-ascii?Q?7uM0Qy8i3Qf/PdJ9cKqVkVaSUSFjS0YiTnu/bn4sRMRwnOF9ylWigALnRaCV?= =?us-ascii?Q?P9w1TczbC2wh64yeVSJcCsT/L6QJmaCqAQzsYhVL+UCqP6lKOkZ+WZA4h0sO?= =?us-ascii?Q?4ikelq/gloHDIk82S+eMcuWr1ieloYrnKFwfB29C1ZXNhkDn56JTuz30NWdu?= =?us-ascii?Q?OdbpGMUrB/2jCKCfKW6e5yl6das0w2vqv7MNFES/g29Ssi8aRTysphGmChEy?= =?us-ascii?Q?oJzv9itu3XxfCjaOrIqAyhxBsxviAmyzoEtrbDg+ZbwRfU5Z/Ge9ros/nqE7?= =?us-ascii?Q?IRK/kc3gPkKZgRTbnPnBm8UVRRMNtMmZg4h+XYxjerdNeQcLxNVkF0vVjad5?= =?us-ascii?Q?/tBx8cWykJWg/YU3nudPr5vO7nU5JPslSe4u1I/vrByAA5QQmnOgJrzel45r?= =?us-ascii?Q?yw66wrWhMRd7cQPnlM40vyxkkJhFP2z9wyOvmrEz+P7wbzaQ3GuFqcWt82zt?= =?us-ascii?Q?Vvz2PZm3Bc2a/FAMYuTbkeG00GSGNaLbd63KmGmwIWNtkz2UkAm+c/orVkC3?= =?us-ascii?Q?35V+qrEPoi2oEaSqDGLQMqCJmAlsbBETKu03RI0gW8II0+6Z2p6V9ejUGYLr?= =?us-ascii?Q?rYncKvUk3Krt2KqYIdXpY3jPizkKRbC+YTl/Wo9Tqmfi0JkXu//4awhXklJW?= =?us-ascii?Q?J4h7o9623F6AG9QGqn50MG5kZ8dR7sCFAid7RkiuiHFHdj46DUra4sTVf7zv?= =?us-ascii?Q?Boa0xk2unDf0DUNyL80Ie/XmWBy6qKyCRH1G4gK+9AYZbDA/+rxraQL/e0Io?= =?us-ascii?Q?Q8BWCH3G4xwcoPLhN65SALZXURNGaBNMjPkvOTBGDmMj7tNAx70De36QAR7C?= =?us-ascii?Q?daLkmUeWDb4aNmYPYxfGvJGGgmija5L5B/s8ELkzjPhuDD2c3uHxN2vXViiy?= =?us-ascii?Q?cVl+Z/rsxatphZGiowqJ0p/dUyIzt2c+3xbK+Pwkc3xY5btcpVbVH/P3she6?= =?us-ascii?Q?Z0xB+dZVbevnbPt/Es/E/CSaL7H0D5/DzR0tjsDLyC+8OVFvwLcg3gfmR8ie?= =?us-ascii?Q?fi6w9eBzQ9h7QRMXFT6MJlBnA2EBNUk6AtrLgK4ooJHf+s95x3nMz6pk4z/4?= =?us-ascii?Q?OeYt8iUpOwp5+0/FofQgDLIBLjchcd0yKO5ItKEJNMHxSkXveM6UEAR4tNKM?= =?us-ascii?Q?jZOzcMosO0NMGS0nx75qjnfXlt1CvyLf0L208e+iClEx6VEEz288ORwIauaD?= =?us-ascii?Q?uRKt3nI9Dp0KGeyzMEB9Nc45x/wURwl7aQ7gUqK1x1f0xUtpd6KordcI4h4V?= =?us-ascii?Q?eG1sly85XkafE9gWpjXNsVkG5DjIo8jd355jTGGgwNszki2ydaD3kPoW8qI0?= =?us-ascii?Q?b6WfERqMCiw2cnER9EJ6mRQ=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3ad4719-b00a-43cb-bd71-08d9ee42eb29 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 16:15:43.3550 (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: dFK9QePbq5Ha2a5ikK09iKSjBIEQCTHoyVDI9zi45+X5QWwMdXwed3EX91qr58ob3aYM8X5pavhsfLZX1oEv2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6548 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 --- 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 Mon May 6 21:52:15 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4874205jam; Sat, 12 Feb 2022 08:15:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4ofF8yuY89XnkvPgFG8UX/JKYri2aPokoiekjvJWxesSrVphQ1h3LdRbSPC8u+ORadjbC X-Received: by 2002:a17:90a:f184:: with SMTP id bv4mr5884301pjb.117.1644682556345; Sat, 12 Feb 2022 08:15:56 -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 v20si7652039plg.264.2022.02.12.08.15.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Feb 2022 08:15:56 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3698-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=YKr0mn0g; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3698-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3698-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 C885E3E1098 for ; Sat, 12 Feb 2022 16:15:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E958F2587; Sat, 12 Feb 2022 16:15:54 +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 B270D257E for ; Sat, 12 Feb 2022 16:15:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644682552; 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=b3SYO0SO3CvFOAVRDcugHEO6cAH9tGUqAMn9HyqGnGM=; b=YKr0mn0gX++8w5XufMnaZGF1UyrXK4gXjEAowZdFITTOkzs4mVwzZJ/icHgTlDZsH0RSx/ eWg9Ua6dK9XDzPjoPqzMLa5O7VG2pYVJAwrft/wBHmMR1ZfqPuhhdMbOT6BxBOuPfDYvi+ a0aQ9a2JRlenA3sPOMkFjcmnz+cXcZI= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2107.outbound.protection.outlook.com [104.47.17.107]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-6-Crubm9s_O_KwmiBChsa6lw-1; Sat, 12 Feb 2022 17:15:50 +0100 X-MC-Unique: Crubm9s_O_KwmiBChsa6lw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FQh4czzTvsYAnA1gXwI3zgk6MiZOMxt2aBYjXMWO7pcomofEHvOcqi4m7ql59+lPFsJ7xDDr5lpc3yUR/Y6YTmohLV23vdHFPhMLWDovp4B+76qN3M1u9krn1qxVOrzDfP8qeMjJasQ3YcKZK7yrLuFzSXISunRVEybstkFvUOLXot6nKldmFQpDY2ttKtyP1aWde53y5nnvXc/cuN4Poa9BC02Xp1Z4bFChDw3lK6PvgLP0qn8vMEe1ETyyIzKs9Q8sTEz+vCJ05mpf1g+O2wN7dDNNHF70mnQHs400SvRDPM5Dz9XUUSAtw2SkNC2QTanlMYMeQhmKnqnUIkqfnQ== 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=hcQdIFS6xCmj7QJ3YF3ld5O2dZadoF899EHSAeTv3Fs=; b=OjcIq8SIS7gM1l9atcHcICSWcgb8Nvo24l80GvV0upIqIVqAbEB4jmZuQZiNlE1CZeikzP004HNt7NQzqhGOUSqBja2BcE0TANXqMadhiS/qKI8NAoty25MCI5zSiMkkymqTPP4QQgATiy6uEDseSicmCYEkM8Kri2AzkoG5qDX8wTTKQ/j4ACnYNnVG/AbK1nCVvKvwJYBIumXs2Hl3M1yIsPuuTDC/PUtRt9wVGhFxdf6ygtc15llM8+mTwRxbJdwTvhowinJkVyVm3Uw3BUKq64Di/Q2FrrQzzgFAd+3J4MHta2K2nG0uLy9JGqa86HfKkEWj/3p31EW2QJp4pQ== 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 AM0PR04MB6548.eurprd04.prod.outlook.com (2603:10a6:208:175::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sat, 12 Feb 2022 16:15:49 +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, 12 Feb 2022 16:15:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 4/6] selftests: mptcp: add the MP_RST mibs check Date: Sun, 13 Feb 2022 00:15:38 +0800 Message-ID: <207c13257bee474162cacb9f2564fb5b30116a28.1644682054.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0012.apcprd04.prod.outlook.com (2603:1096:203:d0::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: 0814596d-c74a-4eb7-2264-08d9ee42eefb X-MS-TrafficTypeDiagnostic: AM0PR04MB6548: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: jYLtlx+XGDAylLNcUzNZPzKX8xtPMPfgeC8XwPPOcI3kkJbYRrvTxn1j71ocs0YIKcdL30khl9b+SgKlNPkhJ/c+rMoszuODdj+V7FLhQO+9Ccz3QI27vLOik/UHZ60LSS8ExsfNMz+X0ERTWJd3hhAbT69s9fmB+BUIKZNL2bHA6j01o7YEPsY0w4BOmFCZorZcPR9kjmBcxIE0asgnrnm4UipVBp+WJGwrLOzt4Dvn/iRdD2+G6GOi+wRgAOABIh+T8CQ3fETakiN5WVt3OCpC2nwLBqxtVnV7EBfEl53335qsOKe7LgNinmdkm1i1dOg2pv9KPXwYm05Zo4cWWaVNLEKMW68vempjBrkjwGhAZ7pb+aEUyREAMXVf96E0uw2O+iZ17+eJKA19yE/FEj2joZpSbdQ1NHp6TEiEpNIblyVeebzvzCTFNaJoTw9p9IEpc6yriRjyGgJyha/zjXUbS0v6UO3Z03GLzo5QhEnRn0usy0+K4GPtEzJbSA7B+VkJ9rrA31Kl/poKOxep1A2kHa2+bzkEBgZBNvA1d2pmybUuryP5UOrgSTiFFrqkAxhlsgRF25sIb/VrZv4tkRcvJ0vqUhfAFDx/sukgco5PPXc7J3822dT2SwKtdjIgKhjOy1t9KB5h9ga1RCoUZ+QnB6kqz3v2T4TbWLkvCiERK4PNKJyrtqXxLLE6ZMjuIwh4FibaC0qlXgI2es6u5w== 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)(6486002)(6512007)(5660300002)(107886003)(38100700002)(8676002)(6916009)(316002)(2906002)(36756003)(8936002)(6506007)(66556008)(508600001)(66476007)(86362001)(66946007)(6666004)(186003)(26005)(2616005)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yCRdo6TXChPhZhPDMa2PIl2Q1mur73kSEyfYVAlMrd/9Dz7dtrP39YUbIuHi?= =?us-ascii?Q?y72c9X4ZXs6EfMxRzSmbSxYpNKhGyJA3en3l1HtF83guEyGd7OSo3Fq5n5Es?= =?us-ascii?Q?Zrin0ysrxZZ0exQVINTZslBijg/Hwes6ZO/j9d+W7d6sztXfz+xGtpTpRttB?= =?us-ascii?Q?EbAuSc5Ho7FB4eQM43Ka35Cd1E3JfpBUDq0gwwFGM3cclQqFim4ECiQfHlOf?= =?us-ascii?Q?Cjgll2LhbqiqiXGFh9uanN800HA433U3rT7w0ZbeGJkfGoXCH0k8kic1jcZ3?= =?us-ascii?Q?usyRkbp1RnKh5UE/iMUOLDLVtvKx41ZCOGnXnydOQSfGLmOJRDzYX+dWVlzv?= =?us-ascii?Q?b+MQedy7W2LnfPfAQxayZd8loWu6Jkmai5KAGX3nxDDlGhpfS0ndYu70bnHf?= =?us-ascii?Q?MxbKIMQLxycCrb5MKPjB6WKge4LfmM8T2xSBjhVuLJecK0NmMTO6+Noez/8i?= =?us-ascii?Q?3zNE30u6Pjs3nsO1mwXliKau9Gn03v3HdqWbvEGEAAcx70OIWzZ1FcCBj0A4?= =?us-ascii?Q?JXtGFsx5xeZTS8HwE/DTDQF3S+29IajA32AG5w3CjmbIk0QmgU58IXKP1kJt?= =?us-ascii?Q?pBRqogFbivjznpyUl0xyaWIKVGzYRzUNxk5EXHB5jgkVE8EP8TmciTf3EKd4?= =?us-ascii?Q?6KIvcYRHiFvLOHZz5Wx7XXz6AybHWmXZFZZmccDaSnnKkXCnPenyJfqkM9Yp?= =?us-ascii?Q?9hhGMLIX61XivNxRGEpWRXPMSmma6Tz7SCgp0GwNFphTa0rcKuBytUdEY6qS?= =?us-ascii?Q?7pCOXs8NZPcesIcxKNzrqZX/whPUmUfa9aDdu6WaZvbt+NHq0neoyqjaq2Cb?= =?us-ascii?Q?DU/yelrZWVi2xKMiaLXWzySaItgvrI6bJAH5BJ0vdh1cabECPX5TE0tOfxYH?= =?us-ascii?Q?LhgRZOmGpNzv+rOHp/XtcF/+c6a25gKMJtwQ8qRYTIdEbI+3KKyeAWnn2HmR?= =?us-ascii?Q?r2ilUq7gqGF5cm/P25usDv0UNCgVh4iu1qbl+Cpt5ALSHnVk38GAPJqL5Nnp?= =?us-ascii?Q?LIhDe+1Z4vs9Q81EItGYsCI/cQJc9yAlSDHme/Ldayl/QFFi68xmU7HW/rpH?= =?us-ascii?Q?aCZCXPSJtFIZRi9obyqItx5o9qas/1rvedEpP+3AdJdPPkd+nbiZSiVY5wpL?= =?us-ascii?Q?JQ6r8k8XyJ6H7x3jso97hOPaqfK+0erYMtI5pZwxiuh/5IOBM42cESE+8NGm?= =?us-ascii?Q?lPWxEVg7sPhr1DvF/tzF68Bxh5SPWlm54Bdii9oFlyeoxt9el+GqeUa11ggU?= =?us-ascii?Q?noHl66Ea/zWEh3Io82sj2Fr8+j0X2CaJLvxBW0+F1y/zFwIjYC3BsJJAyXZk?= =?us-ascii?Q?woNqBkjBIGQJqb+PinWNoImOJv+EzFBezQ5gTtaXZxKgD3R/iZ6mkG2ae6zb?= =?us-ascii?Q?rbu2DersBXusss9BwOzrvp0dLFHoXLeaDZ/hSuvbQCGcmmzv/ewl9U8KdZp3?= =?us-ascii?Q?ePsrlKDDMxQQbJowzvYdMPCtGv6IaYMWcrGp7/fIfVLK5qM80Re08N1DcgVZ?= =?us-ascii?Q?WbfHtivUf5tInJX5BHDbJ56wUeG/NDt2T+0S5CRKdH8Ia/Fw32BjxsWSs5PG?= =?us-ascii?Q?yoRF1NphyUuStwmBvEeBWT+zfk4PrRO2jxyaIfPkBST8qiAci2BpgtoN1HWT?= =?us-ascii?Q?Pwo7+k7y+L+BuSyJ/2QtU8M=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0814596d-c74a-4eb7-2264-08d9ee42eefb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 16:15:49.7760 (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: u4yVqalmy8w2ZxRYHAduhmUhtzhrq7WIcdU5tjYMxU+VD6fyFNKwLkNfj5DVlxEmNGsGR/vNz3oqHv1Fn0rjZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6548 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. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f71494b87d5e..000272eec5a5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -802,6 +802,47 @@ chk_fail_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_rst_nr() +{ + local rst_tx=3D$1 + local rst_rx=3D$2 + local invert=3D${3:-""} + local count + local dump_stats + + if [ -z $invert ]; then + ns_tx=3D$ns1 + ns_rx=3D$ns2 + elif [ $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 + echo "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats +} + chk_infi_nr() { local mp_infi_nr_tx=3D$1 @@ -920,6 +961,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 Mon May 6 21:52:15 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4874268jam; Sat, 12 Feb 2022 08:16:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjysuenlpRpEtobsLGZtFMwE1V2iYvu4V4kSKOnZYt731twm2BEZ3H3WdVCXOZ71cOesBw X-Received: by 2002:a25:b126:: with SMTP id g38mr6179756ybj.754.1644682563026; Sat, 12 Feb 2022 08:16:03 -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 j6si3129715ybs.143.2022.02.12.08.16.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Feb 2022 08:16:03 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3699-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="kb35/Mqu"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3699-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3699-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 A87D91C0F0E for ; Sat, 12 Feb 2022 16:16:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A6D422587; Sat, 12 Feb 2022 16:16: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 448FD257E for ; Sat, 12 Feb 2022 16:16:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644682558; 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=ru6+Y8XK+QAwkZT3JbpfGbVcIWNvkBD0X816B7tqQ/g=; b=kb35/MquWKdWDOpa/lRI1ekS2VIRC1tZwrHXWBVKI72HHidm0rbyBx5M+bewPUQODPqzKh 3uaVde75iCgsYUyzSHK0sGQsl2wyO6EZjBDEMXH4MuaGEEsiiIQygtmys2NH6sFtpaDkLO JwaomyUBJKtqMh8umW2JMWS/PtEd9ZI= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2053.outbound.protection.outlook.com [104.47.4.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-8-zcqeX1tZPdm7wQiTWYgzzQ-1; Sat, 12 Feb 2022 17:15:57 +0100 X-MC-Unique: zcqeX1tZPdm7wQiTWYgzzQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZlUPg/5nFKpvuUus+BTN7Qs9hR4h+TqIFysyYSuAGFrVIj/NNoPixRRyeSJJgObijNjPyC+rf0H+MQIeG8NWQZdqEUh4ILGAA/KzM9irGxiq/JIztBYN+ttoAE+pnt+8mXNdHW1YXsRv9OjcZ/BG3MGwWsVcM/tzJ01cHyRS8aLHibwSlhktX/zLjYdfNKMjRIcvsf9Zd/gML9QMAJrDsmHp7/EQqX99v3M/kZrpLM+gRUePFzIqLGqTdmafcP0oEYbtFLGv5BeaIJuk344OtaJzGqQO3zksuSGI/Y7pty1MiV+vg/FtRdKY71bujaGV0S93vJtl2+nJcNq4hOFQlA== 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=TuO4bBZlqzRncNdbdkPr1PK6y9J39RwJkZM4QRs35hc=; b=MTCedmuq+TJz5i+FssnyZfY68JQTPwJC6URlxbktxkmvW1GGKJIWv2VSBRWytkY5rfx6urjLnM5zL0kcoBtddsAut5bEme0wHAwYKe7/Sv1iiN787cXIOTS5GQi2iQaXYKG2BhPArsvQX5aWavQmV6evv3uyNkYB9OWysaj1WVPJIk3/IiWeXoqBGJFDgXYOGgmh+7d3GDxLXZVrizWedH4G3Wg7/Sxt1ls1D9+5cfS76H0lBfm/3eFFcCACDkjPzxXAz0W/37+Mhq1kmFXkEyHjWdH+6ciGGoUqGYLWJ14GWPVz8FY07xZRtQao56zmp6aczDfSUCf9hAVqpTmt6w== 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 AM0PR04MB6548.eurprd04.prod.outlook.com (2603:10a6:208:175::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sat, 12 Feb 2022 16:15:56 +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, 12 Feb 2022 16:15:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 5/6] selftests: mptcp: add extra_args in do_transfer Date: Sun, 13 Feb 2022 00:15:39 +0800 Message-ID: <49265662f0e878e3b9181e42457d495d5c715e75.1644682054.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0014.apcprd04.prod.outlook.com (2603:1096:203:d0::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: 54a7d943-3b54-4783-d02e-08d9ee42f318 X-MS-TrafficTypeDiagnostic: AM0PR04MB6548: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: 7PbRvY3rEXz9XvTLGOFYuHYKjDbYGfFhcoIOf4k808eUOqslZepAQiAmhLbhNrzLPLDvm1HhjVRPEWoA9E2xoW3SL5czoWpV+RMIlE8XJvBMlQyj1qWGvWFqRGl1PJB7U5dHdyLXZh8T/75mfYVzCPNffTFLr33LhkmCH4KF3cLJB/5a5QMogGSRn8y4CWaWsevh9mtiqX2oB2c7y9AVhHMXqFiklUDKKh0Wp4KNpl5KE0Oy8/aXZsvTs9xELY96uC/udpiioy7BbxxNDDL74Zz75IECzBQNca58HVKiTAcrxx31gnJWskJW9AEQ4O+BN7+6/tjXIefT7zUHd89RvrrnlmvZm2QZVLNww6pwrqaVQIqQqhAbLqmEaUU5ikTdpk3KFgAjHa0esXnpvRgDD2yYN9QFFdzFJVOd+9KwzeDJgLW1KwLKyW+u5gYJNdEppR5MdeMgXSuvK9Y4mDVKhHPDqhOkDwsiFj2gNvpasKVCELY1giBg+zpJOePZ8g7FJwAse+RjmqE2YG1xVsIJU8aDa8wxjiWhZYA0M/ll2AGCYtqKAtk5IV6E1Jch1E1y7CMbgTf2k3a+m8Sj1fKowk0sSFgPoA8jtoE70+WeqMSusc+eWzogXopmMQlIXIJT2dIFBltedzI3dAgvGT9drhUjHX+yXR1WE7Wi+ayIVz5UT4G4WagLkkx4+JZLH2C4 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)(6486002)(6512007)(5660300002)(107886003)(38100700002)(8676002)(6916009)(316002)(2906002)(36756003)(8936002)(6506007)(66556008)(508600001)(66476007)(86362001)(66946007)(6666004)(186003)(26005)(2616005)(83380400001)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Rq8IX4zPPWevrR8SXfhYtU1VI9DnvzNKaL1LlQPxzzNztzD5vnj6uB6DsqZz?= =?us-ascii?Q?4YmN14EBT0OwVWHBwLUDToBrDt+hh60ryGNNWhpx1OdHKGOmZDyaMq8rL3jJ?= =?us-ascii?Q?eKXHaFdtWMJUlX9qczRiS8LGQybIslMrbhok5oM5UfXEsSXlb/IJlbuF5a3W?= =?us-ascii?Q?0pSGQybJw3w5C33kFpldAHeNkoNPMis6h1M/HCh/+zck/IhpZoeR13gK1rFg?= =?us-ascii?Q?2dLd28GiMQhuWJ9QY9aPU9B1NyLzEemJs+eVY+V2VsxfBNXLF5w1eOmy6uyO?= =?us-ascii?Q?azZhlVNM1O4snr62AAehJl2/yRCWt7+xSYwtq/G0ZDE0vmBupTrgePH35c3P?= =?us-ascii?Q?ZRR1zmFfS6rfrI2cljA20BKRMOZWhH6ZedkA/RgWxcjiWVOR5thOv4vA4kJO?= =?us-ascii?Q?VlD9/x7UFnQRsRkz9rqyy3WAao9rjFwgEMKKM1uyw2KF3qYGY441iLPAdohW?= =?us-ascii?Q?7zfDmrQanW0YTP7PqFWLsvq0hMwS7cnA60iucY0vYnvKKmOhXwfST4hS3LR8?= =?us-ascii?Q?bn5YcTABu68Hq5wF4AWRQgf5COuq5XY74TxTO3asFB30HHzwkXmgWxxHJuVO?= =?us-ascii?Q?5m42skcgRW2k6miIRvC2PBkj6/HJY61HXwnY/n+Rmvpad8dnfSa2NIUOmo9A?= =?us-ascii?Q?V4sXkUlUZ6Vk/vDWUqhxIHR0i9Ag5aueSYD08ydnPizPVrbK+m4Ql7qovIkC?= =?us-ascii?Q?/aHzLNmUAGBtn3W0LJXNiilLWWIfBP/yX7X/4iuaDnnx8xTLGZvDPFZETX3Y?= =?us-ascii?Q?WRTkwSz4ushKC58LAVrFEYkjri0bguy271bN0bPJfFWyYodRD9Q3JC+KjnHd?= =?us-ascii?Q?f8NhG372mb3KzGY90C2DIzdOpYdyvQSg7ejwhTJ9nTNsTyZWKjPUilLVEzyc?= =?us-ascii?Q?PJ1pgF9s9xkMOdoq8K0x302fdyjadnRL+iGR1irVaopWx7TfupHWZO2pJ08A?= =?us-ascii?Q?WKDgYJX7EHPPSq0dpvHR3EEanR7XBBcgjtLnsIBwzPVw3VnnVjB1AuHqRWyG?= =?us-ascii?Q?GgY/KH9MOd9EPUOcWIZG2ykaw4ggDHZCoTewHu6a4jkOaPCVs+3jWDjzXLpE?= =?us-ascii?Q?uuuX2iBgaPan/e8rBBljeLF6R6M7Bx39f0t9gd0QkpAi1naB5ZwyF3wTSz/o?= =?us-ascii?Q?IoVImGtjEkX99pyMqaqHY071pnDA7Bjp/ab/UgfSlG1flvhS3Zv9H5fuA1rJ?= =?us-ascii?Q?IakJA88+FjNAtLyCEjXe8td5hRUlgdCWKzftHe29gWtDy3V5n9QdwQATpm3H?= =?us-ascii?Q?lDQWisI1nVAmco7Sd2rqu6CjNRr7xrnJz0FyBJUIesASDmx1HkAq6NkoLOIJ?= =?us-ascii?Q?Mdbmh0mx8IOLkW/v+Ih40cp6Sma9cuSrL9U+aqsEBaYBTm+68TZL25MbI2ed?= =?us-ascii?Q?IoQZC3W2R/cIYWqH055WMQ5JXMQC7dGRSfYoHYNzXSwE1rKcq+l+l+835/oS?= =?us-ascii?Q?0oqfsRCo2ZBRtmXutsqWD/TV9Bp1MLkPCJLxEt7pIr1hARF6qaR/+iRxDogZ?= =?us-ascii?Q?WfFZxNZrp5s3fu6c8lP2M4AJZBJJVEA4NWseUkIzVQ8ivkPN0OSCKQtVknuP?= =?us-ascii?Q?AFySH/tFLh1e7xBBDmVfOhVsn8RyL6uy9zr+kyEMzX3P86kol/dSSaP0X4he?= =?us-ascii?Q?vwUIyMmAJlDg0blZSKIWY8E=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54a7d943-3b54-4783-d02e-08d9ee42f318 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 16:15:56.6346 (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: 1AxyKaimRFhYdMe+ZMcIIgm1mfy82A7XN70SqYkD8r/vyXarPELytalY6c+l5TdcjJ7i5mo37qRLKIgBAxQDrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6548 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 --- .../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 000272eec5a5..5321cab1400c 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 Mon May 6 21:52:15 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4874365jam; Sat, 12 Feb 2022 08:16:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6qV/eoWjKFv2SAQV/B2GeYB8nntTkYQ6zu0wGCtKhQxZlSCEr8QdvQYSXeb7WU6h4Anq6 X-Received: by 2002:a17:90b:38ce:: with SMTP id nn14mr5871958pjb.61.1644682570722; Sat, 12 Feb 2022 08:16:10 -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 f19si9385853pfv.312.2022.02.12.08.16.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Feb 2022 08:16:10 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3700-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=V81BPixZ; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3700-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3700-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 28EAB3E1094 for ; Sat, 12 Feb 2022 16:16:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 48B482587; Sat, 12 Feb 2022 16:16:09 +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 CFE05257E for ; Sat, 12 Feb 2022 16:16:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644682566; 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=alv6QWlquTds02rHDwNb7T2yXShfWBvHJFowt8tkTbg=; b=V81BPixZOJZ46ksah479uGZPVhWgAIVCxcPqio5hyVy0SUi2Eq+0YY6u5aULE2mqQjnrRg 5PTbQglU8I7A5Tr3tngJ/oYjoKlR0vSKwn1Pu63TwrWr5AryjegJhdixWMb7BlI65mKDs1 O/mmwICAYXrBfpw8pDoPNcFOG2STf4M= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2055.outbound.protection.outlook.com [104.47.13.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-5-53INGNjSN4id5Lp3Zf1mxQ-1; Sat, 12 Feb 2022 17:16:05 +0100 X-MC-Unique: 53INGNjSN4id5Lp3Zf1mxQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XEFEXYChf7BjTPlpCfONcTxIevfh0dJ9olmEG3ngT7xrw4ty2LXxiCwOfvKtjF57/BXb8ObBQDjm7mjO33jsmjgQVMhkV5LYQWF4gNUQhB3tfX0z4M7EBvm5chauoxYLWGiDkRCQcfbvxjbxhOKKn/r+uN5hOsWECstQMcRksUUf8+wbsTIyIxK9NuaaZ8yEiQbt4VLs22ibvdqqNnZhLEy9riU2+uXZ6o3sioJJiWVMZft5Vp2uZ7TiVQnnPYNdMYZ3zWef2PHvvGOeYnBcxPedwsNDss9URvJrjkQyacFAXLfAt9W+PkiWtmg/7PmiSiE0+yPrvUX3s0JPFR8O4A== 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=WcN58+sUeqYQ9tslgs5X40aGqVrwIXc7NksFcglXty0=; b=PZST8Tt6nrmFOiLnzPuaSL11EXpCLG3bdIzDR4kXM9G/k03SUcyK3ROv+ssUoCLW2485XXqrkiQww/S5umva0vfuC0Sl332yYo6MPTX3/zem7hyrjkanOBfkfEaK7jvgLJPMbq7VnBSLv+c7HrE+lIBpbMczWkWTIKzkZFSSakvuT2qK4esf2+GbvLqiO5xM5ZafyLPiuYwz2lXoBKHwQa6jfRbtmV7UPyQhzqHUjPaWHCozJ+Z73hc+YkoQbYgH3wbBYSaSGM+8yadhkYx0/rz/njIyUJMk2xXP1fA+0uDG61aMtdqo3zlUdLF5BHaQbeQu/VQ+zvgw3p9GrMXSSQ== 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 AM0PR04MB6548.eurprd04.prod.outlook.com (2603:10a6:208:175::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sat, 12 Feb 2022 16:16:03 +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, 12 Feb 2022 16:16:03 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 6/6] selftests: mptcp: add fastclose testcases Date: Sun, 13 Feb 2022 00:15:40 +0800 Message-ID: <9eaa5384986ccd5d42efcceab5fe722cbb876382.1644682054.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0009.apcprd06.prod.outlook.com (2603:1096:202:2e::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: b1ad1954-2001-4ebf-04a7-08d9ee42f75f X-MS-TrafficTypeDiagnostic: AM0PR04MB6548:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2449; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hZmBDJmd7Prl8tZrO7TeJcKmgOdJshcoXyeXkpkbEF+le5Y9LE/BKUQGiRNYGSrVOH8i9veVVJB676lWHfCYuVJj3so1alcnLYodAQb6Z8zkxqzX7lEPD9w6S81IEFl24vz/4NP0pQh8XNtBYoOmBqNNbW4vtvFibeUjL7BnO2k/iN2YujwSLwJQm76jkWhiQuxp5wJ701/KXzqxEOAhuW+CxinNUW1D9jxbvN/6laXweTlHVina3wSK0uj76m+oq167d/QzPVDhGAi3WVmjlVS70PNHXMlnW5X7YNPAb0R2ezsal0+57i0P09JYoTvtuPEQbivOYgOXa2Czoeyn2p1L+ugKezm0CYjvMxOUpQRf+AyHgQISKQf9elms2eVVeUwzZooRDn2edjwR8F8cuWuB0t9LbqMbHa5YQSEdktVkiKs3lsvsVgHcfPBP32k1zeNYA/1nS4VKs1vI9ivrLdApCGmNcfMyxOvLVMf//MWojd1C2cWgKcXsFUANM53Ikt1Sed7v5p1zoUAFNpdEUkSMksvF1sig7DObuMWjmbre/EdnKXZzz9oeXivb+UgwEvrc0zRFFq4IKTdFUkJYl5rTF3UUBtVgoVgSNMHBObJ0pfWkZZ1mFQRr3m7ARjZRIYFMLFPquvlo6BfDtoFs0KXxnpQKviC8Fh5uN7bL2MNasuuVwMjtrX8xdbf2a2BQ 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)(6486002)(6512007)(5660300002)(107886003)(38100700002)(8676002)(6916009)(316002)(2906002)(36756003)(8936002)(6506007)(66556008)(508600001)(66476007)(86362001)(66946007)(6666004)(186003)(26005)(2616005)(83380400001)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2D14dh4qOc3urKp+F2S8Fdnac6LQYfG/A+AM1H5c0AOI6MbXMIJgsGxJvikj?= =?us-ascii?Q?/e0IbkVuz2ESik7lg4OtiXSu5P3datCbDI5yQAnXCDvWSspxnJqd2e6ykk4Y?= =?us-ascii?Q?73KQZwye36HQSgQD2DGUwVM8aI9ZbYG58cxTmndaQ1lpl3vYXVQr5VMVHEr6?= =?us-ascii?Q?3L9K4jiiXRwKVqwBRUihL3PUO51Orysg+yXX8S6yjm0eQ+4iX14YDRIYmgru?= =?us-ascii?Q?+3uHwOOOeg+KWzx+pOyCQIly3QL1JR4nkLxYcgN3sTIQXrrYIAM6ryeSwgIl?= =?us-ascii?Q?u0aE68MnroJKfXjn20ONtZDN0kZfFQSKMx73dBeioGl3wLOHEtm+SO68NBL/?= =?us-ascii?Q?9fRXT5alkiSggQSsV5CDdbAluQXa1gvB2+PU9NMgDvQcCXMLoBXFuXshb0WV?= =?us-ascii?Q?TcqRQPaEx3PdSI//utO4DvWthlE/ScX8XjHfbHXZdhQl6kQBtnAYXHbZBC7d?= =?us-ascii?Q?VdoJbIBX563dGIqpqIUgVl+TDlSkXEdPkQh1Qbx5yygErOYyjRdVg0mO+gTQ?= =?us-ascii?Q?hZ6fZEiBnbcAGm1l+lLYB4d+EYsC4Yp897vgFOGr6Jc/jl6J24o7bvj2dctl?= =?us-ascii?Q?aYM57XyY0Ydr+AQOhKAD2jKy1ANc13ONhRPGYGCggtQQ7+4LncaQo701na7M?= =?us-ascii?Q?Y93Iv0cV/wmUHRJDc86XgURp4v2yXDuGWAA2W4eki8kRyH8r5TPNz9YfqnjJ?= =?us-ascii?Q?nIHFX/8IlUonDLimLZfPTq7vcBDW05tYYCdtCVxQuHNP+AiXOlwOAMre9Ivd?= =?us-ascii?Q?croUz80N/tELuK5rHKD1QMcH+XQRI9KcUd4OVtwupEtN7b9AJmZMabPEnX5n?= =?us-ascii?Q?SSIkdlX4jxaPzfPdII13b/70aLd3/ida3kU7pH4BxpLZ22Qs7K84AmiiQPGR?= =?us-ascii?Q?8QMItrhaS3EqxAncakSQIiEuJCEUunf1UY9mU8Uqe1MZzoyAo+p0JlQ0ebYG?= =?us-ascii?Q?4c2KmZdZx+gNqmctwCOa88zJBkLQeIRwwzt6vSUm75Eu5ByTTyZnEtGpDLme?= =?us-ascii?Q?RrNwsBrjnw12juxvXoiMEmpo22fmRU5PylVHdQQQ/Bhg9jbXJINygMMpzrQa?= =?us-ascii?Q?1y0LlfFfDB35Cj3albwZ/l4ZWLHxWP8AWI2ZKaTRNpEHqowbMcmQVk7r83Tn?= =?us-ascii?Q?LU4ghbVretVlISo8ldJCi5CKDYatntLakLo0QgDKJ2wWCzUxdDpvIJE3bJ81?= =?us-ascii?Q?tSIaRonMnaslknYLlY62c0Hpc0/aPnp3+vHFIDMHPVUWBDd/RgcJMZGW4Tq8?= =?us-ascii?Q?BmnMDzPa32YjH4zmdASGxtNc6qTL9F43u3BAjWzttn6zgoAe6RTb5DMkth6y?= =?us-ascii?Q?JlWBKQQ/yoawegT8+6A2io1QSF1v/A00Mfxo54qJJYWlzFXvKCpCOkWlAh4g?= =?us-ascii?Q?9/2Sdqm6Fc3uN8G+q3yfXx+8BID9dlU31JbXQS6WbhTAf5JIUDM4fv7mJoTw?= =?us-ascii?Q?Ylew/BqNVuJ6akqTg9NUWvsQ61CDBRrOhaoI/BJZkQwNEukTBasYzZ00gomD?= =?us-ascii?Q?7Opxx3zaCZtnqBJpIj3s0TwDqAxbUe9GKLVnHBHO8n03tEF78d8+w9+bEmNx?= =?us-ascii?Q?byZvcYsm9DsKuDMXLoRDHSZtcyua/zeo88kcPjV08CvNjA10BpXuGoYDZRtA?= =?us-ascii?Q?tHKSLYd7NfMjyAsI0mj8RIc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1ad1954-2001-4ebf-04a7-08d9ee42f75f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2022 16:16:03.6962 (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: Bwp4bsHSl1iH855WllwBaYdF9ssCR45xls/b4IBZ00EosmjgF41/f9APohfCkKdL0pqSNAJw63xCb1hw9aSq0A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6548 Content-Type: text/plain; charset="utf-8" This patch added the self tests for MP_FASTCLOSE. Added a new argment fastclose for the function do_transfer(). Passed the extra argments '-I 2' and '-I 3' to the mptcp_connect commands to disconnect 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. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 5321cab1400c..e4f4117fad36 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -424,6 +424,7 @@ do_transfer() addr_nr_ns2=3D"$8" speed=3D"$9" sflags=3D"${10}" + fastclose=3D"${11}" =20 port=3D$((10000+$TEST_COUNT)) TEST_COUNT=3D$((TEST_COUNT+1)) @@ -462,6 +463,13 @@ do_transfer() extra_args=3D"-r 10" fi =20 + if [ $fastclose -eq 2 ]; then + # disconnect + extra_args=3D"$extra_args -I 2" + elif [ $fastclose -eq 3 ]; then + extra_args=3D"$extra_args -I 3" + fi + local local_addr if is_v6 "${connect_addr}"; then local_addr=3D"::" @@ -607,7 +615,7 @@ do_transfer() fi fi =20 - if [ ! -z $sflags ]; then + if [ $sflags !=3D "null" ]; then sleep 1 for netns in "$ns1" "$ns2"; do pm_nl_show_endpoints $netns | while read line; do @@ -698,7 +706,8 @@ run_tests() addr_nr_ns1=3D"${5:-0}" addr_nr_ns2=3D"${6:-0}" speed=3D"${7:-fast}" - sflags=3D"${8:-""}" + sflags=3D"${8:-null}" + fastclose=3D"${9:-0}" =20 # create the input file for the failure test when # the first failure test run @@ -725,7 +734,7 @@ run_tests() fi =20 do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \ - ${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${sflags} + ${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${sflags} ${fast= close} } =20 dump_stats() @@ -2277,6 +2286,21 @@ userspace_tests() chk_rm_nr 0 0 } =20 +fastclose_tests() +{ + reset + run_tests $ns1 $ns2 10.0.1.1 0 0 0 fast null 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 0 slow null 3 + chk_join_nr "fastclose test 2" 0 0 0 + chk_fclose_nr 2 2 + chk_rst_nr 2 2 invert +} + all_tests() { subflows_tests @@ -2295,6 +2319,7 @@ all_tests() deny_join_id0_tests fullmesh_tests userspace_tests + fastclose_tests } =20 # [$1: error message] @@ -2322,6 +2347,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" @@ -2353,7 +2379,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 @@ -2403,6 +2429,9 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do u) userspace_tests ;; + z) + fastclose_tests + ;; c) ;; C) --=20 2.34.1