From nobody Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2908939jad; Sat, 19 Feb 2022 18:59:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJy14LZ/ghsJlDtM3WKrOgt9pb5QJrtITEDXd82i1aGV802zpE/s11YwnEl5Wcm8frivgvRn X-Received: by 2002:a17:902:d708:b0:14d:cf6a:a9a3 with SMTP id w8-20020a170902d70800b0014dcf6aa9a3mr13934408ply.118.1645325960393; Sat, 19 Feb 2022 18:59:20 -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 u17si6078789pfi.306.2022.02.19.18.59.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 18:59:20 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3904-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=bmO911vy; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3904-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3904-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 F02053E0F46 for ; Sun, 20 Feb 2022 02:59:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EE5BC180; Sun, 20 Feb 2022 02:59:18 +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 82D0028E2 for ; Sun, 20 Feb 2022 02:59:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645325956; 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=l+1eAYVORN79OwMVhvIzdOO9ATRjv7NBp4vxeXkDX60=; b=bmO911vyPx0AQ2XFuBF7IX69l4FweKL6bKy5f+5U6y43TQoLg2dQ1siGTcm/dLPqjumPX3 c07YgKOsdC/KQj5HZpLDSpqHzsDOmq/2aNb+28ROB2k8PT25yf42dELHXHppSVFxuSB+tx XTNhlTR1J5+bcrvDT/PdsbfcGtyvkzk= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2058.outbound.protection.outlook.com [104.47.5.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-24-hrugubexNmiANZd46snMHQ-1; Sun, 20 Feb 2022 03:59:14 +0100 X-MC-Unique: hrugubexNmiANZd46snMHQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AOdMbHQY3/9WwajOsOS4HBA7dfn/xhLh3srCWQFoOeOHmE+gzPELxhXfPXMkKndGVgvA8rOlTXlJ7h1/iHFvC8ukVP+Oa7EGlbUfdtEAgvd27wBEdR3zzmBHDF75WdK1d9azeq7+W3okyflXc4hUV0P6BVMdg4nQMud83veJUzYlk7j2/ElVsq7p/KZCbzMJXh1l1Wlc0ebI2ogdsH1qee+Rf4HP0a/ikTNcPMWum+d2+zDydVRu4w9pdAc3/6sPK87Sj00peIwciXR0qGy8CYsA6UUOz85Cxbt6TlCuFB5o+OlENhzf/UxkIPjCaWVkUMIOYrEt86mi2+UdEKCUxw== 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=c7aW3DzNPBB7SGAdLa65igWwLydbfsYUy5nUou+VE+I=; b=Le0LWI7ALOOxGBXvtxKlUE1fI29st/Z/ixpqLY4FhfuZV7c5S7VkJmjyFuRxkb6jq/qV2mnn+8MjkJhn5iCENFrLZ2M4u0yg0UwJzgW3UU0RD0n25lyWLf5Suj0G0m9b7beuwkknhZ8b5njYdtz7Bker/RIAF93g2LwVeFPURWEDAVAoiIAbqRKyk2hvJqrCvy4z4P6SEk79zTUPjFyt7Ztvv5zY8b6DsYTudQAqGW5wfpCL0Kd8PtmHZDqb59lNZ/X0wUrVALzV0dTHAIJRQVk4DAa36USiol7N2cW48AxWGwnEehjx54up5MoC4Sx8SgKDreKKfoYcrfsuLQHnPA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 02:59: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; Sun, 20 Feb 2022 02:59:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 01/12] mptcp: add the mibs for MP_FASTCLOSE Date: Sun, 20 Feb 2022 10:59:27 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR01CA0060.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::24) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4e979c4-2114-40f9-4388-08d9f41cf991 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: taMH29t1bgCflfTdsktW9C6L2kIzzUxjeWH4xhhTX1vXAqYte4GccAsVwy8hmIQciM3CbCNjQUhBMxIEQ7wXoZeG4IO16wm2WrkZuf0Orw1CKNIXK9WyA1I6CHg+CrfNW934G2EbYxGSyJCTlTfWXkGOoFeLn/XSX6lIz7rBruT9cUj6qfCQUsAtepXEI0lipmqgOiRBabNKTmlpXC2m3SlD5eGvNWZWpgc4i7FrmUBGVi+gGSX3EMgGjwe0tAX+U1qoDeUUDwmeeZmELCDpnjY6+cSYD80hpG3/8kEVLtCyK+jVvBx8uKjsgTiFi/lwYmdoFB8pts2cG8gPg9C0j1DDKdPziA0EVH5CTywhY0V5/ayROyYXBB3gxybQkFwxCWFLmyXFxrITCCPfDNAxLob1ZgdYRmHLlmTL8WVVTcdQmDB1/KadEKwgp0eqQvKYVDEjmUn44T0obyhcQoYDXw2nrb9AgIGv64gmYYwtqlLOI+SXOM8PN+YdOq+Z8Tjz6q/9e3954kfKyzNnl54NAPVqmNSsDtTQsr0zUJNH69GGQ0z5AKPuTB05HbVxxaYTT0xNF+TBwosITC1pJYJwUjtKp1wiGwonIp+6pInuK/D7pYcSTplPUYNbWdkC1l4wiY5x5b4LXJa/tlsb42RdzQ== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(6666004)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GMqzJb50uen4pkYTf4Dq9Uia8opBurtTFn8WxiIRS2blvdjFXhUI3mmyRTWe?= =?us-ascii?Q?ZK21AiBsTMugPxfJ2FwvEucZ6f0YNfp6xHvkohV3KirQzQRGtIOd89+oBUi2?= =?us-ascii?Q?60Opfpi/kHJaIKuxsgv95SkGH90YPcHviZxMgQnq7L7tf+D/cHcPca5OdYYl?= =?us-ascii?Q?o1WoVP5dooNcUJ71op37mFYqECnCX/l+WmuihJH4df4yf4xZdVW5a5jCAzrC?= =?us-ascii?Q?SsYQ4im3pf8jYUDHL2hL5miiSlsf3Pem75Xsc4xVBZEmJdPQBdxCk5N3rPHJ?= =?us-ascii?Q?4lfvEFp0N8RFAj79E6NZD6HVv1+WQhgCVsxd7jZbVRVOtTGjJoN4nI/gOqQA?= =?us-ascii?Q?qTpHvrPmq8hU+RH19P7NhrzyLubhDIRNTucKMtQdX0bQJEZj/WQtXxDLoNAY?= =?us-ascii?Q?wpptvNI/PmPM2WVrj3OH18cfBIFnQfiq9pTEMDZXIVKzCs7KwrqAEGK9mMLW?= =?us-ascii?Q?zjCnHc6fenJuW1XXOR+uja5FxP7iL/QcWkWxswJevqMc0B7anaBf0/1/dQ3Q?= =?us-ascii?Q?Iqr5Xks3oGo3CjuC+epdwnqIHXIs1IpGBS0oEQBaKla5M2TnNg8GpU0qKBwj?= =?us-ascii?Q?oC4m2yh2gj9jXWWBHu5oPgRuHW2pZvYzEbJvQ7S/HzR0/docv69d39WBw+en?= =?us-ascii?Q?axUI8DUSuGMU8gKvY3vG5MBRPofMRQ7MeWHssfe4ixdM1BjvaZdFCwi5VZIH?= =?us-ascii?Q?6fQlySATUtQicEpxWSPvghMwwxq/jBxK48aJNbRCJbxosf3KNzN7/hxHSClY?= =?us-ascii?Q?OTmkHzFIFgpDXI5rJybnnVELS6whDKQrnUCX5V8aGRQZgka4JTk5FXiwHNnl?= =?us-ascii?Q?VGZvOtFpXS3ITI2tf4l16mQ5J8kYBkLL0bfZIzqY17E1jhUhkXCGiHRHJVKX?= =?us-ascii?Q?yiIFLNmRvreHXj6Y+iFUqa9i50Sy7NqBuVJtAqOaaNOeDRB16fbJ893BdP8e?= =?us-ascii?Q?7Rxcf36UtyP64fE5jOhJq8Ho7pJwohHH+D3ZQc5mDQGVuv2Z4lk9iKY94G9h?= =?us-ascii?Q?k05PAkN4Ai+td0mzjrGOi1jSikY84aHJCmYS/N5cFDQmPWRQkqt8DzOhrm+S?= =?us-ascii?Q?SLJv2zn8fRKcdGRDTYXbYx6hUOt/aw51y+wG0AJeaJoBPw2+I+1tqA9g05tk?= =?us-ascii?Q?yEBQPDjBzhU3WQigjAHlc5aX5wUj2C3aXhhKOZ//DPGuPm1dGLf/E14ogwqD?= =?us-ascii?Q?Etl9NavRe2dGZMF3sv4da7/QfHjNs+tvt4ZQghDvcb+aagFo0tLmdoeTrbFg?= =?us-ascii?Q?4uZIv/PMxlvP55okw+vkcU4/9w8BTSK/phjpuM7qWacLkZPTR2v3ASq9vgBN?= =?us-ascii?Q?LuYl7M8faZyhBN+M9SpWOHgBfr1qGgM4YQFlZhQ1dFnPhClqxyFZSbaGIVBX?= =?us-ascii?Q?WFTYGM6q534cnF1MM9XwjYPHbUlz5VO6OLzpSyF52rjxqvEqjU1qpOWh7NQ7?= =?us-ascii?Q?bIF7jxeNFgSHX88A7R7IKMYvigrvTu7MzFyxsTMVwKASWlUvxfA4ODyg3W8Y?= =?us-ascii?Q?ZGYkK4s3+dB0lR37nc2LKmUTGqRxR4bBCRacJyqlWwNUgn7cKHc2t9X0tB66?= =?us-ascii?Q?mNoqVjhx30QpFHkfsCIoc1dHRfflQFI1tUD/S+a/aW+eI6G/qSEYS5oO+LHJ?= =?us-ascii?Q?mR335bwbBjHFDt/5eHt9VBke7PzNFUkBmEQTDz2Ht0303CCUzssJZU0qRkNX?= =?us-ascii?Q?io9g7unj3KKYU7UvwKL4QDc4jYs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4e979c4-2114-40f9-4388-08d9f41cf991 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 02:59:13.6069 (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: rbzWh0eznAI8Cyjd95xJ04B4TLwYGezi4y2OK0QCACwo772geJa+n8/QXYL9JhgYdFgaYIZ6ElWi8qGblRKFAQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 Content-Type: text/plain; charset="utf-8" This patch added two more mibs for MP_FASTCLOSE, MPTCP_MIB_MPFASTCLOSETX for the MP_FASTCLOSE sending and MPTCP_MIB_MPFASTCLOSERX for receiving. Also added a debug log for MP_FASTCLOSE receiving, printed out the recv_key of MP_FASTCLOSE in mptcp_parse_option to show that MP_RST is received. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- net/mptcp/mib.c | 2 ++ net/mptcp/mib.h | 2 ++ net/mptcp/options.c | 3 +++ 3 files changed, 7 insertions(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 7cef7409e300..684643f8af53 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("MPFastcloseTx", MPTCP_MIB_MPFASTCLOSETX), + SNMP_MIB_ITEM("MPFastcloseRx", MPTCP_MIB_MPFASTCLOSERX), 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..93dd5176fd5e 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_MPFASTCLOSETX, /* Transmit a MP_FASTCLOSE */ + MPTCP_MIB_MPFASTCLOSERX, /* Received a MP_FASTCLOSE */ 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..e775d75807fd 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -323,6 +323,7 @@ static void mptcp_parse_option(const struct sk_buff *sk= b, mp_opt->rcvr_key =3D get_unaligned_be64(ptr); ptr +=3D 8; mp_opt->suboptions |=3D OPTION_MPTCP_FASTCLOSE; + pr_debug("MP_FASTCLOSE: recv_key=3D%llu", mp_opt->rcvr_key); break; =20 case MPTCPOPT_RST: @@ -832,6 +833,7 @@ bool mptcp_established_options(struct sock *sk, struct = sk_buff *skb, mptcp_established_options_mp_fail(sk, &opt_size, remaining, opts)) { *size +=3D opt_size; remaining -=3D opt_size; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX); } /* MP_RST can be used with MP_FASTCLOSE and MP_FAIL if there is room */ if (mptcp_established_options_rst(sk, skb, &opt_size, remaining, opts)) { @@ -1124,6 +1126,7 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) msk->local_key =3D=3D mp_opt.rcvr_key) { WRITE_ONCE(msk->rcv_fastclose, true); mptcp_schedule_work((struct sock *)msk); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSERX); } =20 if ((mp_opt.suboptions & OPTION_MPTCP_ADD_ADDR) && --=20 2.34.1 From nobody Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2908984jad; Sat, 19 Feb 2022 18:59:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyekPqjYguF9UOtZPMFKxFrp9UNkA13dKeGTpKTNZO1iOYAj3m2R4Gl7JoufduhWvzrBwbM X-Received: by 2002:a17:906:3042:b0:6cd:20ed:7c5c with SMTP id d2-20020a170906304200b006cd20ed7c5cmr11577345ejd.241.1645325967780; Sat, 19 Feb 2022 18:59:27 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id lj7si6194288ejb.914.2022.02.19.18.59.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 18:59:27 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3905-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=C50E3S9Q; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3905-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3905-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 A5D3E1C0964 for ; Sun, 20 Feb 2022 02:59:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9DB1357E7; Sun, 20 Feb 2022 02:59:25 +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 7C363180 for ; Sun, 20 Feb 2022 02:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645325962; 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=OOtYqMYN1U/8sR6VDIy59ocEvLvBYao90BtfC/kW4WY=; b=C50E3S9QQRsL2YtEmva0wMxzrwtJPBsCGTvbm1VbfwZjxmvceZSCNXpbStdm2yDlqmOTUI 4RW8N0sToyVsCPlLOszRaXw1uwd3yhqwGsNKFNVZ8Weqx0o7pdpWZ/DL41Q2VNA2ML1A4e GGKPPC/A5UVVg1lCiAtsFfP6uy8P8Nw= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2051.outbound.protection.outlook.com [104.47.5.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-37-yX-9H9WXNm2Ua6i_b2x8lQ-1; Sun, 20 Feb 2022 03:59:21 +0100 X-MC-Unique: yX-9H9WXNm2Ua6i_b2x8lQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PLB7hMpPfkETJGuVj2iqfHxQM+09bu67XJ0bUCZqmQT1LHKCQS9K98yAw0HnI1VKyz936pjJPy8Z/f1MTnU0cx0cFWFyE5OEoCOiYttHOeodjNzZPS3zJkEKhZT/QoV4Er4WBlyM4uaEcqoysIDi7Qt98kY+Gk/sxFzfqyCPlRbbFhrN8cjijdFLUWPjGlM2O1W1eAzrWOyIdO3YO14Uwql7ke52AlNPUpFXsi5HaNEt/H+gjDF4q490ToiCoe44x9fWiVgaLOS1VQ5cRCpRGRft0AYDJjnRb0dMwsyon82pPMcc9x40UCGCYAe1QK41qX1WpJj/23u8Qnq/5PnAMQ== 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=dl4bqr+Nt+7QbpHlOryjXKJ1w3owT5gfGTQ+leE1HiY=; b=GwlZKFMCgb3Wc4b7Yfdi7Zu/oWwFwJ2CEfHDRB/B/kQweFFxZN6+6X7VNEq7y8oLlggYySntyhz7cwUR+hGcAfo+4zaBnnDpodJzVXR6xphB0G7DiOPML/2aXSl/WFg4KoUqjBick/gZULKkoSpFgnJNMfpW3o9HZ/UzLTSGr/sfPAXtIVZeVOQE2OvfZEoGM5q/9bVKeeugsgoO8DIiTblTkcuyQxdwJ76gjwi/EUIBm1ALS02gaAxzEXbXw3L5Jy6rgsaNrWbFLtY0ibmzFrgM+nRZbCwXjyVgvch9+rKBpguiMNCxziRLLOWCBW9ThVBB2YySwT37ewy+8ymdkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 02:59:20 +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; Sun, 20 Feb 2022 02:59:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 02/12] selftests: mptcp: add the MP_FASTCLOSE mibs check Date: Sun, 20 Feb 2022 10:59:28 +0800 Message-ID: <3983f4bffdf46f58bf0dab252c62a654354da94e.1645325178.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0016.apcprd06.prod.outlook.com (2603:1096:202:2e::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b50ba612-22ec-4507-83b5-08d9f41cfdd7 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oyMvtMdIZAWJ3BZfDzTBvw6r+qBorhui+GTMhVvGSrKlk7wjxFdyE79ZGHQPRMNrhpkyjlHiOEggiCj01yGTEEUwejrGMbg3/32FC8+zkXiGGpu5g+4g1SZ/FYyZpjq1tZyw0a3o8z32+tPmmWYX2iCYCX09hZ30c9QqsinibWQv32PCo8UbXCePhARVbGBvyBb+lA3P39DyH2WcbIY36ovnQKQ45idbr7hGq17vUe1EbFtAAL33Liavsc6LznaikzRaA5VYgFbVzxwtSPK0XT+f8dzMrybAKz059L4cM7AHhBOeNRUE/Q9xmDykRDuUQW5s1PyM+ggHC+hIKCQmnnaxVzwwVcxqLWgN1E1sGF237sesPRe1744JEC5uXA6B62S5IS96rcQf9kz6mdyej9K8ZCtmF/ROI5E/u3MnBIKk8filaLsnTgB8uyMNAOWMDC1FymdsVeYKGRRsjo99WwA/uKag8ohfFEFIwUxQbY4tVaKXM19G22SxND0nyh5kz3+rvYbo5jDPqlIcdBh2yFTiqmfMBf4ME5JnvKFUDeRKg7h9380IBqPL+OEMzAy9UAixmqy5x2+W2J+8EDZODtIXgoHY44oogYJPUBc2NYrYvhyvf7s1Tse9Vdu44mC2Y5x2+1bqzspQHHzqdZQ5lA== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?y4TGsRuZyP1riAhxdMaVuxLYvbVJl2RvnPyvp5/t0TNwM2qYAO1L8ERG7F5o?= =?us-ascii?Q?M6+DQgxLtCrSv71NbYkt1lHl/wRCuCH8FdsdMPgUyCBxEIHHx4IHAJCG4Ilx?= =?us-ascii?Q?qqSdFQ09khwFS7UFmn/zM3EGQEKryhqOg+8Nj/kj5j7LZd0pHvTHntxCr3m+?= =?us-ascii?Q?p3Fu+t9/W8zMNgF5q+V3DvLtBrxOzbFMfUjyAFRite/PoTkN4B7hK66LbyV2?= =?us-ascii?Q?s1FwK5tSVuFFma6K80DRv4uiGjadNX8aUUJV2u8ptP+KdT00fpJ5wssEtpyL?= =?us-ascii?Q?IMOVLyCKdPyOWpj33Fx9lx7+M7euxoMqlwwPcFrRkXMPA7ZW7od0hJV3IcsV?= =?us-ascii?Q?bBpcWHigTg9CKD8Ss+JfsZa1DKiHzEpy2ku4JPsvSixUpMfAtB6AvJ8WPp79?= =?us-ascii?Q?O7t0G7h+NT7iHk6hxdqfhvPg/2J7MO5o3wAuJyHBUGRzoALpT5T4gswEVLzJ?= =?us-ascii?Q?biCPvY9wfBMamda/BJ/JTBkoqXw7jkWmgB2NRMp3udDY1cQtrQKxYWi4zqtn?= =?us-ascii?Q?INnLlEVYZc1y3dbyClbnY2Jt8BtkzMwcG5MOooetOhQUZHoGu3o7vdUz+maL?= =?us-ascii?Q?cZ3rV6AEqsWZdKXiF1p0zpZ0YHISdTM8NQx6pcB8mVhuD7aItgCuXPZwXgXf?= =?us-ascii?Q?NUtclebQWmBsZSfpGdi231/Wn6X1TyChkkBfEcuXBG5CJ+uihIr3yKWd21U4?= =?us-ascii?Q?HYcrfXWZ0tI8g/Uh/gmsBtGYIQ/jqiwoDJO8HKXRuLpjRmIg9rxi2a9twQ9/?= =?us-ascii?Q?Ci+yHDsNkReRaljgGUDvd3j59+Ealk0GbXb+Xdj9ZPKw6HF9dt+/5rCeQS7r?= =?us-ascii?Q?bSAqeGQ8KHWURgsY1ulcKBjhoxjvAJL/HqI0mCzmr3GId239rnwyJc5bIQBX?= =?us-ascii?Q?BJMxD1fHaBCGBqI7v6jHKASXR3NrnZTdAHnzwECBrLNL0o8jW6H12y10UeIe?= =?us-ascii?Q?wZerE3t/PSWNRoi7CCVGmWkSFOv/N2Nou0bGzCF2SaGpuHGF/60Q/aRVi9jI?= =?us-ascii?Q?TACfx7fnU7ipUq/1IsO2ib4XZd+w8AoSUMyT0SXUaGqecGEDBPbGFTwSHeQD?= =?us-ascii?Q?xwchc7Ep1+Q1jdjKLI6aKsObVKc02l1kJOZzer4qHJ/hNrTx1CzMFfD6zQ3O?= =?us-ascii?Q?lp0YnPyKiUTA6y59DfXPR9Q7u1mCp4dUXZtfLERBkGXX++o6TNZZvU6yEQIa?= =?us-ascii?Q?bdcWJ4ACpOM31i3TRSISuAUOB8uOXhsjVtJ/Rr7mFvi4ztmPRu9v1AEBcFl+?= =?us-ascii?Q?nHyAwts7E3+1F0KPHWKwSjbxOQth+SGEwhLl9hd7XH4RVsq3kfGglizj8U38?= =?us-ascii?Q?+yi82Ltc0iyqEdJ4UNUBWiD+z15NU6skvuAVyKlS7oItBQpASLLfjNUUDgE8?= =?us-ascii?Q?htNq1G2DLsUaEvruzhGp5jiCa6+jWipPnErkaWAAYb9aXM/X3uSjbqqkDPoM?= =?us-ascii?Q?EnTPgu8wLC1kEGPwOyDKKXfnlt5JNJZyhMrOg5Rgo1FbQJW8o2DxJsWVBy0a?= =?us-ascii?Q?iAYcOdjiLvE8kwO5qSPnfdyqYbgqpogwmkQIuPnk+pgO4ISBZzdbGLO3o1qC?= =?us-ascii?Q?Yl7cSLm2xbBpSIO2DJ5nkcs+av0Pl7dKMvi7HidcrtvdyHKWcx6LhiAGKBLF?= =?us-ascii?Q?x9iHQxmuheK1ZIu+Whm1s2OutghxHsDPY9AAShO8GJVnI0qu37plf1hqOQJ/?= =?us-ascii?Q?kiJHAlvrxrbycrQIwVwMKK18t5U=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b50ba612-22ec-4507-83b5-08d9f41cfdd7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 02:59:20.7938 (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: YKgm3a/rw1bL44EB5cqfzVPSn1yOsGnQ6qOBeCbZlrTU2HsSpn3VFdjlDt32AI9tQPcPgDGps7eVpaLA46QXTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 Content-Type: text/plain; charset="utf-8" This patch added a new function chk_fclose_nr() to check the numbers of the MP_FASTCLOSE sending and receiving mibs. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 8e6a5292175a..8f81ec0b7552 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -904,6 +904,38 @@ chk_infi_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_fclose_nr() +{ + local fclose_tx=3D$1 + local fclose_rx=3D$2 + local count + local dump_stats + + printf "%-${nr_blank}s %s" " " "ctx" + count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtMPFastcloseTx | awk = '{print $2}'` + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$fclose_tx" ]; then + echo "[fail] got $count MP_FASTCLOSE[s] TX expected $fclose_tx" + ret=3D1 + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + echo -n " - fclzrx" + count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFastcloseRx | awk = '{print $2}'` + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$fclose_rx" ]; then + echo "[fail] got $count MP_FASTCLOSE[s] RX expected $fclose_rx" + ret=3D1 + dump_stats=3D1 + else + echo "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats +} + chk_join_nr() { local msg=3D"$1" --=20 2.34.1 From nobody Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909046jad; Sat, 19 Feb 2022 18:59:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJz921xgdhBPuh2V/jbNueqc3OGVjEm/eoaBH/JFhRGLb0Q+e7fdmmVB2IOPsg4VO6usp3jb X-Received: by 2002:a17:90b:1c12:b0:1b8:ad23:5996 with SMTP id oc18-20020a17090b1c1200b001b8ad235996mr19794285pjb.3.1645325974380; Sat, 19 Feb 2022 18:59:34 -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 b11si26476888plh.37.2022.02.19.18.59.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 18:59:34 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3906-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=StorT+OB; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3906-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3906-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 897C33E1009 for ; Sun, 20 Feb 2022 02:59:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E4BB8180; Sun, 20 Feb 2022 02:59:32 +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 959F728E2 for ; Sun, 20 Feb 2022 02:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645325970; 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=DtSIU3UEFkw6SEidnBvb4J8P1OHSFYsyRu+UcNqB2wk=; b=StorT+OBzYent3UN+KJ8Ca5WG838/QKL0OLa0OZv3PF7takXO1OURhA98S0WG7rvdfL5M8 spFrLgB4wsXkUOmCPRu5VWHbAQIKbHCAxWrYdgUfxLIEsFYwwNLkR/WaGSIqtp/ZGtkDqc iU8FeaEGEDvrwMPe67wOrvUMT3w49wI= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2058.outbound.protection.outlook.com [104.47.5.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-30-cURRwAmwMl6FcLbpG0e8HA-1; Sun, 20 Feb 2022 03:59:29 +0100 X-MC-Unique: cURRwAmwMl6FcLbpG0e8HA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HQgHy+yAZw1zaeCguX+xXQaipCfR121NCun/LwIMLakzC4962V6p324zhiO5YQvH7tMs7AuaBrOAGel7A3EZ5TQU8LhRH6KVcjN3b+V2XVhgdf29QPlhd+kx1VN7wXYzQivSUf18w4FfMV6qCdE2XyC7s8J/mBPNm2HzoLQuC1XxPQUVosCvrvtA3Ay3EdYeGF9jYC/fSTCn3tvRxbB2VL5g7Pc6v6LTeVZf1yygDUfrB5sUHVuUrQLbYpeAlq22K2rnVPgZTwvC6/RTZLktEwrGf64d6ofcQndiSZrn92Ahe/2K3TIvs60Khp3oi7keg9GvhglF6hLlfTzDwCDf3w== 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=vE+utjFsFCiqq8qjTOQR0uoEev0X4nb9y+t6wfEfbIY=; b=SKC+8AdgTwclUPAxLcy7Sa1CMI4HJDxv+fH8yfNwCPWqUPJ3YfBllE9VZZehPFj7O0kJ8KPRuZZH5B6FLmr0KgOHV6cQrfmG38WqQyyAkoAnlSlaYfk6vdRfQU07p8D718eQvSIKFvd+VfsQ092BpdKwy0Ey9cERgldzJyfpxJ5EDaYluyOlQxEo/6+ws+z76AF39O8881w9r9zd3+X5lcY9puKQFM0YLB3foMmO56FNNSavAg4LPX6tkuemUeR/8WZkhfzsJKRk9TXGZcs7DCDj2glIrh7SN2GPiQCle1fYMpo26TY5guyX5NRiF+GKb7pSZxM/CBjtlKujlmL5iQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 02:59:27 +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; Sun, 20 Feb 2022 02:59:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 03/12] mptcp: add the mibs for MP_RST Date: Sun, 20 Feb 2022 10:59:29 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR01CA0064.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 894f7042-87f5-467d-c7dc-08d9f41d01df X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kxBB/4epbjCqFeMP5ro+uJBwGA0riNTVmAZsu/K6whOyNO29QoSKO9GZP3bjuWOkjsTZA+3NOnjLv+U4MRsv1G64uzzKPnPVXEv9NzgNAwPKVIl5QCMiVXIF3f5bcqy9tNTzL4xaZrRW7r5JrfJjlF1X+sF+0++r0yEkBJDsOE86KOFzFNKhdOJyMfSPDlQ/Ce9nNiZz2eNGoA8zPOHswFlRFGUMATNBfO28JSmiG5XzyeZ0WQIJ7HI5SvJiozxA34Z+NA5yXLMO143ij7lsnNnMKNkx8057e3BVMJ/p0mBxPuFtViXZu/6O8GKBxbDNNiDVG9muRS529GRgb0DtdZ455Ibw3GoN9/P3jXU0rKxmd00MNJjKeaO42KqbDWCVE+yxcGMwhBqUSwhTHLIepWh2bL6ngcUq/JnFXApmyBCv30xSk7185mE69rWAojwN+wmOveNGsT3m081I9U89qzHNDOLGAnPyPj3H2DOH7WDvvKt2oq7xO4jBlEQyNQNnn9PqVJA3YmysvtpBNTSq9sIJhlRlzWHyMKK8iZUCyu8WRcn7kZqY43JdUv1A7oqVEpExet+y4nglUf4s4F7FUgDrLzm3wi1kTcy5i8mEJs8FTEtZD/gXItLGQmaf8EbWUUv6zCpcN9lwcIDsf3hZ1A== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lyIawhH8ZQ+NGThDaqDJkkF3ADc3ffOtkude7Y0jaL+GXgIDiIem7hJ6uJjU?= =?us-ascii?Q?nrLqSRe4JPTT8vbkhxkYxB1ptcTM12rcvo2j73cSCIOFb4tudrPexs7dJjMm?= =?us-ascii?Q?xijtM4PCi1PwLwe41CXzy/fVTNJ6wj8Oyugx1bCQBN2IcVC95pM/C7DWimNc?= =?us-ascii?Q?an1/E/YDpjBowJgpLmiyrSU1VGoi3Sv3Ewvdxf23ENLdx+lRVxOltq2G5zm2?= =?us-ascii?Q?MMCsJiCi889c9vdUEDyGcajKw5JALnKYDafE3q2rdi/nxUp5iBDdmuKH9eab?= =?us-ascii?Q?tJLcOi8R548sfCNrh94H7tugmsTyNtFKHKBGAvulKjsk/G+gZIYo5v3PSahh?= =?us-ascii?Q?ujMrA3+irobiuirAzg32zybJzcUs7JDco4pYsQQigzrIAgNKkzTPkHyiEdxS?= =?us-ascii?Q?Q5u39lAuCeQZYcRQJGBQpsvv52Bk7b3EpTKAVYJSZmYUDqowpvbjaRqRfTZv?= =?us-ascii?Q?A8R7hj4tEbfaft8gmGB5yoqczqwQG5i1w81JFaZsrbCiRjKmTVFPn4OmvSuk?= =?us-ascii?Q?sZygiIltQ//NtkM8hHNDIShDpmP4WmWfxWojyDRHYao5SFpPS2qOUuXnKkNh?= =?us-ascii?Q?K7v7dBki2OiP0UMeDvMXMyN5l8OngcDNjIZHqMcwJsBFppvgHXknuBWBzbK1?= =?us-ascii?Q?R5apkBD0V/Ohi82b2ElLFkL3mq10zM3My9gKOSPRqr0udwEbQ6q7FnvJDTi1?= =?us-ascii?Q?GvOSxQJpVXi1iu1eprbBMbXceKcZO7Yr8n3n2D6AAFauoOcrsENAfnaUl8M4?= =?us-ascii?Q?JzHojHj0RpoUABDUQ5uckVQYPCxsCOvCIIU4myeBp/l+/dAVmIgF8nT0SjiP?= =?us-ascii?Q?1P0ASYzAjoiWT+lK6KD3OczLiRN605sCFmpRHpLsda53d2Y60X0M2gI14Wvq?= =?us-ascii?Q?+ooMvyhYxdQOP/bdjnZyi3cQAnJTl0HRLb53SyXEqxwum8dP+1xV97OXaTdv?= =?us-ascii?Q?Hcjwt5wbCvnTmVTNgmNjTzfoWc8Bgm/xy2BGbYOOzFuouSnV5gZIfcYiHYrk?= =?us-ascii?Q?0IynNbZ56sdn22OaYHHpY2OLadSO/7n34dmHOw/nuRQgrxk/p/RfJ0og/noQ?= =?us-ascii?Q?gi1+a1Sjyrsn/92LfqbQ4Baqdmj01lS9qcYKyBDzKNKL/KNy+PM7gQP6QEpC?= =?us-ascii?Q?lAT0kxDlbwxW0Ct2+x6RVLnd0RuMdgmi9Hr6PXAK+tBmA1V4fAfALx1148DF?= =?us-ascii?Q?a/Bti45nu7sswCC28n7KMPf3bmKj7VHpx1zlAqm7JeETadK+4sF3VIYHQgTT?= =?us-ascii?Q?SwzgWHohnCGfchcbVyOK8XdcVSM9QoYTtnEwzgPn/0i4oQsk1FJviJhiB9rr?= =?us-ascii?Q?i8YFpWwJLne4nnwEGeY5nCJngtz0qmKi4aGyilRaMGu06dNFt7byjl3ytXKa?= =?us-ascii?Q?DJi4/NrjI5u38T0fHsNQPv9NWeVqnLzVkqqoA2H3jaMjtHASUEAQEq/9A9gn?= =?us-ascii?Q?/Jt+W5cw/0ptZmaI/pCC52YTcMsG9dmND9QDIL5Xt2rWYPoRJ/7qpxWZounr?= =?us-ascii?Q?OFSCymE4tKNMZ8rTisBcprwECPn5HzC8OL/OYaVxgOxkY/4ZrPZP0RbSzRys?= =?us-ascii?Q?QKMgpzuo6GVC4Q/gw8MZOFEBFRgYU11SlGdXjVtZtX4aQuISZCua1zLx8yI7?= =?us-ascii?Q?m8i+STrxqB55XWQUEKZeTqAjcGL/Agnv4FqbJXRV4HF9ra2TdW8kIdnQbQjV?= =?us-ascii?Q?PWNLLY9CdEHA9fAzrDLqffIE2bA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 894f7042-87f5-467d-c7dc-08d9f41d01df X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 02:59:27.5744 (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: x8cjgeOriRq5BB9DJI0kekEPGJS88aqc6wcWPI958vGUsUllwhJKBhXzVcrwqYWzeJbVp1Dnsbv5H3rOLuI7nw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 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. Reviewed-by: Mat Martineau 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 684643f8af53..d93a8c9996fd 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -51,6 +51,8 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("MPFailRx", MPTCP_MIB_MPFAILRX), SNMP_MIB_ITEM("MPFastcloseTx", MPTCP_MIB_MPFASTCLOSETX), SNMP_MIB_ITEM("MPFastcloseRx", MPTCP_MIB_MPFASTCLOSERX), + 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 93dd5176fd5e..529d07af9e14 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -44,6 +44,8 @@ enum linux_mptcp_mib_field { MPTCP_MIB_MPFAILRX, /* Received a MP_FAIL */ MPTCP_MIB_MPFASTCLOSETX, /* Transmit a MP_FASTCLOSE */ MPTCP_MIB_MPFASTCLOSERX, /* Received a MP_FASTCLOSE */ + 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 e775d75807fd..88f4ebbd6515 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -839,6 +839,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; } @@ -1161,6 +1162,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 Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909122jad; Sat, 19 Feb 2022 18:59:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwVG305c9IQTJLeAtjoHs5l46RaUHf51PdJfxIkhOEBeonlWzS63gTktOxlJEzdaugjjDg8 X-Received: by 2002:a17:90b:238e:b0:1bb:cfdc:b591 with SMTP id mr14-20020a17090b238e00b001bbcfdcb591mr12018326pjb.241.1645325986502; Sat, 19 Feb 2022 18:59:46 -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 d198si9218055pga.120.2022.02.19.18.59.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 18:59:46 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3907-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=G0KfkDSf; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3907-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3907-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 B5A4E3E100B for ; Sun, 20 Feb 2022 02:59:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 191D557E7; Sun, 20 Feb 2022 02:59:45 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DDA62180 for ; Sun, 20 Feb 2022 02:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645325982; 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=nBdKGG/qVGwELWxhk58GfmKXQLzua3y0N/+hQKWfa8A=; b=G0KfkDSfVXAYxjATTVRNJzAF0wHhSn5MIMIYPJFBvLUvBAG1LAXkDIrvtKeKzEFcxCQ4nG RFTd+0CuxIweDVngWbIzeISam+iTfu5HBj5Q010AG4Ww6uKhb+B1LK6PSmQPHOo927/kNz Vtv+6Ls+LR97AX21aF45bW7VoGTbK4o= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2054.outbound.protection.outlook.com [104.47.5.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-32-CCrz5tu0OseBmBgIuRub_Q-1; Sun, 20 Feb 2022 03:59:41 +0100 X-MC-Unique: CCrz5tu0OseBmBgIuRub_Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QYrTzACKT9LANlKiRl+WLRjbNOT5Wg28m4wPgl+VwrwFGwFUiL42AAcfA4Is5rU2EHC842jxGAFFlTiQxdwfX8p9Mc4auWyoTN1gzavEOgIqaTMwC6RF+mXXGxTKwQMosfJYVtPFzdJNya2yyZUUp0wqenk0jt9c7iqETcKo85405p+unxMGLn88MweE9msuuJkX4DQUI22gUn92OAXt6oVsR/C0nL4JarsgB4qhft4s/uDUv/8aftXhU8tMHwJcBZDZBm8bbkqbtuc4H0wn2iNhu+IYVPy53ZzwhpaTaulG9cqUljNVc32YlUgh7xOzWNGdpsATeyUYn/0bPlBXVg== 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=nrYRbEYi7ykkLsTLm6JMD6XtCt6hQ/6vQrRtWn7cosY=; b=VdILw8aZk2NvtkXU+Q0RdFal2XqLxEGR4JUCvFQFODnZfuYsfxGAMyM32hd9UcrC8nK9PUVgI33xi4JhREfKIaLjkiPm6DxP6krZhlTQmFgTmytQ81d7ATCDFtVFyOoEMcWxl7GDyaR/tqB1jEVCSB0Y4BzQ3pCyVHd4dZCPHDZ+jSmQXBaX0UiswRgzdZRp+9YQvowBgIclS8Odw1E+QUK98aQc+nxCsfNJjje0EhDWSpngxhwX/U2glK5Si4U4oxm+lCHA9L4n2wrarFaU0EWtFEbx/MDO8kEmRTOSo1XJS7yoMaqRTikejmY7l8W8PMekrjADs+J8vJQyWLV1rA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 02:59:40 +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; Sun, 20 Feb 2022 02:59:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 04/12] selftests: mptcp: add the MP_RST mibs check Date: Sun, 20 Feb 2022 10:59:30 +0800 Message-ID: <9ef3ef866cc8a67ff0dc174f762f103c132aab1f.1645325178.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0043.apcprd04.prod.outlook.com (2603:1096:202:14::11) 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: 8f62bb9e-5c36-49e9-465e-08d9f41d0961 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QOyMEwjgclmjEiLzVvik4r++/onjWCuAHZpJP7whu0xw3NCMHhOiJX/o62oPAzZeMZVyFeG3RU0VE3bguzUKiIYmHED8+tA5TmzwpmxG22cz9oJf8aY/8mz2bNA8krJGLNmOCQiWKeSZc3nE5YZRXx7Dpwdh9+EP8F6nuO0SIZvxBbToiP+IHZLz3cRrsi8O2ZpSkPPk3egFQ9J6DPFIdLBMiJIuK4nJR/WVWVKrl6jdpW34odqqaBtwyyOwCKSWds3a6rqTd2UHZACmHnAp+n3VyI9ToH1xMmrb3SkjZ6CXMULhhtBRH+lUyq8UU7jZ8gZDHc0W6JgBrc0P1T6f+VB/yVghDrmcDBg6xXK6Cjcb37KX//AhRHB347cg4FPDj69Jz4A13Dlkgy4SZFcIOJMxRuVTsdgw1YoNvxdIHhPW30jsREPGqB8H4bBVLvR0S0JmtoMud5Gxptv2LVkAf/sXHv6dDGzRKr3vjj52W6eFgNWxIc811zw9odQOc8DC/zOltuTlRyZel8BKryt8wSDogDJf8NCpgYndZMUTmclh9pqItRpmgsnusvDNSFWJePnjkLW3hNimIJKeiVnwLc1K7TZwY6fFQ2vvK+3kYqSAT0FQElxcg6Y43jgq3T/FpslnXnL0y1Z1xwySB0JtBQ== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(6666004)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YzXOmPEq0E57Ul4XHFpBq686yCQU7eLOtSJcbahcTsN5wI6WmFEtmtErdVbO?= =?us-ascii?Q?WC7HTVs6R9O4YqjTzYKKwLj5H4KBBeeosEPEeYrZo8YIRm0Jkc0LhS+KqKdz?= =?us-ascii?Q?ZPPCF4AMxRZR+62AGHep+08SVoqWKhaDzvkz8pSopAyleV1Ws7nDCUqeICgg?= =?us-ascii?Q?BN1FyGQCaQpXxo4uZqx85VdFHYnnR4z0y8mSCGCLjleezQRdfnDCwR+pVoVe?= =?us-ascii?Q?2gHh9nf7dtn2QOq9CQNQXXSByp4kRVfUjzUeCcdkn9DKSp3FsZEchgLHOfpP?= =?us-ascii?Q?KrmZxQ7/sybokDGABDnPYhyrIRdh0c9Wkqxbwc4DdNnoCP3SLMgaWsuR6jSS?= =?us-ascii?Q?QRe3xlmq+YeodYOd7qjYFmyBYZol4akP30GmusfamHd2B5kk2dn3p1HR3r5O?= =?us-ascii?Q?n3HOm7dx07uc1ODoC6NaSJ10Yz3zwCXNyAtbzGMOHBERCzkGcOhxg8Hgo/iZ?= =?us-ascii?Q?ugeACR7qT38vmyS3KLv5cjz9CbUiybsih/W3kJ44deu5rIE5M1ZeYBRICKz2?= =?us-ascii?Q?B4VT181FbVFU9j5c49Ilo+w/vesm36yxLGNvT0QwbLHWMQV5+2+HFiyvkN31?= =?us-ascii?Q?vB+JMysV/lMT/rKMeYIgrUe2PFt+OajSqfWK+jIELp4ICD4FMT2AzhaGfuJB?= =?us-ascii?Q?ktcPDMi5ZnOkDxfgvOwbyYxjEl+fhf0c3Qf3PC6j06NR8n7A60ihjP/xUYzd?= =?us-ascii?Q?uMWw4047flWZd95qiaBgx49gMglbhuB3x+5uGDMrJ2EqA+Gmcgs5Cm1mfQvS?= =?us-ascii?Q?vznsStEvP3XkcBrpVAJSqIzgnMluRp2rh5mgdT5cCsmsaK6Cj92CD4G+U7Xb?= =?us-ascii?Q?7uOn05VBzyZculOgwXzlYs5V3CZZX/PChx018rTpO07V050WwsN6Y8Hh+uGc?= =?us-ascii?Q?zcS0JGmglV3Ugwqn/fA46TWMllPO+FyKk4qhgi0fZqGtGaVFERZuowNQPrud?= =?us-ascii?Q?CWlVebGQZGhlWEGDjWHnuC6fGyu5CM+Z820u4NWNlV6HIfNApPFAifMkxiju?= =?us-ascii?Q?HMBCwXvqv03wPbHqOsDyfh4xjJijXDetir7kV6kErNtuB+AgAUe2IWWbeRYL?= =?us-ascii?Q?jBhiMRpme3KaWCQx0wFaXxlHsvNUpJOLP37qXrzxEOuwy/iWUg8rZs3S27Ap?= =?us-ascii?Q?aH0d0KnkT8O3Qf1hJJ1TzllpCBBz3qTiAI9+gTXkWVgIlwUV5YnI1pGyxoPB?= =?us-ascii?Q?+X56GEfLC/Xmp1caBJi1y1QzP0P8MRjNggGsgAX16ctaMbqmyxALOSQoT7tW?= =?us-ascii?Q?ahdieOOhXfUfz/Ojri+o7+u9HxNPqve52C0Yi7V/Ld/7WnqTaB6T7Vd4Xc58?= =?us-ascii?Q?sZBsFk2bRdYSG5oAT9t/gWZH/Bdb5Sf7uwCPI6Sqi3KjefZae7BWIagAzVRI?= =?us-ascii?Q?JV+ldnIFVlweswk0UUg8ZXq9Kh1SBaIPXdud/6JnUTPu6M8hALD6FiSz++rs?= =?us-ascii?Q?WmKO76nmF8oVZge71t3MqVd6TTKGPW5L0PJv+wpWbaZ3Lo9/iVjm9xg53TTt?= =?us-ascii?Q?6rxSDQvo34kPRn2TqRLV4CxgHUOn9MJcFf/FuUduE2q5wIZR6haywXubHL7i?= =?us-ascii?Q?odgYbFVbO2gFfpL2acyKW9nOYGywg1eNVcyTZ3MZ/dDL7TKiJT3VUOCMO7aq?= =?us-ascii?Q?nkdAaww1bLf3S4gwSEIGDszk934BcaL6Jk4YEfDMBp0vWxjMrtPAIxNSpTV8?= =?us-ascii?Q?enyxMWso25ROK9Xyt4hBoMTKUAo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f62bb9e-5c36-49e9-465e-08d9f41d0961 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 02:59:40.1828 (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: nbs2uKajfQaDpUunGTTeTFqcwXS8R03edV4s64uSuAYmeIMLpqOuFdRNpzC4Pn4nxdg64eVFB1ak3goTgBC4Pg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 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. Showed in the output whether the inverted namespaces check order is used. Since if we pass -Cz to mptcp_join.sh, the MP_RST information is showed twice. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 8f81ec0b7552..ed4b35652ab5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -872,6 +872,50 @@ chk_fail_nr() [ "${dump_stats}" =3D 1 ] && dump_stats } =20 +chk_rst_nr() +{ + local rst_tx=3D$1 + local rst_rx=3D$2 + local ns_invert=3D${3:-""} + local count + local dump_stats + local ns_tx=3D$ns1 + local ns_rx=3D$ns2 + local extra_msg=3D"" + + if [[ $ns_invert =3D "invert" ]]; then + ns_tx=3D$ns2 + ns_rx=3D$ns1 + extra_msg=3D" invert" + fi + + printf "%-${nr_blank}s %s" " " "rtx" + count=3D`ip netns exec $ns_tx nstat -as | grep MPTcpExtMPRstTx | awk '{pr= int $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 $ns_rx nstat -as | grep MPTcpExtMPRstRx | awk '{pr= int $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 -n "[ ok ]" + fi + + [ "${dump_stats}" =3D 1 ] && dump_stats + + echo "$extra_msg" +} + chk_infi_nr() { local mp_infi_nr_tx=3D$1 @@ -990,6 +1034,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 Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909175jad; Sat, 19 Feb 2022 18:59:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJwS/M2PyfxM6Vl5aiG0gZTxu/CMYQSu46TWJv1nE6InBD5Wwh5261n5o9ZGOzRWPn1ZzxbE X-Received: by 2002:a17:902:eb45:b0:14f:b325:4f81 with SMTP id i5-20020a170902eb4500b0014fb3254f81mr466423pli.79.1645325994746; Sat, 19 Feb 2022 18:59:54 -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 j66si5631425pfd.63.2022.02.19.18.59.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 18:59:54 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3908-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="JD/nD67J"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3908-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3908-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 E6ADA3E100B for ; Sun, 20 Feb 2022 02:59:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 084E8180; Sun, 20 Feb 2022 02:59:53 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.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 C143528E2 for ; Sun, 20 Feb 2022 02:59:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645325990; 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=Tv1eny2DDITQeOlqu1Q79qIpyxsUvNQljSFyppVqVIs=; b=JD/nD67JuERlaGm6fSaDI6mwrTHKE7fil+AeiznxU3fPFmzzMOyTzZQLSbfzw3ngcb47Jh kukbvbPdsS0omuQGAnO3ybeGYkgsffAjnVO5eobzv1TW7ACZImtZIK71k/1pjbPbupjqRK 9KIomB1f1XRA+/H9xV5vkTj7xM6AkQQ= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2050.outbound.protection.outlook.com [104.47.5.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-qfBvk7zFPqOFuaFAzWJw8A-1; Sun, 20 Feb 2022 03:59:49 +0100 X-MC-Unique: qfBvk7zFPqOFuaFAzWJw8A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IjWs3elLQOb5t8rv71jyJYfcMzIe3nmYfImjlwrPHIwU5z8acABJQq/jZWw1tYUXEsygxH6vIyPCQmrT5VpimFVnHPkhTrBpxAM9AGUc8Dwar5WySgS2jpzC79KbuHhFErcjGa4UHUky+Ot/bXPMtJaZ+kjvreZmW25RjtwvKftIvLs+8U8fU5Qd3A3KgsGpru9pSVbWz9i1p7Q6ojKhwssLxuXWt5ca+wtF/67Sf8obvGrwWCMAydpLyfQZPxxHBDzTUxC9kjcwhlvJ8/9zo91wChO1bmaUhiBlzuJ+XJyHNxxbG70KXDbo+p0uiktfGTUBTp9+F1QMIaZKxsUGlg== 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=ed6FtBPhAFv4+jVllGpOt0+3heYmsiTf1q7rLJRReQE=; b=cvHyp02RWKVjjua+zM/xQ/u1qVzlE6pKHoQPwXZ1KXzGm3fjxb4cc4lO4b3317hJ50zcYR1GaWHjKLNJDO35fWnejy3+4t9fslNVde5JuRgrOvPKX8X0gqMJT9HlcGeO6PMno2/WZcn7WvNnohtur8zWYCWtvcdwCzde2Qb6H/FijOh+4dJgxFRbv9jkzRYl3eZeG/troeuP39cGaHazghOPrZf1TIze2Y9yhbELlBIMqW3a/2890sNHHF4INh+RQTdF7H+cRBkfR/37AsjpNuaoKGAWBUf0QRObnPYGw0PbEn8UhSF3InEnzYOS906sMZWRVaN8o/sATm0kDnwkJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 02:59:48 +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; Sun, 20 Feb 2022 02:59:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 05/12] selftests: mptcp: add extra_args in do_transfer Date: Sun, 20 Feb 2022 10:59:31 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0007.apcprd04.prod.outlook.com (2603:1096:203:d0::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b34456e3-6b39-4120-1de0-08d9f41d0e02 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qcxvevp7d6fAo+z2fbNRE6YtdZkLACHSfLbW7tUI0V3rkciMYouex+Y6+0sjKPunlGwMRCJFm/6YzfSFB+A6YLyIhnyhtzWRAEPgryITYPq7eIGyX3WQikbY9zbOGVGhwe/ZLKb6Qv8FTQffoEtXEhY+7vHGTaJy5hrK2eEa/j84quxc+N03TQ/QOl/o9liiieu9E7ohJwLtm4cT09bNuP2Vb+R1swRgBxQB1pWZ5imr1WzG+1BWqmTfQ2h6ZfhtmdpCz5TaZpB0VoS7Fai0s0ThyZ54YmjIeB5YOC/9UqAsXwFiL26iAxWYfkf8hfPKT17/mrrc/RVH+bPwH4e3Xn+1iaeySQ5RLlYWWXankbuVZzv+p6RenB8/H24Ngof/2KVMuNbNTx4CSa4svWYcwNXTdnB+KG+eo9DBYJ//0tFOcx28ptA3Os3Ryx7oBoaL9sfXb4Bc+iYaDO7RywF+Xlkeo9fEGhtyPCdQBhloBp24pNl9Y1iTv6mGbUy3g0uMBUZsHIlGHZL9S9ZZ+EbmGRzqiB6iva5h848MMJmzjQ7wERo5WwTlQT2MlCNgdGmYWSmsFFLW0+Wh4+SmlsqdsK5G6MAASif9JETpJ+Ll+moJZTPDzpNLRwOUiccREYkLO0/DIBwBee1Oxesg6WnF8A== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(6666004)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PuXrAWAWsZvjA3zhkZnWpNGNY5zIM8sPijVO9NCCEteXTnjvUgeSfd4Kmnqb?= =?us-ascii?Q?JCmkc3Ulo4XYJam51MAXfrFE6xXOxnye2EnncZh7X+dZnP4KcpDyGt7Wu6xZ?= =?us-ascii?Q?N4lLF1hGx+hogcrGYFKMf+KIPnxhoLiBwzQTraP8amovqbEABj1fHJHHczna?= =?us-ascii?Q?PYGg3KqGp/Jyr26VYm5mxNJl0XCLv2GqgrFoLha2Deux9kO55RlGVJwG2AlF?= =?us-ascii?Q?/lTgeXLdPdd31d0ebu+V9biVNTND0cWOkcCA55vkK6pVhoBo9FAVcn2ymHYO?= =?us-ascii?Q?Gj/yvFxfHPM5mYAs3cWKGvhcDdWv8aEjHIMAMXxc4QxMLOQqACdtLfmVBZ9p?= =?us-ascii?Q?hzDqlaqNG/ovz7xWbBP7MALggpS6V3/dKrKNTjDDyZz1Mnsdl2nkoPdCfUmj?= =?us-ascii?Q?uAtEnv1fI6ID2TQT3IK6JpT67ACCWxdSDX6pZ8VtWX3xBGK59e8K3QC7vBeT?= =?us-ascii?Q?ueTihsI0kAZSjBh2BWk5n7+6CeVj8EWmeqyJGgmBaDy5a5GKJJltTHMpVIEj?= =?us-ascii?Q?jz0WqBZFVCAfmTjStIsgcfZiEqwAAuTb6/b/taI5otR7PPHUSp6AvQKqDDfm?= =?us-ascii?Q?fFG657fNI/tS55f2cmug8gUSjJRiYTgAbll+Sb3ff3E2F1kHMq/D90Z5Vp6g?= =?us-ascii?Q?CQ4kYZ5GPzstRrC7lrBrlXnSaqObR2ay49zu/27M9X6Fh2D6YoMe4y7MLV/q?= =?us-ascii?Q?XaqGWxZ336HSwIT+g0viXaP2P48jQw80TNZbEW3tBCpIPN+8FCt2qkQUr8OR?= =?us-ascii?Q?ZjKrDlBDmvM8SIu3+a+mQ2RFZsRRYVW6va3tZWhQzKS8PNgKz2AmACm3Fd6W?= =?us-ascii?Q?qhiyL2VFXdK4s2aCy0wVVY1tT8TYG53CAOAnq38TJYmd3sew/45zG1BxvZPv?= =?us-ascii?Q?5fkQJKQ7YxJ7IjPbF0T99zceUStb4t6AgbtkmfU5+27pySzreQwhT0YV4vJL?= =?us-ascii?Q?9k63aiYlHg5b48mvJwNOD3Rib41ciIWsN/0145IJhyorQx5siUf9ManzGzUs?= =?us-ascii?Q?7o8/66JliJz9bQS1bRqdlmj7Laib9RCNZim3VQXvj3WfLfLBIOaGa+Hpg7vl?= =?us-ascii?Q?rQHsdP9QJ3L5TSZGczA9paFklgraaJDYvh0+b9Nmfs3UV+eyYoiqmF3L7r73?= =?us-ascii?Q?C3zFYG+jRPTaApaMSAiY3Fgh+S7ZlvDQLtZdVKHdQsP1AnW8dDHkhx7Lqxsb?= =?us-ascii?Q?1gjIjC+MULkrIofp9Ye/tPn3DsItJDDnxy3CjYk5bKD5RBNgnG5kc+RyaHTh?= =?us-ascii?Q?UjGEYw69/6mk6EzQ8lCUNr+n3grLynAoOrzcNs+fBcL/AmYf/znAXxzDE697?= =?us-ascii?Q?+DSOw2eRdyTwcZasUBHa3oEk+bJODQIbIowhw3DOuhVHMBvKsas6q0fwav8A?= =?us-ascii?Q?7Ysejl+muX1JEdbHSb6+6yZDLvyHNrnCMi93rwXpgf8repBOAr1287rXdY+p?= =?us-ascii?Q?Xz3Bso8CY4PzfaUdQu0e1t4tAPd2kYmTqhel++Azsq4KQDF/3oGjv21zMotB?= =?us-ascii?Q?NpHWLv1VQT3qlFHx1tEtgtkwqMJClgqbLO0nucBqspIzlBUjfhs9rIJE6n23?= =?us-ascii?Q?oNujU/nd/HqLbI4DfgqjNR/ObGuanEk1wAvgGu8Y1RKYQRsEDe0nHSJVDOgK?= =?us-ascii?Q?vrjDSttj6gGxl5mBMg2n2usjxtgiX5G5Vn1t2oI4rvlEuP5w6mtLyA/VnkHi?= =?us-ascii?Q?9IuC+iw/o8gVvL9t4dN1fbMzeT8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b34456e3-6b39-4120-1de0-08d9f41d0e02 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 02:59:47.9634 (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: aqYyU/PROIU+hORGyDY/PnvqDlx4PSqx8TwCw8ETLHQBORlPsbNp3QaLsxuGtusuWranFsnSedCEtv8oaXQxHQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 Content-Type: text/plain; charset="utf-8" Instead of using a global variable mptcp_connect, this patch added a new local variable extra_args in do_transfer() to store the extra argments passing to the mptcp_connect commands. This patch also renamed the speed level 'least' to 'speed_*'. This more flexible way can avoid the need to add new speed levels in the future. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 30 +++++++++---------- 1 file changed, 15 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 ed4b35652ab5..c06e9e9a0a3f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -12,7 +12,6 @@ cout=3D"" ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -mptcp_connect=3D"" capture=3D0 checksum=3D0 ip_mptcp=3D0 @@ -524,12 +523,13 @@ do_transfer() NSTAT_HISTORY=3D/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \ nstat -n =20 + local extra_args if [ $speed =3D "fast" ]; then - mptcp_connect=3D"./mptcp_connect -j" + extra_args=3D"-j" elif [ $speed =3D "slow" ]; then - mptcp_connect=3D"./mptcp_connect -r 50" - elif [ $speed =3D "least" ]; then - mptcp_connect=3D"./mptcp_connect -r 10" + extra_args=3D"-r 50" + elif [[ $speed =3D "speed_"* ]]; then + extra_args=3D"-r ${speed:6}" fi =20 local local_addr @@ -542,13 +542,13 @@ do_transfer() if [ "$test_link_fail" -eq 2 ];then timeout ${timeout_test} \ ip netns exec ${listener_ns} \ - $mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ - ${local_addr} < "$sinfail" > "$sout" & + ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ + $extra_args ${local_addr} < "$sinfail" > "$sout" & else timeout ${timeout_test} \ ip netns exec ${listener_ns} \ - $mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ - ${local_addr} < "$sin" > "$sout" & + ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ + $extra_args ${local_addr} < "$sin" > "$sout" & fi spid=3D$! =20 @@ -557,15 +557,15 @@ do_transfer() if [ "$test_link_fail" -eq 0 ];then timeout ${timeout_test} \ ip netns exec ${connector_ns} \ - $mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ - $connect_addr < "$cin" > "$cout" & + ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $extra_args $connect_addr < "$cin" > "$cout" & else ( 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" & + ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $extra_args $connect_addr > "$cout" & fi cpid=3D$! =20 @@ -1620,7 +1620,7 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 least + run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2 chk_add_nr 8 0 =20 @@ -1630,7 +1630,7 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.12.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 least + run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1 chk_add_nr 8 0 } --=20 2.34.1 From nobody Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909223jad; Sat, 19 Feb 2022 19:00:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJy3nTEYtvLJaT8pBqSFEAJxCxYT2yiBfuAfEcKQhgxMdT9CANrP+LGzgmQfDY3n0wbZdjHQ X-Received: by 2002:a17:90a:c682:b0:1bc:11c4:46f9 with SMTP id n2-20020a17090ac68200b001bc11c446f9mr3187252pjt.69.1645326002522; Sat, 19 Feb 2022 19:00:02 -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 fa4-20020a17090af0c400b001b88b729c23si3098927pjb.94.2022.02.19.19.00.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 19:00:02 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3909-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=BDd7+7x7; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3909-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3909-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 013D83E100A for ; Sun, 20 Feb 2022 03:00:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0CEBD57E7; Sun, 20 Feb 2022 03:00:01 +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 B07AB180 for ; Sun, 20 Feb 2022 02:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645325998; 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=lCkMRXkCWgc67rO2c6COStZSQ0PhrnC+sGI0Kkp3NHE=; b=BDd7+7x7iKvsCc3jY3lQTt89ZU+8/gigUOjymV8vG/tcmngfY0/rV1SArudhZXCO6Gj3UI lY3KjPcTcDo2E9L5arSdJDCTOrDXvD2ZP6seE6f8T8lUJuL33Wg18ietDi6talR2hN3EZw aCeHH85sMRtoGrX9jxuZYc0E02BXODI= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2057.outbound.protection.outlook.com [104.47.5.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-awK9vVAYN_2uIJl1OAz62Q-1; Sun, 20 Feb 2022 03:59:57 +0100 X-MC-Unique: awK9vVAYN_2uIJl1OAz62Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ig6ZB2/JmyrWzOequm5b/26H0kt2St3x0ilxpdyzxn32qtmNAgjo+YJDdqYsbD4WgcVYnFWdDIUN3xUq1UdSSD1qRy120eoHYHv6INkvp5pWEvFNpGHEqnWvnJQkH6jZuLTshQiqzYX7DG0nGyPnTilCuael4r15UqKrwgNmqMj9xthEDvYFoPpfZgMQwstk+TOmn6am6puejMaaYdnVUCR0zXdliOeeICfJV+q02YZUNdjnqDIsj6wORcdiITfbi74a5413iaBcdVZq9ZxCVuvjJFdqprB3hEVFd0VgiGu8ynbswGiKHfr5qMVy3tRRlufxVHr7oQL6YE588WaxmQ== 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=8JySuQqtkZMu599oeoWXGUxZsFVo64NFJPkDlOrMhAM=; b=IQVT20aYug39dI5aQBPIOT9tkdNJwgwfJ97AGfDT4QxJQR1arWwsYxmS+OXfq/N5oOiZoEOdbiyGrRS3ZlbGCv3d2FiPgkis7HWL8aM2mfp8MDWOBEtjOMMjvKCOwgfiRuhRR/psxPrXxOaqdQN5YORx1avZPrt0D/Q3TARD5P+IwwNaKRihBzUE0C3ZSCGG9QRp2+rnmYgJ2QuAqZdo39Z7peUnesSL/Nb3HpDA0jerSo276Ml+mPPvIDjoKgjNLtzDtuqD2183SfCi4SZv6Ll4DvAH8zz7nt7QPvVAIs28HubIpcEA6DxwR+RXq2zg/iUo7GDV9PYBlR0FLeBbgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 02:59:56 +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; Sun, 20 Feb 2022 02:59:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 06/12] selftests: mptcp: reuse linkfail to make given size files Date: Sun, 20 Feb 2022 10:59:32 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0006.apcprd04.prod.outlook.com (2603:1096:203:d0::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: 13ae9aa8-a76f-4d7f-05d4-08d9f41d12d5 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ucgZ8Q4z6Ax7MJcBLFD04lo6gI3kMPT0YioMSUGJIPj6BrBMiMZsQQwf+lBV01BIVARH2UizUXhKc6nB4k+OsyFM5J5LLsSPoqvoV9IALww29csdheberZ9nb2zH77mHcfgggTu1EiGOe06OLYG3mEZD/1MjTFsVDQbO9r5fnInPxsaJhHIhD0DR3n/hBTSe+DsBpTlmRPhbZj/rjGygq6KWfgtDsTrUPps3WHMfIurm867xoDmNEMCTrOujFgUIguo5WTnLC8t05OaM8tBAXAG6c6T0ItlVVzFni9ZtoXjx8BIUMV7G2FROdGtIKngAnNsyWF5J4hsZ0dyD++pUvcEkGhWv36V1JF+KsMjlVcbWDUz5cWPlcwk41/U//1q3756t/E++rdQe3R5I70SERyuLuOaaAM0JJd53kj5asl6N51PfKl+E8jGe1QHk+IrBHt+BA63N7cvA2ba4FTBl+/04kE6TZyl9wm3VGMqh++4GIyE64WYk/WpVDRTF08sY8PynSw+LRmYjiN30bbfzBSEij/RSvNxosBRzjPEdjFQFNb3+RlmJ/olcQ3IZIX5CFLpln17XW3DAg4oswu2Bx4ogBFWwbZl698c3Q7buySOunBifIoVEAC1rXBBB138T7sQVBojkAHstqnjmYvzYpA== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(6666004)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AFw8Cn6TGb29q0dAaUi80DTUNpM7oYiW7rczovFg8u25oVQ8ZOeuNH9Ih9C5?= =?us-ascii?Q?Sis5ySe0WVQ+zKJG5PtcYqul3wWI6ul9CP+5EN5+6k1wTu03QdohXnp0OR51?= =?us-ascii?Q?4jzi90eLHivj75FViLwtbQnXLwICm3/qr7Lf9rnANOw56Yx+6YXxEfBGME5u?= =?us-ascii?Q?kA/baFvGPW8F++ej4FQt4ThUlgfKCVKzlG0f7MAfFvIIfHx9YkjIwaoIHA7M?= =?us-ascii?Q?91N2+qreENvAVGOacAezS2ni+O2tmfB+bhhF4KgwKpGUvX7c9NlqcwxZ5YSy?= =?us-ascii?Q?3/d0SS36VQHN3RfcI5lcpSMIX/nVLTbry1b+5JJbmz2QcF3nhFd/bP9XyAp7?= =?us-ascii?Q?u/gOEiJ2FBWbEKKGiqIJBcoTHH8vjt7x+PzpUpEvL5zwjncHjIZB++pghTcS?= =?us-ascii?Q?YjOrNoJU1CPv9HSwJ1deeHlo12XsD4+eX8BhGLb6TAzayjMdLWKSeTg8nJmx?= =?us-ascii?Q?vI3P+OIV4jemPrawjgTL2h92Cz8NRp7zjwfMTsdbC7P6sGdIX+qGuEhb8jvN?= =?us-ascii?Q?n1RSBfDmzDUvpZVszcoCZFs4FOr8UejIEiGlLxJTNS4YsVwg171eVRRU5bZq?= =?us-ascii?Q?iHgdwc2Q7EHSrKWvQRpbRj3l1YbY8w1UJfpZX03zNNX+1rJ13/Fv+aJinLQx?= =?us-ascii?Q?/tS5ecJ8uaGZvQ/4Z83b3ArNSd7sKwO/0qBZUNFunXNF7zfDlGF9WUm4hbZ+?= =?us-ascii?Q?FpKioL6oUEf+X3dNLToTrcPk9BClehkmnE3HyU5u2X8vCKTKmFBGYSF5CCBW?= =?us-ascii?Q?nt5PZZ40o/19uDmnGuiw6sF+K4rqI06XGtqesFX9rro3zrJgq68johz5TRFg?= =?us-ascii?Q?dhYzXh1lt8h1JqklbYmx7YdfxPKjt/W0mybiyKxGajdYL/dXaw0sH3khnrtJ?= =?us-ascii?Q?Tjq9OqM1+b6bcU8cRhBnwWrFr80F0seQ/CxlfuLDzfMaPRhWUiQzY5R8P3bl?= =?us-ascii?Q?GFXtjyUekQ45kblItBLkjo5CbivXcLCzUKxSIxXzH23uHrXrSz6Fnm3+C84z?= =?us-ascii?Q?P5Rg/YOCsBx2EI1AX6WYGeqVCNPKT5ytTZJIwPqTBn1zxjHTkb18FdPuSNfI?= =?us-ascii?Q?j9vTQ6lF6YnWivvhv9bxLVd1xNabyOMf/uZsDaZFoX+dcsOqVjcha0u7HAw6?= =?us-ascii?Q?9nr/tRLXolOkQZbofo+hIXcDscSrY+C0yadPsMvI/HhwoRmEjEnvuDnCmKqQ?= =?us-ascii?Q?n76nndRJww6j3V6rwsooQWvuSjhVfwaiYbW1AQX8efheB4y1Gtct0H+xZFOM?= =?us-ascii?Q?NeEOVIBxX/ByQcg7/DbSGj5cghZ5O15Zuc0dObJw5aBYRu1YpI5xLq6Wve5H?= =?us-ascii?Q?v+VcmIx0FBnlgTToyHhlYY8CXceFuWBQbaoA2CkY/Z1p7e4PjY5JpBOS3dQg?= =?us-ascii?Q?v/0/0aZdaS7CVvwu6kYwewODDT6kFS3Nnsvd6UBsIFLTgpSBjspK+uQgGjfh?= =?us-ascii?Q?bkGnw3ne9hy8+xHZR1UQgIVCd+NQcK5gKCSwf114tlMxbRT6uhrJkbFW0O3l?= =?us-ascii?Q?J2sGzuzNy44bStZvhh2Eb2tsLf/FEYwx8iz3QsOi2GiRAaZmnBE14i8YiGCL?= =?us-ascii?Q?mvFVocOKgSFiv8XSX7nvRPRxRCRLjZfoIwvKf9bXGuJh0BTSoKuGNwH+ObjN?= =?us-ascii?Q?0Rs7i4xqr0InbjbYR9EMjzdymh5WOTiKZtezHsOL/g0Pr5hNRMOXGVCs8Zno?= =?us-ascii?Q?BP9rIlo/b8MIwJz/UEv75sHLt80=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13ae9aa8-a76f-4d7f-05d4-08d9f41d12d5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 02:59:55.9471 (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: WmTIEcbTorhR106iyygfzneEOqtX/K70Wy5Qsmlu2NeiJ8qRDz42/c97dOmM+F9kOTscFOHbiEPZMAxaWworSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 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. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 32 ++++++++++++++++--- 1 file changed, 27 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 c06e9e9a0a3f..9d2076021df2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -539,7 +539,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} \ @@ -559,13 +559,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 @@ -725,7 +731,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" @@ -770,9 +776,18 @@ 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 + size=3D$test_linkfail + + if [ -z "$cinfail" ]; then + cinfail=3D$(mktemp) + fi + make_file "$cinfail" "client" $size # 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 @@ -785,7 +800,14 @@ run_tests() make_file "$cinfail" "client" $size fi =20 - if [ "$test_linkfail" -eq 2 -a -z "$sinfail" ]; then + if [ "$test_linkfail" -gt 2 ]; then + size=3D$test_linkfail + + if [ -z "$sinfail" ]; then + sinfail=3D$(mktemp) + fi + make_file "$sinfail" "server" $size + 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 Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909302jad; Sat, 19 Feb 2022 19:00:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJwFHiC+WlSoYroZawwW4yH0qxZSNyREFTrTm8jV6ZPIKAPBhmk5ja/CfDzIInkCb5kZJkND X-Received: by 2002:a17:906:3152:b0:6cf:d100:a8b2 with SMTP id e18-20020a170906315200b006cfd100a8b2mr11614504eje.529.1645326010731; Sat, 19 Feb 2022 19:00:10 -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 gl1si8617720ejc.348.2022.02.19.19.00.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 19:00:10 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3910-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="kMEWoNR/"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3910-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3910-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 A67341C0ACC for ; Sun, 20 Feb 2022 03:00:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 365C5180; Sun, 20 Feb 2022 03:00:08 +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 9FD5528E2 for ; Sun, 20 Feb 2022 03:00:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645326005; 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=SUSq7pZtOlg9nJWv9z0SGXbWOO4idnQRXuDHdgttmts=; b=kMEWoNR/clhy2g3l03F244IpqkgKmL0sdyFVVxiG7GWd9hFskooI7YrHUClC1l5aBzjvQG HymnFFiHTxnOXE6nP4ZHeZ0NE5unnUDlbHPl/XKa4ELl5l325PDh9P41TYc+2KzMx+zW/p 7e6bFlFYx538/lVZlY57fjfMNuMB6jw= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2056.outbound.protection.outlook.com [104.47.5.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-41-lpgj7_BPPDeXOGVTc-ao7Q-1; Sun, 20 Feb 2022 04:00:03 +0100 X-MC-Unique: lpgj7_BPPDeXOGVTc-ao7Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JnAfZcwDOwa+dA7U1nyVJ95J/r69OcJzuOyh139GMQoyTrwyXE6IMMNBISWmxJEyGgIjbuSxJkf75ify7pDj+yXHYoLC6gmR6ifzlwRhMUXrG1LpKbkWmZ9F62LS9Jx1ZC5W8N+JSTYBa8NojP/iGFI1gmOCW24Mo9E2cmahTUKMQmUH/2P4XSWK/uayOvCZxQPf5omA0XpTDg551CkXw6ueZOwpE50ylIZIqWMDZmX23SITb4qSRqdcucPZqmcU36Nx7H/8D22NR37VZzowk16nvb+uSL6R0eYsDQOlAnBTafZq78ZbwHXEN/HyXyFGFEbTf0O+ZqrfhnPQlQLMGQ== 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=jgr6uFTb/ZPv258y/qST+tJHvYxPIVubvp9oSA9NjeU=; b=J6g1VQkuMm8BThMbwUpZNfmnSWUKLiinOyPujq6AR/3o83Q7uh4WNmHLy2fU3Sd+cD6jNUi1NtxF1t3rfTW3Xczak8CTdtI7PQ9rxOg3qzQnFzWNLfkwu7bzrjyjlDs+A02NMQNw52xFxMtOB9FV0TkHONQs0536erPY6SRXwg8seWF+E5W52RgcrHvitDZV3xuIZ6blBKtC6bK2jcOXGITlnfHXsgM2Kb3m1i3uWsMKDUv0gyRT2yob+SlkKQRENl2kgNt35dTrHGMjxaKVGlDohgxQA1BIaBnA78DVM6lfXhdItqOiIePkd2fgULxCBqQjekB2W/Vv93u26fgd9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 03:00: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; Sun, 20 Feb 2022 03:00:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 07/12] selftests: mptcp: add fastclose testcase Date: Sun, 20 Feb 2022 10:59:33 +0800 Message-ID: <5d516ae3f2c943c4ea10d14c0f5a22553b10e647.1645325178.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0069.apcprd04.prod.outlook.com (2603:1096:202:15::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: 34ce57f1-93fc-4a92-fa47-08d9f41d16ed X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gB1ldN1dNAOUsU3h8VtuX1QYpN41CPXmi1Vy3hu3fh5nlhVF4jquVM2SG+LKMxvEsWs3XlEhW1PVeILZ1Afq+7gdNyhEjcs0QXNjdBV7rIYLKJkB8v9WBjtqQoSR9ZpLO2yNgZSpwT7lMjvb57uGp1HdxR+0vTWSimjBsL9AxECGxWbNrgrq6xgITkpGQYsJQ+JRNzoyA3dHoVcSHVocx1B82M8L0msUF6cD3ItDOmyH87n7LqsKwnYAxOspvnWfOn3GoU3tbmLUyMwa70wx1ah1W3KJdwpdIH/mzCTWM1UQsZPanShmUF/xUpZqtzYy+RwSn+rnu8o3O9fn4tNo6nIQHTAkN8rY0mq2p+LABnU8BK8fZiKMkuNHFWcq6/1Z+ysTMguU+6uMUC8KP3zInIffAO99GACEbrC5W8FsR9PnEbIiz0b4V4TkQfrn7Hq9RKHC4HEFnzM1RMbT1u+scTOrAVA4VVnSCmuVlUvbwRysmdw1ykd4r9nt4gcgP6k5CpX09Z2q5eLWDZ3REHUfhZhOiMsnC0JbvA3VeA0iZ8NYjH3dgGA9TlKItmZZAQY+YA5KkAVUYziMJLWODzKX2dYOXjKDQsRmXj7bIwm/RE/3qYy4ej1KX0J+lwfhiQnVspZ+0/1A4eQHEsw7oszHcQ== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(6666004)(8676002)(6506007)(6512007)(83380400001)(86362001)(19627235002)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fvkYkCUdAe+fzejf2kfzmGiaKcuULmFz4ZDq3yMIjgMOJj39UTs8sVCV5Ivw?= =?us-ascii?Q?LttvtCBO+wvoeaNYs3XgJIi/ldGlbOWeG1W1yaGRXm8vLaONRxAbZxBOMgWe?= =?us-ascii?Q?6NvIKIWHmH8gkKkI22L3fo9fpb9+Nf3/jAAc3G1hqajmjn7vu0Rd2B//cLec?= =?us-ascii?Q?kXEAoE2OlQmYLq2YMpkG96j1TFFAtHf6IWdnl8E/24EoClOWdX4IlRAzH/8F?= =?us-ascii?Q?Bw94TQ51IF0R/a0cSDzklBNNs+ZVCHaZp2FuKKSz5QTWRCZOlg+rCTau+lXz?= =?us-ascii?Q?4UxBo3hXrHCjSlLe0wP2tMUSSIiCnKgdnMQyEftzO3YEaGqUj6e6Yw+GJRf3?= =?us-ascii?Q?AaWQcnHqZxwklpIUXk+MrnnOoTZRM+Cl3RvSxet8B31dFNJihB4eA5M+iY8z?= =?us-ascii?Q?pYrzNNccAXLVujkguFZXwyLcBuUnDxZyOuC7UP59uUFAiwO4K4zRmUeKryjs?= =?us-ascii?Q?JvhdwRH5kaxzwRi9N4HuSCWv8et6Env0Rxbx48QCUlL+8M7mgiYbfB5WeiGY?= =?us-ascii?Q?VvWGDdaZ5I9k8crdmd1P8R72+5G1fS6bkcRjHg07B1dEGYPaKemimHWD23op?= =?us-ascii?Q?SiYhZiWQMIfvzNOlG1eSv8htOKkdxlPBrc/7kPL0078d2V2LxFKV60N69qFR?= =?us-ascii?Q?AEYKgEHde+elPpex2W5oIdOkcuq5gGyzJQjU4Xi5D8XVUKO8UE9ItTMGXCSn?= =?us-ascii?Q?KLSlG1FZSMaUS0tPTGi0+mb5RAFZc08QmKm62MdUn6M8c2lkwZ/6KSHALMxj?= =?us-ascii?Q?pLotqAQyd9CG2xHH3zmPpbPww1mPrWTtm7Bu2b+Hse70wP4BeZBfePmBf/SK?= =?us-ascii?Q?0YVSvdzJf6DvQ/T8HrKFAELryQBwbCxQCUTyHUM22YHgTsNmdidbj7+CcwU9?= =?us-ascii?Q?FyhDYnfxyPfCeF1S85ulDqwKOTPA4ogkr05z2aiddZi72R3XZEOsfKkWDhF7?= =?us-ascii?Q?4zeKg4e6Oc0cDeeV0347n2yMNfOLYjToFCMDi/8jQWgW1nH7T3iPZdThPkx5?= =?us-ascii?Q?uvNqyGVJiPg8j43x5uWYQDaHskouAcfdTMxfBdSstZq2Dn24djmJKTkWe6K2?= =?us-ascii?Q?FIUysyRRBlam/N48CvFsvA+UNmbgNj0jxPTPfk1ZlInke2l01Ad7NGxGSmnf?= =?us-ascii?Q?U3Ugset96fU9oLbq7WlhJi2ndbAuendIL8lS3ffpMqk2452tKuSvFN84tlFi?= =?us-ascii?Q?qBltHkB7MqXM8/DFmBBi3Am80P2/kSuZ5TBOXgsC8vzkfop4SG6RuDXIFOxT?= =?us-ascii?Q?aGHsSNyDjee9jOOvxsVJrohCtFyEtgOSyyUYO/BMHkoojJEVsxnM38jZQnUy?= =?us-ascii?Q?U5DWJW5oY9KgnR21Y1LpPtQqFQFE1IiFogWQxH7LtwnqgNKgklsfTE2t7ose?= =?us-ascii?Q?KNTJy6JK+mQu4H/1p/ss2iUUH/JlYvTCoL1XlXPNFW6nmIB1nZ3xcJmjkgEE?= =?us-ascii?Q?9RQOj4QGFpk3mLsdf/LhE+WD988G78quE/HL+A6FGNcYc4xOvM4e2iO/AM0j?= =?us-ascii?Q?RwvIE/BF3OeLQW1ObpRfNBnjHWlLt3vApm6TsGlHFXR9h8JnHGS3gc802FuY?= =?us-ascii?Q?STrrKPUPPiGKzpsvAzIWLH0HTSZ3VRoY80QWHp3nzsLYDQ8HyFOg6dNGJiIy?= =?us-ascii?Q?u7SB3u1+woRYu/bleSsN04yfoAnj5S+yvz7+FIRNDiFHsMpplOiwW6g7YCvL?= =?us-ascii?Q?UG+VxaN/fIyKYOci9JbfAmZaQPs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34ce57f1-93fc-4a92-fa47-08d9f41d16ed X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 03:00:02.8528 (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: nfGAuNfpwKYV5Fk2WWxY7Ez99RG/NOwMuLCLX55653zLHf+rbsoWq6cgKfxpt0E+S6VwHgq1xj0dcXHi2p2Rng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 Content-Type: text/plain; charset="utf-8" This patch added the self test for MP_FASTCLOSE. Reused the argment addr_nr_ns2 of do_transfer() to pass the extra argments '-I 2' to mptcp_connect commands. Then mptcp_connect disconnected the connections to trigger the MP_FASTCLOSE sending and receiving. Used chk_fclose_nr to check the MP_FASTCLOSE mibs and used chk_rst_nr to check the MP_RST mibs. This test used the test_linkfail value to make 1024KB test files. The output looks like this: Created /tmp/tmp.XB8sfv1hJ0 (size 1024 KB) containing data sent by client Created /tmp/tmp.RtTDbzqrXI (size 1024 KB) containing data sent by server 001 fastclose test syn[ ok ] - synack[ ok ] - ack[ ok ] ctx[ ok ] - fclzrx[ ok ] rtx[ ok ] - rstrx [ ok ] invert Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9d2076021df2..1b8b531c8a87 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -532,6 +532,12 @@ do_transfer() extra_args=3D"-r ${speed:6}" fi =20 + if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then + # disconnect + extra_args=3D"$extra_args -I ${addr_nr_ns2:10}" + addr_nr_ns2=3D0 + fi + local local_addr if is_v6 "${connect_addr}"; then local_addr=3D"::" @@ -2409,6 +2415,15 @@ implicit_tests() wait } =20 +fastclose_tests() +{ + reset + run_tests $ns1 $ns2 10.0.1.1 1024 0 fastclose_2 + chk_join_nr "fastclose test" 0 0 0 + chk_fclose_nr 1 1 + chk_rst_nr 1 1 invert +} + all_tests() { subflows_tests @@ -2428,6 +2443,7 @@ all_tests() fullmesh_tests userspace_tests implicit_tests + fastclose_tests } =20 # [$1: error message] @@ -2456,6 +2472,7 @@ usage() echo " -m fullmesh_tests" echo " -u userspace_tests" echo " -I implicit_tests" + echo " -z fastclose_tests" echo " -c capture pcap files" echo " -C enable data checksum" echo " -i use ip mptcp" @@ -2487,7 +2504,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchCSiI' opt; do +while getopts 'fesltra64bpkdmuchzCSiI' opt; do case $opt in f) subflows_tests @@ -2537,6 +2554,9 @@ while getopts 'fesltra64bpkdmuchCSiI' opt; do u) userspace_tests ;; + z) + fastclose_tests + ;; c) ;; C) --=20 2.34.1 From nobody Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909377jad; Sat, 19 Feb 2022 19:00:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCKWkDSHxYrj9Kd9ziLz4zVA0M9ExRxMTK4I7/aplZifnWnG5rqxkyueGfj3DWmjT0fVvI X-Received: by 2002:a50:e1c6:0:b0:410:e2e8:9d3 with SMTP id m6-20020a50e1c6000000b00410e2e809d3mr15209891edl.180.1645326018605; Sat, 19 Feb 2022 19:00:18 -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 i2si8762449edx.265.2022.02.19.19.00.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 19:00:18 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3911-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=fc20Xrnn; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3911-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3911-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 5428B1C0C62 for ; Sun, 20 Feb 2022 03:00:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8BB4E57E7; Sun, 20 Feb 2022 03:00:15 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.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 344A5180 for ; Sun, 20 Feb 2022 03:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645326012; 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=vzXwcVDuNKqrtO4NfTg9NIF8TDNB4V7sFWnHPTrpW0Y=; b=fc20XrnnT7NzKSOC/XZ+8OibHYw5ZSMpV4oaAPrhHRSHELmCsJKCFJiJLMFlYVHMuOPHzA l65B623TFR48Act6uCBOP76kv4P98MSLurYA51GTgU7pkJ+tC/IlJuZk7eAFSwL1Xg+7Y3 LoganpasVpgCBUcHK9HfFBF6QUbY46g= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2051.outbound.protection.outlook.com [104.47.5.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-38-kuwVfxFDMkGlic_5Zu248Q-1; Sun, 20 Feb 2022 04:00:11 +0100 X-MC-Unique: kuwVfxFDMkGlic_5Zu248Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fk70nlH2cf6+We0cqr7BK0VJRkOBCgMuhFd8GMZ0GAWQdrdORuZefyz4Rs6nUQamtZn41A4NBjU8CzIfNmIpDOu9+64rTEXrVBxevTHlUG9xT42yLN0/bPGetuNLQ9KouuIF/Pu4qq8NCyI/Kz7glmkr+sXldk7UXX5bQ2h028f5lwaqAEOZ4gg/GvMrfz3shSYv0lNJTqC8xMkYY58ShHHYsA/PbLn6Lrkejs6O8tw38nB2NlsDzPquXM49tRToMMWintKn1F/jkmTzdQiQTVSQZFUxtw1agpSDOIjL8FXdRp1y9HCubgugZOx1MQktn7eNgLpSRSKLaVJcyZn99g== 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=AgvkD6LDOzHte+GB3x3jzDk9bJTipAR8a/ghSHJmFPs=; b=l2IZYfGAfymQRWXPemm74vASUD4ItWQRa3LzPzia64aX0Vv9pdX9/vomjem0/KLOQ9vJOaDk5yGQHIoIlKOgqfcsaK/h8Qd87gFEqkSNpqEG1uD1Vel9HSJutx0u6uL+BasHAKycb/XjbOpuxvDXyHE9vzeVGcWbJjn9ORbxWJK5nLrrFkggK6tGGZQcsSk8oHQav3B2G/CcaXw4rMh5QVNpv0XT+I4XmDbJS3jyVnaOAakIWycl/bAD9zN5OTE/GH4qXmPJUUmiym8Jc52LKg5GNNFpxlZlbJ7IwXLlyyTJOpcRlNowBN4YTLGp99XtYqjKZVrYumC+qRMvYIqrzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 03:00:10 +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; Sun, 20 Feb 2022 03:00:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 08/12] Squash to "mptcp: infinite mapping receiving" Date: Sun, 20 Feb 2022 10:59:34 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0302CA0019.apcprd03.prod.outlook.com (2603:1096:202::29) 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: 798313fc-ae48-401a-ad43-08d9f41d1b68 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Hu4uIm6/6vdJg75SxmVl6uaVKazxMoHbapgxDzTSNbOX4CLJq7qTGDYLu+y1U5vpfQG6/aNUtHbplmtOPKN4boeDItCwkEqmc9NoRDbP3YGoYlPxCLH7l9nM5fP7lSHxS8fwvM7YE8hYVimlnNK6JLBrfEZxDTLzHYZo8sjcvo7oGJqYeXUaRpSN1d28WPmJnQ5WiljiGkp+c5whr6917jORJcF6gaAi8SfxHCZhekN+jpMPMjCiR9erAdKsnyf6ms5GJBKxV8Vsiil6Ti+oEZD1cyiQUYOaQOlnHQZFqePTKg3DphJwP6aCeOXDNALH5ljDP4mSz9vo9sjEQGXdUqVwzu3jtg4nn1aMrk7enZ3Z02+UkCwAcwyBK1O5KVGIwAOLeKdLsrDAIO6rIsqoOfbWalc+rMdXbGlIsiTBlfD1WoSTdwE+iyTaITlNUL1j/Hm+YDDjJFiwhRG6mt0qo/qe9zqBV6CEOZrZHfK/lEgNamm9cJx1o8DGnrdOdcA+J6YC526wl7zy5jY6iV+DUSDyIc92DqdiTOiDopa4da7OBnyAdzzBxNWM+F9fski8QEY/s4GP1mYxe+ZF09v89BhzCJJRNPJ6cmlVzodCNrF4HDw7imE8LjKWM7UyUn9yO7+BrF1nM9ZJ9Utdaat/Cg== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(4744005)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(6666004)(8676002)(6506007)(6512007)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5EMFWHlsS6RJ9SwcgZ13JeEDrrE2XMndmTau0d/1C78y1t87q66oGsEr7CN8?= =?us-ascii?Q?kofybygwoosNBNONs7YRQwaP1YyO0yebLQGeGOGIOmo46yTGvRIUvrgUClij?= =?us-ascii?Q?zv6bHucP1v88tT2xpKVcWEYmNFD1wHbySzd01NOb7c0DO8GE8vwE+vgvuO9f?= =?us-ascii?Q?WH0W6AeaxgBhoDbjex0HdN4Og5U4hfqog50t+AyXCEYeRb/9iXsMlukFA9Ae?= =?us-ascii?Q?g7J9OXVc6VSchepgdTseMSGXVjZhm2YOd9u33BuO6uEPGw15erZlAxMwBRei?= =?us-ascii?Q?uGgR0ZCy3DDbEUcqx8T+I5Qg7PooWBc0Q1x3pkLWxdRfsrQWn1NO1llZve17?= =?us-ascii?Q?EN92wRNcQsMTeE1hUiPafOvooUXjkcTcenrAdyUmF9Gp/WQdahJ9pj2m6QVE?= =?us-ascii?Q?4xq0/vl0MCG8KD9HWkBam7WGHZpL+S/Mi40j+4pS2oPO/GoEIlcQ41j6xGqz?= =?us-ascii?Q?jj7Q7fURqcusv1UrLnBnIQpX303NTEoOC+V2EWloiXxfgJifzTYKX0vrR5Pp?= =?us-ascii?Q?8Up5bL5J9dXSys73ryi1WLJJW8/H0Q50nPPiZguOcMk4Wd16YIBEWQJyqOjz?= =?us-ascii?Q?6088hep0H0FejxK7MdhqClcrPp7L5LAVY2b0ZYf+rhezxloiNsHe2uNCwOmK?= =?us-ascii?Q?92yW7lT/x4aLO94vvDAQWvs89IoV88T+lL10/lEs95Xik5bwklFLO9Tjprel?= =?us-ascii?Q?lFnCIYGLVXxbCukRnauHWx7d6XUKG05Ar6rlbMJayBmHj1j4gxOybcDdDN/M?= =?us-ascii?Q?rU/xVjzjpO0PICj/mkYpo8m37RXvMLBtU66zpbVMXTxkfkcCFk1SSKLelvdS?= =?us-ascii?Q?79/72PJAPf1jjdsl0oan2ISWy+6/xzPOzR8Csp/qHlRXPh6c9vRpwEZxy0yc?= =?us-ascii?Q?Jsr8a++gDeJkhH4xRAoVjI7BbpWoew0y31H4r42NGxUHh1dQgi2uGW4h4nOZ?= =?us-ascii?Q?WUIpWqf5FqGXbydZMlWPeqNQM74ms+TlBGvRCxKVegOdaToyyKzsJ2JJZ5n3?= =?us-ascii?Q?9Ij1SHK5OQPYrCSX9SW6vM+acJyNx68ywAkgUVMjV+DTgYGaTaig+Ddfo8+a?= =?us-ascii?Q?Qa8pMIKiGt/NY827NpV1sm4oz2x6tsKXdEv3tW37UU6IwubuLpoAyN9gjC9d?= =?us-ascii?Q?1zWgA0agv5i0XU2uy8qL/pfYfLYTmkC+Sv3g0kYN0NG9QCI6WMjA9Q9lMJv4?= =?us-ascii?Q?iYOAHLk5IduvV7z/Ufy7Bnl/7FU+KxvDzHrcsT7i9y0z2SMBy6aXrqvs38T9?= =?us-ascii?Q?9nQI0e7USeVCjQB68i9q1Y3Tz0/eqjh9taxM2YKtYyPiYY3qMlbSy99I51EQ?= =?us-ascii?Q?KrJ2Ea9kZyuhbQfMgli/r0R+B28d/4LGgmajwA7vTsbpzB9R6C3L0LCkXjRC?= =?us-ascii?Q?fG1qRftRZfCAGPZuPvGpcvg3UPtDudmWzBv3H1S2Na5B2QVsgsrmLN68eIwG?= =?us-ascii?Q?8NgJJoJNoeXGnDejEstXzA9LAheUejSwCb2zYFVTANtbcTQ87W5QZCKsG7hg?= =?us-ascii?Q?PZg1GbT62Ewbp97SFOY5R4aQCbnb03qwbAxO3Vgo+283Cz1gn6xNUmV9kro4?= =?us-ascii?Q?qXIq8exyQGaSsKdzH8ZtXTe/EtOUv31bFYqFrSMLr8SCBjOrfWoKnL+29yjU?= =?us-ascii?Q?rdUBl01p+B9AAEHDMgXykO7Rkj+XRQNXvlntu2gqbC011b3oa4o8T8OkucEW?= =?us-ascii?Q?L6Ln5joRpVuOv59yuH4UAaOtebw=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 798313fc-ae48-401a-ad43-08d9f41d1b68 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 03:00:10.2896 (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: 0y0g+t5QZ27OzBCMQ5tlA+1JDrL2WoqN+9bicLtoB1xX/CI/DqDvymp4CQeuETIa+KAdlQBDghiY0dFvhlPLug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 Content-Type: text/plain; charset="utf-8" Print out the infinite map received info. Reviewed-by: Mat Martineau 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 c05c19f92532..30ffb00661bb 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1006,6 +1006,7 @@ static enum mapping_status get_mapping_status(struct = sock *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 Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909501jad; Sat, 19 Feb 2022 19:00:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJ6q7Ug99srhoKf0GveTO3il4likmUQR1wZJXwDMjSiJF+2OrcMsDuALRPWhT7IRiNYnnb X-Received: by 2002:a63:86:0:b0:36c:48e8:627e with SMTP id 128-20020a630086000000b0036c48e8627emr11653820pga.53.1645326027724; Sat, 19 Feb 2022 19:00:27 -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 bj6si14563872pgb.190.2022.02.19.19.00.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 19:00:27 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3912-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="NE/xueOk"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3912-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3912-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 507F93E1010 for ; Sun, 20 Feb 2022 03:00:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 42BBC180; Sun, 20 Feb 2022 03:00:26 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.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 40DA128E2 for ; Sun, 20 Feb 2022 03:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645326019; 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=azrnEwBQderhXPPkBiWQSW4EmY+Kf4ZJB+FQQt+eQx4=; b=NE/xueOk7B/GIpi5+YwHhj13eFAMFSIcovUcrpVtcqidSPKB0+29DIUXrcY0+s44S9lR+c 0B+m2feIE4pPsIYd/4hWmzyhQ16U/i09CluOc50i+Qhgxf9prP3JpC5+xwIIJ3sYYWzz6Z OKH85/RLQ4rzl83VvY+MV5oFFRh2D/U= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2056.outbound.protection.outlook.com [104.47.5.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-7-t0AsbHGEMYao656JNZgYLQ-1; Sun, 20 Feb 2022 04:00:18 +0100 X-MC-Unique: t0AsbHGEMYao656JNZgYLQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UaWGWvCKqrjEjBEDmsM8TTIuhbJwVTLscb8AUePTezVo2WZmvuZizL8DvNrtul8yD9HiQZXp8IAGXc/Kpz8VN6UxechOTEkqF+F2MQzGlcGLGcNcOAC5dnDME5VVXmve7lR3mrHTiOkw8+4QMo+5uBmIS37Y0x26T9Gc0K1V4brU8aFbpO29A2xEF86RpjeMakYVdp6omrJ0bWAN0y9yzwBjIDk5ILfzBSYzxZsLajQ/nUUlE/rtTKOU0W/piStUgrshGDq1etPfT1H8yDxwgaaTRHnh8wBereKbWzPKq0E1+cKp4X1Ob9yH2LMwWACYL5haLHp8Tzp625Sp0xDaxQ== 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=IWZUcEBP7UPsZBR854BU5jS1XyCEKMzvclO00opvPvc=; b=UqXkmekcgZRZNpGu2Oc3tzjIO16U/xUT0LGtBSHCj66dhSC6uF84Yfsna3YxhfDdlkVcrpp5m5fQuryDi4koFYDOYpNYUR7fRcHRmz79a8Zj08aQpOuSdeTQGwYFY+iJ8LFgbX2zJZcT6KlZ1eO2L3vGP82ExLz2JmYhoCx3jVP7Lb8CbYPOGh4h70CSF1mb6OlfL8N9z1icFtmGSmirn/p826D4A4r6CQGDcGMQyEMCGx2uVGrGN7NNB2PLSTEmjsGxF86TJBii3/3MayqliQPxufsYnRjm1pgDoFmrj0wCKC+Nnrz+dRNGh61iw9Vzfh6xFxKBR5y139u2jPn8rA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 03:00:17 +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; Sun, 20 Feb 2022 03:00:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 09/12] Squash to "selftests: mptcp: add infinite map mibs check" Date: Sun, 20 Feb 2022 10:59:35 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0107.apcprd03.prod.outlook.com (2603:1096:203:b0::23) 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: 9d3a6359-9c5d-49e0-167d-08d9f41d1f97 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VaSO1e1g8DBLpMBllhXz1bypMfPV7OI1v8PZUZgkn4tS16QCV43saBMdb27Z/poMum9+XvpCk8lest2AaNfnY8np/fcn4Tc/G0hDDwOWBRYsDioeLj4H2zhQt3KX60AvXnyeJ974h7p27gi3LIVsDyMt5UnmRUJf5hgvCm8m3vCoQJuaZAqRiE1ARC6RAH4jzRXm8Gk+tAcCQmESjuYZKXuoanYUHay40tfj415+EpqBrrx40t/ldOr0nkLHHR26VVxGPKpkLHW49qc0rcnrXxsZ2uOupizqAuzOCNCK8VCqHDgrkcjPgc80YipWkvINgauRt+1zgWrOsRkLU55oKSqSqpVzhybgwBf/9O3fJehZ53TuNLDSVVPTQsviUksfDyIOa6F3MhD9Pr5DLu5ghbA1iB8WvMQcyhgAylV6ZUfslE8CFLW6uRplQ7bkkiPLkNayD4O8gDajhY2gZ8y2LYexOIJUGqR7VMTO69REPp5cQdD87he0GpxmpcZfpIluvN8LvQM90QhY3oFmv1HfPqBrOVNl/PwtmN8Je4IuZHQSK6bFmg4LwxA0xb4kynKSjLGs4O9LKVKzEOgbCw7OROHH7yPWQfoDgKl+WFhutAIe7l/s3ioe8Wpx7slZyScL1HzDgl0BhuSgqXVdMVSGOA== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(6666004)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mzbqFUE9Dgd2eawZJbcNTEtzYVBPD2aj8vKA4AbpmNrqJqh10W7Qw9gJN/OD?= =?us-ascii?Q?WoKrecww1j7lkXJ5x27AqlkV+vepms9kR805GerhplH6rEJc/DHtzr2oTPiR?= =?us-ascii?Q?ROYi5pHlCkQXK08if6pE/tx+REq+TLW45OcDfYgoPlR8oiJmoWMN/76BlDWC?= =?us-ascii?Q?WfJ+FtSYLCBMQrwYo4TtYeUEb1A7Uk4t+q/R687lVqWHE73qEQHMoXD7T/+A?= =?us-ascii?Q?qQv3/0D2yEms7h/SdcbUuV3QVLWzJdjQvGEHn6TVE8qoKny0cb4V5XnNmto5?= =?us-ascii?Q?7mtXLnvRnLAUveGqRiI3D4YoRLpoWb8PAh44QUgE9erM89qE1+uzHQpZciZU?= =?us-ascii?Q?/cXvlsS1BOLHAB9ty98kRFPdbHtLyOdhdxXM5G3RO1WRkxzOkXk8YcJy/4Iz?= =?us-ascii?Q?uRzCIrP2NqRsjg1ZzSaxKxD+l7WHAzwfrgrdAS24H43St7w86Qo/QDyy/y07?= =?us-ascii?Q?a0k9UMgNoZgnqftixPIFjEQcQJNZw1zLzavJVsf3a9HXtFbJKJAzHCIe8RSE?= =?us-ascii?Q?v5E/hXdTsZlqAhYJe6DFlOjzDqJeMes4fg/8clQBfnKREYq/VaXkKgyUVWbY?= =?us-ascii?Q?s0QwUaIMYvIdqCsMJMoRp5QUv+oHMVahQlI4uYVVrcOS2UKpOgtu/Ew9cL29?= =?us-ascii?Q?/PgLs30b+LcCnGZx2CaNVT4FwY3d4DWjHZUJC/ffgXUrFocJVht5EbMvBkwY?= =?us-ascii?Q?WVmSeEbYuAa6hTnIH24RJ6rAggYYGZQKJlErW0mLDpfV+WEibBNfTe0kRG43?= =?us-ascii?Q?giOIMLHql7gH7gg/K9uKbDG12HmaEqFSnk9RZrhUKNqgW+3mIBxvmPwAjS4i?= =?us-ascii?Q?ahXdlBRGCJFDzEorFZDpz4SpR/4H/4TNa7oZtTC+W3LloLeimbmMvvYIBeEp?= =?us-ascii?Q?7CJJCk5Fr3hMEjL4i9reS80QF3e/KCkNDncA4KFolMmoTWuOCUH5NoZ24gW+?= =?us-ascii?Q?RIFA9d76tNkT4Q7Gj36dw5yxD7SiQCiVTU7MLYaUetxvii0KOriEOQy+D/mi?= =?us-ascii?Q?kFwglQLULmmItpVnXFT1maEQWjCKxYGpQ6aL44GLGNcSXq/uw6cnXMsMpOxt?= =?us-ascii?Q?XiPd6uLkCygm+sAonoNzGgJ6yTRR9kzmC45Pryp2ZNMxlLqTXgAAIo2wNGuE?= =?us-ascii?Q?6JDX0LtpeY5PAR0ozpMTvsCMlEtQJpaE2l8TZxW22wKplGlI/NMP5Z6PRt9b?= =?us-ascii?Q?U5TcHsgOYcNOHLx4nxpK2AvzfZDXB33/LatiEaa1deNvl8B5CkgAhoPoF+lF?= =?us-ascii?Q?RtuBSh9emrvMQuJu0VWHS2H3tMHC3ib4Bj3xj+0/+TyIkz1V7gJ4NA+U2qVE?= =?us-ascii?Q?d0c68n9pX3uDbAqpIAr9ElX59R7ixGCwYBNPbJiDyiat7VhknJHW74ZNzf15?= =?us-ascii?Q?6gaa7ztO3rnOhRzZskfqzep5HV6UX4RqOTjG7t9jIBn3Kj2VJFGK5OMm7pF3?= =?us-ascii?Q?djFwbY9Eu8Iq/80hWbPte6XbMP9ecz38A5Jq0Mc+nF7BHgLXTOruQ4DGC/wY?= =?us-ascii?Q?g/eul2pxNhE3XGxQD/6vO4o53a/zLsEq1ka0oHmJy6AO37XU5nepYJQxCnYL?= =?us-ascii?Q?yAZL/AUpl86kji4qKILnqq8e46yYN3JURzolpKialtdVXxMDRamK6cOoWa/s?= =?us-ascii?Q?lYYdjbO2Oom+cRQmh2tqHnJ35SLq5pHzoalbcDCWPt61MSW0tntaMkZPgkHs?= =?us-ascii?Q?1xaH7h5tffFJqLBkW4w73QHELuo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d3a6359-9c5d-49e0-167d-08d9f41d1f97 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 03:00:17.3828 (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: XX5oPzCAuDWhSwspVjkdSlymfRa6bLsU4cAAxOzF8JO+cux/gsWxxs3002PU/BfzkHMg+YLUTQ6WnIApbTA4/w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 Content-Type: text/plain; charset="utf-8" Rename mp_infi_nr_tx, mp_infi_nr_rx and irx. Reviewed-by: Mat Martineau 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 1b8b531c8a87..dfb87794056f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -946,27 +946,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 Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909545jad; Sat, 19 Feb 2022 19:00:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJyC7W5sHONZ2GCJTGswH0Aawh1fHRtqjLWxMRJWync/0lA5cs93ucXfiz9xuRMCTuEoT5oo X-Received: by 2002:ac8:5b90:0:b0:2dd:a3f6:342 with SMTP id a16-20020ac85b90000000b002dda3f60342mr8451734qta.272.1645326031212; Sat, 19 Feb 2022 19:00:31 -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 w12si13138639qko.344.2022.02.19.19.00.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 19:00:31 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3913-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=XqpanPPL; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3913-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3913-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 BC7F41C0CC4 for ; Sun, 20 Feb 2022 03:00:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B03D2180; Sun, 20 Feb 2022 03:00:29 +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 1699A57E7 for ; Sun, 20 Feb 2022 03:00:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645326026; 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=d+mKypv2K6hnmEfB53pj1Es2i9gn/XdUuU6nuupdDK8=; b=XqpanPPL+7DU6G1prp/pTvwTqtaKRYevpPpN2QGx2yeX1jIBc+SUTFxZ28CvXGPdVux/GR AtGJCn+L4NPZ0k64fMSsVOC/M75X+v9PZqzHsEfBqopg6Ys6DpUIEVf6h1oKP5F3CmVO9T fgMZ/guftxzDxtyJWMQm/6s3LkIFD8U= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2053.outbound.protection.outlook.com [104.47.5.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-6-mQqEYbTXPmy06WMwRJZlmg-1; Sun, 20 Feb 2022 04:00:25 +0100 X-MC-Unique: mQqEYbTXPmy06WMwRJZlmg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mud7L0sClviFg7PjLJP92CgPKisuhRWEU21AsVGHSe0lp6KJlR8fxInpbsAECsT3e4N/ZRYkK9uNptk+SFHDldV9wIKPgijttm8KSDwgheJG5g6yYONbqqxeUa5jM61obanLthsCTPxRTC5hfAozEDvGE/UHJ2AApzh0YUCziZaJR+93xuPDmJR94sRfuqb1YdsoEJNdfk8hhLyhLF/cxBi7DJVhAN2OlJVC+jdbGHn02m6B9UbNyeiC1yINzb5jDX0RLnHN+hSnkWh/nFsHE6dOXVoClqn8T0mEDxL6xT6uTFNrR6MPaOqw1B2XmUYwTmdXhaRVwgpxInvDBqM2dw== 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=kP6mW3Vh9wAMmbIMST1CvctuhqyOO7SdyrWhBR15Lu4=; b=Eqc9QnmuDXGq/mRWkxFjhTMJ5kbEv9e5r+JcIFFGfUn4rDGCzpAo05w/DSbrhYpPzV45fAQm8fwtR6Xk5uLUJyRm74iNpRaooGh4R+gpR10/gbVevx7C09oNZLQ7Bv8RzovR1l7AMBe8l0ojy/FKoGwbLuiaDXNY4tjhT3tD5HENmo8N7LjvtSJN2tOXhmYWJrv/N8R87XPKUJfWt0qtDFPemorZgdh0dEjs6WiZzcZwCL4iiynxgvpe9FR1KE5HUaBLvpYIByFFFt4KtodR2+fWRfsXjpYXTv5WlP9gZ3reYeWFyYSqjg4fKZdhN3WtPMtoItThi9U+/CT8WwWDFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 03:00:24 +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; Sun, 20 Feb 2022 03:00:24 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 10/12] selftests: mptcp: add more arguments for chk_join_nr Date: Sun, 20 Feb 2022 10:59:36 +0800 Message-ID: <5e63cedcf653457eadbc52f86c53edca10e49c90.1645325178.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0018.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff1babf6-672b-4b17-58bc-08d9f41d23be X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aLoZ+wEz1BGgZ9FjxP2gSM+zxIR4c6V3a4/XMg0dF5+aS3FJ+An/mzwRB5Has1NL51y3IVVexdC3w6zcR/0hqiVv0/QvB75+Gmdk9O9HDjFVrGVAqbqIQutGHFUd0Fo02WFuVRVso47ALkoZDik4l2GMPiSoMEPvKl6XrHYIz61vNF7q8g95n0zAhG16J6Q7+L9du0CeJoiOfw3Lle4AjeHOFtmaUX8O9SGdi7YsC/QNy0/pxFZENESj5U6hXwFRprMAalHDgnhzFcr0WruDRrAjeMV8Xmeau0pmQYicjOkA7ZVs9yIBybPTncm1PJyiipU/EuqSTU5H8PU+8XdLrp4h/JKN/ylllL8cm4aJr0Xatxk+ICDM+l4xrrXjs0TmODu66g6cuwH4GuEvU38unLQksGKLsfh/NqAA61Xn5yU0oVDGxwHVAiQEuB0kumSXx1N5wIp5Vjnpb8xQCGSdcAJwEcW9ItBei2CxlzOkbGclnfpB1knXLQToqK8Jl8oi5RuXY9m69Th7x3wkt2pXCvfS1SGyyKc+J1XAIkXsyu1JZEf5Y5ZroVaLfcyZUC6Sink8rtzNBdVr97v6pMWk3WgDrOk/CWr5aReUOMjgW7wJBdQ4AKetpBlv7A2keJZmNddSYUc+QmPIYXtJ7Gm7cA== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(6666004)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qspizFUu7/uUi1/UJbV/wXM8Ufnv8EDIRMlRLfT3rSE2OXSjp+4lgav6UpW8?= =?us-ascii?Q?4c+eurj/Yj8E7FL1S54AGpZCp8VkQ1pteDck97JFSKRlG22ftdUMO8Kcw2zq?= =?us-ascii?Q?ywaxBJ1UJ4BHaQ754z3dMs8GkQHR8H8JFHwaS1Ibb6nV8sLc5m2BJ9ZgFd+j?= =?us-ascii?Q?xIyBcxafx9Js25EwegmfY++mrHqfVucmcl2TCJaxhslzB0ZIwJ76ZHFNw9dQ?= =?us-ascii?Q?EBRuDpgvpo5DjZ6pLA4tiZsCfyQCChS6h5v/kUnuhjcsEU5jYfSNpjwgo/7N?= =?us-ascii?Q?Re28SmTHGPTvbguMgli2VQCHoEGLWo+RU+vo4j2VN4Im/e87Aq/PP0q2TOxO?= =?us-ascii?Q?6lLlTqH8FjcsOYpNa3GksALPgWDLMz4k003NqCkUqLdq//a6F2mVrjuJX9UT?= =?us-ascii?Q?R8cPbJsgRTipHxq38pfsVEayV1PQfchmbDbpyzp4TJDSiYOHJySCjQGcVSEm?= =?us-ascii?Q?SDe719QCwqVTepay3HB4MVsrbR1YHAV+QW7K03e6um9f9ES6l0LuL/KNqcF4?= =?us-ascii?Q?wS6oc8XPBK//xxbADDm+LpcGS+UTEZHeExs1gBTggsABE4gzbU833KAMDha5?= =?us-ascii?Q?pk6BgGUC0S1Q0bt1c0SEizn+/VWMoN952AN9vyfv2tgZvJG4BAc4y1ggNahP?= =?us-ascii?Q?T5is7XV6pJFJXHtJ4C9goaO9dvf5Zx5IS4yWrjGfxJ4gMeKmBMZLgUh+jdFY?= =?us-ascii?Q?LDBFJqj8dd37Xmyg51zl7c17mgN7YFiXNfDlz9iMmObklPYB0YiP6I6XK9kJ?= =?us-ascii?Q?oIjLnLHe3AaO+Rv5PVIRiu0TCwPX0FQ1b3+mxNVb6UVVDQBkt90HTR+EBDDv?= =?us-ascii?Q?o8vDiVNBXtTiDMvG/5dy2sMMUA/LtU96Sy+afi9hru2rErYGoJgxLeY/hG/4?= =?us-ascii?Q?c5bjM+b0LKgsYy3AyMScJ645w0bqp96OtOynWXCeaGrJSeaHt2tDHjwTJomj?= =?us-ascii?Q?sj5rFqoniCAT5bYNHgnN4GOZRXLZLFYFMlbce8/xBH6Om23BHVzmW3hRUYZE?= =?us-ascii?Q?Xsz39ZklA/tQRaGrY5UbkSQPRgstXCJGenleOZPARW55XVh/son+LKepRJzL?= =?us-ascii?Q?IDkmdnntvWMI+N5nkZuLrYFNeHKr1Rz9HQ8TUiSGQCNkwrEzE6WG0JcCvV8w?= =?us-ascii?Q?L1MjAb8X14H5WwYOwbUBuQL7RPJz2ln3PZoqy7REXs7pILm8PGHL+UMF38Gn?= =?us-ascii?Q?f+NG8DOtFJP0mN+/pmeHhtkcUefhRjJFiz7Z9ajc5MGL5a543gsPRHghvFWu?= =?us-ascii?Q?5QOMDIRW6AtUTiVnOmy7dPoV1I/3jY7JVxVLKeCpoYyW1TgN23GkXIELrBqJ?= =?us-ascii?Q?jfPSxaRgLFsdHWo00Ax3L5Jenhu0XBN1pJendpc4cN1jA+QYNU9TY88pUU3F?= =?us-ascii?Q?IaXCdUl3JluvDmGqPRequSr7bZDOroULIKn2JuJy9TFhlvgbDHSIZw9M7/ub?= =?us-ascii?Q?EUrT9IzkkAi63ExZZZwd/X2NnFe57alg6hJQ50TgbZCRjxcEqw/RqFysDi3l?= =?us-ascii?Q?Qaovh/F19WDgaw1yRVCNqEAA76QWlYuxteFI4qMRX+RDL8HNmJJ/qnE3jVSb?= =?us-ascii?Q?Zl+79HwePhTAipqygBeiAcr3gLVSJpSHqcFAtm4F0QBM/Xg2E+WhXc0isdY8?= =?us-ascii?Q?pxFGjuzl7kn4GCDvdsweiQ5/241P+DcEp25iIe4AjgA6HZX3VAQEmVlWru24?= =?us-ascii?Q?kPyIOXlXOD3AtorUqeOBZByyY3k=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff1babf6-672b-4b17-58bc-08d9f41d23be X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 03:00:24.4135 (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: JzxXpliEMTySlukwygfKS9Cz0zAPg4Wj6sDLAXg8XkTvA/uRfnAgmZkujvJBhdfT1WjuRJQg5858eDiLLx0ivQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 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. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 50 +++++++++++++------ 1 file changed, 35 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 dfb87794056f..f33822b28058 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -837,8 +837,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" @@ -848,8 +861,9 @@ 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 -a $allow_multi_errors_ns1 -eq 0 ] || + [ "$count" -lt $csum_ns1 -a $allow_multi_errors_ns1 -eq 1 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns1" ret=3D1 dump_stats=3D1 else @@ -858,8 +872,9 @@ 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 -a $allow_multi_errors_ns2 -eq 0 ] || + [ "$count" -lt $csum_ns2 -a $allow_multi_errors_ns2 -eq 1 ]; then + echo "[fail] got $count data checksum error[s] expected $csum_ns2" ret=3D1 dump_stats=3D1 else @@ -870,27 +885,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 @@ -1014,6 +1029,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 @@ -1060,10 +1080,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 Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909654jad; Sat, 19 Feb 2022 19:00:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJykwyDQUMXvkuKDSNlBx57QpAcyqs8HOBXIiZu4u7L8O/BQSFyL0b4DFo0tSrYTZM00Y/Rq X-Received: by 2002:a05:6402:3486:b0:409:8ed0:9340 with SMTP id v6-20020a056402348600b004098ed09340mr15008920edc.255.1645326040226; Sat, 19 Feb 2022 19:00:40 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id b6si8238776edu.231.2022.02.19.19.00.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 19:00:40 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3914-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="dq2xJN/5"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3914-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3914-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 0CD341C0E10 for ; Sun, 20 Feb 2022 03:00:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 918D857E7; Sun, 20 Feb 2022 03:00:37 +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 F1267180 for ; Sun, 20 Feb 2022 03:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645326034; 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=wJ56PYOxCQQHdk2Vc2PM4dX//ecB4QJmqINqA/XlOJ4=; b=dq2xJN/5xNwwOeUE3ZxmdSR9fIgsDdQuIP/jr2v+3tQ+ZwSq8L/9fv9qkajT01nR8/m7wE tmqiLgKLI58j3fFB1htclhyJ0A+o/yqVAo0XMXEJHC7WlmsqjvtUvanEu4ffbzcCgzG4oS BgGiObVhCZENdLrFtKNFzG92piaBqQs= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2052.outbound.protection.outlook.com [104.47.5.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-12-9Ix8_SEiMb28oUxr_HvRlA-1; Sun, 20 Feb 2022 04:00:33 +0100 X-MC-Unique: 9Ix8_SEiMb28oUxr_HvRlA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GmYPDYV0sBRJgwhR+kmRoMGhqZlNcvlTOYaOZU3HBSnNpIbpU5j1aUYMw+VmZv40tynSWpyAgcTDSfUcAOXZlnsWeRxDqCOSVRbUOC0ljw2bVJCVO3+lZ1fbGbw3z0fXg1xotGcsUTKftpJgDGKU5o5PcHtEAKeZeRFiVP2d3c0jYleXrFvmo4i5Bn1n1fe/w4QypYZPvvU+s2KIjih19k6Ha6vAFMEvV6FROSOdH1O+YbdT06Grdefwo+r0OLy+FfLSPT40NtK38737pLxrJzNhmmoqOuu0TZfA63yQntlMymqc2QPtEjMYZ7UD9YD4lKkRyp8i1xBwq7qPmIvCmA== 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=+z0fMgpOxW0+ManWxJ7xy1bfqivg+k7dPNaCWZTE5v4=; b=kMD6h4G1FUew6fvLo1qgOnu1OPFJOTx440nJpCGvNELYCdJ2NTgnyHDifdPAULLJd8jz6zwbXeOXXlC3QhkUduxfKM+4x+F6zS0YKYrR2f863VB+6GJRm2PA1BIsZhAA0pdWoi/bfaU3vGk75Ez0wcQihVCW3PiAeg+tpvgx61c/YIYz7SMMA/CLKq8gN6ogb+qk1f5E+t8nXVNWqVsJUuVdwb7QnsEikkOy+GsDRuyo18M/fdNO0e7JElWU58QCW0Hflu6GQeahhiZyDSDvTdi9QKsWz66yWipq9oTehYxNkY42c5o8h9Wq0R0vF0TFHxUxLVer8h8UTk2qhPogag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 03:00:31 +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; Sun, 20 Feb 2022 03:00:31 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Davide Caratti , Matthieu Baerts , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 11/12] selftests: mptcp: add the MP_FAIL testcases Date: Sun, 20 Feb 2022 10:59:37 +0800 Message-ID: <35a070276d4d81aad0c1c116a13740a99d9eb2d2.1645325178.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0302CA0020.apcprd03.prod.outlook.com (2603:1096:202::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: 5f8b1659-7997-4c2c-4712-08d9f41d2834 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IVO9NV7YWB+XCHwEa95n344dKkOJvRquPq4N95J0U/XuItXpCnsusgSquGY3aZEfRxM/9ZfWHr3B9sA4RZu/tZPnctY2v49x4y6E3ZFAnvQo15ImTABFgEDP6/0J/VZhW8o4Dqzf3dbC4BzNkC5TrwmtjlYV+DbCGu0t0pPZX1/dXLKvZHHyAOyLHBPGWV/QlVEEmPXBJfdrUrG9aYMqZR+gqmLE4zzxy5hLLskAA1nOxLZQjjYTRin/oM4yvTrtLeEAGnvjcP1CRkYnc3af2UmFeBU7/bMfjXRWFr+rmW75EGjYz+Ww6pqf4PgvGJcUEcqvDncMuKlyReb+b7+qSWJXVjb6AYCnr337tLvseAg7LE1WjCeTTe8N1av8HpzxNSr1XKNBKm3OgmULrgLC8lQp9VcvbEBo4ZVdGC685UQ3xIHjyXn6zQ5MqxKYPomUm+xJwrVbiEEWuwFV3dIGO/Zme6XVrs+PD6mujJDaBaBiEOIbqAZVOvm0d276Q3C3Fi+vnMbPnni7lPFpeZWo5CA8JDxBKpbjYc3BFWKih0GSmeqVtXqtvWdHYBECewE86nwr9X4auuthTWfb0XzEPePekaS7+WOHc0Du5ospB4JJN0lhUhQozo3G5uf+7TQ1NwImbhTL9PzNb+q4uWN8pQ== 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)(186003)(66574015)(38100700002)(2616005)(36756003)(2906002)(5660300002)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Oonv3uAHewxMbHk7YrupBH52h7Yriy7eaiMqJVOZ3+tTej7gZMDFX6J7eP2g?= =?us-ascii?Q?W2cSE2gRYZkmZbW809RWdNmaI+Lx9sIc9F4/AivOGengoPjFO54FfG2Z794r?= =?us-ascii?Q?X5BVF+3y+psD3qXtOBYzbGmFfPwGMZ7nycHcScSkHLMpRfoFq89iZtOxeEK0?= =?us-ascii?Q?GL1LUtrek8AVyJQkd1q/70gVEy64QeuSbqq7D7cr3MxmUGjjUJuxEjiLvDTO?= =?us-ascii?Q?Jn4684kHxIvhUQ9ZxW9gYeAM3Oazfw0rFSs2X7cXUIVwMlSsu2v6HR+SaMBi?= =?us-ascii?Q?Zo8puzsS2fba7QNKem31mAI0Ktz0cU+HZKrcrTqI6Gf5hSl/zIIU69ZM/Wxh?= =?us-ascii?Q?gzaQhxGXvbAaONwMVm+Kqcy+uQApW8rUIJoowNjPeTNUzsw/1ZaMDO5uTJRN?= =?us-ascii?Q?BBVrQ63bqcI1SOBtkFgjLMwboLFMmMQluHTYcMfK41OgJyr81peEwZ9FNWJL?= =?us-ascii?Q?aG8gBIa2BU4+vp7t9O7+49MRhbdKQro8euPfWNkHsMQc+JWEasUye5NSwI0O?= =?us-ascii?Q?vWt4L8jrw99f9ZfE5x1Cj5+SaNw3br/eKo6BWGta0bHO4FX8fb2m67NCPkqq?= =?us-ascii?Q?d7J+T/5+BYTaqI2mAIXnQOGEHLYzu9fsfZuHqGgyhavc0K6PRVX4AtQHePF5?= =?us-ascii?Q?FVG98x5UiPpHphD2JDJorQY7eSXc/Mkjvu4oiVQWA1JyltqClqsPE8sA7Jvn?= =?us-ascii?Q?t96EivB1FtdDS6FIRx/gUIWo57KQrVuDsyUYWdsU1I5O/ivqcDlElA8QuuIL?= =?us-ascii?Q?4DC2KzwQS9pRpBRKFHo53OFDtPPZZhuHJXCLwul7l5XOvLcW0cFEqOopm0Bi?= =?us-ascii?Q?oqPl/gp38pwTCb1cJSGeeLULyGHQI1AooApjl8LYzIfYSZiDhs1ldNcRiovv?= =?us-ascii?Q?3jOhAofcRTJEltqc7nmExDv+rXebJlQxCU/RpjdPdvB7oU7pe/EDO4lpT43E?= =?us-ascii?Q?OKPklGKWSDKgtsHjdlYoAGvyBt6y+8lTsyi20p6QZHcJb3G9jHfaJDXnOHRX?= =?us-ascii?Q?AY5wxoiwdkfZxsM2PPwgv4lxuPUFqtEB6nMuPX2O7WVgz64Fp7zWNoAuKmFI?= =?us-ascii?Q?v7Fz+yNKUIgjKfxbh5oHZf23pggqnvG4k5W1M2bYxKXMP9CRKdxvUpaBDmxb?= =?us-ascii?Q?GS8oy2uQD0tw07G/pliTK4jiGmPN0y7fmvd35p5P2IPhJQbzc8rH3nHN3Dhs?= =?us-ascii?Q?ItXzPDVdbRQSf89ytH94yuR5gLoRcQoTSPSosc+zZoJl/m1flXLYIfJH9lOl?= =?us-ascii?Q?jIwMQmRXu+XqieYsQjwIekUcpVsraqS4InDwtRCoZK0UD+zIn3ii2ZqzPoD2?= =?us-ascii?Q?Lm4aE8T/Ar+vsTPmJb7ZXGFJ6Xz1uz6zZr8ize3aXajzMzymiTIMpbJhCUQl?= =?us-ascii?Q?GTHqX+MD2eDWA3UTFIgDlL0c1CxHyY27GyVxLyQ/Iwz4nZmFFbax9f7FrMtt?= =?us-ascii?Q?QG38T1IJaapIVqt3vs2wbtQ3AwhKJpT435F5c1jsmEwMAIITii4tq6ERHLl0?= =?us-ascii?Q?+AMN+IDG84vEvIl67gNhEX9JhxxTSN+GiRiYcB6hVj5jQQ4daDF43boaggeV?= =?us-ascii?Q?Nmx476uzplg1VoLIZuVAfmnLNEyIBIJBOHShb9zgDfeBu2DWOYK4KFeOZI19?= =?us-ascii?Q?AbC+t+y9E/SiS+cvbhlEUE0bEDsrAefgsdBJc9GxrVVlBKzkSlfQ8dt/SJs+?= =?us-ascii?Q?3scMw8M4kuRU4swFDnRPoic/NC4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f8b1659-7997-4c2c-4712-08d9f41d2834 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 03:00:31.8504 (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: yAtWcMbw38dMn+5kqNwpLISaEhUI0Ovj/vnGn6/kqSye2Zp9S2CXwoJq31eAkLYZxm1D5pJB4Mk4u+B3BCgxtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 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 Reviewed-by: Mat Martineau 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 f33822b28058..6fb883971d46 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 @@ -1079,7 +1133,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 @@ -2444,6 +2498,41 @@ fastclose_tests() chk_rst_nr 1 1 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 @@ -2464,6 +2553,7 @@ all_tests() userspace_tests implicit_tests fastclose_tests + fail_tests } =20 # [$1: error message] @@ -2493,6 +2583,7 @@ usage() echo " -u userspace_tests" echo " -I implicit_tests" echo " -z fastclose_tests" + echo " -F fail_tests" echo " -c capture pcap files" echo " -C enable data checksum" echo " -i use ip mptcp" @@ -2524,7 +2615,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchzCSiI' opt; do +while getopts 'fesltra64bpkdmuchzCSFiI' opt; do case $opt in f) subflows_tests @@ -2577,6 +2668,9 @@ while getopts 'fesltra64bpkdmuchzCSiI' opt; do z) fastclose_tests ;; + F) + fail_tests + ;; c) ;; C) --=20 2.34.1 From nobody Mon Apr 29 19:24:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp2909703jad; Sat, 19 Feb 2022 19:00:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxiS9+K4Ns4eqJxP9oBk5Q0qltdA2FiVcr2SMBs+zQO69JdL2JsCfxBM4mbVoS5IvTgIya5 X-Received: by 2002:a05:6214:62e:b0:42c:4194:6ab4 with SMTP id a14-20020a056214062e00b0042c41946ab4mr10942186qvx.69.1645326045204; Sat, 19 Feb 2022 19:00:45 -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 w17si13458586qta.596.2022.02.19.19.00.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Feb 2022 19:00:45 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3915-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=bVPbZbIa; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3915-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3915-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 7BBE41C0DD5 for ; Sun, 20 Feb 2022 03:00:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8469B180; Sun, 20 Feb 2022 03:00:43 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2040928E2 for ; Sun, 20 Feb 2022 03:00:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645326040; 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=eDFf38yVs+fnroJ77VArdIC6sq7WdXiKn3HvTmjPgG4=; b=bVPbZbIaXlkeZGBTVny7DP2ZVThveC8Jl1yntNcOlXm78o0FBhpC3P1+jshdBPArZT4TlU afkJA1dgVi25uwc2qxCoHfbCYwSYZY1O9hRD7Q+xY5BTsfwc4ardEtHEQcATrNPzvzs5d/ Jj4muww7AeTBOgiqvkkcYujkJ+WeXBE= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2050.outbound.protection.outlook.com [104.47.5.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-KCZw3B18MKabxGvu0Bm0Xg-1; Sun, 20 Feb 2022 04:00:39 +0100 X-MC-Unique: KCZw3B18MKabxGvu0Bm0Xg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FSJUupXaEBSpIJLwBa6M8cC42MJdrxosoJbwTUsaWJEnrPGlqhol1A8JuZqrUVNfojuW9H+/bp1fMojy4ZdHnEYL6Zx//4c0nfpr0EED8VMVdpwJJkGNWYXxRLfvRkGHPcGQWGuWhZRb2hbupg+kG5fp0HH4TH7vT6B9NxWvkPz5nUqHF4bgYh8+q5y5D6C8QzU1QY21aa7LK0qXOFx5xrWhIMkIksLIt6LuTFKhr8incFgktQxf1iBERBI3l6sIicXaz2cFGcVhd1fN8KWy7HkTvyoISYc1CE8v/DN+gn5zDRXEp00LUWySEliPNJgxGmM/J83H8LNQhfp3GvG9Ig== 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=gbzQJ4MMOd0a2SJ2/9lDPQFtYW0Nl50iulAsByUFh6A=; b=ILLtisOWzu7/e7yhqO83f5aOMxyYUwRu8uUK8SzDzbAXnmSYX1jUtCvVk+jbuZrJo8FQ5Rs1zi7u8qRKy0FECjuQ7XFyUBTKgvcZIyHdyO+kvvveW+2KnleXpqKgLr4Y14BnbjE0UUMsg8LD4HCbGBnZ4wg67KeV/2KYgEmjGQYhpc1492BaEyj809Nlcz7wkPF0b97I6KsXfttCy9zpq6+mbdCdr1qhdxWIPBf5vN32RFHDoNB/xk3nwCWPjVd6f8nHc1zR05WFQjLUzlXnQ+RgtVcDQNlnrFc9NBTP4z9fPtYHTT56/CE2n4EzpM+TBExwod4cYvY0dU2/oBHKQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; 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 AM6PR0402MB3414.eurprd04.prod.outlook.com (2603:10a6:209:3::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Sun, 20 Feb 2022 03:00:38 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Sun, 20 Feb 2022 03:00:38 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH RESEND mptcp-next v2 12/12] selftests: mptcp: update output info of chk_rm_nr Date: Sun, 20 Feb 2022 10:59:38 +0800 Message-ID: <4f53046d92965c794bab7a611997e40ef225b21a.1645325178.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0044.apcprd04.prod.outlook.com (2603:1096:202:14::12) 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: b6ff2ff6-183b-41f2-8b76-08d9f41d2c3c X-MS-TrafficTypeDiagnostic: AM6PR0402MB3414:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1eJ5fwwPxHQPTe9oBqKqWW6sAA8Ui9JMq4akreBMn+si9l2iANIULsvV+Bx3uJo3FAEJd/iJzMBi2RxVPp2aQS8hdteuGqLYZgM3tHgt8iPwwa6+LOGd5o6ob2W2696xOIGlNi7seb3Qc4+uHd/PrphUX0z0jPj1SS77VPOEetsxHWMarcDWaBwNlAnfcPCm9Vn8D5eji7WZo5yyT0VjFGoKulfP4ugkkQ+6zQjZhkziUsNjMP1fFHl0NfgcVeHAqxz2ch5Jyxv70ehqoVjXVYRjtzp3IMwQfg1PToQOfiYl146xErqxh15/kbEj/xCA4Z5Y3mp4UBDnT3Bj2UZKflXu8aHYWGRZBM37aSznzZBEj9iuqxabXyC24hBTyilTntvWAY+/wtfbBTVE33lanm6Picr5X09ou54PoC6sYajcWiHhiW60kpxfRg1+Bh09SJMlqNXx/KUjdr0I+tgcubDRWScMIKBPNIUiRAETgpIZKUQJSawreGF3b6Pts9WPH70k4ipZLek8c/2VuNhDFj13P4RM0YXN59ig/quemH5nQbRoXYHJIEbTfV39m66bncYGYmX8v7099o8Tl+49HQF261b19KZpeGIwfn4Exhq2YCwzbSBgh5cRqpXTnswaDQX98fEl3mzcDQNK8vWU9A== 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)(186003)(38100700002)(2616005)(36756003)(2906002)(5660300002)(15650500001)(44832011)(8936002)(6486002)(508600001)(66946007)(4326008)(66476007)(66556008)(8676002)(6506007)(6512007)(83380400001)(86362001)(316002)(54906003)(6916009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qaJHIcY4BE6cGo9QTw1hcV7NyAg8aybsadQNkzRA4iBJFZc+Sh+7+17gep8H?= =?us-ascii?Q?rSlMj/RQbOzEmQOUQsmjDByl6SM8clO0cvq1aBQMgYveg/5ZMX23vXtsOZ8D?= =?us-ascii?Q?QFzLdb+HhaSu7Ycan/dmYvjIFpb3UCd8QqAQi64lspCXJQ2P/JNLEwTHlaW0?= =?us-ascii?Q?t3f6EHSY6mUChRc6QwKZvhi6YFQUIqZf6af+5VpDcW1Jwmb7MOgiLmtQqlU8?= =?us-ascii?Q?tsxQrMldqqrKDoaHXVZZ9Us2DZSPCXPwhfdLLf0zJ4RxqsbP9rdM2b0VQTiJ?= =?us-ascii?Q?045PWsZgtTmRvrsN4K29ZAKCF1EDZlL79FlQykvhqiKGf+Peeff6IYdZfRjS?= =?us-ascii?Q?8zrqhyWw9sXyIafekn4+IeuyuljfaDQatW7a++3OQtu1XgF476Aiq2X02nTA?= =?us-ascii?Q?yhAc+19Y4XB9fcrf0rRMLrorBQLMuFBg6Hmi8s8UDw79LDFVVaCHOrJWq3NX?= =?us-ascii?Q?+9IVtNgY8k+ua46Ascc95NB4k75eesUjMWQ5QuK5Tz0GMPkFebbmG1rWHyVo?= =?us-ascii?Q?lzjACHH6RYC/OjRAeLi594wsXbkJ8S3OtCaTbR8Ol+M5A2rUYpVrP8ppNqNN?= =?us-ascii?Q?pYtbDLmzM/I1SNdbTTWmMgN8lTOaoOYQVVfpLrZIWV/TiieTZJs9jFLnY7mF?= =?us-ascii?Q?DJR9XEh7IY5SUxiur42UiLOaT8xht/xbKuLt7MG9DBZRb5kv4wjTK7s4nPdt?= =?us-ascii?Q?R7C6vmMUOdRKeE1/vAuexybLra5Ort8e0AqoTM/bwW39u/UqpXhxN2p/G9nq?= =?us-ascii?Q?Tq+0tPLyPPzA6rUW/bf9Dp5lJsaUh+M187kqVGLSNLEs/+jARGSas40UpDyj?= =?us-ascii?Q?7xiijxwruT7qF07GyUaazKc1qI36bDc9PT8ETgRj0XGT1EbVd/QH/A/o+MHj?= =?us-ascii?Q?JXAuMFn/Vq42tcGS4ifRk3Vllkgoz0Auv7QU+G7kQaUwBkfp9fd4HsZQYpNI?= =?us-ascii?Q?6fPC8p0U5UQeFHT1UVcWK3ewAfFC1mPshSVSFEoxqO63SI5FSxm6UULvnqGW?= =?us-ascii?Q?Bg2vHkMrJYt1qoNxGoVcY71QhVx4MXtizYU0wl/AkNtEacXD9Kiswlg5Utts?= =?us-ascii?Q?QfD8GyfltghbM1cNb8StaJYIGseBxj0ysq6AUWJnJmCxcg/llLePZi5TLBS8?= =?us-ascii?Q?E/+K+51NQrXksxdr3uOatDCL4YsOZvge7oVjNsuwxObt+HxpRm7oXKvyFLUm?= =?us-ascii?Q?k0T9bUJCDVSzk2yNHEMZ4tdwsZQV1cBs6+D7nRFdbha2kyNF5ephv8yImY7U?= =?us-ascii?Q?C2ZwFtRlAQcvPAwOOIuX80Zz5pWNiyn7bTtlET02HtOp/sPxRADD89szxxZR?= =?us-ascii?Q?sLUAJkHEJ/lDXHi1WejtQzWVysWQylFO6CgxHXGrSaXBJYOa3hc+6EBdQFdH?= =?us-ascii?Q?em6V2w1yaK8QZcVP9HMvJ00065l8f33XE5S24UrtgsREHOWPR4zxzNmCWr+x?= =?us-ascii?Q?oLOFABEMMPkhysVN3uXNs97Ul24JSGwjBzzCVMfdOrcBWyfem2pZEFdfqj8a?= =?us-ascii?Q?imLoGYgHWFwm6K5V1JfwMR/SwlSrTuvUjtJLk46+o1xw5MmFRSy1X9NIHFWl?= =?us-ascii?Q?Dmjm2ifDe5btyk/3rFnB+N2+I7B+gdoiT2O+a1FpaEdl4fArccZAD8xQKfMO?= =?us-ascii?Q?naZVur+0Y4XEDCnJJ90I6xu9gvAb+osrb6jwgmVVkn6vw8Lkj9VBleOmCSp+?= =?us-ascii?Q?OxeliitopAXdDcVj4EP86r+9k5s=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6ff2ff6-183b-41f2-8b76-08d9f41d2c3c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2022 03:00:38.5842 (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: K9frpNR7+6pH1VXX4Fx2szfz+z6SZMKF6acAcD5pNrBs96y5BnSGeHlsEs7eUweZQYd2CdcaMUvT3C9ZD0pgqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3414 Content-Type: text/plain; charset="utf-8" This patch updated the output info of chk_rm_nr. Renamed 'sf' to 'rmsf', which means 'remove subflow'. Added the display of whether the inverted namespaces has been used to check the mib counters. The new output looks like this: 002 remove multiple subflows syn[ ok ] - synack[ ok ] - ack[ ok ] rm [ ok ] - rmsf [ ok ] 003 remove single address syn[ ok ] - synack[ ok ] - ack[ ok ] add[ ok ] - echo [ ok ] rm [ ok ] - rmsf [ ok ] invert Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 6fb883971d46..3655911667e0 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1312,15 +1312,14 @@ chk_rm_nr() local invert=3D${3:-""} local count local dump_stats - local addr_ns - local subflow_ns + local addr_ns=3D$ns1 + local subflow_ns=3D$ns2 + local extra_msg=3D"" =20 - if [ -z $invert ]; then - addr_ns=3D$ns1 - subflow_ns=3D$ns2 - elif [ $invert =3D "invert" ]; then + if [[ $invert =3D "invert" ]]; then addr_ns=3D$ns2 subflow_ns=3D$ns1 + extra_msg=3D" invert" fi =20 printf "%-${nr_blank}s %s" " " "rm " @@ -1334,7 +1333,7 @@ chk_rm_nr() echo -n "[ ok ]" fi =20 - echo -n " - sf " + echo -n " - rmsf " count=3D`ip netns exec $subflow_ns nstat -as | grep MPTcpExtRmSubflow | a= wk '{print $2}'` [ -z "$count" ] && count=3D0 if [ "$count" !=3D "$rm_subflow_nr" ]; then @@ -1342,10 +1341,12 @@ chk_rm_nr() ret=3D1 dump_stats=3D1 else - echo "[ ok ]" + echo -n "[ ok ]" fi =20 [ "${dump_stats}" =3D 1 ] && dump_stats + + echo "$extra_msg" } =20 chk_prio_nr() --=20 2.34.1