From nobody Thu May 2 19:41:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp3037376uau; Thu, 23 Jun 2022 03:50:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tEbU7lZJYFMd/OGfSgSm6RXSprd9ABbbLR6eANSZ89Ix6YaSYiV8bsR309fv7U93oYQeA8 X-Received: by 2002:a05:6808:1598:b0:32e:ff1f:1dbf with SMTP id t24-20020a056808159800b0032eff1f1dbfmr1823749oiw.259.1655981435715; Thu, 23 Jun 2022 03:50:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655981435; cv=pass; d=google.com; s=arc-20160816; b=rcOio5+QXE/Wt7wKAWCWvecDRZAhRGaijzz+K95Thb2BDOXcdzoQNkyECD4cXxa77P HfunKgksS10R5LAr66KwqaNlLRU5MBh9U9uJU9EW3JvKcCLWhk901nYvmMz8+gHxVNeu J+UOYLo1Y9v+0dKtIbvmx+eMXw3Dddh25OWk7LAOD1VHpCx/ooB8aJkDRRTHq1a0nalO Z1T+QGXTP3sYjhwbIaM79yUnuhDnGF8SRM99CsbF5j2eAsz/Jm0P3b/lHeRnvfXGZKDE k22VmCpgb0EZxPgiyrjpKqe9oyGzCb5Yi57gnUoBqhIMl+GxbU2k2w+IWOvgNgq2FwgA a/Nw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=BUbsTTrZd5PUw0Xzq4nFrnrPB5/MeC3mJFQBIeqs25s=; b=nJiokQv6PTofZhJpRkS71mDNS6ssDQNlG7tez1PlHWOeQqQvTIJCV6chXM1O4aS4qT 6DSHPoktBZ1rXbsenrlIrmFczLnd7QJTzMhTREQeiaJeY98/uqtRhk5SD8lIl5tisrTG 9d5bJRz/2r7Tj/g1v0qbJrOrnMc2QFTqYGvQNGpSNJCuMcPn/ZN2vQa5+ka2BnW5qkar eIIo8fCGPhHXSGcHBORUUsbgEoBi66VuACFiGmhlOwrazVE9mnwkDW+j2zpdALGXALZV V4J/QPY2bDym40+72CSNV1xCMu2VNDwEe+erwJWDa3xmNAh54Bsj58zG0oJpNCOfO3M5 0v5w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=Rm7kKTlu; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5782-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5782-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id v13-20020a4ae04d000000b004256d0dfa99si2410610oos.78.2022.06.23.03.50.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2022 03:50:35 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5782-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=Rm7kKTlu; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5782-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5782-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE 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 da.mirrors.kernel.org (Postfix) with ESMTPS id 697C42E0A0A for ; Thu, 23 Jun 2022 10:50:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2586A43ED; Thu, 23 Jun 2022 10:50:34 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2044.outbound.protection.outlook.com [40.107.104.44]) (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 7572E1876 for ; Thu, 23 Jun 2022 10:50:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TAWZWrlQmMZZQ60KK36CaxIH+B3ClBPwfTs7wd2FBJoIrmuLUamTFrqA5aTHFqqm2t2GlRUODVg6SFb5GS/p4eX8kzVW+Usp/Os1zTEyAsCfxrd7bsDKosJks60UC7wFznYvY+DWvViMg7cmVClWiPmojemuoAp7TaRj378C4jxAeobAid2vjmGm0kwXgIwoKy2ZLNcPLkNrWy2byI1KZ1AsmlBWoCJiSrqsnUJFQsphvG6CDRfWWxpvMcgdIANt4AIN2iilB6ar4JWmVycpExn9BbZs4uU1GBiotEF3qPlvcPZUNSUa9QwWFnNthLy+kl1eXwsgMxP2ycIiSiHhqA== 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=BUbsTTrZd5PUw0Xzq4nFrnrPB5/MeC3mJFQBIeqs25s=; b=bl7d3H61XimOM/WRRrztX16oGIpEeyjrEd+9pYsXC6YEfUkxtBFk4hRtAIzFxWRP4g+2+/qXJV8ugsPGaLysj1lokJVzABauiT/A8M7FcY68Vi8FX1yNHl4ucBOrqjytne+qG9XLW9xOalQElGvDXlb6kXVfMOPwb7XQLaWqLX+tSgGOhehTA+PjLQZJvXo39r4/BMxX+GCDcagagOrwOB8rb6a781Gc2y3h4AZ8sxrMnkiV2z2+aLEAHqL7W44QyiRjAjfpq0xqgbv9XI0lLdc4BZn63GAbihN/30oVmul5y85wFUOICM10rDhw429PUcSTV7uXBE5mqOZZO/epkw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BUbsTTrZd5PUw0Xzq4nFrnrPB5/MeC3mJFQBIeqs25s=; b=Rm7kKTlusmrbQwqfci6r4vHaIrE4e2Zchv/Uf0TlM4pZxiX045IboSt67i2pt0/SZGaPWkDIqwG5lRvvXHw9UIjMDT2cdZf/TWbSDlpK25PCXJwjkopQ+9i1oGlNyWF0u6GtDHSN7iK64++yKpSO4Myac7tjXWClspmKia7gZuSvI+17A4cW7iI+TnI6kxF8oZ6d2PbdHNExTaVVebhjG2mGZMsi56onUD+BAkxujYpp7bnY2UyyOB6jYXeC/paHevFkiwgp/WF87dUnq54VozwMD7WrnLJXeOxK9TyYdmgSxt5oSKN0XOm5p4UebUzDcwKX9rqd5QeOb5gafLHXXA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DU0PR04MB9587.eurprd04.prod.outlook.com (2603:10a6:10:317::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Thu, 23 Jun 2022 10:50:30 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 10:50:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 1/6] Squash to "mptcp: add get_subflow wrappers" Date: Thu, 23 Jun 2022 18:50:23 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0142.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9e78bb1-7eba-4f35-58b0-08da55063099 X-MS-TrafficTypeDiagnostic: DU0PR04MB9587:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XaIG+0Ugawf/gzbYAak4hMx7J+doZst0Lkg7MWwqmvP583kauJiDdGf4dCEUsW9g20T4hNAbYOH5OtCJVO8xhuc4DWmmSDK4TJ/3Kh/Juq0dx1OFtKjJeZloLZj4O1fJDZQqWLVKBPm+F/cydA1PZGiLCY2RXgwFSzpExIFssLWUcrc+ErQWFXiGKSw0sUOD3D0Irrai/gsuMO0O51Mk8iFfiX21ihOO0CstBDfTFVEzHQ2QURhe44fgaMHD5z/ntbaooUHb/Wh+7LrEjibtzztxzFeni0UojrZdjynfiNi4NucK6zkdMw+uDNMhcU5k7/BKMfPNikXSu5eCE2qpoWz61ObX4BTeXuQUx+fQ77o7YaNeOzl31xykZ6LJ2CfNTmQBtaVEG1r0eOfoiEpmm8FLQLr4nhWXpjE/bmDrp63gvawvd4sZq9miqbqahiDrcdlA+sUHhnEpzaSGHlD3dvzDQ1df/CLPsH39YLqIrhsz5q7T4eZ9k/Yi9lvFC+0SRPVIaINMuF3RuDWHZFjLzFVtBI8NNgn3RoTXcQC+Y5kl0qKcC79fVta1jAue/gPr4I8X2xymy0SEfoxO4VU0WtVrRIzzrG0Y/BqOuDa/wMfGf8tKAUTuzTTUYePxr5oUgMwJFqfH55EIqsPVOM9rXeiChsY0S5r4jpSsrcp8wFIGRyJQsS4a+MxNnazzBYkBqZAawp8AuXSg02OmoctTXVgHhXNBuxwy2qwyFbspql2/fqZZnMW6giqiXnlVwgFA 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:(13230016)(346002)(39860400002)(396003)(376002)(136003)(366004)(66556008)(316002)(83380400001)(66476007)(6666004)(38100700002)(66946007)(6916009)(5660300002)(186003)(4326008)(36756003)(6506007)(8676002)(107886003)(26005)(2616005)(6512007)(41300700001)(86362001)(8936002)(6486002)(478600001)(2906002)(44832011)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?q0V2n1+3ghU0VCxkvJkZaQQcmBh6BYazjNSVtIIUJI4HWLeXRFXVGQf5ggQ5?= =?us-ascii?Q?YZiZihrfUEdFQOj2YpxUxV9zofp2F+ilhDuHuYfca/B2/WnmQ+S8TyHdSwCi?= =?us-ascii?Q?s1lcNm36s0DCSXZbvTUGpenxY0sJr4y5Lnj3MI+5/SimOJ8Gdy1fMNRBBcXi?= =?us-ascii?Q?kx/hQRPxYdQn5C///QvUDaL9OoVYjENphoCrlWDqQHToLdJNP3qe0gP5vup3?= =?us-ascii?Q?BzdJyGzvn6Kf9uUCl9QV4Kdqfb7FWsWNRZHPVoT805B8SL3EpWhQOPrwYvVS?= =?us-ascii?Q?QqgZiMYzGmDzCZtbI+RG9TWjtNUc9AMUnBB4URoc7sZeik7d8V0zCY2jHjy+?= =?us-ascii?Q?cIBdhQ5proirTx5MiF7oPRErmHVl43lSO3kfNo+c8sfd83zBoj8gGYjf59bb?= =?us-ascii?Q?hiZPayis/tDSy7j7BAc9wmqMwIDD/BF/JRhJZX3srMURBaWlPmc7nnf0Knly?= =?us-ascii?Q?KqglkVJ8R8DlcrwbtJ4Cc42ThMaYaqA40/BBibxVd/6T3U/d0fIUNJLc4Mfk?= =?us-ascii?Q?Gu/8rI+lVXZG9gt0NBoK4Dnhl/8j4acgnLvMkzgTOzggP3gnmbRfyAdIpNfN?= =?us-ascii?Q?O9uXIBxEKXDWOxoj7r9ViUbNC52qcx9BmdPos7LPUTEGc2PmFPy3T9LHNHrU?= =?us-ascii?Q?/mFzRLyTVsxXzap2nmPxSw8+5rG3PHJz/hR1zEMcxUfBDwxXutbvZWdsvpa8?= =?us-ascii?Q?dG4TS/BGOLAtw8PtFsfNKntC9L9biBCN94o/rL3vh8tqDiITo3pCig7y2Etc?= =?us-ascii?Q?PbgMLDMSE0ECHz5aZ4QlqRwvFR+WnfcY6/7uDfUbcsUGcIRWVktamfa0/yRy?= =?us-ascii?Q?h3oTuRMUx/esNhBQkxrDzYIdSsCA7pRjAJAdTJ3GQoqHjucyaCzG015PAqvz?= =?us-ascii?Q?boRRJx5ZizkHALgPzrg6IlAt6o/DRyJf+geQpLmhX7unFWDOTTdsYdvbGzAa?= =?us-ascii?Q?RX61AEsC9JFBIiYJrBjATZK4NQ7Jc6lVN5hD44h3yl2IAl04mbr5Ug7HcGP1?= =?us-ascii?Q?ZsN0S3hSnquiSq90PFRFZNE08aXZDH7shsn3mnEMCLx4tifnVLcP2HuCsz8N?= =?us-ascii?Q?PeOBRMfBNA/s39JRbRl7WWdtOGq2vVqHQJBLRmtaQZ4YbvZME0+gE+sm0SeR?= =?us-ascii?Q?mvxX3w3rfCa1YmyByL0RnlW66PnAWsovFH0YeBGDUxKXyFibFSopqHkL4IXL?= =?us-ascii?Q?5qgXDQG3bGCYHAl4aQQ+J3by1/6kK6Z+0Qjt8S0QlcCQpIoL0rZIwPXiPy4P?= =?us-ascii?Q?YosIiMuFLO1ndIVLoosC0s+uPuoo9KfGq9pslTixJQN28FzwQgSC0lpmChHl?= =?us-ascii?Q?7d6xszvoV8JL87oguSETpfgB++5v6cplhQnMYw4gY+GSfB3hL5rkXt3m5LSp?= =?us-ascii?Q?+DtfQpO9Wb/tHLQ+HriRD+CKKe9nb+LLYWjMB7vRlNgTBhegeP971yqD+b7l?= =?us-ascii?Q?L09VoszgLrGKFj1nmRpvPCu7Nr94M8VXFb/MpTaFC6PjGU8PmcruTPeKjDm4?= =?us-ascii?Q?GQ0+J/SFftLD0BIePLXPWeBg6rXdq1Y+2jsW8LfnUxrRSUBO6lnhpMOnw+lI?= =?us-ascii?Q?kL6bq3Ybayrjg/VBtYptkykYEC4lYyyU2nVGokPQRGoHnjewe/EGgXWYWk7m?= =?us-ascii?Q?bvrkqCnsChYQE90TtIkNFGKFwaoBeNMx2L9OGGl3pw0PrN6VQCCB/Ef04B5l?= =?us-ascii?Q?7azWkvWzZ/yP4HmWxZoQy4VVG/AUd9H965OF3UBzaqZ4QS0TKQdZmIBZ6Nwc?= =?us-ascii?Q?VvogZyGiFqHJSyJnTuz/sgTKx3CLgKo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9e78bb1-7eba-4f35-58b0-08da55063099 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 10:50:30.1742 (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: NtKxhMWx3/Fx83Eo8iLrivzaZRUfm48ewkUBIiPPDm3FvKXX2Be8UAwIM5k0A9C4rVUOmOxVKAj65bPGmZbu1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9587 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' This patch defines two new wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke get_subflow() of msk->sched in them. Use them instead of using mptcp_subflow_get_send() or mptcp_subflow_get_retrans() directly. Set the subflow pointers array in struct mptcp_sched_data before invoking get_subflow(), then it can be used in get_subflow() in the BPF contexts. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler. Move sock_owned_by_me() and the fallback check code from mptcp_subflow_get_send/retrans() into the wrappers. Redundant subflows are not supported in __mptcp_subflow_push_pending() yet. This patch adds a placeholder in mptcp_sched_get_send() to pick the first subflow for the redundant subflows case. ''' Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 12 +++++---- net/mptcp/protocol.h | 4 +-- net/mptcp/sched.c | 63 ++++++++++++++++++++++++++------------------ 3 files changed, 47 insertions(+), 32 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b1fae2f747c9..15472d0af508 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1532,7 +1532,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) int ret =3D 0; =20 prev_ssk =3D ssk; - ssk =3D mptcp_sched_get_send(msk); + ssk =3D mptcp_subflow_get_send(msk); =20 /* First check. If the ssk has changed since * the last round, release prev_ssk @@ -1593,13 +1593,13 @@ static void __mptcp_subflow_push_pending(struct soc= k *sk, struct sock *ssk) info.limit =3D dfrag->data_len; len =3D dfrag->data_len - dfrag->already_sent; while (len > 0) { - int ret =3D 0; + int ret =3D 0, err =3D 0; =20 /* the caller already invoked the packet scheduler, * check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_sched_get_send(mptcp_sk(sk)); + xmit_ssk =3D first ? ssk : mptcp_sched_get_send(mptcp_sk(sk), &err); if (!xmit_ssk) goto out; if (xmit_ssk !=3D ssk) { @@ -2408,7 +2408,7 @@ static void __mptcp_retrans(struct sock *sk) mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_sched_get_retrans(msk); + ssk =3D mptcp_subflow_get_retrans(msk); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { @@ -3090,11 +3090,13 @@ void __mptcp_data_acked(struct sock *sk) =20 void __mptcp_check_push(struct sock *sk, struct sock *ssk) { + int err =3D 0; + if (!mptcp_send_head(sk)) return; =20 if (!sock_owned_by_user(sk)) { - struct sock *xmit_ssk =3D mptcp_sched_get_send(mptcp_sk(sk)); + struct sock *xmit_ssk =3D mptcp_sched_get_send(mptcp_sk(sk), &err); =20 if (xmit_ssk =3D=3D ssk) __mptcp_subflow_push_pending(sk, ssk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 95c9ace1437b..406e1bb4fff4 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -635,8 +635,8 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, bool scheduled); struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); -struct sock *mptcp_sched_get_send(struct mptcp_sock *msk); -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk); +struct sock *mptcp_sched_get_send(struct mptcp_sock *msk, int *err); +int mptcp_sched_get_retrans(struct mptcp_sock *msk); =20 static inline bool __mptcp_subflow_active(struct mptcp_subflow_context *su= bflow) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 8858e1fc8b74..6d7cc4cba2be 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -114,34 +114,51 @@ static int mptcp_sched_data_init(struct mptcp_sock *m= sk, bool reinject, for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i] =3D NULL; =20 + msk->snd_burst =3D 0; + return 0; } =20 -struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) +struct sock *mptcp_sched_get_send(struct mptcp_sock *msk, int *err) { + struct mptcp_subflow_context *subflow; struct mptcp_sched_data data; struct sock *ssk =3D NULL; - int i; =20 + *err =3D -EINVAL; sock_owned_by_me((struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_send */ if (__mptcp_check_fallback(msk)) { - if (!msk->first) - return NULL; - return sk_stream_memory_free(msk->first) ? msk->first : NULL; + if (msk->first && sk_stream_memory_free(msk->first)) { + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(msk->first), true); + *err =3D 0; + return msk->first; + } + return NULL; } =20 - if (!msk->sched) - return mptcp_subflow_get_send(msk); + if (!msk->sched) { + ssk =3D mptcp_subflow_get_send(msk); + if (!ssk) + return NULL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + *err =3D 0; + return ssk; + } =20 mptcp_sched_data_init(msk, false, &data); msk->sched->get_subflow(msk, &data); =20 - for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { - ssk =3D data.contexts[i]->tcp_sock; - msk->last_snd =3D ssk; + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + /* TODO: Redundant subflows are not supported in + * __mptcp_subflow_push_pending() yet. Here's a + * placeholder to pick the first subflow for the + * redundant subflows case. + */ + ssk =3D subflow->tcp_sock; + *err =3D 0; break; } } @@ -149,31 +166,27 @@ struct sock *mptcp_sched_get_send(struct mptcp_sock *= msk) return ssk; } =20 -struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk) +int mptcp_sched_get_retrans(struct mptcp_sock *msk) { struct mptcp_sched_data data; struct sock *ssk =3D NULL; - int i; =20 sock_owned_by_me((const struct sock *)msk); =20 /* the following check is moved out of mptcp_subflow_get_retrans */ if (__mptcp_check_fallback(msk)) - return NULL; + return -EINVAL; =20 - if (!msk->sched) - return mptcp_subflow_get_retrans(msk); + if (!msk->sched) { + ssk =3D mptcp_subflow_get_retrans(msk); + if (!ssk) + return -EINVAL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; + } =20 mptcp_sched_data_init(msk, true, &data); msk->sched->get_subflow(msk, &data); =20 - for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { - ssk =3D data.contexts[i]->tcp_sock; - msk->last_snd =3D ssk; - break; - } - } - - return ssk; + return 0; } --=20 2.35.3 From nobody Thu May 2 19:41:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp3037446uau; Thu, 23 Jun 2022 03:50:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tdE9tlbMe4rcYRWankp6worUMoJp96zIuRACLhSfsfp7KPO9YqLMt/TvGwo9Sq1l5lj9Pa X-Received: by 2002:a17:903:110d:b0:168:c610:9a80 with SMTP id n13-20020a170903110d00b00168c6109a80mr38548806plh.12.1655981443593; Thu, 23 Jun 2022 03:50:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655981443; cv=pass; d=google.com; s=arc-20160816; b=YZ1eTyN345qbY50jR0Vl4Lz1rxL4Omli2s/pWZMniLaggBdW5Sfr4RgEhuesSu0wX+ v6tOndNp56Q17cbBXNeh6wU8nSLPAjT/4ZUPc1XG1IF97N4PoC+Ev/kas/jBpYFVtS5s e2NHgNWyrCs0mSA0tl4cLailgska15GrLHqm6TvJf1ZMsi9XgmT1q842vjv6Dj6Fe0+h srXMeZtAlhARmadD4RZ1hvJ+g1e05krY1CWV6aNRx1WED5X2wvjW2Az+UMXDb2Ynmn9x Z2jTW20o0j3x5/M9emk3W/pg7McAKkltWX3p7JEQX4dT08JQ5lm/SGi3+dMmYmqeaVwX tzNQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=26iWokZzac81QCDO3If3ITIZSHHPM6LmLzyOkDdEQbg=; b=uC5cTRzE6iyP+BlbkH9blnzawy/CkxDyxUo+xion21yvZY1p9MTVxEWfheqfO3iFvC E1HG3TIa6n5hVLDWDVCFj1NBKkiX+fZHAzLuPCJ66wnuXUX0UXvjo52A5YiTxoUFoCS6 mxNr5ASgj3JK+9dSJw7SBK8lXpcTy7lvUzhQ4sXGjEIymOcd4LBWPH+Nb+AT4xk2o+3g CYO3Q/YREz82mEz5z/GlLRUTGsMKyAU7Ptmd+j+tBPrGefiUIYncvjT9cyTxdmKsO1Kj mOQcCgXeO4HNX7OWs2fQCZI+nYChmKhajkW6Qx58ToNbE7qKd3HOfeVE7tYAnPYAn3dt efww== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=K5duCBE9; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5783-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5783-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id g6-20020a63ad06000000b00404395ad12asi9202435pgf.689.2022.06.23.03.50.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2022 03:50:43 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5783-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=K5duCBE9; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5783-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5783-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 093C4280AC0 for ; Thu, 23 Jun 2022 10:50:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E8CB743ED; Thu, 23 Jun 2022 10:50:41 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2069.outbound.protection.outlook.com [40.107.20.69]) (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 367E71876 for ; Thu, 23 Jun 2022 10:50:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V/8LorhJ/0u6oEBxk1o7aTJTXnSCUbunTGVZoBgaGQ3ttSRHdy1pgTpwCWd4haHrdTiU3/OrKk4bMEsLpslySSi2pZRVSrKZ6Ax7FCaeLVko/CeQadOA8gbztA/2WsUDLQ39YocXCRSnqsDxC5PWnZGoKwcOc08ADNCbqqpaQqoqIquKyI0shpBr6gKUgF6gYTJgH96WTxxKuV/mB/xIKz2y4qPa+HJYlvNfnGU//g7GQruPIogXv4Drur1bWozWvPf5GS6sk4Xkzr2suz+3CSNjcDBgsKrN03zcXA7rCgfhVJj1kM8pDfzrJ7c96OR5QD2CLHDtlxTrCXejlRgS3Q== 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=26iWokZzac81QCDO3If3ITIZSHHPM6LmLzyOkDdEQbg=; b=WtH1LYq8iIcwspfJ42s6Qzlh/dG1kYwKu9jZzON7YiLXde2U71r/CCrCOKkAJ6l4q65bjBTauOXbn+COE8XGDhQ1FUVUvWNZ1fDTdhfHieWSKbZM50cVt2YxuupWdOCmGbGmsJ5By4D8ipKbN8MkVoAh+96nVCIYjjLPmra9kgKiTetBT5t/KmMXSg2Ac9Ho95cUbmiFuPE10ZaKAdUGxGty1s5EhfVmUloss2gBNR+5TBcLh0pFq0IfZsVkgpQkkhKAP8AJz3zVxkd0iyUPqKnU2hj/lNqkLknOcj8xTgUrpmymypjjreVg2NzotSa9eEPckYs1rtXJJ9QopGTFTQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=26iWokZzac81QCDO3If3ITIZSHHPM6LmLzyOkDdEQbg=; b=K5duCBE9v1FnhRMDxh88jQcS0ZDeUMmG0nvlBhU6pEAO66ShrONs6iVK1Kw9f3V/nusFXRtaT2YwJXAFD6/T42OBeajVznnZj9F0MBiZU9I+tEWuTvYgH2/yTj6r3G+74EGfKX7xvDnsL/205QrBN1wu+899fsBJbnTyd2pLXC0XyKwdoV1FhJD2OfawE2madGYIg/tOeGUwRJATcMaHc6/RNkl/WcG9/gv+r45Et4riM0kIgDN/ihI6H3iBWCjN6BV81E1EGZQEEISHzeZS+UYmLDh3SPeAMeXJUOCg1eT0Ez2PowKEaQdQlYeKX3Bzt95cUOrVUyPVS0gCkueyoQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7659.eurprd04.prod.outlook.com (2603:10a6:10:209::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Thu, 23 Jun 2022 10:50:36 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 10:50:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 2/6] mptcp: accept right edge of mapping validating Date: Thu, 23 Jun 2022 18:50:24 +0800 Message-Id: <38bd913f129a632e1919343c89a76151227a4a97.1655979747.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0147.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::27) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f778821-b0f0-49b1-7f3a-08da5506341e X-MS-TrafficTypeDiagnostic: DBBPR04MB7659:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l8oaRfcLTNIESNqHkQqdUneMA70e0AObAtlKO8VRfeNxqwC5r7XX+VKotv5A3ulcQwpORYp4mxrqmqs8Macv1Z9CjlFj5cF1sAo2OVp+195M7Fx0xXEbTlJX+xonlh0cUYFI/yqrOUx7cubJtoIUVh5DWBSJx5nZuJotE+B9pWSRWdoONW+ZYXVksh8RMvvlMAURgURkv3Q8imn9KrvnJTMiubGFwayxbeTwNp6V12nRV4iXqLxnZXqPttEX/pDlgsOwbOIOgnNU8LQJdNo2aqWXB2joInznY5LJpjOgY8OdWloL4qcWivoTvRC4Fo0ONjR5v011pD/TrJ4IvDCnbGel/D0ExJoxmIQU/yTULzvatgJD1DCrysGJpfydUoXOMDT1WvZiCIJVLXEgBnolp+Wg8I1gbZaEr98a5vVEC7EEo5eDcA0cdJ/RmWzRBFab7/irX2Wt3NbeuDtm5cMAKbewOPHkJS8uYrjkY01KsrJP9UhmymsftXm5TGuMu1RuQHVy9Ly7mDWFt5EY0M89vKySny25e/kihiJ3onQF7qIitDUoUwEoPGUt1PIRW8XM1p3CQYqpgXZ2SQER6xeZ8H8GdX62Jsw+cClLvD51gJuG/JJTChgU/D7jY0+o2zwdR0iKz3E/6sOCVwybel2luG3st4bkokz/fPirgg0+T5egwvKFpKYNPsbhMRgmir0yFaACKBk8xyTc1TSwy+7ZsX2CyrN7V9xuAEz7q270C+JIETWy+watt+C5osxueiVs 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:(13230016)(396003)(346002)(39860400002)(376002)(366004)(136003)(8936002)(186003)(6486002)(6666004)(66946007)(478600001)(36756003)(66476007)(4326008)(8676002)(41300700001)(6916009)(66556008)(6512007)(2906002)(316002)(26005)(2616005)(38100700002)(5660300002)(44832011)(86362001)(107886003)(4744005)(6506007)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SPnzzpBpdvU490xDm47CFn2d9SRGZIcxDMgF9y4ll1LRycQn1CUtZz67DycI?= =?us-ascii?Q?6FOmF3ug3YiFxpcIGCq+B8hNyBk6+QnRPGJ18x4+6qpnlNVc7BMrSFEaGjrj?= =?us-ascii?Q?Rg/jiUtvFdp0UDaiDZGQfLsMoYUXTgh4bQ/m7swFu0ejM2biuwRkAbcsMnBJ?= =?us-ascii?Q?dbeerxqXv4AvbfYRt1RorKg0AqeTKeaY9yXma74vYYTHt3WUNG2H2B3GGEpx?= =?us-ascii?Q?XDByfG4hxQh7Zao7n0rkpXfHbe65112aNif5SaBxYEITmwfcHRWd/H31Dxwq?= =?us-ascii?Q?wBzGuakhUTydtId+qvBHwP9LsDXk1jh4i1spI1I6SEn+JJ8vNt5IfrjoFBpi?= =?us-ascii?Q?hzFxjiEzxi6WwKBQNpkSsGL5bwg0WTnFiEBuoT+S+9DKsmO0spVkUyQL94tJ?= =?us-ascii?Q?1hqBY4t3nYENXBsDHmLJrEy6gx4nxZoL/COTovSr43b1ezHnNj0Dli+95h7+?= =?us-ascii?Q?iKwlwyxUBwqnepJvW5oiykhH3jmI8NgLwlPfmZWd8sBBtr1L3Ek/bX9g2Y/R?= =?us-ascii?Q?CT/ZkKRoykVoA+cGABgf+jHiWSAnlutpfYPpVVLt3PzucXXeH0Fs0bhLHZt0?= =?us-ascii?Q?wtj1zcEGufwmNvu/zEtCG2C0OXT6NAyq+cqKU93DtklYDAkpULihCmBycDPd?= =?us-ascii?Q?CYxcVAWg2NdrdWYcOd0GCVUfYDfnMNiYHDyDFXm9iayZ+AeGfTCaqvKU4c/n?= =?us-ascii?Q?EWFJG8oRUnkUPAZmGodnDGYK2z5p38UA1EKqME4GdSDna1VJLfUjRP5/9902?= =?us-ascii?Q?o1o/n0TT9nN03aK2Yn+PlKwMNGKI65wtJSjHV8/ttEmwwg9l8rg56hbg/l7/?= =?us-ascii?Q?C9T4qntmvBYKVYwlCp9x5Q/lwn0h2M5FWSeQmr5jHOxivzuqNYfZsZwR0k+L?= =?us-ascii?Q?YLzgAdfgy4VmH4VY4+GkmKZQ6+gqnhnCmLeBLaYYTNva20Fy2LSbczwsDfzg?= =?us-ascii?Q?+OLuPGEqQUqtTfrhCAgaYtnJX0fv83zlfcymOYx2HIRZH3Tyre9pLOGHWjrt?= =?us-ascii?Q?68zW/nX3wz4nvuKyKxpLStX4H+3uEW9TwvOYylKLEf2EcRFexNwDA6EFOfFp?= =?us-ascii?Q?BDRIxfZDP3sDTNvCGfp+BYIG46m8eZ9Zs2MVpyNf337XVgDs1vHBv8aU0IRt?= =?us-ascii?Q?9dx1X41NWshvZD5jsQJZXL4UEKxfbhcnAwpWSY9MfhLtZJb7xQ8dqik+bjHP?= =?us-ascii?Q?aMUJRzVwXrsSMqSP9insW8UgcObkb5YI3alx+oFTmeTsydC4bDgnA/LXKGzU?= =?us-ascii?Q?d0qZmWdqmmuhm8OPU8ztNDjaNTJd3dSR0XOEwpofzpK5zNDqWRhKb4gQntam?= =?us-ascii?Q?iLsg2SB+ggU5f3/zXmE0LvWKN4TVq1OanKYZwSldLnrnntjPVcAYdVejSxjw?= =?us-ascii?Q?QuaRS1X3ILt9cU/YQtUblHxQ+XKa9py2OX8ujqa8rcjWq+j+hF4tXyIfuhYe?= =?us-ascii?Q?t+XDl6L7vohWeD5bbl7jHKrPH7RkQHWO7ExzF0QnamfnJblLAngThcEt1Zb1?= =?us-ascii?Q?zgKqRZeiA9RYs21TxQloih8ppYCBKDtBcIqjAIFDeLxDNmEe+awADLANr7u3?= =?us-ascii?Q?sbLikhWB/aDO1uAe752uszfUXRxEPO4ay22DCckvAIK1PS3c14EYphdt2lEN?= =?us-ascii?Q?n0GGKHaGD1xbjtNTSFD0uc+aPc5dmCJBXGZdEp4DP/l//LAzrKh6h2MGQh+M?= =?us-ascii?Q?3s7eD8kuAwL8E9nXpCGp5xG6lYRwzdCpDY+hHoNfgCLsxDEaPjac2OsQlfQF?= =?us-ascii?Q?0Hni16PVa39Y8mTIebxMIcwrTQqm3ao=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f778821-b0f0-49b1-7f3a-08da5506341e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 10:50:36.0018 (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: TdrSig3PEqDl4PeozfNgndbW9+jhWARwPZCj9MZyt3zYQ2n75LPIR/H5hYTqGDC8fDlxsiI5Y/C3LnqOPlbp8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7659 Content-Type: text/plain; charset="utf-8" If ssn is at the right edge of DSS mapping (ssn =3D=3D subflow->map_subflow= _seq + subflow->map_data_len), it shouldn't be handled as a bad map. This happens in the redundant subflows test cases. Signed-off-by: Geliang Tang --- net/mptcp/subflow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 63e8892ec807..69a2c3e6fd76 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -878,8 +878,8 @@ static bool validate_mapping(struct sock *ssk, struct s= k_buff *skb) dbg_bad_map(subflow, ssn); return false; } - if (unlikely(!before(ssn, subflow->map_subflow_seq + - subflow->map_data_len))) { + if (unlikely(after(ssn, subflow->map_subflow_seq + + subflow->map_data_len))) { /* Mapping does covers past subflow data, invalid */ dbg_bad_map(subflow, ssn); return false; --=20 2.35.3 From nobody Thu May 2 19:41:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp3037469uau; Thu, 23 Jun 2022 03:50:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1svhnSCrNvp9MC+ZX7qlCgmp845kutjn4P4Pl2j1flYpOumI7QkCGINPd5liSgN/7rnvIXU X-Received: by 2002:a92:c545:0:b0:2d1:a91c:4d12 with SMTP id a5-20020a92c545000000b002d1a91c4d12mr4705161ilj.288.1655981447695; Thu, 23 Jun 2022 03:50:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655981447; cv=pass; d=google.com; s=arc-20160816; b=nUU1W/IB0UUI3gZE9k9vxUTstQS/kTRBWnOGeeuZieW+H+B5r++jknU8CZudYRomW0 DD6oWHRgQrsffq6rkmCQYX0w1BP0Z8MCUB2piKkHBzW2wShG2mspwtbbpezJrS5dBWT2 PMd/XO0ERK6b6iJHd4c448ujDrdWYei6X9f1SzbKKjoeGQ/B5csCWzwN5Yt8UaCY49Jx Gox9oHN9cYoHpS3wQfCGeFtE76r8U5HXUe2n8ln6zY1gOMXG1zVxgMRAqtNg2lHnZZKq ExKdKG0h6lfohKFoJxakBXcK5cWScKS3CQHdpuSHrtR2pcRlBJ18OSL9ngHAeTmNeRt4 G9eA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=KyqihYF231941JfVUkBtUfiOs4a1mIgvx8Ejeh4PGGU=; b=m0XkO1gwPWPPJtYnTn/lhKhvWg4TLIpd0fOfu/V5dmEINSZ5JFTfEAA8XI8pyVEIFN tDblnZV8ks1D4PnbYHgBgEoVUGlj8qa4J9P698AF3AEmzCFtudygSxUOFeZdvGek96Hs X7U6e5REmLbtfc5hIFdZu45M6aT0m8Qx4UB5w8qjW4QGsNnHz/BYjaVpzabHpvGELpIS UAajGz8JVCFcKTXuHa3AON+pPDx92ondRZqNo6qmGdtJrjA9PWLFCpaNcX33mfeq0kQn 5JHQqFJ3ZWF1kVHaNlTpJBc3RLL/PTaSdJesuNuuYQDKuk3o8Tw/MyxQNvBkBIpfz7W8 AhtQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=rWfXSHZP; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5784-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5784-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id f98-20020a0284eb000000b003313015f5fesi23929219jai.113.2022.06.23.03.50.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2022 03:50:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5784-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=rWfXSHZP; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5784-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5784-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 1869B280C02 for ; Thu, 23 Jun 2022 10:50:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 01E8343ED; Thu, 23 Jun 2022 10:50:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2089.outbound.protection.outlook.com [40.107.20.89]) (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 14BE81876 for ; Thu, 23 Jun 2022 10:50:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iIrllSwR3MZHYbmgdUYHF+qZBqki4DrD+XF1NdoR0/soxoPIQSsw0wLXa1+aOjW15sJHJMYbVBtdJDic3bC/U/qCFYRnpU8Lx7rHmuVClx6vJL0j0V9cdW81S4JXFaNoVnARLVV9mp/rGXESCsqAz/hY3x5AjKck5SymLGoAFl5wwD73WWRsSUGRp11vQanoIcIwr9J1pavYX78KWUSBzGR4Dj3hRE7I+EISq7gaPOeh54hf6Q4mOm4eL/+bnM3HkKxV502RlCgRsQ1ZpiwOa9BCgICR7EooOC2h8gbsW+PQTJpvqxRmM2tERIMbQp2b/pD3MCbfXvgaqdnKCbWLzA== 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=KyqihYF231941JfVUkBtUfiOs4a1mIgvx8Ejeh4PGGU=; b=eTDlTmWqQ1TyZ5/sano4mr9DfNdXp6nkaYhhSC1/a9H+9dxCdy0r8DoNcU0vm0ndLHbui841EMnsVeBp6nyBvcnNb6cdqWQQt6KoR0I1cBj/cEWk0nMpnyKdinG0V87xJXwCYuqMKxD4Gd/nKmloGADO5/Eh0FF9lZzIO76s9qVXLDLcSScFWI5JXiKrJBKvbwbp7XUQNJaKIgg2YNa3dnkrohkLJUoCg5e6yoM0irUKA0WWcNhCgAYYz1RoG7H3h3+XDgTai4JibudT2XGaihLibjiqaYlq62UWDDlF6VdnHxS3W/g96DqyDbRPchk3ClP30FP8fnHiVFcQPpMTOg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KyqihYF231941JfVUkBtUfiOs4a1mIgvx8Ejeh4PGGU=; b=rWfXSHZPGWsuwdbjLLQXKUkmZv7YRDy4voJUwcBfIUO4n9igH9I49KyojK+SMO7AQwUthN5lvdUJeg5i1e4jU1463M875qtUZOtm1ze4fCynTgKJKS8lFUhwYcWK+iSC2D+o4HokDaLLEcYCwKkhGQFGwyFmXo1ZZPU3CLrdHUUZwrlFpuzNM53CMJOXU9+hkHETVIMqOP15ElkLUHoVOoH5jf2dmtxfpvN2AK6kQ+0EA+ERLiWKyUG09+tdyzvqbDJoq+qvI8KGyVdCsaTxSjamisYLYe1OCbfyhzjZYrFCx4TGSYNwxgpi18EiMxrcgm27clD5faF+ZTXsnPkcOw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7659.eurprd04.prod.outlook.com (2603:10a6:10:209::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Thu, 23 Jun 2022 10:50:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 10:50:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 3/6] mptcp: redundant subflows push pending Date: Thu, 23 Jun 2022 18:50:25 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0148.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::28) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e053e7a1-1f34-47c6-9363-08da55063790 X-MS-TrafficTypeDiagnostic: DBBPR04MB7659:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j2HeWkaiV7C0gapSbOZAn6lfrdy33kRQOHguzzuUAd5ZIyOvSb7uyarDEEJAkGfg9B9fwvIk9JhhJ96L3Zy5gkxKT04IjcLlTAkPpjMWoHQMXN1AY0tplL6Bn+V2l5A/UgoUX+qDzVB/fmMwoa/4bnnmwCAC7sepCpHn5QFrFYffgBOua1dAeQ8/595X9sR5YRpVkYv55HOpWZSPRMkXSumZg/rXYiIKSD92+yiLa3XBASM6x4V6eR2N0htg3h/cgnMleM5ahDguR8KwI20ZFNPa3lbDIouF+1K3UXD6jsvGNBYl1S/HQZ0skW7H1XAsvVNxThG0C/CGWDc3yflKTUd31n8i8c3zLj3/pD3uqD0wf2X/ZCGWkdEZ4yDCAMcUlrpJHzTjueAa3//zsoXxxX/kIeT7d9OgWginM3kR+hi59AxwbL/XKfI93K3jMFk6ZaKEg2KtHWBJdov1xAMyjXikXUheByFSaQ2Jh97AJiR9dNaQzdgAOqsriJn3yED759ICsfM2qRAmMGjupq3DyTTWjLqW8mhtFkvGtQOntz2EyBPanw1ArL7bA2zJ7RcPcZBQHmMBrAn8MPe+ag3XJpspGPB2dpCVASl7qLwSqvVq5gy5jP6acTyKKKT2PB//c3hLhsd3LeVS+0oRIP6ikflbqlIQKLZVCqdyb3E7xgB4Z0aRfTfgbcTcCBnWbfQa+Aui0K2gQeMWuOxJHhgA14R9k2a/V+iyB25k4FxV41iKQW7+5TQwgkMOMoUyEJWt 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:(13230016)(396003)(346002)(39860400002)(376002)(366004)(136003)(8936002)(186003)(6486002)(6666004)(66946007)(478600001)(36756003)(66476007)(4326008)(8676002)(41300700001)(6916009)(66556008)(6512007)(2906002)(316002)(26005)(2616005)(38100700002)(5660300002)(44832011)(86362001)(107886003)(6506007)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Jp8jP9xoTDD1mA7eGawINT969nJhJqOoyM4kAoucpkJiLesgsclARrK1lMi+?= =?us-ascii?Q?dZTI8C5dZlKpcigodjkPLfme30xwdJVvvocvB5sCh9F86CfYCqka8ZEA7sYb?= =?us-ascii?Q?7FuWzL+wggYv5diAzczMnZHLKfu5fsWQE/4xV2Lw5p1azoWeCOOgRM32aR+Z?= =?us-ascii?Q?ozK0fJB8dfRgovEktGcX23LcwhW2UWV7raTqSoz2wmr81cz65P8zTFKdimz8?= =?us-ascii?Q?CqosmcTHXdKl/SX7e6I2XQMuCAI/FI1nTJ8IVMHs3yP3qYi0xvIRaonorSMt?= =?us-ascii?Q?6jOwnZ4TqGleqjjn3dWznA7UJCKpoHJ5TDz2rFfE+7KZek9f6D0T5Nbd+E+q?= =?us-ascii?Q?SgBhlh9WpSx9O1bWacLpoOaKlUsQJg+lDkiIaW2fb6i5jn+q1uSd1k+90YoE?= =?us-ascii?Q?sNv8iqeNe3B96ihjUMudVD4QEoelhsXqUa97kCg7hFqZRSch82HUJzsKry3J?= =?us-ascii?Q?wsCoQItr+efWzeU6L5hLTjhd1yoaRIfxQG9biqxx5UjWv7gbrxixk0u4ZtLW?= =?us-ascii?Q?HHkQQS1UlYZSWdkCqx8TLpTE1mh/yBn4OC7V6THinr1P4L6tsGwu15FcvPcx?= =?us-ascii?Q?fVUAlPlIvBP94t1F08qy264Rxa0GHEr2w0pZsZgLdFU5Xu5UjtBmeQNIlXnf?= =?us-ascii?Q?pCe4NwOeU9hu2OyvrHSvbj5W4frNzwiCTB9Q82ymvu6OPF4CRxp3SQCDRAfb?= =?us-ascii?Q?mcJsLznUZ6vC30EgugQHiLxNlGLz4yYRLt0VSn+1bIGh+O3FecMDgQgwE/pp?= =?us-ascii?Q?9dGLMQYO9wRrqomKmFwJKJLZ3E2wZaJedjHwJSJwjE7VCrwpDngZbSNAAKug?= =?us-ascii?Q?3ZKUFg8r0/bGG1ZG14R37Px03peld3RTBOecSfvQ/scJ5U2OEDi0ScwqfgVY?= =?us-ascii?Q?JjFQ22cjCyf/ISDeqp3jYmBDZmJ0WoTX7Cg1qZ6h8ZKs3ihIm8x6OT4hB5Lp?= =?us-ascii?Q?itcmtrsyKSZE6Q7yTyvlQ79souAg9tMDQ+DojSnnfAnFKWUd+jX2kmGQOC7q?= =?us-ascii?Q?rdwaGidXpfZB0oUQYc+spJnDI7oJwVfxFx9XrOBhZerdQ6R72GpocoALFubU?= =?us-ascii?Q?3393ecM7XbqjwF/u1EcKitAkkrjCKnHAs5eCPT12J07fEKRq1uVMx4ifPXhE?= =?us-ascii?Q?l6VT08GAuHLuwJU6mzv4o6E6u7oATQqyzhhtDWgdtxWXEdU0h7ekstB5UYre?= =?us-ascii?Q?U3DLw6CzvZ58vc1aW2iztBUT8mHs69iSGvL38d0AaD0d886tlHG3fC2m8ShL?= =?us-ascii?Q?Ri0GIlhPGs4+C3orscWMJbQc0fSQlijxtXcGBoFB8Ty0tHRDdIUU5BhvtwW7?= =?us-ascii?Q?9UzMvLz7SZCqXelf0NhuarUFs+3K5sb2zoC4tYeqbu1ibfW8rE8my32IVeTS?= =?us-ascii?Q?Jt7geBxUfoEiKH09R0q3fn8fCPFGRfwhkA9rn/0E99wiWMmYASWunXur6LPq?= =?us-ascii?Q?eJ5a4aIru/VErJseA9dxxY3vjzoKS6PjoWPPxtQ5HUJGR/JP/tKNJA0NmFVk?= =?us-ascii?Q?PJ2qCLm9BviGhX4XQUL3EGWynG0Ox2gWChtqPiIqwDYaPROYUjtd128iu+YO?= =?us-ascii?Q?kNo+f29uMuZ6gqQmkq1X6Ggk0GmE4E6qrU7GdMIwqhkVGEbnCeZxp9smcB6e?= =?us-ascii?Q?0tl8UHADuO5Wvvl/YFnjOmvR8MUslE5Fhyl/IOeLm6+gkUeGQF94QkJy26b0?= =?us-ascii?Q?meRYkN490p8NbYMrWQTPRUlBsGqJE8D5I2SIm/5C1qpKgVG/RlBF2rOa0zhq?= =?us-ascii?Q?/IsUuVd4bQt1HjpHM5JosZDr1FYKtos=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e053e7a1-1f34-47c6-9363-08da55063790 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 10:50:41.8451 (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: HnfIEJMUCY1UUaHn5WuzNRJKeg9NBPwNsRZMNBZGERF1z3sjPjZQhVoQsoZNDl+VTyZOEbT0JdNifgfAqFc9TA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7659 Content-Type: text/plain; charset="utf-8" This patch adds the redundant subflows support for __mptcp_push_pending(). Use mptcp_sched_get_send() wrapper instead of mptcp_subflow_get_send() in it. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 99 ++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 41 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 15472d0af508..0be43107170c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1516,63 +1516,80 @@ void mptcp_check_and_set_pending(struct sock *sk) =20 void __mptcp_push_pending(struct sock *sk, unsigned int flags) { - struct sock *prev_ssk =3D NULL, *ssk =3D NULL; struct mptcp_sock *msk =3D mptcp_sk(sk); - struct mptcp_sendmsg_info info =3D { - .flags =3D flags, - }; + struct mptcp_subflow_context *subflow; struct mptcp_data_frag *dfrag; - int len, copied =3D 0; + int len, max =3D 0, err =3D 0; =20 - while ((dfrag =3D mptcp_send_head(sk))) { - info.sent =3D dfrag->already_sent; - info.limit =3D dfrag->data_len; - len =3D dfrag->data_len - dfrag->already_sent; - while (len > 0) { - int ret =3D 0; + mptcp_sched_get_send(msk, &err); + if (err) + goto out; =20 - prev_ssk =3D ssk; - ssk =3D mptcp_subflow_get_send(msk); + dfrag =3D mptcp_send_head(sk); + if (!dfrag) + goto out; =20 - /* First check. If the ssk has changed since - * the last round, release prev_ssk - */ - if (ssk !=3D prev_ssk && prev_ssk) - mptcp_push_release(prev_ssk, &info); - if (!ssk) - goto out; + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + struct sock *prev_ssk =3D NULL, *ssk =3D NULL; + struct mptcp_sendmsg_info info =3D { + .flags =3D flags, + }; + int copied =3D 0; =20 - /* Need to lock the new subflow only if different - * from the previous one, otherwise we are still - * helding the relevant lock - */ - if (ssk !=3D prev_ssk) - lock_sock(ssk); + info.sent =3D dfrag->already_sent; + info.limit =3D dfrag->data_len; + len =3D dfrag->data_len - dfrag->already_sent; + while (len > 0) { + int ret =3D 0; =20 - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) { - mptcp_push_release(ssk, &info); - goto out; - } + prev_ssk =3D ssk; + ssk =3D mptcp_subflow_tcp_sock(subflow); =20 - info.sent +=3D ret; - copied +=3D ret; - len -=3D ret; + /* First check. If the ssk has changed since + * the last round, release prev_ssk + */ + if (ssk !=3D prev_ssk && prev_ssk) + mptcp_push_release(prev_ssk, &info); + if (!ssk) + goto out; + + /* Need to lock the new subflow only if different + * from the previous one, otherwise we are still + * helding the relevant lock + */ + if (ssk !=3D prev_ssk) + lock_sock(ssk); + + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) { + mptcp_push_release(ssk, &info); + goto out; + } + + info.sent +=3D ret; + copied +=3D ret; + len -=3D ret; + } + max =3D max(copied, max); =20 - mptcp_update_post_push(msk, dfrag, ret); + /* at this point we held the socket lock for the last subflow we used */ + if (ssk) { + mptcp_push_release(ssk, &info); + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } } - WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); } - - /* at this point we held the socket lock for the last subflow we used */ - if (ssk) - mptcp_push_release(ssk, &info); + if (max) + mptcp_update_post_push(msk, dfrag, max); + WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); =20 out: /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); - if (copied) + if (max) __mptcp_check_send_data_fin(sk); } =20 --=20 2.35.3 From nobody Thu May 2 19:41:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp3037513uau; Thu, 23 Jun 2022 03:50:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s21CJ0ojo2y4svTn5ZC/04PMo7vP6g8qZxEcLH5eFvLyPw7npAv+v/vl7pX2gnBmaPE8Ww X-Received: by 2002:a05:6a00:1acd:b0:51c:795b:860c with SMTP id f13-20020a056a001acd00b0051c795b860cmr40856589pfv.16.1655981453384; Thu, 23 Jun 2022 03:50:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655981453; cv=pass; d=google.com; s=arc-20160816; b=l4BCFLdYM6O55Du5gE+YeLHAae1CL463fOUEwTt2Ntk8ysmBjtx18oXwSPwrAb5HpQ x10axbJLYH4SgJQvNjYzYk2zuohpoTes5Zf4S/D5cPg2l2Pkix4E6poy0op/enA/jRXr FDk1LurVq9T3TjnO+b16uKG/7TVd3SRjBbkrUx5I73vqVu0c/mGzE6Pk7mL4joJ93rUF 1C0Gu8FNXFyrIsUMlxJY14cNXxA9Po0Tfwc5FHqDk6FFVAneH6lC2Hq7j8WTmH3RzXOL B31sOSR9TKFFVDbM7H8eKhhrqe/a57GdZTKYg4BVpvlOi+yJRSbGGioQog1aX22AkUil opPA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=/5X1fTO+vYJZp80VJpLljx6NMe5AgXzroUxLOI1ndnc=; b=ODc5iPIHNYQ44QrYJPmrFVkiaCZOJeUCx0gJSO0o69Q/hchswr/+8+vkDTCRAWyqWo R7gOlEBpjCF1OQW45IcNZ5NpjKQhWN2iTqkhLd8KKyHQYwXG7EQA7ygQeLfRHjg9GKOT UrWDTQ80jImZWA4eFAuptnoV3C39YIhVwnAmVmB1Yurc4WqmQcu+KAnbgfjLFRgk8+3l 9X7xgL1/pXhrvTVklSCwdL23I9aRMu/fYDiqQPONm81ZoLLGrRtBIBR+Yv60vI4DVd9i HE+oWmeUdDuYZoH5o67uKkDKHBbYZAhGBfGbv5IKQHDT2MFw+tUcSuAI75RmC6eYmXns 40+w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=De+GRo0S; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5785-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5785-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id h12-20020a056a00218c00b0052551b26480si3932860pfi.99.2022.06.23.03.50.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2022 03:50:53 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5785-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=De+GRo0S; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5785-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5785-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id D2654280C08 for ; Thu, 23 Jun 2022 10:50:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DEC9643ED; Thu, 23 Jun 2022 10:50:51 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2079.outbound.protection.outlook.com [40.107.20.79]) (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 6E7FC1876 for ; Thu, 23 Jun 2022 10:50:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jLdPD8SY7yGHDpG2QW/PQ70bRD4XPz4DJu9u1apIrQbidSrvshtHpdBTNRrjDpAECD4gX7S84cGdmkFXhv4/sqzEfKMeFaqkCIP1+/RN3i+5LZVeGNw0oRlNE90J3yoz5q12jr4zyT5xHBJ7SWFYNqfHWIp3Cwob43We3lc6Q1ftk6s5SnRlIEbL6MWvljt2mpL7PUXtWY07ksbtFUzL84C6gsLLgxNRuAD/pl2mUie1KB1GX/YgtigyZtIN7yGLFCZgswNKPU53v6o7s+jykdVY2iMVMqOZ9XF1T/D7H0BmleOsdZhbTdUz8zNw7AUqnLjHq3HqOGcQ+Z9FsdYTsw== 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=/5X1fTO+vYJZp80VJpLljx6NMe5AgXzroUxLOI1ndnc=; b=RPt9InoWTnm7NwdxpdA/dc7vBDJZ8nF088g+X255KNsWndez9MIjecFEWhzKXKR2GZcp3PpQ5ARf7HEPFOuWvfgPiCqvtzxlaztkVWbyme+6rrNSYZUWe2w+PrJTit2FpqWbiuCA1IHS1vlWTae7DFq8Z4To5nLus8z6KATaz1H4iubKKST8sb+b9kcwgbDxzm/AAyiOCl2YANQZeDFdHjWvXCNWPiLa/l9hXy5olBSjuaoGe6smrYVLDhuLx3B0wx4riC/o8MByL6ESJ3dkkJ4bfgRM8MXEyvYXF062YgWFZfHDWw6aiz0j2sE4DwCtsjw1JVHhpO6UcZ9RBP5Rrw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/5X1fTO+vYJZp80VJpLljx6NMe5AgXzroUxLOI1ndnc=; b=De+GRo0Si7koq+8Y0L7phqQ9vY/cN3vFlanldYH1Xne+Sk+iXwhajEP/ETuG/YYnyAWvtFiOyILLs9ouATv0E72NMo3j91e/FgLmrU+N/EAgw8qqHMG4CMw8z6qV18mNjk5xCVH5ocVM81vJYLTqIhw5gua2MHfTWs09YjoYUT+A9eelbU0lonjjzgTrOXTyS/HOBw1v4kEDnAU9EI+K6tYPaoKlYhsHjaB0VwaeL9zRuwFh9rtsTWOYPLGgmeruOc6t78aiCW4TCIRpPEffsc6xUfKwYhk3xYB5mz3OAjnEwrEn/w0k4E2/jj93MjZ5RSyWFYTpSyc4mui1t08bKA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7659.eurprd04.prod.outlook.com (2603:10a6:10:209::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Thu, 23 Jun 2022 10:50:48 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 10:50:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 4/6] mptcp: redundant subflows retrans support Date: Thu, 23 Jun 2022 18:50:26 +0800 Message-Id: <57f9e302fd2dd3273571d25adedae755f4fb8a30.1655979747.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0136.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54544ccc-c9a2-4b7c-2eb1-08da55063b2b X-MS-TrafficTypeDiagnostic: DBBPR04MB7659:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zvvCllzEF/UrgPeINzM/CJ1djToOkpFmgFi1te/8fY/ebLViyvyDRDDdP4uZ2eFLSMWbEf+g81MNAyMXHvXZs+LMxsC0AKHm0igoLHkUTJAMMSiKCRYf7yTCf4X46gjZIC4hFiKvICv6WkTRFFwRVuqedgEOKvKkar8cFMadNkbpheccgants9YrfeaHjbopXuCMMzbC88Qg4kRqHHL5sYIrE0UlODR9u1fqbz4ndA3EB+fnVIU3aDAdklmvLbqr8YD2XuJRAnxISWT336e3cn/teqG2p8pfW7IrbdOYXiu0ig3RXc/wIFiq5yWF8u88xeWStTsUJ8XdQPyRfDSiZiAHjdPbbWLs1mLTnTmbtnAuQdHZOa9iQMuejbOhpdVF1tkYDjxVS0aSbmeZtOnK5Sunt9ML9PGjqSLFddM5u0tGtu13xElfoYNUnsPMHAuNGY8zJsKH1KMppNdQ0PMlV5xgojCUIz9Wg9VINrNMjsxKbal1WQ8cPCyAUsN7iqAfvWFjCpHlpMWTM87JE1kih+I6Fu2TQEJr+rK5EwfRxMOPVzkWN496c843es9GXrb8atM4YrQbgi/WNrOVKB4L0fmLXAQXZur4Ptrtx1E9GQeWKwii2MaQyQ7qdgHkX5zWdvoW45/z+sUu/WZG+FsgcuyxcMc/B8AAxHhiA4QZaAFngod9cxNj4tII24y5mm9kdIDGxceLWqwB/29X0ZBeYUfK2neDM7EA4tOSUL5XGINpk4xTtk2qVOj2UyiFnI8x 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:(13230016)(396003)(346002)(39860400002)(376002)(366004)(136003)(8936002)(186003)(6486002)(6666004)(66946007)(478600001)(36756003)(66476007)(4326008)(8676002)(41300700001)(6916009)(66556008)(6512007)(2906002)(316002)(26005)(2616005)(38100700002)(5660300002)(44832011)(86362001)(107886003)(6506007)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5S/sQGMTXobDeHzb/7Gm0/9PWCCr0khKkyy30Ln8ZV6wTZV738GHfXJFeAgA?= =?us-ascii?Q?mj5UF6bcaeWkb4IzKlyzf21EhUcj7U0QydjrrRJryf+T1HLzKTvPDVYanRXB?= =?us-ascii?Q?Z+D97LlstSP+OVETd/9Sd9i4Z05kYNFybEnSFIlJLYz2CP4/Kpt/xkmPmcO6?= =?us-ascii?Q?TAiHRCf2yWO6Gz0Wn1NdMtw5NGX8BM2S1kVYhoVN0tTkbOmE8SDj6A6GDiN1?= =?us-ascii?Q?ap5oP1yqhRJoZu9x/pL0qEcZSdwLSq96Dbo6AUQkcRpgOlisVnbttZRQZMtK?= =?us-ascii?Q?BZM1kWF3n6sNRPeKWo36GzSDTictBgWHlIReVX36DZADQ8dKOiDXfQERs76v?= =?us-ascii?Q?lR4yR1gUlFHKljLfpt03XXkhS9nkFGZw8lWqwsSItn0WuzxRf87Wn5NjMjzB?= =?us-ascii?Q?tp2VpWfLmCX5jN3/Q9ixCrBI9xx+VzYNIBTr2NIgmvF39jJ/2TjjjeRfJhDm?= =?us-ascii?Q?kN4ZfEB5pcu1JsYZebgU2kJwI2lyPwYM/5a3E4Lck3OM9mlz53yl2UMNvUi1?= =?us-ascii?Q?eFiCo4g5USsfHvpjBC6mjQ2grj9Z16+l03szMDiFzBb9zrEGHdkhOK+ZL3J8?= =?us-ascii?Q?9pWVbg0ux604vjR5urdtNT3u/D0bBGrMXGZ0fW3uTbvNQ6urBaXt+lH+fiM6?= =?us-ascii?Q?XQAtWqXGXwa4k/o0oQ36EVssnPqS83YL8QXb7x3ROlTtoIWtx4NNJvNKwTeg?= =?us-ascii?Q?GY2RasUCO45/gbzTn/EVyDuEZ33S5PJJ7iO2nKszI6RZxjQhLWPlT+SJQkQA?= =?us-ascii?Q?+2OXSKr6mOy5PvTFJ/LuZwcZOjs59ISPAv353pHgdm7yes9k+Z5J7lq/ZVcv?= =?us-ascii?Q?DJvJmFA+tYHckfOtx+ycuAvZAdNctARbqgSmXgBy7QMih7RWi6A+q8fgwGV5?= =?us-ascii?Q?Q/zR0W7LzUij8lJG19ggbfrWeB1Sk8UutbIZNr5cUSVn2KbKJJehc2WF+kVC?= =?us-ascii?Q?bZj0eJ6eREph50Dxv57uT+54MFXrF2nCLcq+mSGqEh9+R/ZcUXeXNvfRm9ho?= =?us-ascii?Q?X/+vMU5mWLUWyuPKHCBIVvJwqH3A5xJsQALxEuBNh9Qn6Q+iZVeuryU6K126?= =?us-ascii?Q?S0xl6HaEu0dnKTie/9wLrxRnR1yD37z6xtJLYBFNi09/F3xM9A30wUx8Rtca?= =?us-ascii?Q?uc5PtAKA9k6SBPZ/xvsMvMRyPmjq6nBBCifWvazpGFJesO4G9IExyzpCjcN9?= =?us-ascii?Q?OxZOQTBeOQIL+pEbKp30v8IiSJRrPQwSwVdJOkc3Yn4bzPUgdNbZ9OK+9aKM?= =?us-ascii?Q?FaB17nCphI76dydiMbW7rkjDlQNtFTsJSA0PpkpMkX8bJ8AotUv+Z85cVKhW?= =?us-ascii?Q?oywlauwgch4L2r5CpKfsh2JsawEHHCpx5U85tMwvQpl+Qb31+znzyXyfeIIP?= =?us-ascii?Q?9u/5InhunXwmOiKyDSUwrplTK9FBpxlKVPlMXPEHnelQWpOeAqZu7WsvwJF9?= =?us-ascii?Q?q+KbNH0/ycCI+FNUnipF9Kzjo8ig0ts7cBze2pQ0S5fAs4cFrzB7LBcuOlj4?= =?us-ascii?Q?w338SjHQXVX7WCOGp+QCYeqei0LWDEriUrSaDPLTFRJ1XOayVlbtaD898Eql?= =?us-ascii?Q?NjL8P0Mgq/jTdu71lq2nq+1yUwSRU6qaH1ZLaQTbrGOLL6fNvxyo/Rh9X0cB?= =?us-ascii?Q?jrs+V+h0JTb6mY+Mon5yE7/xqHH+NqKCI8TYxEOz9/Zkvj2QYQ3uDzFfC/Op?= =?us-ascii?Q?6PWlNy+Zg7L+yxOpm+n58gyAPOPmBZhPr2zLKSB/1HHu2zZz14l1c+NXHzmU?= =?us-ascii?Q?gYLQLasGZE9w/vSySGiNYKH/fFyuDqY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54544ccc-c9a2-4b7c-2eb1-08da55063b2b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 10:50:47.9228 (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: aXzW/6t8g1sSqyawxSvdJLNFiiQ6QZg4BlSNScKmgBePSBicDG13SmV83OMukhadz9s8b/MJEsTdAHg6VC7ZVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7659 Content-Type: text/plain; charset="utf-8" This patch adds the redundant subflows support for __mptcp_retrans(). In it, use sched_get_retrans() wrapper instead of mptcp_subflow_get_retrans(). Iterate each subflow of msk, check the scheduled flag to test if it is picked by the scheduler. If so, use it to send data. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 62 ++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0be43107170c..c7455b3787a2 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2416,16 +2416,17 @@ static void mptcp_check_fastclose(struct mptcp_sock= *msk) static void __mptcp_retrans(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); + struct mptcp_subflow_context *subflow; struct mptcp_sendmsg_info info =3D {}; struct mptcp_data_frag *dfrag; - size_t copied =3D 0; struct sock *ssk; - int ret; + int ret, err; + u16 max =3D 0; =20 mptcp_clean_una_wakeup(sk); =20 /* first check ssk: need to kick "stale" logic */ - ssk =3D mptcp_subflow_get_retrans(msk); + err =3D mptcp_sched_get_retrans(msk); dfrag =3D mptcp_rtx_head(sk); if (!dfrag) { if (mptcp_data_fin_enabled(msk)) { @@ -2444,31 +2445,46 @@ static void __mptcp_retrans(struct sock *sk) goto reset_timer; } =20 - if (!ssk) + if (err) goto reset_timer; =20 - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + u16 copied =3D 0; =20 - /* limit retransmission to the bytes already sent on some subflows */ - info.sent =3D 0; - info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : dfrag->al= ready_sent; - while (info.sent < info.limit) { - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) - break; + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto reset_timer; =20 - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); - copied +=3D ret; - info.sent +=3D ret; - } - if (copied) { - 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); - } + lock_sock(ssk); =20 - release_sock(ssk); + /* limit retransmission to the bytes already sent on some subflows */ + info.sent =3D 0; + info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : + dfrag->already_sent; + while (info.sent < info.limit) { + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) + break; + + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); + copied +=3D ret; + info.sent +=3D ret; + } + if (copied) { + max =3D max(copied, max); + tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, + info.size_goal); + WRITE_ONCE(msk->allow_infinite_fallback, false); + } + + release_sock(ssk); + + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } + dfrag->already_sent =3D max(dfrag->already_sent, max); =20 reset_timer: mptcp_check_and_set_pending(sk); --=20 2.35.3 From nobody Thu May 2 19:41:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp3037554uau; Thu, 23 Jun 2022 03:50:59 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sqHWe16yFzA3a26/g+KtTP3+gdo4IvHwcpVBZAoTp41qMDTzpbAbjjFe5orua0uCI71CxQ X-Received: by 2002:a05:6871:82c:b0:f1:f953:7ab7 with SMTP id q44-20020a056871082c00b000f1f9537ab7mr2143805oap.189.1655981459299; Thu, 23 Jun 2022 03:50:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655981459; cv=pass; d=google.com; s=arc-20160816; b=X/FzngstnJYsiJTgVH5MtLp1iBwe7P0hYl0WS8UNVyFGlp3kHcPyEI8Biun2BAqVYo hnwqV1v0cC6yQ9w1WZpPmBtGxtrR8iO986FP86v7a+YFQU6mDTjSwCeck29F0Gb0NU+Z DU/7s7NyPvQJalW0HTLOfer3wJ3+YAJes9+WBeZUZT6PeSWLk5+nPClIMBThVq2J6Lt8 J7LLm39M6t4/RJB9upc7GikrQ2TntkcAAhCCZaiTvezIZnEHmqmoECaBo/x3/UuTH95p 2yCQ3CeowU9e4OJRAZo/PUGc/dn+bvMvC4/2EfZWPIz5qUCvw14+WYTq6+59QPpCblsB qfPQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=4SpylYRiXp0P4k3XioNA01AuM9ZHejqqclsSfyCQrL0=; b=pScOjoQbh3ZwT/knECGMOR9+qMGEg7OUSla4xKphbHqB6YyS0JgSIa2oitim4kEax9 81iZPoE0d2lgZs9zBNpc+Mk1UsUmzXtJeTrFmen2wQJF9cLH938mjByd1eYUrK45x0IF J1xmKTB2YKX8DorqAPO6mmLPiwpc/7sVnYNmbwy6mskJ0kamyRycXnjD76mj21gz3+kt zUV3Fb1VTPyufnGauoaxxU2Z7xOISu+M2D22qYm4VfAYhQ10taSSMXGXbayX4nvjiMAb AkeVSto0eefnZg3yP53IKanq1hFXiD8ieZPASIWjRqcNA+0AFn+GkPVIa2WfvjeC9Zs7 q8Vw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=xJFdGKSc; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5786-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5786-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id z3-20020a056870d68300b000ee09167dcfsi25041520oap.139.2022.06.23.03.50.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2022 03:50:59 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5786-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=xJFdGKSc; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5786-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5786-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE 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 da.mirrors.kernel.org (Postfix) with ESMTPS id 1AE9E2E0A48 for ; Thu, 23 Jun 2022 10:50:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CC9DD43ED; Thu, 23 Jun 2022 10:50:57 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2067.outbound.protection.outlook.com [40.107.20.67]) (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 697DD1876 for ; Thu, 23 Jun 2022 10:50:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d5DhWBSxLNU3E9HrBSjOSy/hK7r6Zj8IJTtUl+hm1D5Mw6qRQUxxGBUKbdFz62y5EtQtcsWosUFwa55LwNJAy2wecWwBygZ6KYKZIBMrUqPZ9rwowbvNLWTFLHcW7BrpRAe7a3bKaBgvU/E5LrmxF0KMCyMkH67JWbAVeBmi+P7EX/1G11WcdyV7hHQvYZX4jT5YAJTbGeLSycSicS4us+ZSrHziQoZKLo7FVEriPWqmvRuCMzcm55xD4R0ZqOZOT24U1LtvO3dlNxHN7E7ODeayFZk1NdRthegTmdQorXgjNhYaP28hGOKuXXzVBPnlt0lPHT9YUGu34shPlGCz+Q== 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=4SpylYRiXp0P4k3XioNA01AuM9ZHejqqclsSfyCQrL0=; b=c8wPb8e0JC4Bi7PoQF2z+6Y9tTd5s2JPXH93bg3I8RLZKUswcZSrnGC5HqqR8LT95k0+cQ3dBzV0MfjwHsNfgszpDikB77F/UL3qhnqbDcQpRYMaWFpm+3P1/kLCBdP4rN/195RJhCTjduY+pOEUjsSa4wRy4Nguo2onXbzCiNCrNWAcQmzt7R473xjB+pZfh5SolDa9fiByhBMEy/g0LOTxqMStjlARILH4JahLgLim506fBOC9JKEDJISzPar6Yyfsi9d4D7BzXWpcipjFmsmrKkUA/G26Iqj1X1KJak8KgDgX/M2D+qTCiX37GC2ZLB34nXd5oJjWyXCzpMqHKA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4SpylYRiXp0P4k3XioNA01AuM9ZHejqqclsSfyCQrL0=; b=xJFdGKScQt6nqStJyhEXs5Wf4EBa3foJUGP1ZcOFPmyHUD8FuPAjjZ579XyRQ0Lcix+wk/A2SXzQ4KUOF8VVzxekwybKiOdUNc+/9Lg7L92Gw3Ss9obQlmcYwdNAl6tfD/HZgCGQ8mvDwqcGi77CAKTORvcxyqjBRCtLKilceYfAkd3vHg6M5U0+0zsC3+bo6mjFG9KlEkxp8vXLS+AKhPo+b96Hc2cUz4cw+Q//brqyAyjGOvaIHMYdvlMfnrdoG9j4c7FZpf7BsUjHx5gePWSeQ40MQIpRjjtJpsrT1Zu6np7fDhCbC6dac5toozkCL33I4xSYm8JbgFFc6KgvzA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7659.eurprd04.prod.outlook.com (2603:10a6:10:209::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Thu, 23 Jun 2022 10:50:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 10:50:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 5/6] selftests/bpf: Add bpf_red scheduler Date: Thu, 23 Jun 2022 18:50:27 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0137.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e782312e-8429-4077-f0df-08da55063ecc X-MS-TrafficTypeDiagnostic: DBBPR04MB7659:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kvYc4R8MlyD7qB8aXozLup0rgXHLbKSez+taY7M9X/DmvGgaT8HDI7JDl8n415P0uLjcXl+rv/ibor636A9wq6kAWlneUku3KG0B7dIPFMu6x3N7WofRZgKZO0b/lZW4AXzFTLP1cTO2mw87ZiJ/HGo92eqgFNkUsu4IhXz+zJT9CokhqBoHK3sicFdNrMIF3+6n8Xg5iKcYgDA7EoTJZ2jaOXJyhoUQfjcX504RlHq1KlJ/LB+ZTmKgR712cgNAqWBR1zkRS1b/OfLRPEyOGxu4/pVw3oGGNbGqEXDMyVgjW+4sn+B7MLcpuzFqZPnUmQvPD/uhLO1CE5EW8kieuaHResxAPYKZouaka5pFDpPcfOJ7ZUTlKuRQtid4ZMwKo4CVCdpXktn8p0McfAaSJ3pmgDyySLN29rpuCvsMz8a7VnDrhN86qbckBLZiUjkGwcH5UHTuiHFQjbe29V4ILPA+XEXLVegqElofKMSASJ9hd31bDNuqRrl+PvSJVwthtRSu1X1x0LECkKpPVydGItLCSdv4S7usYk0R3uyfu7yZUTLXOiLwGn5cxWU60/sabXuTh4yMtMNR1KEh0f3ckO6K7+LRfeQ1oGcjf4xfmCLIa6hmXbh7IJ5hRU2l9XbOukOdd5xmIX/IhYV4aUx2xli3GPcfl054O5B0EuO1eeHwG0QSjZ0fa1ai1g+pHZo4SdqYpuAQImoPsHb5yKHTkNDviGRnyJs6RCT+Yd1xcfL59ImOlYhI8WV0PWDFyVk7 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:(13230016)(396003)(346002)(39860400002)(376002)(366004)(136003)(8936002)(186003)(6486002)(6666004)(66946007)(478600001)(36756003)(66476007)(4326008)(8676002)(41300700001)(6916009)(66556008)(6512007)(2906002)(316002)(26005)(2616005)(38100700002)(5660300002)(44832011)(86362001)(107886003)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eoJJSYOvoXzzZ6VoSxsucxNQkA3Oiz9SCBLhHAuZe53MvdOs4y/Mz2ooQ4zs?= =?us-ascii?Q?niUYecqGIx6/9Ipg6qLcf5y+NsfRYGq7gsmTL6+Py/rfBaeE2r/j9NIFogqn?= =?us-ascii?Q?hkZ0/CFh1EGa6XckJouM9CVc/sGqhCY1EGoRfbhx/g0IwIBe0Cwh549ti9+X?= =?us-ascii?Q?6kwGNX8uxCgKfllqsOLBc4uAYt46FQrjwYJbq/iZl3kNOsaygeO7X0vPyybg?= =?us-ascii?Q?PL1k42Ar1l7Phr7yr8gq0g/MfN579pznqesNWXVbvGyEya7Or9OSp4vOzLea?= =?us-ascii?Q?3V8bSfk4/Q19aH6PndiZs1b4BDEROqkrsQiO3JIGuLl1mvbtERW9rWK9x9RT?= =?us-ascii?Q?KPj8E9jOC6ov48/UzbRDGJXEtGxSDLZVlyC3SqR/d2vNyO8bm0vGstB/MBJW?= =?us-ascii?Q?62y0pMUGvFYnrTECwB4uTXdChjduC10LBhAxS5sfJHGR90fmFdcAt/KZvJTA?= =?us-ascii?Q?Y+OogWcsa4bhaHEtEFi8jr/tTlpYCFrk+wKCSkfWvoJ72NAD84qbtZ35VUcn?= =?us-ascii?Q?aIUDqJy2fiTThE9NGsYMaaAgkFX0QoZRskljY4DoTBgvPyVydqD1EVtjN1z+?= =?us-ascii?Q?sOVjj7qItE8CiYtI88wFBFa4cP9znIK//ZcEY/hxvUjVYn7ncPVFh+GdXcGV?= =?us-ascii?Q?Dm3pLNItQV7+ZXN3wIAas16ydZTQqOYSr97MmBg7i38LICac+QSma65Nu8oY?= =?us-ascii?Q?cnj8UgYOj9PrcTe4TcHui4clyVh+3mIcxGCqSQmsCmCwJEU48hU3y14QzYgI?= =?us-ascii?Q?q65ExN2y6OrZVeS8t1i9NNmZnxgRVIMKTzWGtNvp+XefB3Bo/KJXSaPeS2QK?= =?us-ascii?Q?Dfk9HSJ5lqGBAPLfGQSdvs6XQUZZG3KBxELl6qiEpYZEYlcJdJuI93KfVTlH?= =?us-ascii?Q?sWea7iFPtn/jwsopYa5kwWtY+82kifpM8nTQx0gW9GJPW+OinCoWTZ5Zv2Jq?= =?us-ascii?Q?qGxbNF+HBvCxev8T+ubWtq41OJQjf0b4WkjO3qgQTglDzNyov7gCBPiaRyrz?= =?us-ascii?Q?00oXXkMT3LeS/bovWgVjEFmk87owHWtPAVT/h2/yq7CmJon1lj+oFHP43v1R?= =?us-ascii?Q?qXKyKg62UuUL3fyAZcuotJPYPei2Bk45Oh9xCS9p8eZpxO9foN2WoMG2nIDt?= =?us-ascii?Q?Yp1J4eEjHr9A13BUptTOZlYlOek5GSDcKTcKV0oLE3FzuEeVwXfOqaZnH7SF?= =?us-ascii?Q?lELsk3Z7Rl5XGEEawWFcT4DDD6tuSjbeFdAHolNyU/ZiWl9JaSLcnnJGOOWM?= =?us-ascii?Q?dXGF85apFH2Nz7/cIWbKG0Tw2kR6+25tzRcxk1W6O19w/i3aKLatrbG/Z3GQ?= =?us-ascii?Q?3NnyIR7VIJ9g3xcBbq6ohzhh7JQ0c2MqJ+Q6rMNfn7C6QQJjM6aGwi8QRmQ+?= =?us-ascii?Q?HMR/eG6kthT9mt6VqiDQdaBr83QogDeRpwPvth7AIoKXxi6Y2tRdvcK8tcnf?= =?us-ascii?Q?18cPb0qqZGGORW0ChNbxf74uNfmcIuWMmf1iCbcnNrlgBAlbX5O/L9hVk0u6?= =?us-ascii?Q?n4+Fe7Gvmb8nqdR4aSVTwbGLYgeFpCTjkCDeADhZfC6vlBKoSVKaqIGdax4v?= =?us-ascii?Q?lE+jbvz1+MGHPHWjp1Y2NWzk7Y1lD+W1gT5bMaUHH2luAwHjtybqUNEoNwNX?= =?us-ascii?Q?PtQ7BtseLx9WU6QuYRo62hkQcM0IJiOSptopqG2GAfSbBx6SOXfEtU7cW2qN?= =?us-ascii?Q?RHR5ezbYiIqw+IApEbdeKh4RCTDcgqMSLKKQtu6hvkpsYTPcRLP/AxxRdBPn?= =?us-ascii?Q?n+TlIq/kwr/XthBdqXcEueUimrNOff0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e782312e-8429-4077-f0df-08da55063ecc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 10:50:53.9379 (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: ystvptcLUMlQ2MTnU+AvL1LSQRIMNJ29QyQmaQew6oIkIn+UGqaI0XyJjJ365GZiOC43wiy0KNr+uIOEtUbv2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7659 Content-Type: text/plain; charset="utf-8" This patch implements the redundant BPF MPTCP scheduler, named bpf_red, which sends all packets redundantly on all available subflows. Signed-off-by: Geliang Tang --- .../selftests/bpf/progs/mptcp_bpf_red.c | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_red.c diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c b/tools/test= ing/selftests/bpf/progs/mptcp_bpf_red.c new file mode 100644 index 000000000000..58f90473e495 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +SEC("struct_ops/mptcp_sched_red_init") +void BPF_PROG(mptcp_sched_red_init, const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_red_release") +void BPF_PROG(mptcp_sched_red_release, const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_red_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!data->contexts[i]) + break; + + mptcp_subflow_set_scheduled(data->contexts[i], true); + } +} + +SEC(".struct_ops") +struct mptcp_sched_ops red =3D { + .init =3D (void *)mptcp_sched_red_init, + .release =3D (void *)mptcp_sched_red_release, + .get_subflow =3D (void *)bpf_red_get_subflow, + .name =3D "bpf_red", +}; --=20 2.35.3 From nobody Thu May 2 19:41:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp3037599uau; Thu, 23 Jun 2022 03:51:06 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v/5mS3EU7a57mpBq8GRU87+JXQs44kNbGVC1HfdqlrRgZZoYgOXAThXW/Iw5pMHFyCQ4ZE X-Received: by 2002:a05:6870:524d:b0:101:c9c3:310e with SMTP id o13-20020a056870524d00b00101c9c3310emr2004590oai.145.1655981466379; Thu, 23 Jun 2022 03:51:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655981466; cv=pass; d=google.com; s=arc-20160816; b=CY5IR9vsZmWn0LSfEvVAwOcierIQKl7+JypI18ecR6NcYHW7lzkUw3gjjSmLkSAK54 Mbm7wmmcUPlMYgiyb0xNppxuuFlD1KyyQD2fiM/LYjoaqnKpARB6dDjlSydtokuofUVU v8Z6bCOvq1znJAhhXgD4VjrEVm5nLYvKhLUcX6HF3Vww8gj7b+dMfy3U9qqW4Vrg0SAI OS6DJl/3Lwvf6m6NMhiyJJ4vNKzohKv1JmG95yqj4vITFdEgZ2DMlUvIhuVCeo5FxhKl bIc3+EcCNFPeIa97EiV+U479PVUfmGd/24fRh76Bn3zjShlBz2lhSIoh1bNqzRQ/MoT5 P+cQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=N6aQsehrNxNBSnrQt/gq9OpT6Ep62FG7oA3o3wkCuF6y3jbf+2STYsy5G04ZQ3ciDE qOCallfUltJQ9N5uifD0eF64HDKBtx4YYcP2oZaWx9i5Joru9+s5LkNWyXAjMl39eujF 3g24bWGwn0NesbMoxA2Pm4CWjssavlnLBo4sTZDqwq6GA3spUwXA/WmcEolIYRYfgnwi Ti96MiBjw1Uo8zGTNLNEow6mfeWATYwcqyfWvgKZvsxWAeD3iz7KOV3cSQ2iy6I7AE2P ePJjxAF6BTP0W6Y1ul805y+6QIEA47zBQv/Oa/aEOqm+81YKdd8u7AVHxp2MWBX4y9pl GBsQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=Rg8lbAWf; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5787-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5787-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id i27-20020a9d171b000000b006168afd27ddsi4628392ota.18.2022.06.23.03.51.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2022 03:51:06 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5787-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=Rg8lbAWf; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5787-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5787-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE 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 da.mirrors.kernel.org (Postfix) with ESMTPS id 2D2252E09DA for ; Thu, 23 Jun 2022 10:51:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ABED543ED; Thu, 23 Jun 2022 10:51:04 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2052.outbound.protection.outlook.com [40.107.20.52]) (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 089EC1876 for ; Thu, 23 Jun 2022 10:51:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iQCLHFEZHt1YHnLZnAZ7Tm1aqx54VWfnjlyrwgX/ARqv5xzNGqOW2J2CO9cfz7TSzFGgMoxs/dqQnWvlhIdiyt/LG4P4YrjzkwjOA1LQjr6WsZBhkURLSwLHIYWg/41tjsOWhd0fdinP2dn4FVijrL1kYQ1RPfEPM7xuEqiDFlvbT6JWnPnxBnR5ALQirgnmGQVXqQgDabkmeiwkMXGFt1JGFgu99HFI7QeTresfPlLdUu5P9zFHssteedHcwt25yBTZSW1VehUDcAkDSC+lHb1F12HUXCBl3B/50BKfBm7M1G0IbN7xc1Z0AIhBlLI5/tfqmfmhVLbak4VpKhuAaQ== 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=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=oexnkeZcguQGRK1C2/lyYSqoJNuHfUCCqvRcc0ym5RK0ItsE/ESwyCfPEEnMYmpgK2aCGGz847tedRVGFtB9ZsqhWsTU6tQKbvVyatB9DYIORKLT1EZOdvy/t13z5OLtsHn97QbJP+M828fV5JieKJzg2fmXTywB5HlIOBrm/nLieXu/7ztNvYG7BZelouBTALiI5PPdY47mu5f1rpMbgDgQBFN+dt8kDFvGOYlVdFofG0Q+02mnSbMtumzd6CWER8bxstYTPs85X5aQq6Zyppq1CIQSjkjUIFyGkfAGRHfC5Oz1J9tt/NH4kCbOuVFTEinMCmWsF5cN13l6pZANUQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G5VgHOKGiA2QU4SHX+fkno94QBSUGbqMBV+Qv9K8cJ4=; b=Rg8lbAWfMctjHKlsqbKg4nk0APyG9hso0YG9SVYcydpA4Njm1j/DHKQc7Qzr5VFTZFUf8WkLy9ONcp2QQBQQ9dd2SnL07ubufHp/+D03pILtV0PB1uABDJZHLD7fIPgRUdCb4KMIgvwDRqBXTyYC/+cRxMBsXJteplHAiAc2GiqlIJUjum3WXxRD5mgTuy9A/XINspFHg1yKUIhjCg9BMJcfHEH+oJACEAIZ6BX82x3ogKnoGl/EpDOoBICCvPL9EnEeQb83RvlL/CHHUY1KTd14h3PIrakjgD5q1IZBmQFyPreuHW/mMtdSE+ESG1qdMR/7aSsXYQLPqLmTi0Zccg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by DBBPR04MB7659.eurprd04.prod.outlook.com (2603:10a6:10:209::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Thu, 23 Jun 2022 10:51:00 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 10:51:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v8 6/6] selftests/bpf: Add bpf_red test Date: Thu, 23 Jun 2022 18:50:28 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0134.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff6efbdf-2f93-4af0-4cb4-08da550642aa X-MS-TrafficTypeDiagnostic: DBBPR04MB7659:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TOYlkQKvmUpS24UXJn6Td5aIHfd0Zo3Y6CcDhVJ0U6BCGtNy2vT9VbQ0pNtjrqpcEjojVlXBtOT8Z0ua3WypGG+tkIFvyyvDSnySr1tJPAEnqqvdEzhixGUS5tZ6rgaLnt7228qtyMY52or5NLPFYgwz3+ZowNZ/rJ8y0L12LYjIpa09wvYDAa2fz13tPhSvLebNKSPccWDG4nJxcbPieltxWTRwrpNE7QXunWYVtKQ7PadSyVCU6n/nvCT+rbKLL+ZNufFExJd09XgTMLK5JqjtyNHs+csrdMGfKNhb5FRtN1XC4MZrdajWKRokXanGY1zdlE7Ta/PyBpSvJ07xCNH6wfoxBO86pzs/5P9Dedyt9ofhBMoKZZBSmFTARSWcCcj0FpFow5lH8bZQIWYkpAFhy1+zN+xp6LKN5f+oHvvotGjBsiAcRVhFAYOhcZOZmz0Ig7j5kEzbGwhgmmPk5fUKLKTVLNUSQGrd4D9VLcrPiO9lHoNXRgeUbhh35g/YxwaWY+qaEDymHEJWQpTygv64VhIPMOEJir9fkjfTkR/cxFJJVHvZGSQS50JF0zZW1Vb4kK/tgwCXnEms8wt77gO0mMDfD+EtFql4oeyZAdbaAid9K+ThvPr0bD4547F7f76CVVoRn8WkWI0fO6ygMrgQJ9dEF3TulliRdAwJ88umm5MO70p0kL8k5hv7v9pyQRYUDgByEgr3HAqLQYEu4ghnY5Uf3swZhCpzTP/wWlzLwHcERnjautZaaW0Vc4k1 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:(13230016)(396003)(346002)(39860400002)(376002)(366004)(136003)(8936002)(186003)(6486002)(6666004)(66946007)(478600001)(36756003)(66476007)(4326008)(8676002)(41300700001)(6916009)(66556008)(6512007)(2906002)(316002)(26005)(2616005)(38100700002)(5660300002)(44832011)(86362001)(107886003)(6506007)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EHhv/Kh7Z20eFJVOI/k474Kib48mxtH4k7haCeeDjmu0GDpgCHejS9YBfXrW?= =?us-ascii?Q?rEHclheqWzadxm80O/tyHRvO6VrHbGYyc9eg8BJh+tEj/y/tFuZ784IvfY+f?= =?us-ascii?Q?5SEC5dOuD3X0Y8JMpMW0C2pHX5pdyDrIsvTAFSoh+p2sR+EeiXelMTc1Sz9P?= =?us-ascii?Q?ZEzd1gN3SLxEEuZ5a4B2WKf1L7KzvQ/tXMM3E9peUJ0esr+PHr3YOcnaHbKC?= =?us-ascii?Q?qV2/sNoL/yIBpiH8pu9hOAK7sailmJ/T934T8JWmXyytjCk4Ppmk9l4jaNsZ?= =?us-ascii?Q?Hf9sgTfDQMwLXf1t3IF43qllBTo6fjfqnXgIbbw/5zYgNnvoWVRGq98Sp9BW?= =?us-ascii?Q?8f/HD34vTWwkn2QSM/FPls7WCTlQmQN8Ztkgqzg7d54ukNpiX4py4Fhw2fKB?= =?us-ascii?Q?P91B74oviroKy85zC2Xm30Ip+FF0mMV1Aapvic6+agWBSab4p3UnQ/TSuJET?= =?us-ascii?Q?bQBjStStAZyyfzGgXusVHpRv4E/TIq3o4g4r8JC17X9Kni5ImvDiTuONTuBC?= =?us-ascii?Q?Dfix41/SimHRcgPzfIeaO67QBg5uMvR1CMGsE/cnDHJxxNTRRs7QfGm0M2Vw?= =?us-ascii?Q?FAa8J6kGL4QbMjlmEmw7NLnAmdzrdFgN7cisx8HVWVD+LUfM9AiK0ZLYL86i?= =?us-ascii?Q?kKt87K0LLxig9SIj60KeUHuD9Ugfqe1nhO53stw4yAzTWO47/1i5sUs1cVUZ?= =?us-ascii?Q?M4sbPAR3E8SshORisHCT5Nw3ekiULd+Xc5/HnplooAWpysHNfohtXZqO1kzR?= =?us-ascii?Q?Tz94idOntB/UvlmnWsYmI25k5wckuCJbqjYokWKtOsDiiLMJ1aU9XetPbzBc?= =?us-ascii?Q?vaY3hky9SuWZ497LfBl+wNaDQ8wJlZKtl40FSWUVbkO/Ok7Pk6IHePk4zGj4?= =?us-ascii?Q?JTgVouyd8MdoJP0p71fjVobLi3Y9QuL1WVMjk0fVcfmA1P5moGEk6p+8MJw0?= =?us-ascii?Q?omX/LyoVM/LfJLg9VhbAoeby50qwKK78MKsqWs6egHT12VKqDa2q7EnizA4c?= =?us-ascii?Q?Dg9VTHNhSOJWlu3A2+sjdat91xus0FY1TIS6kuH/AvYhLhQeZBspLkiPDUZG?= =?us-ascii?Q?cYuz/UzPwDbsnvjgsZsoIMWHUj6hgA8bDgop9JaVKEQ4bYeB3vHjnvf2giMk?= =?us-ascii?Q?KpLg1DVyjL1VNjHHPMH+o28eFud9+nnVj7Sk6Oa3nPVSx1PPZ/tw3dKRmh1X?= =?us-ascii?Q?HFXgHOclSIVSMa1t/x4BZ/v2qIY9wU6tl1gTrxQ8Ky6gbkkieiwR5uwCX/rl?= =?us-ascii?Q?me2lz1C5CfaR4Wx8Ls18NTvCiqttgqLDmLoOdKm47TNpTzDSFSUV3XmqBuYL?= =?us-ascii?Q?x9rVcHBQD+CkibQ3D2/TJbkyTH/k575MIredNfkG0bKZZoqAQ6ClTJlh4Zfp?= =?us-ascii?Q?gUV0PdWpFaVqyMCFa9snhtlVb/NwWbPRuy1o5Rg98mug+V7s2fePi5toDSK7?= =?us-ascii?Q?txoCYaxOA5BmqLFn3sfAqCBNR1yy7wIBqin44nzbGMYXDAhjIm84xtHn0SjL?= =?us-ascii?Q?WnJxFtdZ60rdg/adWJGi8qH10CNy01MjgiSyLaI9N5jBH2YRYbXTIy5sExi3?= =?us-ascii?Q?I03aRwaRGr+XAjay7VwgKPsbvivRybGFqlWcbUUXPYIBlOsm681VwYjoZtB9?= =?us-ascii?Q?G+2CLkHFMtZoFKceohMNiPRos95ER6YLHRggSOi9rn2FoSl4fav8DBeSGz0D?= =?us-ascii?Q?x0cDLljpcum42EMIrBUAwsBHFIddGvwy32QBPaAeTXUH4G06Q6xK2a30vf68?= =?us-ascii?Q?ALi2z8LW3Hpn+HFGjtDZ+P8UyP6Mr/Y=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff6efbdf-2f93-4af0-4cb4-08da550642aa X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 10:51:00.6092 (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: bdqcq65hrKWd3g+j8LQ7eEsfvqKEplqmj0cls8FwGnAyx5N3nvqUScLl+EBv4iGRBAyn/nQF8K/1t39frkyE2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7659 Content-Type: text/plain; charset="utf-8" This patch adds the redundant BPF MPTCP scheduler test: test_red(). Use sysctl to set net.mptcp.scheduler to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR_2 to PM netlink. Send data and check bytes_sent of 'ss' output after it to make sure the data has been redundantly sent on both net devices. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 647d313475bc..8426a5aba721 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -9,6 +9,7 @@ #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h" +#include "mptcp_bpf_red.skel.h" =20 #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -381,6 +382,37 @@ static void test_rr(void) mptcp_bpf_rr__destroy(rr_skel); } =20 +static void test_red(void) +{ + struct mptcp_bpf_red *red_skel; + int server_fd, client_fd; + struct bpf_link *link; + + red_skel =3D mptcp_bpf_red__open_and_load(); + if (!ASSERT_OK_PTR(red_skel, "bpf_red__open_and_load")) + return; + + link =3D bpf_map__attach_struct_ops(red_skel->maps.red); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_red__destroy(red_skel); + return; + } + + sched_init("subflow", "bpf_red"); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + client_fd =3D connect_to_fd(server_fd, 0); + + send_data(server_fd, client_fd); + ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1"); + ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2"); + + close(client_fd); + close(server_fd); + sched_cleanup(); + bpf_link__destroy(link); + mptcp_bpf_red__destroy(red_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -391,4 +423,6 @@ void test_mptcp(void) test_bkup(); if (test__start_subtest("rr")) test_rr(); + if (test__start_subtest("red")) + test_red(); } --=20 2.35.3