From nobody Fri May 3 07:21:56 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1849818jam; Wed, 9 Feb 2022 00:57:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJw6DxJye+iulFJVelOi3ywC6x+SmRIZ7yQfnGm3Wr33JGhQIcAaj/H6kmXFzkEwHV7yPWks X-Received: by 2002:a63:51:: with SMTP id 78mr1096334pga.518.1644397056086; Wed, 09 Feb 2022 00:57:36 -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 bf3si13677303plb.222.2022.02.09.00.57.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 00:57:36 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3550-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=VLd5OhRp; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3550-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3550-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 B28543E0FDC for ; Wed, 9 Feb 2022 08:57:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D4D972C80; Wed, 9 Feb 2022 08:57:34 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8630329CA for ; Wed, 9 Feb 2022 08:57:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644397051; 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=gcCDJzHNV6kcFpm6QUQWBx6GY1KwXHjb2MCAhKpBMzI=; b=VLd5OhRpOF6TS0Tph6owziE5ofHhI+uGVI9sNU218PCOMmfvqSZG+1GGjlKcTMndzYU/48 EuQcYoyMijIEzzLjHXmrsknI6sJF+x4J67053X7AetuDlv2EIiqUNpiUwFUp9MNcw4RLs+ VUCtqRX9h7RxEChhg9ix+G7V/T3D2/o= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2056.outbound.protection.outlook.com [104.47.6.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-Q1gDuE9DNZuT-uEAGkapKg-1; Wed, 09 Feb 2022 09:57:31 +0100 X-MC-Unique: Q1gDuE9DNZuT-uEAGkapKg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XIImtjPeLiCtxeTDBHnnAYC0ZshP+d/MuNuIuCXqmoFAKkGU9p8hEGh3OC6jqFMdngEZPUTXF/I5OtIP9YqGDS4s237+CXnifDLqI1MtEvHJCPZxghqgh05qV4yrvBeTP0akslI0ousFNrJR1P1G2uYED0Fz9ChWEOWxjNqzjmH8UMirPZJmLbR7hWZuYOnlUY70gatXylw4cHkxs3Fx5NbZHURTgopjj7bxDRA/kd2sO2vFe6Xpo429TbtscVHugy2uKHYQ1qZHWVXcg36cJ92BSunpPNyEjSt73Dkubs/o7Q42FhkPI+EZbHkL8v2Zbe+0umI6XN3qvTL5RuqUOQ== 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=a26/8dAG+o98EF8E3cZi1/wwV7DYzSfMYnFb5dQLUqc=; b=TF6hAD5GHofDpHqmi5x5N45RMMtsQY3TlegzYAXXycZcBxSfpBaSYGH8xZo4rGk3GFmTtS6uZI/bHoMb9qSYMi/kJJdUiy607y1OirEA7Vh0S2FhNmEJTxWBHHAXVlc5eyY0+Mjto5UH7lRmwQgvui48YCe267mtG56yujukWW911nHXhOCPmOX4qLV1I38cmoCZHMpW5ZWF1dCACmTWBYJMqh30+mabJ085z6sNaR8Knuh0eIRaLzJsCL4kEfA13ktGm6QeiTohMLEvwdvHNxcK1fzdgFswWdquj2gUtoIwzg6Li8DzNwgq5xCADfuy40Pp5wqcONOZXj3xA74klg== 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 AM5PR04MB2961.eurprd04.prod.outlook.com (2603:10a6:206:a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Wed, 9 Feb 2022 08:57:29 +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; Wed, 9 Feb 2022 08:57:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 1/5] Squash to "mptcp: infinite mapping receiving" Date: Wed, 9 Feb 2022 16:57:37 +0800 Message-ID: <621a0237b6c15001e3590b27358dbb854c2ab6e8.1644396927.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0173.apcprd02.prod.outlook.com (2603:1096:201:1f::33) 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: 4b7d02c0-9b0b-432b-e039-08d9ebaa3392 X-MS-TrafficTypeDiagnostic: AM5PR04MB2961: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: gjfiRiqkVJHhEHuWTJRNa77rbjYHVPEYZ9ujAAc0nfIw6eNavV/znQnz1f8FZVCvJPNL5qb/39HOR4jjGgyKGO3WzlZV+pgcsNwS9g9xcGxdMO8g0yZ63trYG6bhcTkF/43A7eOohh+v2zW4OChq6n1KYsWYztxUXAH6Ya4pxUsgWtmYVgoHO6E0X/VxypFrOS1kfHoL9GQm9LvUf8km1UE5ijyuE7T2ofdZxvPfg/Q5IQZPQIDh+dmqhmbmGIU05ejIj8NV0XIDHb9rDGGljLuULhXNb0k2RuDRUQW4atGgxiI1LuJGWp78+wRmLB2EHf6gbef1CyQuLmJoAX9Ptn6giKdX7uREGRl46p/AHMHTivRMFQRFADKBCSxvTG/klqfZdxSjQS/XXA9AnQWtZunRRRMOLOgIM9vvqJElnCk7PESGadKWyx9wXHn8RvNCvXDKlsponC/FvGLv0jCdioVBHgpTeGMcdcBGXhBQJ/R10d0qMfnNONz53Hzos+Cp0Kh0KdBMjE/WVyDkrejp2OohJO7/mV+aoBP6UEJF8ObknCN4tNppdRtGRzh2KDEWdcuhjTqzYekrx3dpuKddTDx5p7eoRlZXItDLD/R0CZd/ySnQVIsNXo/bnlfORaePKnz3nWoKLPqjaRuAI2cscg== 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)(6506007)(8936002)(66476007)(4326008)(508600001)(38100700002)(55236004)(2906002)(66946007)(6486002)(8676002)(66556008)(6666004)(36756003)(186003)(26005)(107886003)(4744005)(2616005)(6916009)(44832011)(6512007)(5660300002)(86362001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FRX7k3qkDhgP5Pu5W7NG5ncqSf4U3Kevg+I+VIT+MYPA+IlUH1aHaCJ/9AMO?= =?us-ascii?Q?QOl67aXHUoPeQEzUByA0e9QTAbTWS9+BM5Cb7pMXusL7L7tt/2/jwXjO7jPk?= =?us-ascii?Q?y6Cr2+6jD6x2ApRLvdbMqyyl2Q54/Z+T2y2a7qYnIdOaq6MFhh/P1DLVSS+p?= =?us-ascii?Q?HRBgKhKG95stseVs93BrS5fQSNygQivNI+vf/+FgXuFZwVW1I91+ol3t2p5h?= =?us-ascii?Q?oONlYy8Hgiuc8aHO3fE9hnl39SYqKSmNW1iDHvaSR+ao9JDGB+bnSoxi3d3V?= =?us-ascii?Q?NlCU/LQJaCkrQylWXdkA2dmpqTdnKg1g6ewHPvkD5udVi82Iag0ffOEXcYCj?= =?us-ascii?Q?TmvCudZ+BwG43ptGishYtLJ4OTFbwX27Wjintv0/13OxQbHf3whzQ4DCeDy7?= =?us-ascii?Q?+++tzyteKDOoV/ObYczPqlllC1Kd9s+b4sX2ba0ftrw4Ozzi/rq0D2PfayeQ?= =?us-ascii?Q?sJcGdGX0DlaEDXhdO5FNwHIl/cOPB18iCPuzVxeI0ztHjmagYlV7uCoj+wGY?= =?us-ascii?Q?1Y6B7ho36TwAfuCJ0sbMYymgzvxH1CnYGfSwylimntKtCuaJXekzfO71v1Qv?= =?us-ascii?Q?z3Nr/0Itza3SKswqy68UtdptWwhxW3GmtbUe7O6DG72Zqn1ApDpgXXznab0+?= =?us-ascii?Q?TPm2lRBf3Dr/NZnauD/xhrr8GnbDKOXHHWFB3QXh2FTuQRzZMiYHtpXHLTr5?= =?us-ascii?Q?wLd732QtYsclDMst0j/6zdUI6Bh0jwFs1Qj+DjgPcErVMhKAxwQ5QWk/VgGg?= =?us-ascii?Q?/oNbyBL87OKnGWrcTvvQEmIqvO0dPAEGzO60TQ5OJOPRHhcjbVdHmAsueMLh?= =?us-ascii?Q?GMyacCh74Vnd/CHnUjA+x7ZhrV0OiJUGOeA28YuKu1mKv5SqmrAQ6oHczyRO?= =?us-ascii?Q?aS9lWIfWQe1VMxK6SVJSh55cVRGW2WDGvgl9mREAITznwnvoe9A3WQOBfsMp?= =?us-ascii?Q?uvcCB55MzWAjWEzojV0WpieYDYz0p3Eid+Dlv9nwmfzuKXBP6a4kfp5SrGi5?= =?us-ascii?Q?070Q3ZbEnjZmxf/WFE++IlcyZ424auCrUd2Wnb9tI83O74p+yYuuUQx0U8iC?= =?us-ascii?Q?MooCEPc6xMsSllIJF/KI5/2VVYVuSrnrhp9OvqmsluYDMgJ5EASccPwnnxo+?= =?us-ascii?Q?1/SrfAgBXRsGHHWvYXwl0lsnHVjSaE971Lmq+qxsFMDMBIVUNaSVppUhFZdi?= =?us-ascii?Q?sebn4AQP4xLoDVJKREpmllOB6XjwcgG0dSOMoT3jcMJJR+FTo1NVz1qPViyV?= =?us-ascii?Q?T2fJ5bArGON2VwwfMsVHjjUPyIKvqsRA09j0t1fPTy5TuUFS6Rj7yNMqfb8+?= =?us-ascii?Q?o9G5OlG11T1rQzqar+qiriT5aGVF3Z5/3DYAzkVzsi+h58D3ZvW7BldE/1TM?= =?us-ascii?Q?L8fndpwpDBMzKId/tEwHQYTbiDtTW9G7r/ThDF5ghi9uq8yT+y6IpdRSCzl/?= =?us-ascii?Q?/J+kCDxJBrD2bhmhi9cRT5fL3PenEBn3lWbUQ5uiS1yhtk8nhv0QkUbDhZjI?= =?us-ascii?Q?I4JETZ3asHfQ2VDmqhkkeKp20jOoptRr4MoPcE2ZBHQX0vWdi1rXRFkhiBJh?= =?us-ascii?Q?NwoQ4sAKcGI6EU4NWBS+1uVl3S6lGQS/2GD5aqh6lvl6XQPr3Q7x3nTwoQgB?= =?us-ascii?Q?rrLhyR2jMoPBLiAkGttuHos=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b7d02c0-9b0b-432b-e039-08d9ebaa3392 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 08:57:29.2648 (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: ukDFzl3drPm9k1xA/qtaw55aUFngSPjUnSd2R3Eu/dDvVnx/8xC6GnAN4p1t1cXJLDQ8fpY5zSVa7Np/fHuy0Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB2961 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 485f00dcaf84..ae4d855f3c2f 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -962,6 +962,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 Fri May 3 07:21:56 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1849871jam; Wed, 9 Feb 2022 00:57:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyEl/GlUCkIpwdRiZjLADLHbksFfmtS8WSAMqjUT859g/Rad+GEpGNxDWTZK6xPjQfX31OH X-Received: by 2002:a05:6214:1cc1:: with SMTP id g1mr764839qvd.76.1644397062316; Wed, 09 Feb 2022 00:57:42 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id de30si3356651qkb.390.2022.02.09.00.57.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 00:57:42 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3551-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=kJJIjbPg; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3551-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3551-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 124BD1C0343 for ; Wed, 9 Feb 2022 08:57:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D6E4D2CA1; Wed, 9 Feb 2022 08:57:40 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.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 AAA0E2C80 for ; Wed, 9 Feb 2022 08:57:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644397058; 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=p1cnhmfvOg1lGapreID3J2bgUAhluk3TVZnCBFXpbmQ=; b=kJJIjbPgqkIC3xTx1X84sOiq4OW1zGgFyIipIiliMA1/kwGv0UlVJWuxkUPgkGzJWNEdkO 9zTTkOXZYPU5b0UqT63wYcSo4laGlGHT+/EQMorZYm140NfQoOlUMPfWH4Ust3efZWBgys peh55X4DuKXForL2xwf9H0oyrVdWYTw= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2059.outbound.protection.outlook.com [104.47.14.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-11-vxzPnkScPg-jyQ9w2tQfdg-1; Wed, 09 Feb 2022 09:57:37 +0100 X-MC-Unique: vxzPnkScPg-jyQ9w2tQfdg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hxw0S9G8GZ2ogH7S+dO/PRt7/4saLhgtsj6DLsvM/nCjT413rIMVlFoxi9NDPhgojvNVcsG8Hjdjw30ApCxSED9hW/DPURtAxVvcZkVVcOHA9S5dxoSSL9PN1n5jBLJwKYtdyTHEwFi2ywYxBsPRWOsOEIHadqX5z63iEqNpHWTDuflnBb7k2Q7EsJoK4gSaPhWKqXKKCjBehiboEFsScnzSm21xAJSVvBav0WLRPPg/TqIY39AbOPhgCQKSgbJtYIGG4W5h2LVtss0ghHkGZ6MwcBQB1GpP9Hsi/eMKgo73ff5bJfFPJ8G6t7LFUTylSg3Amxd0tHEmc9429ipGcw== 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=llTAtFlYKBFVPMj2ywwSufNYjArxy/q7XOS0f5KZK5o=; b=gCxI+yvRjfszuuwgUDJTvV/St5FcvrmJsdIzOyrgOLAx30B71668sBg2aZCdofhfxps0nDKokNG0BF9t7e319WJLlP4+tSRWvVFI7xKflsM0iMIN/fDreiQXXPIrcqbJOfPMvfu6pYmgIaUu5XhpC9Vgm+TZFnLRHueN7bijWRSwBgUcOe/oUCUzTBBFUEQ4OYFIhOrPYu4ICBufA3F1ZBJT7Ng1CY1+i2vU7+buQeOjSnoCL3NNWt3vXU6y3V16CHw8BVpIZ4knKyGbfaiHBSgxwswgaOGfIyRcvaKTQn53O40njxE1+rkukH9Eq3ICQa+xRqP8db7Y0OiY/Ui3EQ== 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 AM5PR04MB2961.eurprd04.prod.outlook.com (2603:10a6:206:a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Wed, 9 Feb 2022 08:57: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; Wed, 9 Feb 2022 08:57:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 2/5] Squash to "selftests: mptcp: add infinite map mibs check" Date: Wed, 9 Feb 2022 16:57:38 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0188.apcprd02.prod.outlook.com (2603:1096:201:21::24) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8584d6a-9ffb-4a18-9c19-08d9ebaa3791 X-MS-TrafficTypeDiagnostic: AM5PR04MB2961: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: WYvp6lsh0hyX9FmWOPEKeHputVcpA6R5KHCywYmwtbEZz9WSuNYBTaYYSratADh4u9ok+xeLoBATtYHd9RFhVPzKxJ+sVvS54P382/8xXd0C7zGE4FbKBm+KK7FlEg2ORVHmi6Vw8Xi9tNAQjgRSKAWHPa/mS7Yieyc/uN6h7oQ1qvcDN4Z74XJPnQbZGgUYuY+YmZnkeoPrkHvLfCc25tuM702a1KuoDg1RtynJVK1xSgWZx+y7IzCwDqybC3Tuq/bWqkLCIBfvi9YF2BeS4MiP/CJS7IMiD+4ty5G8aqagQ4210RvEJ8SHLntXs8tv1qeiHJE88gR2MyFNSebVmuSSpAkbFgO0kGnia3YqLuK4mNuKY1GdCdUV4joAc0Nj2FeS8ifdNRsVhKQFRe2tJx0mzHE+RqSl+zofDotBrnaZoVEQGnHAarSjh5BUy3csCR28q0Z1rqXXL3E6cQ7b2DVfJPkjRhxx3NL5qQRtphyMtYGGEArTzKW4kc8Q1VWCnewRGqgy5PUlZeYG4hZ8J4HluAlmuesIvIoSGer/J6Akm/kWStPrn0vFI3Q5seRRc8uSlgQWE6E6g2gDy/5KQYSeXWTz7Ug0D30Gi8TVGyt2S/ypGhmgh0fMoGilMKyBvNb2N7YpkZLuxo2us6HGvw== 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)(6506007)(8936002)(66476007)(4326008)(508600001)(38100700002)(55236004)(2906002)(66946007)(6486002)(8676002)(66556008)(36756003)(83380400001)(186003)(26005)(107886003)(2616005)(6916009)(44832011)(6512007)(5660300002)(86362001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OkKWHEUL/nmjkAqYPZi89pF+RFovVfZ1LY8rwJF2MdIdB/Ux97uI7Uhf5EVs?= =?us-ascii?Q?1pwW+P+elRTk4xSxGfXRcaDgPRWDtYhpE2gg7wNvB4oOyhkLvsilH0uFlSF4?= =?us-ascii?Q?bodyUhQIUW5dc9OUtsnibZxWYwvsYaLM2rvlJvrZwdNqxaBWW/8/N2q/nvQU?= =?us-ascii?Q?RSi2ixYxqhcUscJ9sL9pj28DwSDDs0XkxolqaxlvVlJRElhteLHK7LLhLrO3?= =?us-ascii?Q?mufo8xWgJgsuzwJs+M6rxcqjS42tNHXw6/24VV8Php+pg3rfz1kwLcg0IWHf?= =?us-ascii?Q?/9nPqO+Fa/sINqpa3CD0/oxgo4oxVcOX0//5ahB4azzh2qp2+U4RKd9JPrmg?= =?us-ascii?Q?XVAjbMOgNVd5Pv7AQq6/cY9h62fh/ccmC1FAOv4QY665HjcTBaJWKb7F71tD?= =?us-ascii?Q?XnRjF+HHrl2dkABiOTsYjPXBgCp7MXYXk0BoL1HbeNoDvN1nXr98l0UAd4YI?= =?us-ascii?Q?0AZZ7D76xXoCqULOn9TqrPh1dTbAXlwe3ZYymMH52Tvn9csS8bjWBCDSQhT3?= =?us-ascii?Q?O5wcghpGa3k1SSircomgzDv8OT/Q9iFeQDgcGcrrDL1RuEZW3gJZBp0mmEAb?= =?us-ascii?Q?v7o/gfQdIbGmnHOHMkyuXo/SdVqFxUEd7d5hVfhIPGFUh8VS1G/PXkZpGsow?= =?us-ascii?Q?KUMkgURGRW4RvcGGx0nq5OWwccpJ2Dq9FuVbmZfnL/h1lbDRAkyWXSNibGhG?= =?us-ascii?Q?FgVCyLO03v41wmciUR/gDrM8lSOwnJsKir8AkGVb32VcENLhHpcgZ+o/bEal?= =?us-ascii?Q?+GpeMxMokdUXex1T20420EXhg5xLIkA/NfWYv/1NbIYdLvLmlsTqqIX8CQO7?= =?us-ascii?Q?n2ZuaPELM0oN2z3suw96yyHCHZN9F7ddwudCgtLjuQTKcQuoB4w7ah7/5Zke?= =?us-ascii?Q?elyekZmFdK75J3ZlDw5qJBJPy/Fu8BzwijjLgrXqLyxs7fkxcs5GCcnwz+b/?= =?us-ascii?Q?Xgt/j7wOwL+RNdDwxklAzSzj0bM4Jqafz3c8zJpMpikjKwyMWl4GIwwoYbvK?= =?us-ascii?Q?Hk63iRoxbp1KFshcTlFR8lSqqZ+q4NSHXkDKmuxoG7Lw+uYifEfeANGALW5u?= =?us-ascii?Q?unVw8RNZRoHyHJUAhO7cjXYY1clpHLoI5hHiA7/pyW7w9TQnSxM4/PSJRniW?= =?us-ascii?Q?Yvn5Az8MN3ZQ8L96nO7UIbCWERCqiUci9cffUFRuPqVtmrpmPAcD4Z7MluXn?= =?us-ascii?Q?lJCCt+rJrD2ZhfSbrXolG44De1UEl0+wedReAz04v8l56yowAmada1txbmhl?= =?us-ascii?Q?rht8y4/Xf8KRPVnQ3JawxFNw4ReiAXAfjuSoAsRW9x2dSDUKN2y11ItCUTDz?= =?us-ascii?Q?pYkPLy3jUq+3zHM9E3aAgz26kT1HRhfMWcj8Yy6X1b2sfQ2o3QpsjF8jdi2u?= =?us-ascii?Q?O27brGO0akSnFBnE1nzxlUD5dMsRzhkv8hDiKqCCZP1DpXF/eOHpNBGtMslv?= =?us-ascii?Q?DYntV4tKAti46XAKB31MYeC9nccQ1RIcnT7KGgo0E37/YNBbIG2p6C4I0rc4?= =?us-ascii?Q?mGF6s0rosPHFMFQb3fvCVjVvL5flE7v09TyGppiH5qYsSaM1ZY+QhKcAMHGv?= =?us-ascii?Q?PxZD2NXqgmsrLnezPDWkeYaOPW1+ZZP5b5W/VXXzrJDBAb609yevBUYbd8RK?= =?us-ascii?Q?TjB05t0dAmchEBuUTyU6GrI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8584d6a-9ffb-4a18-9c19-08d9ebaa3791 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 08:57:36.1705 (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: ZR9yjUkO++Ni43kvewVZKDP8t5s1C4OMpVZc/vBiPfQbDh9WzmN3xpYnrYuzbEEgQXZNYbbU6oT/3Aa+THfCww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB2961 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 90a6adc36490..3577716cd5e6 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 Fri May 3 07:21:56 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1849926jam; Wed, 9 Feb 2022 00:57:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJzGByG2CHAg3xtp9BWdFJpCNeYJHZQUHRw485MXAP2bvpTDILAxkSQHei29ZIwirLU/I6qB X-Received: by 2002:a17:90b:4ad1:: with SMTP id mh17mr407258pjb.246.1644397068924; Wed, 09 Feb 2022 00:57:48 -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 q4si17437102pgj.233.2022.02.09.00.57.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 00:57:48 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3552-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=e5hoLQzL; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3552-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3552-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 9394B3E0FEE for ; Wed, 9 Feb 2022 08:57:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7BDB82CA1; Wed, 9 Feb 2022 08:57:47 +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 3701A2C80 for ; Wed, 9 Feb 2022 08:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644397064; 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=EHIoEQngxxTS8Zj+lczwXnx+sqlyp66bjyD95ldHVD8=; b=e5hoLQzLLiS3yHV2+xY6BvIBVKqIhWlUbxFsODD3VOfa3a1CvOLRI16Uz97RqDfgCGjQlC bTvE6JwJAYEVWwqWWpaSYoOOStN0J4mSplVK9tIKPUfJtnV3X+e9kFuc/MLSyk9GtAQEzX C6FFmC/2z4YbR8X0fuJSrTi2XMzCPx8= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2057.outbound.protection.outlook.com [104.47.6.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-23-cIQyIS3fOHyIojIaumiRdQ-1; Wed, 09 Feb 2022 09:57:43 +0100 X-MC-Unique: cIQyIS3fOHyIojIaumiRdQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V2LKiAjyzX0S5yVoFsurm1dRMkNDlWAHkW8MWZjCR/q2+90NeRjtvZtFxeYiaaU9rMMfPXOTWNQhSAtwtXljSv2Mv++JIb+D4uc9L4ldcqARBogHT9b0zE1vV4BfT2K0EuuE3974HAeSBzgPfvBLfHMWK1gsRztG6I383RLg7ENSDP/zSScQXSLD4/R2I3IaN/9eW4kcGmNhB8h42fYfKiYjT2FPW25j91l0OyIV648m6NTMGnZFnMuL1tZqAV3aIq2ZgU2gInz03iJ9X62iTgficQ/sJ9y+iNJc9DFDz4bS8Q1FNve/atYIqurae0U0MD1A0lypV9qXFnby2wrtOw== 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=Qg4WJsQGr4yLxe1BzNPIO9wyNDnShHWops5zccKF0+g=; b=LCciL3zk69qNriqPGCQWA1xb3xDHtPJQjbhjCE2oWB5B2Db03zPE5orGPZRGrpML6oZdZxGL4aIHpor8nHKihOkeUPyN5wn1LfhmSDC9FtSCEGFgV5Vi9exhGX4UqWgz+p9UADK9Tn1Jekk5peQlmjESxFwdyLY4ALXI7bzyQTKr1/cgIvaIOJhCA+m5QXLVippVH+bccYt4M2w1CkOgK6J97P063GiSj7uyODSh3Y9l4iqrLc/KO7wjzoi9JjcPucjFFgkjcilJLFBl8cWl5RguclVT6yI6PdhGI/PAAb41NHrFhLQzjn6tZ5R7G2//oU1dxZxZizJTOa7LzsCDkw== 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 AM5PR04MB2961.eurprd04.prod.outlook.com (2603:10a6:206:a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Wed, 9 Feb 2022 08:57:42 +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; Wed, 9 Feb 2022 08:57:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 3/5] mptcp: add mibs for MP_RST Date: Wed, 9 Feb 2022 16:57:39 +0800 Message-ID: <15d21058081166971b94f461b412ba84ac02099c.1644396927.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0024.apcprd06.prod.outlook.com (2603:1096:202:2e::36) 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: 52d489d5-0f1e-4427-6a63-08d9ebaa3ba3 X-MS-TrafficTypeDiagnostic: AM5PR04MB2961: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: f70u4I7QZrAbcnAO9HEymDYQabqXuINx3nhnAXO0mo1EFSoqmwdW/654QAQ+yNDtrAHY5isTKR8sji5ZAURG2vwUtwdnbmIGTAiXvuSTVzxQ0q5zTyItL+L92vQS2rA4H8KVgQIl31e79cqmBXIbbf1ESyiqXTQ5105BTWImaglqRyUwi/2k7FL/9SpM4ICgBkiZfAJAKz1f+pxLNvIJ8C88BfetsY4tFEbZBIIhLXyQIVAJFz6go+sz673O02bmbL3OQ4UN/Ti50gmIlvWSMCoPs0+Sx2x/i2RMHcmqPkrk0qJjycLsHFjDGz46/TiI8S6r6bVMxIG2Je2ZNY7AuH3/tuxyiTYtuajV8/PCgkNT/aFnuNObwoIxqg5T97mYpj71V6gteWyr5Q0LDQ2BcNYx0FtDcWXZxfemWpGWWSY8JMfIfkiaLHc7MLEeQy1CakQIBm5ytReAMvtdE3d3cuXeN8VtWdjvTFvfGWHnpXbvyBPiSX9t6wDPrSkknNbeX/aa2ylzoJD3R0fq6F+iBsORAGMc5zj48G5wkJip5duuCj5IAy2uvKd0Aso67kpzuqJadCkzZBJqCsZpV8RjbBepk+lKybGgPgo/4+XPjvjExMJ9bY2MM8vT9inh2DueHoVSCRbZOK0X7yMKqBHUsw== 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)(6506007)(8936002)(66476007)(4326008)(508600001)(38100700002)(55236004)(2906002)(66946007)(6486002)(8676002)(66556008)(6666004)(36756003)(83380400001)(186003)(26005)(107886003)(2616005)(6916009)(44832011)(6512007)(5660300002)(86362001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?az74+VbKqbEPiDS/podji8s9bDNJ80wtKflcKgdxDCTv4R69ymqsz4xR2/ro?= =?us-ascii?Q?5SDxOlVNx6gkThChtCgGBWBSDo65F7V3TOhQwuuydAXH92fiuFTGAwZGPwYp?= =?us-ascii?Q?/ID3SK9q4zBKKCT4s1k2x8iVuKxqjtvwqxkucTTcPyA1oQJTxHXNCHjmauBl?= =?us-ascii?Q?Lw6JfLm7ajJn1eO0eBBnTVE4Qk5rp4rPYq2YojXLJXg2guqOQ03ad0SC8Wim?= =?us-ascii?Q?jT4ILy6EthBFNi1f/znywpN4EeYXozU9/rTLQ0+EAF6Y2V2uDpOVcz/RTy2P?= =?us-ascii?Q?NWnmc0hUmoVzyVz3N4myXu+fJVB1WaH7afvzsgx0JUm2KcfgwhE005ptEReq?= =?us-ascii?Q?asg+dZozE3ClcIrhCujyRMzvzTZVffK8nrgSTkNGV6523h31XWhQarfVhX6N?= =?us-ascii?Q?iAUqoJZnZybdrveI6b5M6zVVWwkgPClcsuk3InQG+qsidPpLIj4rRaWnhkaG?= =?us-ascii?Q?rhtq89O20ktxJmTAod/Ob7XS6lptcaL9meAT5l31ANVaIG9Xrsn6QhjTPJNN?= =?us-ascii?Q?h7a3EIrypMcoqve/YDn5pPiXHvxcvTSy4uvHBkDlVyJ1vb/egxSP/DQWLnbw?= =?us-ascii?Q?ayrHjAWyNIMFlsHDNtlcF387dbmXP9K3oFMFinBxWDzSgJQTfZ4mCRCYikcr?= =?us-ascii?Q?RRUB1vnziv1Ii1iKglE8dVHe6JFFbzNAV1ZdOXLk1QcdMDZGI9wijSAd+K+v?= =?us-ascii?Q?C51mLOoAZmBxYIBIyqpoLNz94mPFiuoGhzeyIPnw9QDqDBz8sHWOxQdtXM36?= =?us-ascii?Q?gsI31nVqf5CVuEX/4/ADwN41mFlqCBHXYuyZFV0wjR7PPs0EcE5pH/bnw7jr?= =?us-ascii?Q?AcwYidNjOmIZI9a4txDtaNZYwibS62f9kbkSW5WAdysDM9jXuRP6arRuMVwL?= =?us-ascii?Q?nPfv+VEO23PBUvbwHlMvUMlLc7iuB2mOKuKtr1UYR2yzDFWxse6G1TiDl+kf?= =?us-ascii?Q?K0inrEww3DTAfRKSA2XxkLEWe2GJ0K5RYSmoxEAfS2Bd7hevpvmq96XglU/s?= =?us-ascii?Q?9damnktOraCpZe0ThFBLnKqE9+Dd3sji60BcyExeCFmGcNtaQ3hfEAncrmyp?= =?us-ascii?Q?yCl4Z5a3gwh4raHdVylhzXBICjTqh3ibPph1dmpVF2KSLGgUr0/YNrRKn21T?= =?us-ascii?Q?/Z3U1tDLjNsq/H3vNiVBO/RzoGwbF9R8rtp+CgquDWpLLAphHxcYBshzda1O?= =?us-ascii?Q?RK/UKe8X8Cg75MXeYJVoMHfVcb1kgGuTibWcv5SxWk3US25UQL2CjSKn4lB4?= =?us-ascii?Q?DDUb3EVtqmnmLzxaWZfV9Ong4NjbyU6GYqLjP2hlRIvlYxN+vhe8/qtAhW+O?= =?us-ascii?Q?gfDabgemzqMzCTyoVYfXTLreooFBBi0nOzDiH03to/OShZOD/iF9Pci8FQYO?= =?us-ascii?Q?b+zclEQqVTNDhyg67+2jVE1GidU/50+MNhAHz0I+ALwkZr4SQ9s6bjiz7aKv?= =?us-ascii?Q?iOzllP6qIMFUomCjPt3187EQ8mPE79inqRnhqbZW5iES5VCJBkyAujDwJ7ob?= =?us-ascii?Q?qvsFxtLjMykpmdVHitLa61rflOFr/HnuSi70FXSHCCSgkpvo507agl0Xtlx4?= =?us-ascii?Q?X/g/jZWViXTTRL3rCY5JRPD68MnEXGUYRF5BxCmIneiUJuJlRsLgevUKg5e/?= =?us-ascii?Q?88xZDsH3VW4BEnmLFD9qD3E=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52d489d5-0f1e-4427-6a63-08d9ebaa3ba3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 08:57:42.7793 (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: JPYV2NtHWW4HB1GzYrNc4o5yd9DiMQ/WpUm4gNK/EgIyv0iFd2kwGbFW5wiHmHQlGV7EwK1aVYnt5s5gkfuZNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB2961 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 c12251cb0d44..bb7808eecab0 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -47,6 +47,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 7901f1338d15..37226d8d5339 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -40,6 +40,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 670364cd455f..556d68e0e50b 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -838,6 +838,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; } @@ -1159,6 +1160,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 07:21:56 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1849996jam; Wed, 9 Feb 2022 00:57:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJxr0SbgBc6cyEZ2NDX4IadGumg0EVQdV9Qh18jR1qfQcFplORxOyNP9w7gvatZNrNVN9n69 X-Received: by 2002:a17:903:2486:: with SMTP id p6mr1205857plw.1.1644397076351; Wed, 09 Feb 2022 00:57: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 w4si4504282pjb.33.2022.02.09.00.57.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 00:57:56 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3553-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=nosBcmQx; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3553-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3553-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 CC5683E0FDC for ; Wed, 9 Feb 2022 08:57:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 05F982CA1; Wed, 9 Feb 2022 08:57: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 A06452C80 for ; Wed, 9 Feb 2022 08:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644397072; 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=Nj5HhsN4FBm6qCeTR1W9NK9GCfy0YFPY4neg9Svftjo=; b=nosBcmQxUxCaObfoZu7jj8D9QAhQsRd2pw99D90TUEQCyVzlrPxCTDELkQHn/0F2SfXljy fefkUvtj3PQ6tVF5vOS/uBtTHDrZuT9WTTZIKLM8YbSCSKVf8UUreyPcvQCLjbLIMyWb6+ thiRhkG1l/ixXvzf2muCYatx5rzVzks= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2050.outbound.protection.outlook.com [104.47.6.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-3-MLqK_Ar8MGiJ4SRtWQB0lw-1; Wed, 09 Feb 2022 09:57:51 +0100 X-MC-Unique: MLqK_Ar8MGiJ4SRtWQB0lw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UZzj1oRpZ6kP9COb9SaqFlEZZh1kEfDGxo9uhXqUJgtx+oVg37ATWzmRS+V4lplKF5ZTP2/hS0t8/1v5A4ENCfnwBIBg2y0zdpJag+WXo8kTpxsoOH/KqCdp7uUBUpKfv5646Q9nTzHPMJsn/3mB1NQ960bQ5hJiWVztaJrgPbmQsA0rd+midwtgMOzfA7EgozXwwJBBqxthjjhRSEbb4XbASpkWQ+tulxDu0+7gxjtE6WrUaN3QVs8z7L4/ucHdT6SS2bMsOvsj6K3Yd/TEvqZry0/4dLQi21QD/uChiv486uQiYCpQ4k8Q7angBXz/WUncIoAlYkiiaxUe3q/nqA== 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=GIS0iiWvzfWJ9fl7EdkrYPiYbDH2CakyGvRIkVWp/kc=; b=HzRKALGsoV5XHqbSjnznhIHFFuyI27u3tdviW6U9i1q0BN6hX+dqIaAMRlpI2g+UV/0A9I5pFQCBeheEGV6rLvb1bAh1VgL+7sAGLRsV+l6b/kX/12m1SvMpS6BRlYqaRF2aphWK6pCCqhfm5cUs2OwYQ5FLNy/ig3RPKDq1tstX4v1wme7UutSY/8I10Iasio8+gO8vIObnSpRK4xF1Wi3Hp8xkwwNL2xlx4W+8Rl9x/0DwuIHEr6auIa6Z+wnKotXt74UWBNA/iiHj+cYtaVWoSS8JZEmcYlga4au+kAXbXeWypckoHBRvl/h5G6Jvooy3PaVaKvGkzfqgI3XqkA== 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 AM5PR04MB2961.eurprd04.prod.outlook.com (2603:10a6:206:a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Wed, 9 Feb 2022 08:57: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; Wed, 9 Feb 2022 08:57:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 4/5] selftests: mptcp: add MP_RST mibs check Date: Wed, 9 Feb 2022 16:57:40 +0800 Message-ID: <02b525e9e44709015b2331008afe169aec7add96.1644396927.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0203.apcprd02.prod.outlook.com (2603:1096:201:20::15) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16ca6438-806f-40cd-a88a-08d9ebaa4008 X-MS-TrafficTypeDiagnostic: AM5PR04MB2961: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: aTTslfmf1xBcLJXVnQ37HO3dPdmfI/dsTPbzEjs1ut1dhHa45/6+60zNqSOyUmEuDcicb77kYrAA6kZeioLXmQyvvP7qfgp2TepSrztXw2b86V6goFJz2KaBbYaUkJPWFKE2zYltMg00WWohUDw1z9RAzBfNuRyUQVJI+GzTFkH72VrCpJn1xw8Nc/itdscwfZEjgdtJt/AnljodBx2UO7KKHM0zN0XHAv9ltCyoCtbzq64y/bunDIQFQULl0xjqYp6Y7X56UfHnbyvHL1FKK0Q8X04jMEzQXpx/FIa3P7v7xf7CwerhB3CauaWRWS+HMM/ztvH3O0qBy9J5+dfeaudl2LbfN5Zzlptt2PBiB+Hzfv9JRXUvSpKga8LM12KbzP0+Shb5dCTquvWr9FkVkEgtObYlnbqp0uwq87sQc2rori7qMvuSYwa5Dpo5JTbyHKS7kEQwOVilhWrK74hr6xxDeJCN1PIoxLGUdpJovuE2YNPbFkYKPOkZrQA/A1oTkdi+Wl/VHc2IZKmWI9mn3pTG65Fwg0qsW+Z5RkgDXRzD2yOq5frFIAxvUoxxjor3PbKFWGS97IfUUbYFzoj20sclBCHmLn32yZGsNQ0k4iNbwEbL/iLmvAz3ZHqa2E5PnmAsTzoXCtDE/4EPAR2bqA== 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)(6506007)(8936002)(66476007)(4326008)(508600001)(38100700002)(55236004)(2906002)(66946007)(6486002)(8676002)(66556008)(6666004)(36756003)(186003)(26005)(107886003)(2616005)(6916009)(44832011)(6512007)(5660300002)(86362001)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eMK7U6m0lKFkikN1Yna0aRqG9ByDjTfmbkMuDp5Em5K06VNdSSnPVHC1SFXj?= =?us-ascii?Q?+TJhyMCPfj0RYRgi9uKQ9A4u8eN21k/3ATjq5Qul2ipu4gaxWJ5qdOELBNRY?= =?us-ascii?Q?8j1UJJlTPvzElGaUWvYKeJBhLPOynZcNBRGrIdU76qYkYV1nit6+VaQy3Iw2?= =?us-ascii?Q?OpzWcP7KZGBKzbbduf8qDUiR8beY6dYFrGWeN7FoWFIsBgejvEdVnaeecJQL?= =?us-ascii?Q?rf+cwvj9RIr0bd5c1PbkxGtmtcvTFiMq4X82mCsrg5NRt4u0BiZUcHkhYb9x?= =?us-ascii?Q?MHn3j7AM6QvLqWo3Suiraq7WCp5O6k5yI5us5munvvQbZ1+qPEzy3pQI1v0R?= =?us-ascii?Q?HxWju+cHLejacqonQm6mnkC2AF/DQ8V6+44UIU3ZZlE32qp0eNM1+E6aRHXj?= =?us-ascii?Q?oUL/gofXIxalNU5ADrU/gLPPjUsD+tTB2mXnKPNDHjYulArClhDaz/xxVurU?= =?us-ascii?Q?IF4spmrmXrjxvpgbZTclHhtDzGxpnjGnFnIREFdqY5epjhaywhtlF2cme1Jo?= =?us-ascii?Q?Xt1EUMXLkhyC6XXyn2IFgBdXQgGBrl+8WLwraEQaFUhGZxkBW6U8FK+wP6bo?= =?us-ascii?Q?vXk9qeOCUGwgMBrcO01AbxgN+ipRm9NesKE6ZoEMijBMJuP+ZCeMbFLIN/lw?= =?us-ascii?Q?omTNpOYyYveRDWkHsRmJFbffLqe8TzpE9DTUAbzcKgEKDyLnLJ18uwvZuh+P?= =?us-ascii?Q?K2OtC8SOXVPKimtLlhYT9TUzNv5/Z0KP/GpPqGCa6ZUR3IOtbfa2/mpnvyA0?= =?us-ascii?Q?j8Le5E/PP5HsLN2eJJ9TDdOmIFFux81Lyd4qqOku3xb65V3ZTfMuNYBRuaJx?= =?us-ascii?Q?Ab2iTML/8dkDiqMRijdvh89cL5jkjCZivMObuZ5VGuVBYI7M4dG1rRfnRgaw?= =?us-ascii?Q?uh0Z8pOdXdrZhafAbY4IFUD3grL162IC2fyvRJ3op4tVQM33Yhi276oocAkm?= =?us-ascii?Q?LD8yjkJPzWrsfjpAYKj+csZz3EqoUdEOJTrIP5VbQSG0ZOtGQ48Ms40uSDDj?= =?us-ascii?Q?5mcfuTtakP1KrYkiVMNESzyNvte2a+yw/4DzIHQM7sY3jvtK5QpjrCNON+4g?= =?us-ascii?Q?gqS4bw5n6OTIrvRBtplGwtpvYJLxe6T/OeYX2Tc3eVXY8a8tdzYAORGhXuc6?= =?us-ascii?Q?yYBWwLIc3CS8S4dcgnlXIa8YBmeN7datgjpNAymNVAZ+QQwkJSQtP1uziZmw?= =?us-ascii?Q?H/cDivusfW1dbkTUEj+1GopLJRv1QWc8ZmhD0Y56TGaYNguH9fewGx6MOOV2?= =?us-ascii?Q?Nc5uVzRdA1uUPvl//H/bYoUtpk8rMH7KJp1Scyiao/+/CbC/+d5RPID8oJ2E?= =?us-ascii?Q?wAm7fErUAAi52Y2l8qetP4HwQdFChsCuVUlnNU/AUhQiPPGguNV1j76xrCE9?= =?us-ascii?Q?FB3oiXp5YLe3tNDTeofhErEorSNxOQ6GiBGcf13uE0y9Ezz6jaf8Ab5OqeaR?= =?us-ascii?Q?G/UZ7U3iDTwbZQyOVTaf/yWy3lxpziezuqXr/h9/N++Zm8viI+fhR86bwWIn?= =?us-ascii?Q?BhtOBoFMorYtD2P6wTnKqAa0gPgV6MNFhXt4hYLwPy5qU3qE5On1WxAO5vEN?= =?us-ascii?Q?6ZNW1Y5iQiSuLWcZZ/j1wMnTvdQiLA0Ev0TfB+pV2Wc5Gy1pVP1pIAtPX8QZ?= =?us-ascii?Q?z+n6qRPu5/DXlYnoIgiFTuc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16ca6438-806f-40cd-a88a-08d9ebaa4008 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 08:57:50.1537 (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: 0d3LoZh3z753/OMW5bTVt+yXJ8p1DNZtBeGw9/mbVEwKj26M4qh4Qgo7D5hh5BjyQ2LDI5B0ek1Y3BcaauSHkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB2961 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 3577716cd5e6..95d61c97ccad 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 @@ -859,6 +891,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 07:21:56 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1850091jam; Wed, 9 Feb 2022 00:58:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwAC+jUo8nDaF/wv0+xabMvSFqZo5GqwJe9qBx3Tiv2XDevQBMuAU+wpC4/kie62b5P0p3H X-Received: by 2002:a17:90b:17c1:: with SMTP id me1mr2323912pjb.182.1644397084988; Wed, 09 Feb 2022 00:58:04 -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 q1si413742plx.465.2022.02.09.00.58.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 00:58:04 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3554-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=mvYAXFKr; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3554-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3554-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 99A3E3E0FA2 for ; Wed, 9 Feb 2022 08:58:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A822E2CA1; Wed, 9 Feb 2022 08:58:03 +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 8395A2C80 for ; Wed, 9 Feb 2022 08:58:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644397079; 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=bouPZqDHPKxuer01UcxQQZu3KldZYvhRcHmEbtyW+1A=; b=mvYAXFKrbLGEgbda47JhiPvZDC5U1t0rrpxB5W6pdBMohsu4Rc72YcNJXXfgkkGY80Nob+ sOdReY2CZRDe6G9wYjDy9jv2Eqe3wQAWJojgk+OlhkM47hQCqW3NybS3f/GX6PJVINBgDZ EnyYvV7BKNl1yot0AQGOWbwNUKkPg+U= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2055.outbound.protection.outlook.com [104.47.10.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-YbCxivoUNgW_PyoUqrb1yw-1; Wed, 09 Feb 2022 09:57:58 +0100 X-MC-Unique: YbCxivoUNgW_PyoUqrb1yw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EqOw4qe6H2eeBGBNSKBYFAO5KCS8MJogYz6DpgxuUlVzxvywa7B9IgjHOI7M/dUHp+FhIiVpqI1iyFYykVf3z1pzWpxlCcjneQiOOGxYu2gQJ4h6lbl3qy27GBkzA2ZZCOJLytGmVuK7fQgXAIocpKfrkOd/5gKVYA02xSE41MkwgeiEYdsGDMf4B5AC4eGUWvHKGAGigEcD7CSXjCh7tHBO5o3m6fQhiTBFf0JtBCfSWroClyLuuSpYZ/fAOU2GX+Tmop+MgFvBvkf32DP+KlS4BeqmpnRt82PiBFHL9cx3KD3thVYTSqYmC7C21J9XOsdOyhOLxJuYqxuVvWlSqA== 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=7YBtMKQLikWyPuaLDzjHW/HYsdEUkNThV/ODHQv54Kc=; b=idOVhjGT5YKh+r1LL/0aM9ug2iuJibIJdpDsKHe+OWKCRX/Q6BUSdV40Jq99NgYLdgv8gYRHElpK8Tpz7BvqOWYVmhWaCg+o4YVRzZzXsS3SqAxIqbESypAC47qRoDXSGycNcUjSSHkEigRIZm+dd8AGGGQmEyS6gavs5RFAQ2dcaERhhLlQ/NHxgJW/RMuAnNNgMiOzUym5a7PG00AlIYSYkH8IpkfqUS328cqes97nXRpH+IjJBIdp21jy2Lnsmvgx2qPl17h77foh3Wu53dIhw89G3+W/XQuA3i8GUDUfyYuBWXHC5wTnmo3XoDTMdVDBNHNQFX6x3cJArmhAdw== 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 AM9PR04MB7667.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Wed, 9 Feb 2022 08:57:57 +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; Wed, 9 Feb 2022 08:57:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Davide Caratti , Matthieu Baerts Subject: [PATCH mptcp-next v4 5/5] selftests: mptcp: add mp_fail testcases Date: Wed, 9 Feb 2022 16:57:41 +0800 Message-ID: <7b3e19b0e0b8c3b651320897b25464e0f76806ff.1644396927.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0162.apcprd06.prod.outlook.com (2603:1096:1:1e::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: 1cc1393f-3075-44ae-5d38-08d9ebaa4464 X-MS-TrafficTypeDiagnostic: AM9PR04MB7667:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1247; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2VQNIoo7Q7FgHH7N+Pg7EoobqPd6Wlu1/Ok/458w9SiKU1zanN2JdpcCDEyNGOr0jF/qjRFUEa7IEpRKY9AvGEKUoG0R6QVAWYI/IJ338b2Z1RiMaREs9k0j+oIoKo6SHeLiD/voOU9XPtWwoOpXqGU8p1MNWaBzr/IXMVTLnNpiXjfsYWiSUSXQWfOt24B58R4AXr34Ufqzij25fKXhP4ICmOZ+ULrDpnwzVkjIhclrnyGr++AG4pJlZThAQQS+GQuqLTwuwh6nC199VuO7tX2bWTAhNnB+TuDRLMZ6es9n9ZM0gr9E2jPtJCzEp93WIt/A9qEzHYqBmtS+LuRDtQnk2lqwhmqy16ctVVUo8c4zdC91dyMd0nALCJppLtGTlm4qFjwapYk31foDR650WSRiy8qOBC+wQztP6T/5D5zTvBxx58r6bYK6EYAkpbB5ZuzCJcdnShjMglCxuDhKxBFqgwpL5LdtHmKtT0s5RGRhwno36H2ZwZl0CwAHEU2pppGBIeLiL/OAbSUgWTs1MABOP8IRzK2u2f/j7RCoQ9njBMVk+7B0emO2XuEwljPxd4zYseiuyfDq4NRJCiEgPliOL/vVTtK7lyakxdZViuhz6gvOO33q4m4XdZkzQSY8AyfhVq8n3kLRLgZuLDKnKQ== 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)(508600001)(5660300002)(6506007)(186003)(26005)(55236004)(44832011)(30864003)(6486002)(66574015)(2906002)(6916009)(54906003)(6666004)(316002)(6512007)(8936002)(66556008)(66476007)(66946007)(38100700002)(36756003)(8676002)(4326008)(83380400001)(2616005)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VmLpSrLLRSgqb32fKoIhnNYvliltRy0ePCq5nNlb0evWyfYrP6WbK5Gtpi91?= =?us-ascii?Q?0tlqQ6w7YhGmgV8UoPHzuSJ4e3LQTyZ2PWsS46+ERYtW/ODSDLYazpgEb6Jh?= =?us-ascii?Q?nzjMxCcIxkZH8BzPyI6s6Fo+qkf/S1XUZPCrZ2OaeC256U5J0xIHhj1E6Y6y?= =?us-ascii?Q?8uENjZreB3+T+GHm4UphLIGKnOTQI6xvVFqZCD8EIcrGXAzVRg2TPiZUstB7?= =?us-ascii?Q?ysbWrrKvkx/P/eqgWNAgJf5fCkJIwLFrApA62dOuGCsTlQ5itV9zOCk9uRo6?= =?us-ascii?Q?N6Dv5uVHzK20qBREtdtHT+tUSML3oCxmzMJjJSqEZiy0IYZU6HNjk7C3mlbA?= =?us-ascii?Q?U/3x1xuO/+jqxPL6y3+RJzZeux6W02EvIWtB8cYyvamYRKiscaLvAMmKNTsU?= =?us-ascii?Q?H4gYM3wKUUDJNZgFKRUA5WDOuA+Ua5jBCHAbQhvPNuYRXuFqwxymxENDRxK5?= =?us-ascii?Q?BVKnvQd5WhCrcmxTf86YNm2KM2Gxb/QlKSdnuIiEne4Vj4fx+kDZXAqdq5uP?= =?us-ascii?Q?7HrkO1PJ3u43NUAEwRdEm9F45q5ugUyQkpVKAkHcRFon7+uool7NjoCdBsYA?= =?us-ascii?Q?kjhsaq5N2pr2cfq9sLBux6Mzg4dR1ORQJF0p7R4vS+auqa1KZcDBw+rWjLRj?= =?us-ascii?Q?jALtBQJU3PnRCYDA/Np6rU/yKxGsK7HDvb5m7XKBXX/EaVVNSWYgpnWVxq54?= =?us-ascii?Q?63iFsNlTUm9gx3PbDjmFDtK/9MjY36eFReROwP5EG4EpADf4rub9kRTAHZV7?= =?us-ascii?Q?bA4eY6O59Lb/QYism5QnK23YLpbF24mwvdHfO8uZvurc9dPhbZWcodhC8xIv?= =?us-ascii?Q?MU2Z8nmvTIclFTH/9z8t4cF5n5KR2ZodnUh9OdUTs+q3pMZya/OHuJQKIkBh?= =?us-ascii?Q?a28Nin8dv1n9dak4FOzgxDJrSMXxNgFHEzdGN+jbwDw02G50RozlHIkI9AfG?= =?us-ascii?Q?U4vrha36qLav13MUCI6KY7uvIYlVepd696ollfzW3DsDekxKEqLu4cq6lTij?= =?us-ascii?Q?Y4T31ZbmWDwvtGFskXxxRPdT/h6ZYA/GGNdm0GDWbUSLFtcJtIad/HYnbveA?= =?us-ascii?Q?iQo6kHFfgptufrQSP2ahJ+JMIekybACSHDfVwR5ymJ2qgySOLk/z58onhh2j?= =?us-ascii?Q?6pffC3knZ1XTCaFSV+BH1t99PnxFDC5LS2EU9M+Q3iLy92W55qhnP6rNtauv?= =?us-ascii?Q?OKWeJw4HDCxC+O9XLpENMRdtnBGkfyEVHS2zaOw/sJk3FHuLrtsUA754SMf+?= =?us-ascii?Q?p/HXdN1xdwtpayD4lmtK8HdAn9QJiCUJXaDVjhV/sk6WWsDHFXJ9Tg6d+48a?= =?us-ascii?Q?bMU4pm6cZ61c5vkSZ0XSuL7PuxQAtroVeoZOi5g0d96a4LLv983b6/ZsM96j?= =?us-ascii?Q?5HyBq/pQlKKEcvr7/XeLWfN2lin7nP9dXPfs0mP6aeIn3umuYZkumlUsYj8Y?= =?us-ascii?Q?Kp5Si5S5ZrmpTa3GtNVrD0Dp5G9/y+7uJz9HcliXSTfb2PxYJWUxO8sKheJC?= =?us-ascii?Q?RSToycofyKzswpXy6hdvJxtN5JtyZIvLuq8r1/f5BAr1LygCOg5d/w2a68cz?= =?us-ascii?Q?UG7RKr8lpmrn8OtYxVJV+JSZmuNtW9BzpPbwx/advTue2FgJ7SSTzYn75sXK?= =?us-ascii?Q?BjzbleQGdYA91DKpuvdAhLs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cc1393f-3075-44ae-5d38-08d9ebaa4464 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 08:57:57.5906 (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: nS4X56GuPsT5EZZJxkM9gNXjouI+DEpeUox5INER8l3o+84+NjL0v8yL+XqtN3g2QVSlPEoNHImqQck24Ove7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7667 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. These tests used the new test_linkfail value 3 to make 512KB test files for both the client and server. Added a new function reset_with_fail(), in it use 'iptables' and 'tc action pedit' commands to trigger the checksum failures. Added a new global variable pedit_action to trace whether the tc pedit action happened during the test. Check and set it in the new function pedit_action_happened(). Show it in the test description and pass it to chk_join_nr() to check the numbers of the checksum failures, MP_FAIL sending and receiving, the infinite mapping sending and receiving. 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 | 172 +++++++++++++++--- 2 files changed, 158 insertions(+), 22 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 95d61c97ccad..880430058492 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -17,6 +17,8 @@ capture=3D0 checksum=3D0 ip_mptcp=3D0 check_invert=3D0 +validate_checksum=3D0 +pedit_action=3D0 do_all_tests=3D1 =20 TEST_COUNT=3D0 @@ -62,6 +64,7 @@ init() done =20 check_invert=3D0 + validate_checksum=3D$checksum =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -167,6 +170,63 @@ 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 + pedit_action=3D0 + 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 + if [ $? -ne 0 ];then + echo "SKIP: Couldn not add the $tables rule" + exit $ksft_skip + fi + + tc -n $ns2 qdisc add dev ns2eth$i clsact + 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 +} + ip -Version > /dev/null 2>&1 if [ $? -ne 0 ];then echo "SKIP: Could not run test without ip tool" @@ -185,6 +245,12 @@ if [ $? -ne 0 ];then exit $ksft_skip fi =20 +jq -V > /dev/null 2>&1 +if [ $? -ne 0 ];then + echo "SKIP: Could not run all tests without jq tool" + exit $ksft_skip +fi + print_file_err() { ls -l "$1" 1>&2 @@ -245,6 +311,19 @@ link_failure() done } =20 +pedit_action_happened() +{ + local i=3D"$1" + + local action=3D$(tc -n $ns2 -j -s action show action pedit index 100) + local packets=3D$(echo $action | jq '.[1].actions[0].stats.packets') + + if [ $packets !=3D "null" ] && [ $packets -gt 0 ]; then + pedit_action=3D1 + fi + tc -n $ns2 qdisc del dev ns2eth$i clsact +} + # $1: IP address is_v6() { @@ -446,7 +525,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 +545,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 +717,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" @@ -681,7 +766,12 @@ run_tests() =20 # create the input file for the failure test when # the first failure test run - if [ "$test_linkfail" -ne 0 -a -z "$cinfail" ]; then + if [ "$test_linkfail" -eq 3 ]; then + if [ -z "$cinfail" ]; then + cinfail=3D$(mktemp) + fi + make_file "$cinfail" "client" 512 + 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 +784,12 @@ run_tests() make_file "$cinfail" "client" $size fi =20 - if [ "$test_linkfail" -eq 2 -a -z "$sinfail" ]; then + if [ "$test_linkfail" -eq 3 ]; then + if [ -z "$sinfail" ]; then + sinfail=3D$(mktemp) + fi + make_file "$sinfail" "server" 512 + elif [ "$test_linkfail" -eq 2 -a -z "$sinfail" ]; then size=3D$((RANDOM%16)) size=3D$((size+1)) size=3D$((size*2048)) @@ -719,6 +814,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 +827,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 +837,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 +849,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 +949,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 =20 @@ -888,11 +988,11 @@ chk_join_nr() echo "[ ok ]" 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 + 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 + chk_infi_nr $infi_nr $infi_nr fi } =20 @@ -2197,6 +2297,29 @@ userspace_tests() chk_rm_nr 0 0 } =20 +fail_tests() +{ + # multiple subflows + reset_with_fail 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow + run_tests $ns1 $ns2 10.0.1.1 3 + pedit_action_happened 2 + chk_join_nr "MP_FAIL MP_RST: $pedit_action pedit action" 2 2 2 \ + $pedit_action $pedit_action + + # single subflow + reset_with_fail 1 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 + run_tests $ns1 $ns2 10.0.1.1 3 + pedit_action_happened 1 + chk_join_nr "MP_FAIL infinite map: $pedit_action pedit action" 0 0 0 \ + $pedit_action 0 $pedit_action +} + all_tests() { subflows_tests @@ -2215,6 +2338,7 @@ all_tests() deny_join_id0_tests fullmesh_tests userspace_tests + fail_tests } =20 usage() @@ -2236,6 +2360,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" @@ -2275,7 +2400,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 @@ -2325,6 +2450,9 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do u) userspace_tests ;; + F) + fail_tests + ;; c) ;; C) --=20 2.34.1