From nobody Fri Apr 19 23:02:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:7824:0:0:0:0:0 with SMTP id p36csp3441581jac; Mon, 18 Oct 2021 05:33:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbR05RkYMWZ61/7IFiQZyjqPduh279KKVcwgSYTkvhd2CgPfvrGPBP0EvAfJ89An72WL4X X-Received: by 2002:a05:6e02:12e6:: with SMTP id l6mr6832072iln.16.1634560429782; Mon, 18 Oct 2021 05:33:49 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id m18si20213101jav.88.2021.10.18.05.33.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 05:33:49 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2190-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=PfBlmHMn; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2190-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2190-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 F3C803E10C2 for ; Mon, 18 Oct 2021 12:33:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E7DCA2C89; Mon, 18 Oct 2021 12:33:47 +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 8B06172 for ; Mon, 18 Oct 2021 12:33:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634560424; 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=tsW/o/Lwd8J0ymFpFgQfqtgsFP+XJ0gez+6Rtz7j1jM=; b=PfBlmHMnqV0T9V8g+ED/YswW9YsF4nLO1xvJFTd5Slzn6fuSgHHkqFSdyMNzxTp/vIkcgD bxpkduC6UQG9GW456q2+iEbSqob3ePZXTuwAPjfw7V+dI005F+ssZQ45aCiaVJVAOp+ykd Tq3F09OftoORS35aMZSWOO0QUXr92jw= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2058.outbound.protection.outlook.com [104.47.13.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-5-BHVKvmOAPgycsRzJz7LrHg-1; Mon, 18 Oct 2021 14:33:43 +0200 X-MC-Unique: BHVKvmOAPgycsRzJz7LrHg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZuyacM4VPJnR9c5rJNb5/zbgXZappi0OqOn8NHyW0NImpzeT24lEXQevRmypRpeWmGNbKLCpwQZq1OBfEk0QdPbFFYdLEL7gPjfh7TSEWIFNKJwi6NhxWqzx3W/XedvFJCCfXwdk6CNjpOVY4J+/lmvMn5JPaFNheP+ZYLX21tRTNp819w40Sv9Mrme6J4/10EPp4bCRCxqaPJl0HoNTWmpGLcfwNzKW8T1cNb3drsiIZJBgab9PyjkXR/qYqa1L24hkMRsdzI3ADWiJPvsQ+eRmGnT2ABDfUISdBWwU+W2+2MB13yFOshrQo0RkDB0vk4b4m+fdPingbyxusn4MiQ== 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=i9dBpnsEoGASybv7Eqc/Oz0UVkuVeItPtC/W2D8bn1M=; b=hSohdjLsRzks5V9Ich7AJgpz/N4vmpxG7mINr3T2pHl276JPA85aGs+Lzq0JbXM/H1lY7fNXPd1WScl6L61fgO70HFyngWc1mOMyzmZTSrtQuB+qFKjmGWImAYe/cagPChuBIhQqK2ROlAm7XBjMkIeGLrpdHXCFpbuzPGnVw6A5dN1ZSBqq2/PAL/faB8JMrJFhGW11fiudrs2WfR28vuOKiJC7LEi7YzTu+jwIf6Q7bp1Fno6EH4wJRqd60QfhR5PQmWt53BkgklQO5t3PYxumO2xqxGvaWav6pApDYfbkKQ4Ozuk69PYOIyGzSvzBKp7IB1D2qTqhCCaKI2GgKg== 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: lists.linux.dev; dkim=none (message not signed) header.d=none;lists.linux.dev; dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by HE1PR0402MB2825.eurprd04.prod.outlook.com (2603:10a6:3:d4::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Mon, 18 Oct 2021 12:33:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af%6]) with mapi id 15.20.4608.018; Mon, 18 Oct 2021 12:33:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 1/8] mptcp: don't send RST for single subflow Date: Mon, 18 Oct 2021 12:33:08 +0800 Message-ID: <62d6361bb33d11d34f61c826d115de9cf6fdd24d.1634531093.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0023.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::33) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Received: from localhost (2408:8207:2546:b4d0:1867:9999:db2f:de88) by HK2P15301CA0023.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.1 via Frontend Transport; Mon, 18 Oct 2021 12:33:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7be45185-3a9d-440c-a7c0-08d99233857b X-MS-TrafficTypeDiagnostic: HE1PR0402MB2825: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:363; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: poVNdhVQ0QMZckU/yVZSoDlMU0OQ4lby6idPuF5+y8GHE3Zdu/T0UxyxN+Taxl8BQAilhNWX2mX7Rhc5Z9SnKPT0grKbBMtk+U5l7hXlRS1//xtrD33y+9n2rae50qWI8S8UZzNzWFHaTg6sAbGvlm8UtGvpstAz+FKlwVI4dV5b2FdMImRBU8i3FRr7e4FLflfPKRQFdO0/twVoyf+6rnLLnh1nXrHWgqhp+jtyTBGyH1crsPFwesY/56nS+cceWB+0cCI7YfWDkVFLDiIIOEJFTVX3LVxFKxXJ39ItiHzdK/mgFkC8U4Ou3M3BHPdnmXDv37mABRBBM1YZpSzT3TaY9bhkReFBd4RvjJrJSY5CWL3cbMIw8mWnG0WTezCWVKWe7RDkgSUJs5XTMrPfWEwLhqgDcu0HFZNSPaIQEOwZT4DENbtzw3HvIUoXelR6cAWbjiXjTUKGJOVb4pOS19RqMRCwuZMTms3BwqknoN3dytwjE/x6bUmoKK9rXznfuP90FmGoQMI6nbyoMTBRR6ExAQG8jY/iCnb1eM5oIIWv1juWGQaZ39eTjWBbJma2kgTURJoxt1E5N3l4MD4IB3VGWiPPWCE88k91Zn4EkQyLrkHbsJxNvhc4DT9SnMmPEYY8k0u7H38d96KT5ItwTw== 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:(366004)(66946007)(36756003)(2906002)(6496006)(66556008)(38100700002)(8676002)(107886003)(83380400001)(66476007)(2616005)(44832011)(316002)(5660300002)(186003)(6666004)(86362001)(8936002)(6916009)(508600001)(6486002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DBN8zu6pX8daDlD89+LpkpkeIkilj7TJf3tNfW+NjpgYTn9yspo9imLJCAVf?= =?us-ascii?Q?QZenGLpyjIrKKdpJ3W15BR/jbzQA3rCleKNZpZV8rc5HgqIdGKs2PsXzsRip?= =?us-ascii?Q?1ixvVR55hLuSPfU+CxWbRIe+rO+NGVJTLubimJjf45WGETZNkf/WeqeKagoZ?= =?us-ascii?Q?HXVL/BlkM2tXHLbmhL3jE+EGgEsViHCdFlj4M47R19x8RVVhCcp/GgpLd9tF?= =?us-ascii?Q?gE2XKzsjaLYKBTegruHRDAgDtIEJoKRXd8APnhrlnX5OWAyXlWIaQahbB0Uo?= =?us-ascii?Q?vrqSTPTfK2ust31hqiFpp2+fe+4w95KjfZIT2+v9+DrKVFlj7GsvUX+QQb+5?= =?us-ascii?Q?AOYXYi6exmJGLlcT0eYbSKvvGbaQq8pGG2oDlRajPznJtVakpLUXyN3KF090?= =?us-ascii?Q?D6ag647oV/lakjMO2tr0olrtomNRp+AmQl0fcTGxoI0ojGUw9HksQSCK/14O?= =?us-ascii?Q?NgtBT2qMcv2RTWACEuMniyhV5KadUxEoEYc+iP0OqVhYbf+P/FDSCQF2rsyh?= =?us-ascii?Q?D9v+7aNQCd9rKtbC/Mna8sTXMXe7NK8lKDsErv5/LE4PhhNbwQB4MAafumlD?= =?us-ascii?Q?KI6Wc8aQTwtrbNKXNAyrMIigkOQqfqtM2vuwNn7MsDMvcqabXigQ7sM/rnaY?= =?us-ascii?Q?PIM31HVyYvm7WJwzke6tFBdGkZup+jJZm0LqfOGDj7Oe1XOmAP8IQag9fRhl?= =?us-ascii?Q?hN1TezmtFQbL0hPBsrCVrhdqOERbJglXu3XpQ+bv4WhpU45jwtF7A+2VSttP?= =?us-ascii?Q?jX/5CzAJVEedXANG9qPXpLz7eMP4UtFLaQmwa9E6cX/K5GKqA/A5ijlt2njh?= =?us-ascii?Q?bJSj1vJbHkoWCtH3RYOssPts8RzqGJmS1aC7yyDPsOZJBKyoSGoZHF3v/Dgm?= =?us-ascii?Q?jt91BohhuJgM68tOokENpTtVOObamdYFCULji392rfDBG3b7Ma6KNQkOkMbm?= =?us-ascii?Q?z6xr+M/LFhOsfh7n5phIKlafHuP84OfMi0rZFM6QwVgtAM3D4E84tQ0/04Wh?= =?us-ascii?Q?V6JMC259CalOR4Xdw8+BVj0iCT6Qgz6xCiOWWRYyGQqSicLI2dsp3Hq59CVx?= =?us-ascii?Q?O3A9Nm4v6Fwk6tNXoZLpEr79L3zK8QzZARXAkF5zeCeAA/4HYYcx4/xyh79S?= =?us-ascii?Q?BhJ6SjfXe1n22+dnfFmGoPrARR2+nZsuCum47goP8TqbnWqH8OqppWarMRuE?= =?us-ascii?Q?yR4fL4zsMnF7lRPLT4VVJnpKaQC1Iwku3wbPq8Y+l1DF8hN5PQqpPFLeVxLN?= =?us-ascii?Q?s6DDgAWagZnCEAuelSMeutkNLjgdpuLm8Xbd376V0XAOFhsHjvNPoYpB7pUR?= =?us-ascii?Q?YLy5TG5iTHLRr8v7U2rIX2udQATBEHpoSNEzYH3qENSLYnHoXZ8hLt4v8cY9?= =?us-ascii?Q?zjeI1touDR8ccH5Ylx0YVlewU19F?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7be45185-3a9d-440c-a7c0-08d99233857b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:33:43.1236 (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: Ze85CH6oqC+khM/OFtoTL1cvszt/KHl/xOIZoI4tHVtqQ0CEhKuWNP8NpVld9d2QWGha3zKEGW61FolV+l0Row== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2825 Content-Type: text/plain; charset="utf-8" When a bad checksum is detected and a single subflow is in use, don't send RST + MP_FAIL, send data_ack + MP_FAIL instead. Signed-off-by: Geliang Tang --- net/mptcp/subflow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 6172f380dfb7..92b45a7c997e 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1167,14 +1167,14 @@ static bool subflow_check_data_avail(struct sock *s= sk) /* RFC 8684 section 3.7. */ if (subflow->send_mp_fail) { if (mptcp_has_another_subflow(ssk)) { + ssk->sk_err =3D EBADMSG; + tcp_set_state(ssk, TCP_CLOSE); + subflow->reset_transient =3D 0; + subflow->reset_reason =3D MPTCP_RST_EMIDDLEBOX; + tcp_send_active_reset(ssk, GFP_ATOMIC); while ((skb =3D skb_peek(&ssk->sk_receive_queue))) sk_eat_skb(ssk, skb); } - ssk->sk_err =3D EBADMSG; - tcp_set_state(ssk, TCP_CLOSE); - subflow->reset_transient =3D 0; - subflow->reset_reason =3D MPTCP_RST_EMIDDLEBOX; - tcp_send_active_reset(ssk, GFP_ATOMIC); WRITE_ONCE(subflow->data_avail, 0); return true; } --=20 2.31.1 From nobody Fri Apr 19 23:02:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:7824:0:0:0:0:0 with SMTP id p36csp3441712jac; Mon, 18 Oct 2021 05:33:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLW9thQpVFvyB3a9SzGbRo0an8YT3D0/QCjt9WNL8g+SeNcMz05EUH2VZ+Z10JUrS8/PQp X-Received: by 2002:a9f:2438:: with SMTP id 53mr24788834uaq.116.1634560437926; Mon, 18 Oct 2021 05:33:57 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id y14si10817341vko.35.2021.10.18.05.33.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 05:33:57 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2191-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=C5jJUBXv; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2191-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2191-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 173923E115F for ; Mon, 18 Oct 2021 12:33:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3E4A22C89; Mon, 18 Oct 2021 12:33:56 +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 F27FF72 for ; Mon, 18 Oct 2021 12:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634560433; 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=3gXqut0EHpbnuFIpo8SF7jCRzj4lg5tvXPe9/deHn6M=; b=C5jJUBXvKU99hqKisRN8V09Jcaa3LPkUg7/MtfBpKeGnat3SSmi+sgFErZN2eSpx34G5Lt BClhO3eEn7Rvgj7rYVMR85j2oRvVxDG30PEbGMu+lTO6tjh6JU9BotB+xXgjeEvrnWif0s uuR6XUM0Cs+yh7v3yIV1HGw/pP9kCw8= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2051.outbound.protection.outlook.com [104.47.13.51]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-29-5xanZE6qOSu2Ce0t5R6Z8Q-1; Mon, 18 Oct 2021 14:33:52 +0200 X-MC-Unique: 5xanZE6qOSu2Ce0t5R6Z8Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d4/iFe1QUvmDLntW13gIxIjNYPUz/BxHMjswj9yZRpr0UaMoEEwqxnfbJDkIqVdc3OVSZWknfcQWb31dMK6P/y047UqsEFKL9BQKh18yCOfwUSU8cJn4GxbWsxHAV6u/kPSW3Nwyr617f3uy/MUuaL4wCxEN3nyBk/ZPfDM75u47VdmZX1iGc5J/MEAj89nEieIYACQtJIs6Cq6aiFkh/YenmgmGdictQ3DhR5xz8ZJEY/gmu2pxOkVnyVWqUiL2aZPkHpLo5Wg+XkjgJlJM9+jJyCemg7dXoy8+jXzRdzlesbZWhxV2P1PMT4qzkfjEwYsHHKAkiV4blSN4Y6TjkQ== 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=wP33ElWuW+/k3ihfqrfYxc9UNeoBrZoe53MPG/1TGj0=; b=a7NsVewQn02ijQ+tOt348YJm00wCmGu986/MKfXZoW+n958W5Bm1E8Jnn1AJlWzfkEJWO5dYdrnhNF+woOcDkXUCi4d8pQiKqF1kVCp5pL8+uIq66CO4QKp8gCJpmS8mYvuHhszXrlgRbVVfNVkPxE5exjrCj7QKZtlosPv7Wdg/LXfcn7D3Moz6QXqFF5ggCCuIm4JHr+PxhqacX8vqElD+0E/WdsB6Ik8tG1YLsBGu1hg0B7/JxX2YzGPIaZNHnRuCKkXiH1/JhDeYg3cUvW34xHkikJG3ds15Rl36aCPNDvPBUqNlqzcd/zX7ylIAaq9XiPPJ8EALpKEtUAigzw== 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: lists.linux.dev; dkim=none (message not signed) header.d=none;lists.linux.dev; dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by HE1PR0402MB2825.eurprd04.prod.outlook.com (2603:10a6:3:d4::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Mon, 18 Oct 2021 12:33:51 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af%6]) with mapi id 15.20.4608.018; Mon, 18 Oct 2021 12:33:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v7 2/8] mptcp: add the fallback check Date: Mon, 18 Oct 2021 12:33:09 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0012.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Received: from localhost (2408:8207:2546:b4d0:1867:9999:db2f:de88) by HK2P15301CA0012.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.2 via Frontend Transport; Mon, 18 Oct 2021 12:33:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 50b95206-4196-4219-8198-08d992338a8c X-MS-TrafficTypeDiagnostic: HE1PR0402MB2825: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1107; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /XsuZOhQLgtjUlb97EsJb+KtYE0QYzIlN5dRkXNpLWV2b2SpeypS6phGBoh0hKuP8UBgOWYfSY1n9iBpBX98SiE1WTpPEVk7mu6Hz3hGp0kia+cg35PXYSIcCG7lXpcbiCiELk59okB4qAVhvNDlCQi0yDVysRpHTEU3LzRi1bdldHQJ5u78nW3Q9boCcYAHD3YpNp+Q7MrVlY0W5uWvnD9h4FX+rBwhDyxXfNoNBqlezs0kqMRp7N3zaI2AWNj37Yx8oqLrrrZVMLd/bTy3B/Loiz8AnoiUA354UUSTDThgmd7oBXSV8VYPhw3JVjFtB0cJkZAcSehB/Ddu8L7CKvGGQmJo+koRwkaQ/ujOO+DuOHKp/hDVx+kRojWiXzh0nFGat5xuCrFAGsmGmikOK/ELJNCvSzbojgdbAGKmbXcq6258p7tCtvgaM4NjX1WSLC5SG1Va6N/O3tnRm2VllWSjS+DT8NJG27KBxKIwRtfQOoSC0aal7ZtRbfaP6o0JAh7why+T+zgU5rZcwHackoJAk/bDmqoH3umn8rHZ972sgN8dMs6toqEUNdCyz/vjcPDdo42gfaljwGHHUBfNXB/jZXLY0XXcyhXLGXq+7pjrBQlchbaWdnB7lZJRolJumBsx9JmHjTU70YnP8r0mHA== 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:(366004)(66946007)(36756003)(2906002)(6496006)(66556008)(38100700002)(8676002)(83380400001)(66476007)(2616005)(54906003)(44832011)(316002)(5660300002)(186003)(6666004)(86362001)(8936002)(6916009)(508600001)(6486002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?H5Jo9m/luyKh8JX37VwVtVmw0uqzy/FSXwr2An6U+Oiuh+6Gh4C1vGEI9NDx?= =?us-ascii?Q?/OgUXRUonsFgrHEoS6MsF4GgbCuxMD/IU7/SkVNoB1rAlfvHF/eAF8niru2H?= =?us-ascii?Q?MxSqC07yOLrTsBkOs6CQ201BrQ3o9DIubtILXe8/ra7mfALXOTl0QRA89ayr?= =?us-ascii?Q?9IAkpCRBziMG9oTVfLOpGPzm/tzt7j+89XeMcJyewRqPoOUhpMUQCtdKzBod?= =?us-ascii?Q?X9QeAN85+YwMNNgO05a+MxqrvXUiwzvQrdRPRZw4MrJ0LGhkM6R1RYRPr2dP?= =?us-ascii?Q?5CpTe59cvyd8QfH8s4gKiMSWUeO0FjDYO5sOO/D8tcYb8UWxBYA/kqQPyKol?= =?us-ascii?Q?jH/XfdV9Xa8vB8Ul2aHbvoGpHo34yvFUkk/OdswxI0mITy1MrN5pdR5kw1qr?= =?us-ascii?Q?gVGDidUyK11azA6CqWdBqqtj+CkMDd0vf712+dsiTIVNk47ciXfNTlWDt+S0?= =?us-ascii?Q?oP5vZqPeM2PzAEH90h7UGpOqR9Sw7L/p7fmUlYLHryElj7S/EkTRYrbnpfSY?= =?us-ascii?Q?qTZoo2AsCEZ73SspwjlLydI/SeDczuSXOriQuQcZsWzlbfPLL0rZsCvVuCRN?= =?us-ascii?Q?mCwa9T8ZJdFpTAvd6O9TnE+KmJdggqVFobEtoWyQPTlG9m2o32Xj2X8hkTNB?= =?us-ascii?Q?0vaTqheGx6bcNTKBslxq9MhSU4zn0GgIilOsf7MZp9u2M7t9Vhp3t5sPG9PX?= =?us-ascii?Q?3pEC6aWdnnWwhdJSzSPcwCBhgetVLw/jy5O7Pdc1A4N0Ppuj7ztHxjSj2upk?= =?us-ascii?Q?1ZXsdmyNFh90dyXdOmOt/tF2ksO+bHWX6CMdoVUx12+FXmAiMU92GX/z7ML8?= =?us-ascii?Q?AQMqbQErMeJQF3OT5EEJvJEof5yTfiJZY/5kNnue8ZCdtMreFH8sA8klu1dE?= =?us-ascii?Q?nJDEBzoiU5ELsp8L7TLdKMgeyvHAkrypXH/EhblAD8wPgij7YKCorWV/oQBy?= =?us-ascii?Q?MjA0yDnM+vsFd023s5EUmtOu7UMq0I1hbg8Rk/J8wS2XroTJwiT+Ks0ULOa5?= =?us-ascii?Q?9FBlwQ57hdKhY5Q4BcffCZiPVQEfU871k2wGM+JKVw1Gr/vt5nnmoTBwDBt8?= =?us-ascii?Q?XKnl1et8GGmMPEiC+6rjWYUQN4SSqcyslloCqINq+ZF95rnP5Tz7eowkrsWP?= =?us-ascii?Q?2jJs0YeJEePgX4NBPk75+V9W1hobE7c422BumG3pQTzDrUqB2j0OitVILIv4?= =?us-ascii?Q?lHk9CREIJqfoVz3YO3G1BGWSkAAQtG5sx6dgd+ymas9tCNegHsE+L5Yci2sg?= =?us-ascii?Q?hU2ZSRpy4i6icfd0/2tS+P5jawb5aeQAYJ7+qU9mN5zNznocHgtyIBrf9xEc?= =?us-ascii?Q?vwDO/ncSXrRIE6J+u9OZSDkHN7cptkHBx3JEJ7d0MtjuVQSvjFYO2dXe4vzf?= =?us-ascii?Q?uoAq0F5swrarGmktfEGwlvFmGlhC?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50b95206-4196-4219-8198-08d992338a8c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:33:51.6476 (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: XReS1x2srHWOBwP8f2f5uym4LWXRYKhgsDckkXSETa/2/S4uzA1siEof8TVOu7x5vELpQNfrqOKnvubRaN4dZg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2825 Content-Type: text/plain; charset="utf-8" This patch added the fallback check in subflow_check_data_avail(). Only do the fallback when the msk isn't fallen back yet. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang --- net/mptcp/subflow.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 92b45a7c997e..87a9ffebcc42 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1164,35 +1164,38 @@ static bool subflow_check_data_avail(struct sock *s= sk) return false; =20 fallback: - /* RFC 8684 section 3.7. */ - if (subflow->send_mp_fail) { - if (mptcp_has_another_subflow(ssk)) { + if (!__mptcp_check_fallback(msk)) { + /* RFC 8684 section 3.7. */ + if (subflow->send_mp_fail) { + if (mptcp_has_another_subflow(ssk)) { + ssk->sk_err =3D EBADMSG; + tcp_set_state(ssk, TCP_CLOSE); + subflow->reset_transient =3D 0; + subflow->reset_reason =3D MPTCP_RST_EMIDDLEBOX; + tcp_send_active_reset(ssk, GFP_ATOMIC); + while ((skb =3D skb_peek(&ssk->sk_receive_queue))) + sk_eat_skb(ssk, skb); + } + WRITE_ONCE(subflow->data_avail, 0); + return true; + } + + if (subflow->mp_join || subflow->fully_established) { + /* fatal protocol error, close the socket. + * subflow_error_report() will introduce the appropriate barriers + */ ssk->sk_err =3D EBADMSG; tcp_set_state(ssk, TCP_CLOSE); subflow->reset_transient =3D 0; - subflow->reset_reason =3D MPTCP_RST_EMIDDLEBOX; + subflow->reset_reason =3D MPTCP_RST_EMPTCP; tcp_send_active_reset(ssk, GFP_ATOMIC); - while ((skb =3D skb_peek(&ssk->sk_receive_queue))) - sk_eat_skb(ssk, skb); + WRITE_ONCE(subflow->data_avail, 0); + return false; } - WRITE_ONCE(subflow->data_avail, 0); - return true; - } =20 - if (subflow->mp_join || subflow->fully_established) { - /* fatal protocol error, close the socket. - * subflow_error_report() will introduce the appropriate barriers - */ - ssk->sk_err =3D EBADMSG; - tcp_set_state(ssk, TCP_CLOSE); - subflow->reset_transient =3D 0; - subflow->reset_reason =3D MPTCP_RST_EMPTCP; - tcp_send_active_reset(ssk, GFP_ATOMIC); - WRITE_ONCE(subflow->data_avail, 0); - return false; + __mptcp_do_fallback(msk); } =20 - __mptcp_do_fallback(msk); skb =3D skb_peek(&ssk->sk_receive_queue); subflow->map_valid =3D 1; subflow->map_seq =3D READ_ONCE(msk->ack_seq); --=20 2.31.1 From nobody Fri Apr 19 23:02:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:7824:0:0:0:0:0 with SMTP id p36csp3441874jac; Mon, 18 Oct 2021 05:34:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPrZyQJOKqWNHhaDpzUY/vBhM1NKaLbrkvx/zINHTo3CaS3PyVH7nEAK3OFnqqn27gfBkr X-Received: by 2002:a05:6102:1d:: with SMTP id j29mr26883917vsp.20.1634560450495; Mon, 18 Oct 2021 05:34:10 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id q17si7656944vsn.146.2021.10.18.05.34.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 05:34:10 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2192-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=ILKK8Jxj; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2192-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2192-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 73D1C1C0FC1 for ; Mon, 18 Oct 2021 12:34:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 234E42C89; Mon, 18 Oct 2021 12:34:07 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B29772 for ; Mon, 18 Oct 2021 12:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634560444; 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=im8w8W+SH7qLj+Ph2mfvZy1ttAD0d0/zR4v9/RAXsfg=; b=ILKK8Jxj51F6vAirvQOki9qoYz6ZscEcPe8Ry6gH0P2kNeAwt18AjCT/qqkZvtFUtmBSBq TmaKmZGzn9a4yxtEDgb/p5IkVh4PkzVW1BrmJymf1LX3B8vhhUmUjEkqBoDZfuNJlHLfsK blRsI9cgM4lqJnz8aCne0EaVOAsgGmw= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2052.outbound.protection.outlook.com [104.47.13.52]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-21-1ImoqHgiN1qC3NRPDL6Dag-1; Mon, 18 Oct 2021 14:34:03 +0200 X-MC-Unique: 1ImoqHgiN1qC3NRPDL6Dag-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iOEnsFwC7L0E3IWVwzi8l5Cm04vuPTEZIuYHyCacUebr+fPyBRhot4RRG5i+/nuxEarTkbDcqQuizYDQxOhKknz9LHesM80zODuy5YJ2qEkuVsAuLgqDysw6A5Od/5/iwZNL/jNz8blyEtfArKJk5++mL/Sa6ZVKpewnmP2KGgNegOEtVSXymJ8oMDOHupMgh/gBSdyrHY8xh9/G9o7kfSicYBKFJv/tDORmwk0+ptaHA8xvmwrYLaxYuoGXdIK3VLCeqjNmc+qx5lNepRtORi+6svSEuxj2OznSMZ5xkU6hFSnV03GbXSAnBRzWs/P7Z/r2k4BXUrwKDlu/c0rGTA== 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=Poo/EYfKS1DbgYOf8ms9An6X7wCs4aUgFThfNenKSxg=; b=WBkueXdVZoy1+5l2a8ctqJJDYNFnRbP3QASZ2Um9mluZX7H81ZVuoBMGNSMEQplbLcmlS4rBj8Lc5L2yuBX6oNktyeLZJajx2agGr99pdw7d7StaKbvQUVxiPLwlw0Bn7m8F96+aigtYl+kBjxvkbKt6Sp9tfBPK3sFMvzvOQczeb2dyvXeJDIMyJNcY68NeQ3yV6ra9qhbLIahTpSUTYZy+GtgKScZIXB+F72K6KOKeBIhJ1vKQ0218LJ5OdbXa7IjaCDzAisYP5bNNevzzQu7NmazAvDJ9AoRpdT8/Isi2LwET7oM20B4N8xNSljiD10XaCyuA9ANnh13B7v9A7g== 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: lists.linux.dev; dkim=none (message not signed) header.d=none;lists.linux.dev; dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by HE1PR0402MB2825.eurprd04.prod.outlook.com (2603:10a6:3:d4::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Mon, 18 Oct 2021 12:34:00 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af%6]) with mapi id 15.20.4608.018; Mon, 18 Oct 2021 12:34:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v7 3/8] mptcp: track and update contiguous data status Date: Mon, 18 Oct 2021 12:33:10 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR01CA0069.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::33) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Received: from localhost (2408:8207:2546:b4d0:1867:9999:db2f:de88) by HK0PR01CA0069.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17 via Frontend Transport; Mon, 18 Oct 2021 12:33:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f6503f0d-f0a9-4b04-46ee-08d992338f8c X-MS-TrafficTypeDiagnostic: HE1PR0402MB2825: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MoOXQfWPxWH8sJhYUor6Ae6fmfKf879RKd0HH6pZYIMtWC5Rhv7Ikmq55NedYs179cvJIvlJubdR2jHqg/GGQBCKuZuFL/NhzqPAA+TJo0zpNhz7Cb9qjiTTQ+EKVDSL5heixeGA0tKiN5YCehfn7S2YDeviuHN6tvQXHHbPBIA84N1nP3acN199mexM4YQvDM8D/xrz85sQ7wTlof4EsGWYv+39UA/6MvUs0UbK+t+zMDUXvFwD8cT5HtLQlxmnoBuYTCRT/QPDqRRt+PL5eydiZHo85ck0GOvuT0wG4v9txAcoc7OpaJCNCIIvCni6fVvlFEU5QIjSdV5RYLk3/sxTOo8YETPJtzHjecDuaqYIwhBefr31LVDo8HdsZ6j0fQQf5VvY85lWEu3wh9wXpnHTwImlB2W2/hMgKCxBllYLN+Mfb6tdDP+eLkjJV6RKHCIBhKMOZyTZl1wNoEP1KlHVzMTzrBYxgt9s6u4o6xoNfsCneVueFR2B9+mu3YvlnOl4l+6OisXEis6iRYLKe7lzeRqHPW4OXtp9b34UIxv79TWCAncs6+GGqDNZNR3uB76M2QGDnSTeAoVo31IbyfrPq12LtQgkm1nia/VOWrPMqoKomN3JjkqIGox3aWzPvb0nq6sfFQqLHDjY3o7P5A== 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:(366004)(66946007)(36756003)(2906002)(6496006)(66556008)(38100700002)(8676002)(83380400001)(66476007)(2616005)(54906003)(44832011)(316002)(5660300002)(186003)(6666004)(86362001)(8936002)(6916009)(508600001)(6486002)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d5dffakb/S+sDHw/dwenEqXIZP9Zrebk64xu2lsybGOynw7oB2Go71S8aXDP?= =?us-ascii?Q?z3Z+zfU+h3ic84MQcISDr0qfyYr5/x4mZo1GgZVt87GocPWWOhSzPQS6gSDu?= =?us-ascii?Q?/0szEnCwhPVHhw5KUetqmj8wYfMiJnL9HLnFFubQEzowc21uOjX3cEdiFF2r?= =?us-ascii?Q?eFZNmsiu/FR11+lBlHfEx7KBoPwbvlEPkNgv6P+CoFJWPq8zi3OMaGmaRLiL?= =?us-ascii?Q?L6lEHes669KdmhYr+j1RgeqBMB5JDei89wk2uBBtVVNe3CdaGAOUd0bnVf4m?= =?us-ascii?Q?+qUPRU6wUuJKtTekP2WdlBLusmBP6eJ6Wcu3hcKp31WBcreAn2f0nmp8Wggu?= =?us-ascii?Q?7wF/nYIoIoSyUZEqu//IbY06Q5MAEGiArlik1pVGDEFnq8YckSdISpfY2EBf?= =?us-ascii?Q?2mijyf4uizCagGFhvoOMnvRaGexV0hQvqfTRiWioqBjoSUFRoVIbVBIEAZMX?= =?us-ascii?Q?RKZFgTqpO5PIXejgfvjkS0U3S8WqPZnZNfqWC8Yv5yIT1bWj+1JdrwJPeCW0?= =?us-ascii?Q?boFLsEykMBfHMj79BJVmUqca1HZKTqlxyGWXUJLJun5q+I8w8h1Kqrnku49F?= =?us-ascii?Q?5agqRRz0PAhsp8BC+564ptqQdGDKSAWzyz3Y3JZ6KbTAeFZXFdHSwpaSoVwZ?= =?us-ascii?Q?nAkudzxmlmP86MdVIrYIh3qE5rAuBdRs2oPxJ74SrxJhjSDFgGGAHg/gWiU2?= =?us-ascii?Q?EvmeqXB3OzG4x4YCiKK9zIQnEPD+N2A8Fi0dm54aKJ+uJLDUOHnh9kOmJ1SV?= =?us-ascii?Q?meNYJia8LjPxeQhquEQDKXoxU8Gx6PbeT4N6Yzso82EsiESy/hL1k6QnoDHX?= =?us-ascii?Q?jcN/jR+8qQecSK2rkfvDIouynCaxMlxmdhDJzmtSQHTbqbv+kj4lSKBRzaod?= =?us-ascii?Q?ob1/gjRuZwCoWwRMt0tzkLSAUrfTyI9eUwwMrzI+ZilTFM/ZCqF77ep6c0ph?= =?us-ascii?Q?5iVeTq+gDzz+/eSOYosFoGmAMWnnbPtug+FhxZDs6OHjH/KYRWBCELFhkCII?= =?us-ascii?Q?nyXCx8DatCq2sxpfTtOm6HAqJM0XsGIH+IWEBopsrxsX3BlzRIkiGw0XOLO+?= =?us-ascii?Q?mnjLP5xHSyhlxreeG5oGpTxXO6LHjxYD+Xzt3Q7upRZpqoi8l9/4F4R27COd?= =?us-ascii?Q?oJ3JKC+Pc5mkLVeDMebmc+uenl6SduDR7w9Qaz1hBVbS/K/NkEc+8djfmHEU?= =?us-ascii?Q?l2OHbAEdF74Db4T9lZPdt3W9N5FoM7mD1Ex0R4mTxFD5neDbAV7UMSqiD94Q?= =?us-ascii?Q?sE2cPseF53pe/oo2BKs7T9wWbx+VGJtbIKx8jDoA3crYH56/Wa2Ort7Zju3F?= =?us-ascii?Q?gpPIqRJSU1lQQqMMiCLHZm5lhSeg7zQKrO5r24k86y8tHNAS/XSXXGoxpUsV?= =?us-ascii?Q?+cSuEI0LTW+nu35VIYwr1MFPZpBg?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6503f0d-f0a9-4b04-46ee-08d992338f8c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:34:00.0087 (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: 25ew0MFgGRoABUXmX7AFzYi2O5ZMzv2cHxr2QKePTod/Bo/Nn1ganXwswm9SXiFhmfWiA48tgXgt/1ZquGDZIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2825 Content-Type: text/plain; charset="utf-8" This patch added a new member allow_infinite_fallback in mptcp_sock, which gets initialized to 'true' when the connection begins and is set to 'false' on any retransmit or successful MP_JOIN. Only do infinite mapping fallback if there is a single subflow AND there have been no retransmissions AND there have never been any MP_JOINs. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 3 +++ net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 7803b0dbb1be..f3163647c501 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2387,6 +2387,7 @@ static void __mptcp_retrans(struct sock *sk) dfrag->already_sent =3D max(dfrag->already_sent, info.sent); tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, info.size_goal); + WRITE_ONCE(msk->allow_infinite_fallback, false); } =20 release_sock(ssk); @@ -2465,6 +2466,7 @@ static int __mptcp_init_sock(struct sock *sk) msk->first =3D NULL; inet_csk(sk)->icsk_sync_mss =3D mptcp_sync_mss; WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk))); + WRITE_ONCE(msk->allow_infinite_fallback, true); msk->recovery =3D false; =20 mptcp_pm_data_init(msk); @@ -3133,6 +3135,7 @@ bool mptcp_finish_join(struct sock *ssk) if (parent_sock && !ssk->sk_socket) mptcp_sock_graft(ssk, parent_sock); subflow->map_seq =3D READ_ONCE(msk->ack_seq); + WRITE_ONCE(msk->allow_infinite_fallback, false); out: mptcp_event(MPTCP_EVENT_SUB_ESTABLISHED, msk, ssk, GFP_ATOMIC); return true; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 67a61ac48b20..4b9fe56bd572 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -249,6 +249,7 @@ struct mptcp_sock { bool rcv_fastclose; bool use_64bit_ack; /* Set when we received a 64-bit DSN */ bool csum_enabled; + bool allow_infinite_fallback; spinlock_t join_list_lock; struct work_struct work; struct sk_buff *ooo_last_skb; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 87a9ffebcc42..93bc298bd41d 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1167,7 +1167,8 @@ static bool subflow_check_data_avail(struct sock *ssk) if (!__mptcp_check_fallback(msk)) { /* RFC 8684 section 3.7. */ if (subflow->send_mp_fail) { - if (mptcp_has_another_subflow(ssk)) { + if (mptcp_has_another_subflow(ssk) || + !READ_ONCE(msk->allow_infinite_fallback)) { ssk->sk_err =3D EBADMSG; tcp_set_state(ssk, TCP_CLOSE); subflow->reset_transient =3D 0; @@ -1452,6 +1453,7 @@ int __mptcp_subflow_connect(struct sock *sk, const st= ruct mptcp_addr_info *loc, /* discard the subflow socket */ mptcp_sock_graft(ssk, sk->sk_socket); iput(SOCK_INODE(sf)); + WRITE_ONCE(msk->allow_infinite_fallback, false); return err; =20 failed_unlink: --=20 2.31.1 From nobody Fri Apr 19 23:02:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:7824:0:0:0:0:0 with SMTP id p36csp3441955jac; Mon, 18 Oct 2021 05:34:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTM8fdhI+P6D8wzSRGD1i4hLAEO3/GwSCNebA/cZJnS9LeAguv4ckvukopicuy0kTzVLdK X-Received: by 2002:a05:6638:2690:: with SMTP id o16mr17973276jat.96.1634560457517; Mon, 18 Oct 2021 05:34:17 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id s5si21299478ilu.90.2021.10.18.05.34.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 05:34:17 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2193-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=ZVOkdsmg; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2193-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2193-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 BCAB41C0FC5 for ; Mon, 18 Oct 2021 12:34:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 852BB2C89; Mon, 18 Oct 2021 12:34:14 +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 3FD2272 for ; Mon, 18 Oct 2021 12:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634560451; 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=geFu4KXYGHyMODhkl/ULu+RyXiw5j0EI88/Lu179FZQ=; b=ZVOkdsmg89BPCIMpRGVhSyWEsN3BnANa/2/MUXRoWYiFT+RyTnIlbPVzzplbFloU5eOVsg 6oqkBcqczKP/HBIsZOLrxUgw5bZLGVP1aAlpCuLPPUtcI9Te0fBibgKG37ddGoOfJyktyN ZwM2saqBITHRQB2uY9u2bL7lbU/HHiI= Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2055.outbound.protection.outlook.com [104.47.1.55]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-1-7dXhw1XUNiGTdvitWVhd3g-1; Mon, 18 Oct 2021 14:34:10 +0200 X-MC-Unique: 7dXhw1XUNiGTdvitWVhd3g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iUNXi/i6xxjTrHw2cfh7Jd9dXBGJDkcmtqwIZAuGYZ5EMMAwR6RGKrZX97ODkDrwAOaG4S9dEAwi0B34EyKNwNIZvqHll/tjwnz3c2s4KTb2nLVvdF/IYqZSriwDDNEtrKFtPcheALjz3GAr7x+dNuBqvfPeGMHCMrvAgFiygPVlWCWwqLO5lPMbQBIqmP4L0VA0nyY6Ep5UmTSmbW7I9Et34DspcynEwYIkV+WF3r1RE1QK54KA22VJOFNKYyc2htkc5QISQECSW9Pj6CGVJJ3f1Tljei4HUgbWOhpv5ofdc9LBTrYn5LMwJ7eekZJBiicNDSmvDyyDqGWpJEQHoQ== 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=MacGNwJD8EAQQ9iNDQpbU8cEnzuW8bT+d4vwHRrK/p0=; b=lGdXCO3QI8Nn48/jqOq2BNhzMnzFKlFppZbi05Td3/Yeun3DXqB94d8Ueoo9kGhEmr0NSEX5FgL7xO92Fv1SubIGfyxqHHwUsAuTU55aZN48b1nUZeYdUBBewhXXehUQV+GojVyFDmXjlrNTzDYW/ePhQJBoZl2qIEZvTI9e/P6YDH0rs1gdC0MrvNziT3DmbjEQSrS6uK3Fw4Lq8qCQPzTlIv3UgjKTX7LTWJN5Ar0vwHNVbyC7r0mYYvIubwWioj3PO1JZ6Ft4c/OrhVNmdrJBNfBBMZRGWusM9hrpLJg3Qxl7kKzXAGZcWTLzJqv+I4ooacP3i0bf9Wx5JNM8/Q== 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: lists.linux.dev; dkim=none (message not signed) header.d=none;lists.linux.dev; dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by HE1PR0402MB3340.eurprd04.prod.outlook.com (2603:10a6:7:81::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25; Mon, 18 Oct 2021 12:34:08 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af%6]) with mapi id 15.20.4608.018; Mon, 18 Oct 2021 12:34:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v7 4/8] mptcp: infinite mapping sending Date: Mon, 18 Oct 2021 12:33:11 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR01CA0068.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::32) 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 Received: from localhost (2408:8207:2546:b4d0:1867:9999:db2f:de88) by HK0PR01CA0068.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17 via Frontend Transport; Mon, 18 Oct 2021 12:34:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c65328c-1ad6-44b4-b180-08d99233944b X-MS-TrafficTypeDiagnostic: HE1PR0402MB3340: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xKj75a/79PtHOPKG9Yqyygxo+AaK0uKAYLOdrWzkNGyY7fDMksbV2vjapx/LKYx1oNjcYe3P7PXCg4Biy+W4xzKlAdiBkT2GWaVS2KNkWZzzadsaIdqxyjaq4mjJ49GY0hdLbmOLUkN0uX+Q44n7vHIk6+Hizk771z2E0cLlZ1dIEWs39AHW1unutGndVLkstDHskvs0FudHdCSoZZlZsuGWBG2+mB8seCu/RQQsUN7D0C2tUok9dfbfyjIPiWEe6VX7lcizQVxgrBPG4g0HLt2it+uShIEnJVZi2MQEjkqlDnmS/ebkC7yWtcbI3mdG5Rq/JU36cOHNwG+neC7xZNcA1nNW9F+QDNHjZhnqWBV+j2vT9BdEhPAfCw9RM2Dc/r7TTViBdLjiocRd0v40k1P5RyUQ9xn2u0UZb502uknG1Gs6qwjAXKA4l2sKCjMBPByOovx0NlcJxPqevSFDnZS5m1nTSfh/7pLekx5h9kkNIRY64J6oq8M6kXSzHpJ5e4IHgn1BA98TLn4dv2AdyrYwA8YSy5IfQeHLL1oo+4J5pIu9GkBOCT7TLhnv16rNfU6i3PzNNxh0KXf5qf6Lw50NdTHNgNRKl0MhZHmeI9s8E2ZwPkdSfQAWLYPbUy98yUT7K/il+Tw3qVM4IeuPKA== 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:(366004)(6496006)(66556008)(66476007)(86362001)(2616005)(2906002)(5660300002)(38100700002)(8676002)(44832011)(8936002)(316002)(66946007)(6486002)(6666004)(36756003)(83380400001)(508600001)(6916009)(186003)(4326008)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZucIBN8eptZm6qt/+004VxUqcr1C5FdpqYWn8ghUasfdBmdHyGry4K1ho9JQ?= =?us-ascii?Q?eLuv97v7naO2nxSeC/8/Ndm1BpA9z+/CxiDH8ayFbDZgU+FbeClx0o937c5S?= =?us-ascii?Q?Ye7U80Bl49kPUNIo3VlJE9xBahT29fm4me4mpZaLPLA80Ripk6ZlF364aMUx?= =?us-ascii?Q?S9rc2f2p0rAsiUNwxaDMXFM53SfSLbYoDuGn58N7WM3Yb3kWHK2yB7jguOvZ?= =?us-ascii?Q?YZuueQUhNQfdstILpwkcvinK3nEZMMrckwt00cZCFD/h0w28Hv9u5/guRzcz?= =?us-ascii?Q?S9lchBVqzYJoXmD2ag0tj21zGj9zkGk/GdxLLEv6AQZ6RKFT5ktLQuX190ht?= =?us-ascii?Q?olUVU+ll550uNMyivp7bMIFz6+7RMYcPLBsOzwZU3306fMaor8OSv1GvJSUw?= =?us-ascii?Q?3ity4WEQIribx2UuE0/AN24vqxzOru9X4331NYMXEumyiudT163D6ULhf1yi?= =?us-ascii?Q?e98i8tKVe22K49sjS1Qcwi/z8c87YlVlf1/+h7TAFkaWKbo0T/knhgnTMnyY?= =?us-ascii?Q?BcxHyureIWhcJrj0rb5iLGBpr00tCkUn23XuAS7jStzrjkb6GNuKwiYzqOVU?= =?us-ascii?Q?c6IZY6EiKGlN/Uqog9FwUbc3m6ORRm9eGm9BtLnmBOc01ofZ9ADclKNcZVQE?= =?us-ascii?Q?Whxmd7030lwa7LrBQPGQLZDdinoMhsmN0GK+Ts3sFWnOxOnYCYTA4fGQqz2q?= =?us-ascii?Q?2x6uJ3XaXskcyI9UTfBU4BpJ62bVNXTq0wzar/3pND3a1eoqMfjSj6hW2Bnm?= =?us-ascii?Q?qYASNh2xCQzcIEeNzWCCmoGj6R6zvRF8NnKTzm7H2WmUXnz4Q1bdMjBxrku3?= =?us-ascii?Q?RkSmY9hTFERLC2LbiCoDrVp9bmDL3JPIUVKGarlFIKcn75JOb1FdygZ5DQtR?= =?us-ascii?Q?FaMsiQd7iCHB08xqUosPa3kG3AYGQ51erqpKuO9cIpYn2kU9Kbhm/h6UUNdv?= =?us-ascii?Q?V5y9ULYgumUzkZkZkY5psLushhLRn1A33mqXBZPnkPaxmaWeUsgPpiBSKgO9?= =?us-ascii?Q?NfIa7FM+w0lOqgQRJVGm+fSHhL5OrNUe6QmVTomHcDZ5BNiGWZ4qpK1E8LiO?= =?us-ascii?Q?Le0GJvzv12LhIkPqb3hl2WQu3hJiq884QRXqc6Zx4Ky+YiGKxJUJ2GxK7g8h?= =?us-ascii?Q?BWvQhd2Q3pBeEI0t/IFmApYMMbYZWdCuWBGuySY/kUsiSSFitq1KjGHUhyuk?= =?us-ascii?Q?3HzCx1y/3MeBNGXPTPz0i6bTQOHDua8ch3nVJ7zZmeUVrg0tApJw3ZIq0cl1?= =?us-ascii?Q?/O1yodC9ZZDvQ7sKTROBL7K582bcbPIb7zJhRR8uk6oPfWD6qtrrfK7ecrwi?= =?us-ascii?Q?eKLtpYbN3TZ3hZlISq7l4LzULCHwYqxk1/D36z2SDTdhDzIcyeie0WyL+ICK?= =?us-ascii?Q?ekntjkuw6afBodwFDTE3XMt9tTmZ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c65328c-1ad6-44b4-b180-08d99233944b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:34:07.9771 (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: ++Eg8A3JMbS7iflkn4vAkdlCeHS2UehwYx67yMM1qLsrLyM1ePMN6nJAezon24kwB3UbHlGnst4K/etnA8e+sA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3340 Content-Type: text/plain; charset="utf-8" This patch added the infinite mapping sending logic. Added a new flag send_infinite_map in struct mptcp_subflow_context. Set it true when a single contiguous subflow is in use and the allow_infinite_fallback flag is true in mptcp_pm_mp_fail_received(). In mptcp_sendmsg_frag(), if this flag is true, call the new function mptcp_update_infinite_map() to set the infinite mapping. Added a new flag infinite_map in struct mptcp_ext, set it true in mptcp_update_infinite_map(), and check this flag in a new helper mptcp_check_infinite_map(). In mptcp_update_infinite_map(), set data_len and csum to 0, and clear the send_infinite_map flag, then do fallback. In mptcp_established_options(), use the helper mptcp_check_infinite_map() to let the infinite mapping DSS can be sent out in the fallback mode. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang --- include/net/mptcp.h | 3 ++- net/mptcp/options.c | 2 +- net/mptcp/pm.c | 6 ++++++ net/mptcp/protocol.c | 18 ++++++++++++++++++ net/mptcp/protocol.h | 12 ++++++++++++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index f83fa48408b3..29e930540ea2 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -35,7 +35,8 @@ struct mptcp_ext { frozen:1, reset_transient:1; u8 reset_reason:4, - csum_reqd:1; + csum_reqd:1, + infinite_map:1; }; =20 #define MPTCP_RM_IDS_MAX 8 diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 422f4acfb3e6..f4591421ed22 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -816,7 +816,7 @@ bool mptcp_established_options(struct sock *sk, struct = sk_buff *skb, =20 opts->suboptions =3D 0; =20 - if (unlikely(__mptcp_check_fallback(msk))) + if (unlikely(__mptcp_check_fallback(msk) && !mptcp_check_infinite_map(skb= ))) return false; =20 if (unlikely(skb && TCP_SKB_CB(skb)->tcp_flags & TCPHDR_RST)) { diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 6ab386ff3294..86b38a830b4c 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -251,7 +251,13 @@ void mptcp_pm_mp_prio_received(struct sock *sk, u8 bku= p) =20 void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq) { + struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); + struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); + pr_debug("fail_seq=3D%llu", fail_seq); + + if (!mptcp_has_another_subflow(sk) && READ_ONCE(msk->allow_infinite_fallb= ack)) + subflow->send_infinite_map =3D 1; } =20 /* path manager helpers */ diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index f3163647c501..70f2e0e212fa 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1226,6 +1226,22 @@ static void mptcp_update_data_checksum(struct sk_buf= f *skb, int added) mpext->csum =3D csum_fold(csum_block_add(csum, skb_checksum(skb, offset, = added, 0), offset)); } =20 +static void mptcp_update_infinite_map(struct mptcp_sock *msk, + struct sock *ssk, + struct mptcp_ext *mpext) +{ + if (!mpext) + return; + + mpext->infinite_map =3D 1; + mpext->data_len =3D 0; + mpext->csum =3D 0; + + mptcp_subflow_ctx(ssk)->send_infinite_map =3D 0; + pr_fallback(msk); + __mptcp_do_fallback(msk); +} + static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, struct mptcp_data_frag *dfrag, struct mptcp_sendmsg_info *info) @@ -1358,6 +1374,8 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct= sock *ssk, out: if (READ_ONCE(msk->csum_enabled)) mptcp_update_data_checksum(skb, copy); + if (mptcp_subflow_ctx(ssk)->send_infinite_map) + mptcp_update_infinite_map(msk, ssk, mpext); mptcp_subflow_ctx(ssk)->rel_write_seq +=3D copy; return copy; } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 4b9fe56bd572..906c65fca04f 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -419,6 +419,7 @@ struct mptcp_subflow_context { backup : 1, send_mp_prio : 1, send_mp_fail : 1, + send_infinite_map : 1, rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1, /* ctx can be free at ulp release time */ @@ -852,6 +853,17 @@ static inline void mptcp_do_fallback(struct sock *sk) =20 #define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=3D%p)", __func__,= a) =20 +static inline bool mptcp_check_infinite_map(struct sk_buff *skb) +{ + struct mptcp_ext *mpext; + + mpext =3D skb ? mptcp_get_ext(skb) : NULL; + if (mpext && mpext->infinite_map) + return true; + + return false; +} + static inline bool subflow_simultaneous_connect(struct sock *sk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); --=20 2.31.1 From nobody Fri Apr 19 23:02:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:7824:0:0:0:0:0 with SMTP id p36csp3442012jac; Mon, 18 Oct 2021 05:34:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjs5fwXbehQJYri0dEk5n81VtIyynBDAeg4+/JeiW8/c89iExWime2oFA8bX4aF7Ycj18+ X-Received: by 2002:a5e:c64c:: with SMTP id s12mr10387797ioo.159.1634560463555; Mon, 18 Oct 2021 05:34:23 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id c16si15039923iot.81.2021.10.18.05.34.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 05:34:23 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2194-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=frKp0dO0; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2194-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2194-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 B9E763E11B8 for ; Mon, 18 Oct 2021 12:34:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D79712C89; Mon, 18 Oct 2021 12:34:21 +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 AAB6372 for ; Mon, 18 Oct 2021 12:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634560459; 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=imvXdQgRfu2RFbAGJt7i7MT1Est6nVyT1Pinw6QtTsM=; b=frKp0dO0bGsEefIxMDbGo3dJyypggrDPLZfMqM9QLuW9Edqgky4RtpDSn80bqPf0K8VVh9 +27CDgkY+pstcT0U9ZbuCLJZnIq2N4LrQwY2NbEp+FBGSpaSX9NnlXd4iot93FVL9y/9GQ W5wZaumirb5m+xdDEqOIcbIBcikZEFE= Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2051.outbound.protection.outlook.com [104.47.1.51]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-28-ApHa0v7oPbqaKVI17jvDCQ-1; Mon, 18 Oct 2021 14:34:18 +0200 X-MC-Unique: ApHa0v7oPbqaKVI17jvDCQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z+ewb6BEf52MajSiJi8BKlHKjj8fm9x/xwSijGMG45V0CmZxbVVb82De27j/7BNJ8LkN/+DM0Ph0pOSjAWwmCllC4oPey2y89crNOA+0viNxyHrT3rlYmTE8+50P24eCX9UMAiJFKgIy9d4Zuxs18Sk8M2sYJZhnWf/aqNRX8XY/2QH0hzn5iBFug3Nw247MlmtZgKH6o2YVcjhDikG6G0ZgPxbyDTkdtyQLjAEXmcIvMWgotm2hPo6ZxHQ4AQUS8hWdUV1D1lQKHaXBHnbDeIavDI10eaYW/RAjHGf7rN7nSpiVcQYYs+TM/9wxUn7DXF2M5rgAzfrtHA9WGFGNSg== 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=pXlXkNJGO1+FFceiRdC4ucAdYHY8r42TO1WcxNlpKpo=; b=Hj+oRxKptPy2XTQIGcKxcKyIANExDVNWR+n8J/AGdwZ9UHV+7esYCWQ0BJjsHAHRmaQFpjV0xziJCBvEQh6B/0feSKzIEFL6ldV9G1Kin99bmzjhA+R8EHCF2MfFi4J1FL9stuI1nWJauFiql5JLs/b1AIQGQqNhSSKy7dhLUAUpOwuimTeT6t8KYZWaF4xEc/cPYOhI3G5YGAGXXXeJvtruCvVJifEXGZ3kUH4z0Xm8JnCokbHRf4xFrnaubyCSRbe+H44bNHH6u1F57mxmn7W2UBbbNaX4QyYcSfneazsgS6CQm7ZY7ab2K67G0ZrtFAiOj0yd+Hc/iXOBSsKz6A== 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: lists.linux.dev; dkim=none (message not signed) header.d=none;lists.linux.dev; dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by HE1PR0402MB3340.eurprd04.prod.outlook.com (2603:10a6:7:81::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25; Mon, 18 Oct 2021 12:34:16 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af%6]) with mapi id 15.20.4608.018; Mon, 18 Oct 2021 12:34:16 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v7 5/8] mptcp: infinite mapping receiving Date: Mon, 18 Oct 2021 12:33:12 +0800 Message-ID: <2df688ef0e37a820923936f23c86f93f6f1a2d4b.1634531093.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR03CA0006.apcprd03.prod.outlook.com (2603:1096:203:c8::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 Received: from localhost (2408:8207:2546:b4d0:1867:9999:db2f:de88) by HKAPR03CA0006.apcprd03.prod.outlook.com (2603:1096:203:c8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.10 via Frontend Transport; Mon, 18 Oct 2021 12:34:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: beae4729-db7e-4620-1ded-08d99233993f X-MS-TrafficTypeDiagnostic: HE1PR0402MB3340: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1728; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PALTOreK5PbZvD63fHc2wMWHWvoVDihOYBTqEKmxOp43EX45w/oLRAswEkJxykmmuUiapjjuVmVK1NLtHe4PKK7db99pu3CJT5vX1wRjkDzszeFvA0z9cLRS17pbkeUSbuA2FaQc3XsvcMWglh6thSJxJyNI3K75PHt9CKG/GvG8M8rEsnmr9PAvxDFSPK7OmLjwNUI7Ox/Y3wOxBfOXS6D/NhFpZBWR+aI4yn7CMvi6yxxvHLMsXiqXvD73Q9nRoTujA4YTVIERIhHS9aU+3TIkT3mvk3WeZK0kP0vTfIPINbAGlnMkx0/S9+xjFIb9sCIf+RP0OhmSGhwuVX63u5rCa9iR+0HjvWPbaZFW8gyqpT7/WGoPrfo/bi6lWbLfwFaOpgaUc1K47yMBicBc03bqrHLHQfgrhDHsvUJPAVosJOxpZ5QmnOwdDvm3Yui8xOEHu5M5f6t0Yd5JhfYnvTYmLWb61CVYVV4FAk+IDyhKC4VrkJir7D1d+QQFb79Si3hmrQAAXhsuzj/u/M9+1aZXZ95ky/ty7NTXWXTyk5Y4EuNVE2+tKGKBfaFux3pUniWWTI15FT86kyNQnEMeZ/cd7VojhicgBbBjDSmiLI2gBEYNRU9qy6rct3qDJP1XT1Ke4kSitsbYOItJ8zC08g== 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:(366004)(6496006)(66556008)(66476007)(86362001)(2616005)(2906002)(5660300002)(38100700002)(8676002)(44832011)(8936002)(316002)(66946007)(6486002)(6666004)(36756003)(83380400001)(508600001)(6916009)(186003)(4326008)(54906003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HATXfAlU6NQSZLYRW8t8ZlgmQBb+j+xkIJ5FdVtK+mXPeyfQl3Jw6I45IiD6?= =?us-ascii?Q?jQPwXGmVxpFe7rfNTcj8Vczi+ai+fDTqNwm06Vc154aAoiIXWvIz6NKo48sf?= =?us-ascii?Q?smCV91UYz/KYH5AOuuLYNCY4bYUBU4JCmyiNlrF+Oe6k7ZfmX+S1u6mO4gAT?= =?us-ascii?Q?hZAF0UVLAGDdMHm4XgqBJxfClY5jmuva8xyETue6TCdqSRe/xl0HQowg3MUP?= =?us-ascii?Q?tro6xQkVAWGEQGFG+QEeQo0P6pqqx7R8AQ67ZrB84eDT5W2tAttP8a2/GyEV?= =?us-ascii?Q?Mpdrrb8+Er48fQrt8xHv6v5ElSSKmRm0X0Kfwm4tXJrRaAh76O0bLjxiCEvr?= =?us-ascii?Q?BoD6c2wp04GpZapvE+oyPR0ST13HOW82115sdyj3nO2KjxwCKWciKyeatqYv?= =?us-ascii?Q?1Q1DVNZ6xfo5A7hEcNskLyd4JbSmHHOoQJKK7Esd0LkLUXK3sz7ejqHu8hz+?= =?us-ascii?Q?Hak0xYMu4wSTKPy5cGVS74gk0mOkSt8Rf7L20donFDjReema0TjWLl5UHf1y?= =?us-ascii?Q?nU8/uYsr2WrQ7N1Q+ysDJptShulE/8SSE9sauFXmn2smz0QlPjDWEXa8p0mW?= =?us-ascii?Q?TAD35DCN2q1ep3K96NGKfYQ8E0nJiqFRcSlrF0CZEYfTnBl8G8CHXlUsH0V4?= =?us-ascii?Q?sv57TOi/ct9OS71pwKQ0y9es2mpqpk6Vs0wifmUrLjLNEhoVSD6DKxAVyO/m?= =?us-ascii?Q?TEgQru9+jiPOlm+qdmS0mvX0l5oiGcKYUds3y12+p5Up9qNRCF/vHZhRrYkB?= =?us-ascii?Q?oA3PBCvh8AMjA/CWv3CXgyQVFC1HvoIwSMq8pS/og3IY7KUJb8ZguQWXR7Cc?= =?us-ascii?Q?OykYb/0iyZBbFVonYnbkKT3qX852JsEtUfBr+u537uOE7WkaYPddrTbvpf8p?= =?us-ascii?Q?Mnfbm0ZoXwuWRQnaDEHbmi3F8P3HhHkn2346wBicBLqKDpugbe/rK4aaO7PN?= =?us-ascii?Q?5IsXkJFyW9zrX00jVpoiWLRKb9npNELpTYWbvLZKrZA5tzteoXfgBuyR55C9?= =?us-ascii?Q?9a/mZHdEEy5bsSBFluPYnbTXsSp419cpQGteEP9+vwXONUe6F2koQ/UZN2oo?= =?us-ascii?Q?InNomxWLeIqIWzaLMbB/UHKwib2Uv1OC7hFCsPCzPt6VjVJorxUNPp5sDG1v?= =?us-ascii?Q?2gVU9zAvkfkSd+etlMu9hsa3upLPpc6pvEfxxd0VYmMVYwTn2L3pULIpzoou?= =?us-ascii?Q?0bjUq9NVWZWpK0N9luWmAmwQFhPq9CHR12HzXPGegXKC2yDlxtGhmEoGE4BC?= =?us-ascii?Q?tzUsLgtYoiSciH17Tpr8oa0IWLdCskAI1gS/RHwRw3Twz6MeA86YxtOqzds7?= =?us-ascii?Q?4c7d7x1eQ+vc4qeWzhOkiXet3t+6q1+S+WzlyAzXy+R1Ejjv76pMTpDBJ1Bz?= =?us-ascii?Q?Hgy54CWoFK3Ke9Huuh2W8mHcPkUc?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: beae4729-db7e-4620-1ded-08d99233993f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:34:16.3112 (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: sfPSXYL1YtHFD2owL9rvBKXfp/BhJokI/KsW0cQdcLbrMJsVxBbZRnLvGUZHPbPrZag0NqwqQADkn+5UjM97og== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3340 Content-Type: text/plain; charset="utf-8" This patch added the infinite mapping receiving logic. When the infinite mapping is received, set the map_data_len of the subflow to 0. In subflow_check_data_avail(), only reset the subflow when the map_data_len of the subflow is non-zero. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang --- net/mptcp/subflow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 93bc298bd41d..9e54122f18f4 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -968,6 +968,7 @@ static enum mapping_status get_mapping_status(struct so= ck *ssk, data_len =3D mpext->data_len; if (data_len =3D=3D 0) { MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPRX); + subflow->map_data_len =3D 0; return MAPPING_INVALID; } =20 @@ -1181,7 +1182,7 @@ static bool subflow_check_data_avail(struct sock *ssk) return true; } =20 - if (subflow->mp_join || subflow->fully_established) { + if ((subflow->mp_join || subflow->fully_established) && subflow->map_dat= a_len) { /* fatal protocol error, close the socket. * subflow_error_report() will introduce the appropriate barriers */ --=20 2.31.1 From nobody Fri Apr 19 23:02:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:7824:0:0:0:0:0 with SMTP id p36csp3442144jac; Mon, 18 Oct 2021 05:34:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2oRny3R/9rtnAP8DmH84m9lgzMmspI5RStN8F0286noOkdC5tFe3iHzfGVPprtXqp7fqL X-Received: by 2002:a67:3183:: with SMTP id x125mr26785169vsx.28.1634560472910; Mon, 18 Oct 2021 05:34:32 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id 5si12540476uam.201.2021.10.18.05.34.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 05:34:32 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2195-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=MyA4Tqoo; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2195-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2195-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 D1BCF1C0FC5 for ; Mon, 18 Oct 2021 12:34:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6FA852C89; Mon, 18 Oct 2021 12:34:30 +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 E788072 for ; Mon, 18 Oct 2021 12:34:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634560467; 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=j2u24DgYo4DiFYMn5MBkJHH4KD5txuAt2b6UMGB03vo=; b=MyA4Tqoone1HvbItGqkP8oEMjPcdEDKYc6cdBB2o1ca8ATIRXsEgqz3JLYEibUcOyTEzo9 kGeNv8e3gUc9lCvU/P4xnqFzJe7Bd6rYCQ+2IWhaUl+Zti8ykSTvIFYUXvEX0RO+RIsUu/ xD90Rs9KHx0QtispCNXe+LTgLabsBWg= Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2055.outbound.protection.outlook.com [104.47.1.55]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-9-kwGnA4K1OfqSlYWZXQ4zHg-1; Mon, 18 Oct 2021 14:34:26 +0200 X-MC-Unique: kwGnA4K1OfqSlYWZXQ4zHg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n1iOEJ4SSLr/BP+4cpFEmP1UctcwG/w0GoMkjHy5XQxxdlX83GrSvm0eyLr6u5MHE4RCxpQgDr+xx73QzYfAf94jzDOigMnGhW/LFnHJzHtVPRAE1dkHUF4YoAJ/RLBx2Wx9Af5dNfXuA4yWJ5rq3QrGtgYpDLrE2XNK3HzNnghLc7ltL308JwWGb8uaytFv0xFaJQrd7dt4JToYKRJFnYkAXfIQOiepFuEPWyZNQq34Y+ysdF/4y1bl5aB0BMaP/zJq/a/NzO18W1rjvLuOTTkcAGnNo8A6tgRdJqLS5wsit5BTPET2CvI45R4ROiduga+gikguWc64wrmsk8MQJw== 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=rLFW5DaggXeTNXwkbU9uq+mkCjLnjrHmDCBBYfUwkZ8=; b=SNPgLzIsf7adE/jDLUzAxvDCGgYg0yJ0Rx3qRARp4QOYJcG6F6za+kRoVM9zhLlTUPzm7ealjFTBglbzmdAqT3EnqWISkB3wO4P6mg1t++6wmw31ShGGtR5dpPuuaAdxe44X6Mt1TI0LsWsMCFcHbiDicRvFq7FJJOvDT4ofYrFpCzxGduCjvHJO4mrjbnDkJLCxqcrXbLUDCzplopWmp+SsbdBHFV7srnACkgY7t35DgtsiI4Fc9ehZ+pcqsLXzsJwLU3Dc6P8/IEOXpXI9Gbuaw8pdbYyQV/xXJscBLGeYYsIoGIauwEnyl4dhdOH41MIHiBpiAaVZeKIh1JANZg== 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: lists.linux.dev; dkim=none (message not signed) header.d=none;lists.linux.dev; dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by HE1PR0402MB3340.eurprd04.prod.outlook.com (2603:10a6:7:81::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25; Mon, 18 Oct 2021 12:34:25 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af%6]) with mapi id 15.20.4608.018; Mon, 18 Oct 2021 12:34:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 6/8] mptcp: add mib for infinite map sending Date: Mon, 18 Oct 2021 12:33:13 +0800 Message-ID: <3c4cdfaaee83ea9d7a13073a5531f1f620240de4.1634531093.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR03CA0012.apcprd03.prod.outlook.com (2603:1096:203:c8::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 Received: from localhost (2408:8207:2546:b4d0:1867:9999:db2f:de88) by HKAPR03CA0012.apcprd03.prod.outlook.com (2603:1096:203:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.13 via Frontend Transport; Mon, 18 Oct 2021 12:34:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ef10629-6392-44c3-7f4a-08d992339edf X-MS-TrafficTypeDiagnostic: HE1PR0402MB3340: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1728; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X6cXhrS8MmwqQcv7oViKgKOhaiKhcQ/SlyZoHWoewf27LeR2pzpoj/mzBNORbZqXDIrqDrilGXnXtPF/ce875uoullG6Ejuct5e8te7Edwtq+8+Bl+kTOYAhYakZQpsu79AlFFyV/Th5QDlt6V4UyQ45KdOJdEaypY4cI0Y6dsvntDhetzScxsyJj1GQ9O989EH1DjImj5TY8tzQ+NSVTcAZcZpD8/KRR0f2SjNZLzWtQjT6KEbkxZyaUyIKEMs3HSOqBdRNlWQF+3D9+CCp88y0n3fcZAnvGbNA20HrHW54yYh6iIOvBkrosUaFlrAjFhuMSF4x4eY3zDraJi3EYpDKWIHwkWocQ3vX5ABgZixJktV31z8/TlGk7juHGLH7tZlOp98Z6NAHjoSjtWaM5eCp0L6YPcB00Eq+SMaaN7GhxcxfE/BFnOpKys6gyob/qF22ScFCfZ2h8ma52FAFFvkIBgVH4mKqDcyuCtp32mPP26BJhVWCoGWi5ZSpsBZ/E98Wj7FOB5u+eh8zToDwb/C/skU9/nmz6v9Zz4lRKioLx+zs+E2zfm/prChF/4tDFzJSGlghakaa/mPNHr852WW4o6i8qbjMSrN8L5mwXbE1xg8hJAJENgsQskOLWXV4fT+Mw8dP+Wq9/sNWUnjGDA== 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:(366004)(6496006)(66556008)(66476007)(86362001)(2616005)(2906002)(5660300002)(107886003)(38100700002)(8676002)(44832011)(8936002)(316002)(66946007)(6486002)(6666004)(36756003)(83380400001)(508600001)(6916009)(186003)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1JjrpLm8RhbYj6rPKvrT+4UJlcjTf/iJn6k2/ocyD1y2PeI8ac+826yMKsqr?= =?us-ascii?Q?PbOPzwriq8TQncPLxOGOwU4invtX60z5uBPV2HpKTuP2CQ6JWqk8oyqWFcsv?= =?us-ascii?Q?tl6azLELbe1PDWXfueIjB4ca7Td1yqR3pzbtZXavYv0cp9NglAWVyYtsbrZx?= =?us-ascii?Q?PEXCpZlIwTFl+eECMdaaKa+sfAJi7++sSufOqoDGrqQVIQK9agIPKg2AC8Ld?= =?us-ascii?Q?qGVADd7IubcS0DLX1GPGu7d6IHe6PGYwzqWkMouheNPTEojS/K9Bl5GYvOnQ?= =?us-ascii?Q?P8NjmnyjBA0lIUaUoFaLwqP3+MOPZY+0qaFH7e/0zxi/FK6mqHU+wyQ6l6Dj?= =?us-ascii?Q?gZerx1eoy9Zmnp/+2trHSgYljicD57daovhETbbXXVp9YIvjFJVKrKjuvBau?= =?us-ascii?Q?MDPlF7zle01JGs7pJvXlJpzmKKYitINVvslvhsal4W2KEYEKQqAIx6IwEw5t?= =?us-ascii?Q?WfIq6Y8PJMsO3trETDR/aPCYkkAK80W3mfafH6DtHOwsYDLcibW2ycBBFzwv?= =?us-ascii?Q?unTr/GEbk1eNpnNmxHBkY0ZklSl8sT/4zvsALr2Tj+Jo9PzdmPYUFPxxAcxD?= =?us-ascii?Q?RtSEPC9ZSTSWsplrtmxxpOuYuPhYMT6jygBMyENXeNG/4Xy6XEUf32AYqubH?= =?us-ascii?Q?49bv6aCkBA6MJM+NF9VTYsue+wioi2uCO+jJoV/2SE6S1QbD42cQ1NLLsoWi?= =?us-ascii?Q?GQRODVBD1GXms1Pu+P7qIzN463UUPWQI4sP4j0NkuJUZix/W72g3LKc6Yr1x?= =?us-ascii?Q?4jLVockfukERmI869n5mTtz/mvLWtgpHvhBlOORUrQkIbva5C5y4PspZUoM2?= =?us-ascii?Q?SUDjpoLAdKvy6QpP2U6K9i0z0lE910YC1KJEy8lavSM0UQeE9cMUO6TipgXO?= =?us-ascii?Q?dYZh1FhqvZojBaPbAHbEuF65yi/V+M3Is27drb/5dS4qJCoA1xIQrzngqfLp?= =?us-ascii?Q?uVDw44U/HmPYDOtKKkkqxZxPMw8eDG95Cwd9iNyhxRzDtwQhobUDF2xw8Tfy?= =?us-ascii?Q?ALU27oYX/g9zsnn+K0Y9JKKqhlzKecYMea5gyAGZhz8AQgOsbyTctVd+8pyD?= =?us-ascii?Q?syriXCBENiu6CoPTvH4Nb3zy4kal0Yu2cnti1nVuYg9fPy4oUEaG836W6BEJ?= =?us-ascii?Q?/r/AvLu72wOQGgda1CX24lZcFK3NYg021DASTzE0RjK+WUFL1WFsrOuBuiAO?= =?us-ascii?Q?qbRrKevMCP8OiWp2Jvov932ZINvuDzdxCx4MJx6j0BQyDeuEOg1T7A7yrN6y?= =?us-ascii?Q?9M539nvD9IrWMLcI1a1qDDtTTHo06Q1v+prASjQTTiTFT7uSQAlaDSq7ojzd?= =?us-ascii?Q?eWb9Qtqu+NpExYExC4NWM5qwgp5m29gy58eh5IO4dHmBWyANyzrx9JFzNpMc?= =?us-ascii?Q?jM+su76ndUpXvpR+SjmosOpwGyw2?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ef10629-6392-44c3-7f4a-08d992339edf X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:34:25.7279 (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: 6wsaZPhU3GD9JMY4lS7D5M+znHesS22iwoxea3VSMGxky4MP7tSQTcc05TB047zMtchAsE1CzETCARbiqPyVow== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3340 Content-Type: text/plain; charset="utf-8" This patch added a new mib named MPTCP_MIB_INFINITEMAPTX, increase it when a infinite mapping has been sent out. Signed-off-by: Geliang Tang --- net/mptcp/mib.c | 1 + net/mptcp/mib.h | 1 + net/mptcp/protocol.c | 1 + 3 files changed, 3 insertions(+) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 3240b72271a7..c12251cb0d44 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -24,6 +24,7 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("MPJoinAckRx", MPTCP_MIB_JOINACKRX), SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC), SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH), + SNMP_MIB_ITEM("InfiniteMapTx", MPTCP_MIB_INFINITEMAPTX), SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX), SNMP_MIB_ITEM("DSSNoMatchTCP", MPTCP_MIB_DSSTCPMISMATCH), SNMP_MIB_ITEM("DataCsumErr", MPTCP_MIB_DATACSUMERR), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index ecd3d8b117e0..7901f1338d15 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -17,6 +17,7 @@ enum linux_mptcp_mib_field { MPTCP_MIB_JOINACKRX, /* Received an ACK + MP_JOIN */ MPTCP_MIB_JOINACKMAC, /* HMAC was wrong on ACK + MP_JOIN */ MPTCP_MIB_DSSNOMATCH, /* Received a new mapping that did not match the p= revious one */ + MPTCP_MIB_INFINITEMAPTX, /* Sent an infinite mapping */ MPTCP_MIB_INFINITEMAPRX, /* Received an infinite mapping */ MPTCP_MIB_DSSTCPMISMATCH, /* DSS-mapping did not map with TCP's sequence = numbers */ MPTCP_MIB_DATACSUMERR, /* The data checksum fail */ diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 70f2e0e212fa..2283efda1bc9 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1237,6 +1237,7 @@ static void mptcp_update_infinite_map(struct mptcp_so= ck *msk, mpext->data_len =3D 0; mpext->csum =3D 0; =20 + MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPTX); mptcp_subflow_ctx(ssk)->send_infinite_map =3D 0; pr_fallback(msk); __mptcp_do_fallback(msk); --=20 2.31.1 From nobody Fri Apr 19 23:02:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:7824:0:0:0:0:0 with SMTP id p36csp3442265jac; Mon, 18 Oct 2021 05:34:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQLXx6+9ohrWl++7Kc1cIe6vVmWRHpf+QgM2V62Zg63RnktpxwLWM88M/IjEGDNEKLE8Fj X-Received: by 2002:a05:6830:4011:: with SMTP id h17mr21231279ots.208.1634560484232; Mon, 18 Oct 2021 05:34:44 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id 4si13417552ots.212.2021.10.18.05.34.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 05:34:44 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2196-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=N3iv0G7X; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2196-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2196-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 7A8093E11BC for ; Mon, 18 Oct 2021 12:34:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 71C862C89; Mon, 18 Oct 2021 12:34:42 +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 D17BB72 for ; Mon, 18 Oct 2021 12:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634560479; 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=Exeez92Ya2eI+5vo09cXtMBsysV2vCWhQn1AqetNvEk=; b=N3iv0G7XI+/pUBPMYOichNPjo40ef5VJYNLS7XXYlcKhoCNmD0p7xUwYl+IEhEYQ218a5i C5aut/aGrzjNeuZTBIH+NWoLKZsBGugOFIrz5H/9MWYg6/Cix+XOWUyf+VIYuhdGwvMTnl 058Ke07nZ8rERhHktH5jGmg9tg/Ap9g= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2056.outbound.protection.outlook.com [104.47.2.56]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-1-oSlrJLUAPhCNOwRWzrChRA-1; Mon, 18 Oct 2021 14:34:38 +0200 X-MC-Unique: oSlrJLUAPhCNOwRWzrChRA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=arEv2Sf+V1XvlNpONM1pMdT+mIryNjOqd6bWS3a6D2XT8CtD4TLdSWpGWy1pr0FNwDiAvJCoo1xRkJv+H6Qr48YBmGEHUOsPZ/ZSnR9Jw0Aj+75SROyaNwL9YEcqE+mxMAK0q6tO4500Raay6Tl5a1EW+epNYnT39mtKnAm2V/auOTaxfqQ+NxsMZ8FsiK8uy09om5opdbFAelXG04YHdhDkbCGfsQQiDPSoxKrd1xTVevuga/8C1oA5pGYJCM+en6kOehGmVzcmHxcj/cP9Kb/j7kPMYim0J4liCoVZ3T1qwSvCNbztzT7v86DcUPVJkv5wF84SO/U6STvvj/xgoQ== 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=XS/jsiQkXhk+mLJvBB91SlVQTLEQXU4Wf82OtJ3tIRI=; b=SFB7yDienZ4DVmDkOUrmmGUIASig9gGtRZ1Z66owKJ1ijSADSxM2+Nzt+fH9/FDC6t0aofXbUv5wvS7AF9hNmtsR7IzrFpomJgODJsztnjnefL8r7k1dIHNDAxYBxmFjWcTWupQMpM6qvAmoHEWp97uBI8Hid55S+F7vJ7Usj4pB2xmB/cPDzIOzOFhZMgUFymMrqYTc0AZSU7+eeGfI76u9G9Lnhse5rUoLGFdeOTSvLttpy7sTu8ely+hBDPOiefBa0FIiLG6JotH9GK5XQEM5hYH09gaBE0/zM0Q/2S5TrSaXlKVS3GU6o8VBJbC5d3C8jnm2t6gjM/AuvmfBhg== 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: lists.linux.dev; dkim=none (message not signed) header.d=none;lists.linux.dev; dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by HE1PR04MB2956.eurprd04.prod.outlook.com (2603:10a6:7:1f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Mon, 18 Oct 2021 12:34:35 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af%6]) with mapi id 15.20.4608.018; Mon, 18 Oct 2021 12:34:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 7/8] selftests: mptcp: add infinite map mibs check Date: Mon, 18 Oct 2021 12:33:14 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0006.apcprd06.prod.outlook.com (2603:1096:202:2e::18) 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 Received: from localhost (2408:8207:2546:b4d0:1867:9999:db2f:de88) by HK2PR06CA0006.apcprd06.prod.outlook.com (2603:1096:202:2e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18 via Frontend Transport; Mon, 18 Oct 2021 12:34:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f7f55ad9-e427-47a0-4785-08d99233a48f X-MS-TrafficTypeDiagnostic: HE1PR04MB2956: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:551; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UO2YfrG2/IQOYgU/7tQTcv0TuLHtDc4AHsRMumPT9++B3Y0PlkHyhJFPgAg9HRxFe3oUlfVeVgoxTMyO0urMLgqgh+/eSdLbvSQdLAidVI+T5ZJXa2BZChofsTmR70dhAJqlFaOyd5gLZm+O16E6I79t4W0Wuo31i67yxaOU3alSCyOZ19sqf3XsEnnn2uVU8f/QVHhP98E4ZYipj8hknxsChwJWYR2PSgd+7dM873qwqZbFy/BvKRs/M21SsJT/jhsvrP21M1br/jHwR7W/2mCjvNfbO+dLjML/lcaJvxHJMjGdY1bU/bH/bwZfPdRO18mdvKVVyD/RCb+DEgA8eNEsS4nj5y9dIPHwLDyCKhOYLdzqSTQI5XecXIZQF+5+682JHNS3gDrH5fdFQlqvxIQLBHpk2s/uN7rcGNLTXAIxLvoeFm2YrqB1EFbKVZG5VVluzzKaFRo6DMTF+N/9KselNUB1nnSLk7dMKFRjYLIVegmNuqYV0Tn0ABLE9vM3Ln8UzbdyJEs5ugjhz58VJ3HDzlYm/iBmYNbGcpmO8VNxLw0sFnV55uUDvnEgHD9hz0bbeaEDDAVDmWzY3kz3VRSsBa7W7QSX/SZ+8TqMHLATnjjlsCl9mUG02bPaB4ghzVV1VD8+D6Xl2jLDEKJuZg== 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:(366004)(2906002)(8676002)(508600001)(86362001)(316002)(36756003)(66556008)(66476007)(8936002)(6666004)(186003)(6916009)(4326008)(38100700002)(6496006)(6486002)(2616005)(44832011)(107886003)(5660300002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9aYYVlkWEwVSU2BQ+MYUVYG8PueQyfheTG8do/Zotp9V3RZd4dB3JEiW1Cig?= =?us-ascii?Q?VTnR6YpD1LwVguDOvexRTfwLJVcl+b7ahDRiAgA9LedkY7/yfOTWab2GthIQ?= =?us-ascii?Q?W3tb9f5UlDdk9MHdJKE5A7I0ciwkG1qeeYTJCtARRiqfuSKRbfD3gPP1Rz50?= =?us-ascii?Q?9/fm8bBG2L+E0xpTFci7fXqhUK3Gohk6XY+Uo42cMBMJTSr3EuZhxv5iKeWZ?= =?us-ascii?Q?xEkYye8ZUtgp+sS5KGDD6J5TLX189FJfJJ52f7bbeiJ14sgXiPYNWkaw5Lx6?= =?us-ascii?Q?EyKFbDnQ6V/jA0fzG7qrD4/XoB4bRD7cMZoPjAFVAdeVJWeA1CPjCxm7XIRP?= =?us-ascii?Q?zUQiVLk4Z3YVdRnvuUaYHDct3SlPgvOKHMBw3lzXTOOs/cjIomNlGj7U07jd?= =?us-ascii?Q?hHe/d3byjM/nf6yivbQpMwdujqbFF4TuPYH9hbZmRTvMpWwlm+CdpdARYctJ?= =?us-ascii?Q?1SRsncNjk0S8hXE+N4qtO/GiLLsFndjLRmQ6brInPEQJsBCL/dp5cXB0h60i?= =?us-ascii?Q?APLdSSiLQwdTwCjaCdRMZtk3hzS+cLPM7WYyle5TB97G85hgTAxwS0zMhwgw?= =?us-ascii?Q?5xOyGZxQAr7acZF3kx+QD1lyCtKx6ajnOcWNl2pEuVmR8mVenVjrWsYSMTpS?= =?us-ascii?Q?cOkjOa3XGg28V3d2/+hogV+4UEZ/DJcCide7UPayQO+5dOnYyec9n7EwdIyR?= =?us-ascii?Q?vRuQ2wRWq92DUY39W7RLdgIsQxG95yBcRFBPF/geg9CeqfKkMY3tVWxL7nWA?= =?us-ascii?Q?CMWt9MNmqOjpZKgOfiLpkm+udQmhGN4PFWtUyiZsBq2Tzs09qrwzb5NHPVe/?= =?us-ascii?Q?RuwSBKmxN9Jj+Jx3EZIA3YeQjDBBqHnVIcD+jNKQPbLAxgGH6gvjjfFMng0H?= =?us-ascii?Q?dOreXXZu81NaOsiC+dsEOxMdP2qP9T4ydUAjMWnbDK9x1b7+RPuyE7Sxgs5Q?= =?us-ascii?Q?SsfOl4O2+fyAeZsq4o2T8Fr7e/1L8AxU0TgGqjAjR//SJU8t5eMQlwWBTE2s?= =?us-ascii?Q?3u/pS4vSp93nImxEr9erG3ceD31aw85EDSFsT3im2FjVTUQdLzjEMF0PxKt0?= =?us-ascii?Q?QPkipI3K5IIpy/zWaiVyvCvsurTsotkCTlXRLWqKsQpxfq3mKIl4rLPId+ra?= =?us-ascii?Q?GIYTV40sV/1g0oFbZCzS0uPLy77GbJJ8sFCtoiBybdW4eFVWsmem3RVJK2oR?= =?us-ascii?Q?nuwvybMf9JN/9HYtVqtaIBMGuKazDfmrn8LUKyVbB0LOjluokhGyDQO3vrv5?= =?us-ascii?Q?iS5MNLZGFw/GG4PZtc7Ad2cDUILNYAXRql17iq4WHqZ44fFnpCTmAFZJQFdO?= =?us-ascii?Q?Vq9HdZbFUA/3W30c72soUzBD2zY0070oiS2otxWwmiB0yLPf5Lp5wEQus2yR?= =?us-ascii?Q?1IwtNkTRREpZwNotknUv5B06QHaS?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7f55ad9-e427-47a0-4785-08d99233a48f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:34:35.2605 (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: PpiTUxoU87JvZ+lYvSw/FEkcUrBxu+epUkg3wzmjVoH8Sd42vBwU/Q6Gn5DrGbQ5j38TXyFXkahMfwuqOlWfdA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB2956 Content-Type: text/plain; charset="utf-8" This patch added a function chk_infi_nr() to check the mibs for the infinite mapping. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 293d349e21fe..b3b351b868f9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -615,6 +615,43 @@ chk_fail_nr() fi } =20 +chk_infi_nr() +{ + local mp_infi_nr_tx=3D$1 + local mp_infi_nr_rx=3D$2 + local count + local dump_stats + + printf "%-39s %s" " " "itx" + count=3D`ip netns exec $ns1 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" + ret=3D1 + dump_stats=3D1 + else + echo -n "[ ok ]" + fi + + echo -n " - irx " + count=3D`ip netns exec $ns2 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" + ret=3D1 + dump_stats=3D1 + else + echo "[ ok ]" + fi + + if [ "${dump_stats}" =3D 1 ]; then + echo Server ns stats + ip netns exec $ns1 nstat -as | grep MPTcp + echo Client ns stats + ip netns exec $ns2 nstat -as | grep MPTcp + fi +} + chk_join_nr() { local msg=3D"$1" @@ -665,6 +702,7 @@ chk_join_nr() if [ $checksum -eq 1 ]; then chk_csum_nr chk_fail_nr 0 0 + chk_infi_nr 0 0 fi } =20 --=20 2.31.1 From nobody Fri Apr 19 23:02:29 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:7824:0:0:0:0:0 with SMTP id p36csp3442362jac; Mon, 18 Oct 2021 05:34:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEiQYf46dVmwQGzjy5z7n1niYFYPfPtCuXXfSi+8LRUV39hZRHFDzT800eHr12+LHTayDu X-Received: by 2002:aca:b185:: with SMTP id a127mr20002214oif.108.1634560491689; Mon, 18 Oct 2021 05:34:51 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id m17si1576191ooj.0.2021.10.18.05.34.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Oct 2021 05:34:51 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2197-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=OoInlnVr; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2197-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2197-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 0EA903E11BC for ; Mon, 18 Oct 2021 12:34:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2F92D2C89; Mon, 18 Oct 2021 12:34:50 +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 8CE2072 for ; Mon, 18 Oct 2021 12:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634560486; 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=VuBYQ/0BbTvkbfJzQ92KdOhxj1OZ9fC6LoJQZxRqaJc=; b=OoInlnVrZj7AJknEmdvLurrUolHmIuYqp/2Jkiy4z1vXZvxL1FqGoBzubSSWeXsoMocW4p 7k7EHjYzckyL2vqavOv/eHfSMYqGXopws1MrF/NBxZBRBJ2y5lVAQgWRPe/yzDJF/tS631 SiZTUjyoI1I20Z/TFwwsGOaJbEmXRmc= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2050.outbound.protection.outlook.com [104.47.2.50]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-32-KbJNlx-9O0mp8ufTIcjO0A-1; Mon, 18 Oct 2021 14:34:46 +0200 X-MC-Unique: KbJNlx-9O0mp8ufTIcjO0A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KFK19lghzP0fbHnBf6UHjbLD2i5ef7NT5d1uHRp2rSmbvHCJwHg4XRUe+hZaafCe8jsBuUMW0ZSD+PT4jpitHEskD8T5kS7PYr54zmg5jyTGgm1+YOjJG5aof5jMLclsSEGlR7tyeFoJEeVLj/ptt17OcC+mb2O3E0DuBLHfMxN674Vv7/L+Zv9NNNcnxyCmdMLKakiANpuKwVMcbnU4MX3CRovFziYv0fslyDzyw30mE7MUxGmTGrt7dchy9XjopykvW+S6BASW1oPAdlVd18Rv8nC4h3cOs/mDR3IGAg4VYXzhVJUJyXovIQC4EJryg5T+ubVk/miVwYnKyiBUKQ== 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=9FsLEcP/fJTPjLrK9vckC5QqOoPd2i6jdAZBSjrKIAk=; b=gd5waeB+o8zXBLYCw/lrVA+9+G3JQYwJm+4oEb44BQ3wnqfU3t5K8bZi133jJwhMLe54BJx4w8Sd9Is1imth9OxanuOuT3Jfki0N3QxLouWIUS94M6QsievMv/KECEgrtL/KYW3fkFNykvqvy0uFKy/W3J5MsocM3wTo382NmuKiQOaao22XS0SN3mjXhI0suYUr483DuZ7D6dW96DW0FJIk719cXIbdMU8te8Je97nIYfEKPQG9M3ktLbXgBznmE0ejDPkMLeKjSdCFSif+l+1Y2M4f0/UXopqaoEuLAYAOHCDt+IVgFTtymAUb6cfQiYjXdM8JGTFrELGSpFq4dw== 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: lists.linux.dev; dkim=none (message not signed) header.d=none;lists.linux.dev; dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by HE1PR04MB2956.eurprd04.prod.outlook.com (2603:10a6:7:1f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Mon, 18 Oct 2021 12:34:45 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::15cd:f2b4:6acf:99af%6]) with mapi id 15.20.4608.018; Mon, 18 Oct 2021 12:34:45 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 8/8] DO-NOT-MERGE: mptcp: mp_fail test Date: Mon, 18 Oct 2021 12:33:15 +0800 Message-ID: <2e9a15d32cd39483dd1e18174d6c73b33e0566b5.1634531093.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0013.apcprd06.prod.outlook.com (2603:1096:202:2e::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 Received: from localhost (2408:8207:2546:b4d0:1867:9999:db2f:de88) by HK2PR06CA0013.apcprd06.prod.outlook.com (2603:1096:202:2e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18 via Frontend Transport; Mon, 18 Oct 2021 12:34:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5282def2-43dc-4bd9-5bb8-08d99233aa5a X-MS-TrafficTypeDiagnostic: HE1PR04MB2956: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:346; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6lFqlV/2Pi0rh5GWP/9+1NqlnkuLXeyviV10JxOIHCqJouJfb8V1tILwA8LtTyPAIoyZBz4ONUlR4kmL9UznXBlUSvo7AMPYJR/zIlGqU2KWFv/tOmyR1c55glY0ZzDfTawtR9X8PLs7G2KQapTm+3xLrsXdHBwJ28edZhIXLHYTYqiJmm+IQVPmAiC+i5gYWtB/Aaj3Nm345NZh8/eO/VndPhjDDwwAHeibM9P34sryqMxpE54H9ECscqHrtpXgBAOScE6ynInyenOoWUNxpqxyMMpDQce3h/A6ydpfYSIIggl21+Y54x9e/BVCeWYwK8G7RjzABe+uAcN72hePAVM4K+meRROh+KTD8KxvtjyuWsSxQRRjHSPG/OjL6a4NWxE0EuEcyaw+3Ujt4Abgaxbf2LYe6HfaE/PxuBjWGoQ7rQLlrrPPDcv6j2hgmBhEQUAJJM1F8YwDjOiAVh22+tVIsJmlO+OGBcqQYnwglKAKpXw7FcewxvHcYQd+SDwsk4Vhd22uI/kOniZvQDHV6ZPV4QhCBgax2SSjDHYDEJRpLr6IyVo6IpbxDfiXTVqlmwYeEa/kklNUn2XCkMfkrBe9ZL9FzAQrtpzsr+soeJQ+dbpr3fHw1stfrLrVLG5qK6VGmTd7w05kP+h9i1QyWQ== 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:(366004)(83380400001)(2906002)(8676002)(508600001)(86362001)(316002)(36756003)(66556008)(66476007)(8936002)(6666004)(186003)(6916009)(4326008)(38100700002)(6496006)(6486002)(2616005)(44832011)(107886003)(5660300002)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?m1HT1pbOWjmddxtKHM4lNJQd5UIHJyhf63++AKJmR5RnJKfNuTBNAkQoCMoB?= =?us-ascii?Q?PzrNM5ap/anDHbYrUVsC3CxLc/VazJnjP5K2/5e947bXPsIaA5hrqrdR4wIe?= =?us-ascii?Q?3ViQ70z9/4uzo5Xb6ZCdt2oZC+MzYhuDJrERNZf+Gek7H+/xt42Tjzoyr+qY?= =?us-ascii?Q?BqhEQDIMscHL4V98Dyqhcl7O5RcF0fsgJmRjtexn3FuofpRyKb31Wlnsxeou?= =?us-ascii?Q?Li/bjI0jfgftJna+OkNpUP1JBggoGDaJqw0lVak/yM7N7bDEKSe600i71y0L?= =?us-ascii?Q?ZBRUXn0Ks/891BxY7rfRvIZLzFvFdY2m/0sttv2x49vPi5l8AoOhe5muVymU?= =?us-ascii?Q?M6fwEefWJbJjPvisXJ3Vrx+9bkLxYL9K/oz3FepDmdotcgQz8cm0Upf71p2r?= =?us-ascii?Q?ZxPT/uDCGqWcDmXWGuAeCRqcMmpH5QOfdvGi1qrrzCeNtaqoX/Sb04meAGLC?= =?us-ascii?Q?n/JLP3XGts1ZaxFb4iHej44hKPhX7P1y4TpBa1Ak8TU2TESg2z49512t6U7/?= =?us-ascii?Q?uGvTXMtpyS3TTiKtjlmY2as4HxDHAmD339DWWZRodsMGbERL0dv+qzcDpsTk?= =?us-ascii?Q?86WFlatSdzVBG/yGgG0PmB3/4IHJMQkR691IWPfRu3MkqX6FNTGgApOlfWO5?= =?us-ascii?Q?FFLhHkpk7w+tG/dHt4U/izWCpFBsAxrsNidojU0rF70DxKYEUP0Zh7DL5JTH?= =?us-ascii?Q?YZLPmz49qV28FI3+Ha19/fOBw2Blv+5M0ZsRnw4jrnk2q2buDNGgDQ71rBX9?= =?us-ascii?Q?2dek1AdfVNxvfuB6UqkQZSfTGrg0Pc1gD6sxXcO6q4ZrKj+Pt1UjsLj4C+7A?= =?us-ascii?Q?muGyhkFWPqYuwxmfNEe5i+WlbW0jHI5CbOwjPtM1qA+x0You5qB34w+zv0FV?= =?us-ascii?Q?XEP8EcT6o94ytw798q5ZcLmdfuxvkx8wmy0Jic7t8Ybv4wLmlfbvlVlsjJzj?= =?us-ascii?Q?lxQBEXp50XnmuxlI6vQsmUHkpZrpPRpHPEC+863LnkeE0snuvYZHjpnJdFC3?= =?us-ascii?Q?PN3NDBzPOIU2vNCTNIOlRt8r9nEpmavUhnt5o1mKjwQbnzTWB8KfpvxuypDs?= =?us-ascii?Q?73+p+AniNnDak83bnlUKUAEaOpbYcSdOvbJ+eBeJ2CwI7xNfBW7NssqjJk92?= =?us-ascii?Q?iJuSovnOa9uSmvPyyI544NBzepGXBDmZaB7t+efBgvUZU/xRHhSuo1gQkc2F?= =?us-ascii?Q?a0stGUnc4l78b2nw0MdXHszTXRi6g00WjseOxx8JXdhfTbsP7dywuZZknzhU?= =?us-ascii?Q?ENALZ+HX9u59uGuizzLJerLxXOhcLeJ7AOEY4L6uvFW4zkzjAJO83VJ9y31P?= =?us-ascii?Q?Mt302u9jngGiRa4Aks2Ukc+6edMIIbmpgS6deRGffRxJD+om9kRDcGZ2Qcdi?= =?us-ascii?Q?4e29JVZWsOD5J13kXy5krJ/gpw/e?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5282def2-43dc-4bd9-5bb8-08d99233aa5a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:34:44.9751 (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: GeRb/pcaKB4G+m1XFKe/+C03+BD6xJSn22hhNwht65bEcBT6nMWCHKB9GziigZH/eU49pHXdmlvO6fHiNFZyKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB2956 Content-Type: text/plain; charset="utf-8" ./mptcp_join.sh -Cf Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 9 +++++++++ .../testing/selftests/net/mptcp/mptcp_join.sh | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2283efda1bc9..fc3a4fb81fbb 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1243,6 +1243,8 @@ static void mptcp_update_infinite_map(struct mptcp_so= ck *msk, __mptcp_do_fallback(msk); } =20 +static int j; + static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, struct mptcp_data_frag *dfrag, struct mptcp_sendmsg_info *info) @@ -1377,6 +1379,13 @@ static int mptcp_sendmsg_frag(struct sock *sk, struc= t sock *ssk, mptcp_update_data_checksum(skb, copy); if (mptcp_subflow_ctx(ssk)->send_infinite_map) mptcp_update_infinite_map(msk, ssk, mpext); + + pr_debug("%s j=3D%d", __func__, j++); + if (j =3D=3D 20) + skb->data_len =3D 1; + if (j > 40) + j =3D 0; + mptcp_subflow_ctx(ssk)->rel_write_seq +=3D copy; return copy; } diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b3b351b868f9..3339633e87d4 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -977,6 +977,24 @@ chk_link_usage() =20 subflows_tests() { + # 1 subflow + reset + ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + chk_join_nr "1 subflow" 0 0 0 + + exit + + # multiple subflows + reset + ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + chk_join_nr "multiple subflows" 2 2 2 + reset run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "no JOIN" "0" "0" "0" --=20 2.31.1