From nobody Sun May 5 01:39:43 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4336639jam; Fri, 11 Feb 2022 14:45:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyIQEPeq5l4k0kLbK2bQ9/6I2SPIyFWfAYAmxWDu5PTwqeF6LiCr7K0414QGxSEDdghzaZ X-Received: by 2002:a17:902:f707:: with SMTP id h7mr3732661plo.96.1644619539793; Fri, 11 Feb 2022 14:45:39 -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 s18si5407790pls.455.2022.02.11.14.45.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 14:45:39 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3678-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="MZUw/3BC"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3678-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3678-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 367953E1066 for ; Fri, 11 Feb 2022 22:45:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D2E519D; Fri, 11 Feb 2022 22:45: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 C440B7F for ; Fri, 11 Feb 2022 22:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644619535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vkm/F8kIugYthlQHewxQiNOaKyKuHxn4X5zwChelN0E=; b=MZUw/3BC6VK0WpM2TiBQBLUnrGEZyxnte6sM9o6DO9Ckyi356f58vpWepEO/jfALRdFXhW VSshm6SR3RwdSXuSLWFoxc5bX6Wf1BjODTp8IQ0yjwpmwoo7AJBg46FpC4PPEvahJkO/5n 05TE2CU8u/srLCb9dt3BVcCNeJNAuBE= 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-31-DPiDlXrdPxedCwMi12FX4Q-2; Fri, 11 Feb 2022 23:45:33 +0100 X-MC-Unique: DPiDlXrdPxedCwMi12FX4Q-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nyB5sXhJnn6i2bG2yxeJNKdesb8pLm0znS6kyocmbGMZ6mpbFevr+Md6QyGgAD4pb/+qNkFbLeQaW4YWm+OdCOfNxw6tlKlQyW1clRDNs39Sw89nkpSqnQeKSESTbn8zfF2sarHzfdAnOkkCcCH8owWXar2XjVbP5u+fUvRTSYKwuW5H/varBaO+CBPZUwrw6DWuea/gayUYjY/Y3/u2ccIuP+TP2XTWPGR2UOsaZt2wtJexynOJJq+su/X45nOD2Ie17t6f6cqzhq5K2QpR8HI2vr61C6weX8doGFVVWK7ukxFUq45J7JDZSqyji+LLRKrsoO/fookC9vDNIOdIaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OZn+rwqzm+9fVwHDDf4wVUfLJIm9Nt1u//1kz/sYbws=; b=SkLjfmbYh0hlil/NFxv0rHUBU69pC9EV6KinJ85KDDeOYBpNO73bBuYjTQbvh5aVbD4n45MbynqAdeQXqiJfBLybKiwsdvntEIozALhKTF74sIk7LdPecvxPHW5iMf0vKqY/Tp0fpwCsjGOJ6duMWkns7B8Vaet64OVyLg1zGxj4geK38vkDBRodLfszNBdRtPQHWG6+wOuWbceW+zLz7HZm38rOlagXDAauqMgHLJqb2Cez+DFHW1F4LMhfN5G7NdrOwGBrKLzCfixTzz8XPSIiudqo0/852zaxLAxAXcgDvf8v9hn/K3agSPLCxTpSvAwn874yQwS9HhXM0j84qA== 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 AM0PR04MB5652.eurprd04.prod.outlook.com (2603:10a6:208:12b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 22:45:32 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Fri, 11 Feb 2022 22:45:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v7 1/7] Squash to "mptcp: infinite mapping receiving" Date: Sat, 12 Feb 2022 06:45:37 +0800 Message-ID: <03aa9c661016c7b61cf84a421fd684a452ef0bca.1644618926.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 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: 22da9da8-af5b-42f7-e633-08d9edb03608 X-MS-TrafficTypeDiagnostic: AM0PR04MB5652: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: jP/uBc3qs+dU0bfftOsCBuoFtgiLayZR83u42x+Sjv7aka01uQ5Foy50GU/S+a09dL+IGI0rTl4Ux7C9vACOM3wY3p1t0CuyuCh72URcNr94iuDY35kjlMYf9Xme/6w2ix3+H0XOvGnK/JKafvlxNGXTKt6wrjjhoQrG9e56g8fct8Ii5Cw+1oP18wjW/e4tFLOE60Q0DGZfWNJB94OHRtwHtY2sPIvlqHFo5AlbzoEhG0/XSDjWI3iO9VyeumVT4p1n/VFpPm7LOSjgnku3Fv3AUTZeAaqU/A3Uc7/7yyOfnKZSSwdDLIp6O5PXVB4Nu5L8f8dZnhwx/JGfcVDZ5L+GIB/sk/46Yeu+4VvFv/J2tt3s7ewAdGW0fsqtW9XNaLT68g7VWf8wm4ZqnBDXYU6fxzcLw/qt/JMBG4kiMFm9nUTVNC1jN1kLIch3bR0WIWMC2tF8jqdOFvu2cgcZwr0bFZkz9Mr5gJTtAfRZt6CelRX6FH6kgyf487SJXWFovU3snfVA70eYNAs23BWI1PUW9q9Gb6/+cUhaZ0e7i1IFMVVCc87F/finbhKXRiK+79xI5JLiqrEkonB3Ec3FmfyBTChZ5MW5xy3wtaBpvQWx8I09+9dMkMoI0/VNCZ6jUqaIMiCQDlcDsMojs7wEpA== 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)(107886003)(6512007)(316002)(66556008)(66946007)(66476007)(86362001)(2616005)(38100700002)(4326008)(8676002)(36756003)(6486002)(4744005)(508600001)(6506007)(8936002)(44832011)(186003)(6916009)(5660300002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cn/VjkC3oF9zOMhF6ICWsWZdxSyAKOcQysMgJTsWvMaIrgXQuBdyz3ZheMh/?= =?us-ascii?Q?QzhD0i4Xsply6o/Ynq6vWDfXbUtWfaR9WAKoLiowvSVXVvpGwHp1T2Idbd8R?= =?us-ascii?Q?c1USRR1IhSx2rp+2G1bcHFpz/iMStFyfYyZFyg9+hMjd7A3sBvtI7zEbW5rG?= =?us-ascii?Q?0kJIywe4cs6PZ3fXBIHArDtDJzl2yiZ6M/oG7pBsdE3Zg2yxlTgXsgiSIeO+?= =?us-ascii?Q?mt6HrrsII9TkHTDIMeErtHzZgU4TNMPe0x71eS4D56D21auegPZ3z4YWXp2G?= =?us-ascii?Q?aGVX55Lkl4ceA3xowjRvudj2fREqtezqzsMGhAZmbBRPs72tuzKJvy6flsED?= =?us-ascii?Q?7lnjVbX8ExzjRXZjakp/D2yuf92pVbXOUvp9EII7Kwv1kkfYSV2WXa0aaltm?= =?us-ascii?Q?Wo7s4JadJxsnIhFFlmhmW+b3XnXS4dkINy494AlJ+vkbfACghoc8Rq4WrIvI?= =?us-ascii?Q?hw1MjH6iY3J+TueP5AO++Y2gCwCxTN0F1ZZfVyrI4mOpo0KheCJMmvPbzlw/?= =?us-ascii?Q?MmNBnZDTRJN15CrWJHgdKaRKi7EYtacq3ytkjKBLkd/M6N+fOVI+ZJogk/SD?= =?us-ascii?Q?dZ/LMFRg+rKFdyuPh1gqa/6SCuQjsvKvU807RxswtP1Hb99XAT1E28Ad+3SM?= =?us-ascii?Q?G4NX0egIWqtKjN+bZFRUNCTDbPB6AZVmmAqu+OVeduEQ1ORwOre/SnxDfvUW?= =?us-ascii?Q?TuLRx3mLIPxq/IxaDZ+ZZ+7SACbLJJnw6R3CftvQQlwpRgPqruWf+ZI4xON/?= =?us-ascii?Q?qInl+MlNL+t/UBaY/Eq+be8SD0vIB+S4RRn7lxKhBSHOpK+oInznmHUuUT2z?= =?us-ascii?Q?6d/JcbyhG6MSjDhV8zsDHFsmZEuZCeUDyvNFx0CTIFONAlN2p6M7wP83CZDG?= =?us-ascii?Q?kBvPFJsa7d8us/fphol2i6WVuANjcsYBkjpI5x9HWSYBPjLSzbhEcRCmmGxh?= =?us-ascii?Q?4jJRwN2IDM4dbiN8Xdzs6PjYVVBLHDIXPuCu6H1KkhmIU4b/45tS9br4pt5v?= =?us-ascii?Q?1Bj89zgx9Nvk/XJlx86cA4wArY9oSAjiKDsCFVteAaxtJk73/HAvLvK936xv?= =?us-ascii?Q?KZkC3VhoEQb8xzGXvuff9cXtONXwZ9ljkD7CAqwTejLMyX4hbjqNDrAZEIV2?= =?us-ascii?Q?jmfrgZqr9YH9SmkuxU+X9LjZeU5tNM+tXKVDx4UPhKsBLiuuXvWt1Qz0ousV?= =?us-ascii?Q?s1OhkbcCLlk3NA/woE/Tw2IIX2E1wZC2bcAbR04offdsyXCo13B3oW1UoVhs?= =?us-ascii?Q?lUf1mKAbEsvb63HC1T9yljufPUUO6BDEhbn8WujDZspWPpe4tcfFIE6njHHc?= =?us-ascii?Q?edcEz4lEPoyHx44V1H2Nxfk+F2C5juCBdJb8KWldqfPPgBcPBAWmFj0vBYv7?= =?us-ascii?Q?6W+Ckj/+aB6KLtw32gSr6SOk90ANbSZwZj2LcRjVwTxIzgj+DJAHhI+CvpPa?= =?us-ascii?Q?akYPZY1Ad5loD04DHkpgMZrsKseeqYOKf67gzYEvn8u+fCua3zu87ic/bt7p?= =?us-ascii?Q?joFhAcn0EN9XC8mUbDsty4J1wqKaHSOjeWAZnC/mSH9HDEFH1i3+Xu0wX341?= =?us-ascii?Q?k9tZlYT2uOYfB2rXRzC5ghNoWWFMvsKgMh3jUe4qxuF5ALH4x/ohMqcrwkOk?= =?us-ascii?Q?uAz90Lwo7idkNdHcBm/J2P+AY/euX8UK9q6IQOEF0L439S3boiX+1RuH4Qgj?= =?us-ascii?Q?Ppc9nO7OOVk8iIbdcZEnvZi9Gto=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22da9da8-af5b-42f7-e633-08d9edb03608 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 22:45:32.7307 (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: WgEedfOK5coIQy0Ohwko02JezZ/sU5+a0WfphnisMU8n/0qVWQF3tZrmr/ttBPktzX5B77Gx8DofWHwlM/reuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5652 Content-Type: text/plain; charset="utf-8" Print out the infinite map received info. Signed-off-by: Geliang Tang --- net/mptcp/subflow.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index b53b392dd280..250ec414df92 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -961,6 +961,7 @@ static enum mapping_status get_mapping_status(struct so= ck *ssk, =20 data_len =3D mpext->data_len; if (data_len =3D=3D 0) { + pr_debug("infinite mapping received"); MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPRX); subflow->map_data_len =3D 0; return MAPPING_INVALID; --=20 2.34.1 From nobody Sun May 5 01:39:43 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4336684jam; Fri, 11 Feb 2022 14:45:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxV0BlRbioZsuWk7f3d7Qe/X8z7jXdvM1SUm385Fwphp78/l6nhTKdEDIAYNmmhql2p5CGI X-Received: by 2002:ad4:5b8c:: with SMTP id 12mr2707521qvp.99.1644619545659; Fri, 11 Feb 2022 14:45:45 -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 c12si4758249qkl.243.2022.02.11.14.45.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 14:45:45 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3679-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=LoxwEtwX; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3679-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3679-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 5CC251C0F14 for ; Fri, 11 Feb 2022 22:45:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2C34319D; Fri, 11 Feb 2022 22:45:44 +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 DEE5D7F for ; Fri, 11 Feb 2022 22:45:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644619541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rcE04E/Kumip33cbkuKqno/Essi+LYAVbRQAhfFnzq0=; b=LoxwEtwX9Q6QQMsH4JmQwJnjrJseZt3cb6WEfSyE29gCD7OTfnZFgNXgBt3Dw3mizL4HXG 4XHAsy3zO0kBBw4oPHTkyrY6yX0jqCGmT+CJ/2JP1Od/r04+G8R7ymvQ8n6KQa6iiCtCQl PWKqJ+Sx9DZKHX95JIbL7M3iTmHSmJQ= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2106.outbound.protection.outlook.com [104.47.18.106]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-8-LNaQkOH_M5aNOkRb0ZS1lg-1; Fri, 11 Feb 2022 23:45:40 +0100 X-MC-Unique: LNaQkOH_M5aNOkRb0ZS1lg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LnpyAq7t62yId6cDETT/gUJ+H4gLhalrU16gawNg5P6okfAbQ1mzeXG7Zr4b0F1vEX+F65xypowuq5XTEiil+HJRe0KB0TrU4T7jhRKDJsB9aGtwMDM8miVncZCB/YXGLTFg7QYVqIfMYJP0CpJZDkbOe1CKRvZkj8e7iduB6dvtULScTJh1Lg3/uoPtu2749fswkLYy3W0rnK5GkIYrIN3jo6qR/VAMoudqe9KpDymoEmPetjDfdb9XAtGP0L5xteJaI+z5EUGHbrVZ8X0uumuJpnESAuZnSVBNBnPespkSONJrQUTYZAPWnsj9LkfmtY/e05npQkNIwRDacqW9Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KGXB4Wk/EDNVmwBPVM6B8P+e1MIhJLamoTbyF8EpBqE=; b=Q6FeO5wPXUow3AciY4529U+0774TbonlOrQcnZVugPA7NAk/aH/WmZFHNXgJuG292tVJssqXM/GAbGzVAcBXYiCjJwADV5JSj3oyFl7G+MeUVmJyefpifMyTEjUZcC7PuTCq5ZSbij+4PyrBlx+nVyG5uBryblNo0QP3AVVMHYn+VKzH2AJDmbQk8SmNwkZCp3I0KqPBWqfhCS+Wi4MHzHQ1a8GbAUHAQkLerjN33kqFMDj2T0iuM4cda78G1dRC2+y4jl12o0ot/uKaUMuZrZR4X0a8Em6tXj3cP95dtrBLeFCODWshU9RBJyJxiqfY6FinUhDeMHxVAeAOQLpAMg== 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 AM0PR04MB5652.eurprd04.prod.outlook.com (2603:10a6:208:12b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 22:45:39 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Fri, 11 Feb 2022 22:45:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v7 2/7] Squash to "selftests: mptcp: add infinite map mibs check" Date: Sat, 12 Feb 2022 06:45:38 +0800 Message-ID: <075df2856987fb4e276cf4308f2cd2b2df032c98.1644618926.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0052.apcprd04.prod.outlook.com (2603:1096:202:14::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94d30ff6-ab6b-4819-5486-08d9edb03a0c X-MS-TrafficTypeDiagnostic: AM0PR04MB5652: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: OdlpDhFLZXcdZBr/Ih04rBfjssaecT5amotPaJeo/m/5kBNzst2uZ/atKYAZnLhBiBLvgZaBSIIYF2CXGDzrIkZD06e5XBWF8TXF67lvP1/fMB+Ikht1ia/WAFq0G1vbcK+BckCT1I1v4leCwpLHFcsSDG8dqQNTDhaE7CjiF70f67CxR3H2HMDBfsCQaze3LBritvj+NrZP01Pua7Mp5AcD5t5rctWjKvbhBPXCMGukQ6M7CNm6SDMMX4hovAqbvTYjzBbz3pXqdWtsQ4RrpnDrOn6o0a89CiUOD+e2PyBnifvxFS2OxWAvcDzJ0dcpmWj4BXokIxvpMpLHLcjVXTtp3QKASEaQhXPqcWpKpu4OJyl1324XRWqXjj596t8ul2XYtfiMPZ/6ZONETR/l4NDFGPcCBpSMPlwQT8JZa1XSAGWBvie9oHBYfy/TdzV9Iaorul4iDCV1DLS6a3vbMTdUyaW2j0Hz1+KPH9akHWtw7Aak6/KCLnxPGeH3abmrH0VptxUWgT4eVNx8Uen6fBjQoKez36T+sDgkfxtXz+wjL51xE/eX46o5V/1fxN3bXnSwrI0XOlT52pDRJonS3xFoqKt3pc45W7n0r2COpjlyiOfWaf0V9aiieJlHqJUjvdpfyreNY2JOKnh3QCZM+w== 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)(107886003)(6512007)(316002)(66556008)(66946007)(66476007)(86362001)(2616005)(38100700002)(4326008)(8676002)(36756003)(6486002)(508600001)(6506007)(8936002)(44832011)(186003)(6916009)(83380400001)(5660300002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9xqWZGgZO80fhTOyGdadeXpqfqLfD18OsIrRJYEdyERUlHc22FF3ZUtWc0q2?= =?us-ascii?Q?JOREUUVFGXN3zuOspypsn6CQSUd6QAmYqHJucaBmmp2rtcESANa6KDIMsFmr?= =?us-ascii?Q?Bw0FBgQl4DQdyXcVASvxq7xmCCfZ84RFTnnYpU2MQu6EtX5q/rwMG+JSZL1l?= =?us-ascii?Q?BJd1liiQ9KsDRqyVOEgFSFCpy6+2Rp1PutLruhS+DRTG4ibjkQ90JrnJX9UC?= =?us-ascii?Q?J2Qam59qkDVQepa0HD7ZzYE2jryDIQmtZSXrUwgHZS2pTnjs7iVrxdxrz++o?= =?us-ascii?Q?O4L1vbQEcG8ASCXYAdA1lyvzfLl9yjyIF0uJDowlDy6GwBF6pg/LhDn5BKMS?= =?us-ascii?Q?PUdji3ryIXhDOoAsE7bjp0fbDn3rgQkFDB4LxOR8D/liOQMe8Ryvr7m3g13R?= =?us-ascii?Q?8vtXhP3jN3ZG214TJRlTzC25OBtOGRRJ6F8wAKfS1yfEtAt+JpPuM6ZmufNp?= =?us-ascii?Q?//zucuq3A98QQaXnYH03AUteywgOIxUBCfZGEG1868CBBqt8rJ7m4txYHnTn?= =?us-ascii?Q?vij26+i7l2MrCFyYmsbi4P3Sw1ALwv72PJmasFeO1h7JBaSDuQKKMS0Cd82Y?= =?us-ascii?Q?6tTPZRe6BN0KjL3+25oTP7K+IHY/pAmsZjYHU7nRpv4wSHZ1LmPtaAum7MIA?= =?us-ascii?Q?9CVXjBV1zMMNKOo+LX7PWDAp1V6S2DI6f4XaGWNB5vr5IYyoczS9fz2hpSsd?= =?us-ascii?Q?rNwx91Eh1dgefLKd0yxRF/Y8H7dBvOdPRgjk9V7YPjtHKzppssD42MGDTsG7?= =?us-ascii?Q?i86/s85a+xQIjRMKQXgWWpwdBFYVxZ7E87wWpBO6pugt7Y/RVHa0+hgsLd6w?= =?us-ascii?Q?V6/NODx4F4PTwy1PTNeo4EkA+AVZhvBs8B+n80G5JGHXA0Tu34Hokhg55OZJ?= =?us-ascii?Q?sja3YqDHqIQeVradY1jbEVIofryNTSQriFUjpKW5lCPpoZKzft+gxihxqVj2?= =?us-ascii?Q?eh8qwncLoOQJNRx8xhg++u3/cnGGGfCsIdFq0L3EIi+Nyp/ioXZ4HZt6vbNh?= =?us-ascii?Q?xyqy5DTPf8sQLfZ1lyt0TXraoA+0INyfSU/1I+LflpMAGq0yFYTsFbCfWsZ+?= =?us-ascii?Q?TfkKL/gFdAMNIVJsiY7zKmP/xYZ609c9eryAswiFoeyn4qKztdTaUMekRCAs?= =?us-ascii?Q?gDZowR2Eef0R5f0zGJY10ZbBNwdaMw47ewhRde0+burcnPoYa1vxaoicmnqP?= =?us-ascii?Q?EpfJT3TgR7/T/Nhtvctj+k5M81g6IkhofL4KJ0SOp4riWSTneQr2LNGUlNx6?= =?us-ascii?Q?A5wwlD7ScCBOs5ZeMvUhkwF8zZ2g8tD/Gqt+kauFbWtJxpEoYMm/DvSfTRz6?= =?us-ascii?Q?hdlA3uuQuCJZ1ejcFLr3LCORj/hF06ES18TH1SejY2pMvysAw6z51tDRfLLn?= =?us-ascii?Q?0pFBuHEAsdYruZBvQkc1rMNoFKBvbdJ3t7k3VnOLhDcOFtBQeIpDkTgoVDcl?= =?us-ascii?Q?C7aBjlAQHNiqnFUvAe7ekTH0ZlRNh3PoOTwpZL5Wwj9ZAveSmtS++z490v/P?= =?us-ascii?Q?uU1/FfqVY25VMMNEGT4JCY7GiZHdpWVpUC5uMkg+8AXFF9wSLdGIGu7FskOR?= =?us-ascii?Q?iNJqiXKPkd16/T5HU+zetLwVf2ICcF3nqfvqyM9hgHTS4A6Iwd2kXO8b3elY?= =?us-ascii?Q?6yhqT9numFweeHevF/6pvqgk01GeX6WE/HxHNoPg8Ptl60Ygu1c3L+cn9/TR?= =?us-ascii?Q?/2yNWsDbLWQ6GhRRfvRnWdaGo90=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94d30ff6-ab6b-4819-5486-08d9edb03a0c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 22:45:39.4643 (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: qKxhfU8YZVrqo4kj8yAe5RTsAmwitcj+GWlsl4V4Eb8tcq8LpyTg1j9TSyJTX3DjWRR5Wh8Rew33AQcMqzKVwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5652 Content-Type: text/plain; charset="utf-8" Rename mp_infi_nr_tx, mp_infi_nr_rx and irx. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 0b4bd2df2538..9b75569e423a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -784,27 +784,27 @@ chk_fail_nr() =20 chk_infi_nr() { - local mp_infi_nr_tx=3D$1 - local mp_infi_nr_rx=3D$2 + local infi_tx=3D$1 + local infi_rx=3D$2 local count local dump_stats =20 printf "%-${nr_blank}s %s" " " "itx" count=3D`ip netns exec $ns2 nstat -as | grep InfiniteMapTx | awk '{print = $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_infi_nr_tx" ]; then - echo "[fail] got $count infinite map[s] TX expected $mp_infi_nr_tx" + if [ "$count" !=3D "$infi_tx" ]; then + echo "[fail] got $count infinite map[s] TX expected $infi_tx" ret=3D1 dump_stats=3D1 else echo -n "[ ok ]" fi =20 - echo -n " - irx " + echo -n " - infirx" count=3D`ip netns exec $ns1 nstat -as | grep InfiniteMapRx | awk '{print = $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_infi_nr_rx" ]; then - echo "[fail] got $count infinite map[s] RX expected $mp_infi_nr_rx" + if [ "$count" !=3D "$infi_rx" ]; then + echo "[fail] got $count infinite map[s] RX expected $infi_rx" ret=3D1 dump_stats=3D1 else --=20 2.34.1 From nobody Sun May 5 01:39:43 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4336752jam; Fri, 11 Feb 2022 14:45:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJyx9AJhb8fcbZvFrmQZPZ3y677MhAC8aSAhcOw6608Du7h9CrSG/v8bAOd21zIld4dCr5+l X-Received: by 2002:a37:68d4:: with SMTP id d203mr1975193qkc.79.1644619552765; Fri, 11 Feb 2022 14:45:52 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id w17si3702328qko.338.2022.02.11.14.45.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 14:45:52 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3680-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=OaLQ14Lf; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3680-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3680-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 329CD1C043E for ; Fri, 11 Feb 2022 22:45:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3636619D; Fri, 11 Feb 2022 22:45: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 CC3A67F for ; Fri, 11 Feb 2022 22:45:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644619548; 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=142JlwDF984NLX9DaeW+ikTUExhbQpD3Yga5FNiy+3A=; b=OaLQ14Lfbwok7vmkOC5b465AYWe6kDZRSYQy7/AFGR3ivdZjJR69iDy23C0yjvZgPqHACC ki64PW8avrt2rze5ujES/dthMCtLfFAG9UBJOVgUn435udCW6aqKpmpf7Ok186hroGDYln BwMLP8cjKcXExiDFli3v1P6TPViJ9bs= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2108.outbound.protection.outlook.com [104.47.18.108]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-12-ptvzPH3XMjSW0ourmP95Ag-1; Fri, 11 Feb 2022 23:45:47 +0100 X-MC-Unique: ptvzPH3XMjSW0ourmP95Ag-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K7lc5hz0ooKlqwWvsYkM6tM65nA7nOz19U8zud13XFLn2u5VLPKd1kjLo6J35XvTqTefzIgp6gMbmLyICLmvfJhLaTw4Wk+XhDEv1GV12ISVVex3pJ0PUDvxw3VcL875n2crVVfJkXL0W4XDQddTps3N5pqhDUtvECrQt516ZoGkUij/COyzM5VyTAsjjNpEepcciiAOTly9YGNjERyHnah08kOIIb7mf814A7mavKM+9O2K9JQrDQVpmdJevza9m/U+BN7t7V210h8qUsgfhwwoDl75K4NZttUSvNQOWnsU85EQEy8JmLc8nYQEPAOj+JANQ/68cjm2zw+tcRraAg== 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=rGaoM56vjX7shkLushBf1ccp3c6iKVqfDEgpyRVt7Bg=; b=ElqiAlcEqT+4hIHztQNq/SCnx0dtokpEWakQ/UHOtWuuFmmenBvWjZKiwdIVVFvsjjTOxG/TU9nhOMZa7pILlH9po8yOrdc/0hNOgOYneI3qmMaNDHhgFNajP3YWweiDPRRSytEDDBYw+5kAf8kmQhVB3xAQ1s3US2M9UFw6UFWd1awxV0EpEopQoRcn4dwGimNShfat382QYDk6IJzu18G6fuxpc3lI1w7fOhwz8YzIURBrytDpXr6bCAeQR4upmHicFsNI0hR1yyefvauxUyIK2YUZB98038ZovUvvGztI33XYU8mL3oM5opmY3iTvD5XoXA2FWgGqS+ANJbQMYQ== 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 AM0PR04MB5652.eurprd04.prod.outlook.com (2603:10a6:208:12b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 22:45:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Fri, 11 Feb 2022 22:45:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v7 3/7] mptcp: add the mibs for MP_RST Date: Sat, 12 Feb 2022 06:45:39 +0800 Message-ID: <04a577c1d75955de893b17911b0876e68d27d579.1644618926.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0191.apcprd02.prod.outlook.com (2603:1096:201:21::27) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 51b9dbe5-b078-4145-41db-08d9edb03e06 X-MS-TrafficTypeDiagnostic: AM0PR04MB5652: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: Fmd6muMqAgzZU57xFMov6s7X+9Ov74xZkvI134kj8LXgJgfjuuJ6wZUqp05/uEccUU7q5SuD9JBJ+usHZJ4dIqiUiXpbxIhPwsQHhRhojvmvxosxGeNPPQtsRPEDbQoMS3+lAj6soPrIcVU6ktjU5sAbLhhOtsVwYTe1d1YCsNbGNLNrysAO9UFlCYQXJpkyW5skOvD/hoX5yPU79OFxS72K+CrbhiNNRVi9tcmtr/ES0RzgkpLtZuFInUhZ2iUwLzpSfyz61hjAujGBFdhknMl67BEA/3o1vsQb6oatvYfPtzZBw2U3lrBrWsDMV+YQtmkC9A4xWElD8HP7BJWZOsdeh5EDBdvsoxsQbnJ4y4NJpP+XFR9OiCDDaiLT5DokiagarVfmLWAFoivwhI87SyOrRAV7niHCx0GTaZsoQuljZxr569oixiJF6JcxzkxIrPjkqjuLhHybWWxIgHnTkz9W4+34SuQXm87l10NvNOEw5L+5b+u6w/TdnmYvCsaPmUb8O7Q9Ew6WuZqqnXZLYbSYsfezViLzn3X8iBAo1AHfZoHXnUe7stB5jrk6wlFjYqwLzTkQpGwzN1l5ziV2Tv6fShZ/19yw40Sayc2vW6Butuqz+QhXMmz1P4x8VbA31+pdvJqBZOA4djZ+ynDGdA== 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)(107886003)(6512007)(316002)(66556008)(66946007)(66476007)(86362001)(2616005)(38100700002)(4326008)(8676002)(36756003)(6486002)(508600001)(6506007)(8936002)(44832011)(186003)(6916009)(6666004)(83380400001)(5660300002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TbjyJfOQmJfbHjbNK89O+kRLOMWZ+M16Toqo4WykaSq2h8bm4YMkbKRLOqkE?= =?us-ascii?Q?rTC9CNLRE1rV2QawOiXB72ccxTzyecDWzsYkeGidfhJau0e6HzZDBqjXVeGy?= =?us-ascii?Q?gez962qB43W5pbineABiIDYsEbYKakv95/PRxbGEHwrV6mh/G1hohBuojV+i?= =?us-ascii?Q?T0BKLI3qv491OMrsIV5e0JnE5Toppt010O+DF/czMQvNIWuXsxIyA9UlB+NA?= =?us-ascii?Q?KeVGsrXBcRIyKSaF25Sc3nY9PuxSgPdfBOQCmdrQM0dpgMYdZm9SA4NBPDTL?= =?us-ascii?Q?VEGS9P7X/FhPC/Ao/HUsnW7nc4YbuPM6Qb/VAy4VaxkhhNpx7TisUbmbn50Z?= =?us-ascii?Q?icHPq6OSrFoUDlrQfW9F85p0jdL2E/GD7N8eGurmRmhB9RiBh60ISeJ96UPu?= =?us-ascii?Q?awo0lVqiVUQgORGgNUnCvgNq4ATlocIPkLogu2MYoff33X85+3nbS1GjInLd?= =?us-ascii?Q?f6lYfRc7xHZBYoRp2kK1QDI4fbxqw73CpXaTtS4bc2LmB5OD5vWiM2Ze74KP?= =?us-ascii?Q?xq1MWP582Y1T6LBu2p1dndV3O1Ht4FQA7ymapFB2OZpAeFUusc3OweCng/SD?= =?us-ascii?Q?lxEClHEwo0rk5j88iTPTmLvG1NCvuBEP/1Xf4C4r3jJsgbOgYCfd288zt2R3?= =?us-ascii?Q?gmsZuFs4Xjr+FkfUWTPfFRcr8PRPfYqx3x5KO3HxHdWCI28nmCb0mUHR6uoG?= =?us-ascii?Q?/qMPCVl85Kn9hy7RfjZPHvMpED231cP6d0WP+7tInzaK8rj2GSSGJ5NaOXsV?= =?us-ascii?Q?tPxV4+X7/juE0NejTTT9QNbd8UKlwEI6JRsreBBAVTY5UL6/EeTSb/9+cuPJ?= =?us-ascii?Q?zC2Wl0sMqdMKbx+iy0OrzcrPKlNFlZaDc4VlH9veNUsWKt7WyfLKUZQflpWP?= =?us-ascii?Q?Y0Wa48aSFFjIHjDzt8abLSgTasuc54LIRwPw1jg2K4ZZd7yEHL9l6ZmxYc1D?= =?us-ascii?Q?XjplKKzoq3K/b4/kC4hODKCKoNY/JKwgVYYfVSEhD4jUVQEAE3gD+UN9Sufe?= =?us-ascii?Q?3gY4tGzypw/QM5uUAVDPmC4tRl+oXkB/ZOmoWEHNEzJnQH1CFajJWWaqwto2?= =?us-ascii?Q?UXTX+gHyHk2mB1Uo7GRYvuV57weRY0s8YkxRiIE6R9VjD8Vc3tMeyLPN0a+N?= =?us-ascii?Q?I1PmUxGoAao5I/klKabxXCp1t0edNuidhqyichdTwGJfaMg3GEy3pXwJQmLV?= =?us-ascii?Q?nFsPLcmc3Zoj65d6aO22Y77bccB4fzpApUFqltJYa6dLNZnx2hnF5z/WhLH6?= =?us-ascii?Q?DYRX9ytwcgFWbSwo4Hcx2HdcBvirJ7GJOcrmGsrilqGLaRZnE3L+v+7qLlDZ?= =?us-ascii?Q?Hqjqmyi8wzPo7qpUzkXj5oO8lEl87LedWX5CmGpdU13Enk6ivA9mkjQlG22G?= =?us-ascii?Q?Upj9AW+CfX2iWOK6cQXcIUHQaMflKStTUHq0JZ+22I0MsCMEYB177OIW/0OM?= =?us-ascii?Q?OlJ3Eq/twPgNu8FTXcbCwZEWBFYOH1HJH11JeixSF6ZzNizkG6FpO9vW+K+s?= =?us-ascii?Q?aGwgi3YIz5fqJ8myeNkKNnCZ4eng6HrqDSLBZePuKV/UECyeov1w6YGgX6a4?= =?us-ascii?Q?IYiL89O1ND8ym9OdKCng/JSJ7G5nqFcUXepmaeH+tpDyWlPZ4BPvhS7NWdPV?= =?us-ascii?Q?HEAibMLpLhwBCrouVA8UPosU2KBuGrT6CpNUEdgLRKgdsWH9LT160bntJFnV?= =?us-ascii?Q?ARXGXFHBEUE8NHI9XSRskvAY5KY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51b9dbe5-b078-4145-41db-08d9edb03e06 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 22:45:46.3228 (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: ruLWWqg142ajhan2AK8293XJUS+gMp6/h0QEBRwTDddy14iAbjPWpPKizI/ihMdyLGm4OU4DHUOSXpmcmRtlxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5652 Content-Type: text/plain; charset="utf-8" This patch added two more mibs for MP_RST, MPTCP_MIB_MPRSTTX for the MP_RST sending and MPTCP_MIB_MPRSTRX for the MP_RST receiving. Signed-off-by: Geliang Tang --- net/mptcp/mib.c | 2 ++ net/mptcp/mib.h | 2 ++ net/mptcp/options.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 7cef7409e300..5ed9a7da3550 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -49,6 +49,8 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("MPPrioRx", MPTCP_MIB_MPPRIORX), SNMP_MIB_ITEM("MPFailTx", MPTCP_MIB_MPFAILTX), SNMP_MIB_ITEM("MPFailRx", MPTCP_MIB_MPFAILRX), + SNMP_MIB_ITEM("MPRstTx", MPTCP_MIB_MPRSTTX), + SNMP_MIB_ITEM("MPRstRx", MPTCP_MIB_MPRSTRX), SNMP_MIB_ITEM("RcvPruned", MPTCP_MIB_RCVPRUNED), SNMP_MIB_ITEM("SubflowStale", MPTCP_MIB_SUBFLOWSTALE), SNMP_MIB_ITEM("SubflowRecover", MPTCP_MIB_SUBFLOWRECOVER), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 785cf751e5c0..2f3a07567730 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -42,6 +42,8 @@ enum linux_mptcp_mib_field { MPTCP_MIB_MPPRIORX, /* Received a MP_PRIO */ MPTCP_MIB_MPFAILTX, /* Transmit a MP_FAIL */ MPTCP_MIB_MPFAILRX, /* Received a MP_FAIL */ + MPTCP_MIB_MPRSTTX, /* Transmit a MP_RST */ + MPTCP_MIB_MPRSTRX, /* Received a MP_RST */ MPTCP_MIB_RCVPRUNED, /* Incoming packet dropped due to memory limit */ MPTCP_MIB_SUBFLOWSTALE, /* Subflows entered 'stale' status */ MPTCP_MIB_SUBFLOWRECOVER, /* Subflows returned to active status after bei= ng stale */ diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 0401b22128c4..935a48cb40d4 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -837,6 +837,7 @@ bool mptcp_established_options(struct sock *sk, struct = sk_buff *skb, if (mptcp_established_options_rst(sk, skb, &opt_size, remaining, opts)) { *size +=3D opt_size; remaining -=3D opt_size; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTTX); } return true; } @@ -1158,6 +1159,7 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) subflow->reset_seen =3D 1; subflow->reset_reason =3D mp_opt.reset_reason; subflow->reset_transient =3D mp_opt.reset_transient; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTRX); } =20 if (!(mp_opt.suboptions & OPTION_MPTCP_DSS)) --=20 2.34.1 From nobody Sun May 5 01:39:43 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4336808jam; Fri, 11 Feb 2022 14:46:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgL/4eehP3+sjPpwpX6ZB/8W4WD8+bND+NV2yIQAEMV0KUnDAJB7b3OvfW8geqa2Y8PWlN X-Received: by 2002:a17:903:32c4:: with SMTP id i4mr3512395plr.35.1644619559905; Fri, 11 Feb 2022 14:45:59 -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 bf22si4723266pgb.309.2022.02.11.14.45.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 14:45:59 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3681-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="EUGx/Yq6"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3681-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3681-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 0FC5D3E10A9 for ; Fri, 11 Feb 2022 22:45:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2DFD519D; Fri, 11 Feb 2022 22:45:58 +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 0C8A57F for ; Fri, 11 Feb 2022 22:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644619555; 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=W2tsF4PLWhhXE2Vp0zDTFIxEjkpnm4aDFXcqrAwWWdE=; b=EUGx/Yq6I62ZpI0NtieR6OnAfG+I6Ekaft78ey/v8E8b1f9VXyeAguOXdnDbU90TiEGCFL 5+2F2UxB+jlTYpcWDenrVyozNyhtnnur8B3T6RJtCCXpl9FAL4KP7nTidMRYBbB0bLLJnV u3Vga1c157zJ8lNycHy6BOIjKh/eqXs= 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-22-sNKfFvc-MtWIwHcm6VVouA-1; Fri, 11 Feb 2022 23:45:54 +0100 X-MC-Unique: sNKfFvc-MtWIwHcm6VVouA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kgNjkjnTP7kGvlYLLu1JI8MkB3lFwd3EE6gMkmjuXQHjj5FT6Z6F1RCbYAZYx2Ca35SXg0bdrVGVLz+OyqAJgCMZfNp11FMhw2K0XBMoctCSUmXALwllYXwWgSqm7X5kPZjlpXdjQyhqqUdgTTNEEf3D5Qr3LtQBNRyo18esJmIIDEB+pfv36x4bDklnWWUndcQ/ipkta5BM31FiPVx/HKozbSg+Vx/9OxuXKgbBheGKETFz4owoN8NI4mHXTHjl98AzotdCK1YMcONdhZULloaGcbEO5jUwg/8Jr+L19zpto+ZcLeTUqOWAGEvEZGp+8Qb94IvmDGbLP7oLdUpJ1w== 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=L8K4d7ESJk0atp/+mJ6lEAuP+JvtaIhIecvFANBr69M=; b=f6DR20J/6yuPlsXDWL2hVIqZDHWfVHoCi3cYZ9uT5mbRPEf50+jz+3OpwWqf6XPMcWy1TfxWThU7/W8vgEtGZIamUMEDFf5oZoFWzCwvvoLQSxIWB7KBfY+LSXzqEHdJrPbGvPrsupXL+u/yxkmK8yStnzWpdiAObumo4wG5IbYedBzhOtKHnv9avNLzh5PoBrBxkYwVRDKpC0CbqGgBIDXj3kaTYjJdhPzD3LAfZeLZtOuLzNOJw806oetkMFlpNn4Bf1WIfqcwzelSwvH8zRgYDddh+8WF43RdQ8XMvq2S2B5e84+GQLWjfvZtSIcZyIm7CMWYNy2ftH/917m+sA== 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 AM0PR04MB5652.eurprd04.prod.outlook.com (2603:10a6:208:12b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 22:45:53 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Fri, 11 Feb 2022 22:45:53 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v7 4/7] selftests: mptcp: add the MP_RST mibs check Date: Sat, 12 Feb 2022 06:45:40 +0800 Message-ID: <9cc0ab6f688f129e1945ef870bbef6240300fca0.1644618926.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR01CA0069.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::33) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6941a729-9a73-46c5-7796-08d9edb0424c X-MS-TrafficTypeDiagnostic: AM0PR04MB5652:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:229; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T+33i4emWMdjxq1JA6cFllUF60NtTfHqXv6Inlphc8dfxdmBSmpeou1sP3WsVMAqMLufDoS8ZdqM1eU2E//LDAvE5uEEcu5K/uIGvDoVNcpxlKJwOJtvX/BCf1h0WZ5SvzsuU3kC1lq2MX7O32NkJUnrEy6JZdXhOOicJaS9POwcSIP6N6v46gJSrwgpiC4+KaWL5Sq0J97dYaaOrb6xQlUzJWzeH2YlJT/rhRztwaXmUNzwY/SeDJ3HS2oD23DQj+b162O5Kp6njqaLyyaG6me7cItp35RX/JXiVZK0qdTQmE3ZbOBLWtpnlGduMuB+RMjcTLyZNljwifFTTUC0qWTbToQZrKEHOftdG+WL6xq9xcNCvXSj7XPoqf4lH56XRG2BrBxdElzL/nmNEc6BMb13ib9oM/piRXwTpIcd0n6IKiaEisJky4N24zUsQFs7BPCuanfnLVP+pXI3rzeCdIRd3iwbEe6uVsPkUGgrm64nUiof0rGxpUZc1v5Q73evLP6sx3eU8ZNQmTJ7CtXyZfXs5nOQb+h0s9V21vazJV8HRMu1XNi6aTj/L10mrAHwf0dwQkgBDvvxJ7FW4vo/R8QpIaQHY4TWFNt5jcKaiAmxO+2R+JISYvOCx1ugokGNYkOMKtSVCSNv5jmISX4n6w== 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)(107886003)(6512007)(316002)(66556008)(66946007)(66476007)(86362001)(2616005)(38100700002)(4326008)(8676002)(36756003)(6486002)(508600001)(6506007)(8936002)(44832011)(186003)(6916009)(6666004)(5660300002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5unnyUxcE+N4WXBZHwnwM6zLIxQikOcvXZ4/wCY8BSWKZkS4Am6iW4Xk3q8C?= =?us-ascii?Q?vt1ZumFOEer5M0zkoH2nigFtvPlVrCtEYAcUPKRItTvHABpCOzXKArE0BfCP?= =?us-ascii?Q?ShKK2c8K0MS1JD7KldXjEbWvmdgMRZCg4yCdwl8GOMcSVm++hG58yrCn10jr?= =?us-ascii?Q?dBQw9CWVk//kllWXdhOtIE/gh3ixKeH4PBWoA4Ebzbopw+RAr5K52dLzSd/K?= =?us-ascii?Q?/dO2hIcoFGs1oP/P7EZji76lvwF9Qr+l2ReYRYBUK1Vxx4wVVSw0Q6iSfdV1?= =?us-ascii?Q?/yi0+Uq8hpCfdT3IUK8IA0zFW/19Taj35WoYiaovyklwh5nLOEi9nfnwbebW?= =?us-ascii?Q?7oSrfE6f+irIM1Q+d9XXT+JCrUp6piAFigyAEpSbEgMrVK17tTFXIRlGPKpP?= =?us-ascii?Q?uHKWT9Vr73pvaG6S/I40jk4DiRQVebrGfw5UFHeGyDlJnMRNxB4ucV7uT2zB?= =?us-ascii?Q?nUgf0M0ZFuObHNJeeedupXoNS/Fitx7qYzo5wq/LedyZxqPY6G7BUHFHlJAZ?= =?us-ascii?Q?HrJXTbOuLaZoMB36NrIiKAcs70Wz6WSKzqhqTq1WkLTzbEweYMBAjpgjzB0v?= =?us-ascii?Q?NfXLLNsdiNFHR+SHpGvvnx72TLCXcsStNAd3GPlTwsIVF6u6Af98y9H45XxO?= =?us-ascii?Q?0ZGI2ak099xv8TCxynItWrZ8KdfpAl4JA8qShtvByUABaRh1mTHcaoM02o6y?= =?us-ascii?Q?cKOqFuxizm+OtrZFwkSf4u4qsWqseI8lVCG6y48dRR+s/nr3bX9nXW80ncyS?= =?us-ascii?Q?ijHUe/bgst5158jipL5+Kz1ggJpO/5bB8J5ZkRimImFVj/XTGx216xSA8FbX?= =?us-ascii?Q?RcOrHzAoyUwBUQUYi6pX0wq5AZbaP0bbTqXrXAfWtstQR/johpgGlerkqhEL?= =?us-ascii?Q?DYzNaViDOffaHqu3YICkmQo62JFI7xGZwq7+dZZVLLO231XhVz2PLpQvAlw1?= =?us-ascii?Q?n7CpVtHt9CIlBEHCxFmGbeov8/aNhbRd0IMENm+B4l4rW67EKbQMCCLl3NrY?= =?us-ascii?Q?P6X+cGNLyOQczqH4HGL3AEXJywrW7IL8ZY9t9VdeavtbWatVYmo5wvwJk+Y0?= =?us-ascii?Q?G/2VXqCbJSst1qdvhb/EiIVO+OeR2b43VHTKBfQJY4LE81/WUP5xsyhqMk3y?= =?us-ascii?Q?YOGPrDITw7WGL5S71WJ9910PZ2NUfPDX+QprFsvY0KxTCIy6S/n0HSzXmhC9?= =?us-ascii?Q?fDnSFrus0NUTxSl3gZB//IH/z/brwa6AEc2FfHixabFe+8csA6ao+RY4AaIe?= =?us-ascii?Q?YTjaytnwQi4k4ogDwyLS+x7vNdcZW0GZ82B++yxGA1iSvjI7BLY8smuFc8R5?= =?us-ascii?Q?HFEUfEyGOEnH+N7Sm7ag1kHHCRMy/4gE29rU7Cw70T+I0NRgENE8EmTdI9wU?= =?us-ascii?Q?dImx0fTNUDsNOEzcI9QK8xk2qLlH+64mrZc2OLZk+H3KVPzFTGpXL16uygV/?= =?us-ascii?Q?ylYiyIljCcBq0ag7Cgwf5b2IhABBOL4fAowfbOXKCGSkuzKiw/G14U7k9udz?= =?us-ascii?Q?IFRgrQ5fLPqPIlz6oDDfFZsH37R8IV1USUvQz3qx/GAoKkeA50FsIC8u32cH?= =?us-ascii?Q?ftbmJaPiRcOhkAY1ltkWxl8t8MayAd2ehZ3kTR7dJvD0GVBfEpopUNa8uVIc?= =?us-ascii?Q?hq11Um5BX+y2Z8TdRn1m99+dVgMAuNsTovqRZGXwIf1g2e5+OxIxfTx9a8sW?= =?us-ascii?Q?Uc4qAlsQ9yXV4LZqEGm/2zF5kv8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6941a729-9a73-46c5-7796-08d9edb0424c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 22:45:53.4938 (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: 3SHy/m5Hclv9P/OPdWdbuf9zIuBqm9ESyyQiizQ43IyvnC3jlhnUTpT5NQGn5UGS8++gQuLHQSiJoNp2DU611g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5652 Content-Type: text/plain; charset="utf-8" This patch added a new function chk_rst_nr() to check the numbers of the MP_RST sending and receiving mibs. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9b75569e423a..7537f4fe8078 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -782,6 +782,38 @@ chk_fail_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_rst_nr() +{ + local rst_tx=3D$1 + local rst_rx=3D$2 + local count + local dump_stats + + printf "%-${nr_blank}s %s" " " "rtx" + count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPRstTx | awk '{prin= t $2}'` + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$rst_tx" ]; then + echo "[fail] got $count MP_RST[s] TX expected $rst_tx" + ret=3D1 + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + echo -n " - rstrx " + count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtMPRstRx | awk '{prin= t $2}'` + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$rst_rx" ]; then + echo "[fail] got $count MP_RST[s] RX expected $rst_rx" + ret=3D1 + dump_stats=3D1 + else + echo "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats +} + chk_infi_nr() { local infi_tx=3D$1 @@ -868,6 +900,7 @@ chk_join_nr() if [ $checksum -eq 1 ]; then chk_csum_nr chk_fail_nr 0 0 + chk_rst_nr 0 0 chk_infi_nr 0 0 fi } --=20 2.34.1 From nobody Sun May 5 01:39:43 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4336858jam; Fri, 11 Feb 2022 14:46:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJx8GFBiQN242n7vXhVoI9C26anq+97ss87kaaXnbgVI6LOxSR/5J+W1Yi+vyFlPmfgxoDH1 X-Received: by 2002:a05:620a:19a8:: with SMTP id bm40mr1945250qkb.488.1644619567012; Fri, 11 Feb 2022 14:46: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 c10si5924051qtx.419.2022.02.11.14.46.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 14:46:06 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3682-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=m8MKV+D0; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3682-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3682-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 8F4D01C0F18 for ; Fri, 11 Feb 2022 22:46:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8D28F19D; Fri, 11 Feb 2022 22:46:05 +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 056177F for ; Fri, 11 Feb 2022 22:46:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644619562; 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=F5wYijvQMIWylQF2S3VEDV6HQoiZHBzJoJSQMMeOYGU=; b=m8MKV+D0iPElnS1NAq2XeQ29NEsl1d8uyJZbXwqtqDpEenFPqBr0z/9M5gWOvIzdVPhhbx yc8SOfY4BYad02amFiCDnRdydfxjh1/G9dw6sCcnGRFiOOh6hUDeaFGonRgR8K9U0+MbPG jIZF+hs1YeX5TOSUVqfYEZFjK9YXY0M= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2110.outbound.protection.outlook.com [104.47.18.110]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-5-y4zeWBw6Nn-HbKW0_F_z5g-1; Fri, 11 Feb 2022 23:46:01 +0100 X-MC-Unique: y4zeWBw6Nn-HbKW0_F_z5g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G01IYxE6zl3/L8FkZsi5uZlcul2ehtIWuEj2w6EwoaXlsX33wjlVg/Ryy9Z5A5HP6LAdUtL6O6UGu1GKdIlqnIJlscGDz62L/uwLpAZTQ6wyx65vmoaOtdiE+ah7NcgW7qZtIC1jZ+x6PR5PrdxYmwfSr9p3W6K96gppNUMzQ76n5yhbnt5bOypfkRK2QyZejE7oBOT4Dfu2wlKBRCLqL1jubwgSvGEuld18RZh4mkloAlZZ6+uQ6pHg2pQS+CBpihC8TkOBSo4PJUAmFk+I9Vb2bI8MPur09Br23PV9+L3lVeQrxmHsRBeqfhK3Ub15hgfqX1+ovY9cuECsTPRX+g== 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=hkSvoh8drXpYj9GquG/Nb8D2U/hlxxkv956Vfc3yMUE=; b=oTNSdtrHsoUZmf7InKZ61VA1lhAztVtVNAjw7fRqNKrbgQ8HuiwOgUCX9Nhcdx/AZt+zw9Fgrzk9bf9fOiCXrQyfWEu4KLnC4NS6meTcNory157PlioPqB7YKZKJj5wXQZP+KoxZQp0vC2dipCr28Kqfo0bvtH5OsKoqwMT2+y7vL0uXw3t9cSmYDQbxwQdxRhZLcYQwY2nIQXmm0+t5isgAFLWJ+/uHnd9mhrlHipPN2/aBtmhpgj+gIfpirEIO4XYv++CSlmerbH8wsyGH3ssHjcPlqu+h+VRnXr5Ssyhr1qaLesYr7XYTDqw8b8WXj+YGGhH7iZmdPxlUynAFQw== 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 AM0PR04MB5652.eurprd04.prod.outlook.com (2603:10a6:208:12b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 22:46: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; Fri, 11 Feb 2022 22:46:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v7 5/7] selftests: mptcp: add more arguments for chk_join_nr Date: Sat, 12 Feb 2022 06:45:41 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0401CA0010.apcprd04.prod.outlook.com (2603:1096:202:2::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8da9f318-9c70-4b82-ff05-08d9edb04662 X-MS-TrafficTypeDiagnostic: AM0PR04MB5652: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: qOiFxI13tjaAzGnKhKZHS1pvt/zu3DBjsi3u6qJ2L/4HBtPfXkBKA+p0dl2nCoxIklqL7vhkdB7a2vE+KwUmiWpyGPw3Pd+anGpfo3hRiO+UZDGOr+HrrLw0ubtIyKmDxHc2f7YCn0EIyX2RUbtB6sfgpkjviwBebeH0RWQ02YtmX6HD25qG/sj4SxHTj14mPeX3VtkcSxIlv8SNs7sGBkUdqJjtuIYC18UuFE22uVLrrVb4sRBCPWjiEVdplExqpPbn3Jyl6JQjM1bz+rr0X5Kztlmw3nQQ9WVLuY0SwvHJfF3mMgDrWFOVm9ddX4wyDYFBnF0fxVeYK+1nJ0Xy/Im8FgBbwmjaFVAMZxWoSivovOysUbbOsaZzhPdYMcDDpKOtoH7ZmClDjlmgIiXFw6/I9+nIXtOOz+0y+9zINn0ki+EYuEQfKPPOL8RXHEgkb2t4ZIfXZznL5nN+9/kwM/3197+unAyssbpT8CsRwyvUrZZA40niQ5v4FV9Q50uPBvbZBCjnXZqSDIbY9WaU8lMvMHpS4XuTHtoXmqT2AwWOfyfN0WWN2HMR05Ul8FUsUcKKL73BRM3rj++96h9RTDDEaUk1S4VCA4nKWB5TT8JRMZA5DXl+I72kHN+YR5uFty6rqrVd3tJvvfvIsXBi0A== 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)(107886003)(6512007)(316002)(66556008)(66946007)(66476007)(86362001)(2616005)(38100700002)(4326008)(8676002)(36756003)(6486002)(508600001)(6506007)(8936002)(44832011)(186003)(6916009)(6666004)(83380400001)(5660300002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Wv1LPaAXCsP46cfD4m1jS0GS4Dd2ShNPMeKFj1GtDoIkklmsZNqSt7XR+VK1?= =?us-ascii?Q?K2pSpX2V5+yNULrXS+ySQxzDcbGTJuiQPcZ/AcuNhyYyocUjdfHqLGzDCPNk?= =?us-ascii?Q?weL9xypt0/vKZi63euZtRJdvgG7oO3dZ3ipzgSR557FV1XjvN70BoCikt8qM?= =?us-ascii?Q?rTMhxjGQ0D4LtUHhOOV7BTHvdBOx5/CgooE4kshcVk+nQAN6l2jusLPrlHFY?= =?us-ascii?Q?cwD+e47Dd/+yPrpHz/q8sNBaQBaKTmMptvmcTfLucSestUCwAMM77grnOGCk?= =?us-ascii?Q?5jc8oklaGRH5v64o4mdKKANglWTPEjUwrcgLjWgypleIrOIit0Z19VGDOhq8?= =?us-ascii?Q?BfpPTID2LxLvRRrZUbJFCAacK8g8EH+FSRS+qqJazC0guhl+6JF4rs4xDSBk?= =?us-ascii?Q?A4XRs/7bJWbGwjYK9zxTuoAwmh0OXuQ/T9HFvcxwxEX3I742AAKp3P2fckvJ?= =?us-ascii?Q?2h2sZx/bHVUMpKpO0x1+o3iseJL8x6WfnZwMDwvDfnUF/tugJOLu5L5POn9K?= =?us-ascii?Q?4ytj5wueLSW+tR3Drhf+dMk4m8YvLuWGNcoJuTB2GhJJ4RhUuEtjmWag42qF?= =?us-ascii?Q?dRywGiNhb0c9AIdjqtzqwoQ+B7bgRREUg15sXqfGvoAKfDbwhov4TQxQ3aWo?= =?us-ascii?Q?e+8ar8xuMe3S4b1pP7UdJcbnAKAgwomeQOKSGKAUsB4xmJdBmEG/PK3a9xkP?= =?us-ascii?Q?Iuhpd+b23S81JITvvbzQJqgAOhjk9iuREljR8BBOtw1/aqdgrdHQKrIYmiJ9?= =?us-ascii?Q?fRKMno0VX0qZhdPDCSvC0z+3RwH1XF8XovF+oHRXmQ5lUXhLuWHSs/G1Lrcg?= =?us-ascii?Q?MBf5q2AFrigURmKDGiOhff3K6AKmrj3g9HGTxS5WJWacmM/4sPElvrdcxQNB?= =?us-ascii?Q?BYwgLstwmgFoBV5rAaEPu8SqcRoBHBdCG638M5CXeqlb7odH8q0VD+NBlE2B?= =?us-ascii?Q?AfQovqpYcdfmYmRMKUQHzYweDHMM5oom5zArzO9zchEj85RucIUIPu7kT8SO?= =?us-ascii?Q?msWQX6BM/kiO4QI72HZ23MrLcctm6mjNtX/zvqK3PJ8ZITzvhJGAY39m7Dn+?= =?us-ascii?Q?1S67+uXZSSeooidCC6+72tmEM9EZTkO+4yhV9RC48DCNTGf7EDHEGzI46KQQ?= =?us-ascii?Q?PxePw+TbWp0W2vAw5Mgiik5iwkwceZWH+7/kGiYBdwPcfPalz8A+nEGFuv1S?= =?us-ascii?Q?NZNnz+dF7TfoG/GYFtc6Ezg4DpsJyMDtcqGs3u2AefeRLBlBdcF+8ufcR2lo?= =?us-ascii?Q?l6wX3xtE2pOFpyMMzukW+C1ZNFnjFDJgJDgK0A7KWfmj1GqlI2RoHT6FbOXh?= =?us-ascii?Q?53D6Q9cBAHu6WHJ3d6fRI83+C6VVxyUu40eIe7z5S1/s3sz/LEYs3I0Rhj/6?= =?us-ascii?Q?+idXC/au4Sm8vbmCmfpoTEcGEprlSbX3adaDswPc8S/WvW7KpIkDh7/LMNe3?= =?us-ascii?Q?G/t6BLB+xUZTb85vdj4dEF6fye0Hgdlh71ADUG08/Qk3m8J9QCSd33H/EgGH?= =?us-ascii?Q?0M3Y2/O+S2a3ueR/w5kmzMaEC8Quz/fBe9djkl58d8hxKi0zISn5ds4ctJ9M?= =?us-ascii?Q?TraTicHjjDUj85/lOyDfxvugIQ1ky36wzH2CRGN1C2Nlvvy2EyQBLd3CZBJ+?= =?us-ascii?Q?lT2wAFAi1AXwaf68SEwcyhlzv93P/+v154jBRl3Gu9b4p3DJhW279kG4SaRQ?= =?us-ascii?Q?mrzDsnSx0e2ap4fRG3cD0V9MWZI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8da9f318-9c70-4b82-ff05-08d9edb04662 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 22:46:00.1961 (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: JBtsuDaTIdL67KNMtNxhDzw7NsRMf6COGw49WVQgzoT73kyU2lTQejpIcGQ9/kwMiF1yT3jxw87jq/07JlxCkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5652 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, which are needed to check. The default values of them are all zero. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 7537f4fe8078..f0d0d540ee0c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -719,6 +719,8 @@ dump_stats() chk_csum_nr() { local msg=3D${1:-""} + local csum_ns1=3D${2:-0} + local csum_ns2=3D${3:-0} local count local dump_stats =20 @@ -730,8 +732,8 @@ chk_csum_nr() printf " %-36s %s" "$msg" "sum" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '{= print $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D 0 ]; then - echo "[fail] got $count data checksum error[s] expected 0" + if [ "$count" !=3D $csum_ns1 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns1" ret=3D1 dump_stats=3D1 else @@ -740,8 +742,8 @@ chk_csum_nr() echo -n " - csum " count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtDataCsumErr | awk '{= print $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D 0 ]; then - echo "[fail] got $count data checksum error[s] expected 0" + if [ "$count" !=3D $csum_ns2 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns2" ret=3D1 dump_stats=3D1 else @@ -752,27 +754,27 @@ chk_csum_nr() =20 chk_fail_nr() { - local mp_fail_nr_tx=3D$1 - local mp_fail_nr_rx=3D$2 + local fail_tx=3D$1 + local fail_rx=3D$2 local count local dump_stats =20 printf "%-${nr_blank}s %s" " " "ftx" count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailTx | awk '{pri= nt $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_fail_nr_tx" ]; then - echo "[fail] got $count MP_FAIL[s] TX expected $mp_fail_nr_tx" + if [ "$count" !=3D "$fail_tx" ]; then + echo "[fail] got $count MP_FAIL[s] TX expected $fail_tx" ret=3D1 dump_stats=3D1 else echo -n "[ ok ]" fi =20 - echo -n " - frx " + echo -n " - failrx" count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtMPFailRx | awk '{pri= nt $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$mp_fail_nr_rx" ]; then - echo "[fail] got $count MP_FAIL[s] RX expected $mp_fail_nr_rx" + if [ "$count" !=3D "$fail_rx" ]; then + echo "[fail] got $count MP_FAIL[s] RX expected $fail_rx" ret=3D1 dump_stats=3D1 else @@ -852,6 +854,9 @@ chk_join_nr() local syn_nr=3D$2 local syn_ack_nr=3D$3 local ack_nr=3D$4 + local fail_nr=3D${5:-0} + local rst_nr=3D${6:-0} + local infi_nr=3D${7:-0} local count local dump_stats local with_cookie @@ -898,10 +903,10 @@ chk_join_nr() fi [ "${dump_stats}" =3D 1 ] && dump_stats if [ $checksum -eq 1 ]; then - chk_csum_nr - chk_fail_nr 0 0 - chk_rst_nr 0 0 - chk_infi_nr 0 0 + chk_csum_nr "" $fail_nr + chk_fail_nr $fail_nr $fail_nr + chk_rst_nr $rst_nr $rst_nr + chk_infi_nr $infi_nr $infi_nr fi } =20 --=20 2.34.1 From nobody Sun May 5 01:39:43 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4336918jam; Fri, 11 Feb 2022 14:46:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwV6DFgiKSVprAAEZXI683RA98hA1h3gGKFA5HNX5g4UPj8tymDYiQpzGYB7GiRDzs0BPI2 X-Received: by 2002:a05:6214:da8:: with SMTP id h8mr2790092qvh.0.1644619573683; Fri, 11 Feb 2022 14:46:13 -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 v2si5957079qtk.759.2022.02.11.14.46.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 14:46:13 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3683-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=gireqlWF; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3683-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3683-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 58FE91C0F17 for ; Fri, 11 Feb 2022 22:46:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2768819D; Fri, 11 Feb 2022 22:46:12 +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 A49BA7F for ; Fri, 11 Feb 2022 22:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644619569; 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=a0JhJzGuf64qW8la0L+TdO1ywv/jjKUedfxy43e/rUQ=; b=gireqlWFZsVw6L3t3a+cjvQ4LvhQcbHn8kcFSqYO/iE7nS+TpBZi9LizfP4dLYMkxn5qoM J8uwptl92shSoyyYLXU1tJSI+k3BlkjTVLQVBUY0JZ8vD8on7/acqeYGZXvr9VVSyvFeso DVGgQXEhHoNFBRCwaSAmxmVnU1NxVSA= 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-11-Vmk1o43tOw-6nm0nhk9-ig-1; Fri, 11 Feb 2022 23:46:08 +0100 X-MC-Unique: Vmk1o43tOw-6nm0nhk9-ig-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mBeEPdbGeUm7kEITW5VPJbhFz8hgyvhskwAFXE7PIm2stce0b8GC4CSfQxe7tv8h/vWVA6L0TZ+ulVMjFetM0uWKBwV51YcajBosW2Fpe2zxvHQvBMR19FuEFMcSmjmdALR/TM0d2hr0dU/DzhI1J3CYfvMa6+RG3phiLuANRvyjd4a6ovQAWKAe3vokEpDZEl+8cFJyXSSMqQapr/TwXH3/QVm3PVIXdt3ShR+lh9MJphwRlssIA+bsaoL7If79VqA3XaAULFIJXiWuGnJ0+UXuCyiwMfx40QrqfM1ehuF/zz0APr1vgdOvRk/6emiXHW0mKSxo5Eutkj2y9qNZJw== 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=Ydy9JZZF+55NzEUf0NOh2ik7ePxRWxA9heN5azLOa4o=; b=PIl3MlXleljtQttV2E9LUvMvsNgpikRlNrjxcRaZpF0ziLXWMats1NhvSycijPvTwd77rtecdKA7bcBZTOU394x5oTDFm1wREVxH9ZE3Mxym42EvDjteCHDHwzg1Om/dA31zxGP5X7WQwaePgFttYHlNkJ0XOyoQ848ZI38GFAaqthUp/pnJIp0/aRl1PH3z5hZTxYbd0/u7aMWLRKgadp+VG6WLv0t6Ki1E5Q1Gkuldfx/0YKAeOWkwam8/ZJefPrEtQgLJPIyRJiAk7n0O3Zesra4BXutfqHULsUPiW/iFejCSzYuB0HAj2WHjtj1V9Jv7JaxAgi6YUWQiM0rwFg== 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 AM0PR04MB5652.eurprd04.prod.outlook.com (2603:10a6:208:12b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 22:46:07 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Fri, 11 Feb 2022 22:46:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v7 6/7] selftests: mptcp: reuse linkfail to make given size files Date: Sat, 12 Feb 2022 06:45:42 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0071.apcprd04.prod.outlook.com (2603:1096:202:15::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: a56bd5ce-d73e-434f-619c-08d9edb04a53 X-MS-TrafficTypeDiagnostic: AM0PR04MB5652:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1107; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fOwTt86LqacSsBgp9m4Z/T5zbI5fbbHa8GE9WoKvRu6SVYDk3bUjb0AlzyX6JB6dbhWTUfEDznVoLhercdz0u7dpMJ5Wt2L4B7gOZr3N8Pkj+jGgb771Idefx4YaY+vYnLW5D7U+ji2xQsbsh3Eg0LY1Wu0OMW0JngP4dLteAMn0RYzA44STMZO1nC2Dj7p0gKiJ+tkY9H7r+gA/8KyQB9KwJ1hYhLtVEKnOWK9lnKctpx9jSxPCnuAmRbuq3gXojw7huOX9X644YmQu4uEAyrool6g+RTEhj2xp1qpKeW7qZ1Macf9UFe2nB/1eqX4Ni0SdcDvrzmfPBVg1pyXgUAFgSQliT0R6fFU9DIhsFcClMBdAT6jtH7jS06tHPjyzW4CsIiNY8Oku0Ma1Sf9b/xi4Exzw9V6XCK/8E0dKHz2bpYMOuMnaF48f/UghSZq5jXmscfaM+7fP7Af7GY9Go0rBHxXFQ2/qyNNr3S47/MWLf5nB9dG8AQ02Lkm3/1EjHmzTUAtOH6S2OgA7NJkO43jwp/wODg69OHpnIiLEmwqgy4KH8awTVOo9o0s1ugfWNM25DxrjfOpOLZkNc7JnKFwFAC49vydgsBtioozQFuzxEY1D4IJ3CO95ON+U2QQEDD1d4DNNqihwd6qHtaBw6w== 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)(107886003)(6512007)(316002)(66556008)(66946007)(66476007)(86362001)(2616005)(38100700002)(4326008)(8676002)(36756003)(6486002)(508600001)(6506007)(8936002)(44832011)(186003)(6916009)(6666004)(83380400001)(5660300002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?s4ywM8n16jK7LaWmuionhPE7I0r2rJLHHz8rOtiiJh9vHoPQydkSKI9jPCB/?= =?us-ascii?Q?X8DzFxG+m+cdaEsiPgdwutGj+hlrs6ELldWSqzjWaXBeK0kuaoWZ6kOL4DDM?= =?us-ascii?Q?0bSyZ6nHVrCiHJZyY7hT5JmmBacf49ctAd0jdxqZ3yutqXpY8JfmgM3Gi3WG?= =?us-ascii?Q?ey5BUid7yXMNB47KudySay0RvBiZGL/wB1aFxVODyJZPlQgt/epfRmZ2k37m?= =?us-ascii?Q?3ki4fkD4B87uf2dKDfd13R39JLdEsxFDq1yY1wDLJtUd5O8PiWFr9Hb6If2F?= =?us-ascii?Q?IDZDPupG2bt5EMhiaOug901qlQlGgwClUqG+7O9CZDQX9upsNXrT6mTQ/Dyx?= =?us-ascii?Q?zq/dykxZmJpTWf3GwY+HUJmAXFGa2IK/C9ZBbyrwA+aHvwKWaAw84VYtNrKr?= =?us-ascii?Q?XKvFFEQAeC6vZLAsn09ZfQHZxq2mXMqf4pItrzJTIkrgIaNWDQFLnVZn+ClD?= =?us-ascii?Q?Rbc3YkmlhxQBZMfqkpD0Xz46mrqA2D1sK0MLijuvVV38qsgo1SoD7W/wrLcq?= =?us-ascii?Q?5JObzfrYhQYNPiW42n7N97Mdmo+Qg38R5h5/SHiwmPZk3L8uaW84DD4I3C/M?= =?us-ascii?Q?Xl73AbgkZUTjPqfIR6WS2Q7WJa51z7/U/wnvl8oq2nmBlVm6zpsG5NZxpTio?= =?us-ascii?Q?OUR9JmrxZbP8p081VjYufczYFsf56rgQKmjT1k+gndwSQF5UUONi8sG1pdmU?= =?us-ascii?Q?9TQlPoLhOfACZjIl/d8Mclv39s/cAJD5wP6i7LkFOYcBrU4tZc+hQDwDmXtB?= =?us-ascii?Q?VQ2vqozEtpvwUuaOhBKPCzlu9qFLVCYYpx6akMIkdyfVMyp0VpybWqhhTSYr?= =?us-ascii?Q?qpNIowux3SYDUbZ3GixjIfqqqa4MIjLOKTywUOSabiHlQc2cuMzm2F6UrqZa?= =?us-ascii?Q?baFdPFp5qcfK8ro3VwsMwpEx7SBV3vhB6r/MGUJF29k3z+eUgGcl/i2dmwSJ?= =?us-ascii?Q?2WeQ4hcTVbvKeqMe6KD3yHJTX4QVQIsCN5E7T/ZANC8Q7UOsWHVEvSHPzqqo?= =?us-ascii?Q?vgnX4007jk0v1g00iUUkI/fYS5UZI77tfM4Mq491ZCfS7nNlTO3MLbDvm7TS?= =?us-ascii?Q?rRT8YtoNuCcBo9i8Jz0nkuc0Wk9n9ZyF3OwWCWb7VsGRv+LS340TFw0S+ID1?= =?us-ascii?Q?ADReFqCBrWyzw0lKg069DtTgqBf5mFFYrnC7AWxJdoWR23/Y4mcUCeVjuaNb?= =?us-ascii?Q?zCp7yoASOwhA0B18GSnqg2MqfjPxM8F9PKyx8XbLdP+retXxAqEXznxaeXhF?= =?us-ascii?Q?iLo8Dk05IJoQy4W6bFWIfcQPY7Je3mYR9BjqkCt5zi15C/7MMce1lUbdUYyy?= =?us-ascii?Q?1jBzb8faVC+mlYZ6snKfpASDcjHbD7VprWXN55Fiitz22e3vvlHT+T/YGzFR?= =?us-ascii?Q?38UsPnYx5hCYT9xOTA37+aDioOpjDL4CcAgGUvn+hPHZ3g723Bhc0ew0T/OP?= =?us-ascii?Q?eJ3lQirwGzKSsLzYWcgoum4QokmxODqPkq+eJEwj+Pv0Rv84DarTwh1x0hH8?= =?us-ascii?Q?rCV2TnpfF5SpbPV4hBXC+ErypBHtYQgrvfvhiHge/VB9BjF6c4GM/N22FGbm?= =?us-ascii?Q?MyLQh3znnya73M9UEL5ztOqvNYXJj6LIo593Oi0y6l2b/0z+Vy9C5AEJaywo?= =?us-ascii?Q?sX4ljtNe9imvFW0ClSwlE+MPp6TcknLQGrj/1ip/24hk4wcNN06yQBQ+dqbI?= =?us-ascii?Q?1HAxXv88aUc//5ecFdcIxZyaABA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a56bd5ce-d73e-434f-619c-08d9edb04a53 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 22:46:06.9453 (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: uZ+FPrbhR8TCegJ5qJcdN2KnE0/dzhKOOlAZlcDXtMAC5lHcXRUWq7DmsoUKSn2ohcd+ZwEMdOyovaj/65Pz4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5652 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's useful for the test cases using different file sizes. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f0d0d540ee0c..21add441c08a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -446,7 +446,7 @@ do_transfer() local_addr=3D"0.0.0.0" fi =20 - if [ "$test_link_fail" -eq 2 ];then + if [ "$test_link_fail" -gt 1 ];then timeout ${timeout_test} \ ip netns exec ${listener_ns} \ $mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ @@ -466,13 +466,19 @@ do_transfer() ip netns exec ${connector_ns} \ $mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ $connect_addr < "$cin" > "$cout" & - else + elif [ "$test_link_fail" -eq 1 ] || [ "$test_link_fail" -eq 2 ];then ( cat "$cinfail" ; sleep 2; link_failure $listener_ns ; cat "$cinfail" )= | \ tee "$cinsent" | \ timeout ${timeout_test} \ ip netns exec ${connector_ns} \ $mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ $connect_addr > "$cout" & + else + cat "$cinfail" | tee "$cinsent" | \ + timeout ${timeout_test} \ + ip netns exec ${connector_ns} \ + $mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $connect_addr > "$cout" & fi cpid=3D$! =20 @@ -632,7 +638,7 @@ do_transfer() return 1 fi =20 - if [ "$test_link_fail" -eq 2 ];then + if [ "$test_link_fail" -gt 1 ];then check_transfer $sinfail $cout "file received by client" else check_transfer $sin $cout "file received by client" @@ -679,9 +685,16 @@ run_tests() lret=3D0 oldin=3D"" =20 + # The values above 2 are reused to make test files + # with the given sizes (KB) + if [ "$test_linkfail" -gt 2 ]; then + if [ -z "$cinfail" ]; then + cinfail=3D$(mktemp) + fi + make_file "$cinfail" "client" $test_linkfail # create the input file for the failure test when # the first failure test run - if [ "$test_linkfail" -ne 0 -a -z "$cinfail" ]; then + elif [ "$test_linkfail" -ne 0 -a -z "$cinfail" ]; then # the client file must be considerably larger # of the maximum expected cwin value, or the # link utilization will be not predicable @@ -694,7 +707,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 Sun May 5 01:39:43 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp4336974jam; Fri, 11 Feb 2022 14:46:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzc3+OUUqECzIkUfM5PuFAgWzV58Z2c2byGiaRj/u/vP9QcOPruUq7DmamodOlFJD8FmlYg X-Received: by 2002:a17:902:be08:: with SMTP id r8mr3663727pls.24.1644619581014; Fri, 11 Feb 2022 14:46:21 -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 x70si852115pgd.345.2022.02.11.14.46.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Feb 2022 14:46:21 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3684-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="fT6x6B/B"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3684-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3684-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 19D6A3E10D6 for ; Fri, 11 Feb 2022 22:46:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 307E819D; Fri, 11 Feb 2022 22:46: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 7E6577F for ; Fri, 11 Feb 2022 22:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644619575; 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=diY6luqeB50+P5Ylfs+PybUUb0suC1rvBuJs0n/ZPjU=; b=fT6x6B/BRQQJjgDv/GCAH6T9qTn4xFn3RRtsqrb/DO173D6Ec4bI1WZTybjqiN1eo5jO/I icQDyL+jvlU2dBpcQGNLrEcu1olw1DQ4WIVxgCBadpbAdmj6ZhYTnHCmyDENIYMFQHpFql lVSUQbG39yjqxTnKWvCGihApczwV0ZA= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2104.outbound.protection.outlook.com [104.47.18.104]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-28-imY1iHekNnmroKxJgrrZUQ-1; Fri, 11 Feb 2022 23:46:14 +0100 X-MC-Unique: imY1iHekNnmroKxJgrrZUQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MpBhBhZmSXbFMQd+VTMf31LBXDY4uywWUPWbMQijm3jDj4/SMFFG4llM93bvwwECpBbqIdvdWFB+IIquMxJTNvBW7YCqo3nraao03I9L9YrBnrc+eOLVnQvXSUv13ja4gW5deR1zbg4PcUlMx0WuGg2tZnDfeWJMNAwMbzVhLJffbNdqz0hA/EaRozEAduH2Ybp72oxkt2R4aNfUDeLkHnIkljsjfeFXujGrKgvpBo57pGUzIxWZo55n0uAp0GeUwRG3jQfikEqg8LjrTkydmE/jmuWq9wwLPFiqTAoAGOoQXA15Bie5ddj5B4HiNZbu/BoAZkaX/NeEUkY5C+4ocQ== 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=kNSKTY2wQg5gOmanM5MwdlF1QDbW5czE4QchsSlCLXs=; b=oLDYzOfwJRVXKQNBuCGEdQTuH/ATAlEwWD7Fm64D3a8CqlauPf4KRNiOPg0bV3rt9jecPPVYiutj4/XRty0kmno2PaCmllX2W9hQ34doK1MIp6h+5z/6j6NMm53SLM6ZCV62Op4eAs4DC/fbjb85tyNEaOVZwIczEtWXI6VnQMIZQ3vVtp05ClH7FI/6kN+pYGPQV0BtXdE8m3MNMks/5JGVa1svQ7+5NAlDGKgon7mg38xA7BkhvJn9PFGUOtxJRbToXaSOUKaWImEOjOo6YHDCh1Tf9VVLjkzXTHticxrXzPdIrdU3FrrZ8oAb3sUhQayBl6tDC0O5Jcw42G3naw== 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 AM0PR04MB5652.eurprd04.prod.outlook.com (2603:10a6:208:12b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.15; Fri, 11 Feb 2022 22:46:13 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Fri, 11 Feb 2022 22:46:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Davide Caratti , Matthieu Baerts Subject: [PATCH RESEND mptcp-next v7 7/7] selftests: mptcp: add the MP_FAIL testcases Date: Sat, 12 Feb 2022 06:45:43 +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: 2260781a-d64f-4766-1146-08d9edb04e52 X-MS-TrafficTypeDiagnostic: AM0PR04MB5652:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1mbDTAhu6a1wUpjCgCnnrX/vAdaLMzMywvjtcX97EoQwjCE5EjfsnKpof0MnNWn7o1R6FK+e5zojdurmw2ghK2baLES4Svem9bXkvwAPK4TvkhKVRYpQiVLBwmvKFzpbJVzRBrsZpo2BV+QMU7UxXOI33gekPTUzVWeqMxBrENCoMPj72m/0s0HzbryJJuAoYA2b7bnmSquKtsPhg6L9PRb601Y5kAClAMHFRHKoE5wWA/ZpPSgm7g6cOU+aQWdLiSuxeiUyzJAXOSZr/sUjNUkj5K0Ug1RzAwBOkscm+Br7Sy2C4av4I/OMcVEJLd7nwWFN8iSNLonHrjXsfjJjUiM8Hd+RMr8efvUoOc+AVgjuVERaPjWYPrpAMTqM8qFydS6x+ozUyenSdssmQ3AVMhwTvnGrY4Dt5GXPlRZnMmu1h0aS7wanE49BaaFwSQlvw9s1FpKk/3YaLXAlo2PAUn87vjKrmbOqoshAKt9jYbN5MMJp/IIgvBw+idjuf1MUJzDKk3LSw++v6dS5ZCx9andAEuVHRhYZZZr0y3wFBfFUCveP70auV3nMbxBCWOv5DNFATcVqc5/V7fs/v2y1uWqpLN3NKT4Du8o6NNUGJmozjedYGw5PUsMYSGhbaSWJ9Mi+H9MZ3cMFQx1jDlcScw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(6512007)(54906003)(316002)(66556008)(66946007)(66476007)(86362001)(2616005)(66574015)(38100700002)(4326008)(8676002)(36756003)(6486002)(508600001)(6506007)(8936002)(44832011)(186003)(6916009)(6666004)(83380400001)(5660300002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XD5z8RjKffJuz6aCmE3cNQvPYlEY3uiALDNVkcddsgsDJYV6s1gkASaQvYLC?= =?us-ascii?Q?fNCjq6sf71RvevQIJcjlU2sWoFBtRO7au3ARHvFfnkCE79Ob8IICEs33fuhB?= =?us-ascii?Q?1uIB5oextoz+c2qai7Q8At6JvlgSdPjZZGaqJpDK/SdMnY8x8w6uApElTuko?= =?us-ascii?Q?SG+Lh8BihUCBysIa9TyNRkjGZBwSeDfBgwc+g9pEfbOLcAA0iq7JwdU9rQ0O?= =?us-ascii?Q?D3yPum+I3QI/H+hdyLjHyd6bLvNtZHT8QpgJL+ECKuGV+IGM693Y/Npbq0NQ?= =?us-ascii?Q?Rz8E62YgYzkEwusrybD+i8NZnQYcWG2jaWG+rhbQXgIgHb044v6VA+5xBzQx?= =?us-ascii?Q?PokjNZ+3ssVyyVBtyS6zxXCEFd+qrLIpAmu/kPBpZ89BABX0PdOL0bWZMhNA?= =?us-ascii?Q?hwk0H++cx3r7soEO9nJZDd5q9bBinot3JYPXfblJgZ0dSwEbF4BEMHTS2BEp?= =?us-ascii?Q?/e0GkS2wFKXGOuACyPb8uGMWoZdch4O8JaEvZbsPDajxACRd7XZMaHcX1LUd?= =?us-ascii?Q?IRKojKeMVl361kxJz+tbu7e8rFxrXBB34+K0N60o6SDSB8QN59vOpg4KkX+T?= =?us-ascii?Q?yhMcVjjEOcZRJcciLRUlgFJsmIH3FkkMbljVrDoIsF67vmz1k97/pgASnET4?= =?us-ascii?Q?kwPGgFa+ICaRiriuhbe+26VceULiVUlV5jVdziPm3q5IMm5RJ8+sLHGg4x+D?= =?us-ascii?Q?fXKaddZfllsp945C4HyKZZa7ItmGAqQiLGIIS+NQJYsnw4vP5jszj02n4Rjw?= =?us-ascii?Q?pjq6ucZsDtz4fE4+LgycNkuevykFzQLFZ1wg4lrEbH6DWN16oqsF5h3/9Oxo?= =?us-ascii?Q?L7bidTrNpab6+Bn+t09djUa5OU3kCQjKqn0C8o1oOxavOs4+HMoeoKiE0e+p?= =?us-ascii?Q?XZKtPJ3exMVcLszTGNIUnPKclcHgaNrJHkxygg/DBuujXOucluBNEpqlOg9b?= =?us-ascii?Q?TDSFqYY90To3K3PNnlctl5puPt/kGFbbRJt9x3nk7vFT3Z1Xdp2tpKyx9mEW?= =?us-ascii?Q?SCnJf05BvmtKF6IfitW2YPhCjqU7bgC72MDQzU0vx8Z8hz9CBfc3sNc2lFAJ?= =?us-ascii?Q?2jepM7VopKGU/pPbY8IenJbdlZF2mgzKg1jKQnbcdeVxzPqytRzkGg9XJly5?= =?us-ascii?Q?d7qec5h1dxaiCHSIiPyeSO1tqy6/nwvoB667z+0A6ac0oJj/3WNc5+gN8jev?= =?us-ascii?Q?HP3FI2P0akq2Yn7O6Oi+Xq6LYffZn4iUG+FcC0fDk6EY+5c0bafGMoCHZ5kh?= =?us-ascii?Q?eCe7XFfF3pA6GeALBUoJswcDEYHiBP4UgJ99/sGCdUNua8OQqGF3LOlYh1lh?= =?us-ascii?Q?UqswdMCOqbDetmS2Laz9nUA+B97cSLXEUmT5MUsELpZ0hj+tdMzRVXqylO5H?= =?us-ascii?Q?na5vFxhUs7YQXK/45NFC3ZAwFCYUPoTRsAa837ZyKxVNKN6t7SprylZz/SLc?= =?us-ascii?Q?bbhTLQ6KiJLGqaVSL+8a7ub5qQO3SIDb5mAyK7ouLP6wH3AbJ0pyML5Hw/on?= =?us-ascii?Q?Zp9Zgy/q9WuTTWCNyPUgfLCFiy0gzWEIqbDq8jzYwfGjvdvY6689jc4+Q1Kl?= =?us-ascii?Q?M0xQi4VoqM9hlOhcuhqoMYvE1SgR9ukR/ZJ2K1gXgdIDdd66SpsfYCjL3DIE?= =?us-ascii?Q?NUTZ80rk6FqmGXi6hX9PQ+a9z3JPcvvMwJijtkdDlKRlNJANb9xc1TIbplbJ?= =?us-ascii?Q?X0fVShwjDovt5kJMR6jD7xD6StI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2260781a-d64f-4766-1146-08d9edb04e52 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 22:46:13.6944 (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: qnjD4CwXys6J43RHrpgeYCO9U/tTia9sZ3uULUMOeUuEdr98vplQX2ore/8mU6O9wARlGn9Q6oHiAghQY47pvQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5652 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 former used the test_linkfail value to make 1024KB test files, and the latter 128KB. Added a new function reset_with_fail(), in it use 'iptables' and 'tc action pedit' rules 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 actions. Added a new global variable validate_checksum to enable checksums for the MP_FAIL tests without passing the '-C' argument. Also added the needed kernel configures in the config file. Suggested-by: Davide Caratti Co-developed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/config | 8 ++ .../testing/selftests/net/mptcp/mptcp_join.sh | 86 ++++++++++++++++++- 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index d36b7da5082a..38021a0dd527 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -12,6 +12,9 @@ CONFIG_NF_TABLES=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NETFILTER_XTABLES=3Dm CONFIG_NETFILTER_XT_MATCH_BPF=3Dm +CONFIG_NETFILTER_XT_MATCH_LENGTH=3Dm +CONFIG_NETFILTER_XT_MATCH_STATISTIC=3Dm +CONFIG_NETFILTER_XT_TARGET_MARK=3Dm CONFIG_NF_TABLES_INET=3Dy CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SOCKET=3Dm @@ -19,3 +22,8 @@ CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy CONFIG_IP_NF_TARGET_REJECT=3Dm CONFIG_IPV6_MULTIPLE_TABLES=3Dy +CONFIG_NET_ACT_CSUM=3Dm +CONFIG_NET_ACT_PEDIT=3Dm +CONFIG_NET_CLS_ACT=3Dy +CONFIG_NET_CLS_FW=3Dm +CONFIG_NET_SCH_INGRESS=3Dm diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 21add441c08a..bfe2349794fc 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" @@ -920,7 +974,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 @@ -2239,6 +2293,29 @@ userspace_tests() chk_rm_nr 0 0 } =20 +pedit_action_pkts() +{ + tc -n $ns2 -j -s action show action pedit index 100 | \ + sed 's/.*"packets":\([0-9]\+\),.*/\1/' +} + +fail_tests() +{ + # multiple subflows + reset_with_fail 2 + tc -n $ns2 qdisc add dev ns2eth1 root netem rate 20mbit delay 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow + run_tests $ns1 $ns2 10.0.1.1 1024 + chk_join_nr "MP_FAIL MP_RST: $(pedit_action_pkts) corrupted pkts" 1 1 1 1= 1 + + # single subflow + reset_with_fail 1 + run_tests $ns1 $ns2 10.0.1.1 128 + chk_join_nr "Infinite map: $(pedit_action_pkts) corrupted pkts" 0 0 0 1 0= 1 +} + all_tests() { subflows_tests @@ -2257,6 +2334,7 @@ all_tests() deny_join_id0_tests fullmesh_tests userspace_tests + fail_tests } =20 usage() @@ -2278,6 +2356,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" @@ -2317,7 +2396,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 @@ -2367,6 +2446,9 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do u) userspace_tests ;; + F) + fail_tests + ;; c) ;; C) --=20 2.34.1