From nobody Mon May 6 16:38:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp210111uad; Thu, 30 Jun 2022 01:51:26 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sPnUsvKxVmBx6wWsxRU5u0gDymJmKTGqVt+BdqEVQX8wkTZuUREBjWwn2GfJsr8XakVbxG X-Received: by 2002:a05:6808:e82:b0:322:4c17:2f61 with SMTP id k2-20020a0568080e8200b003224c172f61mr4647622oil.131.1656579086009; Thu, 30 Jun 2022 01:51:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656579086; cv=pass; d=google.com; s=arc-20160816; b=oV6C++jCQd23UexwcUYoNhO6OODcfKPBDT8uaUv+rBaCRPnGOrTpC5ar2qVRySGF8t CT/HbVDUYL1uTmdDNy6WaxvmxMnEv43gQdbEYUg9w58SxH3L49v0dqo40Z7R5QTGtMRC XC8/VRNf35NE9Fpo86nwkt6vsY8uZiqm3FlTy+tN/+UTO2PwEYZYtzdK8pHERaC1PMZY gI9rzjXeB0uCU7dGRIiKeE50dC+2CkKYcLlKS5my+9JfU82M9DszS7HYeIi2d1NjfTLv vRnq2bEaqW1z8Nw0MGLglK1U4YUl7L3uVD3PyBetcv+QbFU7LJRKqsiyKFz0zTw0eIcs /BEQ== 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=0ZB4xMH76SkwxyNpUeggaReNexgplLy3BOZmanOZBwA=; b=dcYG+EqeGt/NhFiaLtN3m9lT9zdRhBmXKe2Qygqj69r6vlWsUUpQWlHUoRpn38Ezly 99okuzKdjkXATr4La33I2q71KlrslgFHMwBmUoSGxlUf9A5ypHOh0Xr1ejWMKp2PeUQ/ zksvN6U3MckDTWeMMFrIpOl/ZxHndPpcFGqxwILQDd9yt6mBTeZPTTdTiOanvfudoxUz 4ykUVNhPz1OZ+wqa9UsaDsl4NYSdMfZIhTtCHqCjfnlRfxS32EV0zUK+9cYGx7IhiLVO D3mPkrAYp3/Y2VepN1JEEYeny4cwLrGDRtDV9YmhL278Urstc0XiyjTDo38r2Axjmt96 1gfw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=E67SaPoc; 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-5905-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5905-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 l12-20020a0568302b0c00b00616e10a73casi12156443otv.289.2022.06.30.01.51.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 01:51:25 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5905-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=E67SaPoc; 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-5905-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5905-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 C2D592E0A2B for ; Thu, 30 Jun 2022 08:50:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B05DCEBB; Thu, 30 Jun 2022 08:50:54 +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 7AD00EA6 for ; Thu, 30 Jun 2022 08:50:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XSd0+pGpZUvhQ/NfzFtGHMnD78yO+abdsqN5wgyM3vmBnGoe1gFNARqEXOK/mrmwwbjIQsP8vD5wdEfkY6POM29Pn7LjUQYmNnh/D9ctZ26VwcwIthEhoRH47OuBWQZxU0y8IZ3gazwFkm8jI1wfqKovWJyiP9NoKqaNZJOKx+PbexvVbvJjGPs/nxR8sdoCYayzm5yRN1VXjairt2A5sx1nEKc3bzxHZmEoKmPW8Rr7Zy1ap39KB2IEzj77GdMKIND2LIhxHYgVyx+hKBDNXv++/wsvn66GMqGrPcLMhwO7se/wBIN+DudURJc5ig/Tl2f1y8ihFCdjJeciUVFeng== 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=0ZB4xMH76SkwxyNpUeggaReNexgplLy3BOZmanOZBwA=; b=PvmIZaFTpA1Hg0I9KyTIKs0/rxlcw4+EeB10fWGE6s+bnRIpQfqVsd6uXE5jhoi+dxSkJbR4BDk/rXSKZaZ1TtZeXMPrmGdUg7xKXnuxYt+rKXG5S9z0C3oWqCaLyX3PdtGohS1N1NDMnZJtRSmAn2rjsIu+TAkmds439mVHwsT9FooaH0mfkVUvSNuml2zVkT9UQ4FQjCHi5X/Ysqbngd3WqH1FOWotbyKBWLO+WuAifctHOEATJ1DPjsJMeYYXGt5xcgGyeRR79JQLgSPlzTmnni6QuTZIxxixcbJrBNinSxmbOWUDzANSv1+i/p++prnr2L59yfI+mtlJejh1jA== 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=0ZB4xMH76SkwxyNpUeggaReNexgplLy3BOZmanOZBwA=; b=E67SaPocE9sv5MCnIxhUnF5+bUrOIca89DzbBl8OXIKeoWxFHqslrofCYAzjGbFauDGtAXNqXjCoFE299eHGrb9SeDkcNfsdrO8LH5fu8u3tiSe1+wZ986SRBwg2owbDSsV5hcXspY3isbR2AbQ3NSLEktF+DADHTeHZDvPdpF+9W/beGTT0LEAWmRBdB1TUm9m5Iryz3xn86ZTYWX0DxfWZyO0FjJMXe3x9QQ16jEx1s7GTK+TkzACVlbUUY0jBo6gSOogf1y9x9btmMB+u/kxN5StnFY6j/FquNlzj3WTx2QEbOeFzz9olaNIJfCI8wssn6nAu2nkWoQqPhZZpqg== 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 AM8PR04MB7778.eurprd04.prod.outlook.com (2603:10a6:20b:24a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Thu, 30 Jun 2022 08:50:50 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e%7]) with mapi id 15.20.5395.014; Thu, 30 Jun 2022 08:50:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 1/5] Squash to "mptcp: add get_subflow wrappers" Date: Thu, 30 Jun 2022 16:50:50 +0800 Message-Id: <9d0b6144bc645bd10e8c44dadbabfc1d8605d935.1656578856.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0025.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::12) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 329aa4e0-e49a-4078-06f4-08da5a75a1c6 X-MS-TrafficTypeDiagnostic: AM8PR04MB7778:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c7gKqgAeBr8tNWwsXvmCPvs2Bgx0pgjHesR7EWkbGrvfk7Qe5GA8rXooI6RMCnC9BT8RyfmbRYK+hoyMJD4hTumvw2XGP1tps3dDsEoKIJsdnzadKzOj9kEBfbfUNoI3SGVVG2XpTHsmKPs4ffmnCBjdQ2skeNstTNCB3qKRVwGzBkaBOjj7g5owsqrRjtP5LsdKDewQEqK8WooEJ5ycCxmiuYPB93WvMS+C7HQe8fdUHH9acgbn8JXVdF0l73gpuRImVnPeuM+3gxxfbtcMr8cLyz46uLQJRwDjrZ887tv9UMJuT7HPP5+0UtBVy6zvM/cqv7r5w03v6VDyH4SkK1VEZB96SsQt8iM+Jikgr9OFfzHFrOzCZNnQNBcHRyK9VAHzsfdsHYHcBDnrqej5pxyxRrJnpbfIk4qqsXEuGGqYatbJKmWMroYPBrV2ZKtPVO/VjeAbmK7AjoU5J9jecLBWh9ieEYasK4mElboUo3cN0pxMC8fij8iNpQcZ9PwQb2ndGz8kF958ULIKbLxAh3h+7vTmK6N1JGE0+L2LYKQOzjKb5gIA+8nfey21EEv/ww877mpsqcIsioxTzBMwXAJd5wdrRtxWI+5fa+JMKTTZKsUZ6b3P2xFOnFvQMzjOcrbzL2BiO6o2niSkgcXEFuf99OcsARHwFFLWHYvH6HhusQj+zCNs69RBqLvCm9rJfyNWHp+qgtu65R7EVJenP2t20Y7IiEzEYY4fnLa0DzLc8uOU9UyPHkRqC2uGu7h+lFwSd9cdlwmLtqPocsAUqAhzL5nt2+61XZfvfFnMcBMgd6v98ZE17+1ueVvu431o 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)(376002)(366004)(396003)(136003)(39860400002)(41300700001)(186003)(107886003)(6512007)(2616005)(6506007)(478600001)(26005)(66476007)(86362001)(83380400001)(38100700002)(5660300002)(36756003)(6916009)(66556008)(6486002)(44832011)(8936002)(66946007)(316002)(2906002)(4326008)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SR6g/Hc7pt8AHce35dIw9C+nQsxBXzRzLU1F3Zc4rHJ26ECE/yUoxq66f0Um?= =?us-ascii?Q?WPKOxbilDLF0CuhBCz0sS+5pFiyqswArMHby2YJFnxfepeGtwZISjk85+UOb?= =?us-ascii?Q?+hvLEZTIsxo2+I8abfRfGoeoiJUApFp2YqDFB7xODiQU+UO3QbPib5Zo8tI9?= =?us-ascii?Q?s7ciQYkuvLwEQRFCHo7Cppj1KMZGLHixq21C2OzLq4k/jifeIqrP7t45rW95?= =?us-ascii?Q?3mtYDEkg10IqCtG6jsoEM/Revm0oBIRJzJuh5zKKI4Bd0i7pxkMyoBK86dxQ?= =?us-ascii?Q?+Pui0b/+pG6vgfMQsgQZbhuGiuR85LRTykOUpGivpLN81wHgNGoR9ErMBN+h?= =?us-ascii?Q?FBLN56EtMHz4uBLJ48XKjh33+QovkgKTVsvmKKUCBgN/tsTMkaMNKfKJVbhj?= =?us-ascii?Q?Lgj8k2+tAVhAYLHtgO0JYpCEjktywBvEkNtS1Z/rG1Cr0xHdrQ3rgHpt7+Q9?= =?us-ascii?Q?QgUQs+Bc4nz6SydVf7kWPqn1cEusPrBwFi2oYqnNQ/Fd6Y964LGalG0HI2/y?= =?us-ascii?Q?aL69XfyrUv5uyvdPsAQrJWQlaLGZl77vh84czEtFPsUXNiU5Dos8KGi4vjtr?= =?us-ascii?Q?bvnEQgMF4om5tIX97Kvvt1Mz1RKFkRdm8tpgtVcsesWby6eslAy3OBSUpJwS?= =?us-ascii?Q?+gmUFBzaCJVoh8qOFYrd3hh3IZt2rO5YQMICR0e1WoFhLAhtVXObqk+vFB0l?= =?us-ascii?Q?VYD2D3hMuEJ73hbtcH2I9Y6ig5UbqrYpL+4ez/gzfk5y9gvAD87J0P7xAQMm?= =?us-ascii?Q?YEy2Rh+ulQxt3uiVjuzeGNE0ca0zuOOGBBq3SUoPu/Vr2JrRipCDDIZbhTzA?= =?us-ascii?Q?UMcCq+36o799URjzUzP//RKTHQ/HAInxWkHVPUtnCRfljgqtPlrfeIoGWHEY?= =?us-ascii?Q?Z3h3uq6mWlN8/Dm3vJkBUG+Kr7snF5IpBWoo3eDsTGkxrNg89CD5tApH0Aq7?= =?us-ascii?Q?qd9eHr6PCBsy2t8PKbWp8g/op0N8G8/64Y7piEtobvPJfTGLdGNuKY1DaLoX?= =?us-ascii?Q?oiQiZixJtZsAjRPc/8vKhXYcHC654gFWnASIcqeMYIbzy2s/cCx6jJizHYzj?= =?us-ascii?Q?O8YK1Sj3WKLe3/BZgVxUJwS5g3fiC9ZYAwDSSZ0cXs1LsvPH89B+Qw2Qgqkr?= =?us-ascii?Q?1vjBqS41uEgCf/6yQ5LUywE2jATD52VmJ8czBFSNsUxLdjhbUjRBXJTXXWYO?= =?us-ascii?Q?s8CkBdlo5tKoToITFGxHfmMHYSkBcuwIni2ti1eOPQk5UOmXvaw/kdcJtefQ?= =?us-ascii?Q?azXDAfNbUplTV8Dqtf6d7suWoOiqIa9jxml2uW7JlMQD7EFqfq4Kqbn44w6B?= =?us-ascii?Q?fAbIH8f00d8fZ8maUNExSeUTN51sepCO0J5R68COJGvDa99EWqYsNrFKmCpU?= =?us-ascii?Q?hhS8BApZ9RtpZPyaYtqf75UqGRu6O0hxlO85BeTQ/FILnNLmhE8ubUfxvUk9?= =?us-ascii?Q?cY7gqpHUknUiSQWoJYGRvzeq25JKh+FE0XIr3oeCwaxcS9VgOrGor96J8xnS?= =?us-ascii?Q?pzN9WcfxNG31iv2CSyFsAcRMFKQ9aWpVw9fyXpJ7FKGGEr1ExRwRReEYO/ec?= =?us-ascii?Q?C2CfexvLNa2Qq0+l45lD+mpgTvMEbtOHczmxAsftURkHbsUK7ol7utnXll/K?= =?us-ascii?Q?Vw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 329aa4e0-e49a-4078-06f4-08da5a75a1c6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 08:50:50.0629 (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: Iv4ZgUPE9OfkDhgXef6B+A1ZZ8p20QENhWJK5PimbSGJ8zX86eGsZpiQBv6V1tdxOClfcL7LW8cWNrGEnqR/iw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7778 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 | 4 ++-- net/mptcp/protocol.h | 2 +- net/mptcp/sched.c | 56 +++++++++++++++++++++++++------------------- 3 files changed, 35 insertions(+), 27 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b1fae2f747c9..6e44786e01fd 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 @@ -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)) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 95c9ace1437b..af414cd8b7cd 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -636,7 +636,7 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, 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); +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..85c1fe85399d 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -114,34 +114,46 @@ 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 mptcp_subflow_context *subflow; struct mptcp_sched_data data; struct sock *ssk =3D NULL; - int i; =20 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); + 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) + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + 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; break; } } @@ -149,31 +161,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 Mon May 6 16:38:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp209967uad; Thu, 30 Jun 2022 01:51:04 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uxATAPXChhRwOJZ2Nn2X8SSSGPThe5nlGCFOs+Suwzp9oh9TwXhMiQfSKRyEeZYd8VdVMF X-Received: by 2002:a17:902:d551:b0:16a:2a58:debe with SMTP id z17-20020a170902d55100b0016a2a58debemr14530096plf.65.1656579064021; Thu, 30 Jun 2022 01:51:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656579064; cv=pass; d=google.com; s=arc-20160816; b=f3y/v2BA5fmVBv/oxDW3ZlCwt+skke9pjh+02/h0+w34VZMs6TxHRZd7Zuf9DY+lOM qNxWeQ1+mK3As5YjgivnUpD67+vn9aD/S5hfiabZ2WMCvSnYsxqjX2HucxFFS5IlZNrz 7bb7p9/qOt5Kz5ayJysI/Uq283ur7jAwWv7jTfIp5/gtU1r0kQuMejmYAs8ZvXi3zY/+ J/kEFf/2tM5yvahvCu/oLbjlJAuEwKz/Wy3w0r9Nk4FlZPI/axngSmMntOmpeySq7yN4 hKx5tmIhCt6rAme2E34jfqC+jGdSgsOSFv0cxOZpoiVhAlKXgX476AkD3iqI8dmxDIzb HN6w== 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=yUTTg33+3CDrczuIrfebSYHK+Y5M2yboYyz+w124WKE=; b=sj7o96mrHbNDSrLcLe7SAz80w8U6bZOChR6EDJ4SwCLFhb+NcVL0m6m/rArLzn3KIE SVYQ+Gard9zsbnA75SC7p8HWwkHnGtaiA6crJcfhityaOVjJjLEId4lUq2o190nrIsqO HSw4jqO/TSE+Mry0BCIpGyYlbQPyxDm9LT1u72uD/IcF1A+BkIBoZtHZQzobbzDL4dtd lVgpmq6Pxotu0eWyI67BY7+0ZJOvaWrAc8Y4o8HpQKhet4Q68b4e+zIEH15G167EnLWG LCDQsoyw2hIO0lyHY13I8nT1EVYCImGhrzBT7ymKsL6kKHk4hGLvYd9L0hr9w7/ttHR2 JjSA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=BRviVlF7; 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-5906-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5906-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 lp13-20020a17090b4a8d00b001df3fb83daesi2644804pjb.157.2022.06.30.01.51.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 01:51:04 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5906-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=BRviVlF7; 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-5906-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5906-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 6B54F280C0F for ; Thu, 30 Jun 2022 08:51:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 64607EBB; Thu, 30 Jun 2022 08:51:02 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30076.outbound.protection.outlook.com [40.107.3.76]) (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 6EBEFEA6 for ; Thu, 30 Jun 2022 08:51:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QbXdzn0Mz6w9YKIkCyR5dIYvMgQu96dQrmnjKHNeA8FalLuzJRdvKcDDKPGHSMrESLBxfZuOnBj68V551ovvKA5UjKtrwQhWfuzAIjnQ7/V9Oxe6rk3jFV0g9zqBGaKk5v12sE4IWvknv+vsX5hVt1m0ASk3wihWlDFa1il8gLcZZL4FlQ58mjt0SRWt9DRnHQcYzqBnUcqz2oMBXpbqAHn2HxbPjG4/1iA6OvN1LqYtZB9cJOdlxECS40SPDVIa3g4y965Z9QRDl3yIO7/uhMqDIIX/7Tsk0TMLZkqmLpTg/EVGCmlHbRXBDXcqijuhLgVqikX2kYMZqrYed3pPaw== 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=yUTTg33+3CDrczuIrfebSYHK+Y5M2yboYyz+w124WKE=; b=bZ3cFOus9yBqezX+9HXl+74etnnfvQ9+ds6ZYHmGns6hgArITIUQZjLBbig6J2WbAuQY5kN20nvPR/L0NGAuImpeihcV0kOSymkfFLg+9zIO5V7+2XQ/goVhDzdQHMGDcqBdipcMu7i7vwaoX07+ShhlDMvbHzDg0o4vEUOwX3ZtaS4Adc4qVVAPU87LadBmQt/yZaB2gprFZY+yvGnVksVidWDVeE8ALpjGEDMpIDjlKPHfnN5GzCJPs4U2Nl6/qDsNIsi98/ehQyxMYIOVeKL/Kk1SqRjhGGgqM5vQBPIlihj1YEFdcticbkFwp9eRFP9+fm0GAIxoxj6A43J5bQ== 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=yUTTg33+3CDrczuIrfebSYHK+Y5M2yboYyz+w124WKE=; b=BRviVlF7FwRxl+d3G+KdYiVdiPMF9crdfi4r1U7XMPDvSmUefmonBeVnbk21JYM/fZGKyNGJZkS80BWJrMarpYPWYmOuiZxxLIWWAn3LStcRD72WQs171qP0cYuThD52lJBdwk4mk6af7nJG6o6JG2WWAVFzMJF6rcAS1HZBHUEJZRu8CIsRfpoMZpSQw6xBq3v8YmGt2ql7NltVe864KYBAtokLdyJBWh7XgKP6NeFtHA/NKlpztSJ5Fs5AxnlSW/zNlsEj7VQst5kQWloalB9y7HI+3xandEkCpRFkUd5mz9/MIWsnUWP1cH7vNlhXlCHzaWbqfDP5u8cjnDZQYA== 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 VI1PR04MB4381.eurprd04.prod.outlook.com (2603:10a6:803:6d::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Thu, 30 Jun 2022 08:50:56 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e%7]) with mapi id 15.20.5395.014; Thu, 30 Jun 2022 08:50:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 2/5] mptcp: redundant subflows push pending Date: Thu, 30 Jun 2022 16:50:51 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0210.apcprd06.prod.outlook.com (2603:1096:4:68::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: a2144d53-822e-47e8-38e9-08da5a75a59c X-MS-TrafficTypeDiagnostic: VI1PR04MB4381:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3qzmW1O/ACuZoOvA50zL/7lllFHeglDuFhMVA3+9VCRY81M7bQRDNw0sY/kGxzpPWdaYqq6WOVIxjsjYy8Mc2OM1T2KaokJ1a5tauGdB0X99FoMGr6exQYABpPTFwmQ1dDbcowvl7HADrTtffhgGu6gkGFMw1w9HNsQ8+3fJZnpz5a1JrbPepfqbabZmmuiszVsN/n3hjmvW2dHX4dcAsbZUtkEmr4+yLMZh6ykr+WwWTR4Y3h5UZiVBAgOc+qGN2nV5rpFpiKGRtnvScMlkX3brXMd/2j0V7jv8qCRndoPsTC7fKsgMJ+EK0f9uCCUwUTUhkNmS+W+oGQ3PPMxicVLl1DKYjXcr4RZKv+dhlcfsbD3JOay9onhpTozG76PdiWdA7fCfJNAHMH7jZEtSnXKrpLkfJ1WbWUJtEzw/yshtvNkO1GkSNURuZ+7IXv/ryuUDavWN/iSB8XGKZ58qG4ub1wI/MZEXhmhh302tShcLPBWHwhTszh9eJjtmRZWhtSeKBZAgEUxBDJwyMME2h0lmGhWMjJ07ZOu16ygzcLwHnEkYid2cLlLOApzE2mIiWtp6lPKbE4xkdW2KEl6GD6yMR4oYbdg8TMlDO7lVafLOQr2GfpFgeRQUisDQSZEoraZIfE+RRRwrWY1qku5cfWscBPZXuH/A04NKuzx0gzhdVkbKud+Fjq5uY1knAb0IOncq75SCPCsbkVGfbOiHtlZOfX/uZcuA1boqwxCH3Bi1x3uuInYVikY2FcB7w8EC8GZBLY67x4X/OD3Nq3ruwk1Wdx/+OBnkSFWGYbNAKIrdzJExkUZowCg+flSd5jej 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)(366004)(396003)(346002)(376002)(136003)(39860400002)(66946007)(44832011)(26005)(83380400001)(5660300002)(8676002)(6512007)(4326008)(6486002)(66476007)(41300700001)(2906002)(86362001)(66556008)(478600001)(36756003)(186003)(38100700002)(8936002)(2616005)(107886003)(316002)(6916009)(6666004)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MyKpxH+TpJ9adQyimQRoml8YBSam7qChFUepnO+IvFkhLsQULLM8L668Bhxz?= =?us-ascii?Q?9VA84aWU3HDQzx2Gt28WpVHCOKZ4T6mA/bPCrwhP6J1IsCVEM/2uWoUYP2j5?= =?us-ascii?Q?FMdMnHMau7cbLh7ElU/Pwe4n6yeBjY0M6T+WOeXBNjJsSfT7h8QMbrFO4yNJ?= =?us-ascii?Q?Hfvcr2dIxHb5GoNLLgaPhGAd1cZ7YmD3++u+CTqYd+E3xSCXFujLUSq97Ptz?= =?us-ascii?Q?gJqUn15K13RiC4EUqzQWEV0VpHluI7BOqypGS7ezaho/NLsxmfUyKXYNtlVe?= =?us-ascii?Q?+4hcIzmgbGZrMagcgCIOKMUMpbFGcRMY5vmaGDHISkAUqljMXaY7ZUHdizCZ?= =?us-ascii?Q?Per94fx8E68+icJ5DvRmBMI3+CkpWOpW9zwJlMLjbFNvIq3EEWXUcqf9FynW?= =?us-ascii?Q?ctaXfnPlKFFbyamEqG0iRob1zLVyZfr8C9RkOXXZGsK7ix0joUF8tCXnNiS4?= =?us-ascii?Q?GqtKGbJ3cndsnUOI9vrfh3WspL5ggzxA99QozYJl7nzH9g6B1C6WuEww2Lbo?= =?us-ascii?Q?l2MMAVsH0k0to+lTsoyOtCRgj8F7zq74jG9tqmF+rYAPWdqYojmyjWSpSGk/?= =?us-ascii?Q?ieeyXK19e6e09lw47/zCf+uxZZsFh4VCc5XokF2+6pcqMZv3R01GrppuKzUQ?= =?us-ascii?Q?LaA1OskdO0MmK5J4BjDKvhWSe4WoyZTHJI3VOtdid0oTCJkNADuKaK4HrIRi?= =?us-ascii?Q?SOkVrj8xmp/6eUOW648CjiWj5a56UKUbcYMUxCC/21bY9CB4V3j6C6nLK9Hl?= =?us-ascii?Q?puLdwNtMKKR11OacKG0tTb+50DiplA9AywIoMtjP+VfTMriNW2RrEptni8CH?= =?us-ascii?Q?L7hcbJWNeGlKlp1JuM2z5dV7Z/UW2eWo13Vdp7DG/dzHBaDkrdMNomMtaRCa?= =?us-ascii?Q?bHRjs64u7NbcQd2ARDQ/85/pIiMVV5BtqgIWNpnEPHEA+cSN5O43O1PUwC0N?= =?us-ascii?Q?WSkbgbkxaFA/8dRo77ChrXUr5UsKAVXn0wt3yE34j1qGYJ3rKL1HT21sSXwZ?= =?us-ascii?Q?uq82J9YyFL3LanlRrCtomKUXAycAW4F+MwpvfZ3wEa7wf3GqAQyvKhUwMkhh?= =?us-ascii?Q?1537l0/fBjDh00eHS9hNSdtGJ2idAvvhmb0vHEISATG2ioknRWa6dIrDwavB?= =?us-ascii?Q?A7MbHNLpd+0IklvP3MaxDqZCUIXolGF1zBltxlUY7WaZKkrJvbB7joBwhvtq?= =?us-ascii?Q?d/OLfoFcJcekUE7P+5eRJq1dNSoRQ3mHabdaqA1nd68a0883mkxG7qhFJqT8?= =?us-ascii?Q?zTPd7l9VXHbWAXjV2Ey6iaEwf5t28fxp0G5FjSOFSozLooZQysnwNTqqiWK1?= =?us-ascii?Q?35OVTfK8v/8sHvQ21B8jQnXDNFhdKlE0dxMre/C9WQjKkSjql856UyrLna83?= =?us-ascii?Q?ZlOWlogC+6OcsZ7Dp33bkNLi+zf1aKT5r/OsAt8fB6+gKLYZ1wSUR3FyEFLF?= =?us-ascii?Q?6cHW3F5rS7g5iVZOslvUw0A1ZnOnZU/iqj7jaaOIKtf7XQKJBxFHIC0hMC0d?= =?us-ascii?Q?KDD2b411dB6es9NlldibTKyoAfhGW/8ZCWSSJj8xCzAfVcpLlY5a6/EcJJwx?= =?us-ascii?Q?alNXwmOWdf/b6mjQXol14B0LKPjSOkZPAaOaV4gDDXSA8Nr/RLKquDZVvff9?= =?us-ascii?Q?TA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2144d53-822e-47e8-38e9-08da5a75a59c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 08:50:56.5311 (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: u8NvgUdrUGD0b4RRjYHBssmUy8REoF+zT/Vnrqwb9zm8W905aw7rELbbpVu+9qh7lgNtVWvyKEa8B6/3PJpizw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4381 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 ++++++++++++++++++++++++++------------------ net/mptcp/protocol.h | 10 +++++ 2 files changed, 66 insertions(+), 40 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 6e44786e01fd..f97e6c318c0b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1516,57 +1516,73 @@ 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_data_frag *dfrag; + struct mptcp_subflow_context *subflow; int len, copied =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; + if (!mptcp_sched_get_send(msk)) + goto out; =20 - prev_ssk =3D ssk; - ssk =3D mptcp_subflow_get_send(msk); + 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, + }; + struct mptcp_data_frag *dfrag; =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) + dfrag =3D mptcp_send_head(sk); + if (!dfrag) 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); - - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) { + do { + 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); + } + } while ((dfrag =3D mptcp_next_frag(sk, dfrag))); + + /* 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)); } - - /* at this point we held the socket lock for the last subflow we used */ - if (ssk) - mptcp_push_release(ssk, &info); + WRITE_ONCE(msk->first_pending, NULL); =20 out: /* ensure the rtx timer is running */ diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index af414cd8b7cd..09a9797d2dfb 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -355,6 +355,16 @@ static inline struct mptcp_data_frag *mptcp_send_next(= struct sock *sk) list_next_entry(cur, list); } =20 +static inline struct mptcp_data_frag *mptcp_next_frag(struct sock *sk, + struct mptcp_data_frag *cur) +{ + if (!cur) + return NULL; + + return list_is_last(&cur->list, &mptcp_sk(sk)->rtx_queue) ? NULL : + list_next_entry(cur, list); +} + static inline struct mptcp_data_frag *mptcp_pending_tail(const struct sock= *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); --=20 2.35.3 From nobody Mon May 6 16:38:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp209995uad; Thu, 30 Jun 2022 01:51:09 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uAPeQrP8Viwi008YoPN9GkVDycS1eDXdwLM5yoXZJkKFdagjtR/3EHywtJsyfOB9O8NOth X-Received: by 2002:a17:90b:17c7:b0:1ed:1a28:8dc6 with SMTP id me7-20020a17090b17c700b001ed1a288dc6mr9065573pjb.224.1656579069199; Thu, 30 Jun 2022 01:51:09 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656579069; cv=pass; d=google.com; s=arc-20160816; b=SiPdZM6/AG1K+MlRVYtwlPKl7Hc8SIdvIxREMFElcN8H8b6ipUSVyeRqqda2XNkAW4 0BHzZt3j3c9E1I4AquOdVo/SDXZGi0vQJ1hJ56RlMOrRahGef6c6ifn/GBaceRgW1HnP u3HrawPY94VyHBTi9tFEOfRMOwpqDX/82utBD7i1w+URkS+tLYH69AcT33+rn8QeWA8q WJ5J9uq032jvnXJsNWiq4AOa5ACo/RSG1m5LL4dfKEdkClSKvyZK2/D0dQ3tOPIuWpUR Ww/gE9ABpYHI4aZK6WG/RGzCaztHMbo81C1lrai7VeM6Fd3P+4Id3Y1s+R4wuMat293Q a/Dg== 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=jovhntmTzU4gmIzTJTnqKNfUjz1ltHShObt82ozRWb8=; b=xg9hlt+Qc+3X7C5x3UQBh1fPlwRs10jZh9CLXESkiyS5r4gcYWjTrzhWu4gMSMnhJW QNcC0bMZfFWDc9JqHCoE+mMClogq1NeypEZGGKQ3H5OmULKJo2MaaQpFnsdEf8oNYnnX BJvnWCCQPwg2tlUprkn7OSmPkWAj0LmmEUqegyXVz+R5aybeY4O5NNHAXwINKvCCPJ1K zVKB0ClrH5uVsIDVXSTPCWHkyO+E5vHnuT0HwgvGQPKC5CDUXUhBDkt6u1VVY8xJOhqr cCZs5Xt70T/9SW3o+Io5pf/x0ptg0MDzu8I1VVHxoQKkd/AArqWd58Z+ixvA7KNwf2JE 4v8A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=0e0bXHkR; 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-5907-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5907-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 198-20020a6219cf000000b005184f87b172si22968396pfz.268.2022.06.30.01.51.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 01:51:09 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5907-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=0e0bXHkR; 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-5907-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5907-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 CB5EA280AB7 for ; Thu, 30 Jun 2022 08:51:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BEA4AEBB; Thu, 30 Jun 2022 08:51:07 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30088.outbound.protection.outlook.com [40.107.3.88]) (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 21C6BEA6 for ; Thu, 30 Jun 2022 08:51:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SKR+G2SBduuFV/HfGXx//RpxBPFETms/XKZ4BmKg5aCC65tAtsTKa0jaH9lenH4Sh49kvRH+MvRPWAYh9STbcYHZYaGa+JkzGLBEEwvWAtUpHsnkKK7kxZHekKTGoKPHTkJBxwwOI/889eq3+QNhPm49T3TZYfRIacFmVSk3m3g8N9ILSAAy6MrbgY+0rIhW4A8M8dwKjZprRh4T0KhUmRNaDLs1I4mb/q+TzHIA9rtmJ5kKl9KvoHQwnMiWegDndL2ESnNbCrsh+cQdPVE3nqERS7lmKzI+8/BlFEqF/t2edN9Jxz/R58bQbeGsg6CE/brK152yNR3zoNw4lR1VBQ== 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=jovhntmTzU4gmIzTJTnqKNfUjz1ltHShObt82ozRWb8=; b=NfbyoIKhMcSZF01AVMZifLVoeiqDgYYlHtkyFrLhbrZLosdNmZwmuhwrK1fKSih9FXrvEmhP26oTBdmhLeyX/ObafHpj9Cvl3CxOKy09VlBOcyxGiydy3za+Of/wJDa9S4SROUh9eH2sTQLbKKF5bzbZmjlIyk3mu3MUNJDfD6PUpeslZUallFGPk7ATom39lCNQtAK59iOjy6+RYT0Dc21tV7e3foHeywBQIABvW2P12wUtxiafTp+EivhjWXUPByihRwKb7pPvVYoi/dtPSMOPv8ocRxncHPjC8VvHB7+ns75ihUlaa9/xqzT2eWeglU205LWKmTR9LD1cCitsvg== 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=jovhntmTzU4gmIzTJTnqKNfUjz1ltHShObt82ozRWb8=; b=0e0bXHkR4yHOkFdAovno2PgIKaoj+wBLYIcmUXvYATq7j3Cf4W3P6Mgr7XNKZBh1/QM4Ik+hhEE9/VbgjBODFTWkwsOBrBiRjmJghYxYbIholGBNEVM1y2kSqarQ5b3mAqbTQuBBX1l0GjyuKC2DGcioeq6AJq61tTmD/JfOOXM+wddDwaTH8VCY3YFOTkV827MRjc8NrrYHExOKGlUNtbqv17JLg/XFQG+XGKa4yzvMqniL4qgarkEkSC+dtPygnvZn9nDilklq7N940vGeYmzFmS8VaVdBrDSk866XBH5WVvXZS7f1bR2B5qQDuuDM2yCiSdczuB/IlHzKX6HvWQ== 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 VI1PR04MB4381.eurprd04.prod.outlook.com (2603:10a6:803:6d::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Thu, 30 Jun 2022 08:51:03 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e%7]) with mapi id 15.20.5395.014; Thu, 30 Jun 2022 08:51:03 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 3/5] mptcp: redundant subflows retrans support Date: Thu, 30 Jun 2022 16:50:52 +0800 Message-Id: <59812cc1ba657fd6b4a2d1e499809cf3c3917e1d.1656578856.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0227.apcprd06.prod.outlook.com (2603:1096:4:68::35) 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: ddf5ed5e-8cd3-4323-3fc7-08da5a75a9a9 X-MS-TrafficTypeDiagnostic: VI1PR04MB4381:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4ZhTdqPrQy1jYxyBas5QtevVWMrPLrqRZnJoJaSh9+BG3HKBxZj4GdlvZY4/0Bcfa1hvk5m4ucHjgMAk2lmPsIG/n/GEs/0hLBRMxzhOXUqEYav657Q8DluqWuQrV2XeO5Ox27+2IeF6nAPExDiiW+S2/pUtQMg+tCGtgD2j+MndjEdMrnc3blGbhzGSfiTw/zukcJoWSUa/EpfG1WDJBZT+pgHXB9Qz3YgYIIkcneaYquluoKiaAWsj0+umJdhl2QgfVKM3hhur8PwbhesFmHp5Z/gkqsw/DE2gT+Kr/R5Gb1YoMDCPc0cBCdrlLsAMNgbqnxIlOFWXPvypIPYnbQ9HhBY+AQuheukUSC6JLKmai5B/X73rV4eOBelTeSeJ8m7V+9248MCHIg6ccrGaEX7HfpSRz6veRxXWQQsXG/8C3KY5SPpCIK/6clT1tqwxM3/LNY5BRhz2gdjc5gK7CpX/PceBuah69dOes5yHJliyDHx4kFkHqPnGg1rz9FwYIIv2v+SS9nkDC0W6ekD0p4L+BI/V/GjzYioVedWdiqm4I3LsEiQVnNKTFQ+hhpQXIzmcFpDubIDiNc+6947+JWrtUZuHqCp2j2MweI/ieo6wxK2570dvNSHk0lgeKjBiS4PJfOJ1OETeCw5Wte0iao+2d5VxVxsHhsLgqim1LbM+rKqpHIeyywhbi8q4ZkKVD/AG72CbNMQizjgRz6HFSG6vibJZf6N8IjS4oe//GMMtuzO4ayf32+ki/zFE1OTZXo17d922ZVMLdDIsqq6rdjEFEPY/+NAO6zFJud/rosRlsVZzjJWxvP2GNedyHsrD 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)(366004)(396003)(346002)(376002)(136003)(39860400002)(66946007)(44832011)(26005)(83380400001)(5660300002)(8676002)(6512007)(4326008)(6486002)(66476007)(41300700001)(2906002)(86362001)(66556008)(478600001)(36756003)(186003)(38100700002)(8936002)(2616005)(107886003)(316002)(6916009)(6666004)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2vGAThHwzkyQkDZxwLA3BXOa96JYIApxCUfJUlZQm6bB12XlJvpQARPiaGfC?= =?us-ascii?Q?5Fkd9RNyqPoxBGe4Nw7mAVlZTjxPaBZuZWWPXr88Aiey6g/kCsepHFdMlQpr?= =?us-ascii?Q?ZSGZUX8w855jYT8iNvW6KdYGw9poaB50JmmKsShvi9A4+tjfvXsd8FEfZFbE?= =?us-ascii?Q?h3jMxyqqjfGBNRUP31i9lA/W8sfc+PuG187t4zEPH1/f/xM45Dbehs0kHjeb?= =?us-ascii?Q?DCgKeeO988JlwwJHy8YD6/s6oTFLUecam92703SqC28vYBoYXA6B+oz1ykZC?= =?us-ascii?Q?rhucwMVx/uEOkh1OyITjRd74yEevmYQgdlCBfibSVjoQpE3AkT6rI61cmSs/?= =?us-ascii?Q?HPOM8t9HaDfAXGFm2HYDSEa9PMi1T0ioFXlHSoHdng+ApfjrS+zgqLPSb+gD?= =?us-ascii?Q?ndACuGwPoDkjlP1ZqsShCpjjgKhXmJFi4c7ysS6zPaZUuWCgWAhUkNzEQw2O?= =?us-ascii?Q?RNu8ri2I9ygSq7mQu4dhf4fGBwMcw6KZbJXEnKT0oJY41vd2lzZt93+XP5sZ?= =?us-ascii?Q?sI1kZ7IBumdU96YT+QQzREoxLc7xg6NvOOsqcP1SZQUxOJEPmGKF5u1wF+ZM?= =?us-ascii?Q?aCnrXzpaVind4JNlUIEl0TxWW2/zXErZsmEc9S1MMPv1FpOl2teP/m4Ao3mP?= =?us-ascii?Q?50Tcn39/zx2VQBOKwDV08Fxx5Vz28RsnxqilOLV4pny87yL1U/63CUenZzjo?= =?us-ascii?Q?0WkoLWRabM8OQkNfrKyJVMRmvFjhFj3DNCbbalSv8bALCzRhZxskWQ06BCrZ?= =?us-ascii?Q?IQd6hjzdTESz4YyAee8f1j900a1FkUnQUMOHqDw9lZwnSy074PKIjYHSAx2t?= =?us-ascii?Q?NVFYDKe4aCs6EGjikGXPKsioE1lHCLIi0dURsWkOZOX3IBIToF/PVJRnd3CM?= =?us-ascii?Q?CT1OWAvcEurPEwm8EXPFSmx5rcCswM7r2dqLR5Kp74etplMbEL9Ea7w/z+6K?= =?us-ascii?Q?V7t8SkGLi1vstGecOiYuNYb7p2PjvmjOvu3wHhLR5N6PLczNsIfff/sQe4gz?= =?us-ascii?Q?kHhfm7hkX7h68qa4QnTw9tlh3eNcFGRX6mN6UFXRB/w+ztm3OYxJafbKpvpu?= =?us-ascii?Q?j1S4W91GhlanaaLThZRYYqCLIFulWIIQEneSB7ZWQSGt6xwdwbqIR8eu+Rsz?= =?us-ascii?Q?Da+YZNBoyi/nxcytmIrxuxRUISmQlVK6RnwAU1JHazgwtVQcXJjxWSwJTR5/?= =?us-ascii?Q?/nLgLR93/4e7iS7fzzKDUP8y3FsvGUDCzBPm7NYNvUoT+I+6BofL8jR+++ru?= =?us-ascii?Q?4Bv8jFvSOUKSbqeUPcaswqAmbqZTwhiQxRvGSVae+UCrIeVCF3IGfdrhfKxi?= =?us-ascii?Q?Radnxwo0KLYS+BGZZRtcahF0Xgx+cdBivsaL+Fz5DzLpXlH9IHy/ctIchBPv?= =?us-ascii?Q?KYGb1klUANgIYlqdyCLA6Y51pVDty2WEZ1lmSLe9LM0BzMmGgiWY8kFE55g8?= =?us-ascii?Q?vRLFz/AXB6gSlWpI4aNYC1cLLk4ih4ZmHzB3LTWrwqciUq/pxL2T1e+iftfb?= =?us-ascii?Q?IKkd/+hH5vybU3omVy8fWVIhfXkXcCSNd4l4AnQ1bJv1GzuCUkw3gVVh9eZf?= =?us-ascii?Q?+o7cr2v1BHdvHHc0g942de7Ay5A6quD0ZQGaRhGpukQibX/Lg3ROK/aLWI3c?= =?us-ascii?Q?DQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ddf5ed5e-8cd3-4323-3fc7-08da5a75a9a9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 08:51:03.3429 (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: IYE616jyniUCM+gjwbIxcdC9NciaQgqv/gJ5fWi+7TaMSIjWCDpFOsTfAXfj7alXPNHpt1QyRTz5Bl1MpTKASw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4381 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 f97e6c318c0b..3046b01c140c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2415,16 +2415,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 len =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)) { @@ -2443,31 +2444,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; + + 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) { + len =3D max(copied, len); + 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); + } } - - release_sock(ssk); + dfrag->already_sent =3D max(dfrag->already_sent, len); =20 reset_timer: mptcp_check_and_set_pending(sk); --=20 2.35.3 From nobody Mon May 6 16:38:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp210036uad; Thu, 30 Jun 2022 01:51:16 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u01DTrQS+cGYztS70YwFlfCy/iLmCcHFXd6YCeD3IVVHzJkGxh6SOQC1QFEtMv21FULQEX X-Received: by 2002:a17:90a:be03:b0:1ec:721f:6e34 with SMTP id a3-20020a17090abe0300b001ec721f6e34mr8931754pjs.183.1656579076191; Thu, 30 Jun 2022 01:51:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656579076; cv=pass; d=google.com; s=arc-20160816; b=rfD07Uib6mqWQ2Ka26WLv9v0jCcoBVFVP4omNflGCvloc+6WPzVljvSd5ybeHB4nAO 4q9I6Y8ZN+XNsBXfQc/hG5UZ4/cPVMksdA4NZDmWmOE5vnDIqSRnmIYbZ8GrxHRG3Hkl DcFOCiDAsf86hqwVXWyaSsWN+D8qarZTQMCYqryIPdyhJlNKoTGaE0x56cjnKAcz0Mwc /DiLacyak42g/ny7a4bQouhUMAqxv7zHgoR/+G/Ytd3wI68TRQLGO2nCRywA0RQpGtNZ a7AdLKUGwefGCvQShmi6mMtG8YECYbEZPBPrXF+Ka1JOzRZp3IBWHA/rMZvQ2kISy6rl i4gQ== 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=EkoMCz1kwea6p0PJ4ZxKb2BEf32pjQdOXILgmOdokLvCjIDxVbFVk2c54/JAtxrq4t KPnvfh7Cd95AvtDtxk51isVMlyEbjj0/vOhGTYs6XCh2zXDq39oV0FOKlWbhKXY+RfYS Xxs6RRCsuFTw7Gyz8oB78LVwldlvfYIyRL3dIzi27KJDpM3Uo9HwXiCU5EZM4PMEHmn7 v7lgorU5fnwWszZwUEgGsmKoS94qDdVBSjx4iqm2qiCXcOOUW1JcC/RLNKFyQiLmqEzJ VVQQNshc6R2E5ewxeeFWtz7QwtGa3B+bIwr/pwpdN8f8rF1fuQnWD2rbdHaDfPdjcZIv CTKQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b="IK/+YMg3"; 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-5908-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5908-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 t15-20020a170902e84f00b001639f0ff47esi8158675plg.40.2022.06.30.01.51.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 01:51:16 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5908-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="IK/+YMg3"; 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-5908-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5908-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 D0FD8280C18 for ; Thu, 30 Jun 2022 08:51:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E9543EBB; Thu, 30 Jun 2022 08:51:14 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30069.outbound.protection.outlook.com [40.107.3.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 ED08FEA6 for ; Thu, 30 Jun 2022 08:51:12 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gbEKG2pcuPMxaV0XYfPe/6bBeCn6tw4gr0FLaEb4piAzVpxNGk2FLc5Gp2cj0h7eUyj9dnPEo3aozET+Bnwo1XDPBmotnSQyn7IuYzs8ADCXlCZXKJA5ACy2FMcv7alt94apTQVM+VdXUD43DOX3qO12tjrnB4YWqmEV4Puj7yfbpMU74cYA30wa1E5iFSVV56oAiFnfsXLZK2x6xgfttafEmALd14KlmJVrY4c3rTTZeuHwb8GKZ+71MTNcD+bSLq9sBmEZx3LdbFeabh2cyL56tcB+IkOsXH7jnC1wU/9x/QJGmj6G9pEt6GzHGbpRTaZKxQT3kgCnn2KHp4T7/A== 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=ANFTGxgumSoELWc/TRklTfej03mPgSxpH503UxdszDeNxsh4KFO2cW17zvKuFkdBZjYR4xsr4DeoLUGq4RB7MH0PuFTo/aeOqwKfZ5XvPeMv7lcTRfhcP/n5uD2TwAKAQk7DvGiZ+UPPYhBQw80RGUwPPk/AToZ/OUw02u9TpuMjDqlsn6Wq9rGmQ1rJmIIg/HjU+xKXm9P3euhAiVIqy1ugdvWjckSTuNHgX5etep4+xCYK0yDSvbwjmWMoz3y2NeVvFCWxt3CONV/0LaFy5mHX1ba+4RCwisDcBym8Rjo5UWIEZdkynAS3weAfXWzpF6NdjuC2XtAUNAoX5JVsTA== 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=IK/+YMg3P3TGsDLG8eAKxIFeAx84DMI/d5pGPTctd9NtKd294YRZ8pIeRqz9KZOzx2715E4AFJmdJeof402HGVVVIvUY71BcmfcVJKzna7lhf9EsYRaZHk9JOpEYdfxGiXJbTONAdOkQOLgqD+x7Z6+FZ8Rg6KYSXd9N5ctUzpgNUkZ9/nrumxSIOV9gnXmHfDYot+TG+lHv+CTJjRmCfMOD6XdMNf8xkKqq7DwI/8gskVEdHPRImcn8ADACvKUrK99D0TAVaYCPfAGoZMyY9ioi6oQTqGfDMRMgXz6mqN2pLlS6QRshjHvQJHZQDIlQB8vIyXqO3XKboYMOFFutvQ== 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 VI1PR04MB4381.eurprd04.prod.outlook.com (2603:10a6:803:6d::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Thu, 30 Jun 2022 08:51:10 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e%7]) with mapi id 15.20.5395.014; Thu, 30 Jun 2022 08:51:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 4/5] selftests/bpf: Add bpf_red scheduler Date: Thu, 30 Jun 2022 16:50:53 +0800 Message-Id: <2a4bfa0a78bcc5ef6986a271de12457d04c61b06.1656578856.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0111.apcprd02.prod.outlook.com (2603:1096:4:92::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: f3789bb6-c57f-46de-f4b4-08da5a75ade5 X-MS-TrafficTypeDiagnostic: VI1PR04MB4381:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BO8IpZsgMO9u7nv+/ZMfASk/bEX+wUoxkG2hESwGKZpyn1CLkJKNy0dWSmOlTl5lFaKBtgaqSZrQhFQaaKYfYA7YygmFfxIq9+MRNfk0Y2lFuTfBTMUi/5WYwnPOGnsAtLs3q0ozeO/aIp6X9BWolHFQ27PNMYl8GUBQnQoxZEsbgiYx2xU5rzjzOv84Hu7g1CEnU8I8M6S4sSFOf2my+aDKlly7dv9BPo/QGc8sCOKFFAL21o4a2IPnKZFGJHlM90lFvVu5llmaSgOWTnbDvphIiUdnfiUKPimf6Vh70ulpe3YlSUH0bGQMdKkp2WikQ26bwlJYg6ZieT7hfHm+Ov0+mGbVsoqIv/nakHC+QN3moBNqMl8Z67ElG5fy38BJ0/vMW4whlH5JdWMTg3aQg0ok81F47M6YpU4TG9jjdPqpJ86SQIWermKXfPewAI6vadnC/x0dtKDvIZU8/z/28eln7oZeMImiwehzjJzqSQNj5j1OqGBR9bcpch+MB4XcK83W1EenNE99iS6tZT4HY83/wwjkvVsCd/bA9DRoUgtNd4qABFkIKnQmndLrLR9OVletJkIdMTA2bT1uiCumFCSaGngabrPsoy5l8+Bbqp8A8B9KGo6tXhV4vB/nqDotNopRPPGOVzczW8FOn9b8IYrcQpcTKyTr2DApPVBA6LZsDnyGKQ80Qeol6r2kgm8ktXqRZtQcHHll2CQhovRwiFDQjjuBU/xphaxjKHJuPdzT3cB1BiiEK2dhFOliqZuthQx1IYzjBXNWzFXeP+keHpSsDvAh4P10W+bvOeHTfB2cgg8qlyQ55c3NcKI3nOrJ 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)(366004)(396003)(346002)(376002)(136003)(39860400002)(66946007)(44832011)(26005)(5660300002)(8676002)(6512007)(4326008)(6486002)(66476007)(41300700001)(2906002)(86362001)(66556008)(478600001)(36756003)(186003)(38100700002)(8936002)(2616005)(107886003)(316002)(6916009)(6666004)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qVXjntrfjLoFfIX+AEcPy0/xPwwFeOvw0dxA8jcPzd7/5uWv/kPo85S63ZgH?= =?us-ascii?Q?NauJfHnX/FCTPNEAqFijeDTvgQlefeUFi+V0fQeDnoj22O2EEjI4Mw0i0Vhq?= =?us-ascii?Q?SQSZosjqR1j2/OoXyiBnjGQExgQ9Xpuncy4HyCQXGkWiJosNW0Guu0/6nQ5+?= =?us-ascii?Q?HklfKllizDWh3OdPwk/kqutZe+cGrPVQpThvhp4pzCtvZClKHI/395fB/7wp?= =?us-ascii?Q?LKKa8awXqwVCHn1YBCD+iisL/8DSfTUjKQ3TxeoxwmYntGgUsCo2ZFNYqZId?= =?us-ascii?Q?ZCA4YW6EyX0aOqEWZuRYiSI9xOZRIrKBbL6pJWh4r+3FZWP/ISYX018D/Zu/?= =?us-ascii?Q?spjkuQmpItYjmXKX8K2DLR3I7nJruXYqntQfLt4yPnYY1Pd97Anz198IpAN6?= =?us-ascii?Q?+a4DBqJJxU3bC97g7zgVt9TCY2h5Cwe+TFkYIPKes1iPkrOS+mIj4/NUe9hl?= =?us-ascii?Q?IdkjauVSuLGpWG9DKHXgSyDYnkNe2WDqq7GEQdACvYs/tS46/PPor1j5qTJh?= =?us-ascii?Q?LHTSsTYKuhUKB+R2A3/Y/mxWWe9UbFsXLUyYOC0dUHN9VvSgb2SqmuTo45fF?= =?us-ascii?Q?dUdGGtBGi5TIE08/Bfr6s6kch0psQZlQplpUnbskvauSW7RSJGbnj32Y511P?= =?us-ascii?Q?zqowjshXFsjyihfZKQnLDhgtMobsbQSnEJKaA70lRwRt62KVQ7NkcNJ/8nIT?= =?us-ascii?Q?B4Qfyr/bfmEKj/3KOoXCdhB+fBlxdgezRgF0DA0lFUvxD6YNwpb8m6XIGgHV?= =?us-ascii?Q?ZvDHjTEo5XWKzOXDLMdgn0gsvPypGV3UxxmgvnoPiJ9UdEKkt/EqwCu6TTG8?= =?us-ascii?Q?F4kp++o5NuAc6HaY9dTVIqjcv3H/qtcz2oLn8wfJjPTZQHeSZJQIFE41zpfk?= =?us-ascii?Q?fTeDMR7DHAK5bCyeyuv6evMYRMVza3xFsPIVDV3NAfhrDKyZRrgo+uErGvQt?= =?us-ascii?Q?Hk/tzUgjuIyrFiN0yqUsvDn2/rLTUY169qeX2FgJaPzqCAMrmhbnthaS6Dav?= =?us-ascii?Q?t0Po42X3IgYHOSis51rxDWE0Qw6OqQ0BvPOduUFOLDhexuAy5CwDVsPc8GzA?= =?us-ascii?Q?z7vQkRbmKOKPd6poNxGJSH74mCRILNdpHqCt/HiEChS2b6fSUhYs59OyIxD7?= =?us-ascii?Q?mbWfNBOqo7V7rEUHYiKgvgRnD1jzFQbEYSIylSC5raL0B1422ZeyGA4C+1f6?= =?us-ascii?Q?4VFPgDNGBJYL6P3XD+WHOhDz/AEOrrRy22XYNqovSY4/pYb5cc9aIne/VT6Z?= =?us-ascii?Q?WaASVX1nP0lsOXWjMgklTaBvRg/VsgyYaoonari1O9PW/oMIA8Xov4I/UwHp?= =?us-ascii?Q?YVDRCErWn1bb9UtBgehuQYPmafqdZELhHeGjZRyDfpIEZeuqV35ohSUn9vNR?= =?us-ascii?Q?HO/84+Ory375WkPlmDznpk3fAjSacVdEtyyi6aRsI2PXO78iY6B9/Cwkofqr?= =?us-ascii?Q?gETtkWYKUqLJRqul0OrzrgcdJRcXynOXFFa/xKwk32p29bIGTUxdYnHuuVco?= =?us-ascii?Q?KhbJDz43MaK9T7zCsJriknN59sfPsn+6xl/BrOcXx3D0ngvarLDGPqlQpz8/?= =?us-ascii?Q?7wzOkgj2xsHk8oYXBysKTquQ7+Lof+CA9PFZEBtPqsvwHmtF/eYFtP4OXup3?= =?us-ascii?Q?4w=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3789bb6-c57f-46de-f4b4-08da5a75ade5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 08:51:10.3267 (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: yIl4W0HNFu8BEAZmyOVgvwDflH4YEJ2vD8XEZEUAO40qMSVyxqvrLFVtILE1e8whrePbGixvfG5WihE1LTpD/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4381 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 Mon May 6 16:38:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp210284uad; Thu, 30 Jun 2022 01:51:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uMwy/d9pJwnMssk0HIgtjBNWvuTHRWmwy/jH5b8ZkqpBcGAXWHyqk+32FtLkJuLoCwhUMe X-Received: by 2002:a05:6808:bd1:b0:32f:341c:a56b with SMTP id o17-20020a0568080bd100b0032f341ca56bmr4548504oik.144.1656579113773; Thu, 30 Jun 2022 01:51:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1656579113; cv=pass; d=google.com; s=arc-20160816; b=m4iPuTqc4ydK8W/568fZK6XpqxQjVtbak6VHx8JAJT4AbZ2oVzA9U//eE6JeBJEuhw k3GIIKB7xgz3SLLb9+HUTWNgyRbPgmzgIOoqQ9M6qrhboNtm7U9tIgGMqAgkGwhbg9VF I8+PzuTDITvcuRMadhV9gkpVhk3pIsDS3LXHiOYHp5hdx2ar8kCTpuOH7TS1iBJvn0Bu KiySKnCJzUCY8KL4PyMkpx6LzQ7xUfOzJyDDvTZH0oDyneoP1RxALHcq+0SD7rf0aqil CX28tisrgZJ1Dnvzc3Oo3Frdx9oRZglRguq5q8oB597EzDRCoILBQtO1g2c4b1jL6h9l Mjzw== 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=VaTkSGJvNiBk+kvkOCw4J6vrWL/vG9aFXOsnhiG29At3mGy9p/T9dhfBuCtMIsCkYU 8IMmDtHM+/hu7lEsau2GLuiFnNHy6kc5u63UiBjHk5jjqBGuR/fDcmPJPf4NlCi0WG1q Rko+7AiY7y7H8AHAMVRFCaqDMvsdpgJOB9/VEuG8e0uYAEzhcryw3hpnxEErkfrumrCK hGm8ipdm43LZw5HLB0E0/Pkduty/QC8ZXc1xF3f3XhTSY+TlqKjadVPjgyDJPLB5KTzw NqvfAkrI3Ulq9C7lT6wagF2CjVbpkYg+gUiSC/cb/qm/dS16hnx4CiUjjeXvi58tf0rf dSnA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b="FC/D/cQY"; 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-5909-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5909-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 ch12-20020a0568081c0c00b0032ed8cce1fbsi26510878oib.263.2022.06.30.01.51.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 01:51:53 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5909-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="FC/D/cQY"; 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-5909-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5909-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 891632E0A38 for ; Thu, 30 Jun 2022 08:51:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 22524EBB; Thu, 30 Jun 2022 08:51:22 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30076.outbound.protection.outlook.com [40.107.3.76]) (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 86F32EA6 for ; Thu, 30 Jun 2022 08:51:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZGy5ST4VfybR7EvW5bm6VZ3e7I6koMzDMTHX1XB7jAizQJPtVyjoqiB0+sIHfgUyfDa+L5jW7q2zOO03TiAFBP6C2QVo3kOaWDFsciJ5CmVs1p2YKteWtdurTLjNTZi7M9hAWCDc+1fQ575zlGmxOHI3ZXUnkhqASGSxAQhnJHNCTwrUg7GCnDq2TXA9XMvCSVB6eyrZQFBCaq9KNQXxTBmf7B8UnN7H4Glfn4+26N6rEidZ3Y2HTaAr70/+afgUQWS0oEYDj42Y2CvgnL1d2pMm2PSH+tNU/ZOZvIsGdX8zDQbZ6yxKcc9J3T35qV3bbbdWVW/hb3iwRe3XdKyn5A== 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=I27+gcqswknus2/qmIGSRW/bnRhu4HfqtL4CuI7C7F5OTGShb1+j9cFElod5L6J8mItwVe33vVV4IIvsM7qU/0IgEU4R8yHctPKgHoKSDJ55d7LPv7WaC7UAq4YuZkbGEIpliREWGyt13kLdOG1NdVgSwa43y8eaC48dWzZEEYexGH3FRaXtwF0HI7C6CxBpkO+DMZaMZaVVVrnbjm9V93Mo/EXR1qKN4aXlogcqqFsomAMI4lAerwDOdf495NEc8OE7/NJE4GkbOATzmTpsWi4pCaAYFBYshr7+6wJbTn11YqRYbGri9GB5T/WHNbrw/2B4M8MQWkGEW6t/qL1uwA== 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=FC/D/cQYhiI6ekKHQ8tIsB/6OfV5kKEkT8tz6eIXwaZp7adBn8W3poWCo8DFmdxI6sMwE0qBFQ66ZdaoigRwATm4ZX33LhDZhJbyhV0hK4Caz5q0SntUY0qdxMkw9oveFNWhegfcQMPTM+0MghZ5S+pt3QCj0Pn+NlFLQiNS1OMQZaU/YdOWqDUxue7Xpplho41XlFtJvNloqXW7HaNV4qjSJ6iGUdiaDOBjRL6EeJaUyLKsyy+/VxyeW0/8CaRBZrTbF6gtJBp1Y1Opuf2SS1jtuh8aB/DHTrsj5DIu5CXYMfSm9vEoQkLjxU4JpsXZ1AMGVq9TbFGWYx3jB1ZnDg== 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 AM8PR04MB7778.eurprd04.prod.outlook.com (2603:10a6:20b:24a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Thu, 30 Jun 2022 08:51:17 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e50b:e0b:7b9c:a79e%7]) with mapi id 15.20.5395.014; Thu, 30 Jun 2022 08:51:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 5/5] selftests/bpf: Add bpf_red test Date: Thu, 30 Jun 2022 16:50:54 +0800 Message-Id: <22c84dbb74978d8062d453f6bc1857502078fc28.1656578856.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0103.apcprd02.prod.outlook.com (2603:1096:4:92::19) 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: e99e09fd-a7ca-40db-82ce-08da5a75b21b X-MS-TrafficTypeDiagnostic: AM8PR04MB7778:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wVG+DEYNmcvMzz0YdxX/KTJYkvbX00+BS4EtiscnbHW7Zv3zuzgGcCs/d8u9FrKNtyBpUN5xchDtFopIGqTHOpCV6VnDtegL+l8D5a2CtcgLuFbRJoGBiQifUWOpTsNz9kB+NVGVPuBhOGYAap1W7oc6Re9Yb8TeNdGXXKJIXiFAzk9CTWAV+7H+TEFsXkdvXDES8DbEB+JSIfG0FLFLvuypc3A+y0u/LXHiym3x/7I8cq58FCkW32Guc6IUu284033SmqW9pAoct/b57/UbDZ0S0j6Vmy2IbG6ZuEJtEITVm5PoH9UcJnHJnY1q8LBEQ3wB0kTMMND9DawRyi3xC4gg8LugXCVlaYCHY9hhhg1WpcJMBHrE6rJPJoS488mnol6m94lEaQExguVlzPb19IPCpq3NX6vyGxzZy4uC86cOuCzFGvr04G0vM1n7vNwANu/lNCjseMJN/ml+AhQ+QF/l3zbqr90fM9vdk5gu5E4thQLdAYYIgHk9pZxkthsaQmVeo1gXoe0DhJSXXL1mTI8IboLap19t4mrDXV1XwJUyFY2NtxCZWiAbOJjAR8PXZXt5VcfYmndQ91yFvrKQGFOsADNX2Qtey41czY4lo1xJpA0mdKWG/ZRPpfemxAlqmks2xrwGEJrWsFoIDvHBSR8WOiaoSL3FmWLt9EafEVGekzP4hRd8JgEINIRL2Qpt/qWnyxCPvfKbKBZbAdsOqUKyAyQOPucb2xCBGdkElUeVxQL+rD6OOZXJ+LSCtS34Xgu4OjfHT3M/F0iiVeOC/rpb11CvPvILjkcl+SM252E= 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)(376002)(366004)(396003)(136003)(39860400002)(41300700001)(186003)(107886003)(6512007)(2616005)(6506007)(478600001)(26005)(66476007)(86362001)(6666004)(83380400001)(38100700002)(5660300002)(36756003)(6916009)(66556008)(6486002)(44832011)(8936002)(66946007)(316002)(2906002)(4326008)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CPvKiRE8q2YD4aMoGk/A+xO2rQMDsvP7ezwfhOPwFsPGVKyv8bvxCztN0wgY?= =?us-ascii?Q?/jLj9skqyhIryCuWIh6PumtthyJ7E6zlK9n0T5uX3bnlMzx1r9wRn3CUVW9w?= =?us-ascii?Q?bEpsFNtmIzFGo+toQHBbUmsPr4bdyqFosqg5o3ts03tq8XD0q4VgommcAXUg?= =?us-ascii?Q?IQGQchTFfrRBF4ygJ9W9Wg7FbqoL4btYyNgqfac40gdxJFjOpxFBxaNzZg9e?= =?us-ascii?Q?5k2zsBki/jts/u7yt5I7b1x7V8/IIiqYfNk7Bol4vR5aFxqIoTkgTt/Amkxn?= =?us-ascii?Q?tO+WljlJF+MHZz1QCiRs4Gsjius40moBdM1t4/Vica8y58xv63OyatLN8vKK?= =?us-ascii?Q?ddZGeDh40GqneHzkwfg7n47u3ZqUU/gw1LTbuxLo6wGaz5pAwjpyC5d3zIzZ?= =?us-ascii?Q?wsUYSRSAu/s6KAWFvc0l5/cnU6wnBrJeWR+nkwkCbJfDjv7Mco6FFRDfzZ5A?= =?us-ascii?Q?i9NT5/5pe8CIIqkFCpzE4pcg1JZMZG2vLghxPAWQnA8lyMTeoZd5n74ebUfU?= =?us-ascii?Q?ev28H6YL9AvrAe/NjtgyaJTh5s/VYw08uhlqWarJ2sF2Rjmu8ZBn3GhCAj3h?= =?us-ascii?Q?vOQuHak411R/EHouloRdOY94xsfwbrfPH8VNvy8lQCSvx0t6FRsJqZyv3g9d?= =?us-ascii?Q?UBjK8zy6LZczOk82prnW8Ov8O/pXpezdD6HtOWMXMe0ZQdsGi9LNpyw4BksE?= =?us-ascii?Q?dw5sCS10TC7MSoHQg7vy+FQGr/nwnK0WCqBWb/AnakUFLohZpkevYACzFjEV?= =?us-ascii?Q?ktGOpvb/9ZgCbSgpPrmhaIm3WBerY+U9+0Uu18qQ6KDQrdGIQyGV2seHZGTd?= =?us-ascii?Q?3meCOj56ZR2eYRMn3TMWlHBcN3TvRWvmT2BvFlynop0frEBASmm+WdwceLMc?= =?us-ascii?Q?iwpVFsUYJ3Hj0ZQqmQjHZ0Ilinfh999hILxlj/1XkB3in+RyxWl+sii27FQH?= =?us-ascii?Q?ntoKpJ+Twzh8jEcmjJI+TQ+fztCgY/XvMU8LnIa6g/UdA1UFJ6fU31AduMie?= =?us-ascii?Q?s3C99DSu51+DIHFExFo7KurycGa7XNgn6TTtOcXKQKrlF6sY6WaZ7IWg5s/C?= =?us-ascii?Q?EmXS18fukOocB7Pv7Cbj5fGvdHm9z/FEMQgCJ0lTPZBhr455cDFaMQuQCa1z?= =?us-ascii?Q?Gk0Ksx7QHKoHDRD1INm+BOIA7LVHGLHyLc2BvdypUD4mjZvLWXxDlcw8LjDA?= =?us-ascii?Q?sSxnf8Rst4hRty0GWG7FRVvZ75tySED7GiRs8OPBsF21tiLCYiH8S0ifmJC6?= =?us-ascii?Q?CHlZHo7n1TDlbC+OvZXWoPquYRp4LunvtaLlkED9YvhQq77cE0XziTzHEAGp?= =?us-ascii?Q?rszY9H6psGCvTv5RRwHbwudocm/6XVbvIWcgZ7geKamLYPex11nj99KtNulS?= =?us-ascii?Q?0LJ9+baqjbpjlM+d2hlZ0Cq+/+NHKbOdEsIVasSYpjp/sWlg7+FARNFAoIJM?= =?us-ascii?Q?eWUxt7NFtB6Uft+lMnD+EOhZ5RKFEsmv7ioRuMuamQGkGRkPBdcdmSOnnKo/?= =?us-ascii?Q?x30eyJAdPIZijTpk0O4w58TSHwmq19nUw5otjkGYi5KdOs3aTnMxUjKxxnkB?= =?us-ascii?Q?LWu/sNrZNy1v6wgbj1IYEQKilwZ96HSiesGWA0xVcG7Q1oXykAP+5zSDmI6h?= =?us-ascii?Q?HA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e99e09fd-a7ca-40db-82ce-08da5a75b21b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 08:51:17.4823 (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: mlj7b1K6M1Fes2tvYR4Maj+H1vl9fryj4GddXmnXv81wHJO6KOz5dTJQ2EJHmNsZ+/2tSMwUnnHSvFhZfReSoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7778 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