From nobody Fri Mar 29 08:03:27 2024 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2085.outbound.protection.outlook.com [40.107.15.85]) (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 CFCC7194 for ; Thu, 15 Dec 2022 12:32:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PpW0QN0j3Id07OX59XXZVNm2+urL+A7BZxiYovzBMvciiGJD0xbil3NMRK3/QJvYkyhUzEbs8LVNuyJuyYBQh0uPDI4vHOdJXeoNN1tQEDMObSsOqqHatIobvkfSA4HIrQukPNvc1/XskjQ7Oi0jej9hLcX8D2eButeu/jlDjhmOS1WeYHx8AVVxENy9JXOLf3rjSElBZ8WTFcouYm1ltOAyBDcdzUmYchq8taNBiPepndetwVxE7sYJgOemugJZfeitj/ui6XXF3hBwWtupaxVrmBdZhSpsasgNCH2ZNueXncXhOFl2iSypzxTx3FJ0KaRH6HS1grV8biaqaCs5+g== 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=hStRBQms5r9S3AbR8kt9tPQrTr0D90Bye4gEDleyFIg=; b=Fk0Y7gwjTZYFJ5t9Ia66cBYf7vZlEEsIQBGB6yVssAvD0fDkO5LfKp7vXugRlm4JA8/Ci3JrLbL9iuBL3wPKGI6FXGlD7/Ta7OKS2fnbHYaT8D+qisYVFAdG1eXOeBWTzSeKUC36tSP4LN1989GdVb8x7U1Va1kzWu92SJnWBGOWeCqTddjdvf5MeFKWFarSLWNeSrMP+uzUYSuEKh1eWBxVPekEnsqBo0HjeuUh6L6Emqz1ocLa5Ae6+eFbP7qLfm5L85g5DMZh3ZHTfdILlHNeVHd5488L53YUev0xJ4/vkUpGwFMF/RS6Xp+A3vJCxSobjOaNumxXyBJcTTJZLw== 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=hStRBQms5r9S3AbR8kt9tPQrTr0D90Bye4gEDleyFIg=; b=M2jI6T7pGVAt44Ti57K0wgsc42Hw0XasK5W420QQNuk7CI1rR3SXasdSOeTBiBbi0wJbGhMNOs/ahLMTt203HJAKRHiFTQ8hmLN9Z4CZ6xD8wXRwNz+qyFSxoyMXB9IK5MftNyNCn9/fN0xZQelXwLP01wKK/9usSI0mkN97Xfj9B+tEdbfLGj1zO9f0wnJ2JAR6JyXvKJKEAvoGB07VV4IJUm90gNZkBWkimHOo1QW2q6DwYXONYscboe1mJlmxI4t4WVO2TIsA4VdMI8SqSluSWKxJfn6GlVvJiH6jHbNJ7GO0PLFIlnaaJIn1unfepUVWjtFrr+GyO/iFbUTmHQ== 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 AS8PR04MB8675.eurprd04.prod.outlook.com (2603:10a6:20b:42a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Thu, 15 Dec 2022 12:32:47 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5%6]) with mapi id 15.20.5880.019; Thu, 15 Dec 2022 12:32:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v25 1/5] mptcp: add scheduler wrappers Date: Thu, 15 Dec 2022 20:32:39 +0800 Message-Id: <13b7ef70bf5dda8f5a9e14b180716ccfd2f67f0b.1671107241.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0014.apcprd04.prod.outlook.com (2603:1096:4:197::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8675:EE_ X-MS-Office365-Filtering-Correlation-Id: 508d1197-476e-45c1-3ceb-08dade9878d3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DA9e+PVXH9G3FczkeH2sGvrnSotcWXvhilBBwLG6zC+oCxAx5G8wA/MKOOiCqllH0YYpuM35yRE1CUv2pR5yWZ7dlvxqfTP6xdNUlXdVaU/VTI2skUDs+K6himBP0lzsHPQkEq3MxlMv7pnzXZjb9CuaY4IDey6T9ZNPj7LSHzFm2+210ud69I86KC+v9TmImMbKq2UcLvnQP1VhFCrYRED76LGdzxH9GInaT2UtXgBnuYaBag8zWSYsbkJJUPE5xHcIZ96PtUvyxZ+7ilWaQEWvCnkQTtN5iwI14zS3+9Yo0AiEqsW2v3lN/EOgtzzR8WDnJ4SABUuEgHY2ouOloqbWtfELgKLwjzhdNucOQUXoDxSY9oSmjX9QWBCqGjYqqcflMXKiujch6lURAiBGBgu0/qodZZgDfr2Z4wD9FMQX2QVGWTLIX1h4KlGGsWTLcqpQiU8siNNFESJZRdZpu25iun7xyrQqMaaFvNyOLm+q+lDA5eGJCkDNOPO9GKfoPy3yq/Uvww7ayRwyQgdnxHpaWxxszLR+1ZbPlQBuocL8vZsySsPYz5Hvy/747QACgFOZptt1xjy5xTAfw7Y3YLju89srtG9axPcu6AdfMPbRYBiOUx6vgg40phy92ErqZ0JIV2pr/D5pTiWMC1vd7w== 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:(13230022)(396003)(346002)(376002)(39860400002)(366004)(136003)(451199015)(26005)(478600001)(5660300002)(6486002)(6506007)(6666004)(107886003)(38100700002)(6512007)(66946007)(6916009)(83380400001)(316002)(66476007)(4326008)(8676002)(186003)(44832011)(2616005)(36756003)(2906002)(8936002)(66556008)(86362001)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?n2ATNpfCg+vO1zgrwzrsbyc8vdY5mi2QveGJPOJTXtcfmPQWGkno32imnn+k?= =?us-ascii?Q?1PWySRhr45CCfm+FkTtRf5buvTT3zh/zRWybtedtvf27Jx5ZSwwbVMYX5v76?= =?us-ascii?Q?rug9sFEvZF5gQ0Lu7buxAk0VauuThyWO0WCPWTc7zqO8A2Qr2xiyRRAwBe8d?= =?us-ascii?Q?zYzguZ7yGSE53D9+08o3LDiv+Y/KKtTkg4+z4YUyAo42D61VVkmxRYa06/u2?= =?us-ascii?Q?GbqpOWOVFApFsvsYpOFOL2VZic00okNrO6FgXH67eFCFUth92pJjY8zIslcr?= =?us-ascii?Q?t7gY59QZseFa9LlUARaH3NTs4KOXYPcGF3V7m+1jJcFqTzruWoaH6e2Fvg2g?= =?us-ascii?Q?6X2N8xDXkhQFw0ExphfkF6DYNzMtqn4RmAUj2/mWrSX7XiSNGS8LKy3AVmSY?= =?us-ascii?Q?qLy3BoXXmLodNnOV7ZaaVnJQdyOux6YGVRpASKZxAD/w4o47Opd9147pI0/p?= =?us-ascii?Q?qHwGCIazHJnyI0QgJIfgvvI2PxX39n+rcuw+fquvtQY56jV010ZJfUxWMM/S?= =?us-ascii?Q?KZS6NFsiw4+mtnvL2NBCtT7l3RU0E+/9rg6Cwp0NICOlphClmmSGL1YT49cR?= =?us-ascii?Q?8j9Gf7TWh/yF4LA8vuB4m6+EO8pTXMDjyL/N+deHbjbwreQS7lh9YcWspJYj?= =?us-ascii?Q?OMd+kLD+6WOtp5ARzSbZyXXtaO48zCJxSSoivnGWdKXCw8JLUdELz2CNPtGv?= =?us-ascii?Q?kKL2NBLEy8CDTX4D+apIGVfisVBWDvO2PS0R+lthU3VYBRcYV3g2WJFCnY92?= =?us-ascii?Q?AZXuGOD3+wUvl+c+gdWVpwcA9zbBkj2j/Pd1oh0NmPQRwiO3CvzVRMnmOBtz?= =?us-ascii?Q?ajJbgRtqsenhUpY3GqclTYgLHPrtyCMK83ZpzLhq5aDr42x5h3ETIIZ5LMhS?= =?us-ascii?Q?u0LOuFahReCcYUEc1vWsc9j4r44fBb+zsyp1TFfygpmrOkShNyfEcl2ffWRP?= =?us-ascii?Q?3rtPfCEmMJg9SVEh3UAuo8ojiuZhy6P/FxxgbIUgNyENQKXIX4+LG8tNLjVf?= =?us-ascii?Q?x/NhOWIHij8hpEC7m2inCx2w8DGcnpp5OkiIDUkv9CVHgVO3zr9nDvPI/99E?= =?us-ascii?Q?/pBtW+BwhcuZW09C/9eucIjiIlNSPFksIsyKbfhiu1YBJNxPyz3F/FXdhMkE?= =?us-ascii?Q?S71HFivlEYuf7O8osjY3akoXrHelLT1IgWjjUMCNkA0pv9706P41LqT9BfJt?= =?us-ascii?Q?3RYbAtFzWpqufQJ2WuS2WtK0QVb8+sTbDyi2zjF+BoEeh+ETndpDTXBkgQaQ?= =?us-ascii?Q?N9GmJVbJ/bw1DraEOqmEalpi/E3rc9ZP9jHG17yOGyGSqBjAqPmxpV5KRPTq?= =?us-ascii?Q?Et11WawyQZORZCIeIt6eJ3srZ1brhz+RIOSYfGHZsOPgYjfKGGop0h7yyI0d?= =?us-ascii?Q?+SXrwmqhIukp5nmbm/Mjp7cEpkGpRArUUvaj6ZDslH9uSlE5wJrkVBcAYDzd?= =?us-ascii?Q?XJXAhPUregKYl9r7TP79qgHFlPkp21fRCvr2mWr8fFQd+VXKHfc25dbnyt1O?= =?us-ascii?Q?roCxQN0kg0l0m11SH23MF1AEWQrdV/lYS/y0Mav1AHiPA8RzRssP9Ys/Br3E?= =?us-ascii?Q?w5qMWEr2HFftE+9Rlmt/8M+HqYJkHiA7+VlDsVWDobPuQCYtuL8sMV0WwntU?= =?us-ascii?Q?aw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 508d1197-476e-45c1-3ceb-08dade9878d3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2022 12:32:47.2819 (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: LnyKKM22nMXn4bfSWERr6MPQQYw6Ga6Ab2hzEtepizeQowpBoUhMWHrzOKhZUuqUMqj2GYk//LKEeHLZ0AdVTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8675 Content-Type: text/plain; charset="utf-8" This patch defines two packet scheduler wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke data_init() and get_subflow() of msk->sched in them. Set data->reinject to true in mptcp_sched_get_retrans(), set it false in mptcp_sched_get_send(). If msk->sched is NULL, use default functions mptcp_subflow_get_send() and mptcp_subflow_get_retrans() to send data. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 4 ++-- net/mptcp/protocol.h | 4 ++++ net/mptcp/sched.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1ee39a16d9a8..14c69a519898 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1396,7 +1396,7 @@ bool mptcp_subflow_active(struct mptcp_subflow_contex= t *subflow) * returns the subflow that will transmit the next DSS * additionally updates the rtx timeout */ -static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) { struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; @@ -2216,7 +2216,7 @@ static void mptcp_timeout_timer(struct timer_list *t) * * A backup subflow is returned only if that is the only kind available. */ -static struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk) { struct sock *backup =3D NULL, *pick =3D NULL; struct mptcp_subflow_context *subflow; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a9ff7028fad8..ecb94ce68ea4 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -657,6 +657,10 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_= context *subflow, bool scheduled); void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, struct mptcp_sched_data *data); +struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); +struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); +int mptcp_sched_get_send(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 0d7c73e9562e..c4006f142f10 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -112,3 +112,53 @@ void mptcp_sched_data_set_contexts(const struct mptcp_= sock *msk, for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i] =3D NULL; } + +int mptcp_sched_get_send(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct mptcp_sched_data data; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + return 0; + } + + if (!msk->sched) { + struct sock *ssk; + + ssk =3D mptcp_subflow_get_send(msk); + if (!ssk) + return -EINVAL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; + } + + data.reinject =3D false; + msk->sched->data_init(msk, &data); + return msk->sched->get_subflow(msk, &data); +} + +int mptcp_sched_get_retrans(struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct mptcp_sched_data data; + + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) + return 0; + } + + if (!msk->sched) { + struct sock *ssk; + + ssk =3D mptcp_subflow_get_retrans(msk); + if (!ssk) + return -EINVAL; + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; + } + + data.reinject =3D true; + msk->sched->data_init(msk, &data); + return msk->sched->get_subflow(msk, &data); +} --=20 2.35.3 From nobody Fri Mar 29 08:03:27 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2056.outbound.protection.outlook.com [40.107.21.56]) (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 6C2A5194 for ; Thu, 15 Dec 2022 12:32:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U4MOIBnEXTtPQtYw7jY2adNLYhs8VYY931m2ZRx9UFtLGWGVgqkeW1cWEgUBSlnb1eHS2FYOxDSn1sOCFSvkahfw+ZYqxBbYwv+b3740gbym0eYAqMk6lN+J7OicSIxDJgT7MACGX+OHlZZ1Of8RRwyrs3b8NdyiyIdddJc7UK6i7x7R9/FyFmPUSdj1K//phbVay9BGPmOo/e88BdgQK6kCAEYk6zvwzkT66vOSuOxtJNSqQsMyTZ3Bk/Klns1MwN6ugxgLoJEjAszHSpkx50Ii4kNojcnSbQHDA05h1ZtTCK0iUhEsMBY9IPfmEdr3UW9kz1e//rHwc+CMqAQffA== 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=+oWGJpQ1VnvISJpEbn8100eS7LD98L9UmA3+xS2nut8=; b=OhVzceolHKI2DABlFmyVaRGsAw9HctjV6lZo6aZIKCVhFB0cx/o1WcdvilI5jP0qyQz5MhKzEG8v4vjjl5x+luNbgAKU+NsQOZrzYmNvG4w2uuXPopuwMjrznVqzD/6XlsVVIxXKAeDrCiDKj1qn1b0qpdxTYYD+Jm9wqAyopF4UXdKtMFgAwIcEVgadcVvJmDqvhPPOJ54051gglijsteuZUydT2n2zsMcTAAiIkkzNqHkeHaLeyopTd98rS3mq0PrwwG9dzHY0D0mxF3TqaVpfdKAgONjXYfCD6MYbrjgay0MpxROZPbk95vGoY1ZtVq6SO8x51CiSk8ga66qcfg== 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=+oWGJpQ1VnvISJpEbn8100eS7LD98L9UmA3+xS2nut8=; b=XjaJALr3WRwNR1oBRDhfB/A7WCWepRa9UFpregd0nYAVnC2/zdA2VkWXzmf9U6hrgKtYB80ty7zy/2EB/EdlzOxZhVazaJp9KgSVFWGPZPpxwsRaVnScCEs60V8SQGCDrpc2lUelbS2erIt8n4uP6iM/zn+w5K0ydFMV2PrfFZdF17mjHeuM795PLoMEdMYWeeqsbADdHZyvFbSgjabclAv26M9sa+KkA/+duQVNqXPBGT6BseVJfpI3oNg463QUPVkeBE1SRCh915zMyFUMobDgHJS5W7ORdgVw04cOLLGfQGMqh2yq1I5dY3ZKj4V9+qYSljEsC1YYecammGWLWw== 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 AS8PR04MB8675.eurprd04.prod.outlook.com (2603:10a6:20b:42a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Thu, 15 Dec 2022 12:32:53 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5%6]) with mapi id 15.20.5880.019; Thu, 15 Dec 2022 12:32:53 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v25 2/5] mptcp: use get_send wrapper Date: Thu, 15 Dec 2022 20:32:40 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0005.apcprd04.prod.outlook.com (2603:1096:4:197::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8675:EE_ X-MS-Office365-Filtering-Correlation-Id: dd86302b-a714-45f7-996f-08dade987c91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3E8aQ1rb5FftE3wGjU77n40785Pk2frYtbv6MdPAKaG6txOSYMPOxrK3qQJQua/ciMYJpFe7efM7oP75nmqv06lT8MjE2Fc+w4TzAHYlOFPg3H2feypZnu93rxCsDi6V1xyu6jUvhCMbTmbcBmMFuKzyCso0XyQOiSs1ifv41k8bmAEnptZmUDtKGq2sFg0Vm8P6+mDWALYbl20J+RIHx78mqo48yWXy8tXoWxZDZa+O7oM0n3C0PT0krOiRhtOQfV7ghJtfvufu3YOg3oV3A4m4EvzpyZcFTLkWwEjb7okupLtHNGlbXmx0bF8x2Ijq8ZNFDP35r/RhYo4otKHfnaTlGEtAGC+DiOwK4ERJAtK0ek9fqUo78kYh+xS5xzTDgzjIFNLuOMHMy+ZWiuZiUBZwfD+bM0O3PIl1VPNkDHEepvzYWTRWd++8dcAOi8Z5yfPDqtVvFIi37mukSI57xHAUJ17FOUaser90tr2vL4crJmJ+yoP8VtgBwejVO+vjztQhqFbY5XdlNLNENlhZUAKfNeYVBnSWhpNJ89Q/eSgxSMFvHkGbkujBP3dPShqTZZqbdI8CCZewxwnLkC3qGwelW0paCEdEXYKWEcB88xI2tUEf1guso7Q5ArtTDLXSNgdPjtt+5x++WO++WDMTUA== 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:(13230022)(396003)(346002)(376002)(39860400002)(366004)(136003)(451199015)(26005)(478600001)(5660300002)(6486002)(6506007)(6666004)(107886003)(38100700002)(6512007)(66946007)(6916009)(83380400001)(316002)(66476007)(4326008)(8676002)(186003)(44832011)(2616005)(36756003)(2906002)(8936002)(66556008)(86362001)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YHCS11YEIIpQhmYzDy6/FDmGxS0hqZGCkp8UKC6UANH6fj66sluqzvLNDYMs?= =?us-ascii?Q?BSakCYc/Q5ZkEfxcR94MxklgQVlZk1Tehzu6zhl1ztsXF3hwJSGv28/MpvUC?= =?us-ascii?Q?g9bJ5n2f5fBVP1vCEBrVffrpLrclJoLaxBPF3RKlBUnpzDhQbtbpwwm7qTNn?= =?us-ascii?Q?kh7FSfMPeuW60yi5RqLCSYyqECXu1JlRcWtdULRmMuYygkrPlEqT85urZdnJ?= =?us-ascii?Q?8L00bfGuMkF3YmK+aPHy5qBrykpEByq8K9JDWpyNUWZXUbjlccM/N3PCMJxV?= =?us-ascii?Q?WFaINZC0CEWi4IPfNGhDMIkPHtzNkZ9eVrXYnaLGAEO4CObbKsNkETeqMnO9?= =?us-ascii?Q?eY8HrMlej9i3N7inowiCOUb0aVXJ9sTV+AhttAcfjMzILQEC6FJV60w3Mz88?= =?us-ascii?Q?cnfzdlhz5CoJfybBeEjRTx+bNrV9BxvFZD55qwOswQWp/RxEn8aDtwP3cUHD?= =?us-ascii?Q?CYPD7TH0Fjh5r1j7ZbiDYXogFseX/noQqckDVqn+7/8NNf5GZVe2ujvwkiNR?= =?us-ascii?Q?5xkwJD3Jo73I57BleN+EV7V6/vwBwof5U85RTUlfIjL3qoSeGh6Mh+MROL6k?= =?us-ascii?Q?kiwmca/ZNnfi2pJTma7snt7x0s6D2mAUPkMLsaFTTAGCfjoaAbwlbdsrcZXb?= =?us-ascii?Q?rCbpbm7dLcgtJkmi94SrEMeNo02cdDBbB12C/LHGR+X/V9GkGo1yD4VswvrO?= =?us-ascii?Q?0OCAyDy98EGh668oqhYZIjZGWHISH2yMTDUDNu2acQ/F8lCuTNC2MuW6YOhh?= =?us-ascii?Q?N1SJqXhonRC3zRnKl/kPFSSNVXpMnY3wLw0XPEFTlT7/orl5QixXu78+82T1?= =?us-ascii?Q?VbYTLxEICUv+BLc9aGy0z4/Iyr3Vn8BfvwAA7hOCIzXrGKseoH7juj70y5K3?= =?us-ascii?Q?/bFxYexO2BvkUrOQlg3db5pSIufT/YfG87fx/CKtYkcpywryuOo1YoDYOi9Y?= =?us-ascii?Q?YRIH8/7hPQEN8joEkDQaPxQcCVJXAd3wfzRCHW+ZKxQkBYFzST0w/giuwnWU?= =?us-ascii?Q?L5vlyCXE3qVYBDhCfB6qgSPEOqd8wiPtk0RmpaXsb9c5P1LdQbSHCSwK15aK?= =?us-ascii?Q?RwnKkiWbS4jgLFS9BMZfHgXO4cLOfBpCqIfsa8yynvbW3WSLvnzEGV3dphOD?= =?us-ascii?Q?ZininrXL4W6etUuiT9G28HLpR2K4WcMJtAGcSQfj2UCtZXLtid9mJ/+ksRwl?= =?us-ascii?Q?9hh6O74m35ujxmO6lQ1R3+xNvT2e5h2MDPcpo6KK1vy1hxwLklRPUm1IQcOe?= =?us-ascii?Q?xEgIsz+Doxi9koDnUmGeWcqLp9p/ZujdGoEwoJZbK2lZQmylmUB6p09LKt4V?= =?us-ascii?Q?JJrbhDap6ZfIJN8x5V6IHp7icDG0mdp4/Ya7XogTPl0cGXlRKksh4klTKL1X?= =?us-ascii?Q?ajgMsiX9PXM188ORDrYlQqSCJqLoz82MRN7CUVZRuuEQ/Hp/13/G4OwILiCz?= =?us-ascii?Q?FXJ2uD7Xd7BRmZ0qmoen05yLgnw6hUnySRPxHrjiDpQBFaQRvgJITHQSnH6P?= =?us-ascii?Q?Ws9/PzO6+LyjAnObR35+fiQkdtYNQbhO7SaxUPez0hOrYCOWUDR/lhTsmwKv?= =?us-ascii?Q?TDQRFwgl6WCyLv03XYU1AhZgJr9TaA0nrUsHST8MWdrg1m725+49E3cY3/Ma?= =?us-ascii?Q?GQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd86302b-a714-45f7-996f-08dade987c91 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2022 12:32:53.5314 (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: e3cByJ8FdkU2ir4usbqlhsVHlS23wMsYGI24BP4ZrtvrF/pQUJRKcGkK0S4hvAD5t/W0WDvTcL6fPYNSH7oXIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8675 Content-Type: text/plain; charset="utf-8" This patch adds the multiple subflows support for __mptcp_push_pending and __mptcp_subflow_push_pending. Use get_send() wrapper instead of mptcp_subflow_get_send() in them. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Move sock_owned_by_me() check and fallback check into get_send() wrapper from mptcp_subflow_get_send(). This commit allows the scheduler to set the subflow->scheduled bit in multiple subflows, but it does not allow for sending redundant data. Multiple scheduled subflows will send sequential data on each subflow. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 117 ++++++++++++++++++++++++++----------------- net/mptcp/sched.c | 13 +++++ 2 files changed, 85 insertions(+), 45 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 14c69a519898..57967438e70f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1407,15 +1407,6 @@ struct sock *mptcp_subflow_get_send(struct mptcp_soc= k *msk) u64 linger_time; long tout =3D 0; =20 - msk_owned_by_me(msk); - - 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; - } - /* pick the subflow with the lower wmem/wspace ratio */ for (i =3D 0; i < SSK_MODE_MAX; ++i) { send_info[i].ssk =3D NULL; @@ -1566,43 +1557,57 @@ void __mptcp_push_pending(struct sock *sk, unsigned= int flags) .flags =3D flags, }; bool do_check_data_fin =3D false; + int push_count =3D 1; =20 - while (mptcp_send_head(sk)) { + while (mptcp_send_head(sk) && (push_count > 0)) { + struct mptcp_subflow_context *subflow; int ret =3D 0; =20 - prev_ssk =3D ssk; - ssk =3D mptcp_subflow_get_send(msk); + if (mptcp_sched_get_send(msk)) + break; =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; + push_count =3D 0; =20 - /* Need to lock the new subflow only if different - * from the previous one, otherwise we are still - * helding the relevant lock - */ - if (ssk !=3D prev_ssk) - lock_sock(ssk); + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + mptcp_subflow_set_scheduled(subflow, false); =20 - ret =3D __subflow_push_pending(sk, ssk, &info); - if (ret <=3D 0) { - if (ret =3D=3D -EAGAIN) - continue; - mptcp_push_release(ssk, &info); - goto out; + prev_ssk =3D ssk; + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (ssk !=3D prev_ssk) { + /* First check. If the ssk has changed since + * the last round, release prev_ssk + */ + if (prev_ssk) + mptcp_push_release(prev_ssk, &info); + + /* Need to lock the new subflow only if different + * from the previous one, otherwise we are still + * helding the relevant lock + */ + lock_sock(ssk); + } + + push_count++; + + ret =3D __subflow_push_pending(sk, ssk, &info); + if (ret <=3D 0) { + if (ret !=3D -EAGAIN || + (1 << ssk->sk_state) & + (TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSE)) + push_count--; + continue; + } + do_check_data_fin =3D true; + msk->last_snd =3D ssk; + } } - do_check_data_fin =3D true; } =20 /* at this point we held the socket lock for the last subflow we used */ if (ssk) mptcp_push_release(ssk, &info); =20 -out: /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); @@ -1616,30 +1621,52 @@ static void __mptcp_subflow_push_pending(struct soc= k *sk, struct sock *ssk, bool struct mptcp_sendmsg_info info =3D { .data_lock_held =3D true, }; + bool keep_pushing =3D true; struct sock *xmit_ssk; int copied =3D 0; =20 info.flags =3D 0; - while (mptcp_send_head(sk)) { + while (mptcp_send_head(sk) && keep_pushing) { + struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); int ret =3D 0; =20 /* check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(msk); - if (!xmit_ssk) - goto out; - if (xmit_ssk !=3D ssk) { - mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), - MPTCP_DELEGATE_SEND); + if (first) { + mptcp_subflow_set_scheduled(subflow, false); + ret =3D __subflow_push_pending(sk, ssk, &info); + first =3D false; + if (ret <=3D 0) + break; + copied +=3D ret; + msk->last_snd =3D ssk; + continue; + } + + if (mptcp_sched_get_send(msk)) goto out; + + if (READ_ONCE(subflow->scheduled)) { + mptcp_subflow_set_scheduled(subflow, false); + ret =3D __subflow_push_pending(sk, ssk, &info); + if (ret <=3D 0) + keep_pushing =3D false; + copied +=3D ret; + msk->last_snd =3D ssk; } =20 - ret =3D __subflow_push_pending(sk, ssk, &info); - first =3D false; - if (ret <=3D 0) - break; - copied +=3D ret; + mptcp_for_each_subflow(msk, subflow) { + if (READ_ONCE(subflow->scheduled)) { + xmit_ssk =3D mptcp_subflow_tcp_sock(subflow); + if (xmit_ssk !=3D ssk) { + mptcp_subflow_delegate(subflow, + MPTCP_DELEGATE_SEND); + msk->last_snd =3D xmit_ssk; + keep_pushing =3D false; + } + } + } } =20 out: diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index c4006f142f10..6428323d8c7f 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -118,6 +118,19 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) struct mptcp_subflow_context *subflow; struct mptcp_sched_data data; =20 + msk_owned_by_me(msk); + + /* the following check is moved out of mptcp_subflow_get_send */ + if (__mptcp_check_fallback(msk)) { + 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 0; + } + return -EINVAL; + } + mptcp_for_each_subflow(msk, subflow) { if (READ_ONCE(subflow->scheduled)) return 0; --=20 2.35.3 From nobody Fri Mar 29 08:03:27 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2072.outbound.protection.outlook.com [40.107.20.72]) (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 547F6194 for ; Thu, 15 Dec 2022 12:33:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S4ezn9/JVUVy8yEpdqjxE6MgvpXbT3DNpv9t9txrup1HJhmSYHkMXUTbT5kGLmNTp5twI8ngZIIVTXyvuw8T8unZLsCCsSG21Zsw8Ihwyf1h3xO7qjWJhyR3LZOoSacy4bIeXh9arGCKsMoxu/jjnPF8uTgo0pgMIkU9xeRudwZOBhvT16+wSnqNKjrH4dmqgrmH9lNAK/QDkxDreMOGqJSVE6S9QDen75fQBWoltcsqNw95yUvC5TX/r7PZ6w186PW7D6mx3YLORz2BUYRyMJjSD3OgwJ0guN1yujh7BQYMBZBzbqxpY2YK7MvT6LL8OSqP+mHjnvWSwNkCKudFbQ== 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=iwLZz92+Uz9lgR9TBv5P73MdsPnJKC2rE6IR4Q31Tvw=; b=C1qnATSxJhH82NCKKsZ6d8BY6f7b7M6XH0d4++Y2w4Gd3AR9K8InQsRVvI2eue7V4cAq8Qqb3N5JD0ZKQACJ14C7sd63GtEj+LIiyRUVi1XYFP8Q6oXwBMAbA1Q6422lx/BB5ttjqaVIc5g1ksYvKriudyLlw+iUhL7Sy9lEpt2NPcpQMDnfkhwYbvcwnHsL1cd0ZsWLCJyqNC0ajxsdqorae2LTN0IoCriCGTt1VKv9CbbLHjHPCnJPJwWleNeQfkYRY8KdaE/mEwX417AMQf6ms1X2OfZkNkPQQXQzgQdK3E5Vtogk69RXU7rNmiCeXdhPNzEvNdH7oHOtB9WIIQ== 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=iwLZz92+Uz9lgR9TBv5P73MdsPnJKC2rE6IR4Q31Tvw=; b=UzsNPjES22JOaaYe09/k687akF14+t2NaK1Mux2puW4QzT6fdKsM550Ed6bENplPofU6lMRunBp7tPxLz7e3/zupClO93h4WMNGlU8NUEwAdqyW18Cje7VP6XRC+v0cDU9q4d6yXI87dS4spmA2T1gKlKhkO4bEFHk6i/oO4Bvk+iJKIlBruzsF69cgZmUB0eLbfchRTHP/76LvL9s0smbm6B1AzBvD9o9K/P8zh9AD2bad95mhICDAF9KLynjHZLKe/DSBTlnMY8vjlZjNI3zmxheNVuuntyo+EzVRucxCeKUj+8nQUE010MbU0aETg6OZNKJZwZVzoqAYj9fRb5g== 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 AS8PR04MB8675.eurprd04.prod.outlook.com (2603:10a6:20b:42a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Thu, 15 Dec 2022 12:32:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5%6]) with mapi id 15.20.5880.019; Thu, 15 Dec 2022 12:32:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v25 3/5] mptcp: use get_retrans wrapper Date: Thu, 15 Dec 2022 20:32:41 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0017.apcprd04.prod.outlook.com (2603:1096:4:197::15) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8675:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b966318-2c15-4b3f-0c9f-08dade988025 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LaSQM5YaghEjJvTlT+j6KzH1Bq9wa6UuCWXP6mo70O9xFWlfjIPBXuagsPt2lkm4GU4GcjzyaBB671QfCW6q7KBr2pdXAxaw8Ui2WJZ04RtLrP0AwvdUhz4B7ZY4auVgGFCvd1DYYDQfWz84Qm4s6IFT4xr00pJnzGVuKzqQgf3W9vj1LjKaGtnkYmTH8A/OLftUV5DcdHEhR8s1jXhGGeAfvPSxMPpurfaEXbCvSLeH8bgardUy6zu4Mz53kdcGF3EY7jG9I0DSNNhvBQNeglH3ksQHaqhW/iVD3cReuL/YKWZwYmT/Y+SCs0V/TkcrzIkkvSMwYt6tcXBis+F0UYb1bhkRsA4I8F1qG4uN1wv8veFNZxRPiMlWdDuLQU3rDpBfY7rrXeKySHotNT5xOic4+T8GAU6c3RopWaiNUMA2+aPOJEyBqxSeRoNC5SnF1tD5FWqZUDeDv0up9FjfZyXS3o+N0puQkrbbn0WmQiwJClECOC/w0x+072qdWT+KTCOpvuqMcRBOClJ4oM2h1sCmO4RadrT0P8sggabeg/c0JZTl9UV/WiCKae4kQ8SGwOzhz0RTJNuoVIVtnWX1n8eW38C4igS/ILXXv6UxAgPQz3q9io4FCrC2Yt2CHc0Qrj+197G+Zw7bUkFGfyF2UQ== 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:(13230022)(396003)(346002)(376002)(39860400002)(366004)(136003)(451199015)(26005)(478600001)(5660300002)(6486002)(6506007)(6666004)(107886003)(38100700002)(6512007)(66946007)(6916009)(83380400001)(316002)(66476007)(4326008)(8676002)(186003)(44832011)(2616005)(36756003)(2906002)(8936002)(66556008)(86362001)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NpF7QHmzSExP1l3k/kTylO/SJNK8+zo3aAsvqR/0I9QellO4GuMBpv70F6zp?= =?us-ascii?Q?I3tkroLjGTcUuL/9Js5DPaQrVRjFpDF0nqYmSXi50EnGoACQOXR6huffGkzN?= =?us-ascii?Q?D92l8sUj8gOm5M1/o3CtykLqBU0QyvtPvqlzzvgzNoD5+k3gqD4/wUTEXRLp?= =?us-ascii?Q?Crh6NKSnqEGocZ5AZELPOWmXDMVJtRJnAOXHD/CJYRtUUCktFw2xd3cdz0pT?= =?us-ascii?Q?naaW9qw0Cvna6S9HFnhUpKeKg2hNSO4G/s69Gc82bJMshXRWCXKhxDLR6//S?= =?us-ascii?Q?ArdbtfynfOG1l7zu0GEJZAWDhD5f4IdaNxBB2S/PFSKAXPXrym7bTkEJ+8Qj?= =?us-ascii?Q?vAkRGo1zpZ7f+B27F8y8T9p//EQRrxWYkMd4lu8jAH47OK41ZYOnBfonecyA?= =?us-ascii?Q?21JCskp8ImpBlK61EZPNqY3IRyYaN1VxASgufpW88KvYOi2hqBtrsJ4tyYJs?= =?us-ascii?Q?0jKiP/ZUJE/0p6tHeCHcgI71QUKo8ZF86hsZPg5ub8G+SOU5p/QncZWOu2++?= =?us-ascii?Q?qC/uMMMW5xnncWyQ/HXdynoPwJbrIS0dO/Ukclvt1gVW86lupft3qdhLjBKW?= =?us-ascii?Q?KKiv0kaQeR2PBEUllcukdj9MsK/ISkH01sPLQkRudMMjngJl0YnxnMH82kg+?= =?us-ascii?Q?nI6AHvoLyP/A660myAzvLojnt/MK8GTVjTV/uSlydYV4dFq1H/TkTMT62qQf?= =?us-ascii?Q?xm7nHBoDTjZNTe9jg7hV9lsUVQQEa9GvoEIO33ajsNp3Nh8MPP+OL7BJ7qwd?= =?us-ascii?Q?VjRlGyEbmErvH2G1NjuGMn6aJ0dXLzKZmtd9Dshr91HMvLe+QiEszl0LZhPF?= =?us-ascii?Q?cya94OHgYJHgr30nNrNe+yhKJGLkWVVPLdH8BHjm00UJURQcSrrXMpeFoY90?= =?us-ascii?Q?cGN8sAQ6CsddjO4Q7kEZkHMO6XY4ioTd8IBfuZ2i86gI8L8CKAgSxYRQoQ7a?= =?us-ascii?Q?Wc2XzjnQEzZrlU9VJUkSXH3EMcbySXC4KOdhdo0kKQRlmhb4DmJJwwVrJNEK?= =?us-ascii?Q?l3UBjY7AevZFFj9KbhTAkkIv0g9+wkykJAmaDCj1NuJB293XFNbZamNAyhhp?= =?us-ascii?Q?CtYCCGi2DqAW5H6RvcFPxf1ICbRD4+jTS6As8EQw76HZ9uni0mf5dGGcP8eL?= =?us-ascii?Q?IYgr5UOzo02N7dq0338r4AI42SODhHtBqtP64Q8OdYkFPoTnIBpWqY3qp4i/?= =?us-ascii?Q?RG1Llr6taD6O+a4u1ODC2SLYoI7r5ZS+BQZ+K1RYYo9v+A8LQ0zE5Zl1qQO+?= =?us-ascii?Q?oR3oruNtxjCjkNnVamU3nbajvKbpHcPPEiQlRhsr8lule+DDFL4QQy8mtSUh?= =?us-ascii?Q?s6JO+2Mum4qySc2sa8d99JEOCiEGea3pk8BYfyZOZHPBzp6x7ZkGdrvams5G?= =?us-ascii?Q?vuV0FPI3CJUfPNL6O81xD47quPKZ7rSVDxna0+U7z8IaRmmITy/X025udowh?= =?us-ascii?Q?iWOMgR9mCRXzAXAYn0NGdUUTN5cvFdYabBiGUcJKSLrYe/5qXaA9aXUjruZw?= =?us-ascii?Q?fx56h0zaM2msN1acGdSrDWL1Yu1suF9WFgdvEEgeQLfOO2O9L9crJdZ7sBC9?= =?us-ascii?Q?ud/kONL0SnEWZN9U6cqtgcvkj9I3uo/7NwHk7a3sDYJxu1k63aI6joguN1VG?= =?us-ascii?Q?5g=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b966318-2c15-4b3f-0c9f-08dade988025 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2022 12:32:59.8902 (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: b/UZfQZ0AwIYoXz+49Z6dorlYFJlupFb4ICeRn7ox5cPuM/wzpSW9sLjMEtzjO2dFutfJ70VmrlGwPmWzr0DBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8675 Content-Type: text/plain; charset="utf-8" This patch adds the multiple subflows support for __mptcp_retrans(). Use get_retrans() wrapper instead of mptcp_subflow_get_retrans() in it. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler, use them to send data. Move sock_owned_by_me() check and fallback check into get_retrans() wrapper from mptcp_subflow_get_retrans(). Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 66 +++++++++++++++++++++++++------------------- net/mptcp/sched.c | 6 ++++ 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 57967438e70f..91b84321885c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2249,11 +2249,6 @@ struct sock *mptcp_subflow_get_retrans(struct mptcp_= sock *msk) struct mptcp_subflow_context *subflow; int min_stale_count =3D INT_MAX; =20 - msk_owned_by_me(msk); - - if (__mptcp_check_fallback(msk)) - return NULL; - mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); =20 @@ -2523,16 +2518,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)) { @@ -2551,31 +2547,45 @@ 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; + mptcp_subflow_set_scheduled(subflow, false); =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); - } + ssk =3D mptcp_subflow_tcp_sock(subflow); =20 - release_sock(ssk); + 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); + } + + release_sock(ssk); + + msk->last_snd =3D ssk; + } + } + dfrag->already_sent =3D max(dfrag->already_sent, len); =20 reset_timer: mptcp_check_and_set_pending(sk); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 6428323d8c7f..c7c167e48d72 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -156,6 +156,12 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) struct mptcp_subflow_context *subflow; struct mptcp_sched_data data; =20 + msk_owned_by_me(msk); + + /* the following check is moved out of mptcp_subflow_get_retrans */ + if (__mptcp_check_fallback(msk)) + return -EINVAL; + mptcp_for_each_subflow(msk, subflow) { if (READ_ONCE(subflow->scheduled)) return 0; --=20 2.35.3 From nobody Fri Mar 29 08:03:27 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2049.outbound.protection.outlook.com [40.107.20.49]) (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 784A0194 for ; Thu, 15 Dec 2022 12:33:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EXxO62HpDO1QhEJy6vnsSL1iTgCmaJ/57pF4XyE2eNPwGoMuhagnZhfD+V3afXxjnXIH/ejdAjpinNQ0mErfdXcIX0X3hZ7GkHMrnz6Q1EL12WhkKRaZ2ZYsOu4ASlxgEo9WSSDjhiJnBpV4uzpgDm7MwOdvGDQFw6rwlQkDRTcJT/IhcsqJlfodyApbMKQ0CfjtT2+AA65mfRu+jDGmuTrA6uISFI5Hez1uqQ8ntgZ/LubK6MEIJ2Keg70E6smLd+nS2njqu1hM6pR1BkNzgVXuh4t5X0iQiLVMa2W1/iGQdFKu62HUQ2EBKsdwT2dVYx9AEqTIah5s7rMTo0CGQA== 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=g3LrEKZXEKHwgr4y9KFxK+dy9jKsU2FL2knK+B9lOYg=; b=dQ3dLgBU9mMo2/PUKzUROZbCNH1yoNZn9/mMoCaOVz3mLUqfb9CyL/lj9mtPFgoCOelxV5zOi93/iut065dmYyFOgoliJ4i4A/yw1Y7+KEi/R7Vdu4MoCqjcpNaVL3MIcuUAzvTSdjVzjB5MO3kPwN4x3XjTgTeygU9j2VEd8biGhQgoqnLPcfPN0NAU4x8bBulFmz0Xq97OU/UxsgSigK1l9sytXo1WqOsHR/FI1mqpVd9vPGGr8dxzK4QRGRG/06US37mn/NwKOEKju1mSVH07euCSUN+A4ybXDeku005julddsmS9MOC1WG0nHf6GNHprjvEkBZWvgPBegrd9yA== 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=g3LrEKZXEKHwgr4y9KFxK+dy9jKsU2FL2knK+B9lOYg=; b=cGQ0nX3u9M/uuygcYmBI+9IGSx55ft33YXA0wzjz027jfhW8BKC59yyKIbVzA+09xUvV15/i+zvd6oCSnTFydytL0bRtkZaHLOTWtCJs5J9s5gKFhiqdh8zYejPsGRNP2oR57i4q0SBCKI8+4pL1JF/xbyH8j1uWljaKE0dqJPSQMLlEmKikxmhC878XuGBYC+XAIXjxerAL7gMLJ59Ttk/7Epv9Xl/w62JRMS7qwBR18D+tU8CQPu0bS3h1NEaedfTGr8Kw6EbyAzsh3WSUwHNvzxEWglptPtunXvkEPXQ6vt+nCLL1zbXXvoj/E9vX+lGMlodXX+oQ2WpCZpErfQ== 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 AS8PR04MB8675.eurprd04.prod.outlook.com (2603:10a6:20b:42a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Thu, 15 Dec 2022 12:33:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5%6]) with mapi id 15.20.5880.019; Thu, 15 Dec 2022 12:33:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v25 4/5] selftests/bpf: Add bpf_red scheduler Date: Thu, 15 Dec 2022 20:32:42 +0800 Message-Id: <0fb1835641c64be23fa9840fe1164418fb1fd338.1671107241.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0007.apcprd04.prod.outlook.com (2603:1096:4:197::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8675:EE_ X-MS-Office365-Filtering-Correlation-Id: 56da7b7f-2641-4f5f-c75b-08dade988423 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7TnDpTEbAiE8LATdX1Q7bFf7nGIxg2aX5NJtkZP5c2NPRizUwIl6pYbLhR59vqL+Tq2t2GZRzM7tgGaCRPTXPErwqgCxwUC7iLuVMR/lB2wU9yuIwNqIjjDRKTqFaezgASmnWZkD8+4olC6J5Hwy174CDZFwmYppm/z77CcZut7U+QjAp74ELqX6VQGlvpKMJV9YqhqiK0pFTt2f99fixi/nKnPI7eABoxtSWgs29Yf1klsbHUbtRK07eCMNQ2aJpewsZHX7NmJvtTWKwp3bpeN1bFN09z4eEW4KMK4bCCMCgiSedX2P57NkyHdDtDRhVpNghJdTD0rhjINQOFRk5xh3Cm6GVwKfRaKjIIvzdxNYev+dbSax0hbSgzsDvyuIJgG3/G9jH6KVBnRCR+45iF/QTqhM/NHcsEJ8LVoplkpMRblx8vnf2v8B9TBvh1bqhNkhhBveSmwFzjIF7OjRfhyMMbmCn8f5DXiF8wdwr8a5nh75WEI0tmeP9mhx/LFzZiRqLwgXVxxBBx9WLMLMrl6813DbkQ7TeHRl7cDZx9fHbxLMU9EhDof1wpbJBJqN230xuvRusAE6fc5DeJs7IohVqwa1ZJCigcox9vD9Wo5uofqPakjVG1SUGXSSGWNbBappA1hEB8YVjo9LS7sNfg== 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:(13230022)(396003)(346002)(376002)(39860400002)(366004)(136003)(451199015)(26005)(478600001)(5660300002)(6486002)(6506007)(6666004)(107886003)(38100700002)(6512007)(66946007)(6916009)(316002)(66476007)(4326008)(8676002)(186003)(44832011)(2616005)(36756003)(2906002)(8936002)(66556008)(86362001)(41300700001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OwNsHXwhZJ8SFL+cY/BIp7cGi3dL2pH2MAZ70ukIGcmK87R3mRIM9Wed20zu?= =?us-ascii?Q?L8lY45mh9H1HnpT9QIzUKo5zuQ6cL21Ac2jxM7VfWpFX9VhR5DkxnUjmzYfo?= =?us-ascii?Q?yh5UPPmJ3R4HFSTT9+v7KsS0dZ0uy77QMgflfcWHUGsen72HQkbgEhF+cHXy?= =?us-ascii?Q?vAPtKWHJ8Dxba/uw8bsADy1lCzYSTDgnXxfwt9r3T/t/FFHr+zqYfrfmrXW2?= =?us-ascii?Q?iAIarh03wWaF83mRlElxmszEtIiokk8eL9K3Fsyu0tn8QuDgrydZqDWkq6fp?= =?us-ascii?Q?Tqu+svxUGFrtNNAk5hzBDyULOOxcZw0YypfDxua9UP6Hxp++cNSmtxG1t7yY?= =?us-ascii?Q?rsBTa6nXyCsiX6jb9y176sOE6wWQfvwZnr11mgf+VNH2nAsPuUkN85rU1Oq7?= =?us-ascii?Q?3cLnP/D73AtjB4+WelveOCgBj0t4aZ415pubyheXbrsDt0sGTvuZx+mhttDD?= =?us-ascii?Q?MszjmQHsLZ6oLxOsXF6kL9CY9holiTYj1/mg8qDFXvGlcEQ7qxAFiz6+zvNm?= =?us-ascii?Q?UpzdyWPj0IRfqc/zlkj1ZLhXH10/yDhzQXOp+3tuxJaG+K4uYxax8SuKwpSk?= =?us-ascii?Q?4eztBOs/eGxP5izOKOGDYNClrl4nnD0vrd0etF2sEIT/6R+AVURiGJSsGYDg?= =?us-ascii?Q?keFCAYp/nx58LurygoiP0gUtwgTPkM+4xL9ziSCH54cydYcq3gSnlyD5pbgu?= =?us-ascii?Q?oXBZS6YhBB+CrNRvu6AElHAZH7bqZa4J4nzcjEElzQmDbDqAnyu2YmSGxMcQ?= =?us-ascii?Q?B9ynC3crJpZechoYjk95RU1ro4fIxr9kTk0fcUxRz+iovXV4qBz/4sOg7tu1?= =?us-ascii?Q?1qaaMLD3Y7XnpdE+tbvNshj7C0WPSL4cqrYq18C3ZU0SP7CKtvNRACG8W1Kc?= =?us-ascii?Q?Xnel6U5W91/Y62gxMvpB2x9QM33tFc85ZrdecF99Q+ph3/71s5p/epxv2crW?= =?us-ascii?Q?eKDMS9Ump++0lYxsbmBFcN9i6FR5yQDgugPEFarvN9Fp/FJysWnrjkX7QKH4?= =?us-ascii?Q?NZX0Jh/IXCTibLxglsQj17nLDQksZuZmAMJxEIQJBA3PnnFue1Ztz+MYkWky?= =?us-ascii?Q?0sqixyoMToo+voFGvyNynOMqIbFcdh6M58mDKRNjM4NMqpPuFqalX1EMucif?= =?us-ascii?Q?vvnEtKFw4pXNwrkmpjsdRYSBYqnXk9tq8dIPgsLjiDbsnuzt+kLZlvwpgL3U?= =?us-ascii?Q?94riKach+JzmwI84923jcoaUswigRKjndenL5Vmb0Szb5mMjmwWTrNpayV5z?= =?us-ascii?Q?0VTu7sLN6t7BKpZqx2/DX9uU4Z4u7G/lF3JMLBsciSHTrd4QvXq0HA2khKYg?= =?us-ascii?Q?gomgZN/sQCuYSVWCVnIijPXDooGN14A6j7TVzmQK1liMKwNXlIdK0+BSu6wG?= =?us-ascii?Q?FCq8cXXp1n//VZXariIw8ELsOZ9/awc2WM76a3VFTcFo8yYTKj1zs09w7NfA?= =?us-ascii?Q?NprCV3fekzSbICIKWfcHPCwGgLwCmMjTOmC7aAJJAw6cpB+T6QZOJbmfJy0b?= =?us-ascii?Q?b1rN+8rD7/HRk+A0a/sVShx1Gccgfc5qgZ65fZrycOnrlRiNb6Si+kPAXyPF?= =?us-ascii?Q?ohgUd01wz0kAjf396ymS0fhpfaG+ZdPXXlLfJwighaTKV51tLNmVIMVs/bLd?= =?us-ascii?Q?Bw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56da7b7f-2641-4f5f-c75b-08dade988423 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2022 12:33:06.0928 (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: 9HCSpFSGxEVnij/ycdoWc8WtaNiUpT57P+0YuD0Q7dNKDgiAHKx32A20BjjvKsxfUaYz1BF1v2DMFLBGWT0hRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8675 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 Reviewed-by: Mat Martineau --- .../selftests/bpf/progs/mptcp_bpf_red.c | 45 +++++++++++++++++++ 1 file changed, 45 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..30dd6f521b7f --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -0,0 +1,45 @@ +// 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_data_init, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +int 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); + } + + return 0; +} + +SEC(".struct_ops") +struct mptcp_sched_ops red =3D { + .init =3D (void *)mptcp_sched_red_init, + .release =3D (void *)mptcp_sched_red_release, + .data_init =3D (void *)bpf_red_data_init, + .get_subflow =3D (void *)bpf_red_get_subflow, + .name =3D "bpf_red", +}; --=20 2.35.3 From nobody Fri Mar 29 08:03:27 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2045.outbound.protection.outlook.com [40.107.7.45]) (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 B56A7194 for ; Thu, 15 Dec 2022 12:33:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X3IvER3hidClqzXg6H9AS/N/CCs+xRgMau3HR0fcRrTvr19EEQRnKJd4xpLuyCkH03BqbiySfGbsl44fMTyFTwq/Gmnh4MXJMzSmpAoNoC3Zoj3ZWUmyzEQ3wlrB6RjcbVDYW8BBmS5MD27etO79DbwtId4QTh/+q8rL7TSkRQeYGpnGAzrfE/eiVtEdPClzRzd7GWO9tGPtTJrTDe40BwekKgWx1RK/EdxDF0kLst3IAG6CgK4syzrgVozrhNYaNNiyiz42ubsR72w29/2efkYktu0qpkWAxmN61VPksqO/229JiV4ENGMgKZIx3wM2B3YA9Z41n1FZjHKbh5OlRw== 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=HhyoJsi+EFKNwD4jaGtnFksegUwUO4Z8tLf9FWgCFC8N0GGJDEL72OfQRKBDDPdeqKXzP6SZwOVEHNgICQSG+1jKE9k8gpaoqrMlzCVxVGL0E4Pox0FcFJDk0YOe3ElvtUVWyAtKyA+UZ7iQ/yW4vz/eK2sRwq0muju1SKPJrdRJpk+azchgeRagYh2cJymRx3LU7lVudm7O+cpTPtMNxd0PmDC04k6xjnjzmdJ5m8KmQlX1COuHmmozJtM5EjLM/7upp6zsGx9ZnIwic1ZkwR8nqMeGlftlP7nu4Ukw7S64dybuA245QPZ0ak3pZ338rN/q76FiyKTkYKpSue55NQ== 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=ph7N35xUG5Nvm/ShNhp3H14lChhOPSu1YqxNQK4y+khV7aUJFIzpY70UVG9alDj0c19jPzt6YgQ8NWEF8VbywO7nveXSA5fUXLxqdsj2qWnaJsMC7ghly03kB52cEljeLabzREtMrAwiaCoF5ecORVZSBnovHbIIAs1iE1tSKurImiZ+Yj4rzAbwR884Nz5pvUvQQeYrpmhBAb3Ao8nhnVL8i59V2tMqbE6ROooh0Pmk/kjzmjCIKNcYiZdwEFBWG9JvMUh28v7Z88Rn8uq1+EAfVt0rVOZIYmzh7bu43Zg3PjWVR3lRJey90BbtAIubd2tT2qxE0+rOIG1pB9FH8A== 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 PAXPR04MB8814.eurprd04.prod.outlook.com (2603:10a6:102:20d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.11; Thu, 15 Dec 2022 12:33:12 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::4c71:cec1:22de:41b5%6]) with mapi id 15.20.5880.019; Thu, 15 Dec 2022 12:33:11 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v25 5/5] selftests/bpf: Add bpf_red test Date: Thu, 15 Dec 2022 20:32:43 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0010.apcprd04.prod.outlook.com (2603:1096:4:197::11) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB8814:EE_ X-MS-Office365-Filtering-Correlation-Id: 14d98a80-2c59-40d9-c5df-08dade9887a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IXL6SwJkHvlzhcLP1J5CFJ+R+9KlciJrKSFWMODwxc+CE0npLccas/vyb7zSj6kNo5IFGxo0m6Ba80GoRawhFN8bwAEBLG12e63uokun+OqysIl6ugUo0JkFbl3z0CNHvKbOS87N2oeA+pKX2drBVAYc0592WIPQr9BBNWt2VvkHpNhQRmk89LkyksHRu8dJiOX4FWgKr9Wr2XUmQPdi2UE3nPVbHTbcFmyTqK6M4r9HAZnobVJrHHN68n6wB8RtzLcr5fcS8+wGgaWm5BATcg7sunCmlKdroXaYq44T7flDVaOI5pT38srGv6/Vwlu4dTv2lrcKa/H7FLLuCJtLbxN2IoJlmGgwu202Gin4Ubev6+7Bl9KyP2pJzmOMM89C+shwTR/Gh1N5fKEOs2c9lT5ZOVEkpypD32EiZS5ucZGL5vaKdg2rqRxHICl1MydAzq91UfKBmSKtGa8LgDzS6fbYlO8G1IzaaQDkeKZa8wOJSa1L2WqWIUXhxA4O8TkwSiJapahCB0KPXFzQ5k1RxZ++CQd3LovOI0R65avNz7+VShWgXMc6BnysnTl4vWEaSgnn1ifbCeiANDW27RCgExvFqjFqiq71PF1J+i8xqvmHG58vCxQlQM7C3yu22WjG 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:(13230022)(396003)(39860400002)(346002)(136003)(376002)(366004)(451199015)(478600001)(36756003)(6486002)(107886003)(6506007)(2616005)(6666004)(2906002)(44832011)(86362001)(6916009)(41300700001)(186003)(6512007)(4326008)(83380400001)(66946007)(8676002)(26005)(66556008)(66476007)(316002)(38100700002)(8936002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bk/x1zc0hSWL7wJ1L/sgQdfPAf0T+y18W+SFe91jAIlYOfTnUGqzrXsdM+sg?= =?us-ascii?Q?UHOS2eCUshdSrtg2KDdENY/t+EcR3lNcTlPoldAo9nvCWGFQ8x+a66cqyv5X?= =?us-ascii?Q?7IWbc46ZXbxJ2PxLCid4RZbO5F0LCXsxgB1PhwPJdcIOGbwsBojVM+N21yuS?= =?us-ascii?Q?rPfKZ06XRth1DyMB/1lF6VvMjYaG3ObtJJLQRS4DMCuR7datWYcb3PVZwsQa?= =?us-ascii?Q?eAaM0I0zzyAMr8pRxHidyWPMC3xinxgZ4LcZNExY6H8oibsP2XWTG2lHv8S+?= =?us-ascii?Q?9ZLZO8g+T6GuQSbOFK7SMU1Xm1O46/0HX56D6KdciCvPNYBj0dZBBmczN3//?= =?us-ascii?Q?t4UkMWg+Xi4CqyP6186Ukhx8iYdQFDySNbMyA2/SAOOEFqX2EfmxkBM4qfRb?= =?us-ascii?Q?TqLlpAR0rlviv60O09TyFkTlzf+vp3EPNppwjQZeYikJ6x2ZJT63QS2rCDw7?= =?us-ascii?Q?6ErVn8WbUcqKYOTHhYqNH/2YCcCoDFz5H9PGew5/X4rZgQriDg80AWfKXXXI?= =?us-ascii?Q?Ptsb4cA4U9PwUJ2FtuEq3K9k6Of9Ori8f1DbtdhYMQ4CZ98AdvwwXcV7lWF9?= =?us-ascii?Q?WlMGYWsqUubZGzXFOft3yMJRZenztB6br57EFWnogGLyKYyuepuSrtpXEbMA?= =?us-ascii?Q?BgkxY3f84E4iaHe52DiH3NqVFrKsybofWxyg3ikTV+nEycB2Ow4ZMszSPCK2?= =?us-ascii?Q?BDF4hq8Iwl7PEKMdq3KHaBzwTIY1SKfIw73hk75Q0GqSVa535wcUnnDQ8ADW?= =?us-ascii?Q?m7wzfBEpUf4dBHCTlzyV4FFAawiuK0X6OHINLV/6+habb7XDmco1gcPl+TOY?= =?us-ascii?Q?uYGkwB3viwDeb4yI2iwtXEB3LXlDnvIcqapZpDIZplNKUM1my0htqhsE7XL2?= =?us-ascii?Q?lPK3vTmDWSCeWwcs0Cx5ua39LJHWJzA6EjNGeojxgmw6k1ZXwTzv7gfT8mLB?= =?us-ascii?Q?2g79aq+UqHcuPFDLrdwOTwXs2IhMPWPlW0FI/KOmNuYc2roflYVdMOla4M1P?= =?us-ascii?Q?D1FUIb5ifECckkXJu+YKA1EcjKZpThU538bEbvHjYrmErUUnTyvk1QAA15k1?= =?us-ascii?Q?AzROxmTo09LZARRzms+xVcHpUDktQOMPM41YgGmD1jnYHox+3+o6Akd3td4K?= =?us-ascii?Q?5A1aO849rWxI1ciWfRbG+nSX9OY3NmA1ZRDFrkdDC0McE9ipocynm7tXYlc+?= =?us-ascii?Q?JHMRYG/iq6Cnt589oz78PBtGlu/3x8ayjjx4lmcWxtGuVlhYdBbSoYLBa8+Y?= =?us-ascii?Q?zCNbB23dnBjno9t6V9fzoT0RWINd5jKRcC/9tnGBY6zL6Z2dGSxd48dEHfoX?= =?us-ascii?Q?KRyilbalKoUjr+F4L00LiKmV4pTH2ARXnUDVDBkxJIkSuZAD5uKgv0lrhqH3?= =?us-ascii?Q?QxaEyKM1r5yO+tRhfoatm07UhsxVJY/qZA2FCldGeOsqIbeZZfvPF9mq7jQw?= =?us-ascii?Q?Gvty6Umrk1oRyrYCbQYs804Fd+dDmOqUGIZWKZtZuXCzo4BNEWwlblETTHT1?= =?us-ascii?Q?gaXDiI/CXUdY6IffLdMbG8OFdS0bDKZ9H4BYgDPEuiFj/0LflhLnmPAI7gmw?= =?us-ascii?Q?7C3ozSZkyVSwObIP2yesqJrGF5AIVLLgJBVkE9BRuw27YlTj9S1sjlnBntvm?= =?us-ascii?Q?xQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14d98a80-2c59-40d9-c5df-08dade9887a1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2022 12:33:11.9205 (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: 7jean1xAewz5yiLCLJA0uS02p9/X4ntzZVFIe/mrfAEd1IkqsQs4JIFbXpoJ+h0KKB7Gtyr1TAFJHLwC5nj2IQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8814 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 Reviewed-by: Mat Martineau --- .../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