From nobody Fri Apr 19 17:09:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp874583uao; Fri, 9 Sep 2022 02:11:29 -0700 (PDT) X-Google-Smtp-Source: AA6agR6QrNO5leNs7gxrBpc1OTegISPFUchYvRt6ZrBN0k6yy2y0wlh/+cyC6rzb9n2qUwnMQMYM X-Received: by 2002:a05:620a:1402:b0:6bb:6c8a:e590 with SMTP id d2-20020a05620a140200b006bb6c8ae590mr9302971qkj.598.1662714689829; Fri, 09 Sep 2022 02:11:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1662714689; cv=pass; d=google.com; s=arc-20160816; b=aZ2D/CXFdtwF9VtTY8Y8+1O6nMq/GlnpH+X1y7SAzbtMTlUEx1f5HabODNP2hi5uoy pzgWUQ2pG2BcLtRaslMp67vQIm0ATRXVkiq6NNrEz+eOTfLYYKQtkaM9oIDy6PvV+zBq 4pSozvY4b4nl8/E+bPeh2cYuFt4B1Sjqkz4udhAiiQGzDsG9gD5zEbUnxzJ7S4YWa3OC 69O5lwJtpF3lR5isQG7hI5h6WHg3XVm7uMSciCk4+E+g4HIT3ZQ+vVryk3ZCybYVYh87 cUnyMUKPjJAeD5saL+A4+QTjtKuiVczhk1wWRB/boDG7+f7CD1vqpYZS78q+lluAEstc E3QA== 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=DDslROtSk2w/wOfeRi/b/opJmFwQjMDeSM43X9L21fE=; b=Q5+GmYqWCjUQWqm9eAYImfhjfUrO0vNopFO5HbESPc3Wy7bAyUpIiXyOy3LaqlyDkc MbaKY0C0SqErHVPPh4hoBFq1PO69WmkG91Vm6agpbVXGYz6kWho+tqHzLzFMtwje90cV tBkDhWxeb7TbxOHm6zhBfksBlN1Tq6fBv8U0lnMvos+lOuxgymXdJVvtkZ+xoT1G7agU 5S8g50RGA9YpgsaHlTsnNsPQ2GqAjxIBCPhrY/u+4H8z4lWdGSxEuUcjU3XsYCPSNEEh DgTuVw8gs9kvknVJ5KUzKTQyNg60At9Wd4cflTcsjAAquobNUAo5uBQGQDX1L8nLfqoO /aYw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b="I0/umW2u"; 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-6248-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6248-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id bq8-20020a05620a468800b006cd1bcf89c6si5027qkb.410.2022.09.09.02.11.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2022 02:11:29 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6248-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b="I0/umW2u"; 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-6248-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6248-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 773881C2094D for ; Fri, 9 Sep 2022 09:11:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5F2F27F0; Fri, 9 Sep 2022 09:11:28 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20079.outbound.protection.outlook.com [40.107.2.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49FD27E3 for ; Fri, 9 Sep 2022 09:11:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NMRWzdJ7WcXd4i6HN31tutj1UnsZ6PrBomYzq/gB6RdagX7aXs0xejbkafivKAaY6+LlTmiMX7Dtvpr29tFfZbsGKp9fV7me0jIjtRTnnlJHP7EEPVebiOhegDMy6xI3jZf2l4E02nOLMLMFp7d83VLdZtpWh9cGYotSQGdG7s6glGJRFG5KpNzk6295IuOVTIGLV1cMq8wW+e0nnr4X//JKWwGEw4JMOfsyRVo87M9B1z3qar093tM/5ZVbFxrwc3PB3gq2Cc8GWje2iuo5qWuwCy53d0leJBw3NQDHoL1KVhjahZcdicSfhzoC4TT1uv5/av/GvrxMXN6Uurt26A== 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=DDslROtSk2w/wOfeRi/b/opJmFwQjMDeSM43X9L21fE=; b=nyoGlSeZ4fxlxwOihG5PqKhYoTTkrqtHPGOt6C0IxSW2fCOXMxhslMGAhntyUW32aGAxGMrXIpOZpxnI6xSTZ/wq/c0qt75QBRZvRZXodD5o7ZC/GnfssjyUGTGIdjC2ceIodQPbajn73GWZeGZ3M0DAuJO01Toxn1gOXjuHDxfx1Q67sZSqzWj5Upf/HNf7mJYgVt4tVu3J6z2NFPJtyHh3taAos88Ei1a7Wu8scQ+RKDRoap5y7j6OjEtAcXX8kEUwvY1Lr+x+lyVyuJ7PHUTZlsQ0jQ9bqrAMx4JoRiTfQW9R5Q8fYJuHQ4NGg+cyeVBVDiLWUw4cui/zR//trQ== 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=DDslROtSk2w/wOfeRi/b/opJmFwQjMDeSM43X9L21fE=; b=I0/umW2uH6ge6ty2PVwMk5rKzPkvdMFnqJRBTuU4mDnVv/XSu1zDsQKpcJ76Yp08OVTkRgwsIKorN6fOZntp2DwKw793w6YJ/u9BSm0OEgj4Q7FeF+eIc8byRlJRAR8+R5CiyV5bIuum0oAxBWvlUNffr0LWYiGOLJl4dlIbyv3KfhUlriINEIR11XxvNTjdebFyHT0JMhcXDhvFpRPPg4hfGjibO1zW9TXjpY3l5sQfeeS5C9zR+eNRh4eKlLOTyv1EItTFRMfLp7oEOvbqIaEunfdIDpHpoTOsN4vNT7qlPt2MtRV88to65OrKuYKDHMUQg4eZP+DNIHWJ3ZhDWA== 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 AS8PR04MB7542.eurprd04.prod.outlook.com (2603:10a6:20b:299::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.19; Fri, 9 Sep 2022 09:11:22 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5588.017; Fri, 9 Sep 2022 09:11:22 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 1/5] Squash to "mptcp: add get_subflow wrappers" Date: Fri, 9 Sep 2022 17:11:32 +0800 Message-Id: <6b7806e8632ed9a7adcf83007bb374db7a14eadb.1662714028.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0001.apcprd02.prod.outlook.com (2603:1096:4:194::10) 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: f7f55af1-5786-4cf8-1e56-08da924343c4 X-MS-TrafficTypeDiagnostic: AS8PR04MB7542:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6lVVOdYLBmG+cfsRF+OkScJQyG5cVAsUm6FXdyXakX8TiuSn1mZSqiQg6KpXaEB7b8CzZq1MbD7nKTPtSaitvkN7p8Acy8zeYtqaa/72y5vPPQN7ENT0WhUFlD9PZIjvD1Gycfdn0gFTbGCbhkuLk3ugzhNNOiXmXRUWBYmw9c4md4yxqdEIuJjPhuNunK2Ktx4oC8A2/CF/lbqBAlv7lMUD6kl0HfdoQR+MEdWcrt4w77O/uPFaUbljoUBc3aAdrngxCZy/L8jrc6bwwhRpPW39okwSIpL1EH9jflZoQypeoNYF43qRuHmoQC/rv7HhWmtRDVTaZaqZ4uMI65sboW5cerjeehGpCHgxtgG5lk+ghZ2TuCtT/EJY7IjGMJoG9ukGuUAn04BA/Eri7yLXSxHqHU8ZARKdKdufvlGgErlFg8Bw2dyhoNnrBRkbj0DSuOX6DIhsBDLt1ESTAoQkmSXX7Np/0fqa1f+qCny8eyFmrLLib+YIk5JBTfRFHlxl3itn9MfZsrdnXsNynw7hWIfkogZz9UmYVkSMdqB6FJt1I66/HYqhnXK6N5cT7PtbZgBicKdKOV8oqjhguyE/Opo403zULpvghJCap3cVZTannBOEISeNaJQhFU+DBryI0AmJbfKR30JNn47vKLDJe2hr6v/Aja1jIZNqacUI5mU43J93142+fSMGAKX4A7YHZu7sHHmsdHKQ9z1YFyWlm3V2R+cSf6zLslOKyAJ0dwdLrk2nre6kTG8LAyAmKdIC 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)(39860400002)(346002)(366004)(396003)(376002)(136003)(86362001)(38100700002)(4326008)(66946007)(8676002)(66476007)(66556008)(36756003)(478600001)(6512007)(26005)(83380400001)(2616005)(6506007)(107886003)(6486002)(6666004)(316002)(8936002)(6916009)(41300700001)(186003)(44832011)(5660300002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AC9wHDqXOzA3+7RfgOPM0TXA0mBdMQyOpT7PooKwCxWSGpmSvMzbxcvbVQi0?= =?us-ascii?Q?ycQ+WSIFECQpUdNigTNyQyuWAXEZZSJZvNi5FT1h6CmSsz8XkMMc/xCe1N2c?= =?us-ascii?Q?ooRm9U4/hYdNICYqJqnfs2Y7yOzydROrYK5IrurSxjyURvKRTLuOMiYKWJSh?= =?us-ascii?Q?L+Tnk+eybJNkdOi+Ql1Tok/4bAgxYoi4KCiWJIhuVyb9GNI5Ao4sgblLezCw?= =?us-ascii?Q?0KnqwcJUpWJQcGNwz44UN+d4Hdj4F4gmS4qFv8ewLZ+BnvUb747Ei5rpyF3M?= =?us-ascii?Q?rBIqCLkZZYRKNYa3CSPthCkJKwzWwiGDTwJ7Fkt30qawSZbGnBmlxx7TzbZA?= =?us-ascii?Q?Idx/2eUzdjAs4P8dejF0K9enPzTq2oxiU+/L1hWhKJMUWmt6vJVOxsFaaQ+P?= =?us-ascii?Q?BuZS2FbBn4mdInYtUUD5k9TWrrA+dIw4u1+nKRYc6ubnvCaqOGi+Y0ncFQml?= =?us-ascii?Q?fXDq+mHK9ID4Jf5S3uHA4v9RHVL6fPWWYwSG4aV4tP5q+3g0Eih7VebJBI8H?= =?us-ascii?Q?EXSWAW733xzJHSo+JaNNpQm2XhDwHMcpeuXtPaV2sfLAVKNj2VYbW9mvS9iA?= =?us-ascii?Q?CNV8Wy6u8JGpEYHd5unUzfAlBHGISrMEypqBeogKtUwfxRqyNcK/AT2WBZtH?= =?us-ascii?Q?RRk+WAZCAC1KX/ElHYwu6dg7Ckh+0aZQUnmaVZ+r/YinPQQ+PkXOuIdBtcRp?= =?us-ascii?Q?uftLMuYHyIAlURyBIGRJM74yPX6Wh+MuZvT/ct2yq3cgAzT0FSC3Z4MGadtU?= =?us-ascii?Q?IyfvwXvrbzykCzdaGu+6cYfW0XgBk0HI2z5Nox6g4FaF0qisye7LHPkJXece?= =?us-ascii?Q?LW1G37FINMCo753MDz6zg9niGs0zBW40l7hZPBBbq/P727JO4sUaNZoZdakD?= =?us-ascii?Q?aXym0g+k3BatsGSS/pvAnNp9pKcCKORzyXZcmesPm/00l16pNtTPJOeL59Sl?= =?us-ascii?Q?PiSTx6XTRn/chOSozJzFgvnyJfASYouK03z+XGG1GKJvifxTltNQ2Bo0+uWS?= =?us-ascii?Q?bbStd5/Ba9w+03LYv6020E+b06EGLsVPAmilrsux+IPAjxWsAz31QBSnPZV9?= =?us-ascii?Q?56ubMeptZsn2bDc/yb/stChlzWQVbIpBYiPS/A6xq6RBvEQawvXXm8kjx2CZ?= =?us-ascii?Q?7G8FGHppLdhwVTvCsLmJt5JBgRMrO1+y90FOEqMukfodw+x4s6I8joS3wR7A?= =?us-ascii?Q?clCHKwA43JtKyGVJ/z/tFGZxqfU7xUgiUVF7OfYw8OHrj4AzHoH0RL0SnfEF?= =?us-ascii?Q?tdFQvTMCcCALiBWddTIPAT9cEg2nrjwTCofq6uvQyX9umlh5tSjNXqjZflR8?= =?us-ascii?Q?ijK8ibGSFohwJhrU1H8saPMIlS6eVvD/oFM6mfryAHzi6FspZtkN1gEi7Ifz?= =?us-ascii?Q?VanzFEeyBqe9+AeRVufyVdHtL/Rlt5AUESfZkz+uqv8XzpPhL/8V9gzgZDUh?= =?us-ascii?Q?AZCz2hGIXCbgWb9Di4lsyD+QCkMuECtDVhZr0qMHnXj87n1Bio0AbcFr0VUD?= =?us-ascii?Q?FjcQCW+GSZSlK2QDWqOCuEpVfmtUaXR8lzNwISTCCosup9QMr8nGV8Vl4cLo?= =?us-ascii?Q?rW+EFvoXZZeTQTMrDnozJtw7EQGuzAlpUr2QObyY?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7f55af1-5786-4cf8-1e56-08da924343c4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 09:11:22.7017 (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: hvlarotKjf3qmT7WcMfiA4xK9OFI4eCWR+J7AtvkIA94bD/AMQdMf2wfu8nC8iblvUFmaSugfZms9A9LPp4++w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7542 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 | 59 +++++++++++++++++++++++++------------------- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 55442df8fb97..8888de922475 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1547,7 +1547,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 @@ -2425,7 +2425,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 1bc9f6e77ddd..b6411285a0b2 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -639,7 +639,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 __tcp_can_send(const struct sock *ssk) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 044c5ec8bbfb..cff538a9e187 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -114,35 +114,48 @@ 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 __tcp_can_send(msk->first) && - sk_stream_memory_free(msk->first) ? msk->first : NULL; + if (msk->first && + __tcp_can_send(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; } } @@ -150,31 +163,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 Fri Apr 19 17:09:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp874646uao; Fri, 9 Sep 2022 02:11:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR42vqC4rm27M0pt3gozzybIj1AwHiERVlq8uu1/5vvcOozWesb3Psriosxnm0fh86igG+vo X-Received: by 2002:a0c:8045:0:b0:476:dbbe:f169 with SMTP id 63-20020a0c8045000000b00476dbbef169mr11213354qva.90.1662714699308; Fri, 09 Sep 2022 02:11:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1662714699; cv=pass; d=google.com; s=arc-20160816; b=CL2i9eCQIGXndpkFz4jPp1oxrQXvwP/zD/s+CC9A3swVf51a841d3iSszt1k2aazE/ ANTZdOwen80lGocFlyeqso9ey3brhrP8uHcDjbH9WNg0Z1f8lRMChBjc/XeAwlrwVJ6D 0GkYFVlYuqCgIML6lMqWX7fkORWeXWyTlrMTKdcHrcFTOsNHPoD2WIEnZgll27Z60HDP m4QuP8z45bakWEOgQ2ZWdw3K/Tm1XArYHXfKv2sOO+Oq5HtVwk5Qitxa9UI4DdpIINtx 4x+hW11t1x5AmkZOhSj6uM6VtXoAsh5TrQ9TDOvqKRDCuIqZJg/TC3Idu9TU23u29/q+ Lb0w== 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=VCfSn5yZ5WJfk0XrZWUj0Sdu+dDr3kJGMNZjj4NJhzk=; b=TFl8R36E4aaeQuz7gMiOyIM/htHFRwCTktN+jHR81wQdOloDNYvvl5tv/F1Ny2s979 1yAHWVEk13mhTkxoXxlzr4PJ3fub7QpJ/MDkDg2wiZrb1mupHOtsHLcFdoM3HynD3jD6 LgJc7JaemEQ7k1eax2PEGp6AA6yoFPKzX/77Fuo6G8z9QYBXXYi2CMZ+twJ+wz4uThtP 3BEqR9ipAfqfbb4hhUGo4y0MhjBCiCQvCOmJbeKfcUzigMqeZp6MLO9nipP8+ajRyi8X A9nEhmtuUvRawmLezKE/Tpgbu5sF4jF0mNkQ0XxtKukNB/IsD7rYYYy6ujg25Kw/zvMh ysfg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=RMpttEhP; 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-6249-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6249-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id bk19-20020a05620a1a1300b006b940381458si11126qkb.322.2022.09.09.02.11.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2022 02:11:39 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6249-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=RMpttEhP; 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-6249-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6249-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 079901C2094D for ; Fri, 9 Sep 2022 09:11:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A5A7C7F0; Fri, 9 Sep 2022 09:11:37 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70084.outbound.protection.outlook.com [40.107.7.84]) (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 B26CF7E3 for ; Fri, 9 Sep 2022 09:11:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ih72V6OvAWSYbpxdjMuWIfs3ou6JHdJMsuXSA3FLPHSqA8hg+I5AuZsatmLCAs6a1wcgJ8zgEmCxrZ/mbRaT0GSPfVAPeYdmQkKqm50Vhu2Ss1ZU1hsM+YJ08BSzJH6/DXZZae/aqoQrEmxoVC6OlRn/6ry0lYdrlzihV3EOKYsnu9wJYaGPL4FEpvy6H1jKu0O4ta8j/QJ8PW1GEyUKyjr7BHDDGiXVUy3dTY4ngKePVH+giB2YxnjSCRvn2/+yUowUFEf+EQ1V2hF0/0/dFzLpmGal4jjXDmwCGiauLFyFAouLgQQeRdDMTOHYlxIgynOCsPeJuk4R5O8Gc9Nyag== 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=VCfSn5yZ5WJfk0XrZWUj0Sdu+dDr3kJGMNZjj4NJhzk=; b=T6JZsdFN6UHm0eM0f3iJ+HCSx+j74KrF6vGAoYD8QWoNVThf3FwTTM22NfYVR9K69M9/xdxDfU4TyVBhUdWX8gKJnONc51uNVLyrpE1QMP5vKuXmGhpjVx6LP+P+H3c7F7JYKMvfEX1QevB/JjgWDG1SaoGmHPV7GgUGwEegcSn/yBUBX2313OKdmyBQR67FapREZxU2AyjKqcCyncNCmno5trfkfB/jydCNOWkF+y6JHVtIl73njR+oR/7gzPmnWtxD9A5g3j+JHt7GT5i4OQQx/JkWegF49rZSNcqpge1gN4Cb8qpkLasmx1nvRyOLS2CHY2pIwWTfOMedKOyC9g== 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=VCfSn5yZ5WJfk0XrZWUj0Sdu+dDr3kJGMNZjj4NJhzk=; b=RMpttEhPz7rOG4LTUe++VVFwUuVSrgzhG499IJLpArez+COxDIOixKkZZUPHZar0C2g1WaNzBe7POCpvPnQiUOC0o5lufvrhYnjXcO6/ss6JrDPHcUHFZtxgo/kWykIGD8Rzrr3TjLvue2+jx7YRm9jU+oXks5J36XDE90YoWELAWlEnGPBhJxP4zu2//5ZYVnSkHlpdRvjutU6jQHHMkRtVe94gyRGkSEF+A9CQnT3ujpkypdfU7SDCe+F04Q4dBEnFkBrWvLAqElKlCzPzinBpOlir6DmQCIffE/AheNKg7Md2X409LExQ8/SvqF3jwOYM8ASvFZLhIBR/9ku/Yw== 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 DB8PR04MB5739.eurprd04.prod.outlook.com (2603:10a6:10:a5::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14; Fri, 9 Sep 2022 09:11:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5588.017; Fri, 9 Sep 2022 09:11:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 2/5] mptcp: redundant subflows push pending Date: Fri, 9 Sep 2022 17:11:33 +0800 Message-Id: <946c9ec14b547f75292884c03eee94bb05b6621c.1662714028.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0018.apcprd02.prod.outlook.com (2603:1096:4:194::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: 1efebfea-72c3-43a3-de9a-08da92434784 X-MS-TrafficTypeDiagnostic: DB8PR04MB5739:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pSIistM9M9IZj5LZeHqi/avuBOlGzYSlFJrL/v9T90vusN9jrPCzaH+27WuFVq2kpl6KaCfkmjz5Qz42ELar3XUcfm+uSB8HT++wA39UJ5uO2qKqQOG9MSwDNO8km7E7hPMrLiIHyb8J4hTcfptL6PAPW/qgmeyQj86b4m/ucVUnguE9+ZAmZovRM0Ge+m1AZjhtMjXIQqdDM+P586j1/ar9MoeDPwflre31FReCAJrpnRzXbhZZ7pmycwxLK0hjAhOaeGvtfhZl1aKERlNVfxz8sZc8ylUF+vD9rKKcCqy0+1teOR7NujD9A2PWaTiGxQNiGlWnTFHZKBQB8udCMv1FnVegg306KK2IyOGRqTGFZj9dROScFobnSxAMBQhkVc3rbKpBDud7mdtlYXJOVxzkC3C8EQKfxPFciUoYO4VFzWwiVcWKO02MsJ9Tlt+HJSAKDvq9nOJ9tYp0m79EVw1GV7nJWqPRqvC4LJTtWz/sS4tElv9dsWzI7imxi048K0SwT3h1whcfGoMscahBdD+wloDki0YTn9hZDa+CLk5S17A9JTWa8UGl03Gf3t+kYi6M6YPIgQ0fRcV+X2duz0uA6Q7bqs/QbuoupSb5hFQgR6Sf1W6L/MmDJwp0rZDLBAtLJvxdd44KSYsLgrbUszN3aldBmoq5bY9tNodit1XviWgP7E7X3a3jui1qa+96zKmILSvgJdk4yvFiqgrCfU96YzW+t+GnKmdXWDQEnvysOGKKWARI6LhTSdLWy903 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(346002)(376002)(39860400002)(136003)(366004)(2906002)(8676002)(186003)(107886003)(5660300002)(38100700002)(41300700001)(6666004)(8936002)(2616005)(86362001)(4326008)(83380400001)(44832011)(66476007)(66946007)(66556008)(36756003)(478600001)(6486002)(6916009)(6506007)(6512007)(26005)(316002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fENIa7ZLBNXSXwD3IT8Mn/CDZAeWr23syhe6Aew6Q+b0Mq3tgsDx13CGffmZ?= =?us-ascii?Q?Iir+l0ivNl/M+v0JJv5SyePEmcAGn+sVT3YMo7eMA+kMudvVmE1RgrpRLidI?= =?us-ascii?Q?reVQDB4lvfweZjhug4kCEzWa51x4JesIs1BO8gvZkFyqx63kMHBlYTGWSlfW?= =?us-ascii?Q?Fl3pE9oO32nFsxLTmaKrpOQJ7OUdpS7ilV2nweOV4hsfPF8lsp9XncEKDH87?= =?us-ascii?Q?jZlqc7e0m38BxcG8ukXhpiW2drYV8urSSryJVZnJb+qCm3hUzrNvOstl7xl+?= =?us-ascii?Q?ift+mfPPkMr1eNns/pjn0RdEmjOasjz65BezzTMI5GmbqMNE6nEIjn1rU0Ma?= =?us-ascii?Q?5cS6+eV9TVLeDmQgIvx4ttIusW0ybcteV3lGO1WmectEDXsB0lggEcj5Ta7S?= =?us-ascii?Q?i2CwrzZlaIW5RmIo8LXf6PqpnYOW3dFmDxSA6wQ4pa+FeeRjFaj4fmQDGap/?= =?us-ascii?Q?YpUbUSXOODW5gdy1q6WVJ/7cGOt5l10wpRnk2iwQwji0aWcfJ6J61CU9mFv0?= =?us-ascii?Q?DlUU2PTNZj3dnIJOwuhznH2HZYFt2m1QzaUx1UIyxkU4kyNBYqAobx39sXcV?= =?us-ascii?Q?vohmP+uTfgVh4s2S8ZbK+knepce146iE1pK747aqSIi2tLQdhX8UmkRgfzPw?= =?us-ascii?Q?FVy7L1pulSyOfh/WD0z50cFg2NjWnoNpcv1kLIAPKHCw81wVCHY7YwMpkNcf?= =?us-ascii?Q?lTDUx+hFv9zb/zRw6OHGCIpwPnQx1x/ynSsGE/uVag7k1F6/Mh/YuT3BI1MW?= =?us-ascii?Q?VxtsqGIVGCBAew9vUonmrjKypAjp+lTWMfcXp6buHmRqhaoB9DW2Nmbq2tzx?= =?us-ascii?Q?80g1m9ORjqwD1sFaC/gDqcbBitch3oEIFQosXfhYQ0bCih/ix91eZmK3KHiI?= =?us-ascii?Q?JvdgPzsL7IDYnxvNd/skCq6HEQXaFxg5q7JXd4/3/5zeJTVaiOM0YQVRUBGw?= =?us-ascii?Q?qqn8Yz1UQTIJwsep8tnW+j8tj96NmkW5iaYxKRQVw0e5XP3JIHtz8M54UWlR?= =?us-ascii?Q?CWNc/r/F5s7Jss7fcYAIYyUAdPGE8YgXhvXc/JxrxWp9jReXLvnGno7NTOq8?= =?us-ascii?Q?eO0TjwHd22GZzu7Nz1OYSSH01U9Y3q0CBxCFUc19+uAukvaQv6/MujciJOCg?= =?us-ascii?Q?qb0eL892IHZqK5Rh/9brUnSygTYxOrFQ7D0e32Qwf22MzRsHArKSWHrrJ7QO?= =?us-ascii?Q?8vxdUxp31n8sDJCRa8FNcNN2dm1SrIR19034Slw8J1vXC1nPSp7Niwq5SB4s?= =?us-ascii?Q?ZYsdjStB95gsymXBGCvY7UAZ1BFdGq6sGtWL5wnNS2DHVPxI2aFwxxqPZwkT?= =?us-ascii?Q?RjZ966eEx3bQ4jLKXrH1eNucamjg+nu2z1A5Q6167rbyGbXBGj8wrhG8b/Ot?= =?us-ascii?Q?gEYfrT8mNqcXsBM5DOY9Kiw9lNzaeMeCB5zGLhv6D/9G5opDXdDkOjwxNptB?= =?us-ascii?Q?wQe66Vrn0v6RRlBZR40OTyxURyH6xb2DbhEmCA+Ie5PayAyWcTS6BBZ6le3z?= =?us-ascii?Q?5q2CPWmMIFOdUMj8ErJDEwAZMTaFbKUV0p/UKi/cyLQbKu1sMfXiOKhhhjuu?= =?us-ascii?Q?DBVjW7U0OU7l7q4x5XMrgEKiYsFvKmmHvZ85erUM?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1efebfea-72c3-43a3-de9a-08da92434784 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 09:11:28.9981 (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: VXPzb3YyEtN794BTEPQGntWeeCn0wCQ8uv9FJ9CS4CnwHqvRXQbJ0hTI5A9r9CgCnpN2NNIEBuIXqgS8v5Z8Xw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB5739 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, 65 insertions(+), 41 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 8888de922475..be62126d7c63 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1530,61 +1530,75 @@ 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_data_frag *dfrag, *last_dfrag =3D NULL; struct mptcp_sock *msk =3D mptcp_sk(sk); - struct mptcp_sendmsg_info info =3D { - .flags =3D flags, - }; + struct mptcp_subflow_context *subflow; bool do_check_data_fin =3D false; - struct mptcp_data_frag *dfrag; + int last_sent =3D 0; int len; =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); + if (!mptcp_sched_get_send(msk)) + goto out; =20 - /* First check. If the ssk has changed since - * the last round, release prev_ssk - */ - if (ssk !=3D prev_ssk && prev_ssk) - mptcp_push_release(prev_ssk, &info); - if (!ssk) - goto out; + mptcp_for_each_subflow(msk, subflow) { + if (!__mptcp_subflow_active(subflow)) + continue; =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); + if (READ_ONCE(subflow->scheduled)) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + struct mptcp_sendmsg_info info =3D { + .flags =3D flags, + }; =20 - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - continue; - mptcp_push_release(ssk, &info); + dfrag =3D mptcp_send_head(sk); + if (!dfrag) goto out; - } =20 - do_check_data_fin =3D true; - info.sent +=3D ret; - len -=3D ret; + lock_sock(ssk); + + do { + info.sent =3D dfrag->already_sent; + info.limit =3D dfrag->data_len; + len =3D dfrag->data_len - dfrag->already_sent; + last_dfrag =3D dfrag; + last_sent =3D 0; + while (len > 0) { + int ret =3D 0; + + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) { + if (ret =3D=3D -EAGAIN) + continue; + mptcp_push_release(ssk, &info); + goto out; + } + + do_check_data_fin =3D true; + info.sent +=3D ret; + last_sent +=3D ret; + len -=3D ret; + } + } while ((dfrag =3D mptcp_next_frag(sk, dfrag))); + + mptcp_push_release(ssk, &info); + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } =20 - mptcp_update_post_push(msk, dfrag, ret); + while((dfrag =3D mptcp_send_head(sk))) { + if (!last_dfrag || !last_sent) + goto out; + + if (dfrag =3D=3D last_dfrag) { + mptcp_update_post_push(msk, dfrag, last_sent); + WRITE_ONCE(msk->first_pending, mptcp_send_next(sk)); + break; } + dfrag->already_sent =3D dfrag->data_len; 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)) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index b6411285a0b2..149c1e007d5b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -358,6 +358,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 Fri Apr 19 17:09:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp874652uao; Fri, 9 Sep 2022 02:11:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR71+rQyDyE4zxSKJDeoyzLOrdQWxaWPzzrkRxa0vvs0seg4Rreuv12IbHM7xso3BeqeyrWe X-Received: by 2002:a17:90b:4f81:b0:1fe:1716:fe20 with SMTP id qe1-20020a17090b4f8100b001fe1716fe20mr8461337pjb.63.1662714700707; Fri, 09 Sep 2022 02:11:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1662714700; cv=pass; d=google.com; s=arc-20160816; b=smfUWrbeHHgMfkconMhy5NkB8eximWLKZYlolQb22asdqwTRrjxgcqEk/GCiB5anI1 6ZGHC5rXxuJ+oGQFw4BNfpoYIQo0N5umyUjbV6Oq0qdCVHkJygrmlKqqTbyfWlyUZjPk +2ACsALGRdugPYdFxHz2ur5MAJyV+GvLLsfxi+nlNuAPbFBDWdVrMT+T9OeZRNj3PwPi ZrSuRH0OoHYSa7yyIVc8UXb3842J5603t5nYlyy3jzaj501erAfsVwldRGb36il0eJFd dOXo7Z4aoLiTjDDptDyhvIbAbyOSMRT0brVr91kmiWKKcxfUitmJfWR/hyna6qW3VnUL mUkQ== 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=fiMAKpxeiVGk+okQGPHSc58TH3XvIRAtS5rAGhilfnw=; b=e0p/lqaAp8NGCqWXi/CQucFfrlb6pnlV1AUjp0u3OAJYqa6W1bOovIspflVBvPOzfi IqYf3B8duKpACmhM7fBkKgebDuO7MHFeeDiEUgffbUkCAcgjvEyODsO36ixrDw5p8pQl F5S9eCX2NT9dhCvY3gwPvk2wgplTMgqJqGKRY1psVbG1fj/9QHdjaBghcE4Duzn2nwM2 LhHurT3oBssJ4XKu7bh8YipdgCnfAdra5A49IDp7e3uC2d16iQMG08VG5UWdhndcODUy +c6Y0Yf3qrcRg7gXsDKM40jmoKu7aJpY7+C0wiNy55g0FlWGV6H1wfnrWRlv/LsRSfyj K7cA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=v1XHDabG; 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-6250-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6250-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 12-20020aa7924c000000b0053870bd5555si19622pfp.90.2022.09.09.02.11.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2022 02:11:40 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6250-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=v1XHDabG; 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-6250-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-6250-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 232A2280C5E for ; Fri, 9 Sep 2022 09:11:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A7C2C7F1; Fri, 9 Sep 2022 09:11:39 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2074.outbound.protection.outlook.com [40.107.105.74]) (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 EF4F37E3 for ; Fri, 9 Sep 2022 09:11:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bSdL1LfryTaJOW43ZscwQQcmlmQAYg+lRaG3cUuUaRLTVXxsXCnGy2vSA7Mc1XCP4c24QzqEM0FzXjCUlHzWQv0sudQYrhTVdtrLxKnFDDlbKSnRWbYYqUyATDKbWaux4IY9kLKx1PNKVT9WOB1JpFfXC+a92HLQXD9vr9ZFy7aGPbfcpI+YZAHVEnpP9iBTU3GT67gI8o3doqGR9G5lxD8J5VOMFtjpSdEnnIpv6j0dw459NJnTizpF08/ttQDcx7BmdyjbhnVIbrz9uEUCibjhsjIwUIIguGg2rExRE9l5Z11+7sIMn5keGJrUFmwarlPRH2DTxN7Sf0Wd2G2Jeg== 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=fiMAKpxeiVGk+okQGPHSc58TH3XvIRAtS5rAGhilfnw=; b=H4dNY84wMxcqMYZpHqpi6s34znpEQf6aqQ1m7S2DBn+m3/URJ0wIvjf7F7PyOzLB9y/HmCsygpq3qXx4uhABqmPYTkUU6EVxjLNGG4Yd5jmdKyJ8Fgq0o9xLtLxlGUtHo4DW3SIWPs/j8EcV+G11qHZPihZtJqwkgbI7+/8+yDOmofQ6KKMu4KHK9RMZmhMHKMcjYrUiHIih9WIk7Z0MJnvuDlWXkZmcFW0kyS7e9ejy0EhpmWEkuQeqGdLDlWdqIGTHzDSHKsj3PjebzmJU876/kEzlAoE6jnVRfi2sTXtbLpEFFRJevZ1i1NxV7dDeR667oKswmW0roqr4gVtuqA== 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=fiMAKpxeiVGk+okQGPHSc58TH3XvIRAtS5rAGhilfnw=; b=v1XHDabG5odd93JJdUyoF5FhsSeuJp2FIfp8Qpckc+UQSeH2lyR36GE3aw9HcSrnN6TaGb4tfvHhNmTjV8ytz5S7WmWPEIZkEU27r4lphik1JyXSKfOJD8b9xyQ14JV5iIBFifGrjG952gPA0SzmA4DdCrSBxI2JuVZ5XckDP/ewGXYEXG1KWBpxxYfUQ2CbcVXNY7QVXUYXCYEHV+eKHxpyNDiJTwLQ4xM/YQpYdqb7VK/4Vpg/kjFZuzpxRBH3QTd5CGweeDvXhf6hYEMd1+oChbr5ly0lEouQmSsaN2xXgvkyfNTypoR/07MNZn7d6VL/RGa7Q7gzoplcJPOWrw== 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 AS8PR04MB7542.eurprd04.prod.outlook.com (2603:10a6:20b:299::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.19; Fri, 9 Sep 2022 09:11:35 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5588.017; Fri, 9 Sep 2022 09:11:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 3/5] mptcp: redundant subflows retrans support Date: Fri, 9 Sep 2022 17:11:34 +0800 Message-Id: <5b959eec45fab970a5b168fccd7f17fdee843ee4.1662714028.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0008.apcprd01.prod.exchangelabs.com (2603:1096:4:191::10) 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: 7d89cc13-f481-447e-8a85-08da92434b51 X-MS-TrafficTypeDiagnostic: AS8PR04MB7542:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X3ss2Wcs0t9ou/oQ6w9cmD0ahxI3GC475lgBTxE+O+xn3M+e8w/xH6qktgB63R7H0JOWlPFMtSL5VU1saIZ6hJUq2LYB66NTYXVBiga6wOsOCD8xJKUfYmzvPjZyzaJSlU4tlYw5PZuvfn2hz7LzOKIf2DbvgSE/7fW7FtjRioCkj2y7BpSYDXwm50ro7G8/3xb+iiyZsQdj5l6KSIGggimUxDLHK53B51NldBXo8/JgpI4ne3BfQdnh6P9j+V7ZcXBujjJAHUDCYwl4SJmPeI2558iOcuqGLAK3RNz0gfAaKtS2xMyHtb0aouyKSpFdQwjagpmWNrhdsuBper/t2lbxjHN1zJE9ugKjtuN2lwcVhkFg1h3Tc49cJvAwgnaGFZgPJZipsWApnwosd/tOguw5fJV1KsSoCcj6ZpDB+OferMx7MouFU7pZlVzX9GGV/6D5xKgWtEfkWVKEhwegW/6+d14vVqvuekFF6cX6cgmwclznQj78OFAv958woBT3eOv7ELFmfu4ycQxn2rGq3uNpNE4DI9ch1gPVHyniChR9tlYS76fy2JNhQK4c4hSx3l3KJfJ0TKsGqKycXpq7RjjBu47XqwNRUmofgoBikhqkQKMXBegYLfpu2aNRUFn/e2ZxZdjV417PX/pvDNZuK+w6WepgsKVIi2oNgpet08+G7US3NS/rG/XbNUrJFtRAZi/xCKt6oTolNyJJXGLW9nrDuMK/0H0hCDmXGZCW4AQPEZCgcfqgdWcRk5F55qrG 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)(39860400002)(346002)(366004)(396003)(376002)(136003)(86362001)(38100700002)(4326008)(66946007)(8676002)(66476007)(66556008)(36756003)(478600001)(6512007)(26005)(83380400001)(2616005)(6506007)(107886003)(6486002)(316002)(8936002)(6916009)(41300700001)(186003)(44832011)(5660300002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z6YpguXkaBwf6k090lwYsdvsSyONZ7LnLmkH1sJtOG9ln/3DDJWbnqEUj08v?= =?us-ascii?Q?M6LzKljDyRWSKd3EZnO6L+smKjd1fv2ivQ8wlNUBhyNF9kxbJltFYqwE//sQ?= =?us-ascii?Q?CPd10MHaEIxbIKx3smCXx76mLdu5zHfvy8XWLvcxcsF1F0aXE77swI6cCqdu?= =?us-ascii?Q?PIub64hzKm2Ot3G5WevhPVGPVTpW5Ul13MvuJYJCmEBCvpfUa5fkWxMp58Qc?= =?us-ascii?Q?p349SavXYoYIQ0XzE0rc3Vc9T67ofica7b+IKxqSGameEVpAYlvdAjL4nKuo?= =?us-ascii?Q?tW0dWddbEHxStLXB3jA0iGDQ+m+ERqnt0Noq6Net/UpwHUmXGPBGm79nCv8U?= =?us-ascii?Q?yhhOBqt/109VcX5MnOZZcsTdg2o7VH8a+FMgMR8Y/IMOWVPrCbvCC/xlRlxX?= =?us-ascii?Q?OCqDG6k2QqhoBylmS4E4hqXF+KEAupwfBrePMQ1wCiV+pRDE4+X6z5d7DVaa?= =?us-ascii?Q?yuTRweqXBiUr9Fw+f/f9QJgA1LysCdHWVMvM+Llz1HG+LZPIDIuDcCCEXCeX?= =?us-ascii?Q?L46wJ6Sy/uG2RlVniHiwOqgLVVe4gIBiecYTNBok+mDuCTveJsRz6u9/XBO5?= =?us-ascii?Q?4IIDuQVMG3tF5rl0zghxzyheCauwL6k1+I9hbhiFcR4jtfF7HswITclK/AvL?= =?us-ascii?Q?GQe161EroAz6WqgmG1Ov/Bhie536H5O7Ed5popjOVmPjVW0t7GulzJz4xPFL?= =?us-ascii?Q?boiDa5UxBUG/xAq4cGMOaD8uvZ/WK7RazmC6qvoB2pm3Un64cWCdN5k+uj85?= =?us-ascii?Q?K7wazr36vKjFGHTWeZuBJb9FkNBRkRpdb7OG5e76doPaLnr0r1naruz5s5Gj?= =?us-ascii?Q?xI6DPrU4hmwyeWXuqq8Z7z0EStxdeSCHpOS/vLd5Yb8QjjfKAXQ/qvw4XDQK?= =?us-ascii?Q?9T7bjvKLTRyuyTI7MAshnUyd9HO4bHymqNbxF1igph3xJD80px5rYJ561X61?= =?us-ascii?Q?HTWHoI3P2UZgV2O5vUyQve3t5jYRWcImVIMmxUrE/7OeUlPt146GnubRlEm4?= =?us-ascii?Q?ah1tzfKyOzSequHqpeQg0p3RPtPpOl/O7dvJ8c2bwmowFtD8a97C25O/J+7B?= =?us-ascii?Q?G0YT/jGE60WOFmL34ZbLZM/oP41sTxdLEZurbA1Ir+Uev3pJqr+cY8cWAiwS?= =?us-ascii?Q?UeJghQubuKfAWPBEb19nuLPcvomplf+2WuyHq9PZ44M94lA9X+bHWgfQzeVp?= =?us-ascii?Q?IWoNQFQyP1/hxgRF8ccLN4/KFD1eSUERWpFsOht2jFxqDHJpp0lpBx67Y2wm?= =?us-ascii?Q?YVwzoBincMorlAbJfczflVQKKEa/pgHaIBpwvSmo5eESeor23yWOnc1rt0pT?= =?us-ascii?Q?Dn1RWhqfrlZEwbzE4aZTZckQAyVigzSrjU6ztsygeityAwTDt32uzgg9LTNJ?= =?us-ascii?Q?gwQs9TtX0L9oXya55N82jYgg0Iulm2+eWDUfDfxrpzjqZKauIFEaqEZRte6K?= =?us-ascii?Q?vF8NJdJS5cm/0FctyDo2H9lwvyGewWrqzIFLwMdGqM58Ulqc8I2IJZ2x+Sq9?= =?us-ascii?Q?YQPyYbo+0SSF1s5MDXRBD7FGzlDe6+LTgJrq0TEClQha4Bss9qS8UnDoqFKH?= =?us-ascii?Q?kRc+kU2dGnxXS9SSv+sr2YN0Uyy7lM2AIIjw1QeI?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d89cc13-f481-447e-8a85-08da92434b51 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 09:11:35.3414 (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: QexrkKYb1WGwBGDb7V3RnaFGeQvZFnMDgNxrnTyD3PMbz7yFhVh61teFV0yV4V3lw9+YJPq7Kuu5acy/flicfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7542 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 be62126d7c63..bbf55a0fe314 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2430,16 +2430,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)) { @@ -2458,31 +2459,46 @@ static void __mptcp_retrans(struct sock *sk) goto reset_timer; } =20 - if (!ssk) + if (err) goto reset_timer; =20 - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + u16 copied =3D 0; =20 - /* limit retransmission to the bytes already sent on some subflows */ - info.sent =3D 0; - info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : dfrag->al= ready_sent; - while (info.sent < info.limit) { - ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); - if (ret <=3D 0) - break; + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk) + goto reset_timer; =20 - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); - copied +=3D ret; - info.sent +=3D ret; - } - if (copied) { - dfrag->already_sent =3D max(dfrag->already_sent, info.sent); - tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle, - info.size_goal); - WRITE_ONCE(msk->allow_infinite_fallback, false); - } + lock_sock(ssk); =20 - release_sock(ssk); + /* limit retransmission to the bytes already sent on some subflows */ + info.sent =3D 0; + info.limit =3D READ_ONCE(msk->csum_enabled) ? dfrag->data_len : + dfrag->already_sent; + while (info.sent < info.limit) { + ret =3D mptcp_sendmsg_frag(sk, ssk, dfrag, &info); + if (ret <=3D 0) + break; + + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS); + copied +=3D ret; + info.sent +=3D ret; + } + if (copied) { + 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); + } + + release_sock(ssk); + + msk->last_snd =3D ssk; + mptcp_subflow_set_scheduled(subflow, false); + } + } + dfrag->already_sent =3D max(dfrag->already_sent, len); =20 reset_timer: mptcp_check_and_set_pending(sk); --=20 2.35.3 From nobody Fri Apr 19 17:09:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp874711uao; Fri, 9 Sep 2022 02:11:49 -0700 (PDT) X-Google-Smtp-Source: AA6agR6KoR+gKRe/Mwc4tpciduvYnsq1z0qlEKz/Db1bmPDn13ikBGFA/Qu0t3pX+uuBDYySPQ8b X-Received: by 2002:a0c:b444:0:b0:4a5:747d:ddd7 with SMTP id e4-20020a0cb444000000b004a5747dddd7mr11236618qvf.103.1662714708934; Fri, 09 Sep 2022 02:11:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1662714708; cv=pass; d=google.com; s=arc-20160816; b=0MDe9g/AWSDHxd/EiFGb0qo5+HI66dRKp1WZVekzUfschyty58r/rbl5mPJQcY1uOA amKukRhaLa2pGLZqYlJlonh1qhKQKDQ1GBYnVkyFxTgCvrbj4ZUlUisKXovrf4zZYYK/ k4AIrDFnTf00VBOBD5EvXWKmPUVHdU235wUx5ymTXIISmdSiJwte7lY/DsIxN1Tpwy1z yxJ01fXrYxo17THEipnJJksbam7gnfhmefJQNc0BHsxahJcns7CAFdWEDtiAyxYfJLXh RFS38ux+cmO8yfIwPWkAiwh82hLM/ehTxp5aWNihWx6oegfAXHjpWkS2hvLiIIz+ciT/ WhsA== 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=PntwEpYQQS5aObE8eGPTj3QBzslLhC3yChbU7EWp3UxLzoMs8j0TwatA5hmxLjtIsI 2sRHAsTDeUf3dZkeglHITXNMswi+KWoeDcyoHXjci+yxOEdNd9g6qrT5oyGy/nKkQVge Op4nWeWfU+nJXM/KsqdbzTY299an+QBe27mhxXqTlLUMMG8n4NMg8wAt+2CkHWR63FlA ky7cdiyLszKh2rdqsJxqNipDaarHnYZUV8NbTyowh7bE/AOo8PJ7EvPXEqO2LNtTD/V/ t2DAKASebDexDoxqwPnQWiSS36PwLblA2BW3clnEJwlX2+td7tW8W10/zxsnGFyNX13L 4ROg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b="yk/S7afq"; 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-6251-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6251-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id y3-20020a05620a44c300b006bb1387fdc9si1940qkp.468.2022.09.09.02.11.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2022 02:11:48 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6251-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b="yk/S7afq"; 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-6251-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6251-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id B00D21C2094D for ; Fri, 9 Sep 2022 09:11:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5F0497F0; Fri, 9 Sep 2022 09:11:47 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80050.outbound.protection.outlook.com [40.107.8.50]) (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 BE6B07E3 for ; Fri, 9 Sep 2022 09:11:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BRtzNiJ7RQOz1iedfTiFAz1NS1WvKK/HTCeQCSWK/6V6bjGtcuAe2IpqshGD07mfGQljMD+sQ4rCeADbq1Q/NBnP1xXlyfQeY1NXx2hI2gcmkgCz59N6uoL0TGHgViLuTC21vAAeOnFw2qqcCrL9Ru7+VBWEAnT12aqGhNeQ8lWdVouLFjFUuQsdPl52xYOxL7/FtjeYubkU6wEZ0swZ55mF9IHXpoWDzlyBZemQyoLj+CYAGdiUlISmcnU7jHcGLzjEe0ricabXf/mboF96i1MPJ01u0zr6V6zmYNjC4ZAekBux6ebr/vjcVaAhxSDXTkQXtQ/dGbiO2g/smnVV/w== 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=AZ3kY3KMM8ifkR8044Kmot6N0uuIkbdvG1BHr3EUuHGg/7cUPD3A/DOS1R50XpXhrdZQ7yL01BnqDxhLRPEI6iaB2BP+Xbl6QMKvnYfEojRq2+jOuKsyC97g0jVte6zINzD64dvwq2P2VmbmBt/E0ZVa6tRCk980mcy059WshkOB6VfvLhwtB/Xdaq3lF4q/BnF/SJNfdEE8ftGMSor2x881xGDIOvsyzQwjF4XwJAQUq4v1UDlKNde4jmD78iOfqi2TBGEVvycV+zOIkIQBpaL5B/b3fV249g0cKsdc1NUYj6uJPbOj7XsUgxAJhTnV6wJnTwDM6wRXSBzkOYEV5g== 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=yk/S7afqTmAePJxabtQBeCJPNvB7cVI3fnuB7AGXOARPxyb2xn+ll8qJEa8gvRR/31nqrtrUN2jbtyMfdAZzrM5LF3+YvBWBXfCnHatCWzgVcGKyEUS5hRVh3enewCacr8NUbzAMF1a3i/DBpFdAI3RVO7X/Cc1lg5OeMCEZMXFFITdn+MZMDicgB2pexucxPts5usEM9giivi9bqdm8Nf4vmUIAmiYsWMOq4Y6Aaaphu6Wz7+emc2yeu/+EG+bQsWwpXvS2BG4Qud2ShH9buxmvKs6cQmyyvPdv0YoDZkdIhm2taxb19AmKvjsML077KksnLSFF9PuEil4pFnOSnQ== 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 AS8PR04MB7542.eurprd04.prod.outlook.com (2603:10a6:20b:299::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.19; Fri, 9 Sep 2022 09:11:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5588.017; Fri, 9 Sep 2022 09:11:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 4/5] selftests/bpf: Add bpf_red scheduler Date: Fri, 9 Sep 2022 17:11:35 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0008.apcprd01.prod.exchangelabs.com (2603:1096:4:191::10) 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: a621048a-3215-49bb-50fc-08da92434fdf X-MS-TrafficTypeDiagnostic: AS8PR04MB7542:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kxj1qtaL21+wf6dWyUwmiqKNofEzK3VjBoSzeJTlqmNf6QjAZBZ/yZQ5gR0X+DLe0shordGG+/YKrO9lnkMxoG1uCUNiy0KNuLxGUio1jtXmsT4IroXQU7AV4zIyASg18XomjDlfXkiFSy9PhvUnQbYMnPs6GGc4E26smx1uQeh04ruqhoLmfgttCOFWbII9M9/KnL0mnjCYCvsiZens/9fTooiyvh2+ndK7OShAGc3MQKSdbo8J6UE68SI41ZAkPPTgvD54yxAmk4wyTs5BFtiEkr4qMrYCISrC+cU/r9sMt6XpIRyLTJzioERPDgoNrbBUbRkIIsz0gtvL28EVQJpSjTnCK/wcZshm8AFFOBL6JZPECjEZg4HOwP1wM60RsbwzVd1jrjdXCRrq+poQ9xOh2yHNmdwxiO16Gv60/TlSMbBgDcGAbB1IjMrP+TFoyUz4OZJ9BtY1glP8pxak7u0RsE5iN8RomfnZowXoCMCVIyQz2Pg4BVjmCmfEqZSUWO+hx/Nj67/6sO68X+hDbf7HyxbWd2/uBpzYHrA3MUQLSDPPzURKnJbTRQmzBNC/r5OKp5lvyTp26GVhh/v14g0tQFF2IKsz/cYMUizegJ2Zgvtp4fQrYyrIcqaMLLbhOQGE8izRL0J+S+8gdGVVXkuEWqfTzPeRS5UQFf8nmBWPddbocPedjq7zU2LrMpusy+lNXYlNPj6z1xOVpN10OEKp79oEwClfZban147swp8g6dfQcJbx3PI1Roejpwnj 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)(39860400002)(346002)(366004)(396003)(376002)(136003)(86362001)(38100700002)(4326008)(66946007)(8676002)(66476007)(66556008)(36756003)(478600001)(6512007)(26005)(2616005)(6506007)(107886003)(6486002)(6666004)(316002)(8936002)(6916009)(41300700001)(186003)(44832011)(5660300002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/NMpCy+/x+htxuAhdQZN/lj+HKxIAOFdnYhvJvEuP5yInOXYM8sbqNn888Wi?= =?us-ascii?Q?HcpSL9yJ3Xc+VxfeZrpKI2DIzzC0Rrz2FkpwWcv/yvgqlg2GDJ3vmA43KLJC?= =?us-ascii?Q?PKsmnWDcV4hWPcyiMxUfbvOENsFc8dFjlAa1ynh1UBCs1H+Z8plW7FUe86L3?= =?us-ascii?Q?tSUHNZalrIMN9q1MHrEHY+XlFn2ZVgtiTqNb4PtNFD72ZAg1s8bQrvZ8W0ba?= =?us-ascii?Q?hroUtkZM72U/l5VcbOVFSEf0e0YKYMfUBfM7n6tI7v1qYsv2XcvbkgtobTj3?= =?us-ascii?Q?FMemCv8Y82EahbkewJoZusV8OAmOWxclE0ThL1bBiuj75lRqPGO2TONgahvh?= =?us-ascii?Q?1N99EEJ9sfe3lkNFB4YOF3YNQVLDHKFUfU79fk7XUx7hpk0V3FE6mfkcT8z+?= =?us-ascii?Q?PHhZh0ZDijvknKMc0RNAzv2OsRHKN+p0l9784g4RKhXu1/n9ijoxiPZ5v2v4?= =?us-ascii?Q?a20cq6pPYtJMPjF/F7ZuajrA3bCZG0bS/uTxmh3PDvSbKc/hBqvr3t2EiSNL?= =?us-ascii?Q?uSxYmdei4XK27rniVx4zWPu9APE3axmyUXfYkjXy+LcUx+WrXlvtGZUVvcop?= =?us-ascii?Q?P0kf10bwZom1kUE/FoH6/jI4EpGX5ESxoAJF/w+Q7eOj/3yuMhB5S2jubPH8?= =?us-ascii?Q?YQscfZZcBvnjzk4KlUjA5QV21clHr/4of+pSw1fCU7KaMlqGju1NHnvQdII7?= =?us-ascii?Q?lE5F6L9Cdt2yKql7OmGVs1/SHezjPo2clEUo1HXiRTgKiJcf6WxyfL/rReWh?= =?us-ascii?Q?TDyTt4sd+gu+xEZ1BAZrT+xWRmzBy7u7imNJyETgWaXlu4J04SHuKFHoynep?= =?us-ascii?Q?SxejVdXygRENqOTfQgdPshcYdHtDyJJtZbx1vgtNR23RtyI3jqJyz+V8YYk5?= =?us-ascii?Q?f506LWbcdk4fMDXA0klttF4F9FUbcTKJDAmOdBglZZ6TiFfE5TxO8CopFEW8?= =?us-ascii?Q?LYOx5xCVf1G+UiruRgsOturD1GdZbW+o0/VMDiw3Pf/C4AuddGOj8/xWUE6N?= =?us-ascii?Q?+88G2lHq64XPtP5/I16aYgWk9AdZLrmT77THzFnDEDbIBXIdaL+DzI2xSIgt?= =?us-ascii?Q?6jF5a0NPRTymW7vDMwgoYNmpjKcqtZv9k2XISjD/PVKpEk5vlccp6UmK9Hq5?= =?us-ascii?Q?JD4qLF8LTlO6a05r4ycGdsTLYAZ3tbbCJvokde2zo2K4h1kr3s2H38WB9grT?= =?us-ascii?Q?u/WDQSD1a6+xJgbrKm8ppZeeNT0Kmfy3g2UiQDm1q8/8wqOXCjn6vjFFrJN5?= =?us-ascii?Q?GPYz7YKZB68r0v0Uq6e/OwGLrT06u3z6NLFjk+uMiEZRZXcHM02cCKAOqDn2?= =?us-ascii?Q?fEPvC8XM//+sFavb14PmJKqhFBJIUz6JPA5tdM9cmMhlV5phP5E3m8EvQUez?= =?us-ascii?Q?UOxHlzpYxVjMN5aTTpS2BnnvX6f2Xrxjpx3RHruOcatK/vpwARyiN+VIPh/E?= =?us-ascii?Q?z5FzjFiUpr3IqogKhNuAhFSmDITRpg96cMqzEjNU/giYazMK1W2lXeF11G6y?= =?us-ascii?Q?qom5MLBHop0qZxzAfPT2+ZEA2hFFsXVDr8YZLJUmvvXFOHu8ITUMuQmwhNyz?= =?us-ascii?Q?Thl2glCbe0G1j5IYUGoqBIPpVml0/5SDGPZpJyCg?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a621048a-3215-49bb-50fc-08da92434fdf X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 09:11:42.9658 (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: zblmymFchyHbgH+r31+ZH+kH/l5CgoL46y2lDefkydF2bd63phpe0DAMVkTQ4klzuXaY988zXQBa7dlLtNg5cA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7542 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 Fri Apr 19 17:09:05 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp874743uao; Fri, 9 Sep 2022 02:11:55 -0700 (PDT) X-Google-Smtp-Source: AA6agR5xLcvfXbxHgmHGBOfRVVtsvqzzJ5rxOhGMurCcLdVMWSz63pJg4GgS8RtCyy1IKcj8KM8N X-Received: by 2002:a17:902:b207:b0:16f:2349:6116 with SMTP id t7-20020a170902b20700b0016f23496116mr12526965plr.80.1662714715805; Fri, 09 Sep 2022 02:11:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1662714715; cv=pass; d=google.com; s=arc-20160816; b=08msdauH0vVdjkh1nlLj2o02ILjeWcswKDXy0PrUR/+vMD3bVXv6UgCka2fzXsu8PI l4CZbRTSME9pr9yRzgrpJHWvlpLvb4ocjNF25Bboy5awRmTtREuH/4h5eZqgLRfUw3cO iwGjV7fzQ3/HU382jP45KnYYwpphpKerYpFWKiyRW63L0E81r8K17xeCA3OFzkGNXPDm xYYUX+TuvCyWSHAbV6XUerXKeOZbL3jscagULI+IyOzZ05eIMjAg0MSvt373EDIWxi5m Y2/zV3xaQAB5vE9q2YZ7/v2fpK1tFOOK1WO0Ky34jD9nHqwvEvYNkqI9LZ0iZDmeobWn Vi5w== 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=MnWSGjo2UpLUtf6pjJcRgcvLs4+PkDVt996Yb4VCoNUxvsOo0a/Yk/L1kmHO0CUJNX zmIKymGHoKy4rbTSNyyAfbXL/rWehoUVclfKfERhiDIwaZdeDMHRxC3FLVane7RasEiq yCxYYcYQbEn4QNZaIBq3SGEmhRo+2W+Mv+5QBi9BcALKtBQ/PJ85A2DRCJUCMeIvIL5z qW3QnY3E1qPXfqZVyHg+AtctpPu52Hc3dwCN6KTMiq5zZABs6ou+exT5HkXZn+Z4gJX2 LqvGtXSN9bDdb7l4qST+PpVxF5/L9ePuiC8T50+Eh/1BzTo3hPk4hEWUFQr4/H5TTrvl YO/A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=dQUCdCVf; 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-6252-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6252-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 a204-20020a621ad5000000b0053e57d15b40si32892pfa.27.2022.09.09.02.11.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2022 02:11:55 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6252-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=dQUCdCVf; 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-6252-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6252-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 54D0D280C82 for ; Fri, 9 Sep 2022 09:11:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 441FC7F0; Fri, 9 Sep 2022 09:11:54 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80080.outbound.protection.outlook.com [40.107.8.80]) (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 723FE7E3 for ; Fri, 9 Sep 2022 09:11:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j8yqdDnX46PT8W+2RTZ3iRY4yLNJiOQhkIc6rPQCZtKSIgQ+TumFtIdruzjhV88Gy50BPzn0bzwQveMJn13m0Ta9D7kbHx/FTMyKEgw/E5x34c2XUUVsfmxlNpHK4nL3HzwuSNaW+yqXTxAWWTBHZ6tHFt2JFeohkXtKbZzRvn3GrUhkOP/rsxKshEuB2dyY5E+kaOS9ouzveaQtUNQPgcGYqLfYol866LWEe8pdcqVXqlwAvjJ9Y8fDacjcVMIgCrngnsQYVc8r+sxGmuHgEh9tF5dRV2Lp67BEsHr7xFwUs3jzO5GcfrT+T5XSm27QWDSR8l0uYfXk4j5CJYG64w== 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=O+jQA9OV5gg1Oe1HWBSYuGA3v+YnFWmvn2AI4PYZ6qzn3lzHbjv7bgOeSVy0WSjZNFY/OF1x9SS6gBI/uJ+9fev5paRaeUFHf5wBRg/JZUlhzUThm5eB+DqPjqemrRYQoAUEIlgtdyamG8ojNLAE3mYWUYwATvNaKt+LZj2J8JCjLttj53VOWoMyoNI6H/E6QbdMMNSPTbIwCDY1HnyNBx7A7kDIFc8UAmDqoo4igMfiPvmmW7Wsa20IHuMAVU5G5jK9bXuGL+4njAoiZOzsIAlannTaZUeuxKNOpHK4WqJ0MJtrLFjt57lB3fKokGa3Y/BmZ2L+t9vDaBhpvO0Qow== 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=dQUCdCVflUZvYYTgaXYkEyUMvTQtmsAkT904B18jefJnYDYJKByGy6Eylc8n7uqpOdKbdw+akgyNTqP5CLg24frbnVKJo1qFb5rfTtmEGPVWH+fae167syizuecJkcXp5L9yUvOlbnCoISN8ERmuQ4J21Hc6hiJYucK5w8n82nQw2547TMpLH0odaSejiyTxcNztzNj6WUodgRnh+uI8mvvcIwqlOUb7RAc71BHitI5gj0+39cIxEvPHNOyJfn/vIUZazRnsS9ES3GHKhczdLRY3160pvjmpeCnhfM8dokn1kRI5R+sbWx7Fs/4dPpE9YD0Et0hIZQOJGSnNnLB27Q== 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 AS8PR04MB7542.eurprd04.prod.outlook.com (2603:10a6:20b:299::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.19; Fri, 9 Sep 2022 09:11:50 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::e936:9fd1:22e7:97d1%5]) with mapi id 15.20.5588.017; Fri, 9 Sep 2022 09:11:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 5/5] selftests/bpf: Add bpf_red test Date: Fri, 9 Sep 2022 17:11:36 +0800 Message-Id: <03a6d8d7833e6b258ab4702291f01c8f2dd309cc.1662714028.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0004.apcprd04.prod.outlook.com (2603:1096:4:197::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: 2efd5c35-a73d-44b2-e223-08da92435414 X-MS-TrafficTypeDiagnostic: AS8PR04MB7542:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rgIhkCads3zk1XYQ6JBG4fu9CAdqYYTGBcZEGYhmqedeFKFFe82fWpAxu/RdyApbZQ/ec9ADDrA//xumdaVxgNzszQU/LNk3pFa+ZxknNLqdstOYO2jY4OwumI01nfOjmsrWMMZYRUncu6tE2qCoxHIt+QS5OAhUgLHHnNcT2e4TCmnRW0j1lwELhJ3XL+Vd8cRfqMqLauO9pDcehoRLheJZYJkXb5X4NnZ5vhZAhOH29p4kLJAOwEVUuDlL1f3fDXeL66f8mhGaK4K1voE+aNGsqGJAkCq1z5M/+SRAHQpMNI7wg3hxRzjw/+iUKNaez/bTnkg4v4elSikikM/6w2Ih+A/ReIGjstpB26UK/WQ3RyaunFFbPXN9XdY4B6VjncrJOUY53I7B8SJuyjsfgtuDy9cYjXjgbZ0QovjmsIeXwjU0bBk6dH40UovSiAJpRafBm3VaRIk3ODJbVmMCOJLqugkvrBdHBTKIbtEUQwbQUSbIXWsgkQsiDrOGEZd+mjJPidBvtWXnykxMbA5Fq3iLvE198xQheihBrIjYKlZZntzgvp807+Cv5xCk2FfbnXmJG5FPweA75qXvLXDVuwPu6I0WmEjTNLtlr8S84HOt+g4BegAkCYVfsDx8TcrX2nC5ojIBQqVphLaIcYylLh1sjzdrt4neBxz5OSXNL56Jgtk1EID8RzSh4k+EkwXypc1tXZf8U+aRHb9FY6CBZDU5kFL1cF0ug9q8K1PU++svI29AE1zuV55uJMiXplpU 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)(39860400002)(346002)(366004)(396003)(376002)(136003)(86362001)(38100700002)(4326008)(66946007)(8676002)(66476007)(66556008)(36756003)(478600001)(6512007)(26005)(83380400001)(2616005)(6506007)(107886003)(6486002)(6666004)(316002)(8936002)(6916009)(41300700001)(186003)(44832011)(5660300002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+dAM6ah4+reAUtfevGLN2R65C/9doiFv0MHEvch9KkxLFPE9kDDiiIT1ZMWi?= =?us-ascii?Q?KNCbJviSuksdfayVpoXKvjNYu+AOtbTap4LseaIMQoKXvnPUwn1aI+l1Xl7n?= =?us-ascii?Q?AFbREsqtG81QOcxAjE1W0pFiA0Fx40NDxAaVxeIpJQRgzdYiZWrD3TEOuHh3?= =?us-ascii?Q?4GdDhMA8OSGSsbTksSLZDF4kAF74N+bORhh0nC3/E0cpwGM4QQ2SEEjJw5/C?= =?us-ascii?Q?N9HJG/sHzPNvM1KMZkXF1pvbtnl50VZK+v98zjK/ckWsMdKMR48RArEcll6c?= =?us-ascii?Q?EjQ8q70Vb73oryVRWpiKX9aRbOWqN6w0ynSbWNAceXbI/uGQ4eCIhy5gRnP8?= =?us-ascii?Q?6gHyJB9i5LfMMWOz+Kz34YEsj4W8AOoU2aA0vCbw5R690mUJaJ1nYLvb61AV?= =?us-ascii?Q?pwHE8r8MXiHF1iEsz0RiaqWRwxmh/JMWCHQ11SmRvLhUBR7epU1FPHi7hgIG?= =?us-ascii?Q?DkdMzAhdDtxwQzE6snc1blMIwFNiSLxhHuorU4fWArmWyaKYDa/PkcGRF1FG?= =?us-ascii?Q?s2r1xm/IMcXyZ6nchZniqkQo4VdfDwCBY026K4k+2Re8I3MaY/K9NLrUCMiG?= =?us-ascii?Q?7F/eb2ZFDscFbawA7n9nzakWeG6ifYdlDgamIL88/3VOkWL8JpXPIO86yg6B?= =?us-ascii?Q?0k7U7/8mDhZkG+21zAvyC7s51BaOZ7hXWwEvEkdgylahA/e06menqLLmnusi?= =?us-ascii?Q?X1laUYYWRMMZWj/XocSwRGP9I2SnJhuvwuVqOM2aelVcdNnm8Uqs1NssaCGA?= =?us-ascii?Q?DLewzyUxSoDsbI/X3CAIdJHNZd5HEwLg/7OuvVzroe9j/NeOEKYRFzCa6W0I?= =?us-ascii?Q?8i4Q4/fmwhe64BKCkiNYt0uXWripINGHqpHbh2+KervMi4C52L4WrnZMNvmK?= =?us-ascii?Q?YngPTG1HYtyuKdoj2O4JlKfT89yx0iAGJY0loBKxSIGbb8N3aUvTk2Wyx8Gz?= =?us-ascii?Q?ruHzXjL7bKdfkA6uTh0HrJmIzACKxizLMHJ3jY46G8pJKKNn5bJG+47BXcT0?= =?us-ascii?Q?LNVI8sb87lWNEnAWyW/9iRu5rcbnTKRYOxnG///gnJ2zyKniAGG+HlQGbigt?= =?us-ascii?Q?ogzykIbYwHVqJXakboOQP71NW1NEHGwMBRgVKSsOV0fsK7ar1lMnaN7nqALB?= =?us-ascii?Q?zvnPElD8hrvHvjaEQFsySGHI3CXsTF5rJvtwXX/xz3fOuBkVwAfRw6cfmc1G?= =?us-ascii?Q?0MdKvGsQrATJiEjXg4n+atnzXsegDkkilPjn4e2IKzjXc7kjvRTY4ui098aI?= =?us-ascii?Q?xX5T34RNsYWc8lKJwKaZ2GJYLYJZyMMyyHHbQJxviG6ckLhqnEOArbA6mxns?= =?us-ascii?Q?9oQQLZ6du83OPBoIdc6Cv1ipqdQcNEGF+QSN3EODv52/2lsohNA7fh8ayPa+?= =?us-ascii?Q?oxOohmTWmSSQ17OEQzTjdTYkJ55NFiQ3rX4ZMZX//UzwBP5QnKR1a3592Zh8?= =?us-ascii?Q?KYMvlMftNvr9LIrPIgMVTS0ph6dlmqrXu5iPAyXSlYwauVcRqKQgztN+C8Xp?= =?us-ascii?Q?IZV1yAJw/hBcw5ckwXHkIG8HJs6OsSFw7itFbqWlBmAIaF82eVa+90oCrttq?= =?us-ascii?Q?hoooMmKJCvOrnPJfbg5nAs22LPVRa5QkxtWPNjvU?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2efd5c35-a73d-44b2-e223-08da92435414 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2022 09:11:49.8715 (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: nNyE36qhCvoG4V6ZPwrP441WoI7FpRFOeSmo2UeairV8C+PgavR2Q+3EIGVC3bBKDOFTYZBWQbgscgy/jyoDoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7542 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