From nobody Sat May 4 07:50:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp446370jad; Tue, 15 Feb 2022 03:25:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/AmekI67wBr/wtFwOmHrYdtq2r2N8liWkd4f3t7EMK+CvGAPSPHmpJwTPPxNolPRzjKfg X-Received: by 2002:a17:903:192:: with SMTP id z18mr3615685plg.113.1644924341335; Tue, 15 Feb 2022 03:25:41 -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 o10si3109633pgu.638.2022.02.15.03.25.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:25:41 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3750-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="GWdNH/p4"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3750-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3750-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 D10733E0E4F for ; Tue, 15 Feb 2022 11:25:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C2CA9138F; Tue, 15 Feb 2022 11:25:39 +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 A11C81388 for ; Tue, 15 Feb 2022 11:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644924337; 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=9PCj2lgSMrIv5//Tw9M2zHPusfDOXdYGkewDaCYzKK4=; b=GWdNH/p4ePomEylNqfHi9SuSWAFswNiJX/KtTq3cE+hA+UizGuPEoISKA219VCN20ujRrE BFgp9dsKdifYus2amQtVH98j8he3yAwaTuNHqJP5KxnLYREwYCJd19vPpLXVMJiYIoWep6 HnCSK7PVIjmUddChafq1ZCpkWrNX5zs= 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-3--SWPSZnfNjita3KCW1VH5Q-1; Tue, 15 Feb 2022 12:25:36 +0100 X-MC-Unique: -SWPSZnfNjita3KCW1VH5Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NHT8RVKDQmU+W/Id9fXKWLbYXWDW7LoR8vNU/agwq8mcBD7z8jmuZLYIKu9jgK0uFnLtAWv5WVG6RgCHLJCQJ52VES1PyzSCFjilTVRDrDZIcs6G0O/4JtYZ+HcLSCOqm+lxSUcrNXTbKue5ooU0QPWm1/swngbAG84TQ/IJcf5P5CIk2r0uZzyH8lpjoHfphphjExWWI8kjr8lIb8ujjkssfCscjXGlQgz9pWbjsWaF2/jg1ZnBBlVmj9cDQgavvDAI2ooVTwcr/1XFNZrhM44rWazO4TUk/MDyEDwCtgjdeslyxZTyrB/BSlsr+Oz5dKNHEieUr/4hi3xjze51CA== 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=IKGTpNwTAfeUHlg7o+sAl4ZIhpiR28BdA0P8AH/jBMg=; b=B/t4kFPtng9j4EAmrXZAr4JoESk45kR0T9ieh2w6yupdY+x7UOlJrpNn9TU25OaNoWgu56ETJSjcSb3+ziOKSdBkJ8ZghP06IPriXk2/H6CyLXXzY/pvRlHb+36kQwcHMqvYxWAVDq5SRh1uMWo9A2SsRCN5aBwG5Lgq0A9/sXnCBsyich9NkXBG3/M5CEmtygYl9zvIall5Or4pqR57TNTEBAHFB176BatadvuIVxu7SIev5zjQgVur6Tzypd8eLC9fTo7xOO+UdaR5FJUZNvqQr7oNeBAZqCT6l0/EpjyR9BCoLLGkzqLJnYO39Nnw2ouO2xizIJiFMJV+95jLmg== 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 AM0PR04MB4563.eurprd04.prod.outlook.com (2603:10a6:208:6b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 11:25:34 +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; Tue, 15 Feb 2022 11:25:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v8 1/5] Squash to "mptcp: infinite mapping receiving" Date: Tue, 15 Feb 2022 19:25:50 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0115.apcprd03.prod.outlook.com (2603:1096:203:b0::31) 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: a0deea50-a01e-40dd-f0a3-08d9f075e1d1 X-MS-TrafficTypeDiagnostic: AM0PR04MB4563: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: zATPSL4kp02pvmST6+uI9NYSOYNNw87AL5FemQ7Kf59LSkgkK6sQvB7MweUumycyHJoiNgd2WhYIK+0nnRNSgCVXHz/1zhyuuk3aZkPg5JraMNF9cEHO+a5xi+SKw3tHJdMzCjkk4gKsiuC67t3UF3Y6up9+Isqr2ux6ITZtHtexIMB93Sq0oqamQ7/XBcL8q7dzO5lBEG3iKCfSJQphBCW3NQsFD21QxgeYxY35L8UIXNJBW1ttfItG6RzBaraoutXEqxdzuE6i3IIaNZJ+xzH78N5+4zINoUIXSae3Z8R1qIQPC3C6nYH7m02eZGobs8R4OYUGXcLAR4sRpSi0mclpZSdoBonhdV2MvXlZCboLBsIKEuut8c2E3W0gmsLEdpkbH7AMMxPI5OXHSrIA9MivNcAvGjJL8KvseZgs2gdYqgs2Ao56QLSnmpr/eEqBb9l9FFjJX1zWdX43j5quCdpik4qjWraBIkvCIBWksTeMwgfJwjZGAxUfCzrP4Wsy3tV4mnQgsX5XNG7rm3rf8yOZwRB2A8fooYSwx9NXbYaqm7RU4Zt31PwvA6aw+965t1AzwNsk0OMHdqeYwAqp2xK+bAIKfE5vzz41/qD8ychtn836JMFTHqXJ2fBi/ZS9MONuZGV7Vv8hpdKh5dJkww== 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)(66556008)(6512007)(86362001)(66946007)(107886003)(36756003)(8936002)(55236004)(508600001)(2616005)(5660300002)(4744005)(6486002)(6916009)(6506007)(316002)(26005)(186003)(2906002)(38100700002)(6666004)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5bePCimLwDhI/jQPK73BVw/WcezcMXLzMhQ4/iew2xU04SN/HpekgN14YhTK?= =?us-ascii?Q?OxXLtY0gffSHNv9sNmvGtUJ2Mu416z+p0nrvH+lMBbhUuLU7SqRvw1mfkV5v?= =?us-ascii?Q?ddy7Is2xv75Nfi8CLQySDBCrIE6kAzxzFpYCNTMII8UXZfQweBk+NYJO3xfT?= =?us-ascii?Q?nm3GXqaGy/HZ6NXc+zpLrSu8DcEb593XuBAAVH1j4DbYum5//AcCyQIDEJ7o?= =?us-ascii?Q?g3mwV3uvYchTz8gZ++OuWLckhkuVZZx7SMvA1XWRUrkAIGuZqPknJhQzIs3Q?= =?us-ascii?Q?P12XGNotwbnvuZL2GqD27FM+TeVE5Ecqf8a6mMMZ40IzfWbWU4/ijffbv0hq?= =?us-ascii?Q?kjlA2VwofyWZ4ISN3/xRrZMjobRvzXWC06Uy6BwYIZcaafLnM5m5I57Flf+a?= =?us-ascii?Q?qnS/rUbeflVDWCmQGzHNGR3J6RpbQcBPrjy5PTVwjuywAkR+//UI4cxtbp+4?= =?us-ascii?Q?b6BhzpYSBdl711CyGD6r8V+VW2p3SjQdKlrLjElZgGcEmpueMsaGInFJ3X3M?= =?us-ascii?Q?FnJRHhG6ybQ/MGDKRGJ/e44IBrgOreJFc8NUiUvOTsDoS3Kpod18f7HMVntc?= =?us-ascii?Q?Ja5BdpwcPoTkBLgnBa3ebMbqvRru8QvnjkagFwYKB4dsMNKysMuaWqAonTzn?= =?us-ascii?Q?ULbq/REVaHAgEmbtNI0FzUXXmobxEMRhuzlVBxLGL6qlfn0a31WmAoxuJNvr?= =?us-ascii?Q?UjzIsT0dvwOtdADPQoILlV03j7kzRDycaqKsdnHRVzc/GV+uegnbMXFc8oBp?= =?us-ascii?Q?oJAVZH6h0BucvUHridY+47GWxz1z+RjLOYOLMexCllGojEuIkersq8lIyQs/?= =?us-ascii?Q?n57BQMuNg2TEw9rHDX9YYKdMU37TKvoUbUiwwZu9SDylI5ghuOSzy88crXlW?= =?us-ascii?Q?9pOhqA/RhAIKEobz1X1wqtFTVkQM9ChKsERKQyali0njWZi0J17BD7JeyspA?= =?us-ascii?Q?xs/QSv2o2t6PfW8X/2e3k9R1iZJk6p1aI+SwtB8myEQy9DVA4MK6tqmSwqcm?= =?us-ascii?Q?YBjIaWmpFr575aS7vTcWYzasceIKM37MNAuxksrHBxBTWyeKmlRsUEbhyYsF?= =?us-ascii?Q?uyySRHzOhheNVBdy3yi9mQGnoppdXEDXIkI6kbBiRuiHWCMFBxJnxgtU5PFv?= =?us-ascii?Q?sZl3yfOPPL6oz7YyH6irurqUiLSW2NCOwCm1hNkWVAJRCj/sBN9ZfyHww1jT?= =?us-ascii?Q?HTQfyABE4X5XiR8+YZNpowiJi1OdHNmAvqlgI8lHUQJIYpm66hF6+NWh/asg?= =?us-ascii?Q?AtoKVDthsOs2szknel9QEMOTE1qbiI/x6kOxTxaLqXN5TmAGzrFMuZc55IDP?= =?us-ascii?Q?NSt5uvhT87Sxkl6m2iryZGr4omh86B1tPcC1RdOuIyISUa7UJ4X6TMMj5pQn?= =?us-ascii?Q?U/Eita9CIsr9TYdp0sEnQPYWuXn1wiLwqM2itHcGxKOkCwvyIyBlwf4vNI09?= =?us-ascii?Q?u2lg3TDfTBFhgZPSGHOuJvAJ2q7mMJDpIyXKgjFv5TCaACQzr32gACOhYX8G?= =?us-ascii?Q?hHeABIQDZZR/2pI1jgMQ0PKxFoEzn24hvoPJLvI02lkgDn7KxZ8gy7I2SJIw?= =?us-ascii?Q?KCuCoBgKD+xN5eOVOhXCmVmm9Y+dM9gz9AAdUZ3+hy4RM/rOMauIk0A8PMCS?= =?us-ascii?Q?rProi4ze5/JkmgV4Vda4QMg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0deea50-a01e-40dd-f0a3-08d9f075e1d1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:25:34.0732 (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: tJTQAOLH/IG/zTLl++aSTOJZ4LK3DZRQHoDkWBdO5P3nWwXNJ6ua7MfMQXuhwU1tN7Z+ejL8kHj07/AQW8Cs8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4563 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 e727d838da0e..8d086641bdc5 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 Sat May 4 07:50:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp446462jad; Tue, 15 Feb 2022 03:25:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhHl1J2pLlb2hzYGV/SVstgPRPLe78k47yU/nfqezwM3UgxbyL1ylALLGb1lTdnD/fizmU X-Received: by 2002:a63:6849:: with SMTP id d70mr3101381pgc.262.1644924346988; Tue, 15 Feb 2022 03:25:46 -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 g4si2529907pgw.101.2022.02.15.03.25.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:25:46 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3751-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=hsELZM08; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3751-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3751-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 A68043E0E6D for ; Tue, 15 Feb 2022 11:25:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 054EA138F; Tue, 15 Feb 2022 11:25:46 +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 A86901388 for ; Tue, 15 Feb 2022 11:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644924343; 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=rpvjijw/f3FOXqWwuq8fUOziZPUJ6WcmIUaWPaHs5PE=; b=hsELZM08tLijBJlNObOW9Rv77OD+7xQMOGwTRwbPXb5E7/5e91QtFqyfmdKSOBt72XUPmv EKysifnNsqza6bsQN7/TQ+eUM0uPAsZbPXoYL4BNyZ1BDRRBk/Bf8C3+Xft+XK+aFmCuLE Ong0LJbP0wXw5sveo8BobL97mCkRWAI= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2173.outbound.protection.outlook.com [104.47.17.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-15-liiGyOJJP5erqv0adWcN-Q-1; Tue, 15 Feb 2022 12:25:42 +0100 X-MC-Unique: liiGyOJJP5erqv0adWcN-Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=InUmXLw4BHngiBCaP9FI7JF4IKnHrXzAt+lp8LwRmyVc7Rmfn2GTgqfMr4+QEsrCN/VL9BPJwvLn1tsYQjDb76oRKKnLPqBnH1JVlJFIrE03Zg1wYN/M05Jwfp8MydVC0wc3iLkLr7kLlyBI0yUVhH7ZLDz1XlebEAkGYj1pNg2HyD4c1/y47ft4lITBFcNvkvpcUPdSMrE7JDEOUoRJM0IS3XI+b9ZSJdHoQupc4H36XFDURYXuyG1AsBb0v8siCbxseeixs17Z5Ya2/+NF1DCY/ZGO12L3v7h+8XR3EwCbvLpUROn6BqwLYjOFCOWepNwgNdmrQfNgZOb0NCBezA== 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=YaXkYwJwQdIcg6ho/r9axu6yM8n7F9fr4yUzlVW4wTo=; b=Op46hhz8uMgNjcIjDr3iYIYdNtYgMikk8fZWc8BHgz4uc/bWOdC7SUy8Z0of6GMfKbmosHDs7Q9HxK1X1bEMqMgN7nci2rJFMBVt7Y/YZ2L+SI68qZo3avnA2yV7OdVErNSZ6SWNtib5nuXByzV+BbwP2fvShBFaND/sx+TMgPtWNQVNAjexSmwnLmffSwi5YsF9SPB5MksSCNuhdlPM0ypiDk+cLe9L5sZDan3NiFBZdNKm/SCNCfZACmacyZgz1iUUyTMvL6kFpC6qQEl0IQLNaDVvZvF2tsZa1GzsR20Zuq68pyNaOf/gBjFGPzPRLv1HiI7tLuGoYZHd7LMk5Q== 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 AM5PR0401MB2561.eurprd04.prod.outlook.com (2603:10a6:203:37::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 11:25:41 +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; Tue, 15 Feb 2022 11:25:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v8 2/5] Squash to "selftests: mptcp: add infinite map mibs check" Date: Tue, 15 Feb 2022 19:25:51 +0800 Message-ID: <715e59a39bf5b1e2ec095925004fafc28ba605a6.1644923833.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0063.apcprd04.prod.outlook.com (2603:1096:202:14::31) 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: 90e3f54e-6645-4a6b-5ba6-08d9f075e600 X-MS-TrafficTypeDiagnostic: AM5PR0401MB2561: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: ocBFdR7IEp2qCNlW4o923CnUU7mB//FKRKuikA/WyLkbepDGt4KP5F5LwQ/VoVt3ixGU6LFc7zBvgAEqRsu0hTYfBomD14ZuxLRUH3SQDohY8bf2LCqZQocCbE6FwwHqW1Dw03neXWPg6rNhJNaboKqIPPTXZpvu0NZPNHJkyBhoPc1vtyEPhvdqckU5TuMKc7Thl+O0btFW9YSiYjrdipjIq9fnmHVU1SY8CZYcc5Np392RE0J9/shRMlTh43SXKsJzCQgEzOH9es/kxZpqMt/BuVtbHuM04lBFhimasxkizAyXrVlYS/osk8nS7f5zwjmz/yRpzVTOvDK0XN5wMViGAeCheJn+n23Z37/Pqgi5lXmQ0UDgIfAeYK61LEpFXt/G3KbTa64EO4CtjMqNHTm+g/px3X4vCi2/frF1rPH2lJiN0pvxUIFuK4L0aOGEtpY+HU4ugBBn3Tv9F1B10RK1HJzki6Beji768Z84UNd0/2pgj3L3A/7hafQp09GqTQbVuIDPvfk7L3czTnzLuH17oaPjBI00/A9my9f01GQUH7pagIYPo1SlGrhWneAwwUJZyTzdrtFlldMYTTF/0tIHOQyDU+qPAGtiMEyyiq5hXAOnVyw94CJuMgkAjd+GozkNhtrqCc/2MfNwEDsQzA== 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)(4326008)(66476007)(8676002)(66946007)(66556008)(508600001)(107886003)(6512007)(2616005)(2906002)(36756003)(86362001)(83380400001)(6506007)(6916009)(55236004)(26005)(316002)(8936002)(44832011)(186003)(6666004)(5660300002)(6486002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7lZMwtQ6BAHTSSu9Xak4fAm19fKW9PnQReQ51+1JJF+QPlOB/QHieJycjDkD?= =?us-ascii?Q?bYpLK7eSpfqvGSu2+Y+m2ZtHKTDartqY1/JYzOOYDRKTr2utYdwKBvknAnih?= =?us-ascii?Q?5R1uDrluaUfAO67pj6zGS113C+nVK59bMlYYDJRSncs6GZ3P2eddIZ7Ff1k1?= =?us-ascii?Q?v9P1BvAEawUyRSgrsPFGzP9Ivw18PBOa6H3J3Z3P/2sBy3YvPTxTB6pTSl3A?= =?us-ascii?Q?OhPLi4hl3lpw0sLZalpAeMCljdbqybiTofmx5lPpsmvrc3WjM/ywy6ki14J8?= =?us-ascii?Q?p27y3+b3zBvlMlY8Hf+E2jhnJNmcKIbl2kjTBKYDwmEcEgr8IqSrjadIZ2hW?= =?us-ascii?Q?yDIPi1WC+O8v/4he+f+b0/rLGdVxtXHebK+SF/xtD/D+IV7Emy1AbsxvVBSI?= =?us-ascii?Q?k2Gvpn1jfr4Gqmw741qtyC48bBb+vrijDIPEn1LY5l+Dew8DW4HqK/sDhRHZ?= =?us-ascii?Q?ERsTat4LW9M8Bt4hvvTsyCwOp6Mh77VlJ99teyBhNMMfpLsJ78A3vBqR0qY2?= =?us-ascii?Q?zW33MT08dO4QcyyP/RTe2nnhfgQQechkauvZupBdhdbRSo92aKhiZZiOqmKY?= =?us-ascii?Q?p2S71yPDhq/90q2dwmL2q1LcfP5PwN/DVU/nOdAJ/qTncbRws+LGSB/TEQ14?= =?us-ascii?Q?lSmafn6X9fbgj8YG/w7AjRHckRzSPuo6h0C81VxVQW4fCt8sWEcMGRmWNeld?= =?us-ascii?Q?S+hf/ihKEgcGfan9QpsKVCt87RL50td8I5ggI2gW3c1SLos/TyKeL+1AsW3O?= =?us-ascii?Q?yUVJjf6LMj/EZ62s+c7W8WViTni5ATcu9FyIezou+Adnc2NE9j46LK82dgpQ?= =?us-ascii?Q?mWCPRUt6HmMbvzTH0ayFdenvEaCH8rAYUIfjTRnyrgIfkFlV8+cflX3OGr5b?= =?us-ascii?Q?t2VL0XrKk1NZE1lBGMsPrBVnyq9+/Ne2rSfrtO6a1eZNpFgWK3xm8t8U/h5L?= =?us-ascii?Q?u1nRvdBJDNY7TbnZRiXtg0ZgiqOI9onVlONJn9QGxnudBUAVgkZJ8G36QJlU?= =?us-ascii?Q?iE7V7TQU/ByU1dW6ltT2Y/z0zyV7Taz4bTV/nu0R6agg3OpjJoNKgmKOPGEe?= =?us-ascii?Q?xcqZs2AREoKAWe0OstDf3g5Q/tjV9xmCht79CmVd9L3jnVtW5VqcMoJ8z4/T?= =?us-ascii?Q?2TUcLx1E7mnSyEdAVR3RoTZGpe6H41wdDgFsAn/Kr8axQBnstJ9CZkJkZdOn?= =?us-ascii?Q?QK3nyxIHvXr9XZiSFClnsoVXpEniUxFlcncU+Wtf9H53PQ5k2TeJ2qNWr9yb?= =?us-ascii?Q?oAr8B3kh1YYZWm2Z61SJw2mZkOyX1hO5H9RF4w4aBEA4jMemCLtUn77U0Rck?= =?us-ascii?Q?IiG4go+eWSmZkeyjjOou0AipbqQb0IDJsA2WAqKnFOJ3KnQx4pvXQgU6gaVJ?= =?us-ascii?Q?grRSj/jj6fnEa5OIdRzDtxo+mwbavqpRdnEAwtJkDti+kHp6BeWWMzQO0ZYT?= =?us-ascii?Q?LCEju4bxRNsaCObIPrxv5JtZzqS+P8HNAHascf4uGsGeUIcGpjDGYUXDdqB/?= =?us-ascii?Q?IKHWsKCdUsJ7o7gM4ouLBIZEkQGWTfp9iU0t7qbXjiNEZVgwS0cHcP9Uzniz?= =?us-ascii?Q?VfwyjNxeS+3LxLoo1CPYMChAF+WR+c3bWhJLHZVC3rNbboo9/zzTdmddApor?= =?us-ascii?Q?gIOGlUCNJBak7PFq97P5Fyo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90e3f54e-6645-4a6b-5ba6-08d9f075e600 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:25:41.2914 (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: MVOdwTKPAo7uR3m1mTboqH+L6jrAiKBLLnHAQWOBkHpDTSjnB755zwEGTLjFzeRnHr0q6RgE6U9Hx2y2aIrFkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0401MB2561 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 00a35601f319..243eb7e14921 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -859,27 +859,27 @@ chk_rst_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 May 4 07:50:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp446535jad; Tue, 15 Feb 2022 03:25:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8Imu4z8pCZQJvto3lCXtorWDnm0dj6HRVNJPexlOdARFC3NS7ERAC7cha+oipyhYRNfQB X-Received: by 2002:a17:902:9a88:: with SMTP id w8mr3752364plp.20.1644924353810; Tue, 15 Feb 2022 03:25:53 -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 191si2488169pgc.467.2022.02.15.03.25.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:25:53 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3752-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=BeR1zg93; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3752-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3752-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 7E2A13E0EAA for ; Tue, 15 Feb 2022 11:25:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A4472138F; Tue, 15 Feb 2022 11:25:52 +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 3A2AB1388 for ; Tue, 15 Feb 2022 11:25:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644924349; 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=iRQFT+nrVqdwa+9VeBIYqDYwyUIsupuN7EArlkMTF08=; b=BeR1zg938HUhkzIp3klW6ad+74WiuhbP6rWndA16zK44m16bO7HoBN/hw/jlEkfyahw/Ra 4jnYggVneMx4LCKcTMgrFEawy1Xp7SuDGeXyMkTy92WUpxHMcj2iGQMG5G4wt1SbIl4Njs /7F5f/hENtcFoupoQ6NaPC+rxhB7uu4= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2175.outbound.protection.outlook.com [104.47.17.175]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-37-Zu79wExROZOErbqmR3aCZw-1; Tue, 15 Feb 2022 12:25:48 +0100 X-MC-Unique: Zu79wExROZOErbqmR3aCZw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Buit9G93EOD82B+kjfqt6mY/2pCBbnHHAwCHWmvjg8ecSYXtvK22l9ypqp4qvD/OFJZHvlDjDEIitQKhnxW/6MCLiciGnRozmM285wObH5Xf3WNWHlr5ZnhDxSGpEHyEYlrxrkiNneOW+PcWmylO0EE1AhAb5JCYwEXaafvTQCN/Mg7u1Ov882XGQUK/PHqu//12+8s9CqKcEMniOfYcBIo1gxBFrabTlBRUy7OFthv8DbDkWlLMFf1ZIVrcAWJuRsDcIKN6fuh/yNjOP7jQiRD4XgVqPi9C250KBNWM9u/ChrSjI5VCQUyN+9oe09X84mmUd9dyr/Os3UclfnxJGQ== 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=/F144HjJdOIHMFI+kZ8lsHuRt0wMvKZEiuterjlqHYE=; b=AWeGIZz5qSgULnGg8+9Z6MG7MBZP++cBKwmnZlWjjwT1m5nt+Xg/HoC2EOZScIQlCOh44hVXXlYzaf12k0I+j3NWwuX6rjtc5w640iOzQ8hYHj1CxRne3+YACV80JPxE3hu4lc+n9O8eSfo3u4gsP2Eel5Y/C062MpFh1RZJF3H+GMA13AcD64zxfo+jOMxq21zLS+E+xPMiqb4g4NBKaAYfnH/jeKrzjf+ULUssGT1sEpSNfJT+8qe75vYScgBKsM6f0fy61iuvOya8h522SS6rXPfDNiGCFWlpmnPTv/45qUZiajuFAcVHpPCRxeP7saG5smQ56gTf27sPc3aJwg== 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 AM5PR0401MB2561.eurprd04.prod.outlook.com (2603:10a6:203:37::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 11:25:47 +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; Tue, 15 Feb 2022 11:25:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v8 3/5] selftests: mptcp: add more arguments for chk_join_nr Date: Tue, 15 Feb 2022 19:25:52 +0800 Message-ID: <701fd5e7e3953c1b05c617ac30ef3b9b72b1d470.1644923833.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0110.apcprd03.prod.outlook.com (2603:1096:203:b0::26) 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: 98470841-a610-4372-f397-08d9f075e9d8 X-MS-TrafficTypeDiagnostic: AM5PR0401MB2561:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1775; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: edNf8xTq9eW7jfc/mfDBA4vruh0yo9qAJZ7SleG0x0oOEyqM1aPQLmUWCIi/LrwuwLlVhBIN52ojDRN3E0u19h+Iyqj+o+d04DGAk+D1Pa3pNgeFhc60wSTx5y2dsN6NN7XNAKVvqjRcEyGEuao2bKhjpGBZPsafaLtienjWcws0ggjkunqami6NjKZjYfNTfOtUPxe4kkVLGPxINw2cRqGdWlhkeLaUeMMdukz5p+Q0AWL9C8ETBxiKC99QXCFc6I2wc+KKuoqEWZPgtQAz8Sp67J1pluLXvjEEcg8ZAQAZyCam1A8Vr8OJFCeE+XD8CpZH6+F/Nq6a37ri3bGICKfxyj41l1lbAgoeu3bmP0aHsRvWr8HlqW3FT1/aJwkoMqTHOx63XDalQUoskG99wz9RhJVqzgUfZoWK1+yKbq1ktOza3lcLYrzR2arkft2B7LRUABUUgBrG+2/5Y0eAKP41XcQSCwR2TlWE8rx3iisgyv0OaIjDK72yHth0amQUC1Knjpt00ubki93ed4i/Erbrcs+wx2WjRTug8Q0YOc0cJoJg3RpPtsRo9TDF9+lDRyp6QnMdPcl0QdNelnKernn5zvIikWoAmlpYBbcurwil7fjka+iQ+Z1/nYdptcu9mplSCnM4PdFRuJ/d37dkuA== 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)(4326008)(66476007)(8676002)(66946007)(66556008)(508600001)(107886003)(6512007)(2616005)(2906002)(36756003)(86362001)(83380400001)(6506007)(6916009)(55236004)(26005)(316002)(8936002)(44832011)(186003)(6666004)(5660300002)(6486002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gkkq2mj6lrAiVwKcNtzB4o2jW76AJGIN/R7yZ10tIvj2WlgAZ/qf5giOQQHe?= =?us-ascii?Q?TVDN/R9MmYvpRhMNPjPPp0qUn7T+vXQC8la16BpXc0YqPA9+2shQySuJQhGJ?= =?us-ascii?Q?59O4UrhHMNrbo2/op1vK0hWoc4hLlxWJYmEMNA/JDr9uMiQ8vRtqWmicADYv?= =?us-ascii?Q?VAmy8hzDZs39FJ7Q0PMauSjapsCMRoIvfqtpP82qet+xZTO3LAVyYmWnL0cC?= =?us-ascii?Q?/+V+gznwHFPvMSnWpEIPf7TkKaRjdJDPTKW6CFIOy+PJMZ6CQqB4m6zW7Kw3?= =?us-ascii?Q?sjA5KPj8Vp6XxyCkmlrTmCzUIl2mxR7C/pBNorJJRqGsAijWXD1n62AnFKng?= =?us-ascii?Q?jxBRurBS/vxZaESZay2q5Vb9hX4sGELWZbiKQL1t0f264KD/vvTY0l61mv7s?= =?us-ascii?Q?5balUF6Z69GuQZPfACcbKj8fpN7uP/ijE/TGGud8C7A9kvJE739raISfgRI+?= =?us-ascii?Q?6y42E+IUB/1zQU5Z2JeuxkXMU8zdjuBD6q8ixg1wDbr/kOU9HgWW6VhIwGb/?= =?us-ascii?Q?MFyoa4X+CT/ZHx3HuxvQKSl68KfrNQ8K6RgC3KFnKjYhhsCzT1d3b5oCGUqy?= =?us-ascii?Q?10tCHeM2JF9oalPM6dPWFtry0oIu6mUePdOtiFjqz6zN+jxWiIMRhHqi+BAw?= =?us-ascii?Q?zNE+epEy9Sd4O10ePjsvNCPqD2apR0+iQnTGTwwdR7FXO6o5jHv03QO8UJSh?= =?us-ascii?Q?7KlPAAOWnth7H4iPJzfq/KqimGe7sdm469cLLHedjrFBH/gSgVTDGsU6Fg04?= =?us-ascii?Q?dwbkVpn4YSAi86rj8CVQcXpSZroG9GKEL/NFRnTNL4mmr/gZbW6UWCgfmHPC?= =?us-ascii?Q?r+KMOJPOjYMNVhByciKUNGc+JsUjEd5+RR+266owObFRNBSmKp6rVqe0SDji?= =?us-ascii?Q?P5leQXn2+vcr66IQ3phz5wnP6MWwa4wrA+w8IICbrO3Lbo1tCEXehNC5Hhic?= =?us-ascii?Q?3JxDdqKl++JqxrgJot5L6J7bMSbv+j68zhdT7BFARkeL99rdTrKevaLWOpjJ?= =?us-ascii?Q?aubnmH7GiB431qRkOneI+TVq472XUlnPn0mQGjPD3D6O3nBGAghEp2agSWI4?= =?us-ascii?Q?IefPZyFEi3ErOxrON9QoPMw86Kl67sYiTJ9wQrOAcWmI1VxONFofyrCpTk/d?= =?us-ascii?Q?M1vu3lIMti5lGZIbUMw4YFshRpH7PWOa8AmRBJHct60Umv5ScQGEOhsLVgj/?= =?us-ascii?Q?96CurRlACud4xFPsqjt0xfZ8M7TOZjrijVUpx7Q97YC8eJlzDo8j03fGUiLA?= =?us-ascii?Q?V28JqqnQtq8hHw65A7Exb1Zxiz5c7hDrtZnnFwPM2BPxrUzyoTLNrs0z6PoL?= =?us-ascii?Q?EODbkwfIYiO6TtT0V4GY3gx70AS2FU0h7SjaVUR+LE6EkK+yQoWD8CZm6sOq?= =?us-ascii?Q?TDhJ2pqQT7Rhyp0ZLiOF2uoomkmAZFvzs4hLmYl+tnxOq7rcPW72W9ckqoaz?= =?us-ascii?Q?2q2tOSpcQIiAW7i/Savfvdg2ATuQQGpJykYe8WSnYY5jE7o8UaUr0KArd/+k?= =?us-ascii?Q?k0YWslAmPGsO3IZlUqsyYSpYM25AYhPpprW4MOtIUlPuuUVA6Wm8EoOFN3Ii?= =?us-ascii?Q?H8PNuy+FMWb6sBfk4kMYrrfK1n2slZWxGuCKEmlaA1FnKVb0Du63JtxpvaW0?= =?us-ascii?Q?N545jhIG6ktNoJPSnHvVZf4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98470841-a610-4372-f397-08d9f075e9d8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:25:47.7597 (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: h3XWcLvDDC3cBR/oOOPM6jqh6Vevk/UAhr4W9xQVpk+c7r+Vjly/7ILwsLmPdu6dIRBMdrSlcBwH9W67g78GwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0401MB2561 Content-Type: text/plain; charset="utf-8" This patch added five more arguments for chk_join_nr(). The default values of them are all zero. The first two, csum_ns1 and csum_ns1, are passed to chk_csum_nr(), to check the mib counters of the checksum errors in ns1 and ns2. A '+' can be added into this two arguments to represent that multiple checksum errors are allowed when doing this check. For example, chk_csum_nr "" +2 +2 indicates that two or more checksum errors are allowed in both ns1 and ns2. The remaining three, fail_nr, rst_nr and infi_nr, are passed to chk_fail_nr(), chk_rst_nr() and chk_infi_nr() respectively, to check the sending and receiving mib counters of MP_FAIL, MP_RST and the infinite map. Also did some cleanups in chk_fail_nr(), renamed two local variables and updated the output message. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 76 ++++++++++++++----- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 243eb7e14921..ec8d750c19eb 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -745,8 +745,21 @@ 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 + local allow_multi_errors_ns1=3D0 + local allow_multi_errors_ns2=3D0 + + if [[ "${csum_ns1}" =3D "+"* ]]; then + allow_multi_errors_ns1=3D1 + csum_ns1=3D${csum_ns1:1} + fi + if [[ "${csum_ns2}" =3D "+"* ]]; then + allow_multi_errors_ns2=3D1 + csum_ns2=3D${csum_ns2:1} + fi =20 if [ ! -z "$msg" ]; then printf "%03u" "$TEST_COUNT" @@ -756,20 +769,40 @@ 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" - ret=3D1 - dump_stats=3D1 + if [ "$count" !=3D $csum_ns1 ]; then + if [ $allow_multi_errors_ns1 -eq 1 ]; then + # allow multiple checksum errors + if [ "$count" -lt $csum_ns1 ]; then + ret=3D1 + fi + else + ret=3D1 + fi + + if [ $ret -eq 1 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns1" + dump_stats=3D1 + fi else echo -n "[ ok ]" fi 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" - ret=3D1 - dump_stats=3D1 + if [ "$count" !=3D $csum_ns2 ]; then + if [ $allow_multi_errors_ns2 -eq 1 ]; then + # allow multiple checksum errors + if [ "$count" -lt $csum_ns2 ]; then + ret=3D1 + fi + else + ret=3D1 + fi + + if [ $ret -eq 1 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns2" + dump_stats=3D1 + fi else echo "[ ok ]" fi @@ -778,27 +811,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 @@ -927,6 +960,11 @@ chk_join_nr() local syn_nr=3D$2 local syn_ack_nr=3D$3 local ack_nr=3D$4 + local csum_ns1=3D${5:-0} + local csum_ns2=3D${6:-0} + local fail_nr=3D${7:-0} + local rst_nr=3D${8:-0} + local infi_nr=3D${9:-0} local count local dump_stats local with_cookie @@ -973,10 +1011,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 "" $csum_ns1 $csum_ns2 + 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 Sat May 4 07:50:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp446608jad; Tue, 15 Feb 2022 03:26:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5ypdMhNierde+OwXd174ZQjljjFHA5Te8NNS3W/EynaxamLJvZlZKmyTlrCRF0v+0tUBX X-Received: by 2002:a05:622a:95:: with SMTP id o21mr2269538qtw.79.1644924361129; Tue, 15 Feb 2022 03:26:01 -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 w20si7989741qtj.775.2022.02.15.03.26.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:26:01 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3753-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=RNh9F29p; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3753-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3753-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 D0B5C1C0A4B for ; Tue, 15 Feb 2022 11:26:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A9739138F; Tue, 15 Feb 2022 11:25:59 +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 4E2B01388 for ; Tue, 15 Feb 2022 11:25:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644924356; 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=SVsvY0FGcvQbZYEOP+p5wf1KQESjCbxLjtBX+tOU50o=; b=RNh9F29pKFaygJIsXOAZpzkXympWRuNnDF4RGOwRjIQaEl33Io6/Ka0a+fHx5dsY+yx/z+ Bdv2TCJLKuS5TozJqySDO1Ite7u2yUkNw+UDfYomycDT2YsW/5unFHP0iRdhllKQn8X6Xl q0W2oaVyO4kvAfZsFZWGoaCXz/l03/w= 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-38-A6IN-i9cPc2WYvpvFTVi2w-1; Tue, 15 Feb 2022 12:25:55 +0100 X-MC-Unique: A6IN-i9cPc2WYvpvFTVi2w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BfxIPMHc8skEzarvC3LLk+Y1eeMQf6RcRWj3s//hMdpjCKFy8/MvnL2Ohgds5TVMeE3yn/4/CVp6pWJy1MwgUIXCezZCZHxinuFSOG1qtjY7u6IDB+Jy9Cy66OVdnc5VPgxCUvurXKK6A2RLH03Sr+DhVZZwtSBDssIju+t9hh4alslQwo4hAojnmIubGG6LGlsh08OdEBS0/JrgL7JBlaIEuVJK/z6fPF01tZBlPJmdS7HjmiJad+2ETz36wvUs6jnWWN8+iHgDEj7lPVADb00WJg0AAeosoQR4YAwIW30GBAi/n1Z2/rMuRmGH4XXhLpuAKXDRMlrIFp+9923C0Q== 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=x5FayZXx4Dy8UfTKzTWeo82Q4Xsjml1HXtRd080vj9E=; b=nvufbnn0Isa9ju6xOoLm93gZSQUPqH0qpyiQy4Hojk3Sl3Unh2f/Ynvrlk/1Q5I54isjIVQtE4gnlkq3niA7nTE2lFa7NO1BslGDDS7AzJ7dbAs7X/E6CPD3E5eHne6b5yhzx/Tx12G3rPeKOG2mLWImbUYDuX+vGGnL1/CwbpdWgtiDwdpibsJTo91L/QRB543G3Y10wbMe7J4ds8VR3RAD4CzB8pvCpP4wWNyUzLQzJMGsHaddndQj0uIs6rVsTYXM7mylR26pB57naMPHwgZsXManwzmP07i4QGQeRrIZ4sZYrmKDHAKtmTGMqBEKfuyZaJfjC9m/VfNFv+uTqw== 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 AM0PR04MB4563.eurprd04.prod.outlook.com (2603:10a6:208:6b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 11:25:55 +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; Tue, 15 Feb 2022 11:25:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v8 4/5] selftests: mptcp: reuse linkfail to make given size files Date: Tue, 15 Feb 2022 19:25:53 +0800 Message-ID: <56feffc2bd83a521f38c0424768441aade4580b2.1644923833.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0045.apcprd04.prod.outlook.com (2603:1096:202:14::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: 5ce30ed2-d26f-4646-5a7f-08d9f075ee45 X-MS-TrafficTypeDiagnostic: AM0PR04MB4563: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: jWIngIO3IkluQGgVFf5iZSg+LFxp/awiY6/EDgrbLXB54gT9EuZw0fxq8Rcv7gaSsZI/+uDjWhxob/PLWqt6UL8jjN/6nbRC8SXugjslB2LSXwhmnALZ3JXOD1bMWCxyYCNAPoEaAHKcep+jvjToPV5NQ2mIfRaf7tJ0v/PjH+wsa+VRlupXNJutsZzm6qVRWd6hPXfP0LKfvMdbn+bJTloHH3/XbuQMmd/H/4uWnisq1S2xhIs2VYdqfMgjw0sBsD4oFiK2d7mrTSlawU9B2w7Dd8+SfXhb2dF6oJxT3hue+uPfsEOCifKf2nU7Ui/lrJAJQBsiRo0I4juuG0JVFRLIgL4y4tEAJ23jhUiTZwNu5Ldp2QC7zOC42LKBwrlyLrfZVIb8yGQtCHUdHc6oTmdAKYBh8ufka2kmh7RuzraJHJPPC9brYDfdufssmPd3uHM6+uPx6aepTpQcf+EPCqLY1gvS5bmto9QVfJndwOlZAufAIOmn/gILg2ApTA/U+AABVvEQr9ATaAP7Zq7fryMOW+/C7fvWS9udmfzOyOSaYhttSxbtIMjFQSt2thDKnCM/Nu6rTDbSw/7zT3nKhIS1i8IzpL9z9EvDBHIkghNsXczmUVWQnyeB83MRZCyek6LVx6qVE+ehifEKfjvEp1bUjhgebwB73RwI3wHF0F+oEGRe8m/fuHJb1jaTqbuofcuMw5Qo/Z2Ch0+zKdA/FQ== 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)(66556008)(83380400001)(6512007)(86362001)(66946007)(107886003)(36756003)(8936002)(55236004)(508600001)(2616005)(5660300002)(6486002)(6916009)(6506007)(316002)(26005)(186003)(2906002)(38100700002)(44832011)(334744004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?K/roKvTd5eRI+4tAqcwTitb7eA4TZzzjAUFIu2C2gyuab8U9t4XvG6cgziM1?= =?us-ascii?Q?gerA4QZargIi99/t7782PAPFOhy6eIHf7SHo9KqRW7H5SGEzPWJJclW4oKKM?= =?us-ascii?Q?uZS7kpyZUznpRAl3boX38P4fblwJRvxfaOW94JJvZy8Rhv2xoQ6Svih9wQh3?= =?us-ascii?Q?IsdUaN+7EtZpGGr2AugMdsvpss6f7ctK4uAhukf2Qr9Qua/Jk1ZkM0Dmvy9w?= =?us-ascii?Q?SJdtmU+XX5VlLWSVWip2M1K0vpfIySOeCahOvMQIj6UWcbGq/01G0dt/aMaN?= =?us-ascii?Q?H1X+2Ag8mOjU+aANHoKNlpZlgWoGMUKWtHlJfrTAUzbAEPA90DJ1BhuLjRsQ?= =?us-ascii?Q?zYdQEUcziERm1HwD16KMWZOtZgt9fb1kQNhlMg6qGRBdQZr+YqspfvN7X0Ea?= =?us-ascii?Q?6LMDRLaUqT3lLZRRQUAgZun+4ce28aT9A5RET1SCM1DUIoCw09G6f6vzbuh3?= =?us-ascii?Q?p54FSIyaC40wIN0VBShC7vbHcPEnhysLiPRvcWVUFRNOuy0Yu9Dj6a06DH/V?= =?us-ascii?Q?Bt3nKNzHVT8MuZs+GnIXrHwJ2EGGw2oVHOj75b0fLd/4thAejf7reNaL+etn?= =?us-ascii?Q?3FjutUplV5SyRVhU80rGMGwIAGWMQtp2Y+uFRFFUcFEnfQU2rSK77KGlUXGC?= =?us-ascii?Q?Kfkn/BDJI6W9Ede3fcI7apDDteRhmH57p3Wtvhf5uipUNiuc007Jb6OdRc1Q?= =?us-ascii?Q?lKE/Jl/LDa8Iad24NLgC3TifqhH/8y0lFkqF5iI9lav90nUx6j9/X9TnuoTf?= =?us-ascii?Q?k7ObJ8rx6lZBuriZ3S+k9Eisy5SrebQ0gDjzKIoHHKndbGv3b2kh/lpvyJzg?= =?us-ascii?Q?IewoaYnIO+adLTISF3mwmzfWcBTGEAvWEWSLPIcecfRTqA4d9SSwYhvhJmRN?= =?us-ascii?Q?7M3H6xSUh551ffyTJmhFqwr2Ywx/Fj6BNUXI4pADSnIrAAzP+wqvEWjiCxz/?= =?us-ascii?Q?zeZk4HTXIHKWfJ8hpMPWhkzKB8+jrbM6pv4SyoUpwCG8OBrF7+kDhvkS2Pha?= =?us-ascii?Q?EFAhzdFDJo3IDjvepjk4osFGyX6ww9tZsAqAarbzVIKwl1VSy5W9YR2xBvuZ?= =?us-ascii?Q?JX/spEXmeHqBS7dKz5+a8IEcCUhFrd1AIvdlRuIJCzsAET0a7FkrZkqVYvZh?= =?us-ascii?Q?f3O59GHQqlRJqv3eFaUnNZY1MYEpaVCmMfCdcTYjqy87hOqahKHJpW8QTBnN?= =?us-ascii?Q?m/wOFtoWbtn5DLRTEsBMwldqnu7XKrwL5giB4+Cg3uZitMN8TcqYeC4Hyn6O?= =?us-ascii?Q?ObP8eHt0O422KoHlFCMj7nvkF1UJSYVk1OqQ7oOByS+wauMGYen0woNNbtkg?= =?us-ascii?Q?jnWLWoor0MPealD9S6l8ar4LewiRC81Noyz8y12Q314braaZRMR8ROn9RqVQ?= =?us-ascii?Q?RS+zR382EYhSoql5w/9TDIemyN/PB93tD+xvUS0jnz6zVIEeDH1PelSXIGEB?= =?us-ascii?Q?gYKNonfgU+/Tgl4uxp9VyktzR2s2gnu+1+8ef1Qn+xIerZqohyWNhsDnBJY6?= =?us-ascii?Q?96+Tp3Ko5gQLb7GU53RJD8o3a2yRZpyCv84ffG7XjTQCmqAr12Ih+gA3pfcj?= =?us-ascii?Q?Jf+fGJArRxzndOwNKyPZK/V/TVPOZ8Iw5v9PKN37jCH0qAt7BzgBTAFWaNQp?= =?us-ascii?Q?+ldFsxDrW57f0oj3JdmVXxo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ce30ed2-d26f-4646-5a7f-08d9f075ee45 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:25:54.9623 (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: ZxR6H+a3mn0ibZ9D3gjsmAHT9lyJp+qBhg+I8Rtdcc7nayTYybznpLtOlKqZLdVPZtBoPuYRgvDL0p925yESeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4563 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 ec8d750c19eb..26829fbbc67c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -475,7 +475,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} \ @@ -495,13 +495,19 @@ do_transfer() ip netns exec ${connector_ns} \ ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ $extra_args $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} \ $extra_args $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} \ + $extra_args $connect_addr > "$cout" & fi cpid=3D$! =20 @@ -661,7 +667,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" @@ -706,9 +712,16 @@ run_tests() speed=3D"${7:-fast}" sflags=3D"${8:-""}" =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 @@ -721,7 +734,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 Sat May 4 07:50:51 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp446703jad; Tue, 15 Feb 2022 03:26:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9q+L5LJB8yUqAy+UASCCHZ6RtsHzSKKvYnSYcP4CRYGjT1h1duDsmR+lQXUk3uJB8HKJJ X-Received: by 2002:a63:af59:: with SMTP id s25mr3017659pgo.525.1644924369127; Tue, 15 Feb 2022 03:26:09 -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 z13si32499547pfj.269.2022.02.15.03.26.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Feb 2022 03:26:09 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3754-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=nCJzUZ4c; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3754-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3754-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 906403E0EC5 for ; Tue, 15 Feb 2022 11:26:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6E760138F; Tue, 15 Feb 2022 11:26:07 +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 DC2A41388 for ; Tue, 15 Feb 2022 11:26:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644924364; 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=MDVWPNtUiykpNbbMCAyoYCMROZ1bzsT6qjNBDyxOJHI=; b=nCJzUZ4cZ6q03rOxm6gRK4vEW9FsPznLt/1Eb6+bNO2PimXm0jE4lvSzae5wdPO/SYrltx mFplxSoQGZOmVEBx8n6mSuvHZSNqcnscEsttk6WFKUNfr+CpBaiPIK3v/x+jmRyiedYEvH W0JSv/CunZNz1WgdjzafkWr/GU33LVA= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2113.outbound.protection.outlook.com [104.47.18.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-31-EDuCQhyUN4S_GiIaj9Jouw-1; Tue, 15 Feb 2022 12:26:03 +0100 X-MC-Unique: EDuCQhyUN4S_GiIaj9Jouw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T8OJlek8wIXEIwWWUKo3pIaLCj8QjJjLR8EstMf85U0GOpOZPxWxoezv+wUlyxNt8/oBmkC992ZaCKJllM51MBBd4/WCHGB8FwPrrat7PUSNlsxOt1p9/8KjMpdJZxv393yAviITsMmKlTsAOcehgzudVXET53BWOp8+H3S0LVgUrmNGseCfofmGWkHPlchTMY3LsrIaP6Cv/ZCaIFCewJK1HoaVloD2xllpoh4LoSQR14i5Olt5DCUjOFV1NuSbPV3Da3QK97UlnUT+Ab/2b7ssKGct4qsy+3IMbjg3A8ued2bcbNqtwKDPggWA94kC3KCkRoiPyL5W3ytWaVTrAw== 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=8zuGtsjNMcjEzNXciFtdNloPhqtHCsKS3u0oqt+1Va0=; b=JNOaar5zb4oPFfv65gShB8Ld0zpDbpt2RruqchGfaHgYhRJ3woBcsU8VM4OjBlej4dk0IpSUZ28osEOobZICfvCy24HreTTJR+sK3BYVoPWZQvt+wfx39otXKRk4RNlbnzTSUY/+SDvCfPxzWslHGlcbR+jPv96tXAYt0aGIbWqQQWhznuJ0hYM5zMCBhMSU/QdCJ3br2lTpdU0LJo5f1t9bCDlKE4jVkXa+gG/3e2Hoa6/2ZWKHafWKVpYTbznGzOUNFj0NMJ5On/Vz4b+ULuvL50OjHlmDrYpm4tQ08x0a2bhDMV3hvSKsU+odNwKrlu/y3pNczSv5zZj0Btx1yg== 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 AM0PR04MB4563.eurprd04.prod.outlook.com (2603:10a6:208:6b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Tue, 15 Feb 2022 11:26:02 +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; Tue, 15 Feb 2022 11:26:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Davide Caratti , Matthieu Baerts Subject: [PATCH mptcp-next v8 5/5] selftests: mptcp: add the MP_FAIL testcases Date: Tue, 15 Feb 2022 19:25:54 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0146.apcprd02.prod.outlook.com (2603:1096:202:16::30) 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: 14d0a006-76f1-4337-7777-08d9f075f265 X-MS-TrafficTypeDiagnostic: AM0PR04MB4563: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: Hkgo1hIRxTfOFO5qwYaBm0bwDW1xdRMSliYbGDebXfbf+0t5KJdraUFWj2YQdygLxjVKOswFSxfC61md6YzLnj3XfTvrCzkra0n4ZKshcnCHWFVTBxozN1Es9tORPc7QfwNWMHGqzEdoyo/ZbqdND69g3PSLrRDjYtklSXY1Ee929xgoY3oHae8sn0xJG7rSeqc2KLHvrL5+Y+C5r/EVTP0fSRcJoy/V5BDM2W+i8NeyYSvm/2T+Pf/bRjV9HLpecEpSVAStpj1fj9d/YYuqNa2HZUu5wrqkFyjn0t+5JczfRKk5798o4e/3VOUbp4/8uQXVDD0vAmch9S2yIQw2+tQ+BU45WJ3CrGitgm9RHItzK3GcfaOoRI+aZxyLtX2NrIaYyJO9nhBmET1cjUm1qmhulYSqrSwP0V3kZy5+9p5izenKSE/zLp+utqURlpWkiPcUWF8eBEZP9vElBjOVLnrOdW2Jt291YzmX2cv5446PpmNg6u7L9MPVV77oQYQMKNlYFXnksilINBdyHDB5Z5oSup+6zSpfCzgL8xE5mnYz4d4eTzCnmaGwqPOupHqbv8PJk4/Va/0fhVmLFnrkE+i6q5hqfWx/k6iI1D9hxCaumhmt9gwARyJlodz3FQhhsaW7WAvwSW0b86uEFUF7Rg== 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)(66556008)(66574015)(83380400001)(6512007)(86362001)(66946007)(36756003)(8936002)(55236004)(508600001)(2616005)(5660300002)(6486002)(6916009)(6506007)(316002)(54906003)(26005)(186003)(2906002)(38100700002)(6666004)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?anAW7dKVbaEn09telDlhnPW/ONtvv7A/9x2Q7yvpAP/6sd2dUXxcY2Y2jFGX?= =?us-ascii?Q?M7rZqJCOtjS3AhJjjJ31vgzfAjEZEINJr9P78dodSUJNlh8hEOXG3pgomvrz?= =?us-ascii?Q?q6WMIzrjiDJYRDrorwl2y1aSNe5XQCwFMwcxezFG/pV0BbgaiVnXKKFmwsKw?= =?us-ascii?Q?yxg/kiR3HBJbHQxOAcEuWRykGhYlU3TEuywqImMqPFky4AtfLwMFEtl5/Rem?= =?us-ascii?Q?xEpgjDPri4U+38pBgFXyMQXyvyK4RIqa4HQlJg5vHjkD0DDQZW1V1yGmjWk4?= =?us-ascii?Q?YWB/Vc6gj7KaYTIfFManF5DZGq2oZQU2/XBEpylCOv2uunI+TL9HTiWhcBM5?= =?us-ascii?Q?BSUV4op69BLvhVg+h4CuPCFO7KV9n4LRpDoo1EYy3zLfcrdSbWMh65yCF5Li?= =?us-ascii?Q?m2N+o3E+mYFt464Tv2TTk6k48nUYAna7+KhcsMSeheCZ6ZTAWlE0uz1YM+uB?= =?us-ascii?Q?YaaUm3HpocdyUBp0p3Y6fUUNYNjHi6zf0Y7jD8h+LeCLEWVvN9cW3gBviHhr?= =?us-ascii?Q?7qkH5Dq2TRdzSuSah94ya0qSKhvhXTFm5v45PE4cmPxy2a2P8zPSP6+nasyw?= =?us-ascii?Q?BCApakcZCwy/x4TOCblgefBy+6r6ymHUG/IMIJFiD9x19Zzj19cmzCuO7/++?= =?us-ascii?Q?XOAWwJdzmzJw1wjIjBsCpeX4XlJ2d0bKxQZekpnistaafluZdFwTZ6QBiEL+?= =?us-ascii?Q?eZ8SU7uVdfycimt5ywK/V2tHe5XzdYHhcUO88g3ujkbPy/iQa1jY/ErMqOWg?= =?us-ascii?Q?0neIxG0JRd72sUEyBfZDOzsSG0swm0/hPSrdBk/aqRKtzLP7ODTGkb7xGQzQ?= =?us-ascii?Q?WQef1FyUfgtVwNsrpbt1q6yD0OyT3OVAm6mS6l20i+WAaIFiWgw8jdTZE2Kv?= =?us-ascii?Q?TgsvutSEU+uxzhv3MZsPx/C8LpK3yPCeaRrM5cAVqrdSyNTo9XZpgYukmi7/?= =?us-ascii?Q?V5xFn0RCia6zi6v47578nO1nu+gMVFWLBAC1EmU4uW79ntdPm0YaSwTab28r?= =?us-ascii?Q?pf4BGoEDFOiY+BC6x3JHWiIApy4dYjN5meoikWaNZIYELKsv1UziCHFYu8Pi?= =?us-ascii?Q?xuIZrLd5Q+EtCvv4rfyAsO6rRVERNfEzlbqnwQMaiUHo571feSgCJDMtDX5w?= =?us-ascii?Q?SwGgzT9XQU3h/tlvkN4lsjmTMJnDot1bTopB8G4sDd4f+jPgV3qC8LJu+cCw?= =?us-ascii?Q?bmDJEG/CYNpeNUEhsyeBvWFiL46Bh9URSa8cP3jSWz8pMail2Yybm2+sajZb?= =?us-ascii?Q?2jwQPrIUk2r/1EalPAYPvMLDxov6OG6xz/qicl8vbYh7Vyn6BJu2ZKITxRew?= =?us-ascii?Q?u4jnZJA8LXZD+dkvjJUkg4sKmwNmImsSTRNlotPwiNcNwkY2zDZJduJdYKVp?= =?us-ascii?Q?ejMuhQdSxUMvkdep1uiF3tTosyLhR+Iu/gOHx+3VcjF20uu0zxjL6/OHbNS6?= =?us-ascii?Q?T7WSyXfPrWHweHmQa6wOf8iKXS28firT7YbzR4som66H9z7MNESGlAkizwfy?= =?us-ascii?Q?h/S0Q7aVZOFnw02wgRIuNkhAYGNhE2FyxRHjh4MYDHAIpEC/MVnT3iXeTeCf?= =?us-ascii?Q?SXIRD0zo41UAvbO4nGM0YBIHicETyrjkLB3xvx46IszEQwBx8w/DsbYkihdT?= =?us-ascii?Q?7qoF765OzOsifG56O4ByZhY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14d0a006-76f1-4337-7777-08d9f075f265 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 11:26:02.0867 (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: x5iX8AKUp1NcC314xq1lnQld8eM1VqIXi2jCCdmHOl+vZ2NYdwSc0eRn+Rl9uvd9mnKMnEZPjeRzEjImLR2aRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4563 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 selftests 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 | 98 ++++++++++++++++++- 2 files changed, 104 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 26829fbbc67c..f00b1ae835a9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -16,6 +16,7 @@ capture=3D0 checksum=3D0 ip_mptcp=3D0 check_invert=3D0 +validate_checksum=3D0 do_all_tests=3D1 init=3D0 =20 @@ -62,6 +63,7 @@ init_partial() done =20 check_invert=3D0 + validate_checksum=3D$checksum =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -207,6 +209,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 +} + print_file_err() { ls -l "$1" 1>&2 @@ -1028,7 +1082,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 "" $csum_ns1 $csum_ns2 chk_fail_nr $fail_nr $fail_nr chk_rst_nr $rst_nr $rst_nr @@ -2362,6 +2416,41 @@ fastclose_tests() chk_rst_nr 2 2 invert } =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 +0 \ + 1 \ + 1 + + # single subflow + reset_with_fail 1 + run_tests $ns1 $ns2 10.0.1.1 128 + # syn_nr syn_ack_nr ack_nr + # csum_ns1 csum_ns2 + # fail_nr + # rst_nr + # infi_nr + chk_join_nr "Infinite map: $(pedit_action_pkts) corrupted pkts" 0 0 0 \ + +1 +0 \ + 1 \ + 0 \ + 1 +} + all_tests() { subflows_tests @@ -2381,6 +2470,7 @@ all_tests() fullmesh_tests userspace_tests fastclose_tests + fail_tests } =20 # [$1: error message] @@ -2409,6 +2499,7 @@ usage() echo " -m fullmesh_tests" echo " -u userspace_tests" echo " -z fastclose_tests" + echo " -F fail_tests" echo " -c capture pcap files" echo " -C enable data checksum" echo " -i use ip mptcp" @@ -2440,7 +2531,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchzCSi' opt; do +while getopts 'fesltra64bpkdmuchzCSFi' opt; do case $opt in f) subflows_tests @@ -2493,6 +2584,9 @@ while getopts 'fesltra64bpkdmuchzCSi' opt; do z) fastclose_tests ;; + F) + fail_tests + ;; c) ;; C) --=20 2.34.1