From nobody Fri May 3 05:14:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp2739196jam; Wed, 9 Feb 2022 22:00:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJxno21GS3tpscU+LTO1TIiOOnVicxN1Z/IoeiZSFmRlLgfZq+GSxw7LVJlpJtlogZjWhd9O X-Received: by 2002:a63:d815:: with SMTP id b21mr4856972pgh.237.1644472821216; Wed, 09 Feb 2022 22:00:21 -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 a193si18083281pge.131.2022.02.09.22.00.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:00:21 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3615-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=EXUWZyEt; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3615-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3615-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 83EEE3E0FDC for ; Thu, 10 Feb 2022 06:00:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AA1F42C80; Thu, 10 Feb 2022 06:00:19 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E33929CA for ; Thu, 10 Feb 2022 06:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644472816; 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=EXUWZyEtWvVniOF8r32H0EFku8l5T5Gmwa1B75OwnlNuPCjIDmCleIgUmx+oI54lxKTDUB WeyqklPCP3hGYYP2F/Jm9G1/h2cGOvyWt4VqW0ip4jmCp5KxzBdo7N5/wzqWIZq4gzhi7r vZu42jZTadjpJsz1zjxItS8ZvTYYnH0= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2053.outbound.protection.outlook.com [104.47.4.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-4-b2aXqkryM7u8F0xh3m5eDQ-1; Thu, 10 Feb 2022 07:00:15 +0100 X-MC-Unique: b2aXqkryM7u8F0xh3m5eDQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fPx/eLJLn16FMC5BJzit7Zf5EF89K0Ljt76KdKaEIgsZ9r/77KIvXXpZEogOKI3kpW2EiOQNjTjrWnkfD4jcdbxKxpImT9YPXJjTpHEc0yf+tOiJaefm1EE3zgAjt1MAzutPyr2eWkhzN+0qJsTWbx/qDYOucPuxPPzkKAADPAJO7wWszUrFJ7BQ21B5eF8mewGB11p5icMuSqMPf/xiLLKl/fH8bL0qYUgoApM3Z5AiPdzrEOvKwPcI439ZUlzXOFkoR5AxE50lW4UBN+I4Lv+ManktVP+G2yqYdOYgBnT2gAKJVQZY0cN6KItggUdaUwkj21HIRRdBzhCnbiATHQ== 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=BgFn/XzzaHi4vg1vOINWdFWY38dY3zW31OipZzBpJDf/4yLaGwPuQagkkgdn5ROsuEYRCe+7UA4qe3cj39JqeEqtiW5Hv7hwrMI05GwhM+mrZLQgqoHCMX4iUeeYdtfYo6LBQsjuPTVhZwAd+PiP6vA0dBtqgRmwRlWseDnlzYG7VQcmwPEj8Nl2knvqnbaLgrhQ6kbSddImZF10R451baBxlUeLEF3AYiGnB+ryPX0EZTMLbKaydlvSEouXRBiZ72IOySNnQK501JlTtR/8u28Q4IefLnvx2Ek8WdLQ5//tBlbepA6Q4xEKZnE1hDz8tJttwnfT84G4r/oGp4LV1g== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5761.eurprd04.prod.outlook.com (2603:10a6:208:12e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 06:00:14 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb%3]) with mapi id 15.20.4951.018; Thu, 10 Feb 2022 06:00:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v6 1/7] Squash to "mptcp: infinite mapping receiving" Date: Thu, 10 Feb 2022 14:00:25 +0800 Message-ID: <621a0237b6c15001e3590b27358dbb854c2ab6e8.1644466571.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0217.apcprd02.prod.outlook.com (2603:1096:201:20::29) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: c4fba3fc-e734-4566-5b5b-08d9ec5a9b4d X-MS-TrafficTypeDiagnostic: AM0PR04MB5761: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: xG3CNza7I6JFEGE8otQjPnchFesQOYN0/010LTxrNWBOvbz/Pp5F0AGjrfVc6wyJCiEMUu5E0auZNLs/RiYpmWEvWF4V2X8iYFzcYX2PHDFYmPEULF2v/UGnzHVOiti5eUAaAGlyPCU6z7/IEQ9wWicXqftP5NjIHtnQhUDyZUDWzkjEMRd6gC/mglO85TL5XSEW1x28Ia+gdsrRGZenWGFd9Q2hYOX3qOeBXwdCdIOIxAfwVVTLzFMW26KsLBqMufYM//H9aRnNmC4XHqnlml3J1oBQdb302hyy4PZoVaZNwL6U5FXHMsNPCfQO5tAmCNmrFRHhQ5OdfFLkb9DihfDwDAdtAhb1yowYj4kEHk6FEzXLmpAcmFcIddyIp3CKclkSfacalnW3XPJ55xbmSraPqs62bZXE9sXASG/mtFTLM0LdXI2ImNSgIQC9rZC9nNxq+0HW2mSHymY2fqXA3zzEQSEpJmqWt6MfLYWUZ0Hd1cYxjYDI0M/Ag0fdYiTBpWFFdaC3iGhBb3QvUjL85cWREuBkKn9ynOshX29J61JIJl4369b0ke4tPM7UMfgu/1icmC54cQsQq1UBkLpvc+UL3+yIEl39a95VNXQb1huxWb+iRs3C2fzI4CClgf2XGGtLaciwVwlkW9rZyy9aUQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(316002)(36756003)(86362001)(55236004)(66946007)(6512007)(6916009)(66476007)(66556008)(6506007)(8936002)(6666004)(8676002)(44832011)(4326008)(2906002)(508600001)(4744005)(2616005)(26005)(5660300002)(38100700002)(6486002)(107886003)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?r8QVkh7zG8K2lENKfKnhaOU3K4NmpRJQW0FZrkJjgnfySZXZI/wMS5MqSvpR?= =?us-ascii?Q?5qPUAye2mwFi2L3eySeqW3z5xva3MHoLuV68g/kFeTDUMqkw3gLkpimqoCvD?= =?us-ascii?Q?ueZ1GDpmKfRy4dABBFqj7/Paj1DXtWTYKI6HVj/kVtydHHPzD+KVlpq86QTF?= =?us-ascii?Q?tTjGnK+oWhx9SegFGuytxX0YipPQcc7UusJx8zZ4rxtP5dQGImd03A63Yzki?= =?us-ascii?Q?VdpwoOmmbW6AH0B7a2b4eTHHTUWxCKfdEiqWMKR7OozMLvaGrAlhgQygDgKO?= =?us-ascii?Q?BtqWnHd7V+boWO60hoYmlJvSjM2TrHx70h2eafYIM3taCLQDqGo+/KY3clZc?= =?us-ascii?Q?JpY6zI7EPGI58NGbp96zf0dLyQXhuq3ZUejpKt1HIbdZmHYj9o5gD9kutrzZ?= =?us-ascii?Q?8E/89AH34OueQppE23y9ocFumd5gT8M87R0zsx4isAUjytIlRiGkrBb9WRn4?= =?us-ascii?Q?dHYiZN1kS67fJ0mQjp+dl4+Xe8y2VvDMjC4bPXbN3fNfe5lIFKVHlB/OqOGI?= =?us-ascii?Q?TO9cATHpAhYjITKzz0+r82SAdfF5vlzGsyE5TeyqnbhBDndo7hB4j7qPXp75?= =?us-ascii?Q?RmwX9mLYlE1WN1xC1OsKT4bGawhEb+kzuw/KdstaGFB+KnCfXKoh1hjggoi5?= =?us-ascii?Q?FMG13qnMWejORHufKIo5OlxyKUcDmrq6NOmNHJ5vXnPN016ClV3WIrBSIPxr?= =?us-ascii?Q?68VodiNVcrRTKmrnW063u+ssdl7odHlNGJzes2UIjw3/wAaBdQAJXpmcYeMT?= =?us-ascii?Q?QakY1NZkhyDA1Qz210qk7dFm4fCbKJDgrC/2DAOgnpZ3miPaWhc+utw3sqyT?= =?us-ascii?Q?dhHAyT6qZbXZmlb7gRBe5FPhQ1N4KUkrO3RO/sMImUMrRhz+PHPrlRv1us1S?= =?us-ascii?Q?UPLoOKK/LfM/1smL4pc+pPHvWTvxXsi3mV4zGFp/BwfI6canpPMy3iuClMr9?= =?us-ascii?Q?nxjnqfEiY7ZsMako0IVHObNm5YVWoJp45A5T2+aGoFyG4qZmFA3eOOzZUz1Z?= =?us-ascii?Q?D4gelX4JBfZrX4AgTlCHtF+bhKVALCB+2bpzFFcb23JuTY8b/B5YO/XrdMSY?= =?us-ascii?Q?YF/nmhDav5XBsTl8/ta5wQjW+BRa11w2PYdzFXxoxhiW0GL8vHxh9yQ5+N1x?= =?us-ascii?Q?SRqpORq/eHwxmumbeCIrOUO6RvPQGkWzmumHpRKhRTYYbxDSsJfnBKrwPzl5?= =?us-ascii?Q?J+oNs9BuFNdsbE1A7aXJp/6eAod4yH8aC+Qdddy+AjhtEYpxuDDCiQCBCkEI?= =?us-ascii?Q?ffrdakdqIZSngFw9SJuZRwWTJZm9Wa4nZJ7EUEWX+wyBdGgnI3CzVFzZvEuy?= =?us-ascii?Q?d+2FUIqg1TGjxaEY1B7fke3shkk+qQrv9y7cBigWU1ONtJwesi5vzQ9BnpVP?= =?us-ascii?Q?wlRiipUw2MJhFE+JMDGj66DaUb15/dQM7Z6hRRDLT7wJdHwAo3Q8fHPg89t8?= =?us-ascii?Q?halwDKuEpJ0TVnvmxwcQiByNDcDrlksMiZN6UJq/fRvtJmXCWCOk7RggLooD?= =?us-ascii?Q?saa6hLlLAvphIZVAUyAFWgvbi2z1kQuACGmHhd/6bnbX7dcFKtLCc/MO1ZXz?= =?us-ascii?Q?ZDOATx1xGU8C8jXFefu9XNNPgsfvsGInjAYW3fumGMn7i5Gs2y/ZUyVUQrdm?= =?us-ascii?Q?f6YV65nxDacNKiBaRypuBJY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4fba3fc-e734-4566-5b5b-08d9ec5a9b4d X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:00:14.7010 (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: GPr+xqBZBcneepZ4Ndku9xazad6ni0FnpVDFAzk0HZHfAFybLR7ulw5ABA/V9a4wvD7haKZVo3UB2uSEI4Q1uw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5761 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 05:14:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp2739260jam; Wed, 9 Feb 2022 22:00:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZPx0FahX01pKMF5Ak/P/mZf/3aj5ZXjjz8meXNMHpGnXhOcepUaai5b3KuI2B6fW+uETZ X-Received: by 2002:a05:6214:29ea:: with SMTP id jv10mr3958310qvb.46.1644472827765; Wed, 09 Feb 2022 22:00:27 -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 g4si4029152qkp.409.2022.02.09.22.00.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:00:27 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3616-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=IIdLNF8i; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3616-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3616-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 790451C0C63 for ; Thu, 10 Feb 2022 06:00:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0F8BF2C9E; Thu, 10 Feb 2022 06:00:26 +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 635222C80 for ; Thu, 10 Feb 2022 06:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644472822; 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=IIdLNF8i9USxyYPpurEuF4QFN+z42kNymTKgCPF6vzyf0SzE7w7QVKcVrvKaUWWSYOA9y7 0QI4Gaeep68KRtmhIL0n5yHnBMV+P1N0Z7AvM0y8L0ykgNXLI9w2vEBRQNjCcl732IBvo7 4+C9joWtD1tkWIdZ0ras2EiE2LzDzc4= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2058.outbound.protection.outlook.com [104.47.4.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-22-ryZFHKI4OUSyYJjFunXj2g-1; Thu, 10 Feb 2022 07:00:21 +0100 X-MC-Unique: ryZFHKI4OUSyYJjFunXj2g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZJTxAo7GBptbbkNTEvKwcQYY9tl9l0h3PXVb+xoCurIII0ZrQ7ieAg6PnZ1pGaLS3b7r3YmXseju8wunIDKd70yKPCjPJObIK7bdqYG1Ylo0f7cYsSA65JYrrHNVrQoRZ8TfkcdBLw9JfceyTAY4EZagFsgmzKatnkhLk0b+J7ORAX0vhEANfxYDvBxcbSIVUqqrSh2DP94ZsIiF6ewC8yt8XV4SsJlLZV5AijdaiUpK7PUyWF1eqCkEQJark/3jepjsIMCgFbHOj6wsczU1zr1qJ3JdWVgJwGOeBmZkC1WRcj9KVCtgrZNE55KqgLXH9sRzTOjh+98jlOOo8wjyhA== 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=h4zhhxadKBhwpEJ5Pz+DBqaXX86QsyxzeICFcJe8EWhQgOgr+mkX99KHVupT94v8qeJLwxCx7SUqGFoZnwUl8eUwDHrSwkzmRtrBTsW9qJXkvYHxkCfuvzlJ6s0TCMIaIZXYHIkA3iLiIHAmlce0SJ0t6blXXks8ngXrbrqQcs56ELxbIEclB26IkdcQvGHDPx3Aq3RtGyDfDPv+tNOxkpD6EVnU5kgyVNHTEhUSjTrhUVz3TBOof7Rn/ForOqy75tFKTOiR9uavXS8mCkWvEydG0AziJTI2kJGKfkDh8nn5oCGSuVwuJ1JE5sfdWhOg1Nj0obl/Bdj134SeU1ePJw== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5761.eurprd04.prod.outlook.com (2603:10a6:208:12e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 06:00:21 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb%3]) with mapi id 15.20.4951.018; Thu, 10 Feb 2022 06:00:21 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v6 2/7] Squash to "selftests: mptcp: add infinite map mibs check" Date: Thu, 10 Feb 2022 14:00:26 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0117.apcprd03.prod.outlook.com (2603:1096:203:b0::33) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: c711db8a-b109-413d-d118-08d9ec5a9eff X-MS-TrafficTypeDiagnostic: AM0PR04MB5761: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: 9BKaxU8JtPIHlCPbt517N0dwHw2gkU/zTJCpJ7RnoCNz33jjfsmoCu3AJWC0fX4y44Ct2fW3mJ30IvjJSFXb7GfORmCDzYWOk4YkFU/Y9Yk1VSPaegsjTgVaqwX4Yqk/uhDeCFGrxoUW0fYAeinQVddCS9if/UA0dSVYgMoj9AUwdUxvVirHBZRD5tS4eZqEwsI/pWDiZSROZiB+ZiWQBWBWbsdvCnrGst0yOCs9WVJdb/1GgKIIOZ+zJlWmbr7w3Ponl7RrZq7NPOGWw7iiC19PKQe3BN7Om8AFGYofpifW96M+sYpONTWM7yAitSX7zfxsVix6cBiB5s/uLIjLDJdIjTwPeQdwKX4N29dmaF0rRqj2eEoUSj0D8kNVKLizwwxeJHWLm7QnZMA0thN9rMHvzsF6Trwt7aug2D6u3tNH20/Tx6XJfNklbBOzChUjqQjHwPpiIf0mUJVfqlPYeIJ60wg/EyO4joE/WpL7zuGLMj+n7VODnYbeXV2KMbuegdHoTkMcMCBhPKawHmh1vmOucaxzMMVp8LsOOPDXTGBLz50hHCbTvar+sFs7IqqwB3PvZ+7UuVc/BXyIX0dW+AnJdDZ2Mgy6O01Zaob91ruNpMSpG526Tr134c9JYLWpSCmH4Qkxo9c9dZHqb2u3sA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(316002)(36756003)(86362001)(55236004)(66946007)(6512007)(6916009)(66476007)(66556008)(6506007)(8936002)(8676002)(44832011)(4326008)(2906002)(508600001)(2616005)(26005)(5660300002)(38100700002)(6486002)(107886003)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oArnEdsVcvH43tP+j4GSBwuDPH20iMYbXmdCbU3WX6qGVFc+K+p4rWc9Oj7U?= =?us-ascii?Q?yaa37zMMFL0amQWpLR5YcPdD+qZC5pC7STZ/L78cj7/zEnmhv+zz9U+nvxcl?= =?us-ascii?Q?qP01IS+sCnrrbCqDnLtwJkvtjv0Z7qnJzm/C+qNVbgrz7h7gxASsM9Y0YDPH?= =?us-ascii?Q?d2yiDI9yozRT6j24DtUZZ9MeIQmQWsKSI71FICf74cFKzoG4bzwwthXFTRcP?= =?us-ascii?Q?QifuuuMPzsS419RWOh5xaA6r6ZwPVjzsZRZRc4XB/YMNlF2PFLuuAkGC/FNS?= =?us-ascii?Q?0+wAOuqn2K8VtZTH1JlNVs88fSASNE69Y3vlKnlIf7PpEPXW5c2VtJelOSKp?= =?us-ascii?Q?SjF+ymoLnHdcFKxKfh+2zL2vASX+m+NcmCXionYCqhWpmPTDRuH9QLHkFfS/?= =?us-ascii?Q?/0kOM1PNtixmBSDSwQYUAh+4toZ/eVAcuFbk8kGvJKbaSDXMFxnu3Zx48Oaa?= =?us-ascii?Q?3uPGwmCP5XTenYcjQYKHiy8Q8y9Fn8vvE3ZjkKk36WuCyBgwo5eOsiNp3kEk?= =?us-ascii?Q?TDcrBR7+qFyZ0QOksWjt7tOkcGCqMkjPzLR+PitbuQrDvIT609HOlE/QApjc?= =?us-ascii?Q?2MoiWSZMcKj+vFwyaJek59D4eTpQ46a9p6eYR7dMzryPZL1NQ/rgVJDBhBkK?= =?us-ascii?Q?iZwGu/m2yiErOQeaPR6Y5JFf4qBFwAzMK7eRzZg167xhz2J8BJmDG18Uhy/U?= =?us-ascii?Q?bN3kDtOJ720+n1OdSinTdTO11Kd+rZUE0yikUYgprd+qX2AquGeRtczC7mZ8?= =?us-ascii?Q?8F+cqPN7oyENa5aJZmxQupcciS7S4HH6ZdkAYzMhlw1buNcSM2+ZY0LK9ulb?= =?us-ascii?Q?2v/Inpd2U6uuG5OVhrDukdRob910D7R9LtqKf4TqlOWUotHzXTc31+cZvUY4?= =?us-ascii?Q?l4ETI7RQG/K/CVyxXZ7CgXoH9WhPJ8yc34/5gWwIvauEOR7Sosx3GFZeWo/S?= =?us-ascii?Q?SgcoJe5q1hcLaobnuYNZV/2npEn++oRSbAjZl8nUmqfMQCZETvcpM+NMd/xX?= =?us-ascii?Q?06GOqFhbXoYKGAz3bC4jd0uUI0DMQFYzcJk4mCQb6HZA72p1OaIFlIFC66ia?= =?us-ascii?Q?XhyeaDBoOGS5kl28E7EyCyY37zSz12IE/2gbxg3M74AyrcRovHZlKZOvfeSS?= =?us-ascii?Q?SvXupkIOvj3T/ft/PJZC7w5E8iIjushDyOYWDJ5XTfo2llEWx0tIJN2BPMSJ?= =?us-ascii?Q?WIHJe4CcXze4HwGIFH8K6KBtB1ZHrN6lPzYWuxhDhnqt3onnp58m2RZfeqfO?= =?us-ascii?Q?7a3uG0QtKsfwGapt1+0ogxBA1xcjE1urZvYvfE9f3sunsR+hjAl5axrzwD3x?= =?us-ascii?Q?etNIvHh8N5ssMmmeIIOSObu+7mz2C5cP9zhs4IIapNeI8m1pc5Kv6qmhmsan?= =?us-ascii?Q?/x+IVOV6+pKZho8S4MIQ2+rTmv/i7Gd5ltVHTjfNilsk4pmTd+Vs+Gan5PeP?= =?us-ascii?Q?fJbE54S7CPOQO4Zg4BWD7TKEj5tfSGp7I5AI64KbCOMYJqNVYXefzh/kNzex?= =?us-ascii?Q?8klHwrnLDBE4TiwDeubYy9UwSP9ttcOZ4+gKsfo2ioaGCBAIlTR1RWx6/ngy?= =?us-ascii?Q?GnX7tz4zIfe3wA4R7T8pk5lnnBjU9FoaAkIUa6RMaCjw+bEgLw+ucMskgIvM?= =?us-ascii?Q?gl4rXYGsmMr+R7FMSj82aQ8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c711db8a-b109-413d-d118-08d9ec5a9eff X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:00:21.1069 (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: +nYLmEwDWorVZX1nUUX6zTl+mr/3Q4pfTrzO7OEBWNUcx81hT/2BONWNn8iTHphrn60XK7fyzfBpSAUjQI73hg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5761 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 05:14:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp2739324jam; Wed, 9 Feb 2022 22:00:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxrAKdAteqVtgLejSQs1Ha0kET1kulNiczigX/TGY4ZizI0HuVVxW/34fJh/gmDrWdF/9H2 X-Received: by 2002:a05:6a00:1c5e:: with SMTP id s30mr6017648pfw.43.1644472833426; Wed, 09 Feb 2022 22:00:33 -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 h65si18013818pgc.542.2022.02.09.22.00.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:00:33 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3617-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=MDC0D54x; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3617-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3617-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 9CA373E1012 for ; Thu, 10 Feb 2022 06:00:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EAD082C9E; Thu, 10 Feb 2022 06:00:31 +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 A6D032C80 for ; Thu, 10 Feb 2022 06:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644472829; 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=MDC0D54xG6GKAsGa9nymWcd1ObBFfR7m/R2MYURYVmA5NTI+0XxXerX/KNjUv5+JuFqZiT gnxezGYV9pbW0mvO5fySVWQNxnvhrV1QKdgNUkkjKiaw4N6VFAp9D1o4na1QY9ptaujfUT 9XOusZnH5XqoBEpg4EQhPcKjLXiO0QQ= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2055.outbound.protection.outlook.com [104.47.4.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-24-I7AvH837NVKjBiC29X08tQ-1; Thu, 10 Feb 2022 07:00:28 +0100 X-MC-Unique: I7AvH837NVKjBiC29X08tQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZK0z3GOSSAtMz8mh2cFGrqA/ohLDcmLCsIXnGzy6mnNiFpq9nedv5msfpZlYgaERbXihbRGdd5Q9WclYl4ZVAgpQmJ2/3+pSAEV7LeXxoYgkdOx4G+fSMoFkHVCzNN8S6vgfpE+AOfPY2D9yLPWoFirocF0FE9rO2EinHt5wRtT/VdzXYiIxQF7K+E4CbLmTrJmQeX1GCWWEkdBNhY/3EkiD7wNrnl3N7AegAEp9RKQN7GC8D0jkMmFBgbks8E3Ph74r2GYrwGT49iFjL8LZLpRoPdxapdgZXvkWuLwXj0OYutoG4tLVe4NCsp7IJIPFKPa1giNWaxvAQUtPhfQs8A== 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=cq65ROf3uvupnD2UWcJOeEjzNfKgX6GnEAp54B04bNMUhjYUti5zZbkBDXGWcw8s0JfNK7md6edV9ZdErhAplv1aiOm7wZvfe+2JvsCdEvM6Cl2E6sGWXresSlQtySu31CkSKw5uZRGAgdoNOI3P71q5Qn+OPwjN2VjFbKkOUE3FjVvdZYCo4YVzSumWikB39tDPJmUFDA4zXiTcSIlx1CK9yOIPgF0478+tF9MI2bAcH+hOf08YHzWAKh233VPLoGNdkxLIuRh7tBc1vQ7Nr9Id6Li72PlJntKtd3INf4f6DIgYnFKrokL/8SB5UzspDFG6JN20SHzjtigzHAOOvA== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5761.eurprd04.prod.outlook.com (2603:10a6:208:12e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 06:00:27 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb%3]) with mapi id 15.20.4951.018; Thu, 10 Feb 2022 06:00:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v6 3/7] mptcp: add the mibs for MP_RST Date: Thu, 10 Feb 2022 14:00:27 +0800 Message-ID: <5f2be7491846bda35304550db3dd00828c5afc68.1644466571.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0006.apcprd06.prod.outlook.com (2603:1096:202:2e::18) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: eb77a351-a0a0-4c8b-42ed-08d9ec5aa2f0 X-MS-TrafficTypeDiagnostic: AM0PR04MB5761: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: Xr8WcWI6wUpZlhsdJ21A8FrCLQr20vkyFA6h6nMGobaiGma9ELNXDTMfhNPOhu8DgLO1WyMcZl5vX5eeHlSMBPgmwk7CbdXiLNHrbPNtf/V27sYT55qu06JedSuKuGV7mpeKJsXBSz0KWGy+wVHeV+Hn60Db8mzlCqew1H976Tftvaz9YBBU6sLtatYoN6x57BPaubw6mrvdGvJ94L7pLD2tXGF+jCx8KBiD6LeFnr4kK83BoTXMcYZj4Ehk32y7d4M9fRn3tRqRjk7/aAoq1hQPSDUgboIXDXYD4jHNBtXyKEOrja6HX+kr9jijzO0a2u0SUFn07wQuxnnlEJuxEbOCioWBGH54YVVVXiwrVijYo1uCWQBCddB2ML620X528Eb7q6DhZvx1vC0ue4mB7WxStdMm8TurCU+iZJ2IUrpQy5C2HtFss7Nvtim5AUcbPO3qbFQB/iPqvZOQ7Ytdr01XqcqYrSxkjtk0AfWYuAEy5KtiWwFMeMP64gZzGr4e0calOtBGeMNMYyq22526pjne156LON2SBJ8ClTTzgfjLU+2AFgEzRu8u2yxLJhFuJM/l3qC7RY3w4k6p+n0GxIttTzz/XE3Bnl6bgKef2M1g436kggfa/htLTLrlDgZDwRIfq1CVyazMZ4shgpJBRQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(316002)(36756003)(86362001)(55236004)(66946007)(6512007)(6916009)(66476007)(66556008)(6506007)(8936002)(8676002)(44832011)(4326008)(2906002)(508600001)(2616005)(26005)(5660300002)(38100700002)(6486002)(107886003)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BuLUt3Yt4Ywij0mOpDc+6G4hhRdRqaKCY23IQvzl6DnhLWqOnrSoLVK8EEo6?= =?us-ascii?Q?wKPreWAOz3wXYAKsYsJO3trQGm3CRRgtL6e9vVzq6E+JVXmAmrW84MhqR3nS?= =?us-ascii?Q?hZpfbaa/M6f17Zl7Fj/ReUWnYKf95xot1qgYfCphK+IWUo3sDlj07NitOfGH?= =?us-ascii?Q?0GNnnjptHzR2PO6GLVWV42pbqjOytgcN31TpR1WzHvpwgu80DYn93XbNcJkE?= =?us-ascii?Q?9djjouFj8I6yoUyGEPTOR1MytroidP1zYCcg5TvQHy9+chlahk1LC0d0GzZ0?= =?us-ascii?Q?4haaPQF5b2BrVyJARqznZ/x+b54DdHrF0J3DMATPk8zIkwUBWC9A5FijkHOt?= =?us-ascii?Q?4HW/sgvBFBmK++of05GrzyWGTPBJib9TBpTcrFXQDbZmsMy3zlKLZutLC1Ib?= =?us-ascii?Q?kkSbqW35FnBU+VPxtVv6vwNAzOxUlH7H83Kkq7GtwFyPfZy2SS4UaT+5cuVi?= =?us-ascii?Q?ptDiQ+fh07CTePNZCr3JW3UKAQ21bL6Lhj3jrHQOWAQi7EEETu+hMKYJ7BYr?= =?us-ascii?Q?kcp5cWR4nlcwordBGyLJaSZ9D1wiuj5aqDuh4t51OfmTnHECJHce9eFHgqk1?= =?us-ascii?Q?f8J3g+iEUjlCvWzNsPvxrNhu4anhdpyOWGmtAJRGQsvAS8HiLrzOyp0kiABh?= =?us-ascii?Q?/i13zOZlchZfdBsDqHWsNsnAmfyytOdiQoVI62nhdm+dJdwkJrnOxu5jx7k4?= =?us-ascii?Q?eQjZgXmt1xBCfcn6fZZLSJ03OQhMuEECoG0bT0uJGhL8TsETnKC60f8qb6Ia?= =?us-ascii?Q?RyNaHVE3Qxm9cYjRxI1yBZDiReE1Cvj/5sImtmTCqNLtBbfOTEPCt/sr0b1D?= =?us-ascii?Q?DIj+XLn+DS038QobeIu1y21hZ6cYn3YKlvfOhORVIn7X34wk2PF6IpkJOebW?= =?us-ascii?Q?JP4YgAHbcMUK+4fBFlAnMy7MS9pUerjvXm67ygR7zt1T4rhO4+VoMl0CzT9G?= =?us-ascii?Q?OEmmAI4qKUrbDqKmC9wzYFCqlm+MoShHdkNvi4ReWtJndKcJoxi+fHfiZ+Zb?= =?us-ascii?Q?CY0kTsOr5HJ7I9eHxWbCqPNDghs85M496Ub3v/nt836yRdSb5naubVSY0NL/?= =?us-ascii?Q?dMVNivaClV3DhcgxpScCiidSwHO5JxzKD3Z9rGy+h9AQLCmdzbfC3OxwQ7cQ?= =?us-ascii?Q?FfxPfcOiZcnpj+Buw+FgWRuPOTKXUuUkVvMZeUf369iBImgKc6Xs7TFhRWHv?= =?us-ascii?Q?MDBI2HC+ndh0GoLr0avwwWJytMfLb+Z4qCZ8xW/IPEyZc9B3Srxl3SpIsefP?= =?us-ascii?Q?DhaXmk93Iw+p2XC1EyN1POlePWyI3gg3SPNYxpoOAbNsybhM0Dw+jOQRwb08?= =?us-ascii?Q?o9RtgHjzJQatxYmo2W03TwOrGqUpB0zmHf48ZkNGdx+ndPInNi37IHQw4X0T?= =?us-ascii?Q?te1dufNoFOg/fQu04yrPgWpDQ4uUDJN2X9ZQXEfmOWLOk8UnCE2UJ3APZx+N?= =?us-ascii?Q?M4QzHR3OyshGp7NP5WUEFhfnIEWqkPdo3Ccyed3yfIz1jsfTXBk5L1/Vucwb?= =?us-ascii?Q?NXK0XagA8t14bom9hjLfx6yf9w3DizpqjAJ39TCx8CwFh4uc0gZTCTNoVPBK?= =?us-ascii?Q?gANQWQu6lD5KcApLwtK2d4vwNT52PgVZyPGKhmG9Yr52zMGMFbRhUVRdydlI?= =?us-ascii?Q?DDvUfWL+/lxNwOlEbsMdwJo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb77a351-a0a0-4c8b-42ed-08d9ec5aa2f0 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:00:27.5127 (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: KBbhLOgHqkodyBccUkFBIQO1IT1ev6puGblhedAQ9mZ+S1EvHFbUOrKuUrMV04+UjfMMwJOsNJKGpufhH+z/1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5761 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 05:14:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp2739419jam; Wed, 9 Feb 2022 22:00:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9XUliMTEHGhapVWsAOdKYu5tZxeger42pub6iQ5jjzV2Luw6DjVcgUGyFE5GoxdQI8SSv X-Received: by 2002:ac8:5cd2:: with SMTP id s18mr3714206qta.558.1644472840538; Wed, 09 Feb 2022 22:00:40 -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 i7si4511763qti.8.2022.02.09.22.00.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:00:40 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3618-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="Z/sMzj56"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3618-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3618-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 1537A1C0D95 for ; Thu, 10 Feb 2022 06:00:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9BB652C9E; Thu, 10 Feb 2022 06:00:38 +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 5F20B2C80 for ; Thu, 10 Feb 2022 06:00:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644472835; 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=Z/sMzj56VjQ7f3qLUdM3W0+54xn33kT+zNSUdZBGWDVkGcvS02OJxus+HtG7YNZEUhOSWq fkMKmzkNO/rDmglinLxK+WK8pJqoeSnsZBa5xaMik8p50QdJn1e4jgtqE/pR/1Wogj0Ot8 grhdd/XomrweaFLsW7LRKOMVEURcLzc= Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2052.outbound.protection.outlook.com [104.47.12.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-P6forDPmPt6XTQ0yTlFGmA-1; Thu, 10 Feb 2022 07:00:34 +0100 X-MC-Unique: P6forDPmPt6XTQ0yTlFGmA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PmoDsERKfVcTS5UhhhL+7PtfNXVVWF4sqJB0SGX3UDC3snRkFEknVnKyfjVS+Ceg/IEQiBpYBbaB4eUICZYvCFqV9Kk9L8ByOgJsLP1Lcd9FysLlwODz61UxBLZArOHr9yGaM7lRxMI6Owz0dpA8hfNlo8Rw2bBpzTV3EF2kgZDdpBUS5yjVWtSJQDm9dZvszuhmu65vFPsXAkE7U1m8zW7l/d+tQrFn9KmKGBE6x15Zm40yLk44sVEAacOxU2zYwoQp++2O+PR5nQkwbWGgzYoNU+vX7NIfvVImbpMkU+OlZANuArHrL9tZW7x0PrYUMvxjWxTkb/7dDkJ4/dCDvQ== 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=mLNyj6u6gbupFqeGH9hDvAytaQ4tRru2YiFKe/hUyg3uV5Vr7OhOsRGdMEoEDlJvcGwpiQPnnRd5IGx41gGuCghBy9Za5WLwWk87+yq7pQuTMmE0R+9lrdt+hrIKXQfjonofgmCkYyJ7qPX01aMLaICvY6WQCErikR+qGPpWXrL8g/+W2eluin7nLOXNgRUp60Kr6Y0PG4TNFjHmASvBPeDKHLX6vW0q9+NRij5m8FM9mR4RanU80koI7DaABR+dh/yj0FV4bAnN9C0o7KGLXWrCXef9iLNKwwLr2k04qAsC9K8iMN+wEzSIk/YhK2OoJmLcvQ2OqDtkfnd/XAzoGg== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5761.eurprd04.prod.outlook.com (2603:10a6:208:12e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 06:00:33 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb%3]) with mapi id 15.20.4951.018; Thu, 10 Feb 2022 06:00:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v6 4/7] selftests: mptcp: add the MP_RST mibs check Date: Thu, 10 Feb 2022 14:00:28 +0800 Message-ID: <3884c70570fe577fb08f31037643f638c659e0a3.1644466571.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0015.apcprd04.prod.outlook.com (2603:1096:203:d0::25) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: 2138d9f4-ee3f-438c-41ef-08d9ec5aa6ac X-MS-TrafficTypeDiagnostic: AM0PR04MB5761: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: OPRH3/jk+KhFE/msu10nDfwyXnPPVdtrrXiNeJ8Uz2/rabBvFJF/PG6oFWVhsfuGoPsewxTUzhzD4OYkOwEB4reqsEMeGHAqFhVd917etpnWROU7Z9VX7NAVST2PDCDGFtscrr8yQ+Gr3rf62SVARQHUKPLHEc5eXhasQiAtjsdjhyzI7m12IEYUdIiBx6VOtsDAeQ5oDHckSpJekidoYOyD6MXEYONuR6IEINKXnDvhbK/x9oXYt2sCyu8Za2EgGWq2TM6MD3t7KdrE9HIIlXglt3OjC0BW0uyllvJ/p0UZF8g7BIfttHoI2QWAQ6IuPghyluRm6tG9vFnDUDRiOVPeCG8e2nN5eT3himcHVPZKVi5lGHcVvOd5TSVMVNSkiqaRzpIGCLCvqhcf2hrxFk3mKAX6cryRItfTfEP8meuwjzR2a/yHaUxoARf8737FGndmSMhEJYXOdVfR9d2HD0nmxzdBv0pv543zL71GmunMrqXHjzvrY90u5VszB+vFuThaEKLmXU5pvnoZ3G3v7O6JEW/quXQZZGeUpObywE1YQuvv8oLcYDyXb2mGvZuTgIatgTT/7JWkr5rkHb5m9Lz/KcEG2sA/2LIlwBWtq4btDL5cH+1ysnZWV/nwTLUo8jMzMcfcYUq+dKOruJCXCw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(316002)(36756003)(86362001)(55236004)(66946007)(6512007)(6916009)(66476007)(66556008)(6506007)(8936002)(6666004)(8676002)(44832011)(4326008)(2906002)(508600001)(2616005)(26005)(5660300002)(38100700002)(6486002)(107886003)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zLQq3TpjPzrGHSurSvua05U7Ehc8cMHcQWfj9hkEVNsGQEyq/q6ulidHA9en?= =?us-ascii?Q?26gk8GnuCRL1bfFLBJnaD7ZfA613F5joGqvjM1bu0D/5QtBY+R/Og5Qc0/+4?= =?us-ascii?Q?qqd6p+q2Yft/6N9PsujPM192viz9jVsR/L1QOpgIlsACM9i3zOPoQhuEeF1n?= =?us-ascii?Q?CArFVOPuFH/2KqkPxlQj85cCShFv94rHYqElWsOZ97FgPeSJl+TJe+mIckbS?= =?us-ascii?Q?M0rmxMBP4DvrOx/3gJIbNK3OricXfuGWnaCeb8QOuZPvlrN8f9ec8EChbw/O?= =?us-ascii?Q?GEbP2ErlDFL71wK2mx1lqEX9XRGAzpmmdAbfNI6VN93OaotyrynfUlmPurO9?= =?us-ascii?Q?UdQ0/GK0sSAod+yM+Huh5Eaxmd4EQhpdaP9inZKRlWwkwcIE2Jju5GisubbV?= =?us-ascii?Q?oRH1euOww2zxENAYea5cTe+y890i+O0rIkVTWe3tc1wd/yZ3Etua0vreo0Th?= =?us-ascii?Q?aMyejrGTjhiYKYJ+6vhTP5+IK5WCXkwOUrDJ5DOdSpX1DWtQ+4lOW2Ln8gsO?= =?us-ascii?Q?tdukZVVZdV5XL7aDQJ9k4CXzqUIVP95grcPL2D9icjbfDmTUTRyngGox3gjw?= =?us-ascii?Q?MVdYybSiqnSviySF7860r/ouLKsf5eAQa/do64vebtpnfBsVz9QJ1SDndrss?= =?us-ascii?Q?9VWi3sjXDBW2Pl6I3admD9qZvJFI0FZHemoh1DAYjJqrLu5uTMoVOrUCOWj5?= =?us-ascii?Q?E5NJFwUc3dO3cHAhyYG/duEbzaZL4QyGWuGPVX/P75mfW/0YARetOIcx9Q41?= =?us-ascii?Q?Fmqdtoe7uZWD2fvMuX7aARYXLcMWArMWoEvAdl2HAw2CezchIPdBgrEnOaSZ?= =?us-ascii?Q?/4uMlvaqSEPbXBeNY+VmHsVKStMbv55CyHIlQcCHFBUxjxbKAUcHzl8kbviJ?= =?us-ascii?Q?kbsINfn3WNObGlt5Bo0cbmQ5tv+e03peOhW2sJGhe9Xb+jX2srwfXionF43i?= =?us-ascii?Q?6XT31l3NK9hENsFBcXImIZhUrWksY3Q4LyfuGNuNSEpk1l8YS8C3ZcB0tQJo?= =?us-ascii?Q?IY1LVNGvSK7vR3TdXuNkToU51c+e0a1S6iNW/OEqcOXQwqlBqvWFuO8SIeD5?= =?us-ascii?Q?HmhPUHdSjiDSJcNtctTHxncztCcFJcavzUHgFK7BuIo87RX7UMnpLc9xndSC?= =?us-ascii?Q?TE9FtP4Gw2cCKqlCCAK/He7ZIl8PBwZ6grN3URmLr9q1mttNDndl6yDPFQG3?= =?us-ascii?Q?x5vo13rO6P5NDk+ZbEPjqsSiKVl5S28sQcBC67GJnQ0F4JEmClJECkuqwZOQ?= =?us-ascii?Q?/thAf68iJKjWZJwjfqFTBTEbgk5jYjCVKT5ZfGLtcB6E94sPEriq4SJuN07t?= =?us-ascii?Q?Q87q/X3jfqZtcw8sMfumP8iWvDd2kL3Zzadg3SDAkffKBTfxV6TKVlTmzu/3?= =?us-ascii?Q?145VfDMjYNm0RZBdtk9NedQ8dXk2QiZWZI3UHJF2nU2rZc02ADQRt3y5vAvp?= =?us-ascii?Q?vvTQj8OvIAFeMJY/ar4Q7VfVEP0uuKwq15CiDZqBBD8ExPSlm2H3wRYWX01h?= =?us-ascii?Q?4q/AKDvSSo7E8ZLHhsNsUukzCLKV+V9UyLpuGxGrg04DQh6USjbwT1JpC0mZ?= =?us-ascii?Q?SmKyMD+GvQVahF40Aep1Syd+kq3Aau+SUO57gmi+deCOTl57OwAEKub2g/7R?= =?us-ascii?Q?NqpbkKztcS1/gBOsFGJiPNM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2138d9f4-ee3f-438c-41ef-08d9ec5aa6ac X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:00:33.8091 (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: Yw/0rNbntLHxu7JVsC0fNYX3SwD0bDg/Q7sc46L7faF5UJlJtYw0FdLpUUgbgcBPurpcLQu8NSp4z+TL5T5i4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5761 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 05:14:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp2739492jam; Wed, 9 Feb 2022 22:00:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQy3YrcVX2mP7aYySAdfQZBkS4/hAUqhq3o9RsRH/8FDle5cr4kcm0qBs4tCmqEgDT+ADm X-Received: by 2002:ad4:576b:: with SMTP id r11mr3939367qvx.34.1644472846711; Wed, 09 Feb 2022 22:00:46 -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 z2si337335qvl.484.2022.02.09.22.00.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:00:46 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3619-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=JUNqlTX8; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3619-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3619-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 5C4A61C0D66 for ; Thu, 10 Feb 2022 06:00:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1E8162F23; Thu, 10 Feb 2022 06:00:45 +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 DA1572C9E for ; Thu, 10 Feb 2022 06:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644472842; 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=pfrxc6uchz3LgohHyAvfl0pZcYYP4yahr5LYKiBhjwA=; b=JUNqlTX8ri1ipwJdTw8GgdYqsO03fTB9Vc6oOiIgjCd8kNYa1OA2umZBUbx/f4i5Lp02Ge +eodT3qPMhkM+j35z11BAgcNhkr4w122oiT1936VWDbMpq/FRi5DooLAmfSo77z8zFciFi 2d5YMI/wXfjfG6CbegeXnSwCRBayy04= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2057.outbound.protection.outlook.com [104.47.4.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-12-Bm4tbY9INwSGXjgiotproQ-1; Thu, 10 Feb 2022 07:00:41 +0100 X-MC-Unique: Bm4tbY9INwSGXjgiotproQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XMMgk2a4Pt71S7Ep2WO233pnODM4mNXKWDYpscYT5c7wuky1xZhz0V4Ae9VL8NxoimgpJ+c6oGbe6Ua7cLuy3KQIu5S8viCM8aIOYrLN45APej0HSiHZQOGfYC7MxURKtZ2Y2qo++wN1nyYGeLwf/ewGm9/vD/Rfkr5/j//nejxpOMJoBBlOT+S3yreZFyNtYACTqD2ZFtBAU28WiFcXXhaPjL+syEc+n86RYIri1VrQ3t4q9q/GIuaoo2nwt5aymBL4VduqPhHv6mo+WdEGU4WVXNDeVGBwLtW+NkUKMrPA/kGHCJQ9KYOwZsEEdkpmXPB/rqTjOxKwPZ1tq6ePKA== 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=FBm0FXgBjYAjxZinK//xryRtKDYGI/+ZZ6qchH8Ztjc=; b=IJGJGf1uj8VKmMpKCHwwNyp8KscYXKWDOu73VfBi5IHSEL3EzcQ50wN4CMljXWdPfIekBvmBrbAmVumgaG8ZPxF2MhUtbqV4VkCqArKUt3sNC1Q70a4bebJlWy1wlPmT40rguXL09rM94VcQBmHmSPJ9RZH/SqqhbdpBHYeu7p0NgzxCO0IALUgthatfqUEwXjNrb6S/uoPqd5KoDnvMSVhKMNruISvHxG0TQymHnfjDf4EF4yLHrhag27t4avJe8gnfskR9JT8/glEqQvcl9mPyFaLoZ31/5rYlntXoXGMc6OVFKNhcOFGlkYIRTTptxhsJUYpp4USUHTwxvTLbJg== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5761.eurprd04.prod.outlook.com (2603:10a6:208:12e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 06:00:40 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb%3]) with mapi id 15.20.4951.018; Thu, 10 Feb 2022 06:00:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v6 5/7] selftests: mptcp: add more arguments for chk_join_nr Date: Thu, 10 Feb 2022 14:00:29 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0012.apcprd06.prod.outlook.com (2603:1096:202:2e::24) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: 817dca85-be54-402d-3efa-08d9ec5aaa87 X-MS-TrafficTypeDiagnostic: AM0PR04MB5761: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: 6uNI58VxwlBdeYu/mqJYZdCDbDVt8pPVJoKzurDDQq/+u24FkyUMOi/Dsdp8bEQpTV8cJ3y41FPpn3mDlYYeJSG1S9ADU7XvfDbJWniISUYFsIUksBpvLRGceEjLfbNoKMdsEfcsl/YpBNuZjs/gdr3LGKyjW6bIxQ5Lh84dlritjojcZbhETH5GKuRB6nAHoj9Dp3kBPJWCkknFCTJgiTH4/B/YcIAlp8KYmHC/eUxFmC/T2o46seMeuFpVR3FXIPNoU9kiBR+heosxICDkFdBdgDzVywJ/H3pMNCo+E7mDblpDi7L7GZ2LFzXgallods/M97bkZsR4UdrSIJiH1bwxD0+4Q0H8iPAld/LjU8+V/14MAMkUP7wRVU84FSd7xlaU+aegi5qLxC8dmaoJfVDOq8cuFxMbOSBlAb/VjUTfwYzeXi0E3AcceLt0g366D5auLBzLkkCZOSjwT47FqdMpHNNUkgc9O9AOVAt7uMTGDNDRSnLVqxqa9CVAkA5nnxZmNRaKLWz1sMtPYqe1cwVRFXyc2u4nfXmjGat57nsFyw0do4gnG/6nlJ6MvroKjacQsG9rWaf37AhJdA1m14xCF92Y5CoGhhilCAekd2BLEfBiwQl8Lj8yWhrOeFVbKT3MGr9Yd6akTMla64tEfg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(316002)(36756003)(86362001)(55236004)(66946007)(6512007)(6916009)(66476007)(66556008)(6506007)(8936002)(6666004)(8676002)(44832011)(4326008)(2906002)(508600001)(2616005)(26005)(5660300002)(38100700002)(6486002)(107886003)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?prmqXgJxthYV5ZBKJtRVyrM5HgEnxujXOuJ/NzSKeS1MM0nKc9GtO6rkF8K/?= =?us-ascii?Q?8HOC5eyAmJBrf40t+y6wTQA/HrRbrNSUObftQgwKKGvGKfj9xUbhd1/+kOph?= =?us-ascii?Q?Cg2IkEfra1fd8hYnhYZmas+NiUnO0Z4ZdvVH55kxcOuzYrvrHbvje8PG0JIK?= =?us-ascii?Q?u9Vq02XCNs7oKr+Qvb0JDw3D/1Wj+1mKHHW61AEnQC/edv26/joF2XDhN0+V?= =?us-ascii?Q?51hm0Cc8l3vw6EN3Lqad5dp88g+shwEUkgTLuPYI1WJKbPwcgn25cn0c/T/9?= =?us-ascii?Q?zskYALVtAzqdw9OifJidicBCrfChGGDSlTPnpB6Az6qVVs7TOiOJASAMQAdO?= =?us-ascii?Q?wsV39iZ+HoaFtWjPTxhaY1kgxF+/MitMFRpEj36hTl4iq/mi2Abp8NqNTyVs?= =?us-ascii?Q?gqDmN+u1lr2RqveS6KUaryDs8nDc9Dld9bo4djJmDXozCcnO9vNP7Zx8L1vi?= =?us-ascii?Q?p1a3FstwwnCO8rnnW2nF4QE69HkxiwKth0jnxPZi23hFp1w3EaVJ70vHhCrt?= =?us-ascii?Q?Lpt0ZeSB+x984aV65+98lm4IP3uU6Kg3D4mrdz1JdW9KX/EOwZ9L/865jlWo?= =?us-ascii?Q?/Bjunovii+vga2zH0FtMqCS+uWGH5rrLZZ0tmCtXXXKiur/ewvEa0yCxhm7W?= =?us-ascii?Q?gW0+Y/z69DFiNdsVQxnbpYs9SaNL92rA95h7Pc4wILw0rmOedi5Ohmtxqh6j?= =?us-ascii?Q?fwEU+0DVrBatqlQOwxDhuystDYWc22lzbwhwthDPXZOzNcNXa4E/MX68PMWk?= =?us-ascii?Q?rbTU7S6kxsj2l9LjJEm6T91ZeLnawTOcq+ZhxnZcKjJcgqi+2XdjjBDLGuio?= =?us-ascii?Q?FARY0MIOYntYwQtFqtoqjt9UF2gBrbj5dXWjjNBsZhucnXEj9x5wmpAN7GEP?= =?us-ascii?Q?ACaejZkCcCWi3WQyAaN8boJ/hbIjeD7j3P7u/2jLi30JpAeyRjzgPwijQI8K?= =?us-ascii?Q?7WdCp+jWIzpe48A7MQnCkgKBWHUj9xfYwmCdZ6DgFw9unC28lOwvuqYBcUGx?= =?us-ascii?Q?Be5iCHNzLGOQAUVXB5PahoITIy7w107sd/vPNiA0Y3HGCAV/qmZLZdh12tux?= =?us-ascii?Q?lS2UX+u7tsbpGUA/US1GjzUMkLs+P4twJR2EcQcRiJ9R3LyJZSwcDBVr1D/Q?= =?us-ascii?Q?Txv4o7hr8ND0UNONExo+YJClLJPkgU+7dBZndcE+7kKoHqiNcNFi64KmF/BW?= =?us-ascii?Q?YpKJGq2O7LjXOb+dWgY7JynHJ3vJwP0vtCwMpNW0CXhnJvy+uossRlbz7NnP?= =?us-ascii?Q?ki95bl9lMLy0e8b1IARH+aqok4HWzZp7GkvMaGxh8/RCzVqZreTWqSJFRWHv?= =?us-ascii?Q?wXL5i3fjwOW8Lx9OkyD3lau6kJ1PGsPAMs7kE5Yq6+9fWvto7gnPn6mTqAJy?= =?us-ascii?Q?yCz2/PYsPk1KruLIDEunvMMKWFC5Bx42MUQ3UlTN0bqg5iVGNRqSxjz8yeCc?= =?us-ascii?Q?oX2eUJLs5gMPxCwEp1OO5uMRvmxUu1Kof06XH3Oa9RE3TEeFp1UT0cGZJX0Q?= =?us-ascii?Q?OLHxzn571O4Pmykyt6lZryZQSDVFgmqGOcI/Hc8L9s+MqKMcNV+SmFkjnh7m?= =?us-ascii?Q?E17N0xCx7kEfKVfuN72KZfpAky0rS+6XVTxwA+IXB9pTIbXQG2d3ReUz79qn?= =?us-ascii?Q?7uzPiqkN9vPnL3DrzOOKigM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 817dca85-be54-402d-3efa-08d9ec5aaa87 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:00:40.4806 (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: O2OeVStwMoGKJ+E7ka+fIEPD7oeZift/ZZcfvhWUou2EJwt8g/Kt56UtCr8FlTHoghpAmUkYPKhi0T4bWIVSbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5761 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 95d61c97ccad..c595b4613ddd 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 =20 @@ -889,10 +894,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 Fri May 3 05:14:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp2739593jam; Wed, 9 Feb 2022 22:00:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJzUk7v1Ux00Z/xbDmU6iuS63cHJAFod9s5XmkL6sl/BQ1SOb7BDNxhKpA/+tzVHtAhK4UQ7 X-Received: by 2002:a17:902:c403:: with SMTP id k3mr1925159plk.142.1644472854871; Wed, 09 Feb 2022 22:00:54 -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 u9si1264061ple.105.2022.02.09.22.00.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:00:54 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3620-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=A3qkAqoN; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3620-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3620-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 5EEFA3E1018 for ; Thu, 10 Feb 2022 06:00:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5BF652C80; Thu, 10 Feb 2022 06:00:53 +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 119AB29CA for ; Thu, 10 Feb 2022 06:00:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644472850; 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=waeVsRE+1w1DUZvRLvBXEPZlRbREcoydERpgQr0yRdc=; b=A3qkAqoNihitwRBdexOoE/gpNBeZGPpZ4A6RjEciQ+u1ZqV6AMq7lYNTQlMgqFYaRmxeq1 rxEL7RAPnkupBky8HLdAGRGKgV1xkyC134cl6lmy1ukWQJkF90aES8eEzULjQLbWSZqpVu gwhLKuai+1CeTtFZbu8rHKP1xFfBD5c= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2055.outbound.protection.outlook.com [104.47.4.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-26-UCLHACIRNby6ZZ6-3VCtVg-1; Thu, 10 Feb 2022 07:00:49 +0100 X-MC-Unique: UCLHACIRNby6ZZ6-3VCtVg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KT77bcacjLxt9A7eiFjwy84+pdIFsd14iqVMThQa2aRXoCuhdis2vxHYfHpFBpDNPSf/tpIK9C6Um7IST8dr50LybziMcvdoNxZPO+sTm6tn5CPLguB4LvbXN7t1AuX8AJhwCsrKrqmrRNCCp7L07PgEBxqKgmtN4Jjc+HiK6xLxsMGSYQe2QVg9vCcOdEIr6TIe7OkLIRsJCLojISBUc5/z5Ck5pjxt7PB7XZkB9bo/6Z1GIKyb+Pnv+pKUMwheq5fr9CTH7zyrFkgngl7OCCKPNBC7Dgnf/bOi0y9D9MKuqoUej6zfmJczNN+lE0sFL3T6amgHOWH35l8j6NaIRg== 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=7mbX+EUgrAp7GFBPVgK7J5Qth9Y+6iV8uJlYTL5eh4I=; b=ftww12GHi7NU4TC6fA7zidl1powS4UeArL3Iw+iG9pf43zkZbnsK7aJe2Z0a96wbn5v2dzDkJoXyGLrSG5BvcsR3ILp+VqlvwwqOiRIz6mKapfUfFl45mlP5/qkQxpRRfy1Yn0yJoVEOf3zgHmFntgPZk3He27PoIQ9bByvmMdGiQxj52kMaaKGForYjrBqqT9sD0FTMuPoeSzLD/xrQ7481ZSPZ3ZAsO3LlL3vzyEiqU6pdKJiKtHIuCIiRMx5CevaaUrc5geZRDAxuTEfDMuFEX5zAORpKbadkGzp+27R405AEw0F5TJAxPDt18Z9ZDP5s/3mZmxeGsWtBigzZXQ== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5761.eurprd04.prod.outlook.com (2603:10a6:208:12e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 06:00:48 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb%3]) with mapi id 15.20.4951.018; Thu, 10 Feb 2022 06:00:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v6 6/7] selftests: mptcp: reuse linkfail to make given size files Date: Thu, 10 Feb 2022 14:00:30 +0800 Message-ID: <5c1d0827afbc4cc4c8335b447ad9d661b585b620.1644466571.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0114.apcprd03.prod.outlook.com (2603:1096:203:b0::30) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: 19cf9ee2-f6cf-4fb6-1610-08d9ec5aaf85 X-MS-TrafficTypeDiagnostic: AM0PR04MB5761:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:669; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dVW4PZQO9foYcDvIH4nTlN/XtNJB3w9meTaEi9gqAv7prFNG19V6bQ6hDA9jrsdxluxDulT5yJFsvB6FtShFHOFvef5UZskJPZbIuwaLavtooU5/FFfHRPCB8ob5gpHuxYyj63ng2sbhjc9G/jHO0Nr2Glvcfl/ll1Hkp8VivYljMDY6qu7qaCFkvyRQWHq/qO1DAYrIL7WDqnqplFn6GUWwCrB74wSW0GgM1rD1lmpaUPuAFXNdG8JWr9wo4vWLFSXUYAbIzDLfhiNKkVQWfAIL/71vZqI+f6QbYkVLSBEOMmHTxaS0N/R5QiV5Z8NaOUApT+qXXpkT0N9xaX7ecsO8g/3tEP9t0ckuG7cdPr0w37W1diQzhsJ2PpdqWLpfwaJPYWSicgfUuIU33ZqHS5uS0/Q2ehPt2vWrWrLlNcb8B/vFKr4/aIHh/uNvR8he350YVSsB5bl8Rlk8k5JP41VuJenC/ves1GoMbtE7c7Rd+bBDLdUWK0loRVjDs8OOtuZaaeqLusg63eLqPFOvOc/88UoFhUwF9AUX4MJYp1JENi9Xu22EC7RfdtkM/CzHB2hSKXYa0V2u+biV1+thP+oWsLv/fKOXly+AzNdIjFp1FdnzR55vCgHlEaNbn5VFP7XVgUTPPj8XRlGBRa0qpA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(316002)(36756003)(86362001)(55236004)(66946007)(6512007)(6916009)(66476007)(66556008)(6506007)(8936002)(6666004)(8676002)(44832011)(4326008)(2906002)(508600001)(2616005)(26005)(5660300002)(38100700002)(6486002)(107886003)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P1fU1//SP1EAT/x02WaqqX5uckCHB3hG8vxuL6lnIw6EL9zAbyxVet57/MPa?= =?us-ascii?Q?8LOdIEwUyDHn/SA4Tsc3LC/BUIQX/SeVi6T1aSfUE/lB1V9SuoNFXeJ4qztv?= =?us-ascii?Q?n3k5Jw7UqAduXjUvMjPEQEFyBXfeSfRkBl7IyJa/o+f4cgegAUMyxdZ1JPD1?= =?us-ascii?Q?MoYOPgtvQx6onU+znAbLovqUJTKDQCG5+eUN4NnLswTLIm1qjFjgA7cH+FDF?= =?us-ascii?Q?zYV2VZH1m497i1Jnsynor5eTdIfEo6njN7QndIEocuKGweuaiYU0GoPvETrb?= =?us-ascii?Q?fh5RHpG3f9xKqPfqoldYarluPq8GiMstOeNlneNIj3z9WPYrYRIwu6inn/Mi?= =?us-ascii?Q?q9O4PZpC5pvZWA5KyllIg94hzUeDqjr7RmmNKD6H/f1Eiy6ZljfZJwbV3Z+d?= =?us-ascii?Q?zRV1TT6R/UTkZ6syJQ/vSqleND4UAv3+qPhUUYsIMrT/V77IQI1ebikceFwO?= =?us-ascii?Q?TdigL9ksABmCHFDt8zhmkZFmqpmnhHiBsD6Px2KScdtdF7K8h8Ju8M7q1tD9?= =?us-ascii?Q?O0qd37X+p1Cd5lm1tmeNU6Au3oARu3k9XNpT9eFCeeaoYAe4zyytB85JMH3L?= =?us-ascii?Q?nmvO9vkeHr+K/5kLA9kPj/vMCL3ndVd2lXkJyvwlb/bnC6/JfE8/W6IKGOsR?= =?us-ascii?Q?LTk3I4YVl+RWBvWueTi3xO8DkoHREQglboVexz6QdI65NndK6N0UvC963c9/?= =?us-ascii?Q?MimnUEsH+WunyAvugJ3MTRPfAHe3BwXynvOFyfq7SRmDdQhURrWiWTbiz3UF?= =?us-ascii?Q?qY7Nn0TklVAgHTBrlOAJu6kRHX6YM/4mZeShr0/hSocM1sfUxq3mWxc1uxYK?= =?us-ascii?Q?NWfC5shYFuyd/KH4KWQcFPj91eoayiSkSGnJbUd92RkTSNW2iT+NkA7Er2kv?= =?us-ascii?Q?OARIQHFbQuDQ23jLfr4QAq9gyXLeoxdI0qJeoAtYBabdl05Q7o6SeUtPJ80Q?= =?us-ascii?Q?5Gla6CGEPWHLeZq4rOfLAbXUQZEBkUYWqgXxqXooRidlDz4l2nF3ZHDBWpkA?= =?us-ascii?Q?vSdfiBvDvX4KRs+FhjWftWmf5/545esft/1ovyjxV1h/rgrO0FLovMy2Jz23?= =?us-ascii?Q?dTyycllqnpBNg7BoEUzGk8hVSKm0o10ZY2o4uXBBDUqwtI5CAHC2q8OD3QjJ?= =?us-ascii?Q?XJ54usWA3AcPGQgZeE/uPYpegpzLId/BqonLY8WP05gJoVv+4GHPnMI8e5/X?= =?us-ascii?Q?g7WjRKh3dxnsUX4dqkKynpi37AOGFrHi0HkVkFRTZ+R4SyZE9yQLWNKJOYwd?= =?us-ascii?Q?aoFk8kCggvx6DToJVFqU1t74EB9vJNk4BUb/aS5qnuInhLl8di6eH0ZedezR?= =?us-ascii?Q?v0oBDJ6q4tnUvItj3+cK2ka6x9jHMYMXl5ZN4YUPb0u/DVX135SbXdFahVaw?= =?us-ascii?Q?IlNRqnwwIdpXAmu7t+yLBH1BLDpLkXyYiRhtf7EtoMH8XAwodQTSqQy81LNz?= =?us-ascii?Q?86fD1U71bnxH6sQzftaVO+ibYHgIjVS11QNlkvGvXvIKHgPsLvKC/LWuJU6H?= =?us-ascii?Q?Jw9UElTWPPQ26hCd9m/aWVHs8inKbJsWHJVUeKra/pvGjwESSurvxLsS4/G2?= =?us-ascii?Q?OEN959v0rplWdsygwKPeZrjofcERC9sznoY1c06VK3k07cStbz/tJA/2KJhF?= =?us-ascii?Q?n6D30yCoL9IG17pfuoUIRlQ=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19cf9ee2-f6cf-4fb6-1610-08d9ec5aaf85 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:00:48.6051 (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: Y2E+UaOPHiUtECTIn/CBIWuZ2KTjB0FYPJ3yzI+eO7OlwSfVn+DJCfe3zdHHNIrCX3FVshNlb7x73P8Dl3x0pA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5761 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 | 26 +++++++++++++++---- 1 file changed, 21 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 c595b4613ddd..50a7f9a9b364 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" @@ -681,7 +687,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" -gt 2 ]; then + if [ -z "$cinfail" ]; then + cinfail=3D$(mktemp) + fi + make_file "$cinfail" "client" $test_linkfail + 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 +705,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 Fri May 3 05:14:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp2739697jam; Wed, 9 Feb 2022 22:01:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5VNImPtBYj1AmyrhU2yVhV/wuA+gGDH0YiBdkCecVB0gviHjYoQXcywp2lMG2r7hxwGn8 X-Received: by 2002:a05:620a:1678:: with SMTP id d24mr3026361qko.477.1644472862538; Wed, 09 Feb 2022 22:01:02 -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 gh3si2676870qvb.485.2022.02.09.22.01.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:01:02 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3621-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=fEA843Yd; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3621-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3621-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 2E6C51C0EC4 for ; Thu, 10 Feb 2022 06:01:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9C4812C9E; Thu, 10 Feb 2022 06:01:00 +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 ED8652C80 for ; Thu, 10 Feb 2022 06:00:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644472857; 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=yeDC2j1LKmvJEQ6MhzWNeMpDIgBoNr4KGkGYyk6xDx8=; b=fEA843Ydpt9M4wWwGtjG0APZsdQTd/K8JorHH7GmCxoOnpM4ttnS+Lz9tdvSZvizgqAx6T HXkpbPV1yOX/ljqiW0TiOBK1SDUcbjr/Y9vhQTMfUVfFlV+olJBFZok1XTUklkSum4MMqh cfVnR078nGUv3D3LBIVOH79Js3tozVU= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2056.outbound.protection.outlook.com [104.47.4.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-Cvmav_srPYWYe0vK0T9CuQ-1; Thu, 10 Feb 2022 07:00:56 +0100 X-MC-Unique: Cvmav_srPYWYe0vK0T9CuQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W56HlOt5ovC54MqpjaSuWKVkXRbWGq8tyZI9Kay3SPjQS1p1GrWPi35ZID1DRsUKg4/daaXM0BoweYxBi76uukAlxHCHSyGqipajXnmCqlg7P10hx1A2OATX/1ED06exfroM1ZdiS7kBZtdMN5S81jVGi1LHQBBoA5b7IV0hXKeG84j3c/ORHvPO3gJ0myCk8uqX6giy0mg35Ocne7fUlTgVvFsZ/JHv2DkOHi8lV0TTICdH5tGUqXzLyTcSK6ni18lo6azYb5flwo8BCO8/BahuOIPN4MsQNNVs9ZDsJfooktXQV4NwXbQ/Z0AZznQUr+yWgy8EPQ1SeSrFSyEjWg== 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=RBa/wSMk/wJR8qxDgPIl3t2SXvBXOy3VEypwLXO/dnE=; b=lOY6HwFxNZ7j4f1NH75RdJ8kug9RtNo4Q/5ATL1jowlbIOZFxchYSYYRBAXJU03y5f0BAF/Wu24VdsXAxctBCDzY59hyy5lXsMMPvd1UVxzGj27UOr+jYbVynvxTFOMERzbZbEFNfCmXsMJl3u4Buzsd0+p+mL+71zu+L0rHSLoVz60fh/ij8R6X3uC/z6nBqhnJLKaINBaa9ZsM3zTTfUq2J+4QfBz7J7Ot7NNV0+Kg9M+RSQCR6Y1q+/iH4ZMpOffbxFkB1mrfN22b2LvRyII0L9ve286wMj/BIXbppYBwGD0ufkSsfWqJbAB8cErlKBtfxiSrRkpaEBIlI+BYKA== 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 VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM0PR04MB5761.eurprd04.prod.outlook.com (2603:10a6:208:12e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Thu, 10 Feb 2022 06:00:55 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::b823:3668:e8d8:beb%3]) with mapi id 15.20.4951.018; Thu, 10 Feb 2022 06:00:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Davide Caratti , Matthieu Baerts Subject: [PATCH mptcp-next v6 7/7] selftests: mptcp: add the MP_FAIL testcases Date: Thu, 10 Feb 2022 14:00:31 +0800 Message-ID: <4ce97f8f882fcdab197d88cae88ce8ed714b8f32.1644466571.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0048.apcprd04.prod.outlook.com (2603:1096:202:14::16) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: a9f5f7f8-d807-46e6-2590-08d9ec5ab373 X-MS-TrafficTypeDiagnostic: AM0PR04MB5761: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: 4HUcMyweiim9w732/ou2wqMKLLmJnC0fGg3u0wGTB+B+weQ7lp3D6b10Fe6akVcQwb789okT4qHFWVkYHnaPcWLlkJ/VW0GD1/ezbJwqJU5npb2nAoFPU3g8uYjG1yKIdAGoU02VqT8tUEMr0VsPxRwIQhewNaSIs7nK5qzk3Cv0zJi0fXUVXqj1DLJOdf/Wrc1trKqKUZ1pIucG+sZbQXLqMOWCdDc4N63Sk9kIxIUxsFJjxppZHuUHm3a+6kQ/5wJxsyKIC9zEv6Fpe0PKIw0LZhf8UHCj6Bh/iOqaAIdGvExF0ykin6XoTFyN9oLZbSZT9ZTU9TYtRUJMOCEK2Zxi+8eThX5zzZrKrIFePaLVIel1ZoVZHs8p6u737b8LJf+np0kuDUAGysl9lqSX7TPGcu+P/Ppuz/peaAYXhfn52ElRoeFHAbZTdq2HhrU+7/w/HYZ3OOp3L5uyxH4BUPHYom+8HTYGWwOspvhEAYnZpLJxY0i6GIMrfKw9mjSMbf69JFMEQa4/WW3UPF8BaWtqBvm+3ODhOcNhVjuGCF6yN48DNP6AlSev/gSoyw0uGuXe41a/MP9LN6Sgh/AbhzQLyKyDjnOQx2+0qfIseFNhQYdWGAnwHsPp9an1JpFu2YG770lJfzKufReByimXYg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(316002)(36756003)(86362001)(55236004)(66946007)(6512007)(6916009)(54906003)(66476007)(66556008)(6506007)(8936002)(6666004)(8676002)(44832011)(4326008)(66574015)(2906002)(508600001)(2616005)(26005)(5660300002)(38100700002)(6486002)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Mpg7WNmXn7RCDem2Hsj9mHPwsKM+Q6U5A2/W8WYAMW3hGdu3QtUSlnAlz0FH?= =?us-ascii?Q?1RTt6Pxg1eEkwcVdIP6eVu44E0jbIRJQWstCZy7FJ7E87Xi/RNHvsBPSN2nq?= =?us-ascii?Q?XfhZ8cNueVZHvgubSZlse4IKBb56W3FpRlNv1WxAFUPB+W5Y+SxsKe6WM/Yj?= =?us-ascii?Q?b0jBbc3URrousi38JIaE3ylt6R6A7z9Yi2iY7ZKvihZNduqhHadFtuerABWe?= =?us-ascii?Q?legCbNtsNH0zbv+iUK0rIXk+iQNGW+ttciGUiz0wz0R3mOt+2kBYD4kDvWKH?= =?us-ascii?Q?3uR3aeztl/zJtx1+jvOVXzbUoifZSeKHcWLRC1Opcq+4R3SmJamrjCyZfL08?= =?us-ascii?Q?R7mRlET9wY82q4kSJ1jwkwrEi1RccWSZwQmHzf+2jL4t5LQMyXHDGssII9gG?= =?us-ascii?Q?t6IDx5W8UZgPzNGGEa5+10/3bzvE8YDNV3Q29IeSH9ebCSCz9Vhv/s1hzxTR?= =?us-ascii?Q?dXX6fTSapgKq4CR8EAs51fNUkqtEw4eUSxPUrCGvHSh74Ul2pnMvHMc7h6xn?= =?us-ascii?Q?SMq3/TYTXGODRZiqeItzrWuXA2sI3G8WhhpRtL832/6IqRjFYL2vmup0H4+A?= =?us-ascii?Q?6KtjGh/+cJ5jeTSGoS4zf96p47PH7kVvloTvUG2Rd3Wv4Gh4jqu/y1StEpJ+?= =?us-ascii?Q?Scf3hfazDZwh61nY5hNdDw7Ys2tJ0CW55/EICZojaGl4fuUSFMppAv47K7UU?= =?us-ascii?Q?K3/lpwgbKqJz8/9KXAGw7BNygR1aZFAHiYx1U9nCqCdqzfacZPW10ie7PkuK?= =?us-ascii?Q?zDNHNKqWKgPEqr5ciaFKo/jLQSpcxqoX4Bv29kSClJfq1ZSy6n+QPnsbj226?= =?us-ascii?Q?QLQbxNFtxOT4uSP78Vls81MYaqu18VKc1J82WiiS9huOVS4fo1MBFXWU2197?= =?us-ascii?Q?uI4FT1JVoyLaa0CXq8PsClb6yFCodsOU5hm/C2pDjFLAi8yzGw5frW/HE4Kk?= =?us-ascii?Q?C6lOI7YM+bStYwss0yJQzUosE+D+Bl5DZEBcPCkirsigKSGqr4dZLcB/jVhc?= =?us-ascii?Q?809Nsr3DpBggBgNRX2a6fJM37ca8Ya6+cNhlPSJhiTl0tt8u7zSVma206PUt?= =?us-ascii?Q?n4b6eEGZ4Ln2RTLfJvvgWfUMPbdZGuwg/MKnIooLI3G2zIzFD1Y6q+sSAkkj?= =?us-ascii?Q?DlQGoWiiTDxnmJvBw32Ly5hML2xCRgm2fVdQznst+eFze29ccaQvuKK8u6Zb?= =?us-ascii?Q?7VzaWJAd+q7WfPPptRcJvJwUjsM4HJTPE7oq08d3h3soLl1ST16dcdKmtoDK?= =?us-ascii?Q?d+De7+0aUAWNpXa+nHtMt5e/FsAMgd3oPuQUm+MQb6+8lZOsnnmvZuJkjsZy?= =?us-ascii?Q?h3/tzgv8mYMYvhO7Hgurpm0AK63+HWLmdjJq7T5ayP+NC7QvfbxjEtdDXiyk?= =?us-ascii?Q?DAU4eeCa6mW5pMI/LlGhsE6vU3dUZZFfXuRWg9WlyqD28j8rTE6o12/UAWfE?= =?us-ascii?Q?FQtaNEIOBlxqp53ctsC54Rh66Bmz3vua+x8LyPZ7rFu9Ov4mWZ5aHYUIpodk?= =?us-ascii?Q?zdE31P2j5JZgYM2Ne2Vo5s+FzeO+tw1sSFj4L1qIDytYonDCOFrFG2DBNxtM?= =?us-ascii?Q?gBVBhgz/nYaIYZiHc7Xs7ZKHGhUSJTkDnZXmDdPVLbhjpJlpFIiXYKqP/0Gf?= =?us-ascii?Q?9ZnFF5YmJLgBcB0N30grUSI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9f5f7f8-d807-46e6-2590-08d9ec5ab373 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:00:55.4327 (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: uNClNoe3SRSa5H4HW0+cxhi4pPx2ceT+zJnB1FtDIqhr2OSfz5cp/USX0hsOrVbocrNgne2DbYhu8zMU6Lw+rQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5761 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. If the tc rules didn't produce the bit flips in the multiple subflows test, retry the test three times. 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 | 94 ++++++++++++++++++- 2 files changed, 100 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 50a7f9a9b364..3bb9ec44ed24 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" @@ -909,7 +963,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 @@ -2218,6 +2272,37 @@ 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 + # If the tc rules didn't produce the bit flips, retry three times. + for n in `seq 1 3`; do + 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 1024 + if [ $(pedit_action_pkts) -gt 0 ]; then + break + else + printf "%03u %s\n" "$TEST_COUNT" "MP_FAIL MP_RST: retry $n" + fi + done + chk_join_nr "MP_FAIL MP_RST: $(pedit_action_pkts) corrupted pkts" 2 2 2 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 @@ -2236,6 +2321,7 @@ all_tests() deny_join_id0_tests fullmesh_tests userspace_tests + fail_tests } =20 usage() @@ -2257,6 +2343,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" @@ -2296,7 +2383,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 @@ -2346,6 +2433,9 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do u) userspace_tests ;; + F) + fail_tests + ;; c) ;; C) --=20 2.34.1