From nobody Mon May 20 02:17:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp3776050jam; Fri, 11 Feb 2022 01:53:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBjFMiF4dD9TglVjgN6mWvy923rufSwDQbaO94EWUe1NMqJsimDiO1VoN9lGLwmFEYPCyc X-Received: by 2002:a17:90a:8409:: with SMTP id j9mr910553pjn.101.1644573183157; Fri, 11 Feb 2022 01:53:03 -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 kt10si222982pjb.27.2022.02.11.01.53.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 01:53:03 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3658-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=Epv9Fxij; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3658-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3658-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 8C2353E1078 for ; Fri, 11 Feb 2022 09:53:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7F71D2F28; Fri, 11 Feb 2022 09:53: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.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 139257D for ; Fri, 11 Feb 2022 09:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644573178; 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=vkm/F8kIugYthlQHewxQiNOaKyKuHxn4X5zwChelN0E=; b=Epv9FxijEnqdWY++bix9MQazW2XHiv8lUiLAQVOUkvbjn9p/MKxzY9zgwmf1UNbOnJJE4P i8NWpxK6FYgnmIx+z+8LEBYqNsmng0Sf9ga8qZbEnrjehcJyIktK1zPzmLgzfBO/f+0OWC Q+GfN+2hVfZlrHFIqSbnBPYQwxk1vTg= 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-13-fVC7sU4dOl-tLKnP_7_9fw-1; Fri, 11 Feb 2022 10:52:57 +0100 X-MC-Unique: fVC7sU4dOl-tLKnP_7_9fw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B0pVKdQdzxP4AzGS48iS4VgPlPBHu2lHHT0wQl5u/nhr0Q32VtfINlRtWXTHXTI7zWQ13EQZgttIHYR3X1LvCKXaeLkNRo2JJy86d5ksRZ0Vt5oiO8aAQLlsziZyMVS763jY5AEEBV6ps/LAYu0p0h758E8HxiopFwZAKqTmrTYLfXDO1IIraJVLGiZ7MYidK46KSw6PLn+0zDVyGnavGcmBikZEUSicOwMW2RMkoE4TP+0AFk4H9+rHhl7WEFi4I9+tzmSdBKDWSt2dgNiVyqKJisYfkbG/clvWxKrFdZEX+0YR6XqbFnNQ3hPB/to8FKOLHbAGXs3W5QLFXCftaw== 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=OZn+rwqzm+9fVwHDDf4wVUfLJIm9Nt1u//1kz/sYbws=; b=eKp6AuCiW3QeKwg0JHiCW7fgx740HtGqJZhJ3BP7IPnV+0NkAbRgIJa0/ondFZ/8CG/tw0pChhTQxV4qwFl88RDVyerbD/Xq/6ZWaxAZNJoICPzQzaoQwndiMhEd2QaCk9g4JJU3jhm+auoTqeFaJ8GuYdEQJreJ3NNxN0zM/CoYTZRh9rKWWzaAAomJPGpZF4vrbcFtNDUmyYYoILH/LoKRByMWURbH442SBXBO2T0NwaUqyGLkpMdEM2siXoBJwKkWP4lxeXDRAWv3r4lDApRV3tPjneAeLeUDod+ibzSC1a91VDp/q2I5GWlbQj8ty4+bCiJX2MkfzaheSIxhvw== 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 AM9PR04MB8651.eurprd04.prod.outlook.com (2603:10a6:20b:43e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 09:52: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; Fri, 11 Feb 2022 09:52:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 1/7] Squash to "mptcp: infinite mapping receiving" Date: Fri, 11 Feb 2022 17:52:59 +0800 Message-ID: <03aa9c661016c7b61cf84a421fd684a452ef0bca.1644572307.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0010.apcprd06.prod.outlook.com (2603:1096:202:2e::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: fa7abfa2-77af-465e-2586-08d9ed444768 X-MS-TrafficTypeDiagnostic: AM9PR04MB8651:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:813; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xe5/wcyb4Vu15SNxxMqNzxZYlGmaTIeZ2EnMb7Q9HehXPBtM/Pe4/LrdTBcCFXGvumNscUYFJ5272KGDhjXTO1zEJ+FImKF2o3W73dSreWaYcKp+fXUtmTtRu0Xt7mw0b1SD2M1YZXM3zztAGB04t8eH5/OvzqRME1TVKrogKlllGD1QP+XVfDWzkE4zAFtTbLf9TMZJ7geq8GFaZDmuY/XvVYGjk4GfeO7qy8pbz8jYp9XsrxeTLyshZ57Llzef7j25G8Gc4dWuTjNBDCbUM1cIkAD5IPOUnS5tIrBjTV58VLfXMaqVjLQw9mguyYGRoHjE1VcMgCkoZS4jKuTCfP4jzuQIw5AQzK0gGonH/Br0uq+WO+U4nwZ+iRFSEiQpQbdx9w7MYOeMyseWdTmux0ogBN+sIcekkbWeBGYp0R0VlALPt0BF1hFzaoXsMAZC6HRba0ZGpnWQfdKwHpWcTas+/ROXAm2YTdjbDaSYsNiwtnwtKqJ3TUEO3YrOgjnK2Dr0b1NuP+K5Z/cHUxhMJk3joDtQIx38uExFzylFwzvq2QtMftNRPUODA0fyK3+YWXSo+eVQ9tnH9xRi2p9WE2ua3Nf1ecAGeSadMlOUZb88mn1jaArF9TDxTBlSEraBm2ruPUiTrYS9ZvFsPkP/0Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(2906002)(44832011)(26005)(36756003)(2616005)(5660300002)(107886003)(8936002)(4744005)(38100700002)(55236004)(6512007)(6486002)(316002)(6916009)(6506007)(508600001)(4326008)(66476007)(66556008)(66946007)(8676002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9kGZVvznkWCQkLjAw2FhZ06sFRE1aXOJ4eU5vftJH7rAP21mCZ+ZdfuYxIP3?= =?us-ascii?Q?sVkvPnsEi56B9wjar8LqwKoRt64uem0+7nefREwbdy/PbEUpN/tUYtWIe6g0?= =?us-ascii?Q?/Dlrd4Vpa6eA1g5sdF6tTII1hZr/ulYzcX5Wy2GpNHkv8l2Pt0HqGLyptjLs?= =?us-ascii?Q?EWGtgMXfmj3qRbQZvCa9VgSl15oJ9scsfZdEmVRm+Yvh3X8MUmpQ+0C27Y8E?= =?us-ascii?Q?Jz4eeMBAWPuenNxm4b6egIYhftpmRx7jVJ2uO12XELSqA9FqWg1oC/5dZmSc?= =?us-ascii?Q?ma8qGvGcWgENKaMt1qkSQD3saTXSnJGTCzbul3LM9rHDIr2Hevgdem2KW6ee?= =?us-ascii?Q?1SWLaKLNIqBiM8qGZgSz+YH0DnLPchYOSSiWOteovWgae75ThWZ9SYKRi4oD?= =?us-ascii?Q?JRvSK5JiQT33WtpaqsWf16yRKK/BEaqTun60WVeYmv+ZieW7b3cpsh8YYg86?= =?us-ascii?Q?m52iQrDAMT1Ln2llBfWk+dTT5mCRz4IdbhIn53O3CIKiW8XxxOlqNCB4ZPT+?= =?us-ascii?Q?TSEHDVDM43bs/nj+BizExJYQpIT+fNKmyXpzVsGwdy96c8ZedJGW7PbgIS/6?= =?us-ascii?Q?1R/kYh498chAOKs7NjeWcFDzvWNRTrM8O8xY7fH2KLxs++w6/x6UROMEPSGT?= =?us-ascii?Q?DTLpXrRlhw4wJl7IoM7V7pFmKTvtWhni7ef80eCmK7KCBLN8SksIj0b0RmHe?= =?us-ascii?Q?Ez1CUcO5+ziEVbopNDj0Rz/NdEIrbhtS9wDoJzvBxw5O+EGDuOdBpQywdHIs?= =?us-ascii?Q?jllInutxzfbj8rNZFPsb82G3AWMiZu5TAAiro6d9/WLUPjLEI1Zr74SySJGY?= =?us-ascii?Q?GCDIBWuHcjipFWmIpwOBJO2vY1qtsDTsLOtrmj/LcP/vD4OgAILTgxf8CUFl?= =?us-ascii?Q?uZbN/cv//YmJVCkOC/o+SDDwP5Wl65Yl371lBtgc9J8UxpoZZdevUlASGPil?= =?us-ascii?Q?v5Zc7Md115wWjifB8hpxjBrO6Jq+ojYP36flNkV6ay2yd6auXGn9Ou2Lu1+0?= =?us-ascii?Q?PEHVhoZ2rsEFgtiDsQU+PLXpzq9uO8MLYevdsaCc3UFPmUQ/o7j1oGIzNIkM?= =?us-ascii?Q?v7xspp3LeFZFTLvDV44Xp4c5jdOu9dPyYOm59xdEU7dfStpu6seypczXlqNR?= =?us-ascii?Q?yOAiF/05GA7Uk0ZRnham8diHDJk+86hntGnhR7ewZ0nPA8ry7WBBPXY+pfDP?= =?us-ascii?Q?EhEyng8NYYN2Jcji2W8VeGYmK5q2nupRIqpkmtI64SzBlXcK7OrI3EP4XtsL?= =?us-ascii?Q?ID11FJXX13/MRFxgjpd5a7oS/cEAD3/NzfEd09tvpTpEyc/UBrfZDu5xsiwL?= =?us-ascii?Q?2lG6usLoAj/EfN7aZktkNsvNBI3Bi/h960kTK2Q6iSGaS40QjqegJswl4LBu?= =?us-ascii?Q?MKjyF5QwHVly7oRDsJsnFLrvf3DYbgxFLMcw5k4nbie7vYW9ayl+hqqeKi2g?= =?us-ascii?Q?LmsLw1W5wTJw7ggo+HVfKHDEGTCNTEI1vv4obCVn8crGGTzQ1ZX8dfa4MgCq?= =?us-ascii?Q?ppeYRVjIzfjr729jhv+QK0aKmZT2DVNaaZWncsiJzhHhK8Ht3ZBM6r5BUZoT?= =?us-ascii?Q?SR8rIkZYvZOKdLBBzzRc35fM478sr2evs6PAAcwe0nSJmvgCkuGVyjSsNV8K?= =?us-ascii?Q?JSs2EA7VwQ48UdaLIZvSChg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa7abfa2-77af-465e-2586-08d9ed444768 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:52:56.2296 (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: ancJGBHP/iSkjR3mSot7WRHVPMl1YOykEck6GRwLFz1cPmSnxLm2mJbAHjADDgFyWs+Lplp/Ggy4JXpZDDgdRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8651 Content-Type: text/plain; charset="utf-8" Print out the infinite map received info. Signed-off-by: Geliang Tang --- net/mptcp/subflow.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index b53b392dd280..250ec414df92 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -961,6 +961,7 @@ static enum mapping_status get_mapping_status(struct so= ck *ssk, =20 data_len =3D mpext->data_len; if (data_len =3D=3D 0) { + pr_debug("infinite mapping received"); MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPRX); subflow->map_data_len =3D 0; return MAPPING_INVALID; --=20 2.34.1 From nobody Mon May 20 02:17:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp3776111jam; Fri, 11 Feb 2022 01:53:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwSzpB8bYr+VhP3ACAfDEd1V4OUa6f9Az59slH+UuVflVEfY91UiWGsdbXzLyoCLkYuGyau X-Received: by 2002:a17:90a:306:: with SMTP id 6mr882030pje.169.1644573191009; Fri, 11 Feb 2022 01:53:11 -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 q127si11524078pgq.21.2022.02.11.01.53.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 01:53:11 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3659-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=H3t4iLKb; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3659-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3659-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 600B93E107D for ; Fri, 11 Feb 2022 09:53:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 792E22F28; Fri, 11 Feb 2022 09:53: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 052047D for ; Fri, 11 Feb 2022 09:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644573186; 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=rcE04E/Kumip33cbkuKqno/Essi+LYAVbRQAhfFnzq0=; b=H3t4iLKbRfLKyhC/ioc0qH45qjX9JrPFDLxrQGkhkfT2WoawFkap9sk2KbFrf6ihBcc7d7 bzhkQ+oi7xTKfMyJt3MSjz83OQWN3g6I2ay061igJHUA0oO3yRt0gEO2N5O/h+5sFoJZMr 1yn5g9VVAyv4N7qFUIMQB3ycqRTlDEk= 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-33-FcADWDlUPhujWqCjmiD3uA-1; Fri, 11 Feb 2022 10:53:05 +0100 X-MC-Unique: FcADWDlUPhujWqCjmiD3uA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fJcK9Teskw58AHECqG2HykdpKhNy9xL6A78OK8AW9oxzbzxqGJII38lOm5Y6Bcv5TR3eP8VJfUuXg9GxIlPU5l3HuThV6T3+U+q1fiG7Wq8Bj8rfqvzcvUGeNz0Y64KZeTDeOXECaTZX76hoaoCvOMIn4T9ec4DtQY3Mx0cjo8lH/ASL0d0C47JsKGm33eaVC/I0DWjOxqQASCWZWBOlXu4U5hlysUiPKg6BlfojCTQryaZX6fH8lDx4ZHI9K4fkDEJO+GSoMruardrV0iOBy4G1ECq3v7X9a1tRuxrvCw/+OghSagdH8j79IWremeKcDs8JHK4Nw42EQQsTYE42Cg== 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=KGXB4Wk/EDNVmwBPVM6B8P+e1MIhJLamoTbyF8EpBqE=; b=QmCfj1jLv0dtMBfH2P5gUGaRDJrv2r2SAG7mobunTVEqGqlLe6iwmkO+odLB+IVT0jGALRZQ2Xfndo2YM/6vV8kfTG0ecABzGwseNlARtrxbBox7lXjNnHWU9xLTX/xN9cYIcPIZPqDfCbTIjWRL44n+hkNDYXjypfp9/ugHLPQzmeeL6a4PjVkevNF8yjlaIPnXjDs6yYOqshtJKqkei0oAJSr2Ce0gyNi1r+bxcskwj+QZBECKw6UEzKHY0Omi6QdxiJdq0WgEmtqL2A+ADkzEoTz2iyavGRGccmrsf79pK0hbsMnzAdttUeSG7HYuSdmAHTeMsSzmAxQ4bqHWfA== 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 AM9PR04MB8651.eurprd04.prod.outlook.com (2603:10a6:20b:43e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 09:53:04 +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; Fri, 11 Feb 2022 09:53:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 2/7] Squash to "selftests: mptcp: add infinite map mibs check" Date: Fri, 11 Feb 2022 17:53:00 +0800 Message-ID: <075df2856987fb4e276cf4308f2cd2b2df032c98.1644572307.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0070.apcprd04.prod.outlook.com (2603:1096:202:15::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07dd5441-c000-46da-8494-08d9ed444c31 X-MS-TrafficTypeDiagnostic: AM9PR04MB8651:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:88; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dDTdQRakwXlmhBrrxxCH4knv12fClX1y/IXzwwYiNqDPo0JB/iAMlZgtQYx1UnUWou9C8bmmSeWMvJy9IAh7CFf2aiapDeJyCqTEzQ032LWpI+BU4DBXxN8mdCRM1uC4dGnDzecoWI323itT7u+6IozPnuggRJ/e15wzGgO9yyXWkMD6WUy8Nyjp/8TXffjXu9FHFtch/l28ZeMDdsqMpmQvWUgNVSbiPOcQf5+y2L8DhgmtNNvFCj3sh24BmPimDrwJbWOzQh47AWNHugiM0qALMqq8B+fPNAiSmBlSVTiY/jzJHr1R/l7Wop11qVPIEcVKA9j37SzusUGkocgAhV9XWcvOnJrcJb57vUfEPY8T+i2CLUGbuCEOoTxDnBKjHxIjkmvcHOEZ9tF7wsrg1aQulUZSvbowLKsOuy2Q0/lnJS9eEbOylqZuXlSPDl+QOh90ts47R3j6vpbRe0Z6npbtvi1V1ECNgnsSPo098jjnbpLOyaOvIKNPhdqYIvQtv4GfvfqVXWN3PN02mWdvZP7CUWNF/OFX+leFFP6dzwpc4Qy1PReLwHrd21aNQNhy6sfvLM5eURZ2voF1OnsTomzuIhZlox1XEdBas7eFrCKfdON2uHI+J034+aEcLrwWlhg0gc9bqngtY9S7IarULQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(186003)(2906002)(44832011)(26005)(83380400001)(36756003)(2616005)(5660300002)(107886003)(8936002)(38100700002)(55236004)(6512007)(6486002)(316002)(6916009)(6506007)(508600001)(4326008)(66476007)(66556008)(6666004)(66946007)(8676002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2gBZ/PzJa2CGXIIZjoKgu3XJcp8kbzZm43Mv0m6CQa25bsPORdRF/i8Y4X7L?= =?us-ascii?Q?c9Ct3mDVnC89AOzDpyQKF8o6vSpDBYmeja5wn7Jy5IVtcZL8nCvZmr+ZAtKi?= =?us-ascii?Q?lqq/oJVgIohRJPqWb4ZJORmLedFc4LNWxg6CMfNB1+FpVFtGRgUJRgy36wWJ?= =?us-ascii?Q?vMLyy3FfY33E2suYdCz4gDvLEanLcAWoDJBGuO6KvNqUTfcYQTS2k/SrZ+nB?= =?us-ascii?Q?JHONQlSMdMyaXqg9UD3QqnxqzBQwLUP9tcMcqTnBytSP0R2Cv9kqO3fSYfcn?= =?us-ascii?Q?VhXIij4R2Wz+SkP0mONLAGaAQJiXHWrUZ8M+I3UHTZS9q6GFZ/nAO+IlduJT?= =?us-ascii?Q?bw06LNZZntcxpMhIOO4GiKbVvOeIBrKZhugy/tQ/PAGNfOY8HaA60I9Voas9?= =?us-ascii?Q?wcLKSf8YyiaM8GhaLGOSs4wyiMHZJvFDHQ43ntXXJeH/8llZLS9ZdrpPVLyW?= =?us-ascii?Q?7UuFP+cbga68QFkME8LiIiVafSZma70ibqbXLWwJucV1FuSdPJkfPo+Z9cOn?= =?us-ascii?Q?PjKsxnStJJI7UvRHWayfMEZM0xsQwxDfL8N/elZ9tQCBfzWppO/0jFNLjhfN?= =?us-ascii?Q?xAy4Ed8NjeMk019N4FrBSeNCEiiPUC8D03C3QidUnJ8jB+g6qyM0qoNjxYGL?= =?us-ascii?Q?8l2tpAL6XWDXGbgyPprzAmI6Wpgldj7MLnamyB+Q+cM28kzwq7QQ+PhFa3Vw?= =?us-ascii?Q?oceieOT+e0A2fl57yjpsIFHQg/vQep90u1+jul5NILrGY6CUElX1AgC4PPc7?= =?us-ascii?Q?OPKbY/ydmTXkRSMYh1yFV6ShCpZjF+lFJKkoiJVQTJ+TbrwUs/OgjXg/6y1N?= =?us-ascii?Q?5/GC6r9btvRhnMb/eU4iByHlXQFsI67PJEWI1len23m42X2TxKU7efzJk+gs?= =?us-ascii?Q?4ah1i9V386NHA31V0qvChWjfod01VanovAoGjXWUS7nVLsp4Ihx2zySFt9gT?= =?us-ascii?Q?D+HKtAvlTwy9SZR71TXf5UyOzHgrluY0Xj+1zSG873e9z5z3mkL+HwklXQ0d?= =?us-ascii?Q?LnE2RmWfBl9uVE9ZzV8PtIDu9LayvQ22FNpv5l3k3xw9FaCNJB3luxkS99Ue?= =?us-ascii?Q?7wCTsheiSARYjAekV6FjS7UHqFnnkP7tH4jy7dxrPyJYlyzQcFPJZz3Sv4wz?= =?us-ascii?Q?3fcMxkZVgmjC3YG5/f8/PCoVAg7X+bigXo1BksHmrKv/bYqGg5CnC+H0Ugu5?= =?us-ascii?Q?SxXx8z/XP/okelwVFmVr/wEQt9DVUOy8gJR6YQZOMPjkt1mk9mnaSAl2uwEQ?= =?us-ascii?Q?NMeLvjqB5h3px7b3XGy6nqNM2XeCF/XFtbuSiJZcqLc/6hlTl1RuCrjbh1TM?= =?us-ascii?Q?VrYNSAdOnYmVYs6ddB/qZ+KLZLXHC8oxMOKM4ExSQ1VeosUXmXgflhry4WU7?= =?us-ascii?Q?H1wDJKPpKTEm7Qdq/vkeR2ZGd150+PiTNuJjxdSlxBkN6MN9Hb3/yfwXaFph?= =?us-ascii?Q?XkKqusUpM8qCNBwiEFejsvON96uBPpBYh6jL/7LdRqInDou2Ouu5fe1DqlIj?= =?us-ascii?Q?6wTKPuGTvnZd2ssWlwS1CXQGcXhE0SWI8EJMxQYUc7P3I1NvADJacqfonDMz?= =?us-ascii?Q?wYsdK9cWR/eC3DOqTEw2B1Gug21NF4NbTPQBMHeRHUFb2jZHI58Ua88kGlpj?= =?us-ascii?Q?Z48X5Gn5wFoA+f4QjLvD7Lo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07dd5441-c000-46da-8494-08d9ed444c31 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:53:04.4633 (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: gFO/ukWZeUYrYDWaz/lpueSwK5vFwYHGOY15lOJaQmhYoLmWiAHp7uuj1A/iH3/M6K7zh35X5a77Ba4xdbLTIg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8651 Content-Type: text/plain; charset="utf-8" Rename mp_infi_nr_tx, mp_infi_nr_rx and irx. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 0b4bd2df2538..9b75569e423a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -784,27 +784,27 @@ chk_fail_nr() =20 chk_infi_nr() { - local mp_infi_nr_tx=3D$1 - local mp_infi_nr_rx=3D$2 + local infi_tx=3D$1 + local infi_rx=3D$2 local count local dump_stats =20 printf "%-${nr_blank}s %s" " " "itx" count=3D`ip netns exec $ns2 nstat -as | grep InfiniteMapTx | awk '{print = $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_infi_nr_tx" ]; then - echo "[fail] got $count infinite map[s] TX expected $mp_infi_nr_tx" + if [ "$count" !=3D "$infi_tx" ]; then + echo "[fail] got $count infinite map[s] TX expected $infi_tx" ret=3D1 dump_stats=3D1 else echo -n "[ ok ]" fi =20 - echo -n " - irx " + echo -n " - infirx" count=3D`ip netns exec $ns1 nstat -as | grep InfiniteMapRx | awk '{print = $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_infi_nr_rx" ]; then - echo "[fail] got $count infinite map[s] RX expected $mp_infi_nr_rx" + if [ "$count" !=3D "$infi_rx" ]; then + echo "[fail] got $count infinite map[s] RX expected $infi_rx" ret=3D1 dump_stats=3D1 else --=20 2.34.1 From nobody Mon May 20 02:17:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp3776168jam; Fri, 11 Feb 2022 01:53:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9/txC7DaYbd0Cx2uULn0WoV6lX6AVMIuhTM0YM90uqjfG8zDaDRJEqP6NlbLCp5g3QJEs X-Received: by 2002:a05:620a:2682:: with SMTP id c2mr301294qkp.481.1644573198333; Fri, 11 Feb 2022 01:53:18 -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 t20si5344599qtx.380.2022.02.11.01.53.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 01:53:18 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3660-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=LThJP9P7; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3660-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3660-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 EAC791C0F11 for ; Fri, 11 Feb 2022 09:53:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8D0462F28; Fri, 11 Feb 2022 09:53:16 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.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 650647D for ; Fri, 11 Feb 2022 09:53:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644573193; 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=I62cFlbIMSz3fhyzmam8ApIailQ2EUNCaK0NwtlWxjM=; b=LThJP9P7cIZqi7fCVKG6J97XHQefKHav9FiFPQWrNlpEpRm+SWuIaIWpoTKuM9NtImgul2 NxnurnZ4QOeAYEPsh+gjJHUv8tk60/QU/N8ywMPb3zkx/qkX5KWDpRP4qGo2M7qCzvZVTv TGkyJKx8eO9ncN0A19b7aHL0TakBBcw= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2110.outbound.protection.outlook.com [104.47.17.110]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-9-9Zz7p8NMO0289JTsmOBU4g-1; Fri, 11 Feb 2022 10:53:12 +0100 X-MC-Unique: 9Zz7p8NMO0289JTsmOBU4g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=csZl7VGU0BrkMzdNezW/GAycXig0Z7ZIO9mKSDTveRvbCsz1TE3j71JB4arRPIIUmncq0JNkxd6siSeXJzq34WbOCQkTO4H7jpDi1FhXVbFlw8vPFiGM7SN8OrdFdTdiwlhCN59rilt5/mBwRRcRMs1nQplLcmXEV8qMkNoOpG+624trS0k205lOpJbWLQzgMBPp3at1vKCqFQd5HIx8iYwLQsgXFkjvsBnQD4NZVtdsJXhfj0F9IZ4KnUOGD4OVxo9XKotlwJHNJoMb8+M2HbbQSjdk6NgA8NfK+V9kH+WTVoQRgOjgQgFIeUhCcJG4iegSPk90LR7+rErqEQeCfQ== 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=aI9z4bjoXx379+prboId0KU+beZbnXhdV062qpuTo0M=; b=Y8sIfUr4xcppjdMbP4DWTQF4reamlJ80w5BMQWy9/0/HaodxpMlK5mfPTDmEqrVx/dZ8rJXIvgKwgryR1qKrb7cSXQy0r+w1nGlqMa+6EuO254hgJ2kH0m43SfCnC71ln7Sd3kOUvTWyCLvH7n1zQZgXNeGVVJRsOvkEKAoFKPA0uksfsCClarE9U5H2v18DxuVoijpk3Zi361I4Eh1tht6LXL6qZaDWXbKLSwzzxsW5hf2iok91GUuW4znleqteo35Vz61lp41T8RJHZ5XjIWWaWgXgwnjxPb3Isl0T7NpDBj6bUi3mDy1jk0pIGGPIlJqPNJSHloiw/jOHr37TyQ== 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 AS8PR04MB7878.eurprd04.prod.outlook.com (2603:10a6:20b:2af::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.14; Fri, 11 Feb 2022 09:53:11 +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; Fri, 11 Feb 2022 09:53:11 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 3/7] mptcp: add the mibs for MP_RST Date: Fri, 11 Feb 2022 17:53:01 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0183.apcprd02.prod.outlook.com (2603:1096:201:21::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: 1bb8f07f-def1-4df8-0105-08d9ed445073 X-MS-TrafficTypeDiagnostic: AS8PR04MB7878: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: 1rc8EsqUHWyhWg4gXNrH+uaHzrtu/SAL3hynxJsgoMGM2K3wFvieZaJs38GrWz3UmBr7FbYhALG12jLDVw2VnkFM+fnLu2nOzUzu/lIrUoT8YsT82uV5HIFoGb7b5rLRaBEC4ItmNYdtoi1ZVaLdyWmePxA2Fk8fX5EBOgngnMrVd1hngMm9zITffQz0z9c3MYmXH8sC1hoMTBn+gOr/V3z8p9m6GIAUBAeGsT2aP8vDR7+JxF3BWXelXGFExHw0h/82fraB7cL6g7Ga+JuIOydjA3rU2Up0A65eJV+a3K5lQQnL59JNbudCfC5+ud/+J1/HZU2PjdtUIi6oA/KTRmkIWT3bdJYSKU2s5Zned3eTEEOn2I1GLkvkU2LjGPoEAQuDK4P9wAdHb6YACn5yxwnc510y0ulngwTa5PAGJsCEAFSph91KpKoi0Iya5Dvgaevy9zv15DYM85Rbrspbc5aRazzoeGwcTSHGjV70mHgGtzfelEQeAx4alzD8spksBPqTerEhj2V1/By7+KmfXzeHB49i9PGbfvLLiJDiQpjMDHjZshE00yCYz0vgVNMd8+Q5BpDUivIHLrz/NO2pXXGhgxdCAKbO4IsK8mMGmGwBFhL3r+O7CwPOiF85tYqNe4nysYj6iNIqf6gmptSq7g== 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)(316002)(44832011)(66476007)(66946007)(6916009)(508600001)(38100700002)(8936002)(66556008)(6486002)(4326008)(6506007)(36756003)(6512007)(2906002)(55236004)(6666004)(86362001)(83380400001)(107886003)(5660300002)(8676002)(26005)(2616005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bFRtHhwR6ZzMvOlB2G17I961A9opz8e15nBGnVbziXSQS9tH54Z6CUqQW908?= =?us-ascii?Q?HmnMoo0ED8NYOE4hO22qDoqchonUDWLuozpN9ZiMG93uNhw6AmOpGkhZYSu9?= =?us-ascii?Q?M2iGV8ofySKyvgjIth7Zod++qNrodu8BJy90diEQWkDOR4loDdSiu95V9wwk?= =?us-ascii?Q?SeOMFZddFpKV8vgLLl6b8NQhabqqj8OnwvMKW4ovtT5Dj4Q3XoXGDi9ueNxD?= =?us-ascii?Q?var9kuJfviX3wWU/ayVf1TEiOpLVEZWX+kbp6VgWR4PKWaxlJykVgTsD/HuR?= =?us-ascii?Q?ULeMrp7XMMl8ncgTpS6w+bSiXH0ic2ogtje7RQpZFYdHOpzw6cnsAyjbSIQB?= =?us-ascii?Q?Tlv8Ty0HgZbCeFfSvbPtPCPklOs0r2SUbbYjUeXcGpU7E/kvIEZIlRqv6+tO?= =?us-ascii?Q?pjZzRCotbLYpN+WsqXlFCoDqE1gusnI9LS9rgpzeeiOvSUlWbtdRXMnf3LPt?= =?us-ascii?Q?zRWOT1YAu6nCq3b2rz1kVF1O0n1Gy4fZVYlu64PBghJDTzlIZMYztq/nhaMw?= =?us-ascii?Q?nvRGZSZF3aKgItOonHlFViVV5d9e8uZG5X0M1IGMeB3C4/KGkXI60GXmXwgW?= =?us-ascii?Q?64q0cD9uwWbyP7MGycX9H/H6Q6EubMXtUw26DibJyGTgVfR9H/k96u+CVWGa?= =?us-ascii?Q?BdF2lscJ25j3AsSdX2go8DWbtCMBQtIrr+LOdaySJp4gZs9BG8S/3gvLuoFm?= =?us-ascii?Q?CsQ++9d2mbTwUFWFkQaCMixFvLZ/ENo8QOUUwXtZqq9hXysFCaPTP6LrSAjY?= =?us-ascii?Q?Ph8YU9SyrXCsL+O8pkJDcKPJzyziVIHOGEjHacFQf4thJafoMyA+McQdVlUi?= =?us-ascii?Q?V14LIYUp2wyXXb+10oARV4LByf+MZKXfJzzaq+BjR8/Tn5KUjPmM6aa95lbW?= =?us-ascii?Q?jW4KPknpISVw7knyRJ56s0cyOMP8BpXMegt/eip5CSwFj6ExQiH2fToioCr0?= =?us-ascii?Q?sdm2Ovu02bsIWsTx3ClwLMz9jGCukTE+cTANLNDZ8NhfKDyvsDTv9yp64LY6?= =?us-ascii?Q?3hpur4zO2GaD9v+LW8TxqSL1ON5bdrjfYfpzzOgBrSQbahHWvn1in20j6r/m?= =?us-ascii?Q?FabJeqjrkTLc85e4l2vMevCds6YhnXnwFVTwwDPPD5E458dgHuVBDHw55wJy?= =?us-ascii?Q?MqhyV0Ws8a9i6go6WDOAf+Jhp1Q4Zh3UQN+pF46t9C6gz+6IzsnRRRZQCbcY?= =?us-ascii?Q?Pn0ejqhTmJ03a76N90yFVqwNsKi9c7mXsAqSQNiXX/mQZJGiUILK4uQw8/3m?= =?us-ascii?Q?B9rJGbMjrgpA4y1lUdfvgA1aFb85QnOvLNYlv/rjb6pCVx4xzSzadg3rtAl5?= =?us-ascii?Q?5O+VJf0xuq9sttvPIDhjE1E3CIVXZuBvPeU69E6bVhzODdze9s8LGm3v5bvl?= =?us-ascii?Q?TWCGA6Y0wWFSCVsk/6MQbi4nshnUfRSyY/xzcsnxawGYzz6uC0HLurv9emAW?= =?us-ascii?Q?hZ9INayxiAytG6FSU9RxwXb0bcRnpDwdhdqtQASenAK2t6KVXm5Ve/dRhJrH?= =?us-ascii?Q?6rFrr3JmoxKcODjlObNtBGUj+/6WEpHNknLf0e+o7aTSHe6Sk33MshJQc7BD?= =?us-ascii?Q?/UKZTSNpkEGdnwuI9tEz7IuN3LbNg2BNH591ZNH8nh8EokbviVpGO+HiYBXs?= =?us-ascii?Q?H6TOcZUdlK8Ul5SRQ8ajqNI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bb8f07f-def1-4df8-0105-08d9ed445073 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:53:11.4158 (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: oaqg0W/aJ/mnqNO6TwA5ae8dfGqaHfKg87TnXpKrKM0AQ1PNlhzqP21y840D1dtp9DBCe4M2qcIsPCRKhgJnZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7878 Content-Type: text/plain; charset="utf-8" This patch added two 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 7cef7409e300..5ed9a7da3550 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("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 785cf751e5c0..2f3a07567730 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_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 0401b22128c4..935a48cb40d4 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -837,6 +837,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; } @@ -1158,6 +1159,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 20 02:17:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp3776231jam; Fri, 11 Feb 2022 01:53:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJyB05bo6cgJLNKvPtbxU4KcHicEcqfZX03yMtwECBihMgR840tL9XrdZIsrH6XneiUgjk+P X-Received: by 2002:a05:622a:14ca:: with SMTP id u10mr481817qtx.551.1644573205899; Fri, 11 Feb 2022 01:53:25 -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 b1si1936727qvf.450.2022.02.11.01.53.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 01:53:25 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3661-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=lgE6hlDz; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3661-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3661-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 8B7931C0F16 for ; Fri, 11 Feb 2022 09:53:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E6422F28; Fri, 11 Feb 2022 09:53:24 +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 226017D for ; Fri, 11 Feb 2022 09:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644573201; 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=sVkMdiHkZzAxwJ24B1qJM4rVr73teD4T5rL7mkEO0Vw=; b=lgE6hlDzFo/N98TOa/BsvHTsM68Z8Ng7va0izr8KiEc+s4XzumOE9KZDDdjrd8oS7bFXq1 DtWr6O01BOwqwg7SN+41gQNcMe/lt4v4RbBoAOgJKqsrR3/9iUQfmiTjuqi4u7g8AqN/9i Q/J4BIfuYOv5lfOCkLB+jkbQEtx7boI= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-23-2_GTDiW2PAiJebvdFt9v2w-1; Fri, 11 Feb 2022 10:53:19 +0100 X-MC-Unique: 2_GTDiW2PAiJebvdFt9v2w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L8/9trDqIiGo1au1sbOnXZgKsWp+Bt2gDk2kK1j4tuvhQoS0Rw0NkyyCQRW/EuGYne/8yXQiuNltjRj31evigaxh+eVLY/M+kWyRTs5ssCk5WpzYWelx02HE5F/PcWGjRBO1JNKhICQs60N0o1m9pPtYsX9oNh8YGLIy+xgCUgzfNGC0ncRRNlHRKrhu6atbT9gs07gpqGtnj9d/ra58K9uEdyCLtkvOy+ljTWUzkm0UcqWtsw+RN91QYL1+hqg8/1d+B50ocDQPpBMHuylpVJURLsJH1ZlO0IBYMQRe43hexX7cbr3paDoKjVp3CMd8UHRu+zir2AmmOLpCqyFtFQ== 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=HK+Ngn5Ubz6cDBVLdz/zLR9zSbY70dWaIMwNoPlRBqY=; b=C5lMepmOPaF9vekKdxm6pZhVQM4a9AytWynMRQN39TFFjxfKaIeB42IN6GfBepNm65eNrezCYKvHGgtL/mdL5hFM+OhQjBPJn3DjfPgTVHkHx1c67KP2+vrK/vXYhevnVvVntF2jsvAL01RvNyq82YJtX4TB7Sz2BErHzCPJdFEcp2rFaktmp3eaQm+ZOkbQ5cFRogPYEhfDtEBp+t/vjlaPgXbmbW+m0n1I5FXRqTGUbAxffzXQ69Kxx9M49yHGC53UrY0eWys/U1bCPJJ+R0KdehdVIKRRmphFVMo8dhcnyDLPuZojHOEQvDbZaBkOu6ONjFlcfYTGmfIVZZ6iHQ== 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 AS8PR04MB7878.eurprd04.prod.outlook.com (2603:10a6:20b:2af::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.14; Fri, 11 Feb 2022 09:53:18 +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; Fri, 11 Feb 2022 09:53:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 4/7] selftests: mptcp: add the MP_RST mibs check Date: Fri, 11 Feb 2022 17:53:02 +0800 Message-ID: <728ca52e45b1b11236f58e5936cfda27164c106e.1644572307.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0052.apcprd03.prod.outlook.com (2603:1096:202:17::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: eb851aa2-5544-4b38-4604-08d9ed44547b X-MS-TrafficTypeDiagnostic: AS8PR04MB7878:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:597; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3KNHruZpg3AS3A03T6gFoSQKkkGT+rvodB0N4uwehN0KDkkyRpX+zBok2jZgu1ra66ouNdNXRI150dZQ2IaR3sojiLodgZscWCe5ntTg5YNTxNI5Wzf8HO83U2F/NDl2B4Dnqa6CoBUIFA7mGqsxrS6iCsp1HTzLiwPnNgANrZZ/naDByUTmzOQ2D3v0HJFStLHWsDQmJmjxQaXDKa/WrviMsd5qDMHwWkuOVH9o65WxOyihvf4PHa5PK0cIBXsxDw0X2UsrD1woy4dlQYJgA/HFyyfMkI3zrZ821qN2UK5IbZHAP+StkmygaBTLLnusUO8rMbTTOF1MsdzhyEoC6Yqyg1r89GlXhv351GvsAUiR/rfgfNhbRNuUmFX2jTEmy4xbNedZK0jND3dpPB/SpslO5rEABG4Xqco4hfBzlnRUQDzsGAiLeGrqK0mUvUsxmhyk5UAXBN3cKyHgVDZG3EGRkQ08+0PQTNFAhdOyVj5rZhI4reGhhH2Z5T3RDRSWH92D2fusoGptLVYsQWdbXxN7QWe6mmtXGNsyrbnsBvT8tXg0rYBeMOVxcXXcZ3U7NbcAfzm4QH4qiJvuVTdl+p7XI5p0dr1hq4PBtRJlphbnzuk007YvmTvTJ7zOJJ2Lgk2CfbYEl2RoolL88XYZEw== 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)(316002)(44832011)(66476007)(66946007)(6916009)(508600001)(38100700002)(8936002)(66556008)(6486002)(4326008)(6506007)(36756003)(6512007)(2906002)(55236004)(6666004)(86362001)(107886003)(5660300002)(8676002)(26005)(2616005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RuyPcLAi040LA3sH9psJocf5iDEOKWMqpLbBPdUJ1Bw24y9WuXYph4pvqgXs?= =?us-ascii?Q?2ok7RnCpGSM1Nj3qv21rdZ8SDtqcsCQWG0FjtYZhdtdHAOqlcD7n/GDvhbul?= =?us-ascii?Q?X+hqEtT0yXYvDX5KWb66Ktmh5ZVkISJSdHhChUxr6cLAvAPnxXtV+o6vgED1?= =?us-ascii?Q?Xfh1TDUdRa2Q6xGDIe0NsB+0pGhXNd8VN8+3uwEjo5iRkMkcMIPHwz/+gTzx?= =?us-ascii?Q?6NLSGfb//KRQyUS2urI/sVC2uevkRCDuN0OMXYwrOohUeQu++9yZIYZWg199?= =?us-ascii?Q?ZOUEl0+jXrrnHD/2qKHWYXROFh4X6T1/yTfYjjQfhEXEIt+QLfVNQB70eBut?= =?us-ascii?Q?v4yb+w6l9H3ofBflbgCsoEe+8PxaKHn2m8rCztEIJaDi9uPSRgyov6yqXmfp?= =?us-ascii?Q?j/axKjmMgRt6Re3YTU5nADr+NgCyJyxcXW453vn/BOcXGg7HUwBfcQvBLVJc?= =?us-ascii?Q?yryb9da/Za5skUwoxeUEyptjvnSkmlSl7aQwSjI9IJS3gljKfnDhIs0XkLkQ?= =?us-ascii?Q?UkWqJ/vP35FjFnme1PZzhBDMQt0U91i5RVCosVNkM3O4XiPqF5DfRIrtIaAX?= =?us-ascii?Q?A1TFbwW0bFbSL4OXdVTAdcoEFrc3CBV6L56BPCjkYwcB0yZajAxJ6TtavMpq?= =?us-ascii?Q?hKjfMFZRfCi7Za6cNXTMmkETg6ES09QKUmi02FwaOuZPZ4u4a87KYW8Zdd6D?= =?us-ascii?Q?J8NviDMO41TzQR0rlNNA2pdAFMnR5acg+7TjTT95I/D6268nuZKjuz50J8GF?= =?us-ascii?Q?Zv0pdvttUEbwB3Ek8yF66mZw72xG6QXS+BpW6dbopwkogxOYy1j+LqYsC6uY?= =?us-ascii?Q?NUm3Ltn89KxMZ9VhSzeurq/49T2zrkaJVIftSdKBnPmRH17yXRbXJp0faX4C?= =?us-ascii?Q?cUnWJPRSkl0wHGGh5zYRDKjDzxUxrkJXtHlSYgFF+NS+S09qdE4kSnnj9IoH?= =?us-ascii?Q?6QkXKcOD/Wod0CN4ahX8guJNLIl/bK5YccOs6/L5Ch6VSyDvNPY+Ni8OGSr/?= =?us-ascii?Q?yxzukwGB9TkY+F3QW9dKqxVvoMJElM01p7kjgdfsTZPUREXNNYPI5xjtiv0H?= =?us-ascii?Q?/FQMAVDY6E4YLsrpSasG4s2Yz4vjmr7pZr6wkv+VMdHnzVnDqbcMXrhwzkdW?= =?us-ascii?Q?clvSPQffAZi18wBmKtnUSBKA4+JLNxxyA8TZjgm1iDlZXcdFrlLNo9WEuwMa?= =?us-ascii?Q?lA791HCmGksX59oso0Cd9ryj4XQMvZ1BA2gEeP0ciJ3lo1WSiM30y3I6fhnd?= =?us-ascii?Q?v2wjjGjknXt10nQQ4K/LHzw5u5PmdTMoFwBdqtXxpiqbAVAQSU/ahvHCDsrl?= =?us-ascii?Q?ShdvXjANLDKqKJjAIf+5tmeMVHq6yzRuQysGZtVsBmXBQ1yYy5F9l/1/JjmV?= =?us-ascii?Q?gKLtjNU5CvYA36AgEyx+oOz4ljMvn2AcG/MvjFEt6Yf949BZIAdzI6Lgi1bP?= =?us-ascii?Q?q58YGkwm51g8NMw5AhsFN4LaAoQ6o2b3SkRizkuZolmdHAvrLTPJ3ws+C1nr?= =?us-ascii?Q?wCKieI+XyqAgj8mhYIv9hnJoJ7CEhWKPtuVOoQp9RliQZ3evEvLlbqTcUf0m?= =?us-ascii?Q?T/3J04+NHXNI5FUoLOnDccO+mUGBJJyy1I6U0QQFIGIFtdE4gMK2bRxRioBV?= =?us-ascii?Q?AvICO6DrTtZrl/rv7VaMTj8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb851aa2-5544-4b38-4604-08d9ed44547b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:53:18.1497 (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: f3gnmYgfmxAC7/CsZnD8lLfBNTJwYP0XGOZmkqMJmpsfG+hOjxQwMzk2i+HVMdqJx7aH+4AwGpdMoiAIqCXvrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7878 Content-Type: text/plain; charset="utf-8" This patch added a function chk_rst_nr() to check the numbers of the MP_RST mibs for sending and receiving. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9b75569e423a..7537f4fe8078 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -782,6 +782,38 @@ chk_fail_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_rst_nr() +{ + local rst_tx=3D$1 + local rst_rx=3D$2 + local count + local dump_stats + + printf "%-${nr_blank}s %s" " " "rtx" + count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPRstTx | awk '{prin= t $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 $ns2 nstat -as | grep MPTcpExtMPRstRx | awk '{prin= t $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 infi_tx=3D$1 @@ -868,6 +900,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 20 02:17:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp3776288jam; Fri, 11 Feb 2022 01:53:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUYqLnbdMsWQnmOiuP2WdUnpZmRvymFKpK8sXt8ZdyxPAMTpyyQT5aAFeVvcJ83u9jvXCJ X-Received: by 2002:a17:902:da82:: with SMTP id j2mr687081plx.27.1644573212632; Fri, 11 Feb 2022 01:53:32 -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 p7si4231493plk.116.2022.02.11.01.53.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 01:53:32 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3662-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=EpoariUf; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3662-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3662-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 B63193E1092 for ; Fri, 11 Feb 2022 09:53:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D81802F28; Fri, 11 Feb 2022 09:53:30 +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 827377D for ; Fri, 11 Feb 2022 09:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644573207; 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=iqZy1pCMxuA5d4wa9OlaQ0s0oOQ3Adj4kZYqQUE9EKc=; b=EpoariUfi/alGiMAxhNPm+Xwvx3blUND3/SPvQjH6m0wCOqXDHZTNcm2uU82FxnPq+GERj tR43fcURNP1bYpjmde6AtHV1Muv06Zv+tiYu+AyiPUZqD4rpTETOd/teoyUDsUEZOXAlk2 2wrKSetg/7GhF3+jdJNMo6Zo6NUtqgQ= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2108.outbound.protection.outlook.com [104.47.17.108]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-R7JQHhMaOc2r1br6gJe1Pw-1; Fri, 11 Feb 2022 10:53:26 +0100 X-MC-Unique: R7JQHhMaOc2r1br6gJe1Pw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UdxsEynZXtwV2WhmAX1F6OibMTgEo2Zgt9uoZFQv/kdAunMWgyQImvkud1T7LP67fmA+U136X1PrwIOKDci83xeoSzOtsry40iqi4bZO4RwH+txZ3CZDkgTBbi6VfKq2IHUljHSyfC3tsGyvZ9JGcec96mcnR+uofwyILXtNtul+XLdopjIw7FdFH/QgOkewiRqpglJgnLDjQgOKnYul+x9AtQD8NxCnwIE11VCVYzrA5k8uc94IXlQj5B6ry51OZTsWb8Z1yiCrRVQVw/eteDNf95Yip1RIYDkFx728LfZWUr8lmfq9izh6/D3NDBWjdv0JurUQdQhLuRW6rCKvbA== 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=8YnP/TB5HJbDUYaVYmP+KUC0ttDykthAT4dmIslx0yg=; b=PhFPEgj0algZlztyH2s0xvoFbWhChjThH8nUPZBfzsNH2i0DIMh9RFTHlxrklJJxf+rUxY//3iZ6KG1Ll23X3lWyhGJM7u87O9cw7EuuwKeonRFm/4Sw2w8hMnfsd7z2eMvQ3m1RJjRDD5F9PTnrrXTL82LmN285YC3+uhdGxVAjV13xhb6Dy9MWZwMCxg/B3nxdkMEorbi2rRTpQBroImH2Tro7dctMmgbptrJZqnQ1tCRLdXRAz7X6mMO0U4nJaFqNZ/x8DTOOQCpNW3jcgaCqWsIWf5UhcIxezY+c1hRbXvH1CMyaVSkraurPg6BT+F7Wh3gUknPmiPs3jp9QBg== 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 AS8PR04MB7878.eurprd04.prod.outlook.com (2603:10a6:20b:2af::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.14; Fri, 11 Feb 2022 09:53:25 +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; Fri, 11 Feb 2022 09:53:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 5/7] selftests: mptcp: add more arguments for chk_join_nr Date: Fri, 11 Feb 2022 17:53:03 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0205.apcprd02.prod.outlook.com (2603:1096:201:20::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: 552f88ed-0a28-441a-4b97-08d9ed4458c6 X-MS-TrafficTypeDiagnostic: AS8PR04MB7878:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:813; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YdGolvcfgA6044jpsaOIC8bk+AvrwuKaLy0jJINBquxrINjve1oG5WLIA6gAv4i1oPxDDEl5Cfag/MOXg0D/flIeLcBzEAD+Ag13ED8hHh/lKSU+8lugn1SuUS/P0rZGHfxH07mCuAM9AdZtSXCiQT4C9meAE1+NDqr6niegSnln6JaraYz4s7KkQDkLCDusdWD/baOdoeskIyqaF3TgJHhniDP/kvLfcrh7jKRqoAFzUU+CI6/dLp7h90BcHyfta0YDzSzI56ME8jW0daf6m+wuUF+IVWiN1WQlA3U6WBCC9m91+GB/gFZ7LjZm/V0+xxZGcVNXov0+WLji2BsrYB+aBacon5Ti6V2aOss9TQ9t0HoIP9BE/HWdocFFXhoJVVEhcKhvFuYZWOBBJ0eQLDoN5jEkQD82Acx9OgSoSnWd/E8DuFno+tW5eTibbuXaQvMjDJ+yMFJ6x9AkAjWFTZ/wBc8P19s7/Fpt+Yt3VBaKgCwvBRkInGiVqx9BU/t01u2oTiOoMFuujhFlbYeXPptEloUUbGqHoPlrr/dXiMvDoTon/G05cgdLaG7CxSbfgb7/yJk1HdwULuJfum6KIZ/+qH4K/+Z2hiRPmHByfYNAcIPpo+94ZT5QqwbZkqwKOhqpVUU1I1IDguuEnSZQNQ== 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)(316002)(44832011)(66476007)(66946007)(6916009)(508600001)(38100700002)(8936002)(66556008)(6486002)(4326008)(6506007)(36756003)(6512007)(2906002)(55236004)(6666004)(86362001)(83380400001)(107886003)(5660300002)(8676002)(26005)(2616005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZNbMy4Lb1Lv1uWBEuPY7U6YUA1GCV5/N0uD75OfrMAEI/d5iq1659CZbaf6K?= =?us-ascii?Q?a/LsslU6j39ALkArs9Xlo2BlouiI2oNzULuW8kdMOwZ6Dc8FRHs5/mdgIwUP?= =?us-ascii?Q?xPXO9xoo8daID0TBn0knWz6xQOf+4biWgL1Q7StpV5YRizrlE48rhH4YNpbn?= =?us-ascii?Q?USgNCfs8tP6MOxI4g3itCzBODab8a1lsexpO9puMkUCLb5I+F9GHjTgcqAOp?= =?us-ascii?Q?W/DBleHsXgMPRFhxu6XahmMKcAbXEXif7tSKO50X/TpRYTcgBYjcOItR0PXb?= =?us-ascii?Q?7kbpjbbvAyC1QRRW1M4uPifF6HDN9MFPhoO9N+9nusvywfGZ4j66Ghkjlz+Q?= =?us-ascii?Q?TUlfNzP5L0ik+v/Bccyl++6p87SKQT1pP8PjoLolRcIhVeS2/fEJyOOgYvtf?= =?us-ascii?Q?dxHVVjjSkEsLh5jU5Fm2h+mHipGtFe238DIoFOH1xv4RaXRrMCVwudGW2K1M?= =?us-ascii?Q?qufs4Q7Ko1k+ZlZ0/IztST40SzbYzj0Rs707DZu6u1jHQpfZ41s9348yKJzq?= =?us-ascii?Q?rofa4yvLVIWKYSr+qkLmqUWx1wORlBoKhIeQzhzjktGIP47k1XwbefxuOk6i?= =?us-ascii?Q?dvo5AGJyi6E1cgXHoekvNj9nW4K9KlnbfcU1RfaHCtAyEaObMO5HhMufj8IK?= =?us-ascii?Q?H49eraBE0ML95Iod3P1hvLzT9LyCaCndIjRjHv1ujXw19JExBcaYi8JeVzLI?= =?us-ascii?Q?f6u4k7+9DQg4GbDLr07PuZb096XWGtJ0ph0pXo60R4tPeR+xmugCV+wt1w+v?= =?us-ascii?Q?l19iAtkx2ZvOi+baMcJwrPQcciB5J/F2uB5opN9tF6Km91MDuBT3wHrKUw46?= =?us-ascii?Q?d87Q6G831WEqpR3goKJw+Zo6gudfqLBe8tmavY6W/asgPXNEMf8qU+lyUp1u?= =?us-ascii?Q?9cn9OtINavuNMlB45fSd3VpjeWgNGAO3yk1ABfP1r/0nTuP6fviGy7B1zq5W?= =?us-ascii?Q?VuhHMOFsWKicScex389xbS33iHh/Xea2LTZwTB1eCL/9+RdVaXU0GHwjIFCz?= =?us-ascii?Q?I4IQOdWjkQhqFieqIbsvMsjhCUCKUwL8E9OkiZKiykt30GnHWMj+mqJgpPN+?= =?us-ascii?Q?ZbIkmN+05WNWKh0BBbPCATeY/ZXzcP+ZTQuspYUF0wS3lTwwgI7brH2ZdrEe?= =?us-ascii?Q?72tVTHBGzaN8P15RflB7srl0BBP5q0cEyjdqEEqnFcj4glD/bPiWWdsTdnbp?= =?us-ascii?Q?cBoQ2aTcSz7r6+by6OSG2SFGRD28N2yfOtNVlvJ1nhl60ri3wgrmTEXzPg5i?= =?us-ascii?Q?sGXV2QlRlWS1ReSBnbxlNF6H3aRLbgeedPDIhqzrzoLOpZX5Pnf8VyPbFbrB?= =?us-ascii?Q?9wwRzBU3inD7bOmFdpwDSxcE+/g7hTDu54QR9u6cUHeYBfDNm5etHOLyq9Od?= =?us-ascii?Q?ouYykYqVB/L3+jJKklZ9VV5Uwm/uOQrACozZjP1C/Dh5B90JQYGPnZXHAccY?= =?us-ascii?Q?A4S+5XJ9EjKj+LsRuChKU3JD6+4ovFWczm+QXiQsZjjd0CEhaOV0yx4SP6Er?= =?us-ascii?Q?sdSuytmfmjuTj7dTvQAkw1Qie7fx46lwafKv+iUed83K2WpMzDTPF0MuZmlV?= =?us-ascii?Q?Yn7u5klWpmAyyYH2pM7kzf1YGMH8RHUYbb3BJlEvxztZL6rmQ5Wi+NjhjO2E?= =?us-ascii?Q?4URVpCHNuq2+HlXbOp1k0PA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 552f88ed-0a28-441a-4b97-08d9ed4458c6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:53:25.5710 (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: S4Kn6S9i/+nawlWZ0AS4hSkU8fDSXJ+XhON5M+ZSNNwNqY/z7S49dMs7s/G89jQJQTeXxYdYPgdZJG+nCpzZRQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7878 Content-Type: text/plain; charset="utf-8" This patch added three more arguments for the function chk_join_nr, named fail_nr, rst_nr and infi_nr, for the input numbers of MP_FAIL, MP_RST and the infinite map needed to check. The default values of the three arguments are all zero. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 7537f4fe8078..f0d0d540ee0c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -719,6 +719,8 @@ dump_stats() chk_csum_nr() { local msg=3D${1:-""} + local csum_ns1=3D${2:-0} + local csum_ns2=3D${3:-0} local count local dump_stats =20 @@ -730,8 +732,8 @@ chk_csum_nr() printf " %-36s %s" "$msg" "sum" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '{= print $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D 0 ]; then - echo "[fail] got $count data checksum error[s] expected 0" + if [ "$count" !=3D $csum_ns1 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns1" ret=3D1 dump_stats=3D1 else @@ -740,8 +742,8 @@ chk_csum_nr() echo -n " - csum " count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtDataCsumErr | awk '{= print $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D 0 ]; then - echo "[fail] got $count data checksum error[s] expected 0" + if [ "$count" !=3D $csum_ns2 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns2" ret=3D1 dump_stats=3D1 else @@ -752,27 +754,27 @@ chk_csum_nr() =20 chk_fail_nr() { - local mp_fail_nr_tx=3D$1 - local mp_fail_nr_rx=3D$2 + local fail_tx=3D$1 + local fail_rx=3D$2 local count local dump_stats =20 printf "%-${nr_blank}s %s" " " "ftx" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailTx | awk '{pri= nt $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_fail_nr_tx" ]; then - echo "[fail] got $count MP_FAIL[s] TX expected $mp_fail_nr_tx" + if [ "$count" !=3D "$fail_tx" ]; then + echo "[fail] got $count MP_FAIL[s] TX expected $fail_tx" ret=3D1 dump_stats=3D1 else echo -n "[ ok ]" fi =20 - echo -n " - frx " + echo -n " - failrx" count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtMPFailRx | awk '{pri= nt $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_fail_nr_rx" ]; then - echo "[fail] got $count MP_FAIL[s] RX expected $mp_fail_nr_rx" + if [ "$count" !=3D "$fail_rx" ]; then + echo "[fail] got $count MP_FAIL[s] RX expected $fail_rx" ret=3D1 dump_stats=3D1 else @@ -852,6 +854,9 @@ chk_join_nr() local syn_nr=3D$2 local syn_ack_nr=3D$3 local ack_nr=3D$4 + local fail_nr=3D${5:-0} + local rst_nr=3D${6:-0} + local infi_nr=3D${7:-0} local count local dump_stats local with_cookie @@ -898,10 +903,10 @@ chk_join_nr() fi [ "${dump_stats}" =3D 1 ] && dump_stats if [ $checksum -eq 1 ]; then - chk_csum_nr - chk_fail_nr 0 0 - chk_rst_nr 0 0 - chk_infi_nr 0 0 + chk_csum_nr "" $fail_nr + chk_fail_nr $fail_nr $fail_nr + chk_rst_nr $rst_nr $rst_nr + chk_infi_nr $infi_nr $infi_nr fi } =20 --=20 2.34.1 From nobody Mon May 20 02:17:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp3776346jam; Fri, 11 Feb 2022 01:53:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZBMrIFJzVSYWH23rX6eL7zRtT84JqU5Mk8WnPcdYIuxo6x7+ZbKN11GVAyWH7OQk7CWOV X-Received: by 2002:a63:358c:: with SMTP id c134mr674168pga.116.1644573218386; Fri, 11 Feb 2022 01:53:38 -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 b7si4432004plz.249.2022.02.11.01.53.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 01:53:38 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3663-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=R28jBFUZ; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3663-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3663-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 E798F3E1097 for ; Fri, 11 Feb 2022 09:53:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DE4172F28; Fri, 11 Feb 2022 09:53:36 +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 AB5B37D for ; Fri, 11 Feb 2022 09:53:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644573214; 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=9sQvZ9WU9pO5s6WrwiXbaZLwUvbHgS/B6e2Uim5vkuA=; b=R28jBFUZ5+secyMTYHt8wD19iqZM/4W73I2SYXwx+8HimacdP21P9mB5d8dSwazT4RIbts kkNu8Y4gbgXobdyhn1z4F1mIkSZWQkaPoxTIlml/tZ5cbj9vV8VbxtfvkWBWuKMjEg4xZo hSoZ0vPJn2CN5ZmCgMLlL4p5vsCZraQ= 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-17-1TaUcw0lP1W62NsUAYwJmA-1; Fri, 11 Feb 2022 10:53:33 +0100 X-MC-Unique: 1TaUcw0lP1W62NsUAYwJmA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ni0lKR28Z1eLaml31SmN0fpChagL+zGGAscjBj85zG/HATpZV/BYv0fkyRpYMK5Igvwrn+iF8BEE/mJjKrdoja64h4mHeRMDebb5AlkrICisY8MBzfrwGmKyK1QFCdAd3aJwpgCyXvD5Cyae3T0fC3m3wq9iBJy/Q+RgdNSA64uWZRSF+iyagI4tLa/bkrWV15Qpw/Wo5El4Y2qR6l5crC8PBT7U36tfwT9tJ5agKypak4nlqD5s4ThOWdkE+TRzI8A/w0sJ2Pb+B6NmkPrKuHY0VSh7CLIebinZwJnmJHs/fx83EXWQiQFpKvztLfuJE0fTZhKv4T6P230j7jcktQ== 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=yfJgG59kT18wGIz2AGhhO4Epk72RHvEYXYWmcdiZRW8=; b=mUhW7O0XgTMfq+I/kqDQyHy93Bt7up3u3iWbMnJr3cACD9NRfyD3CE7bPc9azYe1RjtQXxIL6v5MkusIyLw8HalqlSeDypifrvPw1yGoLQHcLvYxulFFK2f4yGBx61wIlcUA68sAe1OfX80bZ7ZU/YDZJIj3prAoZyIat+GPmdupb8rexePJnCON6RbMYMQyIGiYYBFIdxe/8K+J9or/BDpts/bwTx8BE/7WQt31qcAcJcsTSSMzfn9vZXpSxD9eEK9rb4Oh4hmsM/dH1B8xdAsl7XsUx6s5Vgn85z+MyooFXcZGVd4x8p9PK/mysQ97rjix2VVzBWAJcFvbqAo+8g== 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 AS8PR04MB7878.eurprd04.prod.outlook.com (2603:10a6:20b:2af::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.14; Fri, 11 Feb 2022 09:53:32 +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; Fri, 11 Feb 2022 09:53:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 6/7] selftests: mptcp: reuse linkfail to make given size files Date: Fri, 11 Feb 2022 17:53:04 +0800 Message-ID: <5b016d511da3e1cae3a98c0758e912761b3d6bb5.1644572307.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0100.apcprd03.prod.outlook.com (2603:1096:203:b0::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6836a84-d34e-4275-69c7-08d9ed445cc7 X-MS-TrafficTypeDiagnostic: AS8PR04MB7878:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:854; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xkvH6KOtKJLps8PbpIS0YYGDsJZO6GpexUFjG1ZVTEglceePn4cDoBIVG2kUzECVwGIOku2tec/Uk27FRfssqytssPn+RFLofmICgLmSmgWauRMrWXiJ1ueqnpNSpc5RnLxbcA3+0OvVcb4uoPkYsVGGT5gUw5j6DAiv33DgAgdHfx0JbG8Ni5biuuztqxSp7fDtZowW4b6+y/YGT5xUsOqy7dU+CuTbrEI0dzoVWQ7jQCu1lOnXcyNtvkj6robVEmsr9S7izkk5Fxb11S+FRtlIRIIca+FRvsqdPsOuBndtjLAP/hV0ifjfdLR0g+Z/bWXlxyB1TgRxWzvoeoWsORm9AYr5jtQkBtYqE9OIJ+i+mtBpXCuvFL/9Pin9GB1KPSXwphvYSLEDJw/xgKhSge94yAbVXX4/eHw66yFG5ovJy4e/cPd1HTOL3vV+qxhj9JwD82c8AByDUuoPPQp7aHgWQbAy118/dI6Szqc8YLdMpE4xfgCLIV2iBu9Gt4ms7CPJibm6mSPjN6fhzfcQpx7WT5xUhcX8WQ5GQQSYau2DtvHfozwIGtC7AuL0VfX8cE6PYnUIXQ1dsPh+H+trI07vmlWUMc5SHtZSzQlQAECBVlrxY3OKoS8rLaUGgPrZ6GqSLSDPPjBsF/Xnh8OMTg== 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)(316002)(44832011)(66476007)(66946007)(6916009)(508600001)(38100700002)(8936002)(66556008)(6486002)(4326008)(6506007)(36756003)(6512007)(2906002)(55236004)(6666004)(86362001)(83380400001)(107886003)(5660300002)(8676002)(26005)(2616005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?T0+ERLXeUx7DPrJXsRG5uVYHl9bC8yELEkjb49x5Jj2WnW2pHEAyCBKNP9vg?= =?us-ascii?Q?IGJKO3lnd6XZhaaB9cUN94f1xTQs0kppyPkCH+F5FuV3gRc2wVdwpAY6fQ8Z?= =?us-ascii?Q?9u2q12Z+qx0bN4LnAhV8JDsXoijsgg0bEXxH4cIQUZsd5tvsZ445UvonTkWK?= =?us-ascii?Q?qrk0soW9JpSXs69lEN9iaSM3qg/C1IMZQ4rGaMWnN6yKAkGXX0JRjckXk5YM?= =?us-ascii?Q?rFcLJtkBgOfkx4KvzhAQS54KPXwlCpEStM/B3IkY2IH5rpvSm+J9+SOE82IQ?= =?us-ascii?Q?QSJdC1FKrIt/Y1DaOOJFjGlfJk0DG891k4ImbleZOuuP5ZmdtxxzkBKdtny1?= =?us-ascii?Q?sfkmeQl7wT+DqIxuN2mmB9A3FEthWqENq6b7MenU16JftWP8HIqyVNoljMwJ?= =?us-ascii?Q?NgF+BBlQtW7rNYX4Uw1R5QcO9f5cXCIvPnuMbksHB37b/I8nK9/RMrGOAg5U?= =?us-ascii?Q?lniirm6iZOoKyO11a8JE4tSctMmbwyxOkwWm8W78nYyYA9ZhziZ0/NWyjqqX?= =?us-ascii?Q?s9TnTiTTpQdVkE30rm/sqXwsfgZ8e3Exhxdh2BIU42t/d0VRHcNnVVYr4b+j?= =?us-ascii?Q?MSW+27yxkBRGGyVGjif4FtFLZY0e3GjPBxKbhxXgOcGDAkOz/EYP+xWeok0V?= =?us-ascii?Q?swchN0hAoeM6QSR2dk43RMh00FRKHK8KDKfwMADPKDTy01a8DzfLU9I05qI5?= =?us-ascii?Q?KWbagk8zqLDFngn/ukm8/8HyDaHLThDkhHI+0iq+5SyWl1zSdAzwx7NWZd9c?= =?us-ascii?Q?910m+iQr35doQDNpDNf4nQfZP8Vi7AXyxf9DtGoPetI3bFH5JpCkYVQ3TR4v?= =?us-ascii?Q?VjgLE5SPPKxC8d7kgmZe7+PCMEfHfw/f704TFj97wrLAqFmfvqVxHt/MAAds?= =?us-ascii?Q?EPaHfmSWjzoxl4e10siRXeob7SWGWm5rDG0HuFzmGAQvYf6V33kQwpkuQ4yK?= =?us-ascii?Q?YkRBYlnse0e+eaC9W3M7EjmkM9g4B2FByP5UpzGInIE/7pUmK5zM0WIjB/4R?= =?us-ascii?Q?kpaEGB/+8nHBshj5/37g8iFKWAyaWdf/Br0otshNdJ+ePtH+pDQVRxzO6eJ/?= =?us-ascii?Q?W/kYIJ1uDrtGJYc6SIXR0L9pTPdV/h7tbf0USRTEzPmLDbqJqr/6d8N24kGL?= =?us-ascii?Q?xj3KfzFLtPq6q0S98ix9ryRpRqjG2S/cYXQPAR+Dm0YqaVKBShzgiT84AyEy?= =?us-ascii?Q?KK5tOspHRn69DobV86bpiXyrVwObAtZouvX/vZDQC8aFeg+jRbzm4fQmkUW8?= =?us-ascii?Q?kn+8lqj10xiIv/QvmhF5QmKFsm759MazGT2D/n+LKcXVinMQYl6TyUfMNtpY?= =?us-ascii?Q?rHwvLpJJZZEY4pXWJjrzt1v0XR2OhLyIfkFFHiMCxel+08oS9QuQHy8ijZcj?= =?us-ascii?Q?6rRK20X+npG2XX7PwtVy7DjTojqjiIGDPwuhit9WefEPcEdlQZydCcYvMqgl?= =?us-ascii?Q?tje3gieQGOU/I6P0AasnCwgTEFXYPMY0W4Aw8lFZ4DsxGdVSApnRBIkxEeQF?= =?us-ascii?Q?C5CizwZtuKzwVGw5yqNFax1tjzjlVyPcC9b+G49nKnavyGTNhjsxDIVLZg3U?= =?us-ascii?Q?PpT+Hxi7H+DqUv1B/5WNQr2Tb8wYXSFxwk6nw0HfeqDsUujL3tCsMXUC1H9O?= =?us-ascii?Q?Z4PCLIWimL/4JuDUehhuLpg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6836a84-d34e-4275-69c7-08d9ed445cc7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:53:32.0861 (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: z7CeGegmvHICmbjGcqyGfjXMYcN4I1BGFsqVzi/cG3umke4hELgWO8nRVlBIAx403cPJwO0hztV05uH/x3WNKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7878 Content-Type: text/plain; charset="utf-8" This patch reused the test_linkfail values above 2 to make test files with the given sizes (KB) for both the client side and the server side. It will be used by the MP_FAIL testcases. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f0d0d540ee0c..244c4aac1c6e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -446,7 +446,7 @@ do_transfer() local_addr=3D"0.0.0.0" fi =20 - if [ "$test_link_fail" -eq 2 ];then + if [ "$test_link_fail" -gt 1 ];then timeout ${timeout_test} \ ip netns exec ${listener_ns} \ $mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ @@ -466,13 +466,19 @@ do_transfer() ip netns exec ${connector_ns} \ $mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ $connect_addr < "$cin" > "$cout" & - else + elif [ "$test_link_fail" -eq 1 ] || [ "$test_link_fail" -eq 2 ];then ( cat "$cinfail" ; sleep 2; link_failure $listener_ns ; cat "$cinfail" )= | \ tee "$cinsent" | \ timeout ${timeout_test} \ ip netns exec ${connector_ns} \ $mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ $connect_addr > "$cout" & + else + cat "$cinfail" | tee "$cinsent" | \ + timeout ${timeout_test} \ + ip netns exec ${connector_ns} \ + $mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $connect_addr > "$cout" & fi cpid=3D$! =20 @@ -632,7 +638,7 @@ do_transfer() return 1 fi =20 - if [ "$test_link_fail" -eq 2 ];then + if [ "$test_link_fail" -gt 1 ];then check_transfer $sinfail $cout "file received by client" else check_transfer $sin $cout "file received by client" @@ -679,9 +685,15 @@ run_tests() lret=3D0 oldin=3D"" =20 + # values above 2 reuse to make test files with the given sizes (KB) + if [ "$test_linkfail" -gt 2 ]; then + if [ -z "$cinfail" ]; then + cinfail=3D$(mktemp) + fi + make_file "$cinfail" "client" $test_linkfail # create the input file for the failure test when # the first failure test run - if [ "$test_linkfail" -ne 0 -a -z "$cinfail" ]; then + elif [ "$test_linkfail" -ne 0 -a -z "$cinfail" ]; then # the client file must be considerably larger # of the maximum expected cwin value, or the # link utilization will be not predicable @@ -694,7 +706,12 @@ run_tests() make_file "$cinfail" "client" $size fi =20 - if [ "$test_linkfail" -eq 2 -a -z "$sinfail" ]; then + if [ "$test_linkfail" -gt 2 ]; then + if [ -z "$sinfail" ]; then + sinfail=3D$(mktemp) + fi + make_file "$sinfail" "server" $test_linkfail + elif [ "$test_linkfail" -eq 2 -a -z "$sinfail" ]; then size=3D$((RANDOM%16)) size=3D$((size+1)) size=3D$((size*2048)) --=20 2.34.1 From nobody Mon May 20 02:17:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp3776413jam; Fri, 11 Feb 2022 01:53:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2eV+dKgyLItPDTvrHKcwAQsD3Pm6YLVATTcaCCUPm8GEgrVIRRwEKidHoMpIjDxava2Gu X-Received: by 2002:a62:1c8b:: with SMTP id c133mr798270pfc.33.1644573225461; Fri, 11 Feb 2022 01:53:45 -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 x62si1397078pgd.454.2022.02.11.01.53.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 01:53:45 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3664-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=QJTfFlQ+; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3664-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3664-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 F3AFA3E1098 for ; Fri, 11 Feb 2022 09:53:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D56422F28; Fri, 11 Feb 2022 09:53:43 +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 791797D for ; Fri, 11 Feb 2022 09:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644573220; 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=9JLqzjBjEXsjqOnKxZKfDGN605V+R/9XGK6umEPPMY8=; b=QJTfFlQ+Rti2NYjKL8RGiBKRXZBt2+wSWbAO8UUV2fghpEIiBxzR4iTr/CFIJq5lXeCXiX 2O2+gDjFHL9NEvH9x/ypnoNDar+0Qe1KWjY45HTRKrckTkOVFk6hQmU3ErBfgEZ2XqvNa0 7LRGhCAbEtz1H0OhwmmGC4yKFLW8do4= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2111.outbound.protection.outlook.com [104.47.17.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-35-3gEZ4QZcM42ukfp0WR5kZg-1; Fri, 11 Feb 2022 10:53:40 +0100 X-MC-Unique: 3gEZ4QZcM42ukfp0WR5kZg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lb/NRDemd3DtijzVOdk6dG6gStUKk9HUVSsE0w+Zg5gJjyH5hduHdvyykq+7/ElBkW7ddcaLWuoovBKKBfw/mJ/sdEIAHxVHS4e5JMHWdjieqgbvqBZx9MXwXY0OrioXJSnsCo9M4vAToDNbhn4Ln73dlmu5QebG3ioyNfiedyWzqJFdHL6IkM2OLdf6gIcVeU36nX5RSzxWlwqc4PWMYpZgF3CwsgvcLskbME1Zma4oX6OXtckRtj9SFTaEI7S07LZfpsGaYbpGD5KJZBlvDlfWHoAU1f1Ou6ZumoLcC4E+s3jnsTV2YWxi0wHwvfAIT+6xaXQSP3TdxxB4RbN+sg== 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=Q+dq1hdVawW+pqCzY+H7yTyKmodGWzPZi0wViTWZm9s=; b=ULEw+pcZYZdsgtJdmxrg5aHnbblIZFu44S7pDvOosuX0pZo85sMMOlYZ3cKfQR7q4ftGKC1TKBcMAYWToO14Wyx4TxrsvKDgUkT91L8hi93PpBgoXrBaeNbMJzSbkmM9+Bqgzdp0xsQBN2ErI0YjiVveExdhC7hdLEAUB38dtywZANbKdX9Zp4LkwsxVy93gIjmcbgV3U7nH8b85ZW7V6MyHLYIG+7OVZRZWcXpZjWDH8f5JP/nb+tFcRKQPcIlFP+ro3b8zaq8fJWjnqfO8vBjrJ5U4kYZLNlT7cf3K++c2xYPHE5zq/YEHYqJmRerX5M5yv8oaX1hIvRvRquND7Q== 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 AS8PR04MB7878.eurprd04.prod.outlook.com (2603:10a6:20b:2af::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.14; Fri, 11 Feb 2022 09:53:38 +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; Fri, 11 Feb 2022 09:53:38 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Davide Caratti , Matthieu Baerts Subject: [PATCH mptcp-next v7 7/7] selftests: mptcp: add the MP_FAIL testcases Date: Fri, 11 Feb 2022 17:53:05 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0113.apcprd03.prod.outlook.com (2603:1096:203:b0::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: e220ecd3-ed3c-4757-759a-08d9ed4460b5 X-MS-TrafficTypeDiagnostic: AS8PR04MB7878: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: BbakrEnInusxGQ29gJ7ZdmSBl4Esj2VfuUf/AzHEBPFrPJUbAiGQ3YB+GYZVIEIWgxqV656g3v1T5nOeviX5YFv5dwEsXAyJmt6QZ4BCFZhF/AFc32DmXDx0ZJcY6zjaFFLdE5gZ+8LH1NKpoKnjqG8u2sStLIuV82CHimUJHDFRAANw+IqCvBEPjoaPiBqu8tApl53h8xwJ6AX3gOS1QgYwXqfaD0Pt8bco7uGqxm3lRGCUV0MIZVsi90t9e8g5aNwTSCCsJd/SJI+H/mg8kvYCwTmOIeGNMb/T3XI4M8MHA82hd5wZo2qVWA/QqpgILNeEglCO1noepLBxK15oKXby+qexI2SEkS1qHmv+vh+PH/dPQu93vNspQ6wLvaVY7RhA5p/1h5bHJ5XKaiTPu3HQYzJXkL7fT3yBkQRzhJIpzpa9KpkZK3SlI5i9J1TrU17T1xGuKasNDoppBnUrxTWtlN5SPiRJrTMDBSTGrKSbPx5TlMWEPaI1/LfXeOjggdjfm7qyMquhRERTCwD5Sd7QwRuIaPonmLzhPkrnnyhbqj7ItrnjChCPFZUQhRV4eC+7JGQp4IPQ8SSq6Ztf8BHaOjA3mNW7ub4JRe2tXwKpzq/K/KpZsFcHX1EFj+yjpXKqyC+CKnk6ML8ZEt4cwg== 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)(66574015)(316002)(44832011)(66476007)(66946007)(6916009)(508600001)(38100700002)(8936002)(66556008)(6486002)(4326008)(6506007)(36756003)(6512007)(2906002)(55236004)(6666004)(86362001)(83380400001)(5660300002)(8676002)(54906003)(26005)(2616005)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o+s1gMfCT7Eo+AyQHQ+jUuUhn1CA8NoU9PQ05ICJRRCkoo7acLvk6JrGn2nO?= =?us-ascii?Q?mTb8Xbd6ZG+WKgeguowfRP1UNssmVd2YHbOaH73Octrq+tkSTHgfLMQ785Lx?= =?us-ascii?Q?VncDDbfULb/EzTFMCufC8MpjBIqQ0lDkeSQ8P8awQAVhMG3UdVY5wlH4IjOe?= =?us-ascii?Q?ZpEtbVmBnTCgFDoNngKDjY6zBYiEe1WHsFwwQJJGSkIX8YCRunY4rozd0W0L?= =?us-ascii?Q?H5z8BQDCChvm5wTlbq82cCDS4y4/c7FC0Hw3Glm0HvRsI6GzZ4kh9F09o/8i?= =?us-ascii?Q?DKeZqNjDgW7AF7YkJ509US5pA9l0naoZ9t/uR0FQxLH7MV22q5RoVsxSLcDy?= =?us-ascii?Q?BKBHQBVQgqLVsZuVzsaLu5emKfMvvEIskWu+kc71kAF4mJJPqi+Z9L9Nu+ut?= =?us-ascii?Q?MLnHmx55w8jlxDII8Oh6iMTJwBI8btJ7bXiiEbqeoDmw5TzCXvBZDWpRmyDL?= =?us-ascii?Q?0UaQNutzb+2U2rcMLSZxyovZhpqt+t7v7ZzJyQyxuZ6hYNm95bpCMArBX0c+?= =?us-ascii?Q?5yTE9nNkuunKViCXpsVHSdMzJGonUtH2rPCMX/0SVqDHG2J6P8RJ3QAkPgb7?= =?us-ascii?Q?0ZF2Z7YvE7yl7e3iEXxDTDCwATO7xPfpGBOYI2TFS9QJuJMoVdqQZZ4IvtAI?= =?us-ascii?Q?b97tEQePQQIuQunjo6xvLK5SL2+gWhBkmgNSkNLE2ER1Dh0Dd1pmKkQX8WEK?= =?us-ascii?Q?y9l1g7uHh5PwFy2cdVBBBj4rykApkcbQ68lKF+rTbrxFgs6t9d/67Bjf/cKq?= =?us-ascii?Q?0AgGfOge3aZyhNAF4l1/6rOH8hX0k1Z/iyOlCO7LOCFrYscP5lC+akSkUINI?= =?us-ascii?Q?uuiNE7hlSYMDmu7rC1bzCWM4nqIP2ksOwsXw+tqLsPoyDytEcVdVrUZI2kJ/?= =?us-ascii?Q?g8ej86mrJ6rdQCMWv/fnfx6l00rSqvikkyhoBVMJtBXiFv3BYs/o/M0jF0id?= =?us-ascii?Q?8qTKdw+5QVXFU4JrqkBkauABszN9fcj2uevl16FTRce9/zj42U+ZQDHrdfC7?= =?us-ascii?Q?YcatfqgiJUt4Q7HD/6QilSIVA54zoc2E8QBbuzYdv257FWI7EVh0bxSegjRk?= =?us-ascii?Q?PjCdjZgQVLvS3u9oiEmmT4w3ZhuzYUri4BHzladM2CQ2VETrlNiOL1q7nvwG?= =?us-ascii?Q?B2ivxG+zEoJn+/1ab9hhhmjRIrv+5+2VHf7ow0wJH0HlkNmRlIHcu5rWZVK7?= =?us-ascii?Q?ILIJQQyqVX1NIfZIuBpn8euChBoxdgUBJhNDyNMef8oIPb9j0ChIFKig6Sae?= =?us-ascii?Q?ICm1CBsWL+iazzs6YizQarERa7bKaAD8hd9QYSVOC/ddwgu1iOxgitX8/R9m?= =?us-ascii?Q?sLQjRDNRBSNtwkK1bcP1e1lW4YNfmVgHJ1o8XcwPG5juM80wR+NAevNz1AXz?= =?us-ascii?Q?JbVAbS8yWcnUMsgtJaa/UToRNw0Mn+UCf9m61WlPpiIuqH0PitRAbjSfsaF1?= =?us-ascii?Q?34B+qo5zQMzt31uKu3vxf7mtKAbANU+SeuyfNt82vLKuAFiU1eecyZzpw47V?= =?us-ascii?Q?kIEHHfKKO9Gfgtyppero3C+8DSwF6pgT/6LDmYJrQpbZ5f2aRxeLfwBJx+SF?= =?us-ascii?Q?jvElY1pO7om/CrXAhsZn71GZcT6jtx/Z8awuKP74qHJVa+0I0KqWVFXy4OEY?= =?us-ascii?Q?JfAdv8tFx33F4vJRrPnXkYc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e220ecd3-ed3c-4757-759a-08d9ed4460b5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 09:53:38.7574 (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: gDBPGg76dRzmpEcHSDadVY7Nhe7UdXMpOdzO1N0zXbWwhmDWNHaO7AvFauQiFeRFR+borHD06qOrJv+15gSXxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7878 Content-Type: text/plain; charset="utf-8" Added the test cases for MP_FAIL, the multiple subflows test for the MP_RST case and the single subflow one for the infinite mapping case. The multiple subflows test used the test_linkfail value to make 1024KB test files, and the single subflow test 128KB. Added a new function reset_with_fail(), in it use 'iptables' and 'tc action pedit' ruless to produce the bit flips to trigger the checksum failures. Added a new function pedit_action_pkts() to get the numbers of the packets edited by the tc pedit action. Added a new global variable validate_checksum to enable checksums for the MP_FAIL tests without passing the '-C' argument. Also added the tests needed kernel configures in the config file. Suggested-by: Davide Caratti Co-developed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/config | 8 ++ .../testing/selftests/net/mptcp/mptcp_join.sh | 86 ++++++++++++++++++- 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index d36b7da5082a..38021a0dd527 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -12,6 +12,9 @@ CONFIG_NF_TABLES=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NETFILTER_XTABLES=3Dm CONFIG_NETFILTER_XT_MATCH_BPF=3Dm +CONFIG_NETFILTER_XT_MATCH_LENGTH=3Dm +CONFIG_NETFILTER_XT_MATCH_STATISTIC=3Dm +CONFIG_NETFILTER_XT_TARGET_MARK=3Dm CONFIG_NF_TABLES_INET=3Dy CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SOCKET=3Dm @@ -19,3 +22,8 @@ CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy CONFIG_IP_NF_TARGET_REJECT=3Dm CONFIG_IPV6_MULTIPLE_TABLES=3Dy +CONFIG_NET_ACT_CSUM=3Dm +CONFIG_NET_ACT_PEDIT=3Dm +CONFIG_NET_CLS_ACT=3Dy +CONFIG_NET_CLS_FW=3Dm +CONFIG_NET_SCH_INGRESS=3Dm diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 244c4aac1c6e..8c72edcb0ee2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -17,6 +17,7 @@ capture=3D0 checksum=3D0 ip_mptcp=3D0 check_invert=3D0 +validate_checksum=3D0 do_all_tests=3D1 =20 TEST_COUNT=3D0 @@ -62,6 +63,7 @@ init() done =20 check_invert=3D0 + validate_checksum=3D$checksum =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -167,6 +169,58 @@ reset_with_allow_join_id0() ip netns exec $ns2 sysctl -q net.mptcp.allow_join_initial_addr_port=3D$ns= 2_enable } =20 +# Modify TCP payload without corrupting the TCP packet +# +# This rule inverts a 8-bit word at byte offset 148 for the 2nd TCP ACK pa= ckets +# carrying enough data. +# Once it is done, the TCP Checksum field is updated so the packet is still +# considered as valid at the TCP level. +# Because the MPTCP checksum, covering the TCP options and data, has not b= een +# updated, the modification will be detected and an MP_FAIL will be emitte= d: +# what we want to validate here without corrupting "random" MPTCP options. +# +# To avoid having tc producing this pr_info() message for each TCP ACK pac= kets +# not carrying enough data: +# +# tc action pedit offset 162 out of bounds +# +# Netfilter is used to mark packets with enough data. +reset_with_fail() +{ + reset + + ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=3D1 + ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=3D1 + + check_invert=3D1 + validate_checksum=3D1 + local i=3D"$1" + local ip=3D"${2:-4}" + local tables + + tables=3D"iptables" + if [ $ip -eq 6 ]; then + tables=3D"ip6tables" + fi + + ip netns exec $ns2 $tables \ + -t mangle \ + -A OUTPUT \ + -o ns2eth$i \ + -p tcp \ + -m length --length 150:9999 \ + -m statistic --mode nth --packet 1 --every 99999 \ + -j MARK --set-mark 42 || exit 1 + + tc -n $ns2 qdisc add dev ns2eth$i clsact || exit 1 + tc -n $ns2 filter add dev ns2eth$i egress \ + protocol ip prio 1000 \ + handle 42 fw \ + action pedit munge offset 148 u8 invert \ + pipe csum tcp \ + index 100 || exit 1 +} + ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" @@ -919,7 +973,7 @@ chk_join_nr() echo "[ ok ]" fi [ "${dump_stats}" =3D 1 ] && dump_stats - if [ $checksum -eq 1 ]; then + if [ $validate_checksum -eq 1 ]; then chk_csum_nr "" $fail_nr chk_fail_nr $fail_nr $fail_nr chk_rst_nr $rst_nr $rst_nr @@ -2238,6 +2292,29 @@ userspace_tests() chk_rm_nr 0 0 } =20 +pedit_action_pkts() +{ + tc -n $ns2 -j -s action show action pedit index 100 | \ + sed 's/.*"packets":\([0-9]\+\),.*/\1/' +} + +fail_tests() +{ + # multiple subflows + reset_with_fail 2 + tc -n $ns2 qdisc add dev ns2eth1 root netem rate 20mbit delay 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow + run_tests $ns1 $ns2 10.0.1.1 1024 + chk_join_nr "MP_FAIL MP_RST: $(pedit_action_pkts) corrupted pkts" 1 1 1 1= 1 + + # single subflow + reset_with_fail 1 + run_tests $ns1 $ns2 10.0.1.1 128 + chk_join_nr "Infinite map: $(pedit_action_pkts) corrupted pkts" 0 0 0 1 0= 1 +} + all_tests() { subflows_tests @@ -2256,6 +2333,7 @@ all_tests() deny_join_id0_tests fullmesh_tests userspace_tests + fail_tests } =20 usage() @@ -2277,6 +2355,7 @@ usage() echo " -d deny_join_id0_tests" echo " -m fullmesh_tests" echo " -u userspace_tests" + echo " -F fail_tests" echo " -c capture pcap files" echo " -C enable data checksum" echo " -i use ip mptcp" @@ -2316,7 +2395,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchCSi' opt; do +while getopts 'fesltra64bpkdmuchCSFi' opt; do case $opt in f) subflows_tests @@ -2366,6 +2445,9 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do u) userspace_tests ;; + F) + fail_tests + ;; c) ;; C) --=20 2.34.1