From nobody Thu Sep 18 06:42:54 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp1814861uau; Tue, 21 Jun 2022 02:54:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tMnOiHwNv9ZMYtDz7sOEN1auwaswoD4vu7lm1Je+yAqYRRfh96P66Tr+Lrfe1l/HAR6sz4 X-Received: by 2002:a9d:4b02:0:b0:60c:4314:9024 with SMTP id q2-20020a9d4b02000000b0060c43149024mr11212465otf.164.1655805292937; Tue, 21 Jun 2022 02:54:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655805292; cv=pass; d=google.com; s=arc-20160816; b=JvdW94oM+6TNQjfhbPN3cTRJ/D1EUSl1vgwBgH82EW2JrMXqnxmzsT9m4QRAtGGaQo 5IAi5gUjEu19dyfdsr8A+PKU95pTzhOCnQz76hlWKk4082b4AylFJaukEcl/Ko+ZfyPN O3f8UWlD0ecohReHOxkBraUzyEgGfEgk3s7qhI1agVSLKr9SunD+p1s+dj+ltl/ksW5Z AAlsiEwQkNw1FzKHyQhBuLDGzuTlsxjnWxGqQBPGKQNoYRaBZYpRWQfoS/qdyUq3yyft tlBsajl1q8rPVOzd6ppwpmJvsmlHpSC/+qZ8xa9Y3ESniP3U7XwGDaObxJv97bXMZ934 +S9Q== 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=F7NUb05TY2+opRAHt+W87LgZvFSd25OnJiCNobXUHbM=; b=lZU8jCFxYApWLUWfVnyckSti5MVAkS0Tf54jgH5h5KKIGI9IPzMxl+P/CMOKTbmG5g sGJuwOZQwX5ia6oPzE07OoZ2xCot2P3iNTKOjR5KouC/4x+5DQDIuLixmNUxrVhIGP0c lqfO8dj0tidzqSmZvPhQFbmnVTfkkBlKO09IvG4BLdXgswK/3JgNFG+nq5FBqI2f1Hv5 PwEAWDWV++7iB8KG7GP6AEncW34oXz2w1bOa+45S/95grxsFs/LS6dLbnTh2X/g1Hnp7 2yAB/sin3LkEtmybIPszLlnpN9yhpPQG1ql2KLOhkGIXLvzT3RgZkrvgjOckUf0SZQVJ CIWQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=0QY48ZCP; 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-5729-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5729-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 y26-20020a056808061a00b0032f0c805a15si11493211oih.43.2022.06.21.02.54.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 02:54:52 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5729-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=0QY48ZCP; 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-5729-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5729-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 C516C2E0A08 for ; Tue, 21 Jun 2022 09:54:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5715FEBD; Tue, 21 Jun 2022 09:54:28 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50051.outbound.protection.outlook.com [40.107.5.51]) (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 9D255EA4 for ; Tue, 21 Jun 2022 09:54:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ezAp0u+/LessSNE71dGCvS6g7EX4f8VfiIGBlNjCngBsO6XgF4sFCsPMZU1KCsWr2C/947aegUW990kzaTHUghnZ2ecxvil6mXAj+4JNxyFxWYnpIOk36Kzy2ZUaJI3zz6CPpKK31msL75iL0JzymvvJvUXhZ71+e+ShMIBKQoIcD69uZlEo2HKf8Q0WzD6HEjm+bGhMNzVGkGFEXvl1MznUqKwKj08c2YtMXc6zJyKDLAMkDC7QTFFWqPCwHlFdUX/OgUPdnGs7OkHKxjC5DIa3gyOkbqc+CbJ8Bxmkqt2+bcIPIWq6xtwtBPuP4uodeQlZJjaTUmoqUo20UB+3QQ== 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=F7NUb05TY2+opRAHt+W87LgZvFSd25OnJiCNobXUHbM=; b=mxrHjsdrKkCPAXx4R2aMWewjweKVDKglbi41BxSWIvI6Df2xDXJGvkFKuKWivqKe9vSpP2/ISVXlCib1UC2aHIW9CbMTSO3agEUiKsLKGy010kZOqJ5R/eOH5b2f+5ltYQXdNSyivvkekVPUdE/wbry4ZiISyO9KaUQH/2V77J/n42Y75sQvjsQlv6jn2VPZE/8z/wwONEkv4Y0vFDnXY1gqGQ42P1nmWCAGyEiA6Ho2NuH1Axn4DEBtdKrysNj5fAuCUWroLx310qU73WBUNpDRRVNy6aTKR7JwGSin2MxQIKInjY2T71RcwBxJNKn3MbCkFLyPzIZf4X/LEx/EHA== 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=F7NUb05TY2+opRAHt+W87LgZvFSd25OnJiCNobXUHbM=; b=0QY48ZCPmhTlrOs4gRmSr6nUJ48eva/q4XQRoevktNZG/Wlz52RUB/MYHLGUQKX9gOB7xXRnR2XnVg/4d7WEItAu3PNy1QpkOufo2ji4sRsL0fEK9TDS2herNUlo2/hy9fdnAt3w5Dx4jxTd/Q0htjWuLSqYXZAk9orQ1Cvq+BSQT23k3JBHvZJ1G8999wmfzvTYC95rhc6aCNJ6WcQi/HXzyIPSnhrw14yfz3NjHpxvTj3X+4erqw2gkP3gyvBT08QAzc3nxJDMGbMgnbqR8IXlfI7K+tsht6HSDY7XVm+TzJsbsLvPIZKAaSf59sooMIuJwtECZ0qJZRvZSgfXuw== 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 DB9PR04MB9427.eurprd04.prod.outlook.com (2603:10a6:10:369::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 21 Jun 2022 09:54:24 +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; Tue, 21 Jun 2022 09:54:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 1/5] Squash to "mptcp: add get_subflow wrappers" Date: Tue, 21 Jun 2022 17:54:15 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0136.apcprd02.prod.outlook.com (2603:1096:4:188::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: 130268a0-5fbf-426a-8ac9-08da536c04df X-MS-TrafficTypeDiagnostic: DB9PR04MB9427: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: mlADDCUtOQNslG1afW1bLOmK0nSNia45wR6MV6ZsUGuNPekC3f/L7iZVUkStzVuGP5EqequxpQhawxS4TiB8/Ok5zjAi0YwBmopQl1nVu/OsbxAAcwocoWatyvN9jUoZgL2qOAd+kk6EC7qUDGcWXJQ9rIjz9n2JCJ79ABMNYj0QWvkXnNU0sFwV2QaLagXWWZEdhrtUGzw6jTNTdQ288i7hfMbxGMlH8fO7SeV8NGSMjdO0BsBgziIFB3IbFr3SrbUD3aR6p1dUTFtF5YzwGGVRM82jeq+Op4o+m/3ikdn4bKEZ02w5d1YeJXrDPpC2Qfq4A3DPHzD46OVxjv0jX6xr/06s9iH9NsPpoq5YUg+BN9NQGUoZHsMJjhaSBnR9Wd2WyK17R084aq2KHWhSFldSqsEJOd6DY5cSmZfZEv/J3/4rtgPpJdEO17yMgU58xaV1Na2AJd0UKz/N7t2pFYIMcSjVozYdNYn6YZyASySvRY0SeeZOOTUy8376hfONKrFFg/b9pUux7BrX2S9OB8bUNOfBojuoenJeBonoCsadtzZo/W2BbF+ONj22x6UZ7a+312aLeOEgLvXAmY1u3KQaBkd0PSSV1Ac2Jc2uM9pW4PWhkjZSGB2Dr4r3u+/zGT2H1Lx1mNVmg6yp8PRAsemjGUFDGfjfJETtBhs6kFP352m1KFC7vfmkWkx9mcVVPF9RuQYnydv85mxvStnt/g== 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)(136003)(376002)(39860400002)(346002)(366004)(396003)(2906002)(6486002)(83380400001)(6506007)(5660300002)(6666004)(44832011)(478600001)(8936002)(36756003)(38100700002)(186003)(86362001)(41300700001)(316002)(107886003)(6916009)(66556008)(66476007)(66946007)(2616005)(8676002)(6512007)(4326008)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Di+B0Cotq5jO5wAzAAE/jtlbvKiZvhR7XBSRZ0V/e+N6+DdGNoHMne1up8Nx?= =?us-ascii?Q?jav34NAKuKPnvysHSah1LdY6A5/jEfRVvzniLNb12kG9+9IFiN8w3Pd2ugSC?= =?us-ascii?Q?r7TyfXORLPOyc18dz+jLtUJwcU9RT9k/IEBT8aleAno3PkmQQorGD2wZMRDK?= =?us-ascii?Q?plUaENZXMcCEpqn62MEMpHW4Rx9u2kpm2yMEd/CG7yFWVYu6bXPZVNdYKj3k?= =?us-ascii?Q?EZXqwfzGQocDRE+IZM+6rL74p7P4It7iMozeOzXEEcYIfLFiQMrv39sjJA/F?= =?us-ascii?Q?AkzZRy72cezdd8UzuQ3GR397ItZ/HGTvdKBwTt2reR+SXiOseGfAwTRSjtLz?= =?us-ascii?Q?MPVIn8aBen5cDaKsv2H/NDkEu19/BYD3xAxynQF7vygBVivIy0EPDzLc5+dT?= =?us-ascii?Q?9KgN7GTRPW39GEPi+da5I1zPvolbpTzx5CZ++1WyZQZ5KziWpdmyqJhx1cvx?= =?us-ascii?Q?XdFHBm1ja77kPKNHbpOx9ncAELyEsKs4ic0PIyoxGBspFsTB8VoBqiRzwvQk?= =?us-ascii?Q?TA3Ap/6HJlIalY3ekMHItCX0e+HMNxT/Z8qPC/u7cTfOujyVz/4xT/npJuuC?= =?us-ascii?Q?PxmMlxKtlVSGwYACjTKj6YZ8J45cVhw+vZ3n/RBtlxRLP7Vdi7BvRoj6n4Rw?= =?us-ascii?Q?9AuHrEN7tLYDYS4UyhY/SVI2hcE56ahEwumDnCGCV/L9O78E6rR0bNMEAxej?= =?us-ascii?Q?54pgMMs0AGefViOcWPa2i5F9bszrvQV393GdYVcnpqp8MoVdT1gvNg0tRgVQ?= =?us-ascii?Q?Td9m379vQ+S3LLPkMpG8PWnbDeNC0tdFAqphnCmHqoPiSg3+9TAohsuPrQ9P?= =?us-ascii?Q?EFzyCcnGimVgfeajpYJlKWab/lVxR+/W06cw3ISZhjAPlakp/Qycu7e2NCsE?= =?us-ascii?Q?r+zW0LMfJ3e5g/nKjM2+kVVOjoINkpBbAZmTVP9YFGuQY/DSGNMUYWBdFsiM?= =?us-ascii?Q?WYIIQ7uYW0r57xd6O6iJbA5KakZ+/WS3PnfQQvpmhMoBMAE04NruA2D0sLyU?= =?us-ascii?Q?HXC9wzAJ1OOYlOKYl+s7fUeSXy7A4au+jrYGh0nvm2bJzLjE2lUYR6OLuUt9?= =?us-ascii?Q?Ibyo/dNHjsxlVoO/pNx9gwt7F5Ypissr+ltKiAixRJ0DEsr8706GrrFCbYBs?= =?us-ascii?Q?4GLdSWd9l8PNQvuzAgSieDZjHOOabV4nUr9BBJXXU/A5lIqQ3ghg3rOrV6Dv?= =?us-ascii?Q?QXQiGMnTl/b7xw9pkBPz8vphlyi3046Jgt7FXeVuzKfVurRnComCvItUjAPE?= =?us-ascii?Q?ze7laN7hATUfxjyCyKh0rZTl02MwZhVWkZ2ilCOr6bHSbQkCFeTpDepG3fzg?= =?us-ascii?Q?HKi/KXnSAS3P49hpqiRw7wyfNYL0VUAgq61kPA6cgfPctlmS/xJmlqXMi35f?= =?us-ascii?Q?zT7il/Sv46r0pn8tFKEx+BY/yp0BvCdzH2NpDnuNT0kAMK0YcHzuRendVngB?= =?us-ascii?Q?oY8i/zvcuTMIBV8gx9MstxXVBHd44CnzS1u3Z1Aa02AkdbOPgBjIB1Mfw80C?= =?us-ascii?Q?/9IJMat34L8DwI0TT+WUr2KkPwUHpUS+NLA+G+3zuSz+FbWmES5XhF1Wh3yS?= =?us-ascii?Q?QIpNm6NYX5DXYk0lBzQglsjk/v6Fic8KXbDm/7Vh3ChwpQ80MTtTsqe04QKF?= =?us-ascii?Q?n/iR4uY4QnHpAKPh6/Sbl7Jnq5DLh7B3rfp/yTxGOuPGSVdgFOONhPCJbNM0?= =?us-ascii?Q?WPydkcpY8wKtmCl+2X67Uj81P3G13vvAznqMp8XidD2mbIcV3ntG03hVyzVz?= =?us-ascii?Q?GgTdNyGNWHLtzZ4aOV1wJg46KpebLWY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 130268a0-5fbf-426a-8ac9-08da536c04df X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 09:54:23.1553 (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: oWqjfehV/IL2QgS4upUdForRAHVFY89T8cSkhu3JJE/Fma727V3WPzUyhVzqKIIP2UiK16+ZcRzxa3oVPSDJIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9427 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 | 61 ++++++++++++++++++++++++++------------------ 3 files changed, 45 insertions(+), 32 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index a0f9f3831509..043ac3f222ed 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1567,7 +1567,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 @@ -1628,13 +1628,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) { @@ -2438,7 +2438,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)) { @@ -3088,11 +3088,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 bef7dea9f358..c4ce576458a2 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -634,8 +634,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..5bd96ec5da5a 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -117,31 +117,46 @@ static int mptcp_sched_data_init(struct mptcp_sock *m= sk, bool reinject, 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 +164,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 Sep 18 06:42:54 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp1814866uau; Tue, 21 Jun 2022 02:54:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sPxHou1k0yMnqhfHZ7kf5gDxvj+LpzpwJb8pO1STuAA12+kDRmx/0rl63b47jIcn6RXZ+v X-Received: by 2002:a05:6870:430b:b0:101:3d98:ba41 with SMTP id w11-20020a056870430b00b001013d98ba41mr14589489oah.46.1655805293194; Tue, 21 Jun 2022 02:54:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655805293; cv=pass; d=google.com; s=arc-20160816; b=ILTRaQ7ggkzhy0ew44q6vsLgxJ7eyrg0+1QrSCp7vrH4drulVvVBbUlDvBJ4wFlGAh zl53crlJRTfZBC4rLTopQHryOW9nbbL6kLsNoth3axkIhaQ78WpOc4rpdFQj6iHld7pl NiTszgdeSYRrmVyJW1VhEIdzlDXSGiSzqIlvn9ApktDXLrKnIbI38yFvJFZCBEl+FgR3 rC2EvXl1xWkqoFMbjXImc4cu2KxKSOwNYxJg8yiisM/fmpKtrO9zNXPTj4fn/L8vvo7c mAgf9HphCwUTzGpj3FSIN5Dl/Bws6LOWQUD1oyXUYrIN0pOFtSQEnVl+vrrnzQMq6vAx bx/Q== 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=z7bvuMxuyvOw/+tFumzP+kct/Bhl5HWt69qW/4mlhak=; b=TziparQona309W7WH25Y0bvPzK4taIsbgqcpw6hksvh6xtLy2I+KsOS1iNeJrVmOdy bfCClPjXnZOHn5ZZ+8mjtdPgrQXgJdJbzARYpVocenUYBpz9K6eHOFQp4Cugr0pSL+HI nHtty0b6lHpRoEkxPjl6uhQInWfqjGN5dWqOQ+tt4+vGZbiqcsHd6j5jcHI/rKZWrjZN B8vPpcSD+2lhhSx3a8XR5Ckw3VKUE3AiFdWC1en6+I9nWR5xoXnipTnngOCB4Cb6RY8T YWn/mIruHvxuoZCpOkHETDkgqF5VyFvYlx3EhCw0jnGZeZvryBecuNh4wwFiJLngN62J UtcA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=LKvCj6nW; 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-5730-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5730-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 y26-20020a056808061a00b0032f0c805a15si11493211oih.43.2022.06.21.02.54.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 02:54:53 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5730-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=LKvCj6nW; 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-5730-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5730-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 81F522E0A20 for ; Tue, 21 Jun 2022 09:54:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4DA57EBD; Tue, 21 Jun 2022 09:54:33 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50068.outbound.protection.outlook.com [40.107.5.68]) (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 AD727EA4 for ; Tue, 21 Jun 2022 09:54:31 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RUEVVLoNAGR8CWkL3uXcxhLaWJmJerYRpTRPAzRL5ij27/F/jnso5wZbmOZNGVOcF1QIMJ2H5xYxLMz2ds/Xxx8ewSKGyCUmY1RkDqaIabC4staebdWoJldzuJKGnIQJijQMxHcWb+OFMAs74bWNf6gztuqDpviKix8Wslw10IHCy7WQHYGgKqOwqWXiuxiogIRKxZUsb+RVowmQPzYQaxQ45kfrIuMtAp8qk6pDiurUK6WJmCQRmjuknxZGbaZAwMTi6a1IKhoDcl8CHZg1+SwDieVku4AZ9VNAnJZm4emgLYJz2qcsCeLsNoTeHzDSeqaBKDCu/NTRwudrVJz+DA== 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=z7bvuMxuyvOw/+tFumzP+kct/Bhl5HWt69qW/4mlhak=; b=Smbihu00RC2wENXX0MgK+nLnw69lItJbggDnOxygFaoH6G8ETKZI+KLlINAG6MI1pvyR9MheYLIftxf8lt71IfaGHPBLIBSwOiQqIUsQ7mz0KwYxhvQaRDUnfNwnUwIaGwFFKbAOghmeuEMYhgc9bIUp5VMip6lBSEdM1ucJlJ0lY2PHhCWn0Z+loQ4KMtdaR/zA0loSA3bQtlQ4gs25y+afd4bGAhfIyK7r9BcTo9BeQ4Kstn3WmztK5SydF/TjGQIjtRzMJxIXgKbEl1XrpErCoZo1xktH09Pzg6WsGKQtMUwzAOMd3tJhp307XRdyQQ4VajUqHqNOMZmE9uIlpA== 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=z7bvuMxuyvOw/+tFumzP+kct/Bhl5HWt69qW/4mlhak=; b=LKvCj6nWtFzh+EJLJOw7wo5uzpKiMo8IHQc1AGzDSPzvi/oa1D4KGwMI0UzMeIr1Y0djb2aeLyF4+uPZnYkY2QCkRNYJNfKEwA5Xw21k5b9PBSjI3A7s4Bj7wJL/0v4h9uHhiR91cnRJ9EdONFRYWw+1EuB/FKXqNpDYS0iX6PrkoCEBy7Vga4YJf7YuCqUPZTgmI2gQz8BPFbSg7m3UmwFhd6eu11XbiKzXQEpzjGmPsZuoEL703gic9J4lwKx/3XRPkMX0vycg0bTD+LY9aVDT6qHnJHLqOXqEfaMQ54nNShnL5kKYM3NJ0oko+rSMjmE34ZK7GZbMFWlO41qYiQ== 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 DB9PR04MB9427.eurprd04.prod.outlook.com (2603:10a6:10:369::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 21 Jun 2022 09:54:29 +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; Tue, 21 Jun 2022 09:54:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 2/5] mptcp: redundant subflows push pending Date: Tue, 21 Jun 2022 17:54:16 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0123.apcprd02.prod.outlook.com (2603:1096:4:188::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: 3f2d333f-bce6-4166-d865-08da536c086b X-MS-TrafficTypeDiagnostic: DB9PR04MB9427: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: gL7RgYrufAdEJxduhf5F3pI1+uNg3aRjH0f66u18N5M+Rz0nDmLE+5/WVhUmabIROYouvUcPmjdaFt3Pigv8PqLnwJJpjPPfucBAwe+xLQQ5MdXNRf1YnPYRQjIJmgrWmADLsZWaJHjSgxiMuif3hg5RF4ZjEuibuGfhfsv1fgVljLx2Ntmu2OrVVYup2RvnNSOJmpDYA3CUUpsPSNy7UG3VzsgbtlUVUr/YIMmOueHITuJv5Y16v2O8Aa2LAnqVWYW2+igbNV5btSAWUoDwhY2vaYnvmDxj5ihXm1XdjNLFb6gahpFp1pRDkoUejpnYn/3u9ro9JO3hMi2bacexcjh0KdZZ8iDc2wmwxS/IykA8qJehFvk41PqGHceeRxbf0uB1yQvqaB7rQmM7mDUxUrMUoqqn0LyzpeeueQLXngYr1FxfcZ2wig8/2uyTxnbEJiTYeR+V8hL1NHMyIw8HoNMllOBLkB2Y9nJO6SVjJsXtiHumjGaqZmmsEFGOWKX51B4nHAku5vZkwQlT0Q7qSvFIb80PoqfEgd/Om2g3cFHHnegkMZSs688qVOLb0CdCK+0qradYG9shIjYwSzIRO3X67L/lh1L3xvp3er20QDdSYfg5t327INwHsNMeG2lN0Apu5G+kBd51wYQqz3a9GJI+9wXXCXQAggZvNpinLEQiXpxBnY/ZcZR1C+ZPrqKWtrMBUcaa2iQidMMFxZE3xA== 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)(136003)(376002)(39860400002)(346002)(366004)(396003)(2906002)(6486002)(83380400001)(6506007)(5660300002)(6666004)(44832011)(478600001)(8936002)(36756003)(38100700002)(186003)(86362001)(41300700001)(316002)(107886003)(6916009)(66556008)(66476007)(66946007)(2616005)(8676002)(6512007)(4326008)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ceYW+8lPDpLvByC9yvrOFbq6gHvibijAGBh1+4gHRAkW6WkUumfHEO4SXxxc?= =?us-ascii?Q?XBIrIbQeVTKrjEd3zWZ6hlJkiUrFin30UzjtXkavMqFsK5xkl91EHOC6ydDs?= =?us-ascii?Q?/9KZmYv05HeJ9R+5tAA4Mjv4zexGJMlNaNjCqylQ2FLnaE4j5o4t952tvJ0d?= =?us-ascii?Q?vSmHLZ5bKCrYRfNoSSHpUAc+/Ibr1jQFsSC9/bIpIFlPhDtdzUTVtxwCWJul?= =?us-ascii?Q?Vdetve5uih1x0yei11T2YvBmdecir2KrHU6BVXkBwzVUFz4uEm+NpC1jqX2S?= =?us-ascii?Q?S3AS3jer5s/2mx950+k8oxCIy4ThWl589TJLX3BcHbJw3sWMqJFzhjz+Ycoh?= =?us-ascii?Q?/JuDspfBqDIcmwdlPCUWdxoAVLFYEe/YNd0UQUY0f8MXy54rmkHBo9AJSCdM?= =?us-ascii?Q?1CEOgQFm/0Mg0AE1RZt/Zuz7/RNgCt1QXmL6A0SroGgHQHlFt2OLKKxqyGoL?= =?us-ascii?Q?iQaOpn0GVwPAl2sPMikik0sFuaXfsETaKA/f+oPI0cPhyWkBOTuoJueJAzTc?= =?us-ascii?Q?7clvmhN3DmJppwzcXTSzjoieUJtIwBJCBWAqo1jbYmmdWjWjBpKcEQu5bm9x?= =?us-ascii?Q?FJibU5vnMwHWZm8vlAdk2C3T/Irr+9ysunZiE/FhXg6+fWFU3wxEAxAxP8h7?= =?us-ascii?Q?0fJG2orVJ+vFo8j2k4pKd++KZLbzmVIdW15A01De/V/8yF3ZLYKcMvdcTWiN?= =?us-ascii?Q?5ynabBWaarEnMVKx6+4nZKdZ+LPsdldhqQetu2ZY37N4d6wz+KC5JPoWvvVG?= =?us-ascii?Q?ZJ9zuZU2vXcYiWJokp/VLGG6J7SDjv9Ys+RQuCDPs9qVU8e1IDqRgo23x8fW?= =?us-ascii?Q?++LVkB1afDTWzIYz3GnxtQNVlBVQavXGbt8m9/AxJw+pK+E9ECltIcMDBOZA?= =?us-ascii?Q?Iymj5f6ZkIE08e4jqn3Kxt4ZwPJ/dMTOagZfGVl5wGWA0ldLjOuXby5uT4iN?= =?us-ascii?Q?l0T6khCKpDaPBvG8xBF00i4VMhYfXdsV8qQMILfqI+DRf/uHD19wz0ZYHhgC?= =?us-ascii?Q?Y0JMN1JgiBz35GtXTCAVlQH3t4KWQ6VjJwCOiavvXzFoo1K+CTHpgRSwnjTd?= =?us-ascii?Q?EaDAdShWo09EmpROgbYpikR23qLegEprQr8l/reSv6R9vk/1Zpw+M2OAadvA?= =?us-ascii?Q?OCJQ369OdgqvufFPrPkI/ENSd4wk0jqy1MN2Inx9PC2F56vUpu86pOrPKQky?= =?us-ascii?Q?2XJOX8E/fqRXZoBYbHjQHWsHST8Eu+8EF2/ssz7m/osZzgWAlfkL7MhXNsvw?= =?us-ascii?Q?DMw2ACL/SXMD0gcq5IR4xhfTDA3n14zuLTIpgBK/o2pPG8U0EMoBt/FyFpHK?= =?us-ascii?Q?WR9dVkmTaS+OAfCYPDR3B0JJXSm/rPhkxJqiBey8ltqW6DvcMvrJMV8l2AFv?= =?us-ascii?Q?gcDPgVbokPRtxIqT2pVVigE6xP2kGA3Z3JnZJRrR9G7nuYO2JyaoLHQzNWko?= =?us-ascii?Q?5g93Hl1Gzg/HJtnQJykJockVAXkCDrrs4Hrb90U2xF00lZkuc5sITK68P3di?= =?us-ascii?Q?NvotKxbJxRUwnS6VrqqvvKYJp8/C3dLqH6C2049XK+dWr+rQtmyIlT13nj4M?= =?us-ascii?Q?GLaeVfV6aNHMJzxmkJ9lC4G5o3SzDaoLO37RWC9fD5X2tZBuxOMVi6h8PlDu?= =?us-ascii?Q?IrTpgM9pfU2eqHKGPOrZXG8uIaobuaXStBgPo2887EvtMA0abtPULloK8Xi2?= =?us-ascii?Q?q1OmX9FkyQRMqdonl937YFM/ebejbT/v50Vr02Qs4I0MzMLp1tuumfdxtW9H?= =?us-ascii?Q?Pv4HE4xUEoaDThjzn8NeIeLLqarw1yU=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f2d333f-bce6-4166-d865-08da536c086b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 09:54:29.1080 (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: n5Ei7C3jENtHCpRB9t4OketCQCPQ++VTTRvb71m4J4kWy1iiNtJslA9KqgpfqEqpUmeOkLkCjsSvrsLJ6D5fXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9427 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 | 96 +++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 41 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 043ac3f222ed..4f5e7f7fa6aa 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1551,58 +1551,72 @@ 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 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; - - prev_ssk =3D ssk; - ssk =3D mptcp_subflow_get_send(msk); - - /* 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_sched_get_send(msk, &err); + if (err) + goto out; =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); + 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, + }; + + 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; + + prev_ssk =3D ssk; + ssk =3D mptcp_subflow_tcp_sock(subflow); + + /* 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; + + mptcp_update_post_push(msk, dfrag, ret); + } + WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); + } =20 - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) { + /* at this point we held the socket lock for the last subflow we used */ + if (ssk) { mptcp_push_release(ssk, &info); - goto out; + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); } - - info.sent +=3D ret; - copied +=3D ret; - len -=3D ret; - - mptcp_update_post_push(msk, dfrag, ret); } - WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); } =20 - /* at this point we held the socket lock for the last subflow we used */ - if (ssk) - mptcp_push_release(ssk, &info); - out: /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) --=20 2.35.3 From nobody Thu Sep 18 06:42:54 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp1814867uau; Tue, 21 Jun 2022 02:54:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1thckzE4bq7QMBY6pZHbF+X4eTSvQTOHyGXGXkJiofcHfMIQgiWaQZS0OMlq51Xs7e39OJd X-Received: by 2002:a05:6871:28c:b0:101:e7cc:fad0 with SMTP id i12-20020a056871028c00b00101e7ccfad0mr5645961oae.269.1655805293310; Tue, 21 Jun 2022 02:54:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655805293; cv=pass; d=google.com; s=arc-20160816; b=NYdBibZ3Qq07A9tMa4vT68UaR6esONtxcYrXtXx3RUv3l/2yI+nD5SOpqo6wseEXiA 59bfPtBBGc72TdjA2wdY7NtFFysQBH+wbOeWvTULykpthJL0A3/kbk1uCmQq2AiTaFxp FkikTjh3jkkQMvYoYADPA6SgkijTaU88SNh7kiT+umQaFsvv7K1Dp69ws3D87CN3IrHM d50v29qQf1ryS3FQJONpfMKZRx7gidJIhBtmM9ulZV/+b1ELa9y3M99EKIiOH6/07ZRJ AXNJcGdZPXsp481vfPKLKGsxyXElXcGKUATFDwPXE7yXNdx+He035xjZOarTBFDjkyuA rn1A== 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=s2RYVfLJgh0YWdxcdVWjJWezSmKBQCijAZjYZPWP86s=; b=Tya+2bbO0AOfnVz3fOvtFuNbwBAWIPkMm5zkw79LRC8b0t6wyv4Y6wFp/81kWJGVgZ EFfCqghYDc0DxTAf2tN1wYzOWObLdBZqeev9aq/LPoqFO1wBOyGo662lADKZ5TdPzXM5 UNDLBswn/nk5ncaT33sGGRNK3keVzj0deLqDnn4Mb3J8lyyPYTU5QRl/CyT7TAP5gB85 R9HP+7o99YbdXDErZnfyYP/ClquGmdLrrMQJxBFrbxSzM/NkUy7C6B8j5Eqm60r7Z7tX umWMaXAKK4E8nMXsv72zPs7vFVpxuBk/rPzL1dXShIt3iSzW41we5/idFkZIdMDgTBCi Flug== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=hQrXylTH; 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-5731-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5731-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 gf15-20020a056870660f00b001010134caabsi14947811oab.175.2022.06.21.02.54.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 02:54:53 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5731-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=hQrXylTH; 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-5731-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5731-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 142AC2E0A3D for ; Tue, 21 Jun 2022 09:54:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A2862EBD; Tue, 21 Jun 2022 09:54:39 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50044.outbound.protection.outlook.com [40.107.5.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 17756EA4 for ; Tue, 21 Jun 2022 09:54:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z7s4o09jkNPH7qvHGDtlRrQR7+nIahK8mzd/Z04FkArOjWJrgi3K8GKj8p+4ZavgzLtAG1znW0UEP8Cb4b3oJnG7uGqnU1h0i39nMSeOQLBztL9etRcpYMfa9h/cQ11UmkkPokb8MAwRss2CxElJyR5g2cH5bw0iXOzdf1k1Of1WusaEp6XYN//eDah3fIlZ+3pemjs+dILAgkNB4z6yP+7CdcvxmgvKag3tvouZVoj1ar/5TP5KTlVjyrhMmy7aT+GNOf6+MhJy/2KjwYie6tbr7DJzwJC2XCTmX8WDa7vr9od25uo7EKkIdMeNXo1l3y1VEDCrxii7im4SIzgWlA== 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=s2RYVfLJgh0YWdxcdVWjJWezSmKBQCijAZjYZPWP86s=; b=RuhfSEnREobGa5+azCOMF1EJr944fZjE+dZdQthi9U8mocOWxoM7mJ8dscVyzsrsaUFwBS8OQCijbZmDDvBKxY+xNMtysDBJDx6KdoxrpqApDHzsrG5S0sjGTCfu7wvo6NV68ESVsyB2+h7J9IZVxhBvFJAOz8wmPOr0mjJaKrCq21uzHqI2Wf5r/EyQi+0DPxEAShSaVETEYylZk/EenrSvmIvwrZkOLThrzcAJo30z1b5YNrq5oWk6VmXb2uCVaok9kb9QDxoZ52oswugiwXhzDLvGwNBhNgTWfR/tha2kk5UlEHO67fFUuuUWFG6B3BKI9AkThnz4YEc6xkPsNA== 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=s2RYVfLJgh0YWdxcdVWjJWezSmKBQCijAZjYZPWP86s=; b=hQrXylTHrdySYdHExhSvXKxF0451IViTaRTIw+C/tINQCGAp9tlNatXe98xkYS3rBYj1ca7JmAAhzeLA8uBKi/T48xvnHgl8ubM+hEexqgAKtm1oKahxrI2Mv7e8R+uZ5d/oDf3qrQVS8l5HTBWNG6YZpAoL6/opIFcCsxuhGWiuAOi3lNSZfcR5F8esnOEYkbFpsUFbzRWQQBQSTF5vaviLOceHErI76U9aieZQ7yTku+vnn+vhp1NE0BTmuH/889mNtYDoccLPlqQaEIfXrHC7/UVN6L24i8biWyo3K2s9bGPXH0ZdxnUYy/PSP8t7nDF9AgBxxPgKH5fPn0GUwQ== 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 DB9PR04MB9427.eurprd04.prod.outlook.com (2603:10a6:10:369::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 21 Jun 2022 09:54:35 +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; Tue, 21 Jun 2022 09:54:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 3/5] mptcp: redundant subflows retrans support Date: Tue, 21 Jun 2022 17:54:17 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0162.apcprd01.prod.exchangelabs.com (2603:1096:4:28::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 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36ccce10-48ee-43bc-c1c1-08da536c0c14 X-MS-TrafficTypeDiagnostic: DB9PR04MB9427: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: jQSRmFPwff8Nrakefp5P1eU3qkgDs4Yctg5DEyJ4GE0sHQdgMfip4bfsCrecJsA0b2IFfq7tCdmjF6QzqmAQtGhYQZbbv9sf2FXxIqPxnwbd9crKtkqSTXnC4hoMLxYxKbZioZc37wnbtD3JblF2SDXOAxOMbQbrME3BHaBreaJyGvlVv9aIxiUb9VgE0P0KrHjF4shh9hXIz8tGC0AOrL6ObRJgX2vxCnO7ukAYUFVzp0k6imIL2/+cJPN8sarF/tTXyzBoPqIymvIUjQ8NetShskg1ldGzVCVDPJv21Js11F7Ej+e+mUawGSHbc90EPi7hb/T6xw8b+pWzWdp9y+4lpoHGGonlY/aCUpn76FAJGpQxCJHZ+DkTD/CgbioBzj2K0vko0dxcLxsDE6+Ecr7l1l6+m4AiYcD+N/6rW6ZkJVDDN3w+xNKnv30vmv0NCGBo+L6ILmWp3Lt4XGXrydDeIEhlQWyE0IZfCajmCYpjmu74lGh1JBiNiOyqCIiIcPC+YVNEGLZhhEexZ+PkKt40G16vG99SXN8oJ/KJqv/r3+HXE2geXUJMSCdhU1lhA+/tp+IP2B14TGd4u0pOFW+oloKvPaT/SDMJhhB+hPCAZtG/yhQUO64nSdoE/lOKkr+71G9oPshbjFV5E80y+6Mjbkt3EWuNm0QPTboJxN+Zs4QksMAa6WzPFkKGhxjhi0DBCDHPT9n3XwWpYcwrjA== 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)(136003)(376002)(39860400002)(346002)(366004)(396003)(2906002)(6486002)(83380400001)(6506007)(5660300002)(6666004)(44832011)(478600001)(8936002)(36756003)(38100700002)(186003)(86362001)(41300700001)(316002)(107886003)(6916009)(66556008)(66476007)(66946007)(2616005)(8676002)(6512007)(4326008)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0U5ZbnN5fRkoOl9WthxVd5qiQ3UNANDxThhTCEdCu9PD0hZKoILc8MKjpT47?= =?us-ascii?Q?5WI8tDEhNpm4dbeaOpkNkiHxqzaCvdysRhL/w+Y+101sqvGE1wrPFeaaAuw3?= =?us-ascii?Q?gVyeAp2QA7rZnUvifEf8IYGl8la4ruhYIVCbF81mbsVobMH8iGoxqla9oqn4?= =?us-ascii?Q?bK27/NtLEPGaqjK9PnS/pKFTgtL7TBqAoxq60KtFoPaM1DFdaWv3dyzI8+RT?= =?us-ascii?Q?Bc7qA9d9FPIrx69Wr4IKvV9OravXwZqZWcbms5oG7aXvXywxDQX3vP0BHJws?= =?us-ascii?Q?gFgaa6fy5gPVZspFuWTYbgvN6vY313TgQ+gw/ii3qUqfKrb7ofO8njo4iVHM?= =?us-ascii?Q?pX/YJLduczIlkMuZtWl383IgJVFAPcTz3qoaeizmQrVjTBdDAePCfDm1sZ4e?= =?us-ascii?Q?OkaqeOZceUJ5NBSD/vMObaEqb0yVwaidql4iS0xEEBbbZwOEKdnuT4Hr0D51?= =?us-ascii?Q?rxdoic5BhrNgJcAxqxGXjncBcW778GBnawWpWdZpt+i/JXHxONSJ5QkILget?= =?us-ascii?Q?dbGKv7BAQQwDyCHBov77qvWV/hiJHPSYiwWMpc0g83y4j5BNwHxVwXUAz0yq?= =?us-ascii?Q?WbV4/H0gE1W0uf6/KAkwWYmBii96iIOQJYBBRvGNIyIgv6KPDBJlJIris6k0?= =?us-ascii?Q?4bwyrm9JXv2vYRDstuBLtBwGUQoxdVDjK2oAqWBIG9RJ2ojOdUOeSosciuju?= =?us-ascii?Q?u0k41EQyMAivDn3fbM+LCFCCqixsnOlktgfWxt39uuCmD4RfWDp/wPCSxKQx?= =?us-ascii?Q?mGYNLftj0FlLBKKHpTgG2reMfiXs6mS0/F0NOXt9FJNrLKW6Hos3KCouYh3x?= =?us-ascii?Q?65HaAW7ELnqG4ql27/k3NyAaFauxrimz1K2EAa+wkE7a1fXXjG86Fa9qFVb1?= =?us-ascii?Q?2LkW4DO1ahVhOky9D7H6MMjzZwM0D8aNodeYBQXMVcJY3qlKLQMCu68y0Tca?= =?us-ascii?Q?fPHPi3nk4/hszgWVdCsZu9XFntrj8XtBR3mSEG4fhDwquzJp05rTUXWmJh6T?= =?us-ascii?Q?J2X1DLrpSIyxSNkFD3oCRwgv7MbJ+2hydEq8YLctLM/1Q0bBK2bpNLgz5QsG?= =?us-ascii?Q?CQ9C1xRESITaEM69Nq7iT/p0xn7AasWN+le19gGpdPCSQrpAOLZL+oZRPY8C?= =?us-ascii?Q?X1oT0wNXLxw5ObsO9VSJ62rzreTAP/QfV0UpdQORR5HALWxbaV2VTi8MGPrx?= =?us-ascii?Q?C8oUR7vT5uUsd7GupDXHg8KBjdRf90ysXJE3mPnwiixqmeLsqn57k3hf7KYP?= =?us-ascii?Q?TGUP2/h/T7NKpQRpmY1HNuIHXpFFxexQc7zcjkEpYEfOVNsWnQ2pzRZrBJ1z?= =?us-ascii?Q?783+kR6YM9Me2LXZnHlNx4IWcLwRhAEJWQmnkVJVc1g07pdD6bMR4GDoBqeI?= =?us-ascii?Q?8REj4NUM5wTTYQmYH7sd0zL75jhucjn+V7gYJXaFnl1oKNAHLNI6pDZD+a0c?= =?us-ascii?Q?9bnSHdc5SyWpxq8YLBfSG7JGoHmUfhc6EQueoEm9kxdpxMxjTc3IgUUs847t?= =?us-ascii?Q?MvWlJxNmVXdgDi3ncO79NzoL5bmD6DviBt+R+GsTamQFfByHQFs+JQRNh+AA?= =?us-ascii?Q?3+wYG82dXfHbvkCxNl0pckJzNo6eHZxkpcd59xKPLahWzwuS1t5PFEf+5ZZG?= =?us-ascii?Q?9SfbDY4m5KzsGM0pGQqnYzYsrdJ7MRkV1YzkPJAdTLTDpT7tTmpRj7o2JuPB?= =?us-ascii?Q?zY6Co50ZXICTVcIv0lEKgC9PVeajOS4zpHn88HrJEdNinWKl1ig5mys/Rk45?= =?us-ascii?Q?Unxjx6NfyZeyZ11KAsI6aeMIlp8VH2c=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36ccce10-48ee-43bc-c1c1-08da536c0c14 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 09:54:35.3575 (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: 8xpW4IvlzDmZXaurMZV0/cmPn8LjalNcksCVCtvQHGkzNgGhPqm0IRZdDCEutlDUd9PJGlw99+0cOC06h/isSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9427 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 | 57 +++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 4f5e7f7fa6aa..ad1eb62a9b66 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2443,16 +2443,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; =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)) { @@ -2471,32 +2472,44 @@ 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)) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto reset_timer; + + lock_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) { + 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 - /* 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; + release_sock(ssk); =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); + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } } =20 - release_sock(ssk); - reset_timer: mptcp_check_and_set_pending(sk); =20 --=20 2.35.3 From nobody Thu Sep 18 06:42:54 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp1814826uau; Tue, 21 Jun 2022 02:54:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sNrnNsixTCawuLJ14tGUmJC1/SM3sn3ivBoGKloq7OY50XKKkJroz5OXmgQM//LLsYEtQY X-Received: by 2002:a63:5a21:0:b0:3fd:41e4:f833 with SMTP id o33-20020a635a21000000b003fd41e4f833mr26144082pgb.409.1655805286969; Tue, 21 Jun 2022 02:54:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655805286; cv=pass; d=google.com; s=arc-20160816; b=WzMfiyc4JRhaurpYkfhP+39pe4PVHTWR0R0vgPU0dW1TexaU6SNAB7Ht0zjjB1pecE FK+a2BZ4gWz+hjng5Pm1GLk8CRvAVwmkPMFJ9x2X7stZB3G7P3zDuh0sfI1i1P7dURG/ 17T7ip8CfcNsmo18gsU2+BPYQZO09DpZD81nesk6SCEpZF21xmiW/HTrwl2wE8mQny37 +13HZ8q3gyvFZuX1XJw6n9OKsxmQzA6JiWIWbkWL0GZ3Qb5n60t30KDyD/HnjDzPgkOn Eje7iGGMv4Wa0Q0OZQYtQrLxaP5dDgvCrdVuFcw/+TuzMYp4fRbZXAN69LZZ7oHE5rq6 hLOA== 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=cvbDCwROI4a4r5tQahgPzvAPK/P1CpwXnr+Gwy2WcePTnHikN5D1v+J5PbM1BA+PH6 yAKkKMwpA7ic9J0A89EOeFaKoi5TX0JopuAlDibTn0tghf0qglqv/HpIxRy7o+TPA5E0 MeNRnAyjOwXdqr5FdfRbaihfb56MNW7+8TU8uVjbP1J5dKgpgPN/RQttXIrleTP3ycFh qYXUM3B9+d1WXWOVh860IyktKxoHbTjBU+0gFjoPdDQeu0DWij6b09ttChSzC+ZNRsgJ Gq+JDjLESpZPCI2gXnlWsZVyz6t/HO6vDuYGVPwbY5ROi4BsRL4gZEPC+gD5QxAPJvCm v5Ng== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=STLNde7C; 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-5732-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5732-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 i191-20020a6387c8000000b0040cc08d79fasi6608311pge.576.2022.06.21.02.54.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 02:54:46 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5732-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=STLNde7C; 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-5732-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5732-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 90C66280AB4 for ; Tue, 21 Jun 2022 09:54:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A933AEBD; Tue, 21 Jun 2022 09:54:45 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50089.outbound.protection.outlook.com [40.107.5.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 34685EA4 for ; Tue, 21 Jun 2022 09:54:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A5YUGM8p9PpSKvlgmpmHvYS4SQlWTzsnjIuQiF7RoyRXwO9EZdE/c+tgHunbxZ+R3H3+2JQSWAxWcBAS1cSTdWLZBhl81Tx5YTS4Jzn0KoKUR8ZzOT86q9R25ERbZkD/OicU6dg1woHetLdlBKiSjX42mM6SpIs9qObyO1KgrQPwsc+Lg/u/HXSzcX9UjW1wSQ+IF2gO0k/3sbKZ330ZSD3Xh11hRPe2sAAtb1GWffU0VajhuMbXGpvGQ1s7xOoT2CWTOUCOy+Dt7ijNoWn2T6YKiwUmMWNfm8NvgXxHkLJq98DQ3f9WB6h84YYHvZaiMD4DJdrKe7pPSpbQKiV12w== 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=gWSbGrNSJHH7g+fQsHFExNMHDFB+rGmttk1x/NzFVq3mWRTU06Nm7pL4aCF3wL6hoZk0e6EXxQgrQJtOITQxYDsRrEY6djQhFCqZ5iDz/qxuTQgH/yF94Hfn757wQ1Eb8ztJ1v1W11x0C1zgoCuoV/FqsrY+hS/RZNoBa2Jpq6RZU1OJdn4R+/e5itjy0L6SzUEny1Qib7ToWdAFABJNlEV3/vTT6M9OU5NX9xxFU7qv7PqVQ6Qk/XpiJyMfVNb35kTiQqoQWMfghF+kouz9pE9ewIv0E06elkUx6RvWgmF4LoIS8mW8o7WDRyMYqaK/Ds6GhCxTviKQnzLm0AqUGg== 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=STLNde7COewSRdmJ3HwrddTS8XBgOhSAepsBIQ1p406/8YleJqFeV7tM5rrdScPAqsb3MvohVV7+cQX7c6Qnv7uijcwrWRlQtpObwHVykPTklaJPY32/62WWLh9RUII7vuqsKm96jN2vd8+2QSp/sJnfYlYiqWIt4EW2x8GAsyeapmkYRj+Y6n4jAo8yy9iPueJaK1MGzqSGrt775dFqXYt5mdmHQfjP51D/6n6RQorflmj/4hJpdeXQg6HheGXFM/3/kAdI2cLJe6igcQGiebvx9ltBliVDtBIHTpY1EGNFgkQvw0xGSl7y2aNWuORC7S5fQtu8/L0AANDP3Q+yRw== 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 DB9PR04MB9427.eurprd04.prod.outlook.com (2603:10a6:10:369::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 21 Jun 2022 09:54:41 +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; Tue, 21 Jun 2022 09:54:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 4/5] selftests/bpf: Add bpf_red scheduler Date: Tue, 21 Jun 2022 17:54:18 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0178.apcprd01.prod.exchangelabs.com (2603:1096:4:28::34) 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: 6358f5e1-0148-4497-1fc5-08da536c0fd3 X-MS-TrafficTypeDiagnostic: DB9PR04MB9427: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: ndtahuL0wUMIcI0c7ULVmw0q6+eBiUOhEXbqVzemI7Ksnr+uhy1vaDwo6EovfE2uHwjDqlrjQZhEk2XpPs26Lq/X3U503JXPbuFn713/kQW0E+6+gj6C8FQxMrZg/7dsbqkw6qSCHQ7trUSsjsHqnNb7bte/xapFWDT09CZ6IK8npFsgy3Jwraiun39lMmwsiAysuhFPEug55eU4jMV70y9IG8/mvihh91siohod2rsC6osKXNI+zWWK9PaZN+qZ8odw6JKPhNFZViHk4mwUBI7zPfLx0Tqsvg2mQZzfVqhGxaS3bvMjVFI7RBC5lu8eOXvABTU5UN/SRT9v2dXvnTz/Q72Dgf3IPHOEuF0zY1PbpvSyzcs9t1qGy6dhPBmr1umX9lA2leV0YXKUv2NrB5bW0XkwpN/k1wGqABy2lJroBxR3Su9b59gkDlCgXFc2833/5UExsMoPZvi04X6ok45dwBXuRer4fcjLm3gRjjvDdSGmSHXvJFpR9dha/owySop72zmHgoQDungoLgqksGBwZEmflU1vmFeY+t2p+uGtRoM0Zdekgn6tqVTqNULNKEZwsY2Z0TMG8a9j3A9mQeeI5GP8sZySvniF3AGuxPCLfcQq9ZX2A1qK2sgVosgi9Ycqy1H/3AuG//rCd7VupTBEsQ6nH1/FdFYutvrbiUkqRcI5vWT2qeADm80YHzPsV1M/BpJ71tho/Qnnf8g2mg== 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)(136003)(376002)(39860400002)(346002)(366004)(396003)(2906002)(6486002)(6506007)(5660300002)(6666004)(44832011)(478600001)(8936002)(36756003)(38100700002)(186003)(86362001)(41300700001)(316002)(107886003)(6916009)(66556008)(66476007)(66946007)(2616005)(8676002)(6512007)(4326008)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NXI3whm17Bhir7t4ddS9TbMlKkwDW4uWNuzU7Qr6+KZSIcOSEEVrMpZOZGUC?= =?us-ascii?Q?jn/vUJYQvdC/dL8zxg5uPqSbvV14fBrUSbyuGGECnCAqVtgRSDaRaLElN618?= =?us-ascii?Q?VDkPBtkF8zBDZ5n6cTIIy17Y0OIG5IPg9Rn8BR+ebjFnWq0WDcRQNSiWInZF?= =?us-ascii?Q?2YnGyDXLZTJN2eyQl3+sROnGzxU4J8U6CS2mYMKtXPKo7QVXUYVUVRYPUSrn?= =?us-ascii?Q?oRGDQ8U6JqW+E5+Kc/NZd6AEg0EC9is3Ed+ZEVkbgAs3EVHZ6xObU3dFzav6?= =?us-ascii?Q?xmEMFOs8SOxw45TE22TzjM1cF8GAlUqEUilcUln+pDE3Vm/dyGsmdCR7PBr8?= =?us-ascii?Q?jS6IC0uv2SEbfAIdAHaRnMxqHzs/iaZRXves7N3V2tsa7/mmf4WAm4vl3yj2?= =?us-ascii?Q?G5TxR9SVAg5t3nZAS4QvOLl/6MqK2m6USgMRcXUV80kg9vvhk4SDRKm346Kt?= =?us-ascii?Q?av8LB3rzHpj37jEOQaLAWPU9VEolAR9oRG3xdbGJFt93ywp2h6xgFQWUDLsn?= =?us-ascii?Q?+XW08FatwSOkNNgM5AW6mlFCKwJkTS+tfYta80FZwX8d/sGck3fOt6P0i+HC?= =?us-ascii?Q?77ulEXaNubgTnvysIu7ZTa9oqTk3EyB49h9UMmWgaP6JHICBH7sIuXJVFsZQ?= =?us-ascii?Q?qwhlPELFC0AA66mXzAieR2k8jH3V8CvHPoJ6L9+XOZWS+Mq4hNmPsfXakuEP?= =?us-ascii?Q?vtb9kJ6IbemlUQvvxPcSjsqCUO1aucsL6S2vgghwbao34tTU01htzcrU/a2H?= =?us-ascii?Q?2TdxULQhILqIrh418EKmWImnzMa1Lx//BQxFw54RhdMQFItGLTrqk2O7mVtY?= =?us-ascii?Q?tw+JrZAChELt0QU0O7lnOFeij4QzE89rAgWP7I5n9OcV3dkZR3+O4rrB6mYr?= =?us-ascii?Q?SaxvgCsLpkElannRhNi1TpTWpH0irUcHi+jKgW52V8Mx3kGHN2raFS1/9ku7?= =?us-ascii?Q?ZG24G4ILDo84TesOIjrjwKaOycMDymzSRdiIbLJfBdFI6U4eHLdlsX+0oCdf?= =?us-ascii?Q?1fOoY7fJ0tRGwd/X3EJL2d9FhnWzQHEXsaNR4yXIg+LEU78w0NTJ03fypeJK?= =?us-ascii?Q?FevAhH0m7nnZQYOWEpoB8bfXrs1qGTDpU+GEUYeIDz8dEEtd9ibVRL48R/ZI?= =?us-ascii?Q?FUsvecC8cn7x0Swi2JoMS0xpV6Ya38oALNhbBfGMA8sMfKfUkFQA4wR6eYx3?= =?us-ascii?Q?ci7I7rv8iLaq0dRzTMGcJrKkff5A2iBXsfP4oly0vBtlsgxe8zeWXizR0UXQ?= =?us-ascii?Q?Zvol4IgUys6pbAkuqJHBhsz9JkmZSdlOJU5e+aTBaPeR17VWQfVqiizDtCGX?= =?us-ascii?Q?+2smj5gSPQ0ujJx/7HNtl8deyV1N5CWZedEZAQhAuFtYvdZHoeL/vdajOf/y?= =?us-ascii?Q?7wm3gqQ1ZtQsmAp7a+3gyxOCBX8h1KyGShJ/rN1ifO7pEYRHpmuDWLSdPgSc?= =?us-ascii?Q?jcfbk2K2XPzn33XBfx6ZAsdEr7RoJirCak84DNqQ8HsEkZhLMvW45av6TIdv?= =?us-ascii?Q?VbozdYmxbdEQ9UzWj0I6IsJEM0xyjgUonmqPOVrxRn3vYLHboKnIYG+B08Xw?= =?us-ascii?Q?lXjX+vR6pCPTCYeqKHjS/ksc+gwphqBbtb69DmRy0QZMIsq3x7qcjLbF87le?= =?us-ascii?Q?EvwfH/6MNBl95ttPlH4AZcJJPLFJpsSeo8qr6RCb7IuFMoubIxzzZQsDI4LR?= =?us-ascii?Q?fzayU2b18RCxEOs/mSwOC7/EqkXjohsP3OjMOD071bbluQfREv9TkcPIYNBJ?= =?us-ascii?Q?ztJC47AiPFaW21IwDTLz5Mf/Uvb2Aho=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6358f5e1-0148-4497-1fc5-08da536c0fd3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 09:54:41.6226 (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: psiu/lAGQnsUrcrKIxI5IT9feyNeSLRwq20iJMQ0+YcbSllAczaofvRwF3RjJ9Ts0lrUTSIFS3rS4lkH4h8A8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9427 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 Sep 18 06:42:54 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp1814871uau; Tue, 21 Jun 2022 02:54:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vHYxp0VuLrrVLNrVXCixKfc1qkCF1j8oXGaUu+mIkDOU/BGx6VRu9NU4Gekg6PkGml4/Ek X-Received: by 2002:a05:6a00:134f:b0:51c:4c92:1dae with SMTP id k15-20020a056a00134f00b0051c4c921daemr29405003pfu.32.1655805293519; Tue, 21 Jun 2022 02:54:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1655805293; cv=pass; d=google.com; s=arc-20160816; b=xWaMr7oDXV09QhPjV9zxFaH2pCpNh9PFzHRc98ZnoH6k7/FBfx71rEDTFGjjCnLIQA bNP4SvwwozEqC1LAT0BkgRprIF2IQF652UDd0M+VSIJqZ0TQW7dnRsWsucbNOQBuT8Tn zVh9KdSR0Cl77nlQ4zaPpNmAXIq7H3FdGOwDotMgROepHGq3VZiMNKapBzYiPFrtqog2 /hhBTgx0Bemg4VjAeDwHzm8oMJB2yclHlUMRwjFG6T0yQhuNcOUJsoumj8E4hP2OIFFG ioN73gN7VrnixD4YQULz1hZZT4XGCOQC20ZRwCz1acNBKllNNe39z5Pcw0GD/75K74k+ 8dvA== 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=R0lfZMoAvqy/Ly+W40Xf5jsS3dXO5+FOTSXFJkP/uOKEQ/FW3cjKwK40Vj+qvr8Dfy RdBA6fhJf0wESdVLaJAXAarAgAvgSd1qoIDmbCHIOUdwUwEMKCNmyzRPfwx7qUG/LMKo ME3+bNs7qYcqwYLMgMLnkaA6qCd/9JlfRT6/scVonBzZKgAHV2jYTxjX4BgoI8vHomAw znFg8xMhErjo1wwwnMBvRmqQmkGzC7gHGmagjqz4h0oUqpqJOjL8jVJ7LEiAMOlQxL+D AmKgK00ChDPvFiDiBCgmdgG78P9nE29ThqCQNaDT3CEB27UA9kFjpN52zuIKQKezzNfW 3VIA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=jKzWM2TL; 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-5733-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5733-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 z22-20020a1709028f9600b00161e9f72b11si9812662plo.540.2022.06.21.02.54.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2022 02:54:53 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5733-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=jKzWM2TL; 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-5733-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5733-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 01B9C280AAB for ; Tue, 21 Jun 2022 09:54:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D5118EBD; Tue, 21 Jun 2022 09:54:51 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50061.outbound.protection.outlook.com [40.107.5.61]) (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 56C6FEA4 for ; Tue, 21 Jun 2022 09:54:50 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IByRLnX2E6w8OEHZDqg0iaTL4ivV2rfL64/isTBFRtbpyBMsan+doV8+5xAgxfkglwu04GBp+i871amepEE1S1SVafAeoHane8fK8x9s5fl6efzU1uccda3RVUoMT7AzJDR/k75sQP3QTDCnNdO4JG/x1BYdZKzngFeEJuBMm73WPjZDRDcOCkSkEQ9uLJsuLHzRxvAWh0yRkgQ/BvfyVGKzrptE5NepcQZeaCQPGS/TT5UeB1baSFt59Z7yqtn1NhmugM1VYSXMZXfcTpKjeLm//asq00rxMptum1r0BG8RWlrPv31Ky7SPBQqf5EZgNcwJ6d96UvC+U4qin01a8Q== 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=k/HBxMYJjzl6brALzNqzxM9wr4xBtWa4z+fHR7hKbTd0O/wRK88PAv5JVeh/wZHB4oQG7p8qBEPIeYS48dw+b1E4NpxIBUQddfM704ADRkDzrek0X2SjNfwNn3o2JRliMLS3z8NFOPJygrzONwNAmR28+qkp2k0btZ4FTbudXVREUphCNDZzk2qpaYyWx9Rcu0dMHHyCqxpLkV19M2aDR4bfPMPKxv7d3Lk9WDCjShWq1041Dv+oU8Y+AdoHGkyjOtft/pcFLvKjVXfWR7vZXjxx8f/8lckExSCfQi/CKxV+dSXhoozk9Th9TB4h/JEsDfnPVN/o6S8Gcqu55hqGtg== 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=jKzWM2TLTRx7cGR9w3NHNMjLJvK9heCDO68IRer37YZJbDDb5v8V9Mi0pHPGQ73UhWUJ/+mjMZ8xg9zOamr9Y/c5a3QoTxy2D7wiV7TqS1APxnjlPHa5OPK1c4E4Sth/2WG9ORhWMSydc00Hx10DTl9bzxhbYeLkc1cR2PGGc/Q2/HSNZ1y8EAuZELHqK1tfThg4PKsfCU0U64rZPIrBFD27jaN0RaHmu7h/TKTso0KzXHemxWyXnLnVeHCZ9pHiMqdI/98TYpWWX7W5dCuh3kiUa6nlda2sXc/WIbIXY9T2AWx79Eo8Yl6CiX22d8MVQwsyTleSb8wU6nBVgLTVuw== 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 DB9PR04MB9427.eurprd04.prod.outlook.com (2603:10a6:10:369::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22; Tue, 21 Jun 2022 09:54: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; Tue, 21 Jun 2022 09:54:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 5/5] selftests/bpf: Add bpf_red test Date: Tue, 21 Jun 2022 17:54:19 +0800 Message-Id: <23316da1666099022ed050bfd6ac2540aeeec198.1655804700.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0108.apcprd03.prod.outlook.com (2603:1096:4:7c::36) 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: 432df42b-a87b-40ea-2df2-08da536c13a2 X-MS-TrafficTypeDiagnostic: DB9PR04MB9427: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: iYdufBAEf/tskiqid4t8regvDKQVRn1FehtK4OCcMjWeCzXeFS5k91yh1fIj+7VGo7F6gf30QzwYjEyslEjUItv8TuWUYbYpWGziZTwYBHBzEcqx2c2ox9I5pZb4atxlXgHzjk7++r9bCzGvNcx/S0+tWTo9l9HmsQ2acoEjvPq/FKDDs+xUK6/kia8LnK85GhGIAanQE2r5IMib5B7gTlVR38bAWZIQTX9ez8T0Xw/F5oKXCFpJdsda08m2zKRj3J+C899LjNMfv1It3X1MaSt1lad6/bsKvva9fQoVXQEAnkmjWSPkvzAEbdGao96YK6SYvlYEzO8wftaMaNaauPFZLawK5RzNmjoyX6w0so68eHlDYFekwMPHVLF+MJnyKr/Hz6pka0RQWw+Mgwv3dDOyzKanWaBKZ/5q3SphUgQybiU10st4yLywL2zCV/QNcMcbnI1U0mpB9V29OOjVD3XgKsmn92rsYlWbp5bhwz1kGEwDmWbzxOVv2ujGwbq27EwWyXr+q5Fpy277R34Bv33gP7la43fb8dNyEqx1+CBJojzg9bpYgngnPbaQZ5iO+rOsRhTWg7MrolPFxM26vRYl9HnCt9zYm1J3gVMPpvBbgWETGWREqjjnl8NiEP3W81wLgM3rj4zZ9a5kaDUbxPHlXHIaE06lpbbMUoREN1gYjCpsJZXFWV3M+O5LE7B+ 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)(136003)(376002)(39860400002)(346002)(366004)(396003)(2906002)(6486002)(83380400001)(6506007)(5660300002)(6666004)(44832011)(478600001)(8936002)(36756003)(38100700002)(186003)(86362001)(41300700001)(316002)(107886003)(6916009)(66556008)(66476007)(66946007)(2616005)(8676002)(6512007)(4326008)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zRuQjiNaGhNqLvy0YdEEwzAsfM07Zxn5Jdzbh94HeBgi8DHIkpgRUX1Zmk6M?= =?us-ascii?Q?rbbhBoYzIQClJuPVCvSqjCy5HBXGw2N39SY4snrFAMYGiBA+NXVzHj054fGU?= =?us-ascii?Q?mLteFVs9CzIKPtz0wpbOKLZc2zArWf1Y6OhSbFCqY0vMWHmRUl63zK0Yvr7n?= =?us-ascii?Q?3XVYMyA/GQh8U00GgeTkaOqBBMMnwKrGMuoAfs5Pd1nYB/jvLCKWDkULA8V/?= =?us-ascii?Q?cgyBKH991RcxKh3F5Wko3HQPbkouaEN8VHeFMlibSeuAOqJV5vILg06ux4T9?= =?us-ascii?Q?tlJ0JqFust9bYBAThqOp05XWuyYRSi4TpEpvcso9BUE7n+/wStoiTo1i8CCV?= =?us-ascii?Q?SmKyK4DWkAhAVsstZ+/dWgUj8rfJciQogJxNxtaV2aPAC+JIntgCO4O/S6l1?= =?us-ascii?Q?syd624x8B2VratzwBsM6B5K+XoGyDZbWHVvAxvk56ZnBzCXXZIHpEjDajIRN?= =?us-ascii?Q?tEGUEz56ehlGMjH8itlYgri0HRcfnxE7Z9qM/QlPhGlWud1B9kyesQf9VDRH?= =?us-ascii?Q?xSMwC278qXQkaDKAszk5LjMEDMfo8nvBTJb8IjP0/x5ibNEoeWp858FLXm6b?= =?us-ascii?Q?ParXc1/pLrHw6jxM6fdUdhfgk+ZzbBXZ3Swp0z2qHahPILbh6GPDVqNn2CBq?= =?us-ascii?Q?+U7AiRB/Kl3UkwrCA+owH143UQV+6NcBKNIn76L5OFlTr6hP8Ttju9bVImtV?= =?us-ascii?Q?vfTDKlBopWZcWRMWQnYr2o2lDE8mVUrXiDja5Yhh5/iHWpqvQbSjJg+qX+dM?= =?us-ascii?Q?pZIElp+qWIndY42tjsJdDZ7rC6EOUT128P2ULgJGXKsR6auYofJUUy/8d6V2?= =?us-ascii?Q?+i4IZ2j7rslJ3ofBrmkWj2UeUu7fW6+B/ZEmaAfkklW19UUcSRHa/XaG5PbJ?= =?us-ascii?Q?/Z0st3HleqzqceJOQwXEe3lDIzepVMuTXM+kUm6VObMSnmV5ZNbOEQQMpkh9?= =?us-ascii?Q?WFzI0wayA5FjhXKoPz2p36meONTWvVxgr3SpOsrh0R+KzYIInXkr81MO96aH?= =?us-ascii?Q?Js4V0rL8CiIcR8toq/9c1NcqzQa/SZgADDVU5zUz/H+XidBxsnP5Y+rW7g40?= =?us-ascii?Q?rp1lbwDPuEv/GQnPfXmBQdBVpaPFarxsNC2amSbz36dRmeeOCEhcIY6wwaP9?= =?us-ascii?Q?UwSv40W4CXJx/55aYCR7A/5ebPfHMagnx7ag0NGkVWj+IYk5qOxuLiQmZxaL?= =?us-ascii?Q?X4mQv5mY5Sbs9LB124a9vYWxmbKIwlP8g01e/Nq7ws1PRzwSRO8ofgwPvaG1?= =?us-ascii?Q?ldtb0kZYYyI3/N2VpDRjd2kbMKyel1AiXB0xeEjNZxM5Iuou4bvHdg6xnqsf?= =?us-ascii?Q?CEmDJBgQJzukSE4xGrycpQhY5A1D2lNIByJ0OXQxpqyWFQ2lJ0OWutTUuSAF?= =?us-ascii?Q?+o/+8l5YxhDcNrsNrZvnPVfVro1qBg11sgkUN3YZnepSDwK1yECMi4VXULh5?= =?us-ascii?Q?upWmN5zIjEfNEnLzCf0O37qg1CuUO0uSo/L69HanLMMMWxmh0xXZ2ipcGKWM?= =?us-ascii?Q?k9b8RV/qC/NfSAm9cMRLtB6YQiUuwB2X6g2HjJ46xu0BjKjYvO7c5Q30oCYV?= =?us-ascii?Q?nvl9ZykC3uUviQ8ZXmj6QbHZam7q+VNFQ8tiz7XOKIx39+aF67WAdkcc86No?= =?us-ascii?Q?Cndx364dO+xo+a64+laWqZJg/RcfgL+IiYj7ZtKE3GN6zYVW4QIC21EJaYQX?= =?us-ascii?Q?T7U5ftj+IMhwKSq3e6RMy6zc9Cw/zkDvixuO/GnfGcDnVSgpr5nCwO7bigFK?= =?us-ascii?Q?GphQ0fbdPPNtrrjqlu7EoxXyKeBp5aE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 432df42b-a87b-40ea-2df2-08da536c13a2 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 09:54:47.8565 (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: eBOz5hx2tW1McvrEAqhvnmUbUZt04Z5sUJdT4gZ1Yfwb2JXS+5CHUcmxqelgkLRFAh+wskaGPbzot1H4PHUg/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9427 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