From nobody Sat Apr 27 06:48:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1918134jam; Wed, 9 Feb 2022 02:43:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmE2QNL18/8vineEuVWjow8hQ4IRzsk+8lcbLE295lCQ5VVdOHjrixNk2usK5bPkeT4NPv X-Received: by 2002:a05:620a:45a8:: with SMTP id bp40mr715490qkb.48.1644403387793; Wed, 09 Feb 2022 02:43:07 -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 g15si3025143qvi.79.2022.02.09.02.43.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 02:43:07 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3570-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=ODyrCd1W; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3570-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3570-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 7A0631C0B8C for ; Wed, 9 Feb 2022 10:43:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 71D592C9D; Wed, 9 Feb 2022 10:43:06 +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 E90DF2C9C for ; Wed, 9 Feb 2022 10:43:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644403383; 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=ODyrCd1W7ixzKmpkb6YhU2F8aFuCsjSPlYZbvqc1et7N+y2SUrTzfO7DmJdv/lhTDeOIbM Bnry+X12PmucBdkFkl9QV9aAOd6sZMU7Bu8vXwhnfYWUfQ/2UIY47r6dSoqtfJwW6z1aQR YNLDfbT7ufr3woLx6lVqLAV8Ua1j3vs= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-32-62PrpM5UOwCFxzQHaWYfwA-1; Wed, 09 Feb 2022 11:43:02 +0100 X-MC-Unique: 62PrpM5UOwCFxzQHaWYfwA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QlV3xWh+e7StUA5ecNY1D9+xzO60RCRSgtLgBKf11GQ/MpKRGes4+RDev/fuYhCRnTq/9zB9sGqtD0KttmhuEN5+/tQHvzPgWFtjQzNX8fH1DIZq4C/6LBHgEpYuwZjFVAmF2ZyNMRLk1tOqAjolwQb4DdM3o5TgcMrMEy+HXNzqgE3j4TGyQj3mj8Z6i1PVfuYjraBWiZ6weKuaDyJDGH2eOJuxPPdz0V4DHHxXrXepetvHwrTQBMnyfXA4MaD2T+90e9zNx1fzJKFDqtEA+CIhAmv+n1Gooe3daJsdX33/CmecizTQmSvwcss2AC3KdySdw07vY0gWUN7vZl5unQ== 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=RZybAStqVhzBLD9OJU1Yf0M2Zu28tL2wGMdJWlxHzwL0Mp9gUbpL/BAHDH0X6YHPzPzQ4u4KvoxCRmphibFqNtTOjrdIF8TzSbQerUoNRJ0BGJTLA3exLpinfmOHNnfAoZpddrMcjnlVD44FV21fT+FZnXSjFWI17c3+5OGZ8T2GChw439DivbNxEi20YUc6G2BFN7Nt1s6r/6OyfRlbBdedeK1iBM8vg/QvM8wokQV7FwLbDvsuan/u/fy83Oy67bygB0fYXvLBBOH6rBATaIIpwfJomOZrIwZDnmY+kw5+BafRQQBGqc1ciecgs5Ymqc4kakpLRg23J5qOx2sr+A== 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 VI1PR04MB5807.eurprd04.prod.outlook.com (2603:10a6:803:ec::21) 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 10:43:00 +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 10:43:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 1/5] Squash to "mptcp: infinite mapping receiving" Date: Wed, 9 Feb 2022 18:43:09 +0800 Message-ID: <621a0237b6c15001e3590b27358dbb854c2ab6e8.1644402973.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0181.apcprd02.prod.outlook.com (2603:1096:201:21::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 59416844-8458-4f06-7072-08d9ebb8f16f X-MS-TrafficTypeDiagnostic: VI1PR04MB5807: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: zjpy7IHamqsIQzuSRw0C1bFCKHRwpEfHo4Ge6wF2iFqCEJyJd0GUe5C8/Sg62PKas1+yAoJ3evrqhQWePWBmSltmt7kq+BgJtOPEg7QeVn1vOvQQT3i5VESWlxqv0dy7tX0tqAUj5D/vzEvCgJLC+QWmV9i2YUhk9yVSs/eRhkmqK5e5K21s6pYZkuTPkPPmxHhWnfFe/YhcWwQF31FT9BNv7bTBBpp75nTM6TUu2KEGdI4Xr1ooQ7KxEB9dDMFugXsCkEoYWMamgjZ1jyq30v10rMTsseq5Dpba2jOEBw1/W1CaTzWsmPaGBcDcoUBq1xaV2PXuOLV5GGrl+cKGgKEiuvix04KBA/16lAH+7rQHEhG0Yf84x70zPl/Zb92b2LDpDBIILnzYN7YgStUn+UGPF2/DbjgsLxZAmk2ecBWYizptN+q3EXPy4Jci+8P07mWPraGwfTdqAnS3arLJeIUvvzce/0+e0r7YhW7IuHMPPRO5UBn8Vmz+wqFljq1Uus/0ouqmueoOHNaapdGYtbq3UsiQvQcnRqzlEqoATDh/IWeg8KWENOIpTfquRAttF2xtlW3dqZvnuL1A/3HY//8w/RtPVpr1Cu3PkX5ng2opbm0TY8hvr9qACcy5tw2Ki0987wDNPIIBVmMuigYNdg== 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)(8676002)(4326008)(66476007)(6506007)(66946007)(8936002)(66556008)(86362001)(55236004)(508600001)(6486002)(26005)(186003)(107886003)(6916009)(6512007)(316002)(2616005)(38100700002)(2906002)(36756003)(4744005)(44832011)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hN1A55apMUPeAoo94subwPUyM+8jmQvsl+m+AP7i/v5/y8yDi6qPQDu2xbL8?= =?us-ascii?Q?trVr0vixLfVSez6VAFWS3XMBP4KFoBhKq7I1tF53YRHlbRoDqIdEBGI0/7im?= =?us-ascii?Q?HUdqOntNKTeq2OXCh/XxLago0k8HMYAcryERvXIY8M31Q1fzv5GqvEcGflsx?= =?us-ascii?Q?dKQfbmf0lKgFqLOO3RWfJjju0+exauzSClINsiJehDXTbzKrazkJG06TyaKv?= =?us-ascii?Q?yVdUN47G4HCP4WB7sL5POPRxlr9RnHZrq1msc9+fQobsQVwhyRWWWt/GKCmr?= =?us-ascii?Q?Pzb8KJc+ueOpL3igUrxbTsa00NwtTQJBxZJGK4i6/8kp8Pz9pHp4WAK3y7Ix?= =?us-ascii?Q?JrBmqwXlP5UBt3rCH3suYKUDBjGHcK9lnX+DY+zzshxrCu6NIyd8Ho7dPN/U?= =?us-ascii?Q?ZsZJbg/Me3UvbN9nOjttGGiiUDlA3W637auOPTe40QoklkbzJNF9rxB3yyT1?= =?us-ascii?Q?66p4nRKTaD9MSikNZc+NhmSqfa/yZzzPKxSreiZmz10Fny28QGLbKl2EIkW6?= =?us-ascii?Q?DJR8umzkqeGlVa8Mdol/+yXVUTPyNWD6llzfNlddIrtjO/pFSIRZwiCtuqMr?= =?us-ascii?Q?LDTKPTRvuM3O1uFoJnIqS9jghUomBGG+GJYzFNhze/w1rBgLDhb/xghPnG1O?= =?us-ascii?Q?XciCABhTlFZHSNhX0wsCK75zAVcKKuuKNENlZijJMKmB0818Qawze4KmsVfd?= =?us-ascii?Q?r+P2+PlraGeQq3xaS2SHu8rfAtiNabQszxvz0iYLlwqRjBFRLKix6aQru54b?= =?us-ascii?Q?upqvN94A5VbZkYIFzUR50Y/V42frEzDlxZNOm/+ygxzBLMIBGdBm1yFGItsj?= =?us-ascii?Q?zfhs2Irxo6Tr0U3uWseWlMEByW6FNO2Dz1c4APPKWf52eCORPw8TMDHEELXC?= =?us-ascii?Q?3k7idwoZJ22Xr4NdRGNN+qO8UY6ZKQ4C1TopiD8E5ZOdfxkJPKZaLTBAg/kU?= =?us-ascii?Q?P8pszySJQqoXk/HTA8rbE9VF0c7AbQLelsGzAChTDJUj4dj5PZJehRoNvLOh?= =?us-ascii?Q?BpEHlmcG47yx1tjnpXxaNot3QneNeMwP2O3sVhw0sgTRCGlWCVQPfX2iHuO5?= =?us-ascii?Q?rpey404ktiW3yC0EPri46+vVsEyteQOf5unx0l8/lAGCIBOHfSJvS/uk43uT?= =?us-ascii?Q?4z3arKDzry45z1WJG8cSLigPxlLDwlqVXcNBZC402nxh+920BeCx1WA6EXjl?= =?us-ascii?Q?VPJIzD8eY6gM0b3GqXKgia+QfPxJeHT2zh2qwSHFxluCOTjqhj/V/TcdOhXf?= =?us-ascii?Q?r0SDGWVLhNPMvivEYWEprHb6InBdm72cxCXNNAj9FgMAUQ4sFZDO01EeqNK8?= =?us-ascii?Q?cJsNpJJjjHFn7yVYpTMl6dFJ18NH/2Jh7PndWHbOKaY1CCPVvpxyTz4igtgj?= =?us-ascii?Q?Rv7/mN01ePAjuwTuh+auFGrUqAEjW2SXqgTWkj1a29rXKRixsX3x4fsuldMM?= =?us-ascii?Q?ttl1pwtje9v5tXeJr4xuXECLSQdk+75Bdg66Hhcag+GNzBVpurAzlxWClz2a?= =?us-ascii?Q?BlwNBOpaNdBL4HwRDjmrTgUGXXJeVn0i/7G0OOQ74xOeLdycbZj0fvLsT0Dk?= =?us-ascii?Q?0FtwtrRxL95h434SaUqfDp4gEurri6wPsiUQI0xh7ZIJwJOgpPz9vJDuTbyg?= =?us-ascii?Q?gPIrE9300A3rbgtg7Oe+TO4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59416844-8458-4f06-7072-08d9ebb8f16f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 10:43:00.7695 (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: 4WCHc+SaI+gLPq+RmSVlIZ8+zPx5rhyrD3tRxqPh1cnW9ru1H9FwELsvce5czRww/YMCQwG4jSYjCmMSyzeWew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5807 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 Sat Apr 27 06:48:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1918193jam; Wed, 9 Feb 2022 02:43:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJwDYe04D8z8x/wwn0GQOoTA58wB7AFANVgKGbohmaoSnmMMmKjuOnNRhQ2HDv2KiyLTs3wV X-Received: by 2002:a63:6bc6:: with SMTP id g189mr1379762pgc.337.1644403396645; Wed, 09 Feb 2022 02:43:16 -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 n3si15857243pgs.484.2022.02.09.02.43.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 02:43:16 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3571-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=gJp1U54n; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3571-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3571-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 4269B3E0F91 for ; Wed, 9 Feb 2022 10:43:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5FF2A2C9D; Wed, 9 Feb 2022 10:43:15 +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 B681A2C9C for ; Wed, 9 Feb 2022 10:43:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644403392; 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=gJp1U54n77lZ2M1Jt7jZuAFrEfCBrloIf6QV7Af/N+uDQzYKjJiny39G40MOW5mctFUiPf w8uuWPwJnt9l1CG+RGvDwa1495fwdcpfzfSs/euGccUQqOmp8M+bcleStIbwWA+3S6ILir 1R83lL68FVtnuOQ1B09rR4Mp+kbO/Gw= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2107.outbound.protection.outlook.com [104.47.17.107]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-7-Xn5GzT6NMqyhpV5GoxdS6w-1; Wed, 09 Feb 2022 11:43:10 +0100 X-MC-Unique: Xn5GzT6NMqyhpV5GoxdS6w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ya8t2BLPg4Byh+bChT7kq66TsEx9p/0UoFrT2VawWCx3GdXRbUq81Ri1Jh4Iv9lgAE8vtn5SmsRov7NhJGrcEAzOWAUhuDc2h2bt619se9jJauJgGN/t14pmImpSNS16c4JXvQl1b0TFXFTJcPl+h4mgLfLyImHGmMvIdDyTqXnIEXQKNvehAZhl7p0RcYScXe6o+h9Gopaqz6h830u9ggCwU1Uah9kkNeJtjAZa5CQW9BdkRUkT8qf6HCKqlNn7bWBsoLcKusOG5KEnpaY/EE6UUEw3Ve6BtltPX0tQYzB5Ilo2USlHY3Rx5VcESVaIzwJhAnW94+mNLqSwnbXcSw== 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=IM6gH26C5VSOYDJFSlaqaJFYPP2up7nSkn8dXKYrZ45MMxDmrXfpVNaBAJuPllz66pUop7F+QgxanDuJ8W+RzOhesLluzwbf7dNyEsd8WL9bciXvDyNCi+qs3BRbwhag0Nb60c+583DRZ7t0jPWZbkSKjuXMCOn0tSgNTtfOHruPSOuidYhyAj1C4HNQ1ya/Vc3RSdx5kfnaYIAExTXraqhUkvsJSmfKempzz4Rgiu4MOsFyTAUf/YiW/Oxso/k5O6TUhBM3xEY1C5E1qfHbE0WCOpruZh618VbHX4oLuG5z3WccjcBPhaG5a821YYUA5/0PrGK4T6JDVAEF9ePCsA== 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 VE1PR04MB7389.eurprd04.prod.outlook.com (2603:10a6:800:1b1::8) 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 10:43:09 +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 10:43:09 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 2/5] Squash to "selftests: mptcp: add infinite map mibs check" Date: Wed, 9 Feb 2022 18:43:10 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0162.apcprd02.prod.outlook.com (2603:1096:201:1f::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3540a8c4-1e53-4aaa-196e-08d9ebb8f685 X-MS-TrafficTypeDiagnostic: VE1PR04MB7389: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: b1SShCeCGEgXva4Ljizym7VZH8AYaSYK3AMu3UuWQdM+3sOXwnbUiioiT5syCwI5v5+jpQM8NdYk72XkL67ojW8lP/+P/7X9QTiuLi03fQqmagcCkY8XmRp8oS8kR6GcU/8QK/DcBsKJT2KDifX1dF2I3rIY0oXPBln6m5VDJXb1u4tU4UBqD3t0IvpEGwPwo8/aqsO8Wbh1b8NBLaUDGfZfoC2rWm/YJJ4T5cHIMLfRc2JJhluQchZvNZLbTdJVHHRPiH6Eb88khWIZFgP+XIAotT2WGlw8wGKpTGlyslcQLlTBCH3XNMV093Ez6nF9oknZZPIWlmldipWGYcfB9QTSGIwIQjaWROtPDUl8Ic5jIFSgx/N4535gH2UFAvvqcKQOrolJdIOtD+VAWdyPBwPvldqq74a9zUvyA3T09D4uFxumszXkxs6Sdnq6443I1T2LT1Re0gJ87g//2ANnZzaoTpCoDcPRYgUhE4unQMeL2kwdp3q+7orV9oGa/Flw1B5+ojx0/HBWZtgi0tXPif+F63p0+AampiGS7Q5dXsPbCbVRSSXDr13oW7jAWiNheddLoezLJvkIYzUoCURnYcbd55lKqNkcDf2L5EukiGXWdJSSTSGs3/gtcEG6r9lD4t3mBS6AdKC1OCvo3VPobw== 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)(8936002)(2616005)(36756003)(6512007)(316002)(107886003)(6506007)(55236004)(6486002)(6916009)(508600001)(6666004)(8676002)(83380400001)(66476007)(86362001)(66556008)(4326008)(186003)(66946007)(26005)(44832011)(2906002)(38100700002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lCvytEMKZ0w0wijskWyi5yIiIpxe0lC6jVAeMTTuZBDP2LD9h8sn+Hxv1kfG?= =?us-ascii?Q?mkV40MQfyz7JZzvjwB5XnwnhQfL3bVqyg0GClx33BuN7P1UYQOYs+H3se8f5?= =?us-ascii?Q?NEb09gGOoqt7o5paySIhE9cdKF6FgAE0m5GuFF3QdQFLeGY02KCkJUtpzV0H?= =?us-ascii?Q?ss9W3EycHZdfltX95CP7Rq8sE+fJ4XvXY7S1pbWsoM6Aip/xTgTqOh12yF53?= =?us-ascii?Q?WujY7FE78Gpo01IHkcvr1YtqGXvgNHnUQwyDcyxUmy70v2VqTOYSWS/UR62q?= =?us-ascii?Q?ORU5k7TsmEIjhlYkI1llIZ/vYF0/BqZCRRFLeig/OTG1VSBh6BpdgT/jfmbv?= =?us-ascii?Q?U6k2DbQXroNI82aIABeWVy34iVfzVWuhNx76hcgLJGnJK8L86sDrlO6EaUSF?= =?us-ascii?Q?MS0CshvyIP5aBm0bfDp8ZvD7zdV3vssG3LZR5I7qK03DGvSCK30jq74nNENQ?= =?us-ascii?Q?usffwuLni49Xg8awjd2kIzZ5Z3ht/aGMEZy5HYS86Gbw7S1Z6DWCqgLlftqX?= =?us-ascii?Q?rAHElK+yFgEx114EYm8DGvuLH4PpwcodulQ66SGwlQEsStTUX3suO+HM8/iI?= =?us-ascii?Q?6fu5xSsXFYv5L2vDEj66CvcUyH7qTcMuMAZ3WSAmE8mvdkJJqI1dlS0iCO0l?= =?us-ascii?Q?Vuk1rznf2vbblyojuyrDmQ7LRcFJ8V+UDfZxlNgmDnz0Dsab5Wgsgk6XTft4?= =?us-ascii?Q?+uad3kwOFJJQC8gwNKgbj+mbjkVlpRSxZdnXp0eDlIT8qWG2sJDdmoxGHCSk?= =?us-ascii?Q?uT+6a0hB2iHkChBkXY8gDHiJzsRgdHM5JnCkmKBOPCDWmtdQ8oPM4eybzp52?= =?us-ascii?Q?tREK2jLUfZ0TwfS9Et9+VS1O2SFGBi6mS88uWC2WWCG0K1/nBPUiDaPQ4T3p?= =?us-ascii?Q?ulJpf1jhogXkQ/BiHUZHf0lZSEYArkRx486q4AIKGJMHeTSVcxGN+qG9I4l5?= =?us-ascii?Q?pPu2Cg7tnmNh0SyvzmBF8QlP6tGadW0ruTrqC1PsmQ1cKiITZAA5RQNogSZh?= =?us-ascii?Q?2MEtde2Kuussq56oQ/H5EejiKlutN0OzmN7y8Z6uMD0+1eo5Dwu8+znMH144?= =?us-ascii?Q?KOAIaTNg+9pSl3g2/U1Bkvc8C0G7rOvjuFeBrZEIs9c78QGF5JhmOxkApnRL?= =?us-ascii?Q?CZ6oOe17tKowC3iJhF9E5bO5Vqg05xjG3zCXvofPn9ly+R/mRdXk+wGOQXjY?= =?us-ascii?Q?S9A9nLtmoZ6EVx4Eb2seFDLcgNz0MOLZVicakvGY4M1gKS81E6cuu2jzRCoa?= =?us-ascii?Q?DyDhKx+1pQfVU/uwVhDv3OtswDKbb/6zCupFldDlHkHK9osJPXSYJejNFQjK?= =?us-ascii?Q?p17MbobXNDLPfzkmp4a2MD4jAxm30LIDzsgkFhBLXgSISeMzvS8wa0CS34EO?= =?us-ascii?Q?x8X3Oo74K66w9vChgSIXfgXPHH43HCQRBW2Ionne6HY1UGcMcDnv+P9ASBco?= =?us-ascii?Q?EwTI1OEDSoyMtx4n5TSnPgUmSXMUtrVNDh1aPYmofFsfA4PQ/CKDzLFCb5SQ?= =?us-ascii?Q?7FSBm07Tae4TR3Vj1HhF6cEDIBiCLi6pnV5Rcpd7CXAh/rLI0G5w3p2MvSwY?= =?us-ascii?Q?Q6697oOmyItimYHb9mnljO+e4FI8jYt8QQtJEupIZu5s4bIdXZZsaZA2ORcF?= =?us-ascii?Q?07pT2KTQGDzQwc4bbnUKUxQ=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3540a8c4-1e53-4aaa-196e-08d9ebb8f685 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 10:43:09.2844 (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: 4fYLU/he8NDIWCbqn27yNwMQCkHfIViYfMTco5m5TKKIH/VpJ44vV5hUudcxbto+o+FazbvST4dLQgWWPRR7fA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7389 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 Sat Apr 27 06:48:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1918266jam; Wed, 9 Feb 2022 02:43:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJxvKvEP9TVtMJBnlD9Q19UAHdxUBlYo5J8YhaqZA45u3hBGtv3LtM1VpmfwV2LXBgNCgXeh X-Received: by 2002:a05:6214:2529:: with SMTP id gg9mr1013218qvb.60.1644403404611; Wed, 09 Feb 2022 02:43:24 -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 az12si3462959qkb.74.2022.02.09.02.43.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 02:43:24 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3572-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=RD58Kpdo; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3572-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3572-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 3421D1C0C62 for ; Wed, 9 Feb 2022 10:43:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E88972C9D; Wed, 9 Feb 2022 10:43:22 +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 A6C332C9C for ; Wed, 9 Feb 2022 10:43:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644403400; 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=RD58KpdoQyZZ+l+rGAjzCFfeIgYfJA7S0MXJbbvEff/j4Q3vUb0qEtRISGPg6xh2OQQaWm jIx4rhOsToV+qnWiYSQPFfjKd7wYLcrarVsP0q7K/cLRf2FGHS2w0olC09MeQlkgjUk0kl nprAdTZV0Fa3LeFr1tfEhzUUCvVY2eE= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2112.outbound.protection.outlook.com [104.47.18.112]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-10-_lnrUAxxM461a46ow-xWIg-1; Wed, 09 Feb 2022 11:43:19 +0100 X-MC-Unique: _lnrUAxxM461a46ow-xWIg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nME11vs8850IPc48PVpmNUvhuiwwb8GeT8FPG6qULjABjWxY+2YlALvXvidz2oyv6vXaQqSXCF1T0UcPVLjfLOzIYz0rPpobMi6xIO2BgI53mvJaJwSVwYx2pVRbRZFSBMcDP7+8Zj3bHsbGNrM+s1K/uoeqfb3skeZ4E9+TlDlOlH+LXwMIEweuv8TLY07I7u5qNGn1HOqwlqu15ONQoq3+7d1ejnSVWGdgdXdUr9Zr6qusII2rvlzYbMNLB0HGQzqy5j+H5VbuX3XMP4I4moeHDinvWx9wPgtJJHgL2hmtBN7OiTwY3qStAO9xw60C9sKIqqd0ljt1SO6iMcxzTA== 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=RCGZ+T6yOMmehsFwhcIAraBmKM9cWnFDRdCPf2gQpME5hA6aAnnhLA6UvQcFfbZhcz57CTSRngXzpB/UROOGP6C5CAAP944dsfKn+a1j2x05dPGWg2TLm9KNMdd/YTbbDMBBvLu6eUq9dh8Tk0vYo8V98UVpMU1jrhbibzUh/HHScDr/iL84Hv5czFSrNr4ehW82e8GCFcKk1Ngo74v3aNLTBrX/8ojGsAWmfIihg6Da6bcOdOW1S/h0PF+YcSi+R5OMxhprngqP0zL44fbEiVHb9FNwjky8ywiuK8+mAGwLojiofIYeK2AnoFLJ5KZWydiYz01pBrbfy59WXGd6bA== 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 AM7PR04MB6997.eurprd04.prod.outlook.com (2603:10a6:20b:10d::11) 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 10:43:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Wed, 9 Feb 2022 10:43:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 3/5] mptcp: add mibs for MP_RST Date: Wed, 9 Feb 2022 18:43:11 +0800 Message-ID: <15d21058081166971b94f461b412ba84ac02099c.1644402973.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0060.apcprd04.prod.outlook.com (2603:1096:202:14::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3ee31f2-c5dc-4fc4-c078-08d9ebb8fbb9 X-MS-TrafficTypeDiagnostic: AM7PR04MB6997: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: tt4kh01gSOsH5LuPCnTGslmNLC7q9OvR1Lx2DC0BJd6xG7N1Oj19ZgDFEtmuWNk81dhk6ZybGSNfPPQn0AhQXyV6Snrd68Oy8JRXG8Uf8ZTVo2sEY/YjOTRtPXD8bcIYX5mUl/gCmSUUq+LIsqMRyOeHv3VUQd4As0INv5rMLMmIUqEDSEww1GhryetKYRwWwhIvyimoxG2CR4Ha7kfDiSdCz/oe2MvNZnarzE5/TQO0lepClNaoLBbcGdj7QnKDcMq0RKjOs7OZARVrDI8LTXpfX9djKdBZOurcQ2Veen+MM1gh8Y92VwQw8rr3tRFGHlh2njPR1Du8QmBM1W7EALwTfeVmoLstUooTwqCjV5vRSvqXHpmRUKvfqpkvY91vRe4nSxWkyWtRymE55prRvgmNJIywtRyH+Es/AAFY79rfL5Sxx2KVjm+hmaTGVRnypVmRkGMIyo9HA0X0+KH0pUj3HQNYChT5OMIynRUhyX0zsdcDM8M7e1kILnJW259AdYzg2azi02yvYnUK28W2DsWCntpIzW8dP7eqDubPwHCzewWjV5ogvEl+e+SgC8kYYv8Es6qgis1j8VYMHJ59j8OLbXhVmyMvBjihtKfGrSWBfltsdQPBf19Hrbe56Xy0H22gFMO+f3cqhWsbgMPhnw== 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)(83380400001)(316002)(6666004)(44832011)(38100700002)(26005)(107886003)(6916009)(2616005)(6506007)(2906002)(5660300002)(508600001)(66946007)(36756003)(66556008)(6512007)(66476007)(4326008)(8676002)(55236004)(186003)(8936002)(6486002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DcRIJuFkke56lsUspOmXy3A4qEoFk+Twdje6wk8FRW0rFluuf4+FrSRjJXoe?= =?us-ascii?Q?0cz7rAwAL7vhPE0719FPLxPCuGHQjia8gZILCDzsU/NQE3yfjiHJ5aIzs7If?= =?us-ascii?Q?ZeNh5mFdXNozvVkB2J1XHNma/x49j572LJ+0cHjEd0sf6EvZjzcR9/4DkYuH?= =?us-ascii?Q?q5UONi6jVsdMypK1VBDllLFooDOE1MBiuM9n7Og7K+rthaRIaTDJonZvL1ug?= =?us-ascii?Q?RLfwFi7rDXtf65B+ZU24+oVXj27DaZc+RARKoSw4x8QmMcIuERpgOt6kxrqb?= =?us-ascii?Q?rcdJizYqkuJos1A1QTpLaCtjNPLATxY+30XYriYGI2k3zrkG7zohtV6YCc2A?= =?us-ascii?Q?NK1caD8nd5w8k6bZyh2Mk/9U0nje2AQ5wrgjr/3BFbzdTtrS+C3Xwmc6sBbk?= =?us-ascii?Q?YyR41eK5CY/eXCUFqhlgRweHRWEbXeLfkNWOLq4mm7kI0z8kRa9wKv7TX/Yo?= =?us-ascii?Q?U19YwAIHgti7KlYikMDG24FwbB4QwvSCSA3/Og7lRS6O4wwv7OZO1fin5EIS?= =?us-ascii?Q?FSvCFtQgV+YU9SJcwjW6SZUhB12vFRmam8aKlxLKuCYdgyok72GctrAwQ/u3?= =?us-ascii?Q?j8tWYggyuarz3aXEQ8ivKIeSXg1YCB4NM4kp0B3vEW+W9/ehfs9slAZd2L/B?= =?us-ascii?Q?K0RdgWUaMGwXvVZtTulLGFA9wQgnr2uh5pMVZfST6MIxlEwH5XErrNcMYvVj?= =?us-ascii?Q?dBg8eK9zfW7WxaepM9fVuhyt5Kr4f1OmCpzSesZyOeW2mi5niWmLPKxAG/mj?= =?us-ascii?Q?7Ndhb5LvU3M5nCNME3kX39410APFYna6ROcQXrV8eJ9bVm313PTSTatqarqw?= =?us-ascii?Q?Zjyjxw/gLBkG4UMm/uVGNQRkdDIRdKIH+TDdjxPGugeoko6cW7JfdhfZq8cc?= =?us-ascii?Q?ABEDrE9GWgmcv5VNGB2YkFrsWzF5VNtYYwnx4b28WbzSBGJ1VcKXIxsD+qgy?= =?us-ascii?Q?AllRt+ublVr2pzUbZrk77tMzxTpFnDVrByik5Og8okapApNUyzL4B8ca7xQf?= =?us-ascii?Q?V+nCjzVVOgI2EwpUxzTlxkBiKlQltpD/LtJimUQAV1d53SXWRb0snDDGRdvG?= =?us-ascii?Q?c4/NA8awBb++w/as4nl5Ym4wnnefLrUR7iQ8C7RPjARSCVpB1WSjqanHKLpZ?= =?us-ascii?Q?aCgZHVuoAhbaxYeoqcRSn5TR7ANBdQkk90fC4rTAPgFqDO7eU1OsjmFoxyuF?= =?us-ascii?Q?W9SYEATltrZMmAOgF0OglJ/gf+nJfqazMicJg8JMa2i4sOZvEb42BAORUcV0?= =?us-ascii?Q?zu+TdDw7hHDsMm/X4ag2tkN/S1f9NKxJSewCXGx2Mw4i8eRTQ2d1REN8KcsF?= =?us-ascii?Q?9BOjBMSvjzWeAZ4EEViB+1gt3rvIMJmiojR+R1ZRRmQEF+jNQQN9sF+fyOe/?= =?us-ascii?Q?TEJKI9JEPhOlHYoKsTxlGJQ0psJVRh0zW60K4m6bpjRuvzLiL6awdCefOMW+?= =?us-ascii?Q?Nx7n1jrYvlDI4U1CaQJExk3KFmDzcv7Hy5XfnIh6XOW40jPFe2P9zf3Kwp+l?= =?us-ascii?Q?cLAQS8ONWqw8LzKGG6+bH9llGFqc/anvDFdQjqog1R6HTYqmQo51WfhhGltn?= =?us-ascii?Q?je3IaE8uGCcDaSYytpCJ/6xbrYEPyRVSO7ODu0UZiBUGnZRapPaykzF4v4NQ?= =?us-ascii?Q?81YoCzi/b4STe2w36A2uMgw=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3ee31f2-c5dc-4fc4-c078-08d9ebb8fbb9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 10:43:18.0181 (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: qB5V8Zq1NwxpsCH1mVWGqEtaY/T4d/KI4fuENVIKafrRd7wHHdK68EcSrBIUEkZhe7PNW4gd2MVHwBqQQ6YNJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6997 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 Sat Apr 27 06:48:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1918488jam; Wed, 9 Feb 2022 02:43:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwNpbrmKnbyg6FdJi4CEFxbEuQT4DpJGhm5UVd1jimzdpWC9t3wL55HNXSTz7WKtSJtbsUe X-Received: by 2002:a17:90a:4481:: with SMTP id t1mr1837677pjg.230.1644403424554; Wed, 09 Feb 2022 02:43:44 -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 b24si2231074pji.13.2022.02.09.02.43.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 02:43:44 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3573-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=igGiDLvn; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3573-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3573-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 2C8AA3E0FDC for ; Wed, 9 Feb 2022 10:43:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4F8BC2C9D; Wed, 9 Feb 2022 10:43:43 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C42D32C9C for ; Wed, 9 Feb 2022 10:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644403420; 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=igGiDLvnO++7MlK0IyITGt2AAdA55AX5QBEWofmtHiK36pKiKYqHPFyM2+Zd4ZAiKybj/J 0s40h2j4okvXlsSnzbLUZHCR6qVGJcmQr6rahffZjy/OSqaYJ9xmOEf1zANMEt57XgO93y MO+TSNBaLetLUcPm6VULk4+WSE84D5I= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2111.outbound.protection.outlook.com [104.47.18.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-19-tzQAI4oGNE-Zm5vfgg3frg-1; Wed, 09 Feb 2022 11:43:39 +0100 X-MC-Unique: tzQAI4oGNE-Zm5vfgg3frg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VQBsxW62mhobMgBO70/pftLBN/pb4KKKGqxFI7rZpZ3G+jIGcDunuSGR9UHv6cbKQrWTlG5+G5QgjyV9KPiS8a06GgFj1qWnNjmjVwYZD1sksp6zDZT6KvqCA1IDF2cP4UUku+V47miQ3wdpYm/r8lYuZe/MNlWclc19SvyW1S1oqh0M86f0TuXj2xS+8cSA8MnL+95/19PeLXbraxTxx/RrD+cVIuog/nenCn6fYvIPxwhK657svwxeI8BY6Y8Lx8aSHQXyR61Tm5/fmCwza212wZWG04Du8qwvS/Se1HBYtlmzmdx297Zs0KBA0I08Q89fg4FCaVQPVsWN871kEA== 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=TYUyOsBw37eQE/aHkxPA7inyR1ZUBIlA1plA2qo1qvpP/SfV8Y7vMU8/bG9kVYN5mJjKFMWko+HIZnvwX1BA3saXLtPVYkAoHZIeV8A98+Xyt9Rj3IdSAQRy3Ll9oE6ZITkGUFxLkKdaBMEvkVN9TKjNt0C7XuUzoiV5U6pC3Ex8z2HgQ0g/gveYaZwO9U4Y/BOsb4oH/L6Jl9/N6lRpPdM6ltrxZA7qLhcP5P4Nk1BYItUMo3+GT5FmxUsUywAGj7z0U9PqHsvfxgw1lJjV5pqEK3s6V+i0/DwsK2ORNW34x5HfvBr8wpft81F3Ytetsakq6h26UlZdut8oJG/v1g== 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 AM7PR04MB6997.eurprd04.prod.outlook.com (2603:10a6:20b:10d::11) 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 10:43:38 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Wed, 9 Feb 2022 10:43:38 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 4/5] selftests: mptcp: add MP_RST mibs check Date: Wed, 9 Feb 2022 18:43:12 +0800 Message-ID: <02b525e9e44709015b2331008afe169aec7add96.1644402973.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR04CA0070.eurprd04.prod.outlook.com (2603:10a6:20b:313::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: 2d54c186-8d30-4517-ef59-08d9ebb907f3 X-MS-TrafficTypeDiagnostic: AM7PR04MB6997: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: QLhLAU9p6+kk35r43MhsyG2o1X0x2iX5p/NfgvvJVDPeXEoNgIlbNMN+z5n1Pc/9XaNuO/0ydC6EducWJAqjh1vtBLPG4lNspcMmEvoow4pryb6ikyTr3w+eTPJMcgdvp9sQr4+54BdvmHxZIXXDeoyS/Fo28UKxrKqdi9WawxuPaYvQzIk0lZSbe3+oryCdF7wZaa9z+0iVC9oFEMENr8C6UsD+hpxGXxMWdwREYSVXsEoCkuWyoxeLAVafSo7JAL9PHJmYMEeDx6DZZeFEER56KhJzi6/7kHcnfPutOpw6UpB0N0J7KJIoXxtmA7rDktf/ZpA4cxPUzq79NPPYdv9fprlph97KZQo0lzQxR/TsuGUl7NhtcvvlRjuh0Y1xr16c3e4SOKWDrYXUB2EEY3lRlfru+kUMyd5i43rjI2D2EJ4l/1ODKFHiK02zMZiVq6XQCWNd18dd3iSO5o4ZQmYlmT3Pys/v4aIvIG4o4g/Yf79ursEIuvAx+I/vgRCovqxC2N7ZlyWcGgak2SzKLRDOOj+5tzIROaH+84jYoMLALb46f3maO9tuHUk3QPEiCVrOa1Fni1iRS6eBN2bm0oZVt83f6ygt2D7gGPv5dfpYukFvzRiDC2KF1LxZUJaw7n7q3lbACVmEqOYIhAOmqQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(316002)(6666004)(44832011)(38100700002)(26005)(107886003)(6916009)(2616005)(6506007)(2906002)(5660300002)(508600001)(66946007)(36756003)(66556008)(6512007)(66476007)(4326008)(8676002)(55236004)(186003)(8936002)(6486002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aaHEH46IYcJGPYmU0xULqvDfcIIzTTyXX3rkMpyLoURskK51kVHN9YVhzgTK?= =?us-ascii?Q?i5qEtLin10Shm6WJUC8/usD8nIVKPQAOS1s5q27nDfh5OVKD8g+aYucpTwK+?= =?us-ascii?Q?HVc3NWgfn2BAyNZ51zTEyJHWDmEXx3vgjS0PqAYnOF0JarhDuJlhUMiy5Uv6?= =?us-ascii?Q?+emCWdfPeYnAI0i/X0gCUHWNAKI31GFvsktrpLtv5ykEosHX+TMBuDb+WFZG?= =?us-ascii?Q?4ihBAJzXoalNHsWtdYo8teHEsLGHPvzUXOVSmBlix25+BbJWOw1fz/4FtI5N?= =?us-ascii?Q?tPwZ0NAAnzo5l5BQuUP/dkA93cjB5P73ihYeVLRMeomKbIrY6b20+EEeY9VM?= =?us-ascii?Q?Sf/kg+29oTDPiP32Umza06owaWtdbXPsOfmYmFgABarlft7VS6sWgCUFxxdF?= =?us-ascii?Q?gf3PmtFIB8sPNoDusfEEKDT3kLste7/3TIcoPMCiOePfP61rcSSewYcD5KxX?= =?us-ascii?Q?G5y9HRmxwtZ5EPYDK9cxDbvQgnkPPQSI1XCmcpqlLwYKsdAtwUOuARL5zzCT?= =?us-ascii?Q?u0Rgrf1r8Mx+rKQGBKkOYhMuxviLilCsnaP5+mZI2+9PDbqSvg9mpFnoD6ZK?= =?us-ascii?Q?8UJh6nZ3Tmc8zFBIASsalHomqCKYKm6G5KtvLgpFuxWr/hJboApzI4Enq4it?= =?us-ascii?Q?fnPV183QL/Hzc+Pn9zRRNB9LPdODgSJR5hs+cM3qn7T5vGVD5EGy3MYS2JMM?= =?us-ascii?Q?nYM7IpOkU7PMr4CV9jz06WztQ1IqJmqPtkfoDOYoCS4xmVk6OsbfeID1avHa?= =?us-ascii?Q?i6UXu1ecK0pQtMcGqWZV6aaYl0pWtTpl0R10ob1CO0z3uEByeulvFSM1tITM?= =?us-ascii?Q?dsxNUj7Qu/9iuzlSbaS6nJW6yjW8dKoMcj+P2iKw/fEym0wbPjFMfyZRqHG3?= =?us-ascii?Q?wVjtwu8pj2LerPHPBmhK8c43QpowrqVMd9Wv8ZX0ajs/4NSHSOSF59Yh4F40?= =?us-ascii?Q?Ou3i2Di+seQzPt+Mt0Dq/0bNpSrXuHkPaBu1UHnUtoTDZoB72jRZYZDKN+wm?= =?us-ascii?Q?ZgZND+q6WU/v9ihwf+e/a2m2BLRvhJg5t35HyWt8nkSE2Eoko2bufrOXIcu4?= =?us-ascii?Q?Q44mGIdBtCSWDAMApqBjEakXZMYE0yHuSpAmr43rfQThDuOpi+kO5RsV+WF4?= =?us-ascii?Q?sQgyeF857eu/6GVRkMhlqSO6HSIRrV7ECJdUO7dpimAvGhvjnvh6txmkys5M?= =?us-ascii?Q?8o7N7FniOi/1cUYYvf4rSEMBCeRym2FdfW2hVtUjA64CKXcWLtcgCpmpKOPz?= =?us-ascii?Q?EjocK5Et7y8l4BVaPlFMRiXhUU8GWz4xRspWNIWMe7qHsZCxiUil56XtZtWJ?= =?us-ascii?Q?Tr5dqdFFBzxU1gy9ivfNkHjXQcRbPeWZ11FGYabNF5u5KbKu2GFDExs5+zc+?= =?us-ascii?Q?b/goRr2hsomu/X0f6E0QQYZkisy4N/tXNGPPmfkkUSYV48V6hyXfHapUO4vn?= =?us-ascii?Q?oARqM0vJFUno/cEQJ6cXa584ZU5UyAX8eLmv9vGrBUiKd06yvom4uFYEP6zb?= =?us-ascii?Q?5jYGqWKzYJPFfZh9D8tVOEntRpLWzNZdAhwK6K6bW/AmBiPD5GXglufjM6Mp?= =?us-ascii?Q?jnesEz7DTOOTKn8Nbv/XBtF049l9ol2eylllvOc4eCX2XxXvxV4bl7N7yjwN?= =?us-ascii?Q?DwXMbBbd37O63+InYb2v95A=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d54c186-8d30-4517-ef59-08d9ebb907f3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 10:43:38.5789 (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: UABvKL27PcE2zOSxKYoRfPJSulMKHGAcXnYG/OjjLmCa5NsI5rhI4dPR3ie429ujTdSmEGZnfPTSzvUNrHAdhA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6997 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 Sat Apr 27 06:48:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1918597jam; Wed, 9 Feb 2022 02:43:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJziU+ITYE/HsgLe0LNf3vnEGL6Ka72mKTa5yj4cKnpWYEMkiXxSr9M0gxLGRKKdnewqFEZr X-Received: by 2002:a05:6a00:b83:: with SMTP id g3mr1588752pfj.58.1644403433018; Wed, 09 Feb 2022 02:43:53 -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 j8si3498412plh.553.2022.02.09.02.43.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 02:43:53 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3574-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=KdW65Zgh; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3574-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3574-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 8D5843E0FFD for ; Wed, 9 Feb 2022 10:43:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9841F2C9D; Wed, 9 Feb 2022 10:43:51 +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 EAEA12C9C for ; Wed, 9 Feb 2022 10:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644403428; 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=QU3VaUyclKaS01pX0/3fH5AYCV0dKc1+aN82+DkVGr0=; b=KdW65ZghUbRtGBo1/Gbd8ommgcTiJI5vJ6PHzPc66IZsXB6KwYSEw1p9938eE4clYJofVU vgHmRgTjL0qvYWboOdQQy1fQz3cefMgyyYx/MJH2JzGZ2SBbhQrvLNmXWzK9eoAZHs3aTt 2MpqK494v1qZy7OqjTRjZ1yEMqbQ7o0= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2177.outbound.protection.outlook.com [104.47.17.177]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-x2orhLW-MYSgZpLZS8mV2Q-1; Wed, 09 Feb 2022 11:43:47 +0100 X-MC-Unique: x2orhLW-MYSgZpLZS8mV2Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rtqueo0auNE77eXsP7ON1GrSIhiTOPTZ+ETlALjpobQNUT/+OdZdbl2iWGN3Zx35EF22n4Vz/h9Q7dK3E/w1z2qWZXR5Y4J+H5vCl93p3x6A8DrkGKKbkflntIrbrxwJSjb0jnR7zxxEPtS+6kupc5ygS+QtqwnVpDn4S4TZnSbw30GrDhppiTaVcFqXQ009d9jFhpS8ocnkpuNCxmVHSHovZPybiXrsjVjWSu3UKj5HJysGViuzNb3AMKIYwIUdQG38lniHWzgI0/DbPoVKvrED9DO8msv4JW1O3RWACgMCCBpYXdalEAltvu8D9ROBtQ2wSODN/opdvwqFqRLruQ== 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=oJz7VZQLwIqNEpar7GIKTE0t0IyIy/Uvdn5hlzmZp1Y=; b=EyeEUBEalWk4kYjtOIv5h830AKcV8hovvF6wakt+U9zgQgqbunLvS2XCsNddfb+gCIoN7JtmRVmunAWTp/E8pqIEO9QJ4RnNf39za2mhlIy9cN2t9QFJJLAXxv0f4mrZcZTxJmOIVU9qRXpgkOhSD62tNelS/JYAIN0hRQZsfhAvi7stBFvOudE0c79qMxQk0wlY1ImRJs/x5rMJlcojK6Mser7blMuA4twIDZ5t7Ns/hKj+q2TSujspq6fOygXQqblElrCRitGvhi65H9cW65jw3UgkeaJKLfRQiXA/2sz+68y1Kq03epwOf3RwaNMjwYwPZ55eDx5kh8VAi5CCLg== 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 AM7PR04MB6997.eurprd04.prod.outlook.com (2603:10a6:20b:10d::11) 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 10:43:45 +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 10:43:45 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Davide Caratti , Matthieu Baerts Subject: [PATCH mptcp-next v5 5/5] selftests: mptcp: add mp_fail testcases Date: Wed, 9 Feb 2022 18:43:13 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0043.apcprd03.prod.outlook.com (2603:1096:202:17::13) 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: 1885a671-b451-46c9-8223-08d9ebb90c0a X-MS-TrafficTypeDiagnostic: AM7PR04MB6997: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: wjsRc62ZH2ec6x5FU1W3e2Xx5UrFuqPsRz2he9eTwF2id3CxxYZ3BijU6So400nibR9lqpQHghIMpnkF+fYpB+EdQa53oYn6S6jWZ/WQx6jcmnYHgVfZpZKwcNJ8STBcUCwcmBF09Dh0vbE5vf3UP1zJDkk+TWI86M47t+y16N5tbDK3KcXEFsbooOG9KVFPQoU67R32bNlGM7GM+VMPWLdL/2TD5nemoaLem+TPxeIKz+qljE0k4qLYa2WZeBtvrwpl9T3TNCDvipUtMcSvRqLxIzh7YXeFeEM3NIs9MDwcYt4zMentmt3dasj4gIbt32a3QEhjIUTXVGnWcE8g+k3BJH84vipKzkVMVu6fLdIK7verhFt/JFmjREpWrlKJBaJbBu2Yc8/AgnYkTpfNCd02FGM8a0zNHm+ePoxI3CFNDxIioSbxuZkQy/DLr0pHOlIZsmua1Kj4Gq5+IfkQW9L0i/ZSlrwaRVOQxFLfOPj4dq/pGW/uBOtO3gFHrfGLZZQczneg6zjKRJJUXoNVdyXlrUfC3XFCbnXlurUXtJuqrsRyGT6tFraDG4r4xejChfNHhDimiHs1xpz6j7q1AHJZB0JptupNFf12pRRFQbNb5ZvZ+xZvhcUvaiGX2v6AAsIZIxJzGFVcUVpnwCdKcQ== 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)(83380400001)(316002)(6666004)(44832011)(38100700002)(26005)(54906003)(6916009)(2616005)(6506007)(2906002)(5660300002)(508600001)(66574015)(66946007)(36756003)(66556008)(6512007)(66476007)(4326008)(8676002)(55236004)(186003)(8936002)(6486002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lumFPOecWmRF6X32/7vJyJV0fCV/s6JUnoXes6nUsQxYcJEg2vbpj5/jTHYL?= =?us-ascii?Q?Xs6b5ou70qguzmCcVjU9udtUZQI4dj2ylS4YWA0XbiOfQbq4jhTD0Uolva/R?= =?us-ascii?Q?HMVhr+T/VkLNlLTk0fO1N45xRLSWPgvqzP7m14/jfgcvQrqdpuZceq2nDR1I?= =?us-ascii?Q?qcQg+1n32yk6D0FDpZFuvxvYYswIZ5XWWtJs1FK8EuOsqYH0tNh0/C2gvDan?= =?us-ascii?Q?m23y8A2lun1V/4mHTSMoLyx5RRijNzok6EeHhRNnc+O62R7AFoxpy4PxS79j?= =?us-ascii?Q?Dk+BRGJYeQnNGhaDt4n0abdWCMMKVHW4ek5KbcOkiwqq2DwrFOgFmQ4fMASr?= =?us-ascii?Q?g8jQQGCaKgucufsCxSNfCgKO1erC53VwsSFX4UPdOCCAe9xv7wXW+bXlqQD5?= =?us-ascii?Q?7o3/DWuW4zNPNlaEe1GqN1xo2y2Zj/O/nS0y1Aj0HKBBwe9k6Vy72RqLsFvx?= =?us-ascii?Q?vfUJQQwSC3Vecszra8ZlysUH133an5SC9/1hGCY7EH0/ma8L6hGVOmsr7tPa?= =?us-ascii?Q?t6ySsSe/28tuCqNWN+31CoglEb3F0ApuOaZHkJoWgy9/WeBq0FmaaDdpk539?= =?us-ascii?Q?j3zGY7z3E8gtCF9JEanU+DRQ5yR3ldTOUp2tbmGgE35PRHowVDtvmjdHF3E4?= =?us-ascii?Q?2SVQkH9OlL6IgnHOmykuIvLJtqtxLrxhl2Bf8nfgdEEFVpygrB+vF4tO8fx7?= =?us-ascii?Q?g+cv8eKg65AMlI+G6vTaclD3A5GRiMo62jEnTvZMqY26cjR5sJZGhJPXAWWX?= =?us-ascii?Q?hNxhRwUo+D+c+W80FFIvpzmU89PQZ3qj2EYkWMui8kOzdMHtdcJ0pD6XYYyM?= =?us-ascii?Q?revv2rwKg0Tjp6969hDcaSCW5mt4OE/Omb5dAAZ7yagbk4CWxvQ5lOxA4Q+a?= =?us-ascii?Q?q1aZNH+1TDUwgg0r8aWSqxOo1XmQfT/Jc3ehkJVlRrvnofm8pgkaGhErMkeV?= =?us-ascii?Q?w57qJVxf7HtvVpV5nIVqm3IJvzQjolxWCSU9l5SuPk74AQ8xi1SDZUEduSEl?= =?us-ascii?Q?68sUc+NaOGtyCbVo5msAJ30SAB/H8ZtZ1jXpyYCBJ/kHx2LEXEqZ5tK/ncEj?= =?us-ascii?Q?p5X1eJYNY5oAh7ygyqZJFub8zc6obzZZtDKrWkpsEfjdr5evuSWJayzJ4q8L?= =?us-ascii?Q?mOsZdQomJdcleTBizrkpaiJoOAkbHVpnw6EcNyIhVSUerSKLKf/Jrk2e830j?= =?us-ascii?Q?hskbxPu0xtKqQd8lCoZiEB1AHzTAPc+lcDii+YE/suc5r8otObK9mgJmCnr/?= =?us-ascii?Q?tfAskdjKmFKFFVmfuCnTOZLH1Bk/y2cP0+txBLr6ckdDDO0DDzrLs0T774cf?= =?us-ascii?Q?pMQ+KDIIo2pQxDfQQJCsVLIh0PH2RVb3cpsSA+Cc3AzS0BFi6WnGXPmTCygb?= =?us-ascii?Q?/zZV7q2UOoMLdD2whWUGPBkD+PmUFyf6FM9mzw0iXLL3CzyVNfliKn+QEfnt?= =?us-ascii?Q?/WqKLuaCu6Uoiq7/f8OY8AlwMkfYeMeBoAaEmD/Zj+QVs4CMlUhSTI4tExy2?= =?us-ascii?Q?1zqc1glpB0Zi02k/zoyCZ0apkxhDH2Pf4GNgeZiyRq9XTaRlKjeLRVadML68?= =?us-ascii?Q?2I5WXdi5bH1Ek902ES3E7OtOVrOXCE12YvLzMiqFpiIlmt+DXOlNx2ld5aYz?= =?us-ascii?Q?FVgTXnmPslG4royywBY+etc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1885a671-b451-46c9-8223-08d9ebb90c0a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 10:43:45.6096 (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: mOcVgN6PU8qnRBgJBMa0binDSR5o8Gde/hUfO8wCPRY/cBcwiGg4yQkJlrzeHFSkqjLsfx/doRYOV55d4Y1gDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6997 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 1024KB 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 function pedit_action_pkts() to get the numbers of the packets edited by the tc pedit action. Added a new global variable validate_checksum to enable checksums for the MP_FAIL tests without passing the '-C' argument. Also added the tests needed kernel configures in the config file. Suggested-by: Davide Caratti Co-developed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/config | 8 + .../testing/selftests/net/mptcp/mptcp_join.sh | 147 +++++++++++++++--- 2 files changed, 133 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..9f5c9afc26d2 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" @@ -245,6 +299,12 @@ link_failure() done } =20 +pedit_action_pkts() +{ + tc -n $ns2 -j -s action show action pedit index 100 | \ + sed 's/.*"packets":\([0-9]\+\),.*/\1/' +} + # $1: IP address is_v6() { @@ -446,7 +506,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 +526,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 +698,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 +747,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" 1024 + 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 +765,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" 1024 + elif [ "$test_linkfail" -eq 2 -a -z "$sinfail" ]; then size=3D$((RANDOM%16)) size=3D$((size+1)) size=3D$((size*2048)) @@ -719,6 +795,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 +808,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 +818,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 +830,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 +930,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 +969,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 +2278,23 @@ 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 + 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 3 + chk_join_nr "Infinite map: $(pedit_action_pkts) corrupted pkts" 0 0 0 1 0= 1 +} + all_tests() { subflows_tests @@ -2215,6 +2313,7 @@ all_tests() deny_join_id0_tests fullmesh_tests userspace_tests + fail_tests } =20 usage() @@ -2236,6 +2335,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 +2375,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 +2425,9 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do u) userspace_tests ;; + F) + fail_tests + ;; c) ;; C) --=20 2.34.1