From nobody Fri May 3 21:01:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp5526575jam; Sun, 13 Feb 2022 06:50:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6Gcc2gYBHcobhUywh7j7oou2zLRdYkwc5o3kVLYG4B7QftKo1NxKs5+3udSkXaSr/vzHc X-Received: by 2002:a05:6214:d4c:: with SMTP id 12mr6951604qvr.94.1644763820944; Sun, 13 Feb 2022 06:50:20 -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 d22si6865817qtd.131.2022.02.13.06.50.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Feb 2022 06:50:20 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3706-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=UCvpJLh0; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3706-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3706-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 94AEA1C0A4B for ; Sun, 13 Feb 2022 14:50:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2EA6F399; Sun, 13 Feb 2022 14:50:19 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3227373 for ; Sun, 13 Feb 2022 14:50:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644763816; 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=UCvpJLh07KaMzhChdT47C29ZrYXFnZw7PJ+c3hyDhvxpzmFyoapj7nPy4OFeafC8H2EHmf qwtbU6UGnWmbtpcTObqJgb2sTRZx7H7Iklrs+zP/fVwluZBPvEhWRgJIO2Ys2oT4KrYxtO y6Ub9iQsUNRy0/p/EZbFI/FeFvAVZbs= Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2057.outbound.protection.outlook.com [104.47.1.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-6-RSW2CfSnMUeb54xXilrygg-1; Sun, 13 Feb 2022 15:50:15 +0100 X-MC-Unique: RSW2CfSnMUeb54xXilrygg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eBcMXP15hYblkhPcjHID1UvgCyguGRUGS6dpM8rtfVbCZ50IZLhC6x8ScK2xbwF+iWvB4fjaF53vd1DJBKY+pMNfGe/bks/Wsv/KS68ZWy7b5ZiaHOveGYYxLFUxjY4TAlN/NB5O8Ej5gm1llJM2dQZqzyhw5zySD+stZ14X/0vhoVqMASAwidUK4vIIJ5AdJs1tHJ8QY5n8R/P2YyYnMncJ97Q79zzBZldkDyoZFqnnoX/KDfh0MqOkhWX487ckDNqbZzHv2RZKieRMF+p+c1IMm5mgxO0JVubW6Td8Uaj0wnByhv3EZi72KKL3VYgqbHZiFixF7BQh5/IPS1ta5Q== 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=dQKg/8bPD0vtgKcg3K7GrxJdkz+rGvVTIqKG6ChUSfTl0duUmWT6KJEDKbY7ysgbHSkScdnuFOIwPYQ1gEZLCWHDfpBONhzqM35oQV+oEIGvN7hjmebBJ5H7WbZpYctaoZialqBO8XSYMjnk2iSwBEzwc26rV71L30xdBk/dzLcUADguNLR/8tLEbznFPzVn08T0c6dnz5R4qr5JWUwxui5TRUusB6tO3jsFHsTVJcy9JhG6J5AZQsVZ8Upl846OaQaFwOM00qf1jMqUq5pVaUH1xID5kcU46pKT+YGokuBqvjAjEcc2j6MZJ2w5hIeZ5iI5SYz4v10sYR5Ln+xv5w== 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 VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sun, 13 Feb 2022 14:50:14 +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; Sun, 13 Feb 2022 14:50:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 1/6] mptcp: add the mibs for MP_FASTCLOSE Date: Sun, 13 Feb 2022 22:50:31 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0101.apcprd03.prod.outlook.com (2603:1096:203:b0::17) 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: 3cefb903-6121-464c-2b39-08d9ef00246c X-MS-TrafficTypeDiagnostic: VI1PR04MB4845: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: j/+PbM0GZKOPb77HnV9mDhQ0aIwVmmGEIEw2024nVsWtmBUImxOJbXy5X3QOsJYTDNnGRD+U1DDxdPVWSqg4o6hxlZJa9v2Hnbwgzu/+Bn2ZeDnF83mGFXUWIXN4THGm7LnCTTqkSGD5oUrDZpxmi8BJOTRhjGZ7PsTy6UrSCel26DTB4joboVQj4mcYVrQeHXxtJl9d6kZt8gCryePUd+erhgXtTYraRbVTk1fqVXsyl4ZO6q0F3fNVAh/HavP9RlHG93gddy5NITemRjqP1uUXZuoSbC2slcx0Gg2XQTT9yShFKNB4OIGBcEwKlJSISKqeFX4djLB9/VZTpYaKbUNCa4i9cUOFY8f9B4NxBpdBKvC9Md7IohxQyQf1KA061R900dqZaT5KgWtGArIVlTKP+1F/RJ8B6DbX9di+cn2JmiiPFeuP1rXf+9G1F2iRfNYRn1KeqN09rG3vTOaX8Brxx2wP6RJn5laOMHIkgR8X+IMaI+QaUFjaO0Iwehs6ODQxGSmvDB7JXpk7OPPUT50++TjbNiJFjg+iM2Q3DHws+XXo3vsylZU07U1orzW3fF+5oJffYlAaMU1ZN2bUSKK3PyWANmutdowI41lQUpfmMg6ZZCfpz9ZN6HRJlOSTvNZV87ZbBPW2V6KcEs6w2A== 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)(5660300002)(186003)(86362001)(83380400001)(8936002)(6512007)(508600001)(6486002)(6506007)(6666004)(38100700002)(316002)(107886003)(8676002)(4326008)(66946007)(6916009)(2616005)(36756003)(44832011)(2906002)(66556008)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+F1SPSpqOXdAhUqpK479wL7aYcwHR0jD/otxpzy1riDGZL0igvNvlMyHFetl?= =?us-ascii?Q?0YX4Gtm9HZQh2rQky8YvYtjr9ZuSeuNbuv1pXwexNwOQ3vyfJxwZPTQYjfxw?= =?us-ascii?Q?uVYKX34d2v2cE5CslEW88JZlhZjQaMTeUWoRvCN1Ei0vimzSEROWx+ue1Din?= =?us-ascii?Q?CARCJAbbgTA0WhhdGFHcVywKMmZayexi/i8+pPmtZnX6Eo3yL5HN5qbPoMEc?= =?us-ascii?Q?pWUfNesEYbowhhWY3hw7jxggppHAXRZMeZLj45pgNZ4q8S1hE4g675bgPC4y?= =?us-ascii?Q?SVNnUJxTkpZfTkO2p12rWmIBYGcqDhA1uHsNVXGm34tO0ZUoMbko2y7Pc15b?= =?us-ascii?Q?Yvtj8ahVq2n5bxW9iYa5EkGv0c4HBpc2CtASLDqedMjVfQ8B4Y5ia06SUBVj?= =?us-ascii?Q?IbKErShSGkVZZM9kIJSiWUzNRKvCbsVVjzdZpItTtVaHZmWeSeFMU0lKwNyn?= =?us-ascii?Q?dsuUKApsFmJywdlMybiVwSQtrVM08Ran/SWncgURpw9b6x/AaDPH5d+/iqhf?= =?us-ascii?Q?RsVg5gDq/xUfM3o0AHU++El9dDGtw3Em0nA1QVKhUJX125IKiUivCK7gAlIh?= =?us-ascii?Q?ylMy0GNGu5EP+pde8S7fv/IRHUNltOWhhEgk1SCkvQYWLP2fs+T8Pjb945m8?= =?us-ascii?Q?H0ws5bEVLFtIDttEphuBZQSZR3h4jQoqE6USQkYHKg8SlXX361rxvkbUsQYx?= =?us-ascii?Q?rndVlfJbcwaRmuNHSB8DfUiKg8EzLs7xWLIH04Kc3kAwOKTWeYrXpkm8n143?= =?us-ascii?Q?ZophyjamRWeIYivdZRcsxXnW8RbRsompFp+tgxdxH8cHugFAniFYybLS4yH0?= =?us-ascii?Q?16KFYGA7eIJybJ2wLipDGfBPJF6TN79KirM/fn4wCGlEtYuDXxd3ybsG2Ag8?= =?us-ascii?Q?B1QitS7W2kESr/7UUKiNbZVixLRolSU91fVZEGXImN5x6faeB6JX3Ce1zPNX?= =?us-ascii?Q?PTRw91YFUWo//M8r1mVmLK+no51Chgq544QN6/aKaI76EwLeA1ysWLr81oGB?= =?us-ascii?Q?QbS6d8YE7cg/AY7m63hiIR6XexhMsI2/cR3ufOnGSfigdm+udeYRO1D5hZ0z?= =?us-ascii?Q?j56KZhdqU5V/Rf6OM0hV+cUH3goAO7gHPNtfmzootF4EEb/8JvYyW+DmoVXL?= =?us-ascii?Q?zOVlFzRjL7RnnoWBQMvluw6SIxR+8jAza16Q4AoVojMik3EG8aSo0LmaCMbe?= =?us-ascii?Q?cAZAarx5pkAZubwv5GLgEGet32pCabUm2G6Ztjk3qtI3rZO7G82bQpJkTaWf?= =?us-ascii?Q?sKGl8piY+9ipyR5jxpAMb0ochO5oO1arvgpayeASkZNRkSEauIDE0bD69ShD?= =?us-ascii?Q?JXtHhGozHQqLgOgpHEQHfvxywOrp778h2U1eAyAIiEGS7+CocBGRT5W32Y2u?= =?us-ascii?Q?DEAD4HLNiuL99snuLvZnR+W7ZeCCPCJZm7NLjkdWrPLGrzFjStzV1X7MdOt8?= =?us-ascii?Q?X9TtqHwLHl485roS+XY9tpE8/lfIO5vCu+mZoebBcNtzAOblPGf/DKiZId7v?= =?us-ascii?Q?xRifIo4edQKnQ1EvDVO23CE1LbptSyWR2iUCJa2E5pmoUy3OsWRk0v0pTY/U?= =?us-ascii?Q?surIvh7y3VyetUPD+fGv9NrQrWPsfIbl0Jx62BLQx+gg6UZOQBFE5QvjtH4t?= =?us-ascii?Q?HCjHnTLLFXjUy4EQWoATwjqdtdCyeG9XO32OfoTdC0iSibnMtfVHQVeskjEb?= =?us-ascii?Q?pLsta20JN5a+o+w08oyD7ML3yIo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cefb903-6121-464c-2b39-08d9ef00246c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 14:50:14.2711 (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: QJMNAUfjHKSSPkP8Yxbn7b3vXGXa1BK+4jOvAiDF9mdB376ZUkkXRrd5BG+z6YDzCjG87QPdlcngr0qbOZctBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4845 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 Fri May 3 21:01:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp5526635jam; Sun, 13 Feb 2022 06:50:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzki1nSMOMXKU0/wufReZ+cFOWVaW2ecGmXvFp87Vea3I6Z7j+cl4KsHAHLaei+HKeHAoUX X-Received: by 2002:ae9:e91a:: with SMTP id x26mr5062041qkf.651.1644763827282; Sun, 13 Feb 2022 06:50:27 -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 w6si6548063qko.557.2022.02.13.06.50.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Feb 2022 06:50:27 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3707-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=m7UadL6a; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3707-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3707-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 DD9381C0A8E for ; Sun, 13 Feb 2022 14:50:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9131A399; Sun, 13 Feb 2022 14:50:25 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72511373 for ; Sun, 13 Feb 2022 14:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644763822; 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=m7UadL6aya7/MoQXH/NIR50JeGRvLLg858gh5iDrjGUQ5iVQrKxfBrfEdENMt+PNSIk5TB uL672k05VdYxdV+G04gYqWzT2Sq9ewzKcFBk9fTxtb6wcyYInwne0qW0JHDsm2cNaVWij9 0Fd9q2SKGXGlY774tUfKMOeS1b6OvM0= Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2053.outbound.protection.outlook.com [104.47.1.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-pFIjcT3GPv2QrvzYibDcdQ-1; Sun, 13 Feb 2022 15:50:21 +0100 X-MC-Unique: pFIjcT3GPv2QrvzYibDcdQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CvCSmHbg1NXgg+jUPkWlLmkTWoBgL/t79sgUVvTIkrpx8ycHYbvbvA4eR8xDcPMugXMrJrZJYG6wpczxiTNPtEw8HIVDB/x3qLRAN9oZfx9CwcZ65f0BDq8n7Wd0E1+8i3DaYhf/7T6e7rerzhX53NOGk/v0Ns6mhuppZKtoVZ23D64BtFz7OU2artiknRuqcqOM0qhKzZ8+r+L1zSDYqjeqDl9vI7SMuWr8CGNi3bZqaznqQgBwZ44ykg4gn9eQ9SMZnQn0Tvh7mfkfCOSsx2X2xgCn9oDPxRxa30QkFBLZF9JnQHzcwzyS9nqxu5SliJJIPyrj4qNG9oVfVchrIA== 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=CTPO1p9XE1FZL0d1FKS/1Mr7T6BrTFln53ZhMYrG+ZHsiyyMlZfbZYtndezUj4E+ZQF/HY7I8MioHD/o6BY8uTIVtwmCGs/qXyOefmG+nTO4t6/qwo7Zt5NwrjMDrwgBuwKgF8FY+APGaVqArOAdwojXVbcUpO9BgNGW0TGmzUzBz7N/yEpbujFwJLLvdj7/EyZGSe392D5jjLS6Pe0XzHNLPJa2PrV7D7+8FV1PwO+Ls5gaHES0foUxcehDZzSbyLTVJ1XRKBRYMJzJWqokPXmqt9dak9ogkjA9qwt/LAimjkxmOrF3XlSv/4onFk9FwkwIhJ5nS+4uufxAEFbzVA== 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 VI1PR04MB4845.eurprd04.prod.outlook.com (2603:10a6:803:51::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sun, 13 Feb 2022 14:50:20 +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; Sun, 13 Feb 2022 14:50:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 2/6] selftests: mptcp: add the MP_FASTCLOSE mibs check Date: Sun, 13 Feb 2022 22:50:32 +0800 Message-ID: <6ddc8dace646141f6b64066c1626e40bad76804a.1644763526.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0401CA0019.apcprd04.prod.outlook.com (2603:1096:202:2::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: 867ded41-e529-463a-3519-08d9ef002879 X-MS-TrafficTypeDiagnostic: VI1PR04MB4845: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: i4ok+flICnXc0GwEMGDz+eExjHkb53IMjNdjltH9SDOevFbqTVpysPBX3AgFezyXN6cE6VZKB/W356PyhqCMWJzMfpx0dsRTikCwa24S/AkelqQT2pTNX5MiQIFxqELGj5f/3xpEp81E6IwJHvlaoxM+pPrqoo7KWwbdbs2sPoUTKn4HyWLe4K5xpsfAF4mh7F2lpeIx/uV0L+YXeM26nRI1jRGwQ8XiXzXObQ2YozAnUui96NAGiheo424kJiXVfvyFEunYv93MneOEj8XRoDavOiKdIRCKZ+CZVZ+cW6XvpfswLFet+lECNi87aCIzidmObzjGr6VOzIJYyvj2+0VXPL/5zlpW59FyQdobngMYFMYgcvsrfMjMB869R4LasJ9xzpqe9aCcVWFSTt3gp82aFSZXwAel/gTK0XYK4OnjkMWF3I5hyXtUFcwbszpt6GP62pN3HvF8VjwZEVExAmBWjm5LrCEc56GpcGjRVB1JGxelOnZ3HegJeV8XpukZbMO2vGOPv2ZVX/2dcjiEsMAZ4G3GVOYl80BUsW9lFYF73yVNqEfh0tVeyFU8BjC2GnVn/iSzFBRYO5C9xAtc2/Lgf9PJD4cFmU1EptnUC5E58ySjucC+JoPo6thZE9m9fkUHgjWCLRI3I2OY34COYw== 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)(5660300002)(186003)(86362001)(83380400001)(8936002)(6512007)(508600001)(6486002)(6506007)(6666004)(38100700002)(316002)(107886003)(8676002)(4326008)(66946007)(6916009)(2616005)(36756003)(44832011)(2906002)(66556008)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rpT93lVSdCn+Bhr0RARL46Eh4+TErDeZD4HMj3WHpqJwNV52fFl9hzuNarUn?= =?us-ascii?Q?sQCp6OmhJIIz+KBYdbXL3EeIrdfgcPbEE9UdDx7fw5n+cZapVWQpessZ19TA?= =?us-ascii?Q?69l4R9cYYkMkyglVJuqDm7ByHFakW4BXB9aj9zPlDc/FbaHP83vTTGD69Ar8?= =?us-ascii?Q?6q9EZ837tfb6XChspxrdQtZ8XJTVOZRhb902eaMh/4oMtGQNtSUjXXyfWPNH?= =?us-ascii?Q?xNxlXpZJHBg4lxuRM1S4UiTGPu0lEtUd/Xc7tv95yCugkwRviYWS8Bz7DAnC?= =?us-ascii?Q?PTdN2beXFkJKP1zfg51E4o+9W9klcyAyNeabHmZGbnz5vCyNaG/oU+YRQ6DS?= =?us-ascii?Q?0hgYqVEqZ8SIS4r2s022uYLxcrh7tgMS7bwUF8HuDVTukkQPxmgttYXgitQL?= =?us-ascii?Q?zFx5eSxMQQA/QtFxkdzYB5YqlY2a/iTwrNz3RV9qTKs9NYTx6QGJO6TnPgBX?= =?us-ascii?Q?Clll6/t6RoLWuAR83b5cH6zRoZTV/wjK5jzIUhswAXaFx61qx/wA27vaCsNz?= =?us-ascii?Q?Ty3gd7i7EA4QPYxqKrNm/tUo1u3MwmLfwAWgoP6e5FN/MEVGQIxLVLPWyvXy?= =?us-ascii?Q?Iw4DOx9C+QG5z+LD8oTE/bUHkb5NQbU7lQJZt3VgZ1AaFNsJ5BTL/cfq2n2d?= =?us-ascii?Q?Llo2vbTfhDp8aVNw2YTXcRrcgmpmWw0nzjKHQl54xQjZ/+/ITnUutvSt93QR?= =?us-ascii?Q?uQIyXumw671Qt4uLZ7Yau7svfY01owpxRC+XYZZzsofippr4pitjr85ItIuK?= =?us-ascii?Q?BIPuKEpyjWcGBvp0INbjX5gEa7gJssfEw/MLn2p2eC6JqDJ7sZpwG6me0jTq?= =?us-ascii?Q?cxiX1IuiQ3LZ1YR0XLLkRymyGyqXrO/fyzUTyxcfaIXxvItnlYpGhV0mjjKE?= =?us-ascii?Q?j+DYGxorUeVlMJS/Fc3n+2wa5wBkjO1egapaQMsH8/vlB89dAOq61ST9HMIB?= =?us-ascii?Q?j7w6ttE0B9FEqM2cQt9a5MFqCBv9hpn5SaJPUcUd/KADvzV5eJ9A3b0N4gGu?= =?us-ascii?Q?7MSm8ZUhBl7Mc/3bRh/cnHN0bsEjdeAJ94qVkfCLEd/mfSA3NVEcsLu9Mo8X?= =?us-ascii?Q?aKZ7ebktj8SOgKeHRZQb1F7TgIutCdcJqSEUZi7rid0wUPsNDvrqqc5f7Af9?= =?us-ascii?Q?sWmXZqS0YsTm8AJnQf3Kk0JuedpqKEocbyvEWPBPNznzWQ3XS9kS+oDHYg/N?= =?us-ascii?Q?L65MAe2d6n2w23J4jjIrezwgo23GImU22Y8vj3bxLz4wOIiDX+FtbL62HDf6?= =?us-ascii?Q?7Clmxi6LXSALOAV7zoL/zk5LOa19aq6/w62e/oCSTAc4MgkBotixdnkSLr9t?= =?us-ascii?Q?mN94Gjzs+ffdaVg0HMzw3/SpI8S+73XbipzU87FA/0uOBe4RxCE55OrXEKDj?= =?us-ascii?Q?DbA/jPw11w1atom7FGNRYGpiLLxGQ5VTjikqzoOHh4Dm8yZ8X9EUD7jv1trV?= =?us-ascii?Q?kA34VtBIfDplyZK7/CU11O+1fHASxI3rMAciYkj8QoFoq+NrAAfJW4PiqBoE?= =?us-ascii?Q?Eb8/QjvPhxVuaY6/pWJdlhiJV7cnVIcpPg+MyBkAOpWsxDOKo3Na3yzv1olB?= =?us-ascii?Q?enMYifUZcAI0ncy89RVLzSP1lqmotqeZ1w4fJ0PG/geVnTWjFKoAVlHYeUWD?= =?us-ascii?Q?BJg4WbPMJaw3Kqgq1U9ZpzXSk+vBaUARhwmKfVrcgujFf5XO2RVFrVUvyRqQ?= =?us-ascii?Q?EoRxNDNCbo6HqgRIIWDghp7gPqA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 867ded41-e529-463a-3519-08d9ef002879 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 14:50:20.8643 (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: wpZzJOguywAowzxSzOEDLarfTE4OLxJ+KidUPTs3stQkAfvNqO14vIxb/o9TN6RHlB8w7WVrCOky5xkAeT1DLw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4845 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 Fri May 3 21:01:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp5526693jam; Sun, 13 Feb 2022 06:50:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNdjmBt2yd6+Zkqjw9T4j4WztNy277pNtzTSG7ViDc2J+I12IP73r7a5RyjF3Ieg7RVYSB X-Received: by 2002:ae9:e889:: with SMTP id a131mr4985186qkg.771.1644763835007; Sun, 13 Feb 2022 06:50:35 -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 gw13si2263058qvb.302.2022.02.13.06.50.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Feb 2022 06:50:34 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3708-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=JaMcy8Kf; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3708-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3708-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 B512B1C0A46 for ; Sun, 13 Feb 2022 14:50:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4F1F239A; Sun, 13 Feb 2022 14:50:33 +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 11F1A373 for ; Sun, 13 Feb 2022 14:50:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644763830; 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=JaMcy8KfmAVqRQg1kuaIRtGtrjqCUnYX1C2J3XnvPit+qkIm0pzoWfMnIFO4Xx3pMUunqV wiDMjNJmZYGcB3BdswG7bxUA2Ps0ezpr3p8Cmp72BBVmftpKE2oZZaMfQunPI2Iu+ka0mN 5OVvduc1/+MMNwOK1mPct5w/AaO38dk= Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2056.outbound.protection.outlook.com [104.47.9.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-9-CjxKOK_hO1eQoIAjxfUsxg-1; Sun, 13 Feb 2022 15:50:29 +0100 X-MC-Unique: CjxKOK_hO1eQoIAjxfUsxg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DsGq9AFlOOGEmNgb7SlGk7H3g1X3JzgYzedIgOys6SnvbeTHmS9yTwjCD00uv5lLMdRDtbz+QmNShTXBuch+xXZLbg/glWFZ7BCQRFoNS7HdZE6roH3LOA085x1atrIpA8UkipVJPEQw6PCbihgodraoKkjnYj8AI7StPoIfYspnQIhY/xBfMq8EdHS7uY9VB6aB2NEQ/TOiMKE4EyweIrNRvE1+Jtw+xXnmfAY/woR3IxeOTZvwCNdZKGoIQXDjqtD4sz2bAfsw8ha41Id/HWVEfzROp/Kl0kIIveMVJbwdexqkiBXV0I6KzL/gzadTYOME+M7VOkO57HFbprvSHg== 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=horlyI/SQf2xKpbT5BNH1AsoXHqOD5oHSw5/AUvCBhu9vCasbaR8V0Mzxgj+qBP+O+KPb11PO4KgWWSTgQ981CKmxi8nfcFUGTFGsMCPKx4rSbsmNKp4yAzcjselfco6syzViYx+az5ObU/87RZiOM93tMMZO0ixIqqew1VcUTB6uWfHazEFtM8dIOJ0PtE4bZer71/h+SujNu5yi88/Cbt2kqkKttrogPq3uKPOW64bbwDPjfL6OsRS+mnqyxlzMAXA3GhoC8tHf0FpSoKobi/smvQKSmOBtp6PbaRuDmNHRId3o7zbUFQ+J25SESjAYaVRV44rRKgChc923j3zxg== 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 VI1PR0401MB2384.eurprd04.prod.outlook.com (2603:10a6:800:25::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sun, 13 Feb 2022 14:50:27 +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; Sun, 13 Feb 2022 14:50:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 3/6] mptcp: add the mibs for MP_RST Date: Sun, 13 Feb 2022 22:50:33 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0017.apcprd04.prod.outlook.com (2603:1096:203:d0::27) 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: 20c41315-c21f-4121-5782-08d9ef002c3c X-MS-TrafficTypeDiagnostic: VI1PR0401MB2384: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: 4EsQSGDD70yh4oDdv1UUF2kpizTfIvOmxuO+nGKrIoPJ+MsFheMiGWc5c4Yf4emxNsO/FPPgL5ub5EeZQ3y5noQ3ox3j+/jwJNK2Ip3gwKKKoBfQGn6F6qOqKNw3xErgKP3xUoes8Lc9Z0NZMHM8VboAFip3MmMxUxt+Gc9pwliv+yWnj/3dzdkxmN8/l61ioXVK+AdMNVJRDZuaSQ4scMZDhjXgyRMBiFLXpOGmUsZmKgU5GqO9QserJ3rCVd/EIjrpp0b6BCWPhURsR4EaVe029kWTiWB8eA+hkzfcwZfCI7RFUabQRv77imqRj5lKhBjGQcrpQLne+DYSUVINFgAi+lRh5TJ3NST/N/FxfrVNZCxpnwi3HnD/dmNoaxENDs0CLPL2cIBPN37QvVhmxieqI8tLH9qmpIyBsNK1ySt61r1h+FzGVRrjgAfOGot2VH4yudNbwCPaZ7i7QGUBxO3EHEzQ97QR0J49uVVrI5vtYfP9OP9V32lLNeBq6NbNTFyWI+R+9cCckss3KY8bgHIDwVmuas/odMd2Gz4VLjnQ7j4MedJUe/5A7Q51my3pQAb51UrIIsHYav/oLam7Q6Ow1a0h4dpKAUrv/RuWSQdPylqs0QizDhWN6s1B4F61s9DRDFOO2FPgJCW+OMRw0w== 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)(6666004)(6512007)(316002)(6916009)(6506007)(86362001)(66556008)(66946007)(66476007)(6486002)(508600001)(2616005)(8936002)(186003)(107886003)(38100700002)(83380400001)(36756003)(2906002)(8676002)(44832011)(4326008)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gRZTObeLXiaR+YkRgQZTYRywVTiFJn1vFcjylBfYHll5zwT04UYV358tCv7b?= =?us-ascii?Q?kcPTm2rwjk8+Gk+2m5ktsKF7ND/KbSfdeFhfPZv7LHXVyZaScQit7zmm4aGu?= =?us-ascii?Q?sUHYK5GYBAoIR+l/1X3tpe1BjhYZyfiiaVq8PU1l1/a05nVN0vYNJfHeXcX1?= =?us-ascii?Q?s6E63sOFpoP587wTvy6s3VLg54cH6v/DEpVsAMnS74sSfnKpzDpGIN5EKWN6?= =?us-ascii?Q?9PEJH6nnUwJiJL54tjRg/GNpbgA/JvGviYakNoSEo5dUowAPkYrVQyUQUelr?= =?us-ascii?Q?RKYMYs+X/Bkig6NFwZiu7VQQr//bLCPZFNYl4CBM4orahgXyxbS8J8hMrJbi?= =?us-ascii?Q?181Bm4x+wKqH+oNWkAurjcwcjruK/I+nhwcwhhrtAMQBtyf62kLVtRiZ4V+h?= =?us-ascii?Q?Yp/IMWWzuOmg6WHjAkkKCyGnFEX1gCCnhjZtgnGL0jRT2YJBtPitEbeq5CGY?= =?us-ascii?Q?D9DHahWLVhGxrr+mxZI3FICfiH6zW7SoRmYfbKKsSaNGXuNvmk/DokXrfqvv?= =?us-ascii?Q?982rAczO69Rscy2r+23BOJv3VmN+GNvdGh2UR2ANVIPii6z2bXWDxD3b+GT+?= =?us-ascii?Q?OkCrcAMaepkt1DqZ4ZNFLTfm7IDSWSeAG0EWiwju0NyhMAXbDxkJtujU00oc?= =?us-ascii?Q?KJhHTbOL+frGPh3jcle2eixilwgLsd8bgVV2HifKTUFLj6qT1g0086sWaN1I?= =?us-ascii?Q?pj7JqCy6Jj4JV4IPrbwe1vsBn35ShnjTLS1Y5my6HpNibyT2TFzDh9Cef2mK?= =?us-ascii?Q?qRaKJQu7R2OmfD1znYCpVBYyavJwqSYOraFv+WRjakKDvyot3Z0bh26RQWb/?= =?us-ascii?Q?hmBFhu0820C8041NTcIQlQ34FewAUWUy5uI6uP8H8TGaToJBGDKBlAfP6u2k?= =?us-ascii?Q?rTdYn1EkWcsyWjuMOsI2at5tPhtxU5e0smK7mMBhy4+1WHfjH+D5HujmaE/z?= =?us-ascii?Q?WQ3GVvuncBU5eAGFd7UVwGG8YmuRk1WUzM6G4QAUAJicAtXb0WUNHNCsr6LM?= =?us-ascii?Q?OYkm28T8O2pJ3Ga2Fu+c7llqYbABJWnjBDdkUm/ulmBfm+jr21Abd1feVxnk?= =?us-ascii?Q?5/3/WnQgcLlVUf0eiBCAIyhNS2iA/0yqh575SIoKFxb3/wRMb93fWj8Qu7Mn?= =?us-ascii?Q?TJSYkit8jSGGt6/dP/uHfCo0tlclCA69Y9oMYRp+wJzlH931+Xpe9nk0HkI2?= =?us-ascii?Q?Q9LBklv+O9aLpMSYj1cDTc3HEEWZ7Lyn4pdQMvjNIAM0cbUsu97dLwVGGByz?= =?us-ascii?Q?khUs7ojx19wvjWzNDBvdKBrqcWSEBn5JR8M1cbAFDZd2Rk5w3XYqZ9uQFiMu?= =?us-ascii?Q?C2WMfTsnIqqpFEsMAPPZJZFWHYODZll2SbHmP6FO8gKYVlQawK1sVZKID8dE?= =?us-ascii?Q?RGiJBOM5qNFKFhR8YmzSd7T8s8gQ05vSfXI5tfSdtr2GzXfsmpVVeA/ZsWFp?= =?us-ascii?Q?kKM3pHn4nNnUSC+HShu/uYD2eCDnRY8rwpemOHPu3TO12gHC9elwmfOw3sAt?= =?us-ascii?Q?AEj++//BKJB9FinJ9Sb9bXX3VwPUhbYmvc0cEvMRZTgWpiTI+40VF3yXxyXw?= =?us-ascii?Q?Lb5cApPx5iKpI1ZArqIM+CbHVVf/OmkvyMf7aETmQd2ISG6eyd79WJKYuZ2t?= =?us-ascii?Q?s7m/gvlcAInehUWryER9p1jWqY1emqv/55dcAKlPey8ySEVHkya6ZMTT6RkQ?= =?us-ascii?Q?7+BvwlCxZUfDtS6h75Kp4tHOUXk=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20c41315-c21f-4121-5782-08d9ef002c3c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 14:50:27.3638 (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: 2nJLRLu1NgqOAvfcHenEHqWI6AmiAnWD9cvaZM1EYHi48Si03KcglTAEkcWbvenpEeXKPL6QM8vWHUtFvvCeHg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2384 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 Fri May 3 21:01:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp5526764jam; Sun, 13 Feb 2022 06:50:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+sFFrbBdleTyXaYxbCH27Pn57oEiQxufBTJIpXr6dQYd+bXnjP1X7H15oCDP3vxNkFeeq X-Received: by 2002:aa7:946b:: with SMTP id t11mr3072967pfq.76.1644763842823; Sun, 13 Feb 2022 06:50:42 -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 b9si9432439pjl.2.2022.02.13.06.50.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Feb 2022 06:50:42 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3709-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=cpSA9P9n; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3709-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3709-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 645AD3E0F4F for ; Sun, 13 Feb 2022 14:50:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8524239A; Sun, 13 Feb 2022 14:50:41 +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 3F945373 for ; Sun, 13 Feb 2022 14:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644763838; 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=cpSA9P9nmAxvZPwPx/z4CtQh5hMR3u+6b1Orte4JAclqM5nINlGQE2DNW5mf3wCSWFjNXt z1bP+KCrrSHJMt+Pa98yG7TB8T2rhTSUV15uUNJUMmUEFSZfr+xL0fPcgYERYMQZSO0dah MBa+um9EnRE+j3GzM7T6YSiIzJMQdQg= Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2053.outbound.protection.outlook.com [104.47.9.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-9-jWBHOKpEPfydndoJAgkUrw-1; Sun, 13 Feb 2022 15:50:37 +0100 X-MC-Unique: jWBHOKpEPfydndoJAgkUrw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bLtu/3uOAbGjeGn+P8JpV/7rn3EqyPcYArMf6php3UyPWB2cI/YGEvAOLcAYXQ0b0CJHRbGzKljEjyjAUs7BxWUhOxZ42ct2ofou2nwGz9gLdLuRhoMIlSEOCEyES/ZVHWcmmt/z+q5ckbBuMubh/LH1kyQa1iJgFqykBj9ZAfSTKuQlM4yCc2YhzuPhO2BQthT6U2oz3NURI1l4lQ9lpCF4anGJ1T2dgM4pXlT3/lF5puMhXGvDmT1xurIVsq9jtZa1WrxEOJIbGW+Fxw+Bk2mNIY58kIiSrO1QMVW0PY0IlT48CkGoYYfyGSkuzqJzJKgOMNVSdtYXkNBbBx6oMQ== 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=PBmQPhbMjJHV7uMqhSZfRItm+lvlLrX9BiQWrUQN6k9KAoBZsMFSIK8ksdmFQqG+LU/poS9cMW4CIatfNh042CiVH7d0MgT9RW1W4QfEmS9oZS7d1MiX0KlP3lJ4fMXTDaXIKuLOgGJqm7y10jfN7PO1rBBT89wCPG+cJBMOhJnwnn0vOrcYs7dr0KOhMMhvuBYOgdHICSU2fuH59PsMr4kfWkPZaTM/nBCeUcodzVYGwbh406WSGrox0d2LBH4UegoKggZrDPVR5qnssBKKnk5XnhaYJ9w3cOPUlfryCHjUC5KvNDNcMTBLpegTMl8AAwHA9EGMNczZLbPWA6bDow== 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 VI1PR0401MB2384.eurprd04.prod.outlook.com (2603:10a6:800:25::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sun, 13 Feb 2022 14:50: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; Sun, 13 Feb 2022 14:50:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 4/6] selftests: mptcp: add the MP_RST mibs check Date: Sun, 13 Feb 2022 22:50:34 +0800 Message-ID: <8554bd77f8ab87e77853afc45e1df32e20f36979.1644763526.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0401CA0010.apcprd04.prod.outlook.com (2603:1096:202:2::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 755a5dc6-285a-410e-e612-08d9ef0031ba X-MS-TrafficTypeDiagnostic: VI1PR0401MB2384: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: VyoRwClxD9M1uSMSQ/yR8gLL/n7cHpXrrxv8yUyW5DcE6z+NzLD2wxdN86g4tIYXfjM5RBRXlEvQhu+MWK7YM53bMkJMHvlS/oxpRsyeDSOYDgIETBBCMSfeHg+LFUX0HeuO6yPSSV5tsrGq1WtE7iWFpdvOdzUZmF/tSZsK74j8htMGc2txIHX4/rEF6RiuPdfEh/H1diqh633cxh20/oHQY0Yd7VFJlyxLWFjkmPkNH6KwwyGvXhl/NcemCgjJlCzxGag7hOkabu4NMGolvJsQP/VDNZf5xW7hj20c2+giIGxu5dPbm8COCuGKb65kq6M/u9vudfaRJeZq5wcoOCtdl5AZ6MLiXt0m1FXBOGNuwK9gNOblK+yR5TQWqlGhkzwLNKnrDuU1bLlgqNKIeUGWhxkUiPDDXJTqVix5XnPJd3gDmfBhDzAkl+IuBtM43SVrhS9S+R9yqkXmqnbiMoOBLRi5pHeZwjg0lMoz+MfeQ/XRjf/G5LsOBIodPxgMTLbtsVQcIdJh4A3bI0TIYosM46dOVoRZhBi9CZdwfDV3srP3eoJt0ZpqP4dg/fxmtwtJLdD7JEY8XfFF1ZYQxsdAN6xJa1rxSKbm6CZ6OlfkonpJHR/ihSdJaLnXbvwB95qRjyulCRv5w65WhpQdFA== 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)(6512007)(316002)(6916009)(6506007)(86362001)(66556008)(66946007)(66476007)(6486002)(508600001)(2616005)(8936002)(186003)(107886003)(38100700002)(83380400001)(36756003)(2906002)(8676002)(44832011)(4326008)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0c1k5dDburlWvyFPoHLpKEl6p3SqC96iNubFFGOCuchK2MaCb3qhiNEXmtcT?= =?us-ascii?Q?ZK5UGT1tqREZPoLs5OmGVQtgm0AS3xHOBGkig4oPQmDZZTr3Hf+W3v1eUDn/?= =?us-ascii?Q?LUJNeYhruvNTV+Up1owxcg7zSz8JRr7asq7UunmeKxAeqZy4xIglmTx88CM6?= =?us-ascii?Q?1t9TqbZ+s1Q7iMU0cSJprwM1G/yi/wdWbLLECbdJR6Qvyv8JEh/T4QKuO/r8?= =?us-ascii?Q?EaWXY29WrCXXSxSP/+/Vs7zIzAU7cndH7F9CvsmWuU/7ridts4SePq3+DP8n?= =?us-ascii?Q?oxJNy570+1LuoJ1aZhYyLK8Rjg7WDoJVTRkw8jmEp4Jwtg/F/RBBMOfURNFf?= =?us-ascii?Q?c2+QAskrUwoz9EZRaVtM2Qj6CNuOKgkzbGiJlTBTJFQfah1mbNGDszl5Vtk0?= =?us-ascii?Q?WindxDYAYxWqCoblhd5xM7UyrU6ftIvhEmOLaDhFYrssrzYqDReZdiB+ZIj7?= =?us-ascii?Q?bBQoJaCIPlDN89abXVMF2+evTc+ecZ8dYp7pS1JJw+EsK6mJKTz864MnRAgN?= =?us-ascii?Q?XG2Cr6d1xwPkRitoDscsv0sIeHo3qX7aOTGTiJjQSEcCG1h+o+FXLfSVsluk?= =?us-ascii?Q?pwiVyjpJQq6qEZaOFKrbKXkrNawtNqMnm1IRAaAdKwSYnDCOuuahLM39dGKt?= =?us-ascii?Q?AyeepWwoh7eZ4+9RPsQl1aZCeIHhZqtCa8lCT558z9P9yh8Jwbx+F3N6wIni?= =?us-ascii?Q?7fwYworsTYD3oIOuzy5aCHj/1EV3847s9R1y6rUkSH0Ny53OopOJDYqlz0cd?= =?us-ascii?Q?JP1fnxOpOcqF0zaEB/s40zRXRSlB6Dn7aOMgnAdlA2+Qrv6m5YEhgKfH0uwk?= =?us-ascii?Q?TZvVzTxdooi9aZM5dEBfN2Vrm6lQyL2GCjTpG17n3CXUAmMyfdBapcn3W2pj?= =?us-ascii?Q?IMue5HvP/nYama39MqtrZ3oBgstGXKkfKYWLMreZWe7ieqbDfmfu1ipbP6zp?= =?us-ascii?Q?OmC248uNTwMFiWWSq5GifoWLrxNX3NlFN2k2PWTMy60ZCWNK0OkRUq+XUgDD?= =?us-ascii?Q?jc/IP6hr88tRY6O/hhs9rUnDoe1iKSli5JZ1yTFHSs7/ZkDm8OfyngwcYgzY?= =?us-ascii?Q?j89+3sH3at3D6v+dBQG9Y5RDU8ZkvUAOSXO+Rk1ESWZ1EPuUTGWt4UKDpQ71?= =?us-ascii?Q?DJtswW7BUcz91gL4rc7hGKh6UkrR0qxOqk4g2e+mlTCsJv4dALHXo+x/r/CS?= =?us-ascii?Q?xkKQen5rIpn0VYUB8Q2+t7t2Es1zkQ89sAo7fykEG0l6eLt+H2n65JuVxxSQ?= =?us-ascii?Q?mtpJxzq1zIzyB4OX0GLNeXSfsEXmsY+m09K442ugzZDhuj3D+1huWNaaVPmv?= =?us-ascii?Q?12pKBM30sOuqYeKeOLLFceGiH0SwgkydbcLOKCc1HHeGmhJBNCSnCQCVuT/2?= =?us-ascii?Q?HVQc/nuqRNym3YVYVZL065wftHuYEU4BlCRdB5Dr4aCOyw6BcrlvjuYZl1gK?= =?us-ascii?Q?pebxXepGjp8BKiOM0PUAj5kYaslXqzEN/dxiUN9y8wcRwnvQdXxsYDGpoUn5?= =?us-ascii?Q?8xlAuA8E6+pGpvYXeVjNwqJNkK08X2snosIQgklnGV7rCPotbzo3aqL7Y2es?= =?us-ascii?Q?5E2wVjSqkqov94W8vkNsiMHhHO05CUnukLHjtLIiXiLbGRCJRIX0TYtDjIB1?= =?us-ascii?Q?yKTZL87sXKvFNoaHo16d9zc4DBqTFjoU/2MXqeptUH4tdh9T1otY7HS/a3fQ?= =?us-ascii?Q?aN6mUuWoaUFf2HHeURLHqlVimCE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 755a5dc6-285a-410e-e612-08d9ef0031ba X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 14:50:36.5975 (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: q0B0dr/53nc4ZdS7xcAWNp5MzPRwtS3DnaGK/DJ3TiK6AiMuSQw4GwfFFEo36sO18OF74cVxXhCav5U7wWy+oQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2384 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 --- .../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 Fri May 3 21:01:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp5526821jam; Sun, 13 Feb 2022 06:50:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6S/jVoDBSytzsfWGaDwb1CZG/LCsFWP6crLlcILBrKN0DMlIHlmayzn83qy9zl1GcDXuN X-Received: by 2002:a05:620a:4481:: with SMTP id x1mr4890997qkp.629.1644763850174; Sun, 13 Feb 2022 06:50:50 -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 y1si2665854qvi.48.2022.02.13.06.50.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Feb 2022 06:50:50 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3710-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=BlVBJJA1; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3710-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3710-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 D1D621C0ABF for ; Sun, 13 Feb 2022 14:50:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AA2BD39A; Sun, 13 Feb 2022 14:50:48 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BDA7373 for ; Sun, 13 Feb 2022 14:50:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644763845; 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=BlVBJJA1bi4jaFT4CdUztVnriJEW/4zX1glpcofoMrQM/Lo/ssWJodPkTq6dhB6WpeW0XI EL+3O5O6jS1ToWYggi5oVMc6DR/gYYvU7EBo3Um4YRZs4f6il8ONbeavxB74k6hSYVjtxx 7HxC59YQev81LBnP0A0wuMhRwYwLumo= Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2052.outbound.protection.outlook.com [104.47.9.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-4OqRjUELP6u5GlbZZHngHw-1; Sun, 13 Feb 2022 15:50:44 +0100 X-MC-Unique: 4OqRjUELP6u5GlbZZHngHw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GOLKTIj2e3U6T5FoSnXqIJYOflcT0Obu0FDIjZEdnHJKvcAPuypIsaOc+S1/VhYqyc6/2+gr5s/025wHEKQTBOHTDoUddzMsZzFmV6qioITLWIpz19oOIVekXTy1eRyQZgI4Y/vX5hDKPJUyHQ29XIH+Ob6n4Y6aVFqbDwz4btN7hzUxhfcYVeImt57av4Q6BuM3+tEbDvitQee4hRa4ZFxX5DOKhGnFqOg/m+KkSCseju6nvQ3nvwaoB7S8eVcwOCVDMz5FR1F0ZWt0k/of7cp/wImF3VHObMRANmi0i6C9pCSn9KFrhNIJu3/zShx7Wb1rLQczJDtZmGNE2EseMg== 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=Uw4sZQfTzfe0pKCaEUHA45ZQ0Yk2rrTexP+Z16YkSRSpK3RUYfYLFUxLfj5/dShp84SpLYY6AsfXKKllnfkbJAJQWccIZTrOc3glpeTGUttjQ1AuTf4EVSIudVmVfrIgM64nVSmFcQTcRU9G/1t3PQgnnuvj26NtAMJChmz/vfzkvTA8GQoCuiZ+9d2h3iGibq/zrH31LJxHKasDM5a2YKvM8WIjVvTqUzXMCQajrw89v0jndQ+nJCTrovcxfe0mH5OcwqDO5/JnDPYdoccNmT+o3d9yyShdB1IG1IchLBoBjMQInE/Ql7Wd3dFudpfLJuoPeZbiF2ilpBFOTiYgfw== 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 VI1PR0401MB2384.eurprd04.prod.outlook.com (2603:10a6:800:25::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sun, 13 Feb 2022 14:50: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; Sun, 13 Feb 2022 14:50:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 5/6] selftests: mptcp: add extra_args in do_transfer Date: Sun, 13 Feb 2022 22:50:35 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0012.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::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: 8dd7fce3-1a41-46b5-78d8-08d9ef0035d1 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2384: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: mcdoZGm9/Lo2AkeyX+CFMIdoxpw9d2E61HzkIWRVVRlv0kezcsSbXIj69BGZnhoHNj6Swf9WcLwx1NNxjPXapVkW1Wwj3X4CYzydF7nolqX+GJq6801SPLdHFnw4dEwgrS1iLIfb6VJUxxsjvXQRGfV5oSzGrPPnR8xspCFmogmUvdtKJBebsrFDsuaHSSCQ1xY3VDJVvgtEEnf1O0lSJ07lvNqpN8EbCQFvtaNso4OitQqJvBE/cB147FFHHmd3diODs8j39NfM0SxI93R3qqGk7xO7e6LwjbeooCwzA3foGvst4yx/LCBw7x6BpghmTbmAefpvxfAevmr13LcvIN6TzdCK++y5QH63WDo+emtc/qrzXYqJhkuAx/G0LkzvAiMR3l6M+TIcbncLys+weWq1KWwXVuzbGaem+3jzIDRotn/ycE95deS7xISswWgElxC/nBZcfNIr7cx1BJmF3zbIBARDKAFSoZ47y6Fu+Y9kugu1u72K6cZO2XfQONW4VcOh9Y0Ebp7ippPIvyLeHjUB/+C9uiwVpv1sIMq9xxQXPRJf1mP02/6H8Mk4l4umB3d38QuozOfq761/GXcs1yuhFOg1CqSCogCLzpNUoU9FsSwFXhqBEt80CUVw5hOiJPTD9x1LUtj1gT3dLx5qng== 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)(6666004)(6512007)(316002)(6916009)(6506007)(86362001)(66556008)(66946007)(66476007)(6486002)(508600001)(2616005)(8936002)(186003)(107886003)(38100700002)(83380400001)(36756003)(2906002)(8676002)(44832011)(4326008)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hlUACArfopVFrF8mvJyJRJQ8gh4tohxD4z333xKiXot6u86gSP5kM813u9qG?= =?us-ascii?Q?Uf7WJ7VFg10Vh+qbpJmErVFQDsqIuiGCkn30DX6NWTUYK5n7GQzkS/98R2hK?= =?us-ascii?Q?kNAE9/Nln3I0hZsHk9OZMdvXHHgggIDBkX7boaPUJSIBBHlKklc2MOHh9pPL?= =?us-ascii?Q?z0ZW8z4VcwE7sgAgacGrJ0kYYpHPQjS4wto/4/5MLJkiaUqMZS80s8auDID7?= =?us-ascii?Q?utqivqo7dFj6r6E40/fougnOwDHlVUQJ+2yX/4bLuBN0OebeWgI/IqnHV4nu?= =?us-ascii?Q?E45idfMCcZ+KKUHpweLA5ONISRV/0bqO/xziIxYMBFepUXwACKrP2tTuEIU6?= =?us-ascii?Q?K9UuLF6EkUXIV3uKuz3lbOB73tZGv9TWnlrEZqYwgHuoSW3cy3Zt+DOje5lg?= =?us-ascii?Q?4Y3IRr3J+mSLbveUbGDxfUo83utZq4EKtnZSPMiREJZ3yhcsgdzYZEe9s9z3?= =?us-ascii?Q?IL0lQ1XTyCWYmxi/YuPO2It4Yify8s71lmEXpUf9ZnF7JCoLpZY3Rjxyc596?= =?us-ascii?Q?rpG6o9TbWwqiERSHGeyzZvbGiQyQjzRBNJ0osHLUmWQ6k5DawZl7HjLeryoo?= =?us-ascii?Q?MkZs1rfXmzZci8X6LXwnWIAWwhZrbrPNGicbKvHBPuiGf6BE4Ex+yoLjMMv2?= =?us-ascii?Q?2jWbMNKbLFFAkRdHsTl1L4qRU8R39o66e5kZMNCv5dV/WdvrQtMXSOUbRzBz?= =?us-ascii?Q?hxnoHJo5agKESHmzTYaMMK2fpqdXLYzjTgdvqmxZYRWHObE1+VXk9R0i8k9b?= =?us-ascii?Q?Bfz8QUp/6EcJucXksaYd7ljYxjEYZIqUmXtyVSuHFqt+3zYBEQ9hJ3UnS6zP?= =?us-ascii?Q?u5eKXU6k0NrXaJpNLsneHzzipSC3bIX1hNqE0dJxlmKmqM8LJ/M/x9csvsHD?= =?us-ascii?Q?6wLdG8Mz0c45sntX37gzSoZU5pWmTy5WaaJsfzICOpF4kxOmPeoffM9JCxcj?= =?us-ascii?Q?V34jTF7ByLnHjmjTNLdWGngGF7hZvgn4wkt4m+HrT/kZ6JeFT2OPyf8bVgqt?= =?us-ascii?Q?S2a7nzsopRV9Dj5CQQBcKOYGrqseeYTLE6oWo6adeXNQjO/xBxvRvMNrRlm/?= =?us-ascii?Q?Hd9XxQbBmsLrrhu0nnZfEcdmm1M59YPlpClQRX8rFgOnO78T1vyi9ZMTqgIS?= =?us-ascii?Q?Pbd8QSqDiuJhC9v5rQw39Of/2fTTdSHENTIXO6hjDBmotfl8WvHS4VhVuSIK?= =?us-ascii?Q?fvYedf/hztKebb7mls6v34Op21ETdUvA1VpSa2Q60jOCwiCpDEswjRdVXRKI?= =?us-ascii?Q?81g938w5TwJoIvGCPbdD2DNl/Slyu85ObbuLJUJve4bMTnn+7RCSdvGMNWb2?= =?us-ascii?Q?A3fJPnf9hpE1crQvST4WesOeWUOcBeyN2tKgBU4Izm0cwubYSaWmgdrVkzgK?= =?us-ascii?Q?L+StOzNp6/H099m2PQfimc6ldTQu+m2TxSJrXmZFsvuI+T+WVDTxSVjlUf8W?= =?us-ascii?Q?EXEmEC1y0oQ21h+e+3AuZuLrpxFiFRZ6WGe2gyha57q53DlVDcAEyXgTMKco?= =?us-ascii?Q?TraTPNsdjeMrpcRc3+QINphqyAGmIkef6ETsM+OHly966AHqANZC1oLZ6VLG?= =?us-ascii?Q?5xYAsCXDNrBNDk8MYc20w757tmeZTSDxFF3OxGnz+DW/zVfcrfT0fYc8xx/s?= =?us-ascii?Q?jYj6Szoc2YaF4Bt/q2D75kkjTEAkogspOSJYwGfSjqQPwp3yYv6Zx/+nsgol?= =?us-ascii?Q?X6Nwte2XjofoONgwmeHH8vONNdI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8dd7fce3-1a41-46b5-78d8-08d9ef0035d1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 14:50:43.4406 (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: vVomTw4Zx8oaGWLMngsWbB9LlgpgvGm0m5ly4TlNQYQGqdqveg5hnW9ooWE34GOjq+lJz8XL70+hmoBr8weuJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2384 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 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 Fri May 3 21:01:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp5526862jam; Sun, 13 Feb 2022 06:50:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJw1hGCY7lAMe5lVJoRq5HnKCxr34HpKNARVdt7fHCe62GO69N7cxA7ZlDqrwYtOa0eHrlav X-Received: by 2002:aa7:8c4a:: with SMTP id e10mr10256035pfd.43.1644763856688; Sun, 13 Feb 2022 06:50:56 -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 u36si10053674pga.583.2022.02.13.06.50.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Feb 2022 06:50:56 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3711-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=iDW80pJ5; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3711-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3711-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 442DA3E0F53 for ; Sun, 13 Feb 2022 14:50:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 246DF39B; Sun, 13 Feb 2022 14:50:55 +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 C431D373 for ; Sun, 13 Feb 2022 14:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644763852; 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=E8N9fmKvFPoLFvlfQvK8GS/xGzt3Vq64eUt8SG5kMYw=; b=iDW80pJ5C4RNGhCFKRvYh8f921LEg++/X5vpgFowwyOC5uKmpGElocNXr6eVSSrYF++KDK 05xLm1FnIzQaomwIWWh2c8Tf7FOdxNH5I/5uovpeG7oid47acrPuPWjboRemx7jhNyKRV6 XhRxPnxweQwC17jEWJbgLO71ZMNDtOQ= Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2050.outbound.protection.outlook.com [104.47.9.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-kYu9VhPXNAWuowEww2vuXQ-1; Sun, 13 Feb 2022 15:50:51 +0100 X-MC-Unique: kYu9VhPXNAWuowEww2vuXQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HDCnsmIlll5dDgUo6O7su4yNcPW6xuYQtgUaTRiGo6T3fcv9DR+fED7Mh8hoctJmNfnqQrEOXF7A+zvVsVDIarW0il23TtCqku64x1DKyk7LJNj6wWXahGrmBfjROIJJLqqsB+/jloef1Qo8p3Men+nqjKJq7epJOMmTzyd5vOZSfKZoNKRoOl95e4I7N+1wMyTY9dHSQ4vZRs/6gD87Q8GOZ7R4h64SBLK+tYJTTviUzu76Hs5ZN51H29ymSsWB712FUvic1uwkZ9lFTPyMROAmTzshdqupw+8Z+Bt2aCqpgebJnIA3GQvdYlEDE1R/4ILCA/K3TvHsFYFOYv1wSw== 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=ZT3Y2XmdtPFZ0kYmf2JdaoETTSXvixTcet+8wQsASOk=; b=YZVKE7fzXeMtbEck8wx0ETvXEPElHcPmzlIi7Ux+641HAmyX0zODKpuK7IPrVHsXSmV1lJOpFjHtcYBWwD5pzQW1fC6T0B+w2F9s5WF5nq1WljeTzlnJBG8IrzyTZHSC47TvtFPIM76F09SguXuqBCfbUf6DctZ8qvp6m9hCekiIQn8E5Dn2ekR9EooX2ht4JtfLxVtqwO0w0DdG/s0FtbLFNJt6LUPOYvtyu4LeL2kLn2eZ5tEMc4J7XS+pFFQJWBMHs31PUROtsl0F6EBiUZxuQtvG/KPeyY/el9qq5Rurp/CJQbICaRrQM4U76PJlCIUg2m/8xHGxH8GUP/jx0Q== 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 VI1PR0401MB2384.eurprd04.prod.outlook.com (2603:10a6:800:25::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Sun, 13 Feb 2022 14:50: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; Sun, 13 Feb 2022 14:50:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 6/6] selftests: mptcp: add fastclose testcases Date: Sun, 13 Feb 2022 22:50:36 +0800 Message-ID: <98edc678127c5f44994606ca3b3ccd9fd0e20669.1644763526.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0058.apcprd03.prod.outlook.com (2603:1096:202:17::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 78be513f-47a7-480f-5b69-08d9ef0039d7 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2384:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sevRwt4IU3p+zBLTrfgVqYNBeWm89lYdk6p6WcnqXIXv7IrllzIpwYh/tKWSfUJXfLi6N1BViaYoxNW6fEEFRqQmjf4SmT5m7so4jTObrjvWG+2o2bOmPnD+OWJnT6ECzMDIVvOxIxYP58/WE+A7sAFF8OGcvpOwB/RuvxfdieT3XyXSntGuKzIR43KO7ga74miXB1nbGrFmKJCuSsC/h8kWyvuSVCuYTS7+S5vN3tAZJghQ44a8Ev7ww/o3wX55dHilCt/S/Cz0jD250f4ZgMXDiV5to7V0VmfVhaUQtIcpMVEVrllm+xtqQgj9MKx9hZCu4XzwRmudHByu6AYNdiWua9D5E+jJ0qLy5kP5hlS62IqH5d0/LtCz7PoLqfpT7S3sgu/6weDmMzf4nqpb/BoaBFPQM8yCDZe6E8Lj/b4ZBr4ds/erfIITOoxI39hNPrXoswOlzsTgSgxxRHD9VXvvlk960TBepkcWGSgTMllvZS08v0GCiOSQSL7LhJwO273Y4DbHBf6JxB4K7HW/fBtofatY/7BQXGGgNHETSZsxl82/7pHKJS5UVpJuhbMXTeT3Go0hDGuiWFnutP0yLMYbjRAC66MQ6c6nTiOmy4gCKwHRyosL3Vfu7JM2/ilpZVT6mONFYKPpEOOmg+E1Hw== 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)(6666004)(6512007)(316002)(6916009)(6506007)(86362001)(66556008)(66946007)(66476007)(6486002)(508600001)(2616005)(8936002)(186003)(107886003)(38100700002)(83380400001)(36756003)(2906002)(8676002)(44832011)(4326008)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bojt4oKagKjppI25RHRUdGuQNF2m+OtLUshxY0rij+laedORFCng5NuXErSl?= =?us-ascii?Q?WoqzzbmR9IHqWF+Yl2YmoapPS6bpvc8sPuosWkgkVwK1f6dFis94P86gnISi?= =?us-ascii?Q?P6aKa3tT/vLwal2+Himt6fKcaYVMGKsNYHfxHPQS1Y01pSa5WeK2TIicmaZF?= =?us-ascii?Q?HU4cnWBqAhjejkOmzp8PAfyNelIZn+WAninUG+WVgYNkHs+3UqCRI+lHJqkO?= =?us-ascii?Q?+PPesQ/bRBIcQGHchGpHRD5cUQ926V3pU+nwX0DO+w9ys3lVLPEG2MubOhOY?= =?us-ascii?Q?T/d0zGQIlsym1ZtuJVn/JvB2KPC0Gg1L4O1JLCm+m7j1X3sPGFkjQaHnmxL0?= =?us-ascii?Q?5OGDVTsAx4rXen/P/BOqrD2+WpvcD8dEI5Ay4ny3WutRylk+Ogzh/T8vbakT?= =?us-ascii?Q?v4iIvjcJcDUWU/0lPPgqXqu7Jz9Ax6ck6WFVoWY2XNhuso9J3xqJwXWzk/S3?= =?us-ascii?Q?Vd0c+9oVhuPuI/phvupKONhbzlKcYiUz5B3GSbhLsMk+3aj+3KbuixKXoTkZ?= =?us-ascii?Q?vt2K7Pre+omQHfG7tDSMXBMPql1gujF1LhtG4IMGf5f6NA6OeY2XXHy7YFru?= =?us-ascii?Q?4F/wZkitjiXJwi+u0lZxguVkOFplAP44Ywi3JvwDvrOjunHTZZlquMoWRK2Q?= =?us-ascii?Q?bgWeY6RpIrv6AqeP2gccZVumgVBGfnhvJHRSLgfdbQjKgoCwoLYplCHyLlZg?= =?us-ascii?Q?LY455utPlrEsYas3rLonOOYAyHjmZu+j9YmpB8MIB9O4Dfm3E5NRcq0JJSYh?= =?us-ascii?Q?/5xMAm1lGZS65BRNE1FPpaQm/ZVe0gxmDh2aRiObXChxAbmKO3zwNxcCT41u?= =?us-ascii?Q?h6hT5EiA9Blm7NQsoK7twUj1pXVUG0eqHoc+gJ+taiE9zEmdnVk4G+YkxC27?= =?us-ascii?Q?Tz/JOV17HPFfgFZOWroo9Z7EXSUQWqjaF29E5d8H6atgPf/GfIfujdCGEve4?= =?us-ascii?Q?4J6Cv0b3+iSuVEJBcmLvVlKdsRDRw4qcfPxV3HvxYdJdPDhc0h2hso4NjQWl?= =?us-ascii?Q?6boZWq6hTG+8XhHOPdaEwfhOHHY5MuCWZhuvMss9xd8XrU9Ji7Z8MXD3y7oz?= =?us-ascii?Q?aNTr9w02NtLOnw7PljvAx1W2Jbhy4Hw+0yk66Tz1nTyEkqRNsS9ZjhPWby9h?= =?us-ascii?Q?VJjVl1YLDR3yFXTUe1Esno8FutaFTo1VHpnZci69fBSnhddhdiSkyI6/W1fZ?= =?us-ascii?Q?w0c3zdNBhyhYP/WQgeb3BUuNYyA9b+ArH7m+bIZxswAOnPmWEBgKFRtbxMEo?= =?us-ascii?Q?9qO64krennLvITRGlfLPZcCIgOaxu3y4LwiOSXEGdpLMauFULYhUSIPy04Av?= =?us-ascii?Q?ALoZB2p0P+P/Mi2H6vMKWaW8IgvNPlvRIh2wmuB43A96m7jh+Rw0EM54AiZQ?= =?us-ascii?Q?Wr3LtsReOaboZVOr6ljugIUEzM+B6LICR530dpcNbw1xzsidimC7PBxpZnSm?= =?us-ascii?Q?wXolIdNpiO8WSDyeftgmMc2tkO1SZKkxjcBD2k3/nrxS2g/6NOtJ1m2X85sc?= =?us-ascii?Q?wlb5S/QaqKi87wcsHp/A1iRcktPyr+eaEt8pe2312JYh0fb274MmKQZdyrM4?= =?us-ascii?Q?WE1MT5xQwMRv3gVYixobc56XVQ4DyREn7AsBopFicMgiyTR3pA3M+1ZT7ens?= =?us-ascii?Q?xGbpM+HQzhmT8u+8Yam+e/I3LzkEWrXDix7G6RZjIlGVtUtsK8g48XOiK8V6?= =?us-ascii?Q?Y1MhA9UB4hJCIAQHXZIXWw9txTU=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78be513f-47a7-480f-5b69-08d9ef0039d7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2022 14:50:50.0339 (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: ARQaQW7ekAoJSiKNvyrPowK9fUIYi5s/H4Kq1/sI9YSkV2X0YWyUc/AnuRMrzoFyYWIJctAUvbuVEKYAP6882Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2384 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. 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 --- .../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 ee747f4a4c7d..2fc26fe68a9d 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() @@ -2285,6 +2294,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 @@ -2303,6 +2327,7 @@ all_tests() deny_join_id0_tests fullmesh_tests userspace_tests + fastclose_tests } =20 # [$1: error message] @@ -2330,6 +2355,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 +2387,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 +2437,9 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do u) userspace_tests ;; + z) + fastclose_tests + ;; c) ;; C) --=20 2.34.1