From nobody Tue May 7 17:06:26 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp333146jad; Thu, 17 Feb 2022 03:23:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKwBNQi4nhN25yF+lkLvsMYPry5lmlxNMxD6xMsQL0NEKO5J8VX5j6QIG5e9pyPYcvovcU X-Received: by 2002:a05:620a:1110:b0:49b:4a29:10ec with SMTP id o16-20020a05620a111000b0049b4a2910ecmr1166791qkk.336.1645097015300; Thu, 17 Feb 2022 03:23:35 -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 jl15si5934787qvb.85.2022.02.17.03.23.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 03:23:35 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3793-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="lFCxL6/B"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3793-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3793-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 052291C0B2B for ; Thu, 17 Feb 2022 11:23:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 93FD73D79; Thu, 17 Feb 2022 11:23:33 +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 0E2D91FD3 for ; Thu, 17 Feb 2022 11:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645097010; 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=c6QJO0m7rGSGvwH2/M59Hlv/0phJ9qEZbayk7S21UZc=; b=lFCxL6/BOLPtiu96S4er4P62ott4jM7W+9v8k8Tzf1HBLzt2FPdyW8VlIb1Jn0XnuKDX98 fwi0f+1NF3XlmezTGE7/A9asDpwCSYaWmgBn95ThHVscWJrRgrnMfQbSaemMxoO1v60nZa ihxisHvq2A56Et3xAa+bEptZUaf+bg4= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2108.outbound.protection.outlook.com [104.47.17.108]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-42qHqG-KNpKduy0lMi-bAQ-1; Thu, 17 Feb 2022 12:23:29 +0100 X-MC-Unique: 42qHqG-KNpKduy0lMi-bAQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YbBrPskZvOMNcAsDLuHER+w9vt6etBq5zJzYfaxcAktAOdH+6YlAB/Dj02E0WbXWP5RSqAvrRP0Wu4B6m8t2Y04G0toK4TbMe8kaulPlE2Axv0ioJO/e6S50/YyOaXt1qjOqoNyODek4HdOMToLWzzKCrOeKC9TwZIRs7DEL2R4haUpVFspJ8lbmLrCH8OH0yLsePaMJMeXarsspQgLC+Az90DUQ+bAtI1bLw8Fg1Z+K4LIQ2iK9kBXvg/c7LsGUJl28q3No5y+Je/aD8kIpKwmLykEb3ViEYmwzzrPsd6DwUKksa2bNqtwKNdqAiVEmRd8MRijQCBBILvmXzPlHiA== 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=NCCV5+dpiCM0uZd1rYs2yvYqGilrDMus5szPv8/yLzA=; b=iWQags6Mylch5hFY4Ob9oaBDa2EufCi2Y623PcS9kAIbxMjtOn5ntY7/f96InE72RQn80GDKWvzPsx8JynnBJU9KfUsTpVS6ZP4Z5B8l9V+uqh0S1/OlCY6Da71P+AKj2XO3NsDph2GoWPgAdqYAc0qi465G86M1CJ3XzpN+jc+PpUjkll/tlxstgYr0EtUi5fmh1CIpM/HIFboUYvrbJlAlDyDI06CH8CPkhCHg15l83MpZOx9C9xxcjP9h6aEHulSuvJk35fosuO0VVI92oYTt53J5Z/7pITJz4+f+RhsAYP47KggD58QvBGuAZaGEpaNhj0pW3bYnSUi8BZzRxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PA4PR04MB9413.eurprd04.prod.outlook.com (2603:10a6:102:2a8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Thu, 17 Feb 2022 11:23:28 +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; Thu, 17 Feb 2022 11:23:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [RFC mptcp-next v2 1/6] mptcp: add MP_FAIL echo support Date: Thu, 17 Feb 2022 19:23:39 +0800 Message-ID: <0abcf65bfd7c913a99d1027b865e5f087e31672c.1645096378.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0003.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::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: 6ae6b09d-9ff4-446a-e489-08d9f207ebbb X-MS-TrafficTypeDiagnostic: PA4PR04MB9413:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:163; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f1XxW7ujw1TfzntIcIlYGVP9fZYxmEVRMey9ykKEo5NV7fJbiNV9KtQdNaqoruRYuFVoAVZOGHgb5KhMW+UEtpQ1VGvseMWNGscH5stQP7mif4Her4A2FfEgxJzyv8HReinlpIbLH5TnAxQgQr8nJ7xErkydbRxlAIyghOm0ntcn30OqORQfKlb+knOU20u9UWVkTuZwYcjlES0S3GNk2bIfxq601jOwZsANYNT2o8sSNMWfMh205mh26zGx35jnciKjb5u4J2JwS2XCGaAfNbbG2pTLTozEKfaVYaZpJ2K3zlTTfKm8iWYbGp3nT1UpjjrGPKDsPEJyldWXX7grRMYet/wS9fF15e2dhs62mWnLcBVG5yARqDgoUBrBA05cW479J4c0ZL3tuTLj4kyX92QD2gsBKKfWpzflfvMZP6eiPix5qGTIoMDE5dT+HuJJvAy4+tp5ZS+EY+kMi4rpfDYiyP2W2z1pe22o/zVH0wgkKgSbc1pNp+52Msi+kmK0msMeE312RCiEyeBthYqZ4ygD0ErbTszwc3vkEydZC+2XdSmHtyHg3IUCO93b1fWtzMEj4W10yLV+id5Mf8uXDT1mpgggOyADRdW7P1pmhxDueDoLl3rsdAxtX6SogZHbh6bkaijuEn0G0NQHj9QUCg== 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)(5660300002)(2906002)(44832011)(6916009)(107886003)(316002)(6506007)(38100700002)(508600001)(8676002)(4326008)(66556008)(66476007)(66946007)(6486002)(6512007)(86362001)(2616005)(8936002)(6666004)(186003)(36756003)(26005)(83380400001)(55236004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Jzb/cDrFJ5Lf9O8eY8s6d5eAiyu0lfXNl6VEDJhjJbVktSpRr0zFaBCxJyWa?= =?us-ascii?Q?BIdxyKp/bYBpfmFd5KyS5TjuxKLaDY0lOZzaXxE3FfEaLG6IEQhr/M11q6kO?= =?us-ascii?Q?Ij06+4zFCXjYrMcjF1O2YKpmJWEZEFr6BtUUbl47QBSgh9ICfbIVVdQo05bq?= =?us-ascii?Q?b4ZBOsS3RQwLSO/7oUyQ6DBt7zcW24BbVg8gSm0UB4No2/uDWprnNM1zcNJy?= =?us-ascii?Q?r1NUVi6zfZWNIzMS466P94idJtm4H4bfC5Yc0cFu9xnaDdSFnW/28euoZW6o?= =?us-ascii?Q?s1/k0iEw7w+moCyJkjMTdwDzKCZZIe0vT23eIbcO66H+fzkqNOlsv/VOCLzJ?= =?us-ascii?Q?bBGdusNSXdMrW9AiM+Gwm5cP2uNdE87KarkNPv6Wgpij9DQh0erF8X4swiIx?= =?us-ascii?Q?BmJj6yb1luiU84HkTtaKSd1PiOWTpPwjBHu0yTOL9jBaZ6jA/17Gf3EYc+N+?= =?us-ascii?Q?aUp5E4pZVVv1P/vSbj9ELJ+eKx9C6BE+lmjokcAkrUIMmrE9wvfqbleVSKfB?= =?us-ascii?Q?fOdM1iEr//tDvkrKYIAgNF9rF3myKoNl2E1xx3CgpABd/a1h9GqzBxUZulwi?= =?us-ascii?Q?8BMSuPTTxulJLui8T8UVejvQDD1H6E8AU5BEmYoNmLfeKfKjOVQuCS4I1RM1?= =?us-ascii?Q?L7gx+S3ytXySghywH2Vqllf6dh4Ug73+OM2CBjhEp4GNDUx5n0CHLtFix/Rf?= =?us-ascii?Q?W3wI23tiIPGI7iCi92YpQ9Nysq4DwYhIB3eul3qwNh/vxYz7N/Ig2wlwuzBy?= =?us-ascii?Q?K/LYIlMXKNpNkM2Vnv6XzErDBQB/Ma+KVxhRBZ9neB4Zf2sBqvXLfyrPWT1h?= =?us-ascii?Q?Xhr0is6A4FLMBZSkp6eO2VzyosWpXkoTMUi4D+0hsKrWXv204Nw3tvdhiIBF?= =?us-ascii?Q?4TgJPYxDSA6CJqlOabkBG3hxlo3oSoVrdbEAYWGzd+aIGM1QiOeescn8HNOt?= =?us-ascii?Q?/X7w6eCefmXIzvibCffusXuJ/g9rtul04JhNTBfzeJcD9LDGq+OxUwBzGTPs?= =?us-ascii?Q?NfddkLGG49vsj1ErRIKosChkBu3MS2K7goc/zHfliWi3WvYt1FQ1Qo3EvBxb?= =?us-ascii?Q?Fj6vZkD/72oM0RUQMXc/C5HtuZuYOMK36EzW0bcisd/CAGkeitm2tvfTcCHn?= =?us-ascii?Q?XI7kkEMQQicpD9wH60GoOSTnWW6jV4xR9ujklI+shW3067ksH3ERDYQFM/uq?= =?us-ascii?Q?P1H2txrzd63A65N/MaiPAmoVuSc62dECxIi93rPsJKdKI8V/H6OjCaWquFkV?= =?us-ascii?Q?uYBwHgY7AfknJzueorbYbs1gM0g2j8ajg+x+CHlRuuXzhfJYQVwti3mwMW7g?= =?us-ascii?Q?yLk9Oo/F2hIhxmryHbwd/u393eVMIl69R77C2O4Je9VZnx2vwkU149aZ7/PS?= =?us-ascii?Q?r2gWbDkaCYz3/U56KIplZcKSYWZ5kWd8MdBvOvGDO586dk6lXTSVcmNmCcS7?= =?us-ascii?Q?VdDsWModcGMRGJG735WYuK3or8XgJW7L+YFVcRG4teMN8Y68RaC453OHEYiH?= =?us-ascii?Q?4YQIX49C9HzKYZ+zrGMKZ7Oobm4ZqEpn7brQsA+EGh621+vZxt/XDOWOF51o?= =?us-ascii?Q?eQDtQAHE+6dnMWTCkp/pzJNdfEK3w/uRufWaSffV2BCT5wwpdnRb8YlWOQ2a?= =?us-ascii?Q?xLxHGlT6kIyrr/NY80GEGfg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ae6b09d-9ff4-446a-e489-08d9f207ebbb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2022 11:23:28.4225 (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: pznClOWy5QE2ZAZPFWExx3pzHuGPAcRYWdFEtKP85Q4RKsdrz7+Pqwj3DwE8woTsTc/RGClVirWaiTj5Z9PYdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9413 Content-Type: text/plain; charset="utf-8" Add MP_FAIL echo support. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 10 ++++++++-- net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index d0d31d5c198a..dc0dffc1b6b5 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -279,8 +279,14 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fa= il_seq) =20 pr_debug("fail_seq=3D%llu", fail_seq); =20 - if (!mptcp_has_another_subflow(sk) && READ_ONCE(msk->allow_infinite_fallb= ack)) - subflow->send_infinite_map =3D 1; + if (!mptcp_has_another_subflow(sk) && READ_ONCE(msk->allow_infinite_fallb= ack)) { + if (!subflow->mp_fail_response_expect) { + subflow->send_mp_fail =3D 1; + subflow->send_infinite_map =3D 1; + } else { + subflow->mp_fail_response_expect =3D 0; + } + } } =20 /* path manager helpers */ diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 18ca0248c084..3c74b04fba6c 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -448,6 +448,7 @@ struct mptcp_subflow_context { backup : 1, send_mp_prio : 1, send_mp_fail : 1, + mp_fail_response_expect : 1, send_fastclose : 1, send_infinite_map : 1, rx_eof : 1, diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 8d086641bdc5..f06d93fce1bb 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1172,6 +1172,8 @@ static bool subflow_check_data_avail(struct sock *ssk) tcp_send_active_reset(ssk, GFP_ATOMIC); while ((skb =3D skb_peek(&ssk->sk_receive_queue))) sk_eat_skb(ssk, skb); + } else { + subflow->mp_fail_response_expect =3D 1; } WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); return true; --=20 2.34.1 From nobody Tue May 7 17:06:26 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp333223jad; Thu, 17 Feb 2022 03:23:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJxh+31TamEsqOTrOn6MwCJltpVkJDIZLyzZ2VdRxdNFwpOp19zAHv9L56VP/PdzZgrq5ZNP X-Received: by 2002:a05:622a:492:b0:2dc:dc01:1895 with SMTP id p18-20020a05622a049200b002dcdc011895mr1883863qtx.558.1645097021957; Thu, 17 Feb 2022 03:23:41 -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 v5si6318040qvk.123.2022.02.17.03.23.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 03:23:41 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3794-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=EQ80HEpE; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3794-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3794-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 A83911C0A9D for ; Thu, 17 Feb 2022 11:23:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 504B23D79; Thu, 17 Feb 2022 11:23:40 +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 0555B1FD3 for ; Thu, 17 Feb 2022 11:23:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645097017; 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=N+Jithf+ou1wRL82Vp5OBHU8OKG7JGAV8TevFZdqwTg=; b=EQ80HEpE0sbuAmOSbzhQIZC0M+1WLP0ChIQEJGRYiLmho1wbicG5IALVTebMfvdlNZvnYi M9c2SVHz4j0ojv2oRdpIzIHkkCwnB/n0cNLo48RDm9uCuO0MHamaZ+xe5qYa9QG5VCikQk LKYZlaY9WSX0PyDy0MXSkVbn8Aymd54= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2053.outbound.protection.outlook.com [104.47.6.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-16-Ai4MApUZOKS8FAoSHXlpPg-1; Thu, 17 Feb 2022 12:23:36 +0100 X-MC-Unique: Ai4MApUZOKS8FAoSHXlpPg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LBqt9RjwUFO63uCq1gSejBtYygl5Q3m+h4Ln1mlvCdlovnpkPfCO69t6NWeymWyR5wgWaiD856bnjwmFXyDZ/T7gWOExtTVU2hIvjwY/OPhi7qQalBvFWIWGPeR4NpExN288ZgCLz6ygROl60RdKF7akeLWdDM+EpsV40paXVkBT1xPjyo7W1xFTo+Cb5aS9D84BPrU0r8xut4EAeHdUrFamy5BqCbykb2Yxs38TWFC4kjwYJKGnHMzOBHQ03cg7TlsO56amAf3f5a8jPb5C+evpafgAYdxZIp7Y8hqUQviOfAS6buRVlxWNs9dXzSDvIRlsBH0E0YTbQUZe1Y4SKw== 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=0WROLAK/N6Owe4Ro9xZ2UP62w8JZjP0gNJvBHCfXYeo=; b=S4ElY1pCK2Y/Pvkm/CoBDAtzLbV0YQS618PRrHGVSC7aTNCKowoJJUf1wEtmpYr6Ot8cczSaGRqltKYwVjUuHOdDxMFr3jv+527Rf8gAzL9l/Vc6re8P5UQuCfj7gwvgyaFeJmfM1sSXm0hZqr9Clvi02uR2oySAVhLrree3wW9DJA/CRdrFJyLDX/n0uDUWA5YNmprffe7w4T2YZxXn2OnB9zieB3iYwh2QRdJExN3jmznslRoSsHXMu2K38B9yFuPG8fZ65NqcLiATwcvaWmSmO8MGPqC83KPw2OCxAoXPg3OJfTEkY/SE2NgSHhsCAso2so4hQiHpaQxEIT8vPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PA4PR04MB9413.eurprd04.prod.outlook.com (2603:10a6:102:2a8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Thu, 17 Feb 2022 11:23:35 +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; Thu, 17 Feb 2022 11:23:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [RFC mptcp-next v2 2/6] mptcp: add mibs for MP_FAIL echo Date: Thu, 17 Feb 2022 19:23:40 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0054.apcprd03.prod.outlook.com (2603:1096:202:17::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: a799fb95-8040-4700-dba9-08d9f207efb5 X-MS-TrafficTypeDiagnostic: PA4PR04MB9413:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:61; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0gjMbQz4WE4pmxuoKtg1S0f2sSHplDKvfv9bNil4otFiMW6ZMMuQsLkFQXTxzs/l6r2bDrIQBel39XWzhvs5NhFNbccIoO+vSWR/C6A/bwvndbsN+4dZ7eV/Em86y0CUo78d1nERVhd9lRTnRNGTbmxINriq0mXdPFUAmxSeuw3psrLh+vNJdQ4DZHXVmqtedX4l9HU0o4KjEACjyNqyhIZGUAaPQ+AlfUQJa3MxQFUCAbcOjZWHrhG+aW08vqUOGZm8oLrAL1BxXw5/HzHm6OpYJzOt8ozfccQ4H0EzL9kr85E1giITaAaPGuyutGL+eBkfDqIMhznw5+TO4bjarL9LitIII8ciCC3/BF8eohKhovREbzPMYLz4yM3xYsUu/Hhlvl5XyPcFZxO97GDXOBmO8VQZIFbUpTRZtPnxSNT9/MHpsda5wARPkErth+fIU5WeSx1rlIkiRm35EwSmf0mYD/QrfOtoKOnz79zxtHpFaO94JTW/VSRd8g2i1nlyw7uZBAKPDV8Rq7YeAJpfmi/s1S69RwKY5DPLzDOJ+3IXnnUPxv60zv0eg+Xa9DjfORMfcvsFgodI3E+saM2+mDvxCOzgzjvluNN8jf9Gqxc6bSb2LpD+AQCpdOivhrvig25jfVVbLxKCYQSt6uvrYw== 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)(5660300002)(2906002)(44832011)(6916009)(107886003)(316002)(6506007)(38100700002)(508600001)(8676002)(4326008)(66556008)(66476007)(66946007)(6486002)(6512007)(86362001)(2616005)(8936002)(6666004)(186003)(36756003)(26005)(83380400001)(55236004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1CPdHnDluccGnhORd1qj+o5rlaRhCseBFnZDozjul1y+DISFSoK6TXnvZ2rJ?= =?us-ascii?Q?UkjFP/PdxiAso/wLB7sePfg5jHQFDuUjfezJ8rs9g+VEuLGQfB7sRKEKjwUY?= =?us-ascii?Q?BZ8RxzA9bXUKG05v7EJJlPLgSIzf1TGYVSoMxKqhnsuruZ8uTUGaFiICWRHf?= =?us-ascii?Q?eOGnnXI6NnmymG3rRT7vWBS4RatTNGNzsTHWtb9+Dm6Bw4w3sGqdhFnnGGcN?= =?us-ascii?Q?LaMV0i6zbgfTb2kOSgEWNiJSg7fpcoI1ccQ3bxZy2yMXCBYyOJrC3T3EbkKk?= =?us-ascii?Q?L/ssIP75ZOX3Ts3cgWlByH8nyFFwsMPgYACq3kFdKCTmAHC9c8IhSKPsl5qi?= =?us-ascii?Q?LZNI5SkFXtr2LrYQxouCRQ+zk0nAbZLnTpShyUGdTj11j0z7H09AUidFKVYl?= =?us-ascii?Q?t75q4qLBk/KDowxaJbJksBuN95NG6bepI0Lbfe8xFKmhfEMlpGfDeOyU03c8?= =?us-ascii?Q?3yjKZDzqTTa1WFue+6RXTcD27q84zAVw77/H1oQHzGYaCCOAjhYu6mr8+t0g?= =?us-ascii?Q?tQI8QkgUhRENkr05NB9NVMEsEr+cID2FKRhWdlytOgkYgFp6YxQsDIENlz0f?= =?us-ascii?Q?kHON9fQgXbte9ICNlopMXSETu/1IA9sZSNe/KdOEvVsd52gMHq2ndx5u3YzX?= =?us-ascii?Q?NlSJekbtaT3KZuB2MHThDuHFQ7qh4R5pyABXE+RJg4LQXIyh7AQrwGEROgLF?= =?us-ascii?Q?5KNWCNIATtJtkIYbO6EW10BTUcJvoHJTi+g4mrS+xT46w8/QfNiHY+4hci42?= =?us-ascii?Q?TAEDQrnci6kQUHCvyIQh93FcT7N2iZEJ5ZU7XVHNQCOiU/I+GLYZ2DZnOlB2?= =?us-ascii?Q?meRmu9RvIiOPTs3ePDQxOBiqsrTKzi0DskFK/JMfKtFXOFUMNMJ87nSMlhp1?= =?us-ascii?Q?KrqE1XrtcLrb4ArLY05UqwWGxd0VXRDrsYDw2Sr6cKBg+gCFqfHAyFFPPzly?= =?us-ascii?Q?BFtMPHqOUEkhUWI4F2yovOq2RfgzYR9sixE1FcG2qTz738OW7/ifIuNHWghM?= =?us-ascii?Q?N2JrtL1CMuIoYdtd22iw1Pm5Qjh9UlWCzynwz4YVmgx2sHjWf8mBT8cAcK5c?= =?us-ascii?Q?bNCcZCP5CP3DQfj+hChq7Ms14zDHYeB7HBvKgroGe3B3G/K+R4OYa6Z2/TRU?= =?us-ascii?Q?HtukLVbjF3IPAHMP+bgN0o9k9/xBM+wyOCNfN8Y3yrfcCT6MbjQgBp/yiJVS?= =?us-ascii?Q?0XWJOBWGyKHRZTO/DUWAXlEaxFQf8cgPcMcBmPO5Iopy2Ke+YCkLiBqQCVGC?= =?us-ascii?Q?/hVDJlk1YsgEhp/Sn58GpgbmBSGd0pqmknuCLiCUCKSJ6xAX7o675z22X/PP?= =?us-ascii?Q?NtgbZ6aEZP1wCufP+AONvYlOaO/f53DW6H/9zHmuKq7xn4RpkI5DJvwI4dOs?= =?us-ascii?Q?tHiV99AvuUAIhJHfMRH9o8Zvn2TBU8yBu2qOG+Z3X/+RWeZi93IQm3Gg+y5i?= =?us-ascii?Q?fZm0we1//EkbkWVjJMPoFV0t+IRf5rD/mrlJFUOABFQHDDweMAYf3WfIFesg?= =?us-ascii?Q?2wXYndRbL8DwVe5u2d4dDJ7chbFnR1x2KnTKjaJDwXhcPloS0U7pQqXz5XRI?= =?us-ascii?Q?tAX+m2d442j05C8/zAo875+BpbX5UKQYUSKYdibkSQTR/f1HyUUWSnVOrIK1?= =?us-ascii?Q?7BLVMIdsED5CfoAaAf3E63w=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a799fb95-8040-4700-dba9-08d9f207efb5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2022 11:23:35.1251 (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: WpS2H5sMJQaZTk6RdSItcTnEiRfoJ74h27DB0QejcfeJV6GqGFWl5ezCNDn7VvkysIAQrbD6bqVbggyMCTd+3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9413 Content-Type: text/plain; charset="utf-8" Add MP_FAIL echo support. Signed-off-by: Geliang Tang --- net/mptcp/mib.c | 2 ++ net/mptcp/mib.h | 2 ++ net/mptcp/pm.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index d93a8c9996fd..f3070daa013b 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("MPFailEchoTx", MPTCP_MIB_MPFAILECHOTX), + SNMP_MIB_ITEM("MPFailEchoRx", MPTCP_MIB_MPFAILECHORX), SNMP_MIB_ITEM("MPFastcloseTx", MPTCP_MIB_MPFASTCLOSETX), SNMP_MIB_ITEM("MPFastcloseRx", MPTCP_MIB_MPFASTCLOSERX), SNMP_MIB_ITEM("MPRstTx", MPTCP_MIB_MPRSTTX), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 529d07af9e14..83219721d337 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_MPFAILECHOTX, /* Transmit a MP_FAIL echo */ + MPTCP_MIB_MPFAILECHORX, /* Received a MP_FAIL echo */ MPTCP_MIB_MPFASTCLOSETX, /* Transmit a MP_FASTCLOSE */ MPTCP_MIB_MPFASTCLOSERX, /* Received a MP_FASTCLOSE */ MPTCP_MIB_MPRSTTX, /* Transmit a MP_RST */ diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index dc0dffc1b6b5..314e110588d7 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -283,8 +283,10 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fa= il_seq) if (!subflow->mp_fail_response_expect) { subflow->send_mp_fail =3D 1; subflow->send_infinite_map =3D 1; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILECHOTX); } else { subflow->mp_fail_response_expect =3D 0; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILECHORX); } } } --=20 2.34.1 From nobody Tue May 7 17:06:26 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp333288jad; Thu, 17 Feb 2022 03:23:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwt/6tRA/gxK5U24ZhhMLGwa7nmgwzQO2p/AM7jX39+WO87mbsxEuvWhQ5Ms1/46SB5/PDk X-Received: by 2002:a17:90b:240e:b0:1b9:2963:d5a1 with SMTP id nr14-20020a17090b240e00b001b92963d5a1mr6783665pjb.227.1645097028246; Thu, 17 Feb 2022 03:23:48 -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 z10si12209792pfw.83.2022.02.17.03.23.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 03:23:48 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3795-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=k6R5ipsK; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3795-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3795-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 C80C03E0F0F for ; Thu, 17 Feb 2022 11:23:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BD7423D79; Thu, 17 Feb 2022 11:23:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 941351FD3 for ; Thu, 17 Feb 2022 11:23:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645097024; 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=qrZKPQVWFihMObEcdAPwZ9ZI1x6cz6Exaak2wjBFH0I=; b=k6R5ipsKyMNB241c/0ez54q2qeLX1Zuh9dT2aGQQvhGqaN3u0SchoMzTLL/6Vh/sXEzCMK bt/lUDzVUr/ibTTR6nGKL0hshVwuGjG8itEFDcYeMPOcItpETZu2hJL8w0y8dle+xtE0cx KkOeJsIZKz+9IlFOXiE64oKSo2dVlWg= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2050.outbound.protection.outlook.com [104.47.6.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-31-NZLjmuByO2u0oQVzuIw5ZA-1; Thu, 17 Feb 2022 12:23:43 +0100 X-MC-Unique: NZLjmuByO2u0oQVzuIw5ZA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FIP6jwaUq1HYuaRuEgsBQE/5hvANdAYZ5vLmX4tBuC8pKvG35cZFG2Bwe3W1ge0jmpP185QLtsJnEW+Yl91Evjy1rPGDRk5cSTmkBlH5fGuOljeYUfqFYmdzwEFH5vIwKUVJfb6jgyXDLG7lRDQgV3DikNvRA+d0GTZtKlmmoUuK5fraYsGnf/mp+srF9I//ZSXibX0Et2l8SyvryCCQixa35dqW7zoRuAE+IGZ3AmQ/2dRTU3aSoJy6miPVqKEgzaae+ZtfohzrdMaPDgEmyBdTJB7UD6m3HEUn+lUJzXWIXEFSJl0kBsaZckH+w8QRlKbbBEgZFrRpEyUfD0nKLw== 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=MyqGHCOVD1HJBWCrV6PPgvlU5PWZlXIp7ntLuEDXrkM=; b=Adt0dlw5J7Vkhmbu9gVe3CeFUreDAe5Yw8SEkemttPVzemYP/lnAIsK3UfKu51FwZ+ODXF7vZt31HMrTdzpi8gTQgOBO6wK6sXUxxCPTIe0T/a21aJrkPT6TCXO/VLnW9vie+L+s2uLePJxwuzgyOeJUAJsuUSn+uNTOKibG4c8pptXo14ZM6cWZMD12nJc7ULzd9d2VgZI+iiu8gTOw9o+E67heXuopT07JXoHUKZgt1hyj9/6JPonDMDMwjSlNwFAZp1YltG73AcOg8ntNJcKzX9YI1OP3ZIdWz9JnU1pxrcSwxBSwHfGbrNsunwrJNLXJZHdkf/YYMhoXJQSb8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PA4PR04MB9413.eurprd04.prod.outlook.com (2603:10a6:102:2a8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Thu, 17 Feb 2022 11:23:42 +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; Thu, 17 Feb 2022 11:23:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [RFC mptcp-next v2 3/6] selftests: mptcp: add MP_FAIL echo mibs check Date: Thu, 17 Feb 2022 19:23:41 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0015.apcprd04.prod.outlook.com (2603:1096:203:d0::25) To 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: 21fd0a8e-d288-4b17-bc41-08d9f207f3da X-MS-TrafficTypeDiagnostic: PA4PR04MB9413:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:157; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FbcA60U4HcSesb56ydkaQOin6+47MsY7QQq7S5mWf2KcbsWIFOXRdbzs6jTX3GeB6MQFrf7neCmEBPkYZyv1MdYAacx1v8sb2+EzGx9NfRp/sQDXeMUxq07wCRzA79tjq5yj3W2YZYvLtsXYga7FS/U/72tyDP3aHzhZs5zMvgrwJwJfg5D9bRZ/N7EcM74uew3sS1SbRAB8DivPgD5MSbAUY6G29CQRQFVY0Bxv/mDgPbEGRCk7WEtluEJED4fho6JTrRoJ0BjWP9UhrH2/2vdBpCiLfKycbBZbVdPfXLqPY/d3FAo8g+odGQ+qG1PviwmGMXiKSPHpUgGzI1iaj7CP1akD4aY3XjxJl7B3scaQhLxMyUEGk7VwtdVkyP77Txj1a9ggB6R/s/JzIg366gyvxiQDFIfzEWlaiSWyQ0EMOcFyjc0qc6WtcxIKZD3JbNrrNX01W8TfyW7O29shSbVK9VgtmU3Ka0mpLYHZyQMhht3lBBcuQMTs2s3ziUxmpXS5zfTESKnwwii2GIXIqppmZfobGF/Hky+CjdbSolRlnstPLj45jKZgXVVMfWhiJ+ISJW65NfOSGY+YCRjVA1KJNttP11YSB3vpTklOC2cujuFvZ9hEwVBOE5/teVJWFYzSxhPBgit12/VcSanO6A== 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)(5660300002)(2906002)(44832011)(6916009)(107886003)(316002)(6506007)(38100700002)(508600001)(8676002)(4326008)(66556008)(66476007)(66946007)(6486002)(6512007)(86362001)(2616005)(8936002)(186003)(36756003)(26005)(55236004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JY9D4AbF6y8RAXn5TutLvPQMnMQ322x6F64/L6x6QhRq6A/3F4zSou6uPCgx?= =?us-ascii?Q?XU2eIMmwA2p2svnxMAf3cVCVNreaXNt5B+51oUpfKs26qy48p1jhWsIN1AS3?= =?us-ascii?Q?oirGm6g2GsBycFYrg2SIbU5PTMvXitC35IlMi0k5oRuobM1RKKUzpwHKPhTH?= =?us-ascii?Q?sTSyXicOFuz/hlb34EcMY2LXzKB31YXr1XQ755VFRyRJmm2417bnzLxSnYyO?= =?us-ascii?Q?lnlwFaheBStVFAxARtGxaI27RFYVc14Ri5EbdDl0VSLGJl3zYz4rctmj5dao?= =?us-ascii?Q?MZSybHYFc8DOLWrIJi4WeFvCFa4YKsVm9o+ys0CMzkvRybasghMcuF6PoZIe?= =?us-ascii?Q?tAAHJN9KI4Ef9N0qT03/WW8NZP+arerozb2n6CRhCRF85lEF/mTLuu9UsPs3?= =?us-ascii?Q?k0MAB4L6y+73DvURCUFJysi9Y0GA7ozDz3NO0yJ2T6r+YcMRaBvuLlGvNCsg?= =?us-ascii?Q?ORYkq1u37ObYGlFcvTfh9zkiRNAUCkXXIA4EtFDO1USNUlSoWL0fnd7CHSD3?= =?us-ascii?Q?GmjFvf0FUIzzSxBjQwoxenr879uvyIvfy5oLSBGvrURqp96hDV3JqpPItMz7?= =?us-ascii?Q?tVxkM9zYm7sPm51E2OiACxeMsA0+mwNDYUojgqTDKtj3a+AK+ephCyW/jY/u?= =?us-ascii?Q?jpNsUw6SQ1VL/NXtGEy8hJNvkdyV5/lPQGePl6DLuBGHA3y7T6QtGmv/2YkR?= =?us-ascii?Q?UNzhV0yQG+urMe2ZXpe8YXGwvKs/AWN3PfmginWdnIosZ78ZAR3QwWDNj4gu?= =?us-ascii?Q?JTf8FRNOKubTv4jaO5ytrHveckaUlTP7WGyaXKxn3TScLfmJn0Cl/1ZJ6UpD?= =?us-ascii?Q?my96iA0FSB7wB1EDVzRY9T16Oo/ygOfFEGw8Pya8zaAeEyO1FmRCzyvHruHG?= =?us-ascii?Q?acFd4eV0KSjl5zNqIybdJKbZrVpdoY0EyULVUheCtrDELTkDD93cYZO3W2vY?= =?us-ascii?Q?xSjSUJ/gDKO75fKpmLCHEYrsABqgK8Bevi9L2U9xuVWiisLt/aMu5geycUIp?= =?us-ascii?Q?ZzbCCmBw1s6rPx+m95w9x1CnMfi/omJ7fgPlSVuzpm0Y+3AkVLrmlvniNeJb?= =?us-ascii?Q?P5yDQcsRjYL0gXLi8llWCRK8yHnxoutzlA7DbIJf/lr/qTjvW9/PdqnBZ7br?= =?us-ascii?Q?lNYKf1weZ9RIjr2zo1QMqHqXH6mR+51yEcnJdjjuO0Ggth+nrdxzpOizOdfI?= =?us-ascii?Q?xqNO9Lmok3JZ/5TiaexRnVLoNmgSj9cQdolffulGo9qsOJrh0RI3YaZUp7Fe?= =?us-ascii?Q?uqE3rJLz+8nHIBt9faOtYNfTRxmhvl79MML2GZ01lnmZfcZS/T2QwGk98B7F?= =?us-ascii?Q?1fcYDyvyf+lvtYKFNNpNbf4Ln7laCIUoRLZPIi/RfLKyoRuVzRFCEGINo6yA?= =?us-ascii?Q?RNHThfwlSH+phVxfWBVhp1HyMUOQ+XdTOIg7aU9E8EQTVy++h3qVPqvKXe6f?= =?us-ascii?Q?3ENgKo03/AHmcb68Iq7if0KZ44EvwLeq6eOsgSaveuyTk9hL9olXdHum43qp?= =?us-ascii?Q?jart97V0cjb1ufdRRlOf8UedSEnmQWOBXb5otjG2Nek+ccbXhHDjcYnPrZJJ?= =?us-ascii?Q?Z+tpdMM6Zh7IwHOzX84To7Up6fQAmcfcMJ4/dOq6qwshN8Fa2QwiHDstG+E5?= =?us-ascii?Q?9aGI6ACX/kSAAsahaPnKtT0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21fd0a8e-d288-4b17-bc41-08d9f207f3da X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2022 11:23:42.0464 (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: NXvTkVPhFv+ND66JFh/Q9IJIr4XVfz2lEaaM2CF0paeL5pCajThQQOL4JQ60UtzYtquYAupH9PEgT6Rq6V+SPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9413 Content-Type: text/plain; charset="utf-8" This patch added the MP_FAIL echo mibs check. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 8708be740334..9a1d8a1d3447 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -947,6 +947,8 @@ chk_infi_nr() { local infi_tx=3D$1 local infi_rx=3D$2 + local echo_tx=3D${3:-$infi_tx} + local echo_rx=3D${4:-$infi_rx} local count local dump_stats =20 @@ -972,6 +974,28 @@ chk_infi_nr() echo "[ ok ]" fi =20 + printf "%-${nr_blank}s %s" " " "etx" + count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtMPFailEchoTx | awk '= {print $2}'` + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$echo_tx" ]; then + echo "[fail] got $count MP_FAIL echo[s] RX expected $echo_tx" + ret=3D1 + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + echo -n " - echorx" + count=3D`ip netns exec $ns1 nstat -as | grep MPTcpExtMPFailEchoRx | awk '= {print $2}'` + [ -z "$count" ] && count=3D0 + if [ "$count" !=3D "$echo_rx" ]; then + echo "[fail] got $count MP_FAIL echo[s] RX expected $echo_rx" + ret=3D1 + dump_stats=3D1 + else + echo "[ ok ]" + fi + [ "${dump_stats}" =3D 1 ] && dump_stats } =20 --=20 2.34.1 From nobody Tue May 7 17:06:26 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp333371jad; Thu, 17 Feb 2022 03:23:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyV89oPJHvt4fsAZ8NEDtA69cFYYArqhqolFKKP7T+KwLdyo6fLHOD3ocHdQhMDdleH7+98 X-Received: by 2002:a17:902:d708:b0:14d:cf6a:a9a3 with SMTP id w8-20020a170902d70800b0014dcf6aa9a3mr2475410ply.118.1645097035204; Thu, 17 Feb 2022 03:23:55 -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 oj1si625740pjb.81.2022.02.17.03.23.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 03:23:55 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3796-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=gIPkSQfE; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3796-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3796-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 BBCE83E0F62 for ; Thu, 17 Feb 2022 11:23:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D31613D79; Thu, 17 Feb 2022 11:23: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 6AF581FD3 for ; Thu, 17 Feb 2022 11:23:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645097030; 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=xkDhkLOe3wktycDJ8qLssvnpH/ATYl+mWmo7Hw1mNpo=; b=gIPkSQfE0aehN9i9IFXupZrL35W/1xmD/Kp9vCAxXpMQAZ3iFRRIaotl8cdOEDjwmEtrKj YjfKP8MNRZek8CHS2ZvDlbKpzdLLGW9dHG/zHOAFQoQaFz8trNV90lh+QxoEIckc03vDTP YMubykoZK+b29YTK2f0unogNTrYY7GQ= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2059.outbound.protection.outlook.com [104.47.6.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-3-7XmpikM2M76oTFNDDaDmmg-1; Thu, 17 Feb 2022 12:23:49 +0100 X-MC-Unique: 7XmpikM2M76oTFNDDaDmmg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oP27IcGuE+eXHX3ewBs1Eh6T1ru/htZMNLrphsaIxykE+FwkU0ya9MmeD3qhOHQsCI6xGkuvSoCQp8JWwWM7SCtBmeOwacEwswR4VxAXL3xcGHK20mZ6HoPjxylTGJCddc0THULHD5QWVamFwU+zHh6M927XEuwH33wM8az+6iIEkx754zk5zU6HIjWO+oRFSpbLj6rUTeimQ/o4o+HPUisW5xdtajpM1UZl7F5SW3KGfzadK4boshje/1izTmmt/mEBwxKh1mIHEzIiVjcVlDYw3P0WgKvMt7UHURAYqFo/8moYlYnIYkja4E7pqv7iLzkB5D2Qm5TOeK8cDZ/dRw== 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=kOFLrPlu6sWLU4J9NHdaoxLU33UCYjbK1OaYgwcWZKw=; b=M6HZcpKBZDjNUs+2+W7ZrXHFtUw5wVHYUjQ1OAgcGK7cZ/Y942DwYAy+Is9YODnnsEp/norJ8qHDsOJkBWdadXjHODe3uHanuM8OuOy9mSoAhm0730zdRQdAvVtBjsSvVXAE3ZHSkuH+vfEs3wtPA/2zeMJpYTj7ViLekg2OcuZwlMZB1i1eHT21Fxe1Z2I7ZpxLF7MKEijNQz++k8H4yIJa134KItjAMCAxRDMBBXMMqSpw6g6AFOIavsT4RK24tgTiHqvs90otkscpZism3GPZPZGFMuPydv4An//p1SgXw5KcXnuXCEqESLOUoJiWNOtbqZorRixG0d1DlXLNJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PA4PR04MB9413.eurprd04.prod.outlook.com (2603:10a6:102:2a8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.18; Thu, 17 Feb 2022 11:23: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; Thu, 17 Feb 2022 11:23:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [RFC mptcp-next v2 4/6] mptcp: add a new sysctl mp_fail_timeout Date: Thu, 17 Feb 2022 19:23:42 +0800 Message-ID: <59946591122d6453baa10bfc3de3badda3bccd47.1645096378.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR01CA0059.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::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: 9bc5f2ae-a2d6-4a5a-9ee0-08d9f207f7e0 X-MS-TrafficTypeDiagnostic: PA4PR04MB9413:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9W/MVAIfpWmrfCnnkKbSQszrkDAdVWj3hOYAh53mBCt3sS2ZMBmJyyMXlHXQGIqzMHNJewnftiPc9FnYlNxRThCOuu0KYBa8ZtAUAb/0GuNlplOEdzq/e8068X+9RE20q7Y1cavuEAZLbU5RuD/1Y7MIxf/8QenBmJ+ZPRLUPjmYqSNCDBXijNQJEitTGWTfMvN0VACsp5pKnjrnA5u5t75EpJqHeOaA50ncQLEf/JHAC/UzucBxZIb7RY9BHKgWRBU/DaW82WVVhlEfyolr+5gwao7d0m9RPxPCyOWwZ3ks/5+bncPju2APupEokLyxjGaHGFZO+UKhRsrIfNusuRT8KrV9ZjUKGKjoZ1e3I1FejZw9QK1+NKKpM2jqssercpVgQQYpu9++7/LM6xy0GV4dPl9s+clntH5c5wh25zpaGtGxwhXvmf5o/UfO/TZ+/7a2DyRPPvFiBMNGjjHRXGVlCzQghXZ8Ogb3NqkbRP+uaRWPFmu57SeM4ZOr5CoSPZDniahHXblX5rYOyp/UK+yp/af97ESG7viy7FLGxCF+5kl4t/5qthf5+7LZVbAfqT9wgNcL/QQkhphTbFFUblZsOP+Az4ZQTAfU+7mEisjnqqX27v581sUSFjHhyc6piMsKY7FBksD7t1AIBvfwmQ== 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)(5660300002)(2906002)(44832011)(6916009)(107886003)(316002)(6506007)(38100700002)(508600001)(8676002)(4326008)(66556008)(66476007)(66946007)(6486002)(6512007)(86362001)(2616005)(8936002)(6666004)(186003)(36756003)(26005)(83380400001)(55236004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bc7GlgsthIrMomBvbucNQTo17vsUUXJC0gMvRkW1eseFYtgTxDDeZL+kFNbC?= =?us-ascii?Q?NrUJHIyKrCh7yFSzEp/7KLEMVQ4DA5Nt/61nrML7D6pYTns6+I5KhP5/owgj?= =?us-ascii?Q?1Xfu+IimM8BmDQQmFGDf0jZbno0An0IEK6eKm+eJU7PeQBgBQ5ksH4wUIXyD?= =?us-ascii?Q?tri2mPUthXNx0SLlLVwOdFUcZnZ4rRDJA5wUHOC84FYkU7IbncTXu18Tl4iT?= =?us-ascii?Q?TdKPND44a3aAnb9cIDR5C2wLzPEi+ngzOdufzVaRgRSIQRmHm/prbBbE3/3Z?= =?us-ascii?Q?L2dUksJ8zJ2fEt8BUKFN+wi4cqrqwEBQXsAHxq1upMYMxvg1kqrNZ5QmMu5x?= =?us-ascii?Q?YWVECK2c0kLML+BxswCxyDC5/AQoCit1+wv3krvhPT1jLie+m6kEbIKV1bLC?= =?us-ascii?Q?h3Xm7KmAUTvcajTXvYeKcpWsIawG5GSRrNasSqdPOZvE9ujmqdjl+sfCmrhk?= =?us-ascii?Q?MsnfNoV7hipBSZzILubK4yuMy2xEGjbDqccw3qZ7IDQaxde/iGfaib6Yw8/8?= =?us-ascii?Q?+kwlxIpI3Mi8le7Vv2cJWvfs0J7MRMFg3hQ2Qa9+tef0utQ2vV02Cowgm7Gx?= =?us-ascii?Q?aXLt0SHG4a9HZgFPdoXiDwAFHhPpMu7Aa1ez+D+DvoeM3KNAs/yfgSks5Ip+?= =?us-ascii?Q?e906qimtwIvyCj88Igi9FkBN4d/5pdIN1f26NeN3IiEgNtbt5SJw3UkjLbEi?= =?us-ascii?Q?TZaLVOd7A8c59fVeKdhrgv0QoFIwTm4IMbVWuG3N+LXpuzsGaYmgEChNz/WE?= =?us-ascii?Q?1DDYd2ctC6vJAIEo7pbpmPvqbsx+2pq/5zXN+XNoiSVT9AmNbjYYUvIoaGd+?= =?us-ascii?Q?MfsotsEWXS8gH3x1i1tca/ji7+QmQfk6JinQDZgOyWVIo22uac7IzKc28+38?= =?us-ascii?Q?M+t5uE7e/FaDqiFlL0ugAH2R2Bfq3hduIdkSWQiLK43IvjHSnqRGqjRLJEW1?= =?us-ascii?Q?+6rTNh84OIgBHhvtNMwoWAbE4y61oB4X8nSjsrAbfu9852XKMLNFwZG64JD9?= =?us-ascii?Q?iCfgG4ZbQYzTuigb4BmvttLfyJyk91Bu35xwt+UAIQHyBWRf6ySqzRJ3MjIw?= =?us-ascii?Q?tr7WAwjrJ83nByoU3HJgFqVAnWM5iRuC1avIBhaymJ4revhyS8aVurhgBsIT?= =?us-ascii?Q?bVVDIEzab87osZS5zDjYJxYDR7ejglFloRxjB6DSNPabBNBwut/hxdpdwkxP?= =?us-ascii?Q?evZ9yuJzpsu4WLUXMbFtjDyxEOPNxzafev4F2U7quanWQ63rQ+hAzChMU3Iv?= =?us-ascii?Q?YwERYJmpNzZ6pfCVbK1WvoQINB7zycV1RAFdBYFzNzUR784ltyMRt3NYirFh?= =?us-ascii?Q?DyBk4+xawh3yRKCe9pxwAi2M9e0h55WIkQiIHdeYdIeQ5uiXvsJHFh6s/HlJ?= =?us-ascii?Q?BReuqvRg3CNGs/6JDipR8eygzIYzzAJiVKOV5G3xWVcOL5JnzywFGDv6HaZy?= =?us-ascii?Q?y9Y6OqCfzSq+hiQmLMDWN4eZJ0a6jTjPee9otEfGwTmjotR8vb5CxJXxPKDc?= =?us-ascii?Q?mpQHXF819nc1oIIsur9siGHN7gPPZiYrqXTcZbPX1xWw9GnC5SMdDf6fBLxP?= =?us-ascii?Q?6Wr4XDG9nlwEG063jBa7aYNzB9B0uhJpZK4obzbwKgYjXIvoSPK/Xh2oulE6?= =?us-ascii?Q?uHwu9NLy5AobuzGvf0d8SWE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bc5f2ae-a2d6-4a5a-9ee0-08d9f207f7e0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2022 11:23:48.7802 (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: DveEMpfYJRnnpBLBYIuEUe6QzMNApJbHrjjQBKH6MO3cosKXs3kTz3u7uMeIBQ53FPDp/qKpO3EktdoCFb3vsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9413 Content-Type: text/plain; charset="utf-8" This patch added a new sysctl, named mp_fail_timeout, to control the timeout value (in seconds) of the MP_FAIL retransmission. Signed-off-by: Geliang Tang --- Documentation/networking/mptcp-sysctl.rst | 10 ++++++++++ net/mptcp/ctrl.c | 14 ++++++++++++++ net/mptcp/protocol.h | 1 + 3 files changed, 25 insertions(+) diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/netw= orking/mptcp-sysctl.rst index e263dfcc4b40..3ad19e04ecce 100644 --- a/Documentation/networking/mptcp-sysctl.rst +++ b/Documentation/networking/mptcp-sysctl.rst @@ -75,3 +75,13 @@ stale_loss_cnt - INTEGER This is a per-namespace sysctl. =20 Default: 4 + +mp_fail_timeout - INTEGER (seconds) + Set the timeout after which a MP_FAIL control message will be + resent to an MPTCP peer that has not acknowledged a previous + MP_FAIL message. + + The default value matches TCP_RTO_MAX. This is a per-namespace + sysctl. + + Default: 120 diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index ae20b7d92e28..a211af9b19e8 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -32,6 +32,7 @@ struct mptcp_pernet { u8 checksum_enabled; u8 allow_join_initial_addr_port; u8 pm_type; + unsigned int mp_fail_timeout; }; =20 static struct mptcp_pernet *mptcp_get_pernet(const struct net *net) @@ -69,6 +70,11 @@ int mptcp_get_pm_type(const struct net *net) return mptcp_get_pernet(net)->pm_type; } =20 +unsigned int mptcp_get_mp_fail_timeout(const struct net *net) +{ + return mptcp_get_pernet(net)->mp_fail_timeout; +} + static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet) { pernet->mptcp_enabled =3D 1; @@ -77,6 +83,7 @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet= *pernet) pernet->allow_join_initial_addr_port =3D 1; pernet->stale_loss_cnt =3D 4; pernet->pm_type =3D MPTCP_PM_TYPE_KERNEL; + pernet->mp_fail_timeout =3D TCP_RTO_MAX; } =20 #ifdef CONFIG_SYSCTL @@ -128,6 +135,12 @@ static struct ctl_table mptcp_sysctl_table[] =3D { .extra1 =3D SYSCTL_ZERO, .extra2 =3D &mptcp_pm_type_max }, + { + .procname =3D "mp_fail_timeout", + .maxlen =3D sizeof(unsigned int), + .mode =3D 0644, + .proc_handler =3D proc_dointvec_jiffies, + }, {} }; =20 @@ -149,6 +162,7 @@ static int mptcp_pernet_new_table(struct net *net, stru= ct mptcp_pernet *pernet) table[3].data =3D &pernet->allow_join_initial_addr_port; table[4].data =3D &pernet->stale_loss_cnt; table[5].data =3D &pernet->pm_type; + table[6].data =3D &pernet->mp_fail_timeout; =20 hdr =3D register_net_sysctl(net, MPTCP_SYSCTL_PATH, table); if (!hdr) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 3c74b04fba6c..c28842ab0dcc 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -583,6 +583,7 @@ int mptcp_is_checksum_enabled(const struct net *net); int mptcp_allow_join_id0(const struct net *net); unsigned int mptcp_stale_loss_cnt(const struct net *net); int mptcp_get_pm_type(const struct net *net); +unsigned int mptcp_get_mp_fail_timeout(const struct net *net); void mptcp_subflow_fully_established(struct mptcp_subflow_context *subflow, struct mptcp_options_received *mp_opt); bool __mptcp_retransmit_pending_data(struct sock *sk); --=20 2.34.1 From nobody Tue May 7 17:06:26 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp333445jad; Thu, 17 Feb 2022 03:24:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbRZt5A5+8SazOU/kVMJM7njSumaNepL9yiHgz1E/zsFyPSii9gtsJmmgaMIyxWgXk7ASz X-Received: by 2002:ac8:5f4b:0:b0:2cb:96a5:b842 with SMTP id y11-20020ac85f4b000000b002cb96a5b842mr1883419qta.552.1645097043521; Thu, 17 Feb 2022 03:24:03 -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 i69si1112149qke.743.2022.02.17.03.24.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 03:24:03 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3797-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="PFxBZ/Qi"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3797-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3797-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 3CA9E1C0B3F for ; Thu, 17 Feb 2022 11:24:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 346E83D79; Thu, 17 Feb 2022 11:24:02 +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 E2FA11FD3 for ; Thu, 17 Feb 2022 11:24:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645097039; 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=kZ6yJjsop0VnN+fI/OpWxub0lNOCc/NSc8h2PbhIH50=; b=PFxBZ/QiNifu+enIwfU3cFeFi9RwtUSBaiAZWih8s+qK8Tq+IVxoak8Y3UN4PEXdeJtRsC v90J+R2GeRDAe5fYlw05XbFcJ8hCYXqPJ/hDtBTHhiH0f/5Gz6F1m1Mi2OAVH0SQwLBuGE mJ+7TvlHxcYeLjCUBH5HPe/WVXjdlLU= Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2054.outbound.protection.outlook.com [104.47.9.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-36-tx2H2mHgOBq5vg778RcjYA-1; Thu, 17 Feb 2022 12:23:58 +0100 X-MC-Unique: tx2H2mHgOBq5vg778RcjYA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GFbeyjomWa9qOffv8LmLiVPP1jvgojT1ttsIv5yxZDteDmsgSP/biTzaa6LzafzIcAWNDf2dRlX+SgSvCNkP+ysxhoTRZ8PdT2jc8DHqMeZ48j9EvK8WvPgY9pRnBGqPMbNvczBD4mhne0mAynDkea/QkK8+xjVDVhUsTIcqsPE7/NPfuzStp+A0JbY/SyAu4DXnscAvB/eTJkIWuvyLwZilF8ntStgqfAVm06Ma9F5pRzMRq6mbSPUYgDpV/um57jItJOndbtoOTsukL37CeUM0ihYYXuuxDAIYa+zd5AGuoadLc5bm14BQatTULK4nshEOL8gBSO3ZSQccHGBw8g== 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=rTYglwg7WT9+R1hisLlCpfOlWG1aDSmHUy9qAzxFKms=; b=JVlz5Wb3tGfZmkft6ayR2pb8Y1DZEZDxWZlU2YDkIsMh+V59q2M1jvdl4z7A6kgmJ67mH7BZ8ItK3jtPS+lauulwONMqdsbflHfBVUvgWwP9uXWXnXI4eR3d2QzL+gJ9EQIOQvblRZB5o7zfVEYCsU+1ZsDeONF0LmPuy4QUKjitG4YzaKXvQR7rZwYlLvG8KWxP1ABGFLFdJkuUko0jMfEikwIpjSpqdcMY0OpYeo3uZorPH8oDkTiFBChoXpeA7RtcJQ+US8ilNqvbPCHioPFK3OAP48e6dB2yPJKE0T8BKAZBoFG8qOESTkxqLFvMiFt9b325W+idGne0/GrmuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VE1PR04MB7280.eurprd04.prod.outlook.com (2603:10a6:800:1af::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Thu, 17 Feb 2022 11:23:55 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Thu, 17 Feb 2022 11:23:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [RFC mptcp-next v2 5/6] mptcp: add MP_FAIL retrans support Date: Thu, 17 Feb 2022 19:23:43 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0114.apcprd03.prod.outlook.com (2603:1096:203:b0::30) To 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: a404d574-2ebd-4c5a-aa88-08d9f207fbce X-MS-TrafficTypeDiagnostic: VE1PR04MB7280:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:40; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M+AXdVOsAc9Q+i2IuxdNHnxHpQXi/m5RAc4d5afsOv3ToCpvF4psl+bxs0RI3nQ0kOIdYQfwInG5qlFwVqUMjhXXjs5B/gwSkishWxnHvDwkfmRCXHirc9xkodYgQocd/gKnSXwXsRe/ytbbYXNLHO6Ry0w1ENqVeqyIMstfkgt/2PSrRH9wQxJPZyBpKVd+xqJL4Z9foyIBpSZymcT9ULn6O6Q5jaclHYdvFXFopSp6oP/2ZvP0gdtLw6nHFFDFceetdteiqXt4LKgId/3mPErNbXfOIbUTunPefdmND8mHhsp7NembfhZ3apiffSVVmbgPqieJM6Z3QR3QR2ST0Es1+Qet5y5RbGZ/gi/MjUDg1YdW1T4gq6rsNfk9zgzsKeitMSvfXbZFb3F4HQ1gcKwXAd/DwBvTc97CvaNgKaPo5+1s08mE/3BQ/nNEobmYnSGMqnemt71bmdBAyKcH0FL7wVnMUdngp2s7D1F13lk60mA4HX0A1G9/EYwv3M9Oh5MSCB5esV6CvRcJPG5LkhBM+xuFZSG564G7NTTWXO+wWHqhtp62/Usd/Ljkky5FuSmBsZPimwBZc752k08B3Jt/WRudHFfJb/NOWf2du0+yU1jOdLJg9RWcGtdz396tmtpxnn75BS5cL2XylZ0xeQ== 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)(66476007)(2906002)(2616005)(107886003)(86362001)(6506007)(8676002)(66556008)(55236004)(4326008)(8936002)(83380400001)(5660300002)(6512007)(6666004)(44832011)(186003)(66946007)(316002)(6486002)(38100700002)(508600001)(26005)(6916009)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/NGW9uPYijDi6eLiqIn7auQgnnF2D4V/28eYN4UgpSem2hUWRDaqICNOeSfR?= =?us-ascii?Q?VbP/LS37qmAx+uRGTMlwDkHW19AIfG+P2VVZMAlAf+5I5U3pGf2isMMpsD0L?= =?us-ascii?Q?M0z30mOKpTi5iy0mxYIQq3XyoKSqDaIomDEo0rDj56ZRcXVSTrTK0SzaP6iE?= =?us-ascii?Q?yO98vlhLBnF53CEzyuJERsAKtud0JZlaZlwYeIqT0BEH66hlE4xVWjJhegce?= =?us-ascii?Q?fcuHCvhqmH/xU4ZV65J0Lh+dM09RiYRJMCnLSW1dJTEZol+3hiKPwR2LAzdK?= =?us-ascii?Q?sL18nqr/IoUik7kPr/LgmmDO51PZfB34MCI60NuGT/hb1b04UXQn9LZK3xXD?= =?us-ascii?Q?3FZOqO/hDABXb4H6Z12UPR9pFomtjEN2UmSIs2u3r/waOZxYAmlLY6qFaQQI?= =?us-ascii?Q?O6Z7jsL+lenvHCYpa60NzENvDtf7CScF26A87x0fw5TKgd8tbflwvMWGpVJj?= =?us-ascii?Q?g+i4p02pb2Ii941CDCNT2k9QvOOT2sf5ALHwoQVFhBZK7IIo3RXkYoXJDu4w?= =?us-ascii?Q?SOiCojnkskOErazglDjILGnoSbyEzgE9IX1QAwxO2OJqkugXTwHrE5dQt+ao?= =?us-ascii?Q?Tqy6uWLGsVkmSd6r2W53CQdZxqrXsTNQMpdRib806bbvcJpt7Qm6CNVoNaUN?= =?us-ascii?Q?+b9IlEAWAMnBDn8PEz31N8K4104njhBmYRsQMrqtRwAdEjZ+glwzVlfhElFS?= =?us-ascii?Q?d7ctp9gsRCo98P4THUZ8ejC0OD8USDpFfxG55TOVa3DuJFDcJfw/rvsXKbzp?= =?us-ascii?Q?D4I2bVmqdY1kQirh40Gg6kJcDmha5vTwl85z2d7jyTDK0twzwvkFnX089uOo?= =?us-ascii?Q?+ET/FUrdhA5IrrL9lGEfdjHYttRIf7XpInEtIf16IaMANOno5wVxo5OgL174?= =?us-ascii?Q?YXKY1We103oXMoTgF7g2+jRoY5G1JlGuNS5kb33rR9NfyuylFsLWRjYsgza8?= =?us-ascii?Q?JEfVHKWyEL2Z8WxY5maHpjHe7sT6uItG6Qz09+KxIK+tvik5IbbH4mZJMCdf?= =?us-ascii?Q?S/lPtIjcykNiDZmCuKr1tyrCkex4BUzFD8czJDaDXKoB8wuiPP2IdQV9Dgve?= =?us-ascii?Q?xF2KCDM97ojBqpWl8ShDuPTmguIXSE5PfJAnwb219GqRN4A45hQwbCOtRH5o?= =?us-ascii?Q?fRKvdrjI/DkLADJDHrzCHyAyILjwMLcJhABbioiIxKPIhl8ShFerj2cUlaqC?= =?us-ascii?Q?QgtqsF0k69ZuBFXyacvUrrsDQX2vmUvwEvFKWC18xb+1ooslobWP5w5ugOhP?= =?us-ascii?Q?cdtPXJ81bkLhDmjUAI6/Pzp8P7ARgS2hrvfEM3XXtFpS0DGXWRVz4vij6yT7?= =?us-ascii?Q?ZyL3sV794PyJHKP45GQSY2sl+MnFvNmGje+MSJjV5TG/ACsn/JexVh5w9kGe?= =?us-ascii?Q?736xpV3Jtl1euW/uzc3MaPfap+AhX4c9pkwRQCY8mk4dHqqpwti+ZsaD2aI+?= =?us-ascii?Q?GyOu7SHXqM6yh0+NdjtAwt3pUriRVyigSSB73RGvDxsXXybmLDbnOoctBWF0?= =?us-ascii?Q?6135GxSCDjA/XFPx9YVIFgVeJbqefyTEomGbL9m+w9l1vtTR0eV1lwI24eAF?= =?us-ascii?Q?HXKYmUsBmcWKhFmcTOggYMR/BArqQb/9Qog2JdNrgjN5vJ9OmrZvZdl6uYoA?= =?us-ascii?Q?TtK8nB0G6OOvQxXd6mAHJmI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a404d574-2ebd-4c5a-aa88-08d9f207fbce X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2022 11:23:55.5766 (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: jzzzXXEyzUtgVeqEeSQzknmLvqeGc315CoR7OLvlvEMpsdm0qyLi+oFCsceRUWrRlFfnPqDDYL2dehOfIc5Xqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7280 Content-Type: text/plain; charset="utf-8" Add MP_FAIL retrans support. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 1 + net/mptcp/protocol.c | 44 +++++++++++++++++++++++++++++++++++++++++++- net/mptcp/protocol.h | 2 ++ net/mptcp/subflow.c | 1 + 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 314e110588d7..ccb29b2d2075 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -285,6 +285,7 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fai= l_seq) subflow->send_infinite_map =3D 1; MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILECHOTX); } else { + sk_stop_timer((struct sock *)msk, &msk->sk.icsk_retransmit_timer); subflow->mp_fail_response_expect =3D 0; MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILECHORX); } diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4599bde215b2..461fd30c6b9d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -50,6 +50,8 @@ enum { MPTCP_CMSG_INQ =3D BIT(1), }; =20 +#define MP_FAIL_RETRANS_MAX 3 + static struct percpu_counter mptcp_sockets_allocated ____cacheline_aligned= _in_smp; =20 static void __mptcp_destroy_sock(struct sock *sk); @@ -860,6 +862,46 @@ static void mptcp_reset_timer(struct sock *sk) sk_reset_timer(sk, &icsk->icsk_retransmit_timer, jiffies + tout); } =20 +static void mptcp_mp_fail_timer(struct timer_list *t) +{ + struct inet_connection_sock *icsk =3D from_timer(icsk, t, + icsk_retransmit_timer); + struct sock *sk =3D &icsk->icsk_inet.sk; + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; + + if (!msk) + return; + if (inet_sk_state_load(sk) =3D=3D TCP_CLOSE) + return; + + bh_lock_sock(sk); + + subflow =3D mptcp_subflow_ctx(msk->first); + subflow->send_mp_fail =3D 1; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX); + pr_debug("retransmit MP_FAIL %u", subflow->retrans_times++); + + if (subflow->retrans_times < MP_FAIL_RETRANS_MAX) { + __mptcp_set_timeout(sk, mptcp_get_mp_fail_timeout(sock_net(sk))); + mptcp_reset_timer(sk); + } + + bh_unlock_sock(sk); + sock_put(sk); +} + +void mptcp_setup_mp_fail_timer(struct mptcp_sock *msk) +{ + struct sock *sk =3D (struct sock *)msk; + + /* re-use the csk retrans timer for MP_FAIL retrans */ + sk_stop_timer(sk, &msk->sk.icsk_retransmit_timer); + timer_setup(&msk->sk.icsk_retransmit_timer, mptcp_mp_fail_timer, 0); + __mptcp_set_timeout(sk, mptcp_get_mp_fail_timeout(sock_net(sk))); + mptcp_reset_timer(sk); +} + bool mptcp_schedule_work(struct sock *sk) { if (inet_sk_state_load(sk) !=3D TCP_CLOSE && @@ -1598,7 +1640,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) =20 out: /* ensure the rtx timer is running */ - if (!mptcp_timer_pending(sk)) + if (!mptcp_timer_pending(sk) && !__mptcp_check_fallback(msk)) mptcp_reset_timer(sk); if (copied) __mptcp_check_send_data_fin(sk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c28842ab0dcc..40954f2389e8 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -467,6 +467,7 @@ struct mptcp_subflow_context { u8 reset_transient:1; u8 reset_reason:4; u8 stale_count; + u8 retrans_times; =20 long delegated_status; =20 @@ -669,6 +670,7 @@ void mptcp_rcv_space_init(struct mptcp_sock *msk, const= struct sock *ssk); void mptcp_data_ready(struct sock *sk, struct sock *ssk); bool mptcp_finish_join(struct sock *sk); bool mptcp_schedule_work(struct sock *sk); +void mptcp_setup_mp_fail_timer(struct mptcp_sock *msk); int mptcp_setsockopt(struct sock *sk, int level, int optname, sockptr_t optval, unsigned int optlen); int mptcp_getsockopt(struct sock *sk, int level, int optname, diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index f06d93fce1bb..a30867f926fd 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1174,6 +1174,7 @@ static bool subflow_check_data_avail(struct sock *ssk) sk_eat_skb(ssk, skb); } else { subflow->mp_fail_response_expect =3D 1; + mptcp_setup_mp_fail_timer(msk); } WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA); return true; --=20 2.34.1 From nobody Tue May 7 17:06:26 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp333522jad; Thu, 17 Feb 2022 03:24:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxZXKP7tC5B1v+0dQa7T4fjllcVBsEvvkodiKtsuvhu0Mm44RWHq5LMohYAPeFxr1uIC7tl X-Received: by 2002:a63:2a45:0:b0:373:1850:d5b with SMTP id q66-20020a632a45000000b0037318500d5bmr1997124pgq.563.1645097048710; Thu, 17 Feb 2022 03:24:08 -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 c8si9230818pgq.675.2022.02.17.03.24.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 03:24:08 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3798-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=dWbI8Lg0; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3798-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3798-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 42AED3E0F6F for ; Thu, 17 Feb 2022 11:24:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 698843D79; Thu, 17 Feb 2022 11:24:07 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.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 3D6651FD3 for ; Thu, 17 Feb 2022 11:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645097044; 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=zmBASFmmBE+qtLJ5tmsDVYaiMDBz+H+MgyxsvoDHkjY=; b=dWbI8Lg0RwK81ucJ9aEk+IanySjEBhcMhbjpCW9XtDwsF+pA3qKLEC3QLZx2Fc84Ahkw9H fZ1uody4tLO0JrqTmEig3y7nBu43ci5fvpQozf3U1e/Qjb9tSqSP0yWvjFB63FTmBIw9Wv cQiidGJgm5Myi2G20l9v6Xq88iMqExA= Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2052.outbound.protection.outlook.com [104.47.9.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-10-MJmR8t5pOC2VB8TB1hnfmA-1; Thu, 17 Feb 2022 12:24:03 +0100 X-MC-Unique: MJmR8t5pOC2VB8TB1hnfmA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MrQxw1a6czUPiohYZLwcpPP05gHOQjlLnwzpc1CCj1yRUba5N90NazO8XYmLZ7q0aWg19nbg/U0mdnk/auB+BGHexqIjOvQhuE8M/dwyBmWwJnCuA4t1uoCG4xK1aXhdNngnKClTOCF6halRziFf5Ztn6DendnSxI/SbfiDlYqH8vBjBjFEtiC/SdU4tnjTEFKGpU3eG49FAmcSPQDesnZRJXk56PqJc0EhfpqI0n5FlnRvDBmFnrPnTpyo4rdSUUy9N7DzHsK4VC8lmxJZrZ2t/+hGjGo1df4V5Woer5gcvSj7kWhMhUQgjwloS+KzD8a9ozcraXr4dYgNrGbitgw== 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=+ZadQYNWtiCwn4V4Cx/lzRAoJbzv3m8Dst1z0t9afHw=; b=Bqt+1+x1ueP2QEceW3hJcqyCQmSF2DUguQcc6Cay4nbxenhEK01/Q4ZiBFb1Pt7WzqKk9kQlYMK8CRix0fBkIvepw8M73Ap74zywoi/qp+hcb5+VE8+GnLFuIiYe81zO90gaRh5M6PreyPkRAMJwfU1ze4lrdjquQ6xWRoXbNDqyuZSS/14C/bEe6V3HGLrV7xplakTS+g2Vzh20mxAKcZ1RdUmvCSk+AvYW9AMWlllr/vqNd/xP5KlxvZ/G7ItwK7vVK8J1UlxbXG+Az0pTAm3dBRY1siETouaImbC4agyY61Cxy9oYW2FpwBz/u8chjlFTR9kB6RIv/TOrlAhJWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VE1PR04MB7280.eurprd04.prod.outlook.com (2603:10a6:800:1af::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.19; Thu, 17 Feb 2022 11:24: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; Thu, 17 Feb 2022 11:24:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [RFC mptcp-next v2 6/6] selftests: mptcp: MP_FAIL timeout testcases TODO Date: Thu, 17 Feb 2022 19:23:44 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0151.apcprd02.prod.outlook.com (2603:1096:201:1f::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: 73382490-0839-4588-621e-08d9f208000b X-MS-TrafficTypeDiagnostic: VE1PR04MB7280:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:597; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yV6KsCHE+v/zETHaa0vnuRfpggwfymNYahnHGe+hsKacKZluK3bz2kB81szJEcOmjA+WT8DiycTcURkkKYHGQz/27IIaUpJdSLqOF4RNjmrNaqNmbi7qiWWtAYL6SlC+ZQ+ktPy+XOykTUQJHQFGU55DM0KxKJ/kxNULZNbfSs9S1QtxRCKjVjcRGFA76OTckmbrEeIcUuTGtRIICT4kqwR9+NLMW5LSPL2ri9aQHikjb8KJ+DKXzDJVXsGDiJbo9l6EYMgpE+Qgoc5zkLPPF5EWTy7+zrxACSHbis5vg4gwmZh9k+y7Z5jJnLpEYqj1xhhdA80rCFLbC1YFQXeTjnFWlQGZcoxK2D7OjOstB2U9UAWMLTinXmzIlJxNo66zbHgUCsp2kvyDeYTovbRLmGhV3pKRoJwYVLaycLIiG9dpR0tqqp3mnpTTyTRm8hHzXQo0pAdeBMb1XX9wPeXAMj1e3rhVd70T3NNv8gaf4Yza39gSz/pbpsdc2eqBCmIPhpDm7CQSe7799BiM8uXkgMGOy+CeO3ptw0vRz0DB8oSocaKyWkn4mEdVRiTdJwbbr/zOo26eS0jnS6CSMsKJIKWWMPgkglQ2P8uJM7ZishjPKoF0VHtE2d4e1DGlMUnYRxQPMfldTAqj32WJmmOFLA== 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)(66476007)(2906002)(2616005)(107886003)(86362001)(6506007)(8676002)(66556008)(55236004)(4326008)(8936002)(5660300002)(6512007)(6666004)(44832011)(186003)(66946007)(316002)(6486002)(38100700002)(508600001)(26005)(6916009)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HTuvWANviwkelX28nYL/ZczlNV2HdLiL2IGPtWQorzaAwmQ4mDy+67Xr7D86?= =?us-ascii?Q?oR/W49k2GvHmMrWOQILfcgJIv2kCU7UqQJRU87gPuZgEV0QaNyRrpx/capqZ?= =?us-ascii?Q?XXIP6nUeDqfkFFziGVW9Mx34ljTkrtQ3LqLlrxcJu7qGAmO4hlHAX8y9WD+L?= =?us-ascii?Q?/QmmI51BD9hOpl9fvyG04bnMLHwKPiFsYBWzW7+eltl0XsEhZZDQ8lScFS3+?= =?us-ascii?Q?PrPGFIusYN/KO1bWm+ceDr7yEr64UGZ4j5+aMpRux75G8uQmBDe8J4vdCNy9?= =?us-ascii?Q?jPlsxbdyZ0dS0qObxI++wdv0xkOGPSNiSNgqvj3dPz+v4ZIpJ0zGzUh0jjRB?= =?us-ascii?Q?VOnXFktT9ZWsSWz6Omz0oScg/oINo/ow5kXJW1zc0xG+nqIbuHLWn6oc337r?= =?us-ascii?Q?a+uZfjBcOzGPZMEMulRHWBQjSeZC7KJlpR22u5HO9R86F0fgA5ckKp+GeHuN?= =?us-ascii?Q?cFRLG7CgCqZ7Yp9RKKqR3rmvwjPeWgE6d+7QJWeq30Ziz40kxBu7Br3QecXs?= =?us-ascii?Q?EUSst/hq8M+dcblTMtbflLSGA5ReKrdf9oayL8Ex4bHsq6/TsUvMqnhOTsLb?= =?us-ascii?Q?01vHKTBKZSiQ2aGUt20DK6qZ97w5K+6033mUGEyorquBVwcg+VXseNlCfeoH?= =?us-ascii?Q?57PgoCwWnXtPyN51Y7EZoQ1p+HTbOJxedDLLRDlRuf/YXmmQTtSVxPHkPbTh?= =?us-ascii?Q?7qCot51h5Lmh+z+Bp1SHsFMxysEg6ELtxebO8tkIuPJTS1MWIAateLM5e8Jb?= =?us-ascii?Q?SCKNevQTA4OqN2lVHUjZGF6xypU4/Wtwaq5ZUIHHZYbSuiHunxNw/RzkKF/+?= =?us-ascii?Q?H0hw9ySmXyniE4t1CMqkLWqegNTHXAbN8AyBLu95LrbsZf0o6EymyFnIRVgd?= =?us-ascii?Q?gTsWdMnCyQWAw6KgSgDdJgBJ3obuJOdAFNgeBMg61BtI2S+KuRkj9a3GPhRl?= =?us-ascii?Q?O3dhbCYVKj+HuPfp8wPPxCCzdTco8sIybJxNlaevD+YoXX8lnGhoK4pvKMIW?= =?us-ascii?Q?rhjX+Mg5WpB380oPxKWPOXL65X8HTM6OgpG9jbzeDr006UIfREml2LLDLau4?= =?us-ascii?Q?flLtq+T90oiRs37Ca+VGwJvPLLVJtIO77SQtaEmFKIMUikZBPijYPwsU8FGe?= =?us-ascii?Q?pSBIiiUs/jT/PHYjyT/jEMi0/u3k1h9d4Xz/B3UtWJTT6hhri3UFOT+ziX85?= =?us-ascii?Q?HgeuVqCD8y8czuOSJ8oJnvn3DzatRa8VlLbINjKuugHbI81eyfZIVC83ponW?= =?us-ascii?Q?qYV3vd8tSZ/y5wHnj0KGBxWD0XLpdMOQDl/pIZn2S1Qotkn1RaSUJbKgFqvd?= =?us-ascii?Q?o/7OFpF7wDg9m84koa4ThZZiH+W8qzX7m7qMYistbrgCcWCe3/sW7SeQiBEG?= =?us-ascii?Q?AGORWwPv9n5SNM7qJV3epaz7O6qlQ9x4hIvT5bkeQo/UGdoE37RM2GBAuw/a?= =?us-ascii?Q?5fpwxgPTkx/+/avIN1KjLhvZfyP54iLPQ/eY8mGmKqxW1Kp50UAg34d4VsNy?= =?us-ascii?Q?YqdMILhNpEhKO8SurIbG3y9qeK1teYmtiVxw7rsxhEKeYCrdZ2j5CX+BKvC9?= =?us-ascii?Q?P/OHr4Jx6c96x2KA7WO1wx2As4gHd7YRokwiHsK4VVtZ0QC6JX8QvVKavAU5?= =?us-ascii?Q?BpK3O/GBciiyd7sCdnf9wAE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73382490-0839-4588-621e-08d9f208000b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2022 11:24:02.4979 (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: y6+vnlS3nGQv2nDhfCzJN6Idn26pSj/cs9Jq2RA3pUsL9lTgVdgBMy8dM35lW2wPBFh7LkB7i8oNzcd/XV1Hdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7280 Content-Type: text/plain; charset="utf-8" This patch added the MP_FAIL timeout testcases. Doesn't work yet. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9a1d8a1d3447..f28faf901a24 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -41,6 +41,24 @@ CBPF_MPTCP_SUBOPTION_ADD_ADDR=3D"14, 6 0 0 65535, 6 0 0 0" =20 +# generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x60) || +# (ip6 && (ip6[74] & 0xf0) =3D=3D 0x60)'" +CBPF_MPTCP_SUBOPTION_MP_FAIL=3D"14, + 48 0 0 0, + 84 0 0 240, + 21 0 3 64, + 48 0 0 54, + 84 0 0 240, + 21 6 7 96, + 48 0 0 0, + 84 0 0 240, + 21 0 4 96, + 48 0 0 74, + 84 0 0 240, + 21 0 1 96, + 6 0 0 65535, + 6 0 0 0" + init_partial() { capout=3D$(mktemp) @@ -261,6 +279,27 @@ reset_with_fail() index 100 || exit 1 } =20 +reset_with_fail_timeout() +{ + local i=3D"$1" + local ip=3D"${2:-4}" + local tables + + tables=3D"iptables" + if [ $ip -eq 6 ]; then + tables=3D"ip6tables" + fi + + reset_with_fail $i $ip + + ip netns exec $ns1 sysctl -q net.mptcp.mp_fail_timeout=3D1 + ip netns exec $ns2 $tables -A OUTPUT -p tcp \ + -m tcp --tcp-option 30 \ + -m bpf --bytecode \ + "$CBPF_MPTCP_SUBOPTION_MP_FAIL" \ + -j DROP +} + print_file_err() { ls -l "$1" 1>&2 @@ -2455,6 +2494,15 @@ fail_tests() 1 \ 0 \ 1 + + # single subflow + reset_with_fail_timeout 1 + run_tests $ns1 $ns2 10.0.1.1 128 + chk_join_nr "MP_FAIL timeout 1: $(pedit_action_pkts) corrupted pkts" 0 0 = 0 \ + +1 +0 \ + 1 \ + 0 \ + 1 } =20 all_tests() --=20 2.34.1