From nobody Tue May 21 22:34:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2067.outbound.protection.outlook.com [40.107.20.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BDF47FA for ; Tue, 27 Jun 2023 01:07:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cG1A/1mCumCaWnuFskNukIQ3t/FlKgm/HDeESHDpaArxWNC5d5Q1d3w1+Li0gczKEfZfUEmGPu/GkbwWXB7EYlUtE5oMwnojFPbH/upA6QK4ilfSE69Ap8H+dHEo6UNc6Uxnx7rj7w/IGyVvZ5tpoFydw7oI0oQUfov3+f8a5D1SbIECxW38z88gbEZf4fVR5WDAaeatVMsd2J8NNpJGuALJ3Z3+AMGuUxpLlLW5KO1wqhd9cTm8r7u8cZIj1tL3ZzjLyuN3YqKVBC4sFZq8pFgBWmwYiTQJUwjifkSEg8oXPejMlzP+2GXWLqOITSO74rGszKyDBTceYvq96xmw/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oeApqQnToOXcd/HPMxQTIZreDZRn6iB/x5WGYHzeERg=; b=cZjiycOYLgg3ST9k1ieYCrD+LX5u3DXtAGE//ZRvC5slv8I5C9M7NC24qqPyJxfvY/AaK/5A3Y7pLvUXS87CBotesn4dlSbclG0rIYpO0BHeU3COtUOyj376fh0m/DHWYlIWZ4hpCCqiZ11xVcBWqJXgXhC5H84oOC/mIpgGKDa6z3IuM8eBzwFILJOMdZXRyxGLWr+e737dsXEVxN0RdGu14vwSxHm/QCLSPabnf8jV/UH/CHIg0vmh6PR4L63GYgoxVIXySnPVm6w83oMDu7RsyQ/DpcQvPVEhh6TXsxFC0PcT07k/kQmvpbTpUpfXBsYb8zFLG2qj5z2Vk6ZXyg== 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=oeApqQnToOXcd/HPMxQTIZreDZRn6iB/x5WGYHzeERg=; b=3iBcHekN/ARrj2jwaNjSxX6T2jnqv3gWlEJjXR0gjoIakKBkAtqPLQryS4eJzq58+oiXwDH7e9BF9Za1x/lDB0/5Ik4612kWFTJEZY+Xz5T8aCkQ6nsJq9hmZ29/j4tqtFyo5Wvu+LQPJDMqWG04SbjMCfi4LMCP2fa7fx0yKM+cn7K6cbIfYyFF5L2T1bTNQ6xNseLrHMkYYF9MQI2+hkKvqlwFEMh97Nry4EXMXMgJVLounewNKwPqQK3YhlRVzJINSAQu4vnJvEt3aCLlaYqFmSgbRwbWA4/eBtov0Hk75SySKKhitmhKkDq26wLeLRC6h2+3JEU/h8bxSFaLCg== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:07:05 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:07:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 01/11] Squash to "mptcp: drop last_snd and MPTCP_RESET_SCHEDULER" Date: Tue, 27 Jun 2023 09:06:44 +0800 Message-Id: <3b024e4191dfbe2508090eb15dc7966a0827d890.1687827857.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:195::20) 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_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: 8bcc9450-d59b-4c0d-8e7d-08db76aad290 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zbQkf+wBzbi1x3xrhHa1uaBifPdiyMWYstTZY07VUllMjdOVKBKHq16qC16l7IkRGner41i1nuCzELOlmpWhC627MgDIC0QCtZ0XYKuwZi7sDtym9b+qserFpan5fBhOvWhQ/USkrP2+aRgT+sEjigcKbkeQbcNa0O0aaA+98wYBy31UY65ikaC+Ty0VQ0fFL2uev3ujXR1LzpLPSK9GJTKCn/v0S23UKy3aWHK8J3lbV+Qx1UxDLNh9SdNi+v5SYcmcbLBNhI0Qfx7n5bY1kn1XaMEC57TYmPOEmnP3As8uRght0kzqNnp3r0MUjoNO558VmZI2gev0KQF2tsYf4t/VbpB6AxZcRUscrs6wn6p0RPW/ceFiwPo6d7INw5yB86Dr+595PZTKLgmlJL9Y5S6WT/LuREeIlQkjlvi/mWtyePe6bNQeGz63ZoFRLIXkq+C4SYscLHFcj/uFhWGx2ExoG42tWP/FN6+zlzROj4EpA3Y+9NxsjOYI7fM5BKcdWRWr9AywbqluA9UgQRLeLxbS+Fqioa42xEKzNDU+qBGL1z//6CkcgHhYpWBHDxpk 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(83380400001)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nzpeFN929iZ/QxAp2EQz/6dLPUwGoPtuIZVy7jspuLMCMAtXQ8eCdWCCcE3z?= =?us-ascii?Q?yQR0G9BsQq4+p5JF8wOebrYA6WnW3yKpfM0qe1279nxQZPELB3ZVBfpRSQMG?= =?us-ascii?Q?nwd3TQHQW4Z/OvOmMEI6m9brXTp0RooGlNbmQ9+NSTxEgnHrMxSqrc7NOFK0?= =?us-ascii?Q?QRbc/mSBBIbYzLI1B8BPz6kjwtEu9fGZ20+4uzsIvQpA+SWKI8q1CsNFFA9O?= =?us-ascii?Q?QwXcu898Dz896yjQzPJOq2R9nM6OOHqHJuoMxH1lUpOx2LYfO7VSnJAjbxbN?= =?us-ascii?Q?M3JLevzrzmeHx0M0+UwYRIPECNBWPceEjDEk0JN32tZcSkHJ5N3l5uNeikUE?= =?us-ascii?Q?1ujF5HtZStmKlAp5IESOCHliUybg4CemctH+hQhoxB8cPHSbllItfx550ufu?= =?us-ascii?Q?9E9N92l5y+IoJupKuWfqLfe1ERjjSkF6Gi8l8AJRQpPFLJ+BdwL/upR2tTNY?= =?us-ascii?Q?daBdJghO4YnbKMp3fpjZXWKa46WS7XkOdj9mL+tqfx5NqhTYk3QC0/qXHJg+?= =?us-ascii?Q?0M7W1fuPskG+/6Po4tlk83FRkUTbTPMduXsVJ3mY3CYm76SCwV8XWLTjWsUw?= =?us-ascii?Q?ltw3NjvxrfAlv9AQRR33RNFEV/tfcfueHo2AUtm1CbXg9Pg7BljO2k4QqylV?= =?us-ascii?Q?B6Wt92XILVfiscQiLXOz8iAly0f4nlFjMBokqGwKT+i2LOp5mSJHNQ6/uYd3?= =?us-ascii?Q?B2T4uEwyKmayVXUkA2JLemHokY1RqgrWnhYWZMgIBEABJumNOhUdz0hz6VX4?= =?us-ascii?Q?j6o5yguSaECeMOHoSP2uhJVhRn/gpuW7iZMF9w1xHI2pqN1cBOZU91w/l150?= =?us-ascii?Q?IpLQE9PEPUWaDkohpYQVfgJ7kb45khXiHFEzBgGwQezbu/1S72ViuSh68fn9?= =?us-ascii?Q?+FBC4R/ZBwIbPU+ulztO2SEzsLsBipTYrb+bYaZGpzbTY+bmNogKDSN+FP1z?= =?us-ascii?Q?laRXeyBUSS46/dRgWexOjNSCVuz9vZpTzLeQjTf/IZav533S+PBqTykPdzNn?= =?us-ascii?Q?8er7ds8feXsikbPAkhwrN1yXv1LhM+CKgVvHd+GaU3d9b9wmXTsN3XRAEL9L?= =?us-ascii?Q?3BKK2+adjWSWHgw3J8ocBQfIb5owSVBD73TP7pGeRmEGZTNTfBPfIsQ99pDX?= =?us-ascii?Q?QcdvFck6eoyLl/ImsFEmgcv46skq4xVtqgdYy9/Ux5+iFsjcbu6pqdK6SD0Y?= =?us-ascii?Q?HelVMaFEyaHzCV2FLzS/GDu1rF0qmDJ/v4G4O7D94hBJ19/P1/xRb8mMtDSl?= =?us-ascii?Q?1e4l13LzBAyRgpEuAb9yAI1fPobSMMmeE9siI+9Ll3JHIh64paWTXLtorfy8?= =?us-ascii?Q?NgH9jeBCqhVVhuaZC9cGnbV4GPf5gTMNe3KIQRS2CT78DVAecL128hBnywPJ?= =?us-ascii?Q?0HNeE50ID3Iayw3KdLAoerUeBGXb+ox6P6d7/PyeBLLGbglwZlJIVsxjwabb?= =?us-ascii?Q?6MX7pLydOiJZYZwLAS5kqhec19/udiH6qhHizzjAXye5Vi3ekHrwsOxc+IW5?= =?us-ascii?Q?V8Vt/3It5JdEoRWG876z4QB9PwM1WDUjLVcAxwZBYVm/RqbhR/HfU1in6PWT?= =?us-ascii?Q?U8thkxILW7+58qQaqqNne65koSymDOnOn9EYv2Mc?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bcc9450-d59b-4c0d-8e7d-08db76aad290 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:07:05.8389 (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: WoHQBK2fNqu2bso1o4KZpyZoSvUeUAKC2wWcqqXtRnzA9EDz0vfFXeDubKZEvC63IcNo2sSfL3HrsX3qlj41og== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" Drop all last_snd. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 9 --------- net/mptcp/protocol.h | 1 - 2 files changed, 10 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index aad21e0bf536..3ae0b94d25c0 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1573,7 +1573,6 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) continue; } do_check_data_fin =3D true; - msk->last_snd =3D ssk; } } } @@ -1614,7 +1613,6 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool if (ret <=3D 0) break; copied +=3D ret; - msk->last_snd =3D ssk; continue; } =20 @@ -1627,7 +1625,6 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk, bool if (ret <=3D 0) keep_pushing =3D false; copied +=3D ret; - msk->last_snd =3D ssk; } =20 mptcp_for_each_subflow(msk, subflow) { @@ -2410,9 +2407,6 @@ static void __mptcp_close_ssk(struct sock *sk, struct= sock *ssk, WRITE_ONCE(msk->first, NULL); =20 out: - if (ssk =3D=3D msk->last_snd) - msk->last_snd =3D NULL; - if (need_push) __mptcp_push_pending(sk, 0); } @@ -2592,8 +2586,6 @@ static void __mptcp_retrans(struct sock *sk) } =20 release_sock(ssk); - - msk->last_snd =3D ssk; } } =20 @@ -3104,7 +3096,6 @@ static int mptcp_disconnect(struct sock *sk, int flag= s) * subflow */ mptcp_destroy_common(msk, MPTCP_CF_FASTCLOSE); - msk->last_snd =3D NULL; WRITE_ONCE(msk->flags, 0); msk->cb_flags =3D 0; msk->push_pending =3D 0; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index e9ca30189731..8c9b2a03dc94 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -268,7 +268,6 @@ struct mptcp_sock { u64 rcv_data_fin_seq; u64 bytes_retrans; int rmem_fwd_alloc; - struct sock *last_snd; int snd_burst; int old_wspace; u64 recovery_snd_nxt; /* in recovery mode accept up to this seq; --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2046.outbound.protection.outlook.com [40.107.20.46]) (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 8E8867FA for ; Tue, 27 Jun 2023 01:07:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EB4cf5g9CM7KldsOVaHrZ9UfQuH4hb6TkHfVdj7zjiE5UWgZn3ZQN3SuF40o8cSEkRZcD6JeXzfUWwXX/RDiLFRqT3S/gbIeCwHait1nMMxVZnvnk259u0qUEJXCZhsimA+P9/6arCklQxnFZPZGVr/IQ1ar/HfJqAC1RZXiS0yH2crqSHsrpoEXzRpuQQZrOo3ZM8bo329aFo9V9i3lgemMHvNDtjaj/B6D5W4FHjlgXHdrEJnSb96glg473fNDqnVOmP3fVWhZeWpMe+puEUc71CWduNX0+vJ0CH1ePnNmxTygqwYCyJ9IHQPQ+Tviv6im0PbZoz3lawDpQ8I26Q== 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=lFHYA/XTHN9uqzS/2yBq+enG0Zn6YuoFrwp/K4mk8Io=; b=XG9Wrt3sOKxDzliFOvSWJc3vmt3YwegYOkjFLd22zTyDIwz2qgR/oZ500qXHf4UQn6raBKYuzACjHzpQ0+KCViA/CIszdt42G2S2EXO3iUz9S5etj6NJYjx/ThOse9dTGFNQrrhCff/UyJC2F1rW+yb8RnUuujplSkO9RNJ99leHj0VIKjrh2GfeHh6kqFPSIjNizeZm+D8FrKvL5XX6a/0RC07Ggqv+xrjDqWa+WOAiIo7Ro26taSI/ybzokpgfoJ40ztFPHXQdyd8XlSzEaAE9Sy8D5Rtkd9G01W+9bOR85s7qNqCekSVIV5hLjj56qqhfEJcf+YuyXZijUmTpEw== 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=lFHYA/XTHN9uqzS/2yBq+enG0Zn6YuoFrwp/K4mk8Io=; b=VxjIisE0kVoWa4uAJUQDFENxGmR8q5obwgky6aEl7sWP9DgM6BIig9LDZSK0KGxLcxh3x4XL4bto74gbAg8q/XAJxlh0Rg8KjNvyE6ujAEOiM67Rk2vjnIMbluiyCz1aT+vr/G1ePMHdSDVa+xXT5SDYdtNNAfJ3KcNNpELZ+42isYl3c0Crkydt6DS5cVZ22QcW4KA1pHaVHYLAHelmts29BVwuorZIJ5Ug8hdyLQJdweE7StMRYE1cHZ1PwOBi5TsMYu5D7M2j2UgYAzXWEzsyfqMHjM3ydU+VdWpZvtbG+r+mW3Kz2XPA3+pt9Hjq0zgZuqYfTvj7/Sw9Oo81Xg== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:07:12 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:07:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 02/11] Squash to "mptcp: add struct mptcp_sched_ops" Date: Tue, 27 Jun 2023 09:06:45 +0800 Message-Id: <8634072d697210e57bc48962a46a8721af12f4eb.1687827857.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0035.apcprd02.prod.outlook.com (2603:1096:4:195::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: 850cf390-30c7-42eb-0d1d-08db76aad6b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s7xX0L/rvH0DjQaJBJ23//b2YWgdsx6jmmhM9JGADR3xA+e4CK0TwKpgdxZ6gBtGGoEtFFlAXOs58yAEykBZCiCdDeiBCuJDpVUeLzrvC/W4M26yUU49IIrcHYwmj3APFinGkWI2mtHBS/z0spM48WXNcMKiTUJObqSDRauJMRwRJqQYkoimPF3CTeOM7gyNyWGSHQAXHhuzhfVFl5F/7WSqokLzDRJgOXDxy5MbSb536ZwlRcF77tRqdHu3+gaTB3wLnUGt6bzq8f4+QlO7WJZhz1IuEzYv9DrVCHXMqvQ1DiKvfxo49tYgEEF9Qf0KXj2y4GNkp+t3jzpU0/Jt6nI6CESfAAfnuZiwHJlxUJfrX/mUOH+/mKQkUriyLY5wRSpAijVdNxAQ9aVoxZtFyjse7RI5LObEeHGPDozTrTlpvX9JF3qzTdUAAM8poDtmtoRN8e/S4PMhXlEUG06Q7UJY1aME7BMIlIIR7tI5MoIDCrdqCUI8ouk9ASyEL2AgVkTWduUjFGJtHx48ufbuxbS8reU6HKWMNaMcg1RoIcmfRaz1byJcsx6ZgjxR+9Ms 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(83380400001)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?M+p0D4sDJOZiKGizaVzwOz+z4AJLiFta6fC3UPvjK0VtFM/dHMuCEIU3JDaT?= =?us-ascii?Q?4BaoT8m8QaSy3+9ZSWLkD1qvELBYQSjGz4tiXKhowxHlFz6rxJ8modzjx7AR?= =?us-ascii?Q?ogRVQjxS8RXcVn44SyBQOyNT49TFySkpCVOZpwF3miSHkrO+oKhiE9qRqF6C?= =?us-ascii?Q?I4uWxkF8Ng80aguqGvIBKWN35LOSoMLU+9HuaiRNy3mTIkXpY4Vr+Ng4EPsw?= =?us-ascii?Q?aB5TYPvRd8eu35V7T6D4uDGAHsMm1v3iHAPTlsTh06uiFm+4O5v3grI1WX/8?= =?us-ascii?Q?06rNKh4XvXh5W2BauNgWebZAaqsmmm90KZbk+yACfDSZzSEL147UcPUyIYMJ?= =?us-ascii?Q?iaI8TZV/rpFcyJi+pgNA3EjGBiL7PJm2qHF+4CkqNMb5Kc0SGQRJPWbPltjD?= =?us-ascii?Q?0ZBS4uDl1Iw+GA6fjhqHi7ouTjIYivv1EvbvHnI2dhGAtcJamOmM0tvm208p?= =?us-ascii?Q?1tRUdfHFLcb00E4bjoVKBtzHmLSG6S3f0X+nJmjsOtNFfJi5UqwQZvFrr77/?= =?us-ascii?Q?gNCoFiKClluXo0byIaDXEn+T4w+zdSsmQaopYsCwOAZ8irhafR5fAnvhyxJw?= =?us-ascii?Q?wB8uoo31y65/Po+1t5tL23Gln+x5VS5GBijKiXD0wPSPQz11dEIG+LNutDJI?= =?us-ascii?Q?MWGQOagweIpy5NA8BoDCQ11baGf9Gh8kGQJ7cEVzlxxvuowV3mtXcBvihJlW?= =?us-ascii?Q?8CAu1tR8TU2X2dbenl/imwZRXROu5bu2Z3fvwezzmPGtHMWX7Bg9HtpwbYO7?= =?us-ascii?Q?pghNEIbAiVg041WG84UAwrBjKkBJTmAPoxozhLwTH1ctHIL6OSkANZQEboXU?= =?us-ascii?Q?2BkG7Ux/oor5+K2Fg+p4ceU8/f9cWBJT0F9gYgWHBbC0sZ6JVUvpPKPf1CgX?= =?us-ascii?Q?ugAERmkQRZVloV4stTiCHV/AThWPK6ZaKDQDoS0RkmWt09Uu+C2Cqg8kpLAr?= =?us-ascii?Q?mYH8aSAbOQVK0gXZZbjuIDyEbxwZ8thnyyCnbWoZvfQt9WO8eRLjrTG3SklL?= =?us-ascii?Q?1Hdy7E8w7IFafC2paWAh8RZgJzSGyny8dV60+wBop30z14mpbtXtBz/uWER9?= =?us-ascii?Q?89ssVB5kZWFzYGF1BROEUz3lhZ/tnJNkWi82mgdWO95PBN0iRghiqSC7qxFi?= =?us-ascii?Q?nzHyYgBKjd8DKu3swPVoB4F58Bx6iQsogVFGSDMW/Z0lk+VjlpF+3QFoZqu8?= =?us-ascii?Q?1pkh8RveyyAHfUuxsCpoilJvAJ3wOKnAyvmJj3t9hTaPv/l7iUFp9zixKnXU?= =?us-ascii?Q?1z1+i7xsNqtGT0xKEGKYZwj/aAmOaARvNuxUp+F/PGWByyUtZ8QLyy4YcqVb?= =?us-ascii?Q?24NM43FWIz20VpPY7IkmEVvt+icAeW31+CcL51PN+ILDvmob8eszz1Dv9Ujy?= =?us-ascii?Q?F4vHlWJlWULSa2JXfbEVAXZ+mYBuxhc93d3EOJKWIB6H9Ix/PU27+oRiNaoQ?= =?us-ascii?Q?1TQYn6dxMFgbha115sAc+C7gbK8AF75Tl3jXW0+G6OCg/c7DDFFlApoGY2lC?= =?us-ascii?Q?F+NkOu+s5Kx1AXXm/B9qIk7/mi9erA72y/fwd4/Vr7erhDRPm9yo03kofm3D?= =?us-ascii?Q?RFOzto8pkhzwuBawGL5y25LggEo6JfjXmZyW4kIp?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 850cf390-30c7-42eb-0d1d-08db76aad6b3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:07:12.3471 (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: /VBH6eM64KLZCxTrKuEqM9aqbPFOHXme89RWRqcL6PY8cDAtxhgQiQqXysmLrWwC7cfAY53aWK++pipRjXSAZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" - Add subflows in mptcp_sched_data. - Drop 'const' before msk in sched API. - Add const before data in get_subflow(). Signed-off-by: Geliang Tang --- include/net/mptcp.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 828b10ddabee..ba0e1ee68a05 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -101,21 +101,22 @@ struct mptcp_out_options { =20 struct mptcp_sched_data { bool reinject; + u8 subflows; struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { - void (*data_init)(const struct mptcp_sock *msk, + void (*data_init)(struct mptcp_sock *msk, struct mptcp_sched_data *data); - int (*get_subflow)(const struct mptcp_sock *msk, - struct mptcp_sched_data *data); + int (*get_subflow)(struct mptcp_sock *msk, + const struct mptcp_sched_data *data); =20 char name[MPTCP_SCHED_NAME_MAX]; struct module *owner; struct list_head list; =20 - void (*init)(const struct mptcp_sock *msk); - void (*release)(const struct mptcp_sock *msk); + void (*init)(struct mptcp_sock *msk); + void (*release)(struct mptcp_sock *msk); } ____cacheline_aligned_in_smp; =20 #ifdef CONFIG_MPTCP --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2041.outbound.protection.outlook.com [40.107.20.41]) (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 262967FA for ; Tue, 27 Jun 2023 01:07:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aCZ5FwE0USzfshGLWLhDVT71fb7NpTbtK7vh/mU5V0j+Q4c0zq973X6+REipmQfV3e6tAFzIz3o5VivLQRH7H9GHzTNCu5EjQlQECCSypV8p+6ucEf0XzM8SD3098LpGmfCupDOQBaH8OGW7vqVFHREed3LM2TFzM2dEFEDqQbV6r8cSSspaKFjN2TGMLieGF2oadPBTlJHfu28bas4Duk3tngQwo1s6ACMdKUHcpZm3cvk2cHBt5WfAFzzQNVvxSvi51ULMK3CRTj71ZxV763RG7ZwCIPtsJN+dUzUFvtvSva3aU54x15Pbm8bP9J8dTgluIA2a0jCJdFBQGJy8VA== 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=kMuiez9ufG/+XvLADX8WSR/KEeQqiLIA21v17pE6eyQ=; b=BcfOp0wh9PM0K7k1YTTWBXV8kiBxLjfYM2WwTa4IfiOYolb+1QuTXSI2VbwsS6schN3MbKdMCQXEyeO3WrAO+gPj4+vlff2k1j6qghynDywf2+Fa2aEWGcDsZMB6SI4vNpiiS26+GfJbQmNADj5SuieY3iZjEUgCeBGHaiz8ih8xKgqUAbnWLCxaOWEVzHdHGXh1gCdjg7ZD2Rmyp6qn8Q2z/CQZfYpsH6RYJ/gPOP/laQjNmq5S7uWK1eM5ccesk7zWivrFzCE4fbcyzuZ8eY+FHQwA0VlGUaYczjOET7EJTkt7gc6pGg3M/hwtJZpuKw6CvrJoSpCgRCIIDzfqdQ== 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=kMuiez9ufG/+XvLADX8WSR/KEeQqiLIA21v17pE6eyQ=; b=iKfCI3w8G84NFjWPNCspgHol+7F8baNNXcjlWNzoWfCaxDKhOLXouUsgZ6POEHIeGIbBZLsT2Pc7uX5RmzR0cxlu2IwXc2AAE9kgw/MCDhYOCiF8cah7RJeLPMOnPR11BJOAxjgnw/dfpAlf+y8FwvMlY+iPVx8oQLemK9CQxcHsQusn5enusnqoYqvykrRRfeEz1vCrOHyeVS06vnQ56QGEiL7JRL2ZpC3ldx/CHrH6VQ5GVc+orLpW3z+HiLgWn+V2CQADP3iA6wOv9PUdAvINKE8xd3G45LUIy2K7TaoA5EPPyhA98MWTCEv4+RG3UV1SiYOOdj4F9CPhxtBPIw== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:07:19 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:07:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 03/11] Squash to "mptcp: add sched_data_set_contexts helper" Date: Tue, 27 Jun 2023 09:06:46 +0800 Message-Id: <5694986e33e230afaa68c83c9e9fd64f7a551da1.1687827857.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGXP274CA0019.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::31) 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_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: 221c44df-7a5a-4087-10ef-08db76aadb1d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8hFkfubYBaz4AZOir7YTXHL8jhyiW58tMNVdlRxQqnIk5bW5TRKIOzNb32AhOVejfVRQRqAb7uHw6TbAPAKODjjui7zLkr409RL53b2ZoeOp/JZWXAjt4a+LHiKqwNfbGOOEx+F2uPiK9VL+weM77P56ppV6jjjEyGjcE81RdsYu23RlNnTyAM3m9qWltC/NjPnPeQjSPmc+Y+IwoxqxjuiXMllBPSAuxTBQFyPaYO6d8t7NKp+HCAfA1sIhvyVygeDVS+1eTDFqrqGQ7B4eIDoiT8LXjA8eF+Gf7kT/OxKppl+heQdYPNTK6/9kt4eIevWruVC3ORUQfzx9WC9FW9tJIefrb38ZgmX31dbtxT0SmPXLof6aibBJRrEPodScF4rbyIBaHZZJ2LvxrsVk97vg4ZcDW3IwEY4NU0LJMuBNxeMJUrHX6/te5gbmQz62COfv3p8NXOi9CT0xPEnPQu6ytQ/UGpm+Lw1Y76q8kS6SNWrlHU+2vcBPqEw879Lk3FiTKsbM6CWnQ0y+WUZcvIgM7BLaYhNbf+5yq3VpCGTgh2jaXqNrHp4GyF2viF9S 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zcB6ZOHs842ZVlPnE+yeU7mhNSuXAVL04D3MEg5l2z1mjHwxJ2rNfY/K7B1b?= =?us-ascii?Q?G3okfnAiBnUEJ/oNo1LG7pXtAH7/Z3BLUF1zCvJQ688UFdJQVEFQCHXFzwRs?= =?us-ascii?Q?P2BU0M5WHK+xWRXX/+bsFcBR3DFI/l8en005LHw5VrSOFF2hcZ3uCvzKt94S?= =?us-ascii?Q?5Kz0ckB3gB6AygzHhvGKOOjKQLB0Q/yMcakix26jMQzKwth0b+JZnSV5jBch?= =?us-ascii?Q?FmAHGX9mjlH+EB28wPuYIaGflFUlb9Hjkbcu4LNOZ2MMIdTl2kEAKksLETQ+?= =?us-ascii?Q?6DubDahBlhVfA5DCDnKpSU2VGbnc815vJCCPFdpMYTQbmR3jHxiN3eoWQ6hM?= =?us-ascii?Q?qEkDXEubkPr21qWhA+j5LzkX1hYXnk/1GbNfMWkzM9dPSvEhdBWttik1bU0k?= =?us-ascii?Q?ZPsRW4xXFplLUIOVQsJP6YmfVucTCFVDgWzOIVRIQ+NHkeVaDY/R+RggwvCI?= =?us-ascii?Q?Ot2y/oEAnnIR27eSZgmAq+56YsxjBJrV9uCX88FHtjXHvrMr29an3/b5NHDs?= =?us-ascii?Q?Tsquutwi0PAgPSEDsnAsJrXCrlXd1v3Kqk12nGGWXgoEUdiGlVi82Osp/3YZ?= =?us-ascii?Q?p8Z0C7eys6QyRludstlmF+auCqQyX9sm5ziVlUbfQqq2tnxbpFLklDTckZc8?= =?us-ascii?Q?7mISLGPF1Nb+4a1DiTPB/bYJOk30ephVK741tgcODiIyFrBIGMwvvDzfyi6y?= =?us-ascii?Q?VHLMpu6qoA30KcDVK0C7BF9qX2UHxE/z23F8eAlFumPR+1WDqq4Ep4IZKxa0?= =?us-ascii?Q?RGlPacJLc5RI/SyhCaynW1H/ipiI5LwrHCpz5F99G/+Ot9i1ZQUUh1fDHtIc?= =?us-ascii?Q?fkB4LCbTmqIQ4cRIqaDCxEaTWkGJ+G8FkJIYVqc5v8ne9DZ6JNs8tdVx71lN?= =?us-ascii?Q?Zq/Hd8OMKStt2nPKaJ7avt4T+ItuSeEi8zKJCricZMwYEgBq3UzHoJAtgYf+?= =?us-ascii?Q?9DxxaWoiB/FPnVRvjVf+rrEDWTSnVqFeSlQ9pVzN4HBYWS9ECjjvuS18XIi+?= =?us-ascii?Q?Yx+V1jfsLJKYMLcVHIPrpRCfEuuXG/HpiHkOg2fWvL7JyUq09baMjnC0w5Q4?= =?us-ascii?Q?Z9XXNlnL3mj9SuvDJ96isweNBlZQYvew+DsvqPr/00ARJPCn0ZDJY1ctvZAO?= =?us-ascii?Q?OKSWNljCQrXcALaWORwLeEamAUlYgb7J5/t1qh3aPUABX4LZd6ITc39GOCSR?= =?us-ascii?Q?UGWUS4vJUrlHbaxgavnz7UWmVxPyXzXc38zNirFYTzlk/P3IZqFoYeGxKGGI?= =?us-ascii?Q?v5hUn1Lrd/KWPepQnSouCZf9PEW0e9u+UYGazI9mBnzlw9fC32S+NZKxX4M8?= =?us-ascii?Q?GXDFH3dUTQ3VVwcVWHuUa7fjcuHEihd5KVUWt8VnLFzmxHYfb3XiHTFTJWiQ?= =?us-ascii?Q?ehm3hjB8uMXGoo+SZoQPQpOfZHkCnC+XZ/LZKDVfYQz0omU0PiwGiryJB6Ud?= =?us-ascii?Q?V/6YAVukYP7H/KBILyu5XHlT/SCX1YTLSsdf2PX7nLrP7nYD34/F1f1y+Itg?= =?us-ascii?Q?kBNE25QHWXkN2WZJkL70VjA4ePrZEUTlApwEuuPhCpIV6Ia2XIeDxPiLzCz+?= =?us-ascii?Q?eLC4VYTMtacXuSHKzj+Dsz84gPQ3raxB5Wr1tpPR?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 221c44df-7a5a-4087-10ef-08db76aadb1d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:07:19.6995 (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: 9sOGA1NtRsofJfQ1qJZCWJJjEioaXEAB9RjVU6E3/vNl/iD1iiXmCsyqaNa947ymiBFQGWTYycaLxZLHs+zCyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" mptcp: add sched_data helpers Add a new helper mptcp_sched_data_set_contexts() to set the subflow pointers array in struct mptcp_sched_data. Add a new helper mptcp_subflow_ctx_by_pos() to get the given pos subflow from the contexts array in struct mptcp_sched_data. They will be invoked by the BPF schedulers to export the subflow pointers to the BPF contexts. Signed-off-by: Geliang Tang --- net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 8c9b2a03dc94..cb2f34c8ed09 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -664,6 +664,8 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_c= ontext *subflow, bool scheduled); void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, struct mptcp_sched_data *data); +struct mptcp_subflow_context * +mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int= pos); 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); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index c7c167e48d72..82665263bb94 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -108,11 +108,20 @@ void mptcp_sched_data_set_contexts(const struct mptcp= _sock *msk, mptcp_subflow_set_scheduled(subflow, false); data->contexts[i++] =3D subflow; } + data->subflows =3D i; =20 for (; i < MPTCP_SUBFLOWS_MAX; i++) data->contexts[i] =3D NULL; } =20 +struct mptcp_subflow_context * +mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int= pos) +{ + if (pos >=3D MPTCP_SUBFLOWS_MAX) + return NULL; + return data->contexts[pos]; +} + int mptcp_sched_get_send(struct mptcp_sock *msk) { struct mptcp_subflow_context *subflow; --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2041.outbound.protection.outlook.com [40.107.20.41]) (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 34ABF7FA for ; Tue, 27 Jun 2023 01:07:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZDFidY53ITI/sQqxQ758XeGDiWtKqNw9SGodA99/kkuoA+l+hQHEonPz0D4sqbtcJ1WHr6AtHjQmOld/KScPtMQCJSwqYl8NfGC/jg9rOCccLYUracb/xVU0BC7nq3ZRKVWxxk4kHNCCPyWEr7GDrZdDxvAb0nhsyUfi+svAUudOeXsZITV2hTuDLK+pybgcNH/s9E70HXalm9+Xy8AaTRAUS1QPdOz7kbN35ywaR6MdVxiDOyV5eyuvTE0nYDI2TMyM81o8GgjwERC1yC0elVeW90RLnIzf8FUcqcUfKNMJ5vFNCyvNWpRaQo2mrQMliWgErsRPpHx4sHM/4NULJQ== 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=PUnWy3Uxwr30w+QK9cl6w8ugU4KeuI76tBk0ZcfpRtU=; b=I56lmp3W/x+D8/Y30G9mbZW3aFevshuUbGzM2E03LNhY3KoslcnTatY7tY5OrMgvG/RiUbG+PbCn6YW0ycMfDtSoVbXRosgRmcWWf8HyTWSUR83tWEZ/Ap4os4hbKQqons5lHT+67i4Y5sMNgmjRutnznJWW429d4jU1HVulyVkiIwmv9rG3PFu3Fcc2eVS57dQvYVx9VB5j3Rc+YF6JqKVz9S63oFGInAJYkPIUPIRkK0PR/SkyfB7WSum7kDc8YUC7U3iXi7/T+V8p9IlnCyf4iXUAlMEwLSzulgBenjxDlF9CQZCmve0lHbPFvvq/ekVMGLxdQvChyUHpmlHz6A== 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=PUnWy3Uxwr30w+QK9cl6w8ugU4KeuI76tBk0ZcfpRtU=; b=3YUj+Tq6bWLYIWJ30tgMeWwCFBVZJEymN2dc/UjRQQ5n+/6aKM3YBWHRBapT+Y/dEihcwDznnKIQX93AGAx6FBuDGXgqJGd1//O8e5OXUCzB2H6lqFJGhPOieLZWLy0r8aqily7GN6H3gXevQw/JETB0hxH96+n1H8WmpKAa45R6duD71no+zrXZaRS5lIUhMVS6rZwFU9mogwZEzMTLO9tiyvEWzlE3FDSjw5OLe5PDOvqmr0mZceVySqfBw9GvzgclLSkL/y5N66nDiTjMJPPWW/QzpfVJBZuepdhb38t5hGnxtsdimuFAUWRGROdZBwTnA/ZdkJjYH44suxxf8Q== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:07:27 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:07:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 04/11] mptcp: register default scheduler Date: Tue, 27 Jun 2023 09:06:47 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGXP274CA0003.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::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_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: 8165f7ea-bfbe-4710-9bdb-08db76aadfaf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: my3jXwjeL0mT6HCTWRQXBUH44wQhvoag6ucoJvI4aHIxI8wIWmUOTJmpuqlbICdfoQW4lRicoo/NxrUNRaSp8N03OiweNc8WQnEt1Pe0Aon7hxfw2ZQP5UxPwBXJCe5UZhJznc9MFTcgLFLeaJH3MF9kZbyvXPw+gVsMIw29JpfE6pgKumkfroe5RqhxjNuI2KJOUm7xHxz5GNHZU5WOyfq8Zy50AS34s/BokDbqsXLX1WUItkHgTMixX4D0xrilVjRmZkmP2pypSkodHJLC2Nv5BPKeHT6eJ1TCMVQBYiGI20ufTjPNr4dCjk/EVjOC57xsgkIOFMIok78KnRd7VcBeQD9k/49CPb0TbFeM4PTHqXNuI8HzvNwsS/GaguN70cROmSpaBBkmuLpxyAw6/bKB7yf2Ctu/HzfWVWARQbFyX5JWAA+vs5eRjkHRSNr6bZ2itbUPIDC+7bM+V75ICN28Buy0/KBwF2eIfW8QRHS/aAEOpDa9t+eF2VZIuymFwWJ/kC0n5i7s75G4Cx3KlAhy1Lr9JrqiGaqY9QaaUZIcLRko8nDhF4eDsmJ6+BSt 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(83380400001)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bUyTG/hRcFKKlYnyRpv8t7J2p7c3HWy14ySH48/vGPPyMuZRSGu1KjOKkEsX?= =?us-ascii?Q?uIfwx1JQL9/JgwBNQYxf9O5FlHc8rh82ejBJDQWsXbmFjxSriT2xWsOlbzd/?= =?us-ascii?Q?G+54leMfHfRHLmQka0Dwkh2u02nRAe8YPtms/DCNI/D5KXR5WJVmRvEVM61z?= =?us-ascii?Q?TFVuJuPliS9agJVFc8wlypYdhCEKZ6ob7VKqH8w99FIAG1LjkKV4PKvbidR1?= =?us-ascii?Q?1qOf6zgds5oCknbI1pioCoqrnvlz86EDMycJpSMyaitD0Pc3rTrQ2la1N0a6?= =?us-ascii?Q?s4nMsMFr8+5bmqgyrmLgmWV9K+/k37hlahkfJ+4y+CtWd1FwDUrCJovTLKTD?= =?us-ascii?Q?arybicgWtzKHNA2V5WJXglkZGMN+Uh+NX1o36rzxpLAl8pOAES/dZf/2GEPA?= =?us-ascii?Q?rU5fJ2X2R8zERz3hh5JoQB53Svh50vcpWFTxH0vYk9CH9pscppfX7U4Kckab?= =?us-ascii?Q?4qZ2WwWgl/u5ZB5pGXF3azU9HvZWq5J3BF3pBMVJJRVudEyn70dst5x9lmsV?= =?us-ascii?Q?8/O7RNB/kszr7HuObz4NeLhAiwy368B9qTm2GSsnG/Oq2c6DBqadhX+YMuVR?= =?us-ascii?Q?kPfgiEVAKg+b2u43klJWhh+gnWyAIk/O/+n6l8v/YsO7BKEpXHVVvVnok3zf?= =?us-ascii?Q?qkM3UcrmxG0u/dBpbN/mP5kj4rvZTq5RzC/t0poPXKl0JRJwAHHW+SbOSSyr?= =?us-ascii?Q?FJF6Zq2eNOKrOKF8toXmBWuoVFnsWi+9k4FOcJ2zcyeDA4b6E4gZKekodz8f?= =?us-ascii?Q?fstYCShPTfJVoe3xEHMCF5dXYuUsi2pJesSbzhCvfQITt/OeCSUSoEeW5EOF?= =?us-ascii?Q?dzboNzSKUj6SDLUwIAXgLB/sUbNDiin8zSFDjjTHwj9ZbVSnvxOuJl+PQlAX?= =?us-ascii?Q?txz/4HpHZGMCnvamNWcC8OAxHQx2mvZSw59C8wxftUrKY0KC5ruXg2WHV9c0?= =?us-ascii?Q?3gxOQn8RXV4+qQ5K0BRX/yWCTN1POsMi4ZL65L4wn4meQZBgd1BV3mqIPLy5?= =?us-ascii?Q?lchp6Mc4lkCHemxNB9wNLIEM8V5VMgqUZmujJTTDfWlqoOxuJ9eIIEZI+NMc?= =?us-ascii?Q?eShdopqOL+5GoWUGOp3PJHDnUCgeX9qFZweLCRmFWB0QaqX6on9oBUkq5X7X?= =?us-ascii?Q?MbD0TE4IBnjx6Sir9hRS1V/OvKYrF/RnExDUUkzl4w+zsYuax9RMMboC+QXU?= =?us-ascii?Q?mFEve6VK6mjy/cXT9ApzNbdNKAROSH/PpRaqK4SSdI+B8zmk4t+CE5A2o1XA?= =?us-ascii?Q?QzYKP93iKsPVVC9Ow0e2g0MSfg/Pnt6uiJYFo4NcruiMkGW36K+G9wIO77IR?= =?us-ascii?Q?FCfKH45C5pTaliXU1d59wYQ5y5Ktyvpkg5Pk+vZUIfwNCoiJoGcwmkmRa+18?= =?us-ascii?Q?rPFJ3mtkKpapHcXFt3Zkr+iQlgTpM7AtbSm9bRXjleprLLjotRX3RgwVCxoT?= =?us-ascii?Q?cvQFuhE9dOLyBq8Ef8EO+InDY0fHZc0ulUavtlfQ0Bx9y9g2yExYj14WaY2b?= =?us-ascii?Q?/d/TqBn2w3J6X8RNu0yrq5jUIXhv1Q5ok6+dAdhzCpv99zCyctGTk6nJKWzW?= =?us-ascii?Q?4GijdHA+R3qVh6Mw2xOS5gw1+EXmZZJiIGqIFhtb?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8165f7ea-bfbe-4710-9bdb-08db76aadfaf X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:07:27.6072 (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: 1NTu2XV5axaiVv8uoDR7uuo+ClrRKP4teuh+If1jp+bkOkfe1Ma+2YO8KYgv9/01o9XTs+fAGkoaOeQI8WQmSQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" This patch defines the default packet scheduler mptcp_sched_default. Register it in mptcp_sched_init(), which is invoked in mptcp_proto_init(). Skip deleting this default scheduler in mptcp_unregister_scheduler(). Set msk->sched to the default scheduler when the input parameter of mptcp_init_sched() is NULL. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 1 + net/mptcp/protocol.h | 1 + net/mptcp/sched.c | 37 +++++++++++++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3ae0b94d25c0..5f9f046b2124 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3970,6 +3970,7 @@ void __init mptcp_proto_init(void) =20 mptcp_subflow_init(); mptcp_pm_init(); + mptcp_sched_init(); mptcp_token_init(); =20 if (proto_register(&mptcp_prot, 1) !=3D 0) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index cb2f34c8ed09..bb4d50c8c398 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -657,6 +657,7 @@ void mptcp_info2sockaddr(const struct mptcp_addr_info *= info, struct mptcp_sched_ops *mptcp_sched_find(const char *name); int mptcp_register_scheduler(struct mptcp_sched_ops *sched); void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched); +void mptcp_sched_init(void); int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched); void mptcp_release_sched(struct mptcp_sock *msk); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 82665263bb94..a80cf0481edf 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -16,6 +16,32 @@ static DEFINE_SPINLOCK(mptcp_sched_list_lock); static LIST_HEAD(mptcp_sched_list); =20 +static void mptcp_sched_default_data_init(struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ +} + +static int mptcp_sched_default_get_subflow(struct mptcp_sock *msk, + const struct mptcp_sched_data *data) +{ + struct sock *ssk; + + ssk =3D data->reinject ? mptcp_subflow_get_retrans(msk) : + mptcp_subflow_get_send(msk); + if (!ssk) + return -EINVAL; + + mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); + return 0; +} + +static struct mptcp_sched_ops mptcp_sched_default =3D { + .data_init =3D mptcp_sched_default_data_init, + .get_subflow =3D mptcp_sched_default_get_subflow, + .name =3D "default", + .owner =3D THIS_MODULE, +}; + /* Must be called with rcu read lock held */ struct mptcp_sched_ops *mptcp_sched_find(const char *name) { @@ -50,16 +76,24 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sc= hed) =20 void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched) { + if (sched =3D=3D &mptcp_sched_default) + return; + spin_lock(&mptcp_sched_list_lock); list_del_rcu(&sched->list); spin_unlock(&mptcp_sched_list_lock); } =20 +void mptcp_sched_init(void) +{ + mptcp_register_scheduler(&mptcp_sched_default); +} + int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched) { if (!sched) - goto out; + sched =3D &mptcp_sched_default; =20 if (!bpf_try_module_get(sched, sched->owner)) return -EBUSY; @@ -70,7 +104,6 @@ int mptcp_init_sched(struct mptcp_sock *msk, =20 pr_debug("sched=3D%s", msk->sched->name); =20 -out: return 0; } =20 --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2079.outbound.protection.outlook.com [40.107.20.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AA657FA for ; Tue, 27 Jun 2023 01:07:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XRmOIXNATj9kh4APL9v8TKuR/y1OMPYY3wK2Ycyp8ud7RCvqE2vGCcVT3ju+OD8TquaqygmVAGRAuZ7Beb++Ke6QBgjNTCaE3jJZaRgp/hyCscVOIdAijiTFEqRZ3XAGJAE5K65kGSdrn3R43iK9FbKdYOmmaYEu/Kc+81ngOiGqL7Sriqxy+c7BtB+ZVQyK5aNpvgZj312id8r19P/U0b+AJJ9Qm70gwY6QrLAE+2Uvg2pW++xwMKsS08C+bfmallBrn3DTaMGFKPDQapHEV44JV5pWMTG2gmInIfX8ozfUboZxc6wP+8UWt9M4lhtqiTmYoqFFs4GooR/TsI1C6A== 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=Gpdock9eMDsSOaOjd18QWdwWQwYYF43moOlqVaSz+fc=; b=ELbhIsNUMzjvM0HnxJGzOvEOZohXxhJCkNBU3PWWyZCd08C+FlMT/6dcy5ca8GUEh1x0r793TkwXjKRRvUdqo4+JPIL/1uc2zFSKAzbwQR8ITAzRxmLesh3xJdBiglp5SUx9xYUac7JIhqgzq9CIWBeo491dP6bX2F8iGh6kHc+UnTKFH+fn9KhrmhilsJF7Xwt8+GQuCA1WUXB3HlEyFD0tygqDo2iG5AhNmMlgQ6/lN3nR6w420Sx5ZbS0UKwnp418xBF2GTJNTHANTGo8/T/bDhYt1GXny+CKLrMkKfmJTteHy5cc+vi3ntddQ/r+HK8S9iSGQfXCFuhxfdlqxw== 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=Gpdock9eMDsSOaOjd18QWdwWQwYYF43moOlqVaSz+fc=; b=TTKT7LOh1GjchnIahUmRwUILeRsOd897wx9nifjV2pRZ0pMry6UIYRERpS9mNrnq031ZHxiWz5PU/J/j9Fixfu2eALivSAGICP2IKJzh+qGHhCNNEnLMy6iUl6bANw5vGbk0lOq7VcEAjci/v5ZjeDpCzblrWb+x3YkjWA5bASSwKE59xIA1Nb68yA0uAEoPNbJeas2LGv92P294xqG5ovxnlKyWO50V5mtQAJzkIzpxny5QRp3bvLK4Em0gBpEDhxpSqJ69mO/KB67VP1vpeJLFxYnfnrwZ0lsbMXJ+fyOP6uKi7qxvmK4A6/uyXtyqL63ilavxQYnnxm12Em/oyg== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:07:34 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:07:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 05/11] Squash to "bpf: Add bpf_mptcp_sched_ops" Date: Tue, 27 Jun 2023 09:06:48 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0002.apcprd06.prod.outlook.com (2603:1096:4:186::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: 94d4befd-b188-4c4f-9365-08db76aae3a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hvyBsEToS4UWt2Sf8n/ShnsiPdvpJ8jUtcaj03Ps3doCyShrod9tLccVjCGquZwFRS1NQUBSl/gl6VSn4FlBRoMUmgThXIPe8JDbJYg/ZspRel/BDORm/8AdvOh4qONEayon1t948ETiUH2I9HJALdfuLsV5OaP/WdWiRMRKdmPNYmowV9i9TUajR9/9yqQfWPH5O7WJ7UohzmODnF4Hcmp5vhaVGTInLYf6GqNj0lzNrRfbFvfKngCVxP7sVcN+qRumegANhdgW/uARkkd3gh8pOfxKfALEvtxkZ4+Z12oxzwDY7kyi1Ax7DpxsSs/PZPmydPn0Z9j8W5+cCliUqrYXoQs5NcAXSHWYBFw3GusHIiFT2y4R5fj2j3jZHZx6wYu54vJ7Bd6lFTiAZvnZlehD8FrZTPYtET6KihCDi0GOPz2DiGSLILk45/2Cyx1g2hZ2ODW26yJ8ZGpe5magmIvejXRPLjLLg3+lolPl+tgPKViat6UmH8lzv4MAkAZcmtMocdslvoAbmciTqgSy9lA2gppOYrAuT/CYcouQ3ttyBgyRKa4GO4QMfi0puK1b 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(83380400001)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SD5BcbgAcMEMs4g4svjZ20Yv2Fp5r+9mQfFkqJdQnesGYQO28I8b9wTOA2Tw?= =?us-ascii?Q?f/6aKDfvNSrElA7etd/8+Vdqh2ehkUCCn9rYqFOtUI3/LqbDQvdpqtfL6ILw?= =?us-ascii?Q?RCVddygbCO7H8dqs7DapfL0IH2iTsORglMB288eL48uydG93D0YyIxeu5eeU?= =?us-ascii?Q?X41Ss/VDqPnewtD385rySh+Kh1MRvgUDyPqpIJdL7lY54oMCEqxLgEwSeRDw?= =?us-ascii?Q?WUurEjJxlcSC5mUxPILnFhIkvnUlCbX869icfhS6rRwt6vWhVIhbURTdLnM5?= =?us-ascii?Q?cQF0qBIbgA5k4ngaBsJbQlicsWxcgdOxOWtbdpmWdTIRiPanre/fT2lIXyzB?= =?us-ascii?Q?B0SOxJAzCNN5iJYFy5PMKGkTtAQcegVd2O9aU9YE8YBzViTlylhHloBunmiz?= =?us-ascii?Q?ws2qP5JBl6wc2+/nXtjIrg8D2pAH7ovsvPCrxIoU6umpZLNhho6GlbcPBiy+?= =?us-ascii?Q?vPiFaP/iu+qGiZfrYKS9AgakETiGn1O4ozxEb+jFe9voqlFzi6qP7Uxs0kR6?= =?us-ascii?Q?BOI6++SwJhlwrWb1WNjJpefB/LwNe/elmbSR0kybWMkqqAyDV12r268MZ/4b?= =?us-ascii?Q?iigfE+Gf2Q8u0KRBw/BxZVyabPbw6h28t2uJXfee3KJ24Dyc8tTrldqzBWbR?= =?us-ascii?Q?jSe0DX/9szBFlb99yfDAcZ5NA4/O6RM0WRZzJT4t6G/rGdZGOTg8tE//WXu3?= =?us-ascii?Q?V8iIeU3aCErv9Z131jNiNxzHpvgjlbs9MwpJ3mksrF3ZgnXysLhEBiegnRlU?= =?us-ascii?Q?offqvmCDs1DbO0EiUZqxONixV7kwLucMbKrprm6UYAjJlmV1ksI1hHsaJ9Xk?= =?us-ascii?Q?WvnXwKoZPcpRbKQnSMoUz++v1Zq2D4LATBIPSBD0Npf3mbTacVIHe043T8zX?= =?us-ascii?Q?9cQ6FaQ0gnCLOZAHpl5KJrQkoRzf9ghns3pcAXyubw3AkbF8lA/AID+hJgl4?= =?us-ascii?Q?6RZgjq6FJdkaR5QEcJQ/FPLmUHdUl4oTmE9roj0DQ7A0QENAc4ZtaJSrHHB2?= =?us-ascii?Q?gRIrYGC6p6aObFs0x/y196KWldRXJsHfc4M1IPD+cvEIfux9O2imTUxdkpWL?= =?us-ascii?Q?PmISTkzJDWyPZ2YBrW2Qf2YtrpFuehSpTYr1BFABL3gnaLpNP7Z1Njm14HsG?= =?us-ascii?Q?I0W3QRH5RsY/zqRx7T5FF1miGk7xrrBBRz/+/bhRIzxQha5XHAhM/7zvr6Zm?= =?us-ascii?Q?/EY+JOwIfBgSiMWr5FRKomrivcKaPdFoinh5N7nbKwbxmPnGwg8J3PVgbaD5?= =?us-ascii?Q?W2OVnFH4WrfqbwLRggozwG03CIVmS5DLMKiuWAY9nWV/IO0pbTN1fDkvqCkQ?= =?us-ascii?Q?TPJh7vLSzTjHaPtFsuv0jXsgyh+FW4lyhfJEeCYbNjoMYHyTUsE68kcs8Qav?= =?us-ascii?Q?i06SMOan5//cFOVq4ICwehfb4toxUhIEpEhrEyJmUif0fOAVXt88h1uQyEKA?= =?us-ascii?Q?ecbwZwu07x5O4KC0lDl9UMcl9qmVZQS4IfILJYEzqTAfI6UNCI7qKwXlzZS6?= =?us-ascii?Q?Lg0yMldZjUGfyJSa8zbwke8M/RlsmABe799y/DTGcsrHAGeeGv0713DMa3Q5?= =?us-ascii?Q?KVXFHAiMDZxqlxpgsV6xpdoQiJJyqxPBaUp+2MJZ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94d4befd-b188-4c4f-9365-08db76aae3a9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:07:34.0330 (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: OTcaD7wSjxhiyGfxYbQmRF8zfec/NkcUZm+GJB8veAeqJYFaxTrJUfEaavnj9HafUCh6MVIaVtpV/9/xIuoL2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" Add accesses for bpf_sk_storage_get and bpf_sk_storage_delete. Add write accesses for avg_pacing_rate of struct mptcp_subflow_context in .btf_struct_access. They will be used in the bpf_burst selftests. Add write accesses for all bit flags of struct mptcp_subflow_context between map_csum_len and data_avail in .btf_struct_access. The stale flag will be used in the bpf_stale selftests. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index dd1208670c54..204dc37e31cd 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "protocol.h" =20 #ifdef CONFIG_BPF_JIT @@ -30,7 +31,14 @@ static const struct bpf_func_proto * bpf_mptcp_sched_get_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) { - return bpf_base_func_proto(func_id); + switch (func_id) { + case BPF_FUNC_sk_storage_get: + return &bpf_sk_storage_get_proto; + case BPF_FUNC_sk_storage_delete: + return &bpf_sk_storage_delete_proto; + default: + return bpf_base_func_proto(func_id); + } } =20 static int bpf_mptcp_sched_btf_struct_access(struct bpf_verifier_log *log, @@ -50,6 +58,12 @@ static int bpf_mptcp_sched_btf_struct_access(struct bpf_= verifier_log *log, case offsetof(struct mptcp_subflow_context, scheduled): end =3D offsetofend(struct mptcp_subflow_context, scheduled); break; + case offsetofend(struct mptcp_subflow_context, map_csum_len): + end =3D offsetof(struct mptcp_subflow_context, data_avail); + break; + case offsetof(struct mptcp_subflow_context, avg_pacing_rate): + end =3D offsetofend(struct mptcp_subflow_context, avg_pacing_rate); + break; default: bpf_log(log, "no write support to mptcp_subflow_context at off %d\n", of= f); return -EACCES; --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2045.outbound.protection.outlook.com [40.107.20.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 73CA67FA for ; Tue, 27 Jun 2023 01:07:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pv5O0rU5teRud5CjuHgLpO6mcWuwbjYLw96DvCd629BFGGf7m6XhIGOlgBaE5tDcn+XahrDg/1gNJlpKAtqITof49T+mmUZ69ceBfrLT6jMUHRa/NmVNKuv7ZY0lthW/9TDnblAcKbImsSuYK0ZpK1IEtJInZZLCjwjY3Zemk4C/ufnn3NCp5EB/IhqTM465BJIVWJw4VX3ur2uIZ8KCes3xpnPQwoMbCAFYPTMp1ejru9myNBp0BuxJyhebWJq1S9HJCX55zuVZ604sy62Tr4xKTTL9ARbCvO3dbMJoluuCccskz2Mk/pcfn6XfUKZkgNrE/b8P5THYvGCKHWPzLw== 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=HoCe9mNdYhZiYs3W7k3mdx06wExbbsoWj5FLAT/fCw4=; b=Zf0q7UApwG4as0x3bphT+4/S8yYR2Qat2OWGzpOyPBhwvcV9nImVhLCD/U8zxNKfhy83F0p2sJ9mZVJP0UgzzHQ56CqQAgtGgArjjr8r+F/O8DVxGVpkeHIuLmMY1+ogRVAcTmyNqsL7L2sH/Ww+wjWhMm3cSNRnPi1YO0ARXIiRgx6nqBcgls94tSQ6FWFwyIiOlkA0Wr9HBGbpzSd/0ygCzdc5GWlzDuQIdArvERKLjmWM1ayVsPwjtoNcoug9liaozSIyW2zej+zLGIChdP74VtuwqlNHkSh5ewTU3TgPjXbbzt5lkUzfztsPOfH5A7eo5MzlPC46aUn13n4WNQ== 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=HoCe9mNdYhZiYs3W7k3mdx06wExbbsoWj5FLAT/fCw4=; b=eoFZWgKb33ILib8rPiqpvpieyfxH/4stomi6ptRnupbLRglUSNJoQYcqhUZsToa6kfpezoqymkNk6e74Mnb9pzgR+c3rtzY8lUk9jRH+cpLdkjzDj/kcUeTHVbY5m5++u+Fy+S0+mtKCOMH57PGlCRvdASTmkSKZl96dhhp9+a3ZEMjDWVI3ita2bcOI0d71shhJnfL0dgob4JrR/JH1nc7Xe5lGCWv61NFDad1s5dffcNyLwwdJ723SRPkzVbEmwqLJMDWFlnplOY7TVTsOOeXs2x3EGqg9oJnb5PFIrMt5rObE6fM2Xe6MH7eOFEJsKflwr0yohlu3EPcztZhhdQ== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:07:41 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:07:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 06/11] Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Date: Tue, 27 Jun 2023 09:06:49 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR06CA0001.apcprd06.prod.outlook.com (2603:1096:4:186::21) 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_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: 13de149c-ac2a-461e-d4aa-08db76aae7ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IoCo+A0/c9j/T9JVpjIbsRHEy5lxPjWM7qLvzNxZzpRcKyihbtf8dunfntEo94MyewbDO0BALh9Z8Q5XZHM4gU3cKNZvvNL/7+PyQ5x+VxmjH0DFjoykcWRfYmxOkb91lIrssvqGo4iaU80DiboL2xosK1UXa1rpBrNaZjDkyIqUYMVQVJsTlREnBUCk0dKoZw+GB//70t2XY+Krwge028egq3V4Wgm9KHB4cGfOKhRQm0rBUpCK2ldGDs+rEzqSQvvqrKm3dpdQZgiSNxacRpNooTQLo/rDwyBZsZmwbY+BWvpa5Iivlg84Io+HslHqX4TDcsv5+sE1pYBoXA12NSPbIGqYNpAWfBx/YN8H43Xczy0wUa636gUL7yw7CL/n4YzwVeX+BYUsZ0TGJvoUKuaaU/fvSO4+KL8JqRVTtU9Eo1SjxnKIVNClRbjPkm3oioGNKK5l3poZRkfGSgAaUPwbIIXj4Mr6aBxdlxJo+PwbRaJmGIDJ6NK29bHXCNWW7d/CDstGMtOVeEtgFXMGVOHGFo3v8eVvju1CzctlbbiB8Xcyn3UXB75av8vL0p2o 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(26005)(6512007)(6506007)(4744005)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8pCm52BIPqAE4GqDOzfOvuLyM/YE13NGTaBHOM/nwAU9LYdIjsea5Lo6hg2y?= =?us-ascii?Q?tdfDjwbePyC3kPvgZUOr+XudsFdoOU493gxfPfTPM1B+WOTs8ugi1Q4jdubz?= =?us-ascii?Q?UBpVJOY/6CWizB7+ENl5GpZ6aGHlxjJGz4ky0v73J1IcYtHqTY2FgDfRAPRj?= =?us-ascii?Q?MAQg4W/KY43rN5N/G+HuBnDgHjT4IpKsiZlgWm6ool1kA3XBdbtdjtvLUBNh?= =?us-ascii?Q?7yasyvg569ZFXeNIXy2bS4SiwP4lsLuN//XOsG5VN320qtV4xRdc06dkfvZ3?= =?us-ascii?Q?aInebX5tinGuvxwvWM5H2IHqULdaG9sXTz/fG7JtFStNNC7idyLt2zs6iyLb?= =?us-ascii?Q?gAsBID91RfnCV4q5tyGgkdk2QwYumTWM+BNxupOjzYmSLhY2JzxoMMs1mvCw?= =?us-ascii?Q?fmq8OjMIBhj/JOaWqFL/42zOYx6vQIggDoB62DnTnGeKCIRghcQNzxv5L9mt?= =?us-ascii?Q?FwFzc7gw7ZJrWN+28xIYc7zGu8Q1erN8dz1AH7UIFnY7Q+ReswxDpWp2VgTi?= =?us-ascii?Q?YHPBVCjibrcU4RTFwjl68/zStlckj3cVnkF34rpECQclr710dYyhWIjra/SX?= =?us-ascii?Q?NbyLf4I/f6+lFlDpXVoDRk/VJnm+DV06sl9Hgj1KRRKfX9pX0hog5myaBo4c?= =?us-ascii?Q?0cqVjxTkFhMpe2SathTot7dHi9KI+5S/xtVlm+DX0Q3ppjLZurk0kf5IPQo5?= =?us-ascii?Q?e4GdNmtn2IfXcbcfHNmKYXLrrbt1dN0DiboAiA7WTrzJiwWKy9bZ6fgYBeXy?= =?us-ascii?Q?W8zQaMdhd5/NBu6kiA1piURa8X4ArIdZyHhUd70yDgMnqhrzldMuk1otY3M+?= =?us-ascii?Q?Ok3U7VXI1wQypedAW1nNGDjAKkjRQqIqxiaD1/TBuAxOsKICK/frjP+gdt4R?= =?us-ascii?Q?TEViWPK3eX5MFJ8zgD9kVBiK1cj2Sod7TW6wFSijlu5m3jKBf/5MhzJHEyI0?= =?us-ascii?Q?hgqfoghnszPkOMqU9mQu1NZVD/fFly1ZE/8QDxfwXeZMLxwzu4dpSQhjjY95?= =?us-ascii?Q?Ilrz10JYeR1mJWUNEJdKv5cLefXllwkFmCmyfgawAKK+a+4SbT5bP/gmHKyP?= =?us-ascii?Q?2nWECeY3gE+CZ8hOpR2JVr/TvPUXCYQfoZMHvPzdsAPyqUGR/Xcov7gOJTNU?= =?us-ascii?Q?BbTZ+QAepwxpy6wY8c/dJ9S1aHsvvQEGUw7xuNrAqWH5p4Y7MQojvVJqlykt?= =?us-ascii?Q?O8vZv7D6IzexddcTDf38YBws/x+to005vgmv/L1oqV8UwnB+T5yhoEmmVs2E?= =?us-ascii?Q?NyD3MopKYemR48l0IVTw2pCjkJmd+48lkKas+cSRc7TW3vRqGD/CLtaKESfO?= =?us-ascii?Q?OzaN3mLksHZtxFscjJrnCkAfdvSNnyTpn60JAhvVnLokYPc/DXvtSm5PDY32?= =?us-ascii?Q?9xrJg/yxfFu9CDrWk8sATzheEHwCs+ia3DlnmSAT8asWmtHMqsn2AbQwKTj6?= =?us-ascii?Q?T7h+t2+Uwolz0L1KoSntqA5Iq+sjzryBg6tznZKAVh3Ze60FG3LiNJdtI0UR?= =?us-ascii?Q?5AZmZAci7fPLvDCI3Q3TWxWGOHv0l8o+dbu1LSCrNZvo7JdAUi/+KBkBo01F?= =?us-ascii?Q?CZwFzKdL0t7r6PLfnX2XGN85nnOr+5GPiU5ulkmP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13de149c-ac2a-461e-d4aa-08db76aae7ef X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:07:41.1969 (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: uEilhlNWRno7W20AF82p/eB+SuguT8SfnCVfzZHUNa5J5CM9tL/V5RKyDOkS7NElHBxaCu+pOgT7bk/UjRC6Bg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" Export mptcp_subflow_ctx_by_pos too. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 204dc37e31cd..c580add9c7f1 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -174,6 +174,7 @@ struct bpf_struct_ops bpf_mptcp_sched_ops =3D { BTF_SET8_START(bpf_mptcp_sched_kfunc_ids) BTF_ID_FLAGS(func, mptcp_subflow_set_scheduled) BTF_ID_FLAGS(func, mptcp_sched_data_set_contexts) +BTF_ID_FLAGS(func, mptcp_subflow_ctx_by_pos) BTF_SET8_END(bpf_mptcp_sched_kfunc_ids) =20 static const struct btf_kfunc_id_set bpf_mptcp_sched_kfunc_set =3D { --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2055.outbound.protection.outlook.com [40.107.20.55]) (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 1A7187FA for ; Tue, 27 Jun 2023 01:07:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nQdWt9nAnGgHNmr4ouiSk/14ho4b/hG7OaSZV2kVLASruuQjFAEsgm1nCmypWzbAoS8Pd9EcklJ4AuOXPHndJ9/AgU7iVdqbr3YEI4YhZJR+UZa4nJAl8OTqE93t9fVHDyf5Aa1dSP7ZoUOEc+jOO+NF02BgFhsb4sycg8z1KYTbLu2yFPhPEWY1ryR5Td7Yq2xcypRpOk3w2ZCt36V6Z4Rmcd0bPe5/AdpWyALk7oADSc0kNAcrnMpATPeyEm/KOXv8mx8vMwc2PxJtjRMd4oWT9miel6My05TgsMQCQbBeU0dQQL+3PLXdVSmG/jk2URuOSOKhYaTfIVq0hsZz8A== 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=V8w6Fy11ZLX5izmI9cYU+HhaQ515N2DxkYc7IdRsYXo=; b=aUaiDuKXdB6iPnu2I1HfKgkxvL9I0omCXNmOfX0wLJu/yEc5Z4CpJIXIDBN5HdFrOZhtoK9x5soRhIX0z+kyNhTdWvnhlz/XALWeZUOyBUmMfDiOT8XEW81qe/HhVjXcpX6zHvPOIRxQaPKF0JjWKJVtC+7TyPoOPInCw5HV0Zc3ZN1m6/AUH5A5Lp9xK7t8sSMOkNkX6OCGmRx+uop1D14C0RpvhLhdDie9dcrj4/vkXRdf3kgs86mGNZSnpBzkWmFp9DAb3yAhI0cbEiSq65cJqNx+2JzGziSGk5rJibTvVKm0zt8QM/9GJCVcMvd/4y9B6qhts7ZPA81MmFN/oA== 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=V8w6Fy11ZLX5izmI9cYU+HhaQ515N2DxkYc7IdRsYXo=; b=c0DByD5TA8MdLnnBlqkL/cUyC4PzMSLAYl4lNYHfhOx8gjfNz1DYCofdiyZlAwHmrvpCaX6sUZKOVE28R5MF0gOJaMRwx19l8bBxmAdIo3+QlsTw06xopT/VYcd86Wfi46/V2TIun98XBZjiLfnt8BDS2Tf+MgKcr3RfC+aQUVA85s3pPia3bLfgRAznCqgsvR5GI8S0L8QSKWBHvlQ3rm8DPixUc93Xp8l+m2oXP3VjAIQmykOoB3FtaaoBgRXI2D3GVJjrYhCAxCQAyERrC+bu4rDWIYPBk6M6/jwjrHWBQPZE/fpELNRnmANS8fwUHQOW+Wg9piiW2dMKes26VA== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:07:48 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:07:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 07/11] Squash to "selftests/bpf: Add mptcp sched structs" Date: Tue, 27 Jun 2023 09:06:50 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0021.apcprd01.prod.exchangelabs.com (2603:1096:4:192::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_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: a7b03845-1329-4ea4-90d1-08db76aaebee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q0KtTus+d4kmj8xIkd0bLuPAmvhS2VXdWJHK2o9EJMRGtcuN9KI1lIOmK//wGrlQljzTw8hngpi5v03JtUul/7bt+NCp458xZdnHjuVeJGaO9xyXSz7yhbX0OPzXmEFwkBdj+ZeZwT/c2Meh7M0RD/+HrVFUuEAD9BKgy+qnKiXTdYf9vllElqZYAT3sswcfVcLpLL1KW2p+dXpOQuQNaEGS5Da8qeO7AtrgSkUVLBaMK2dhVPG3B3HiQ5PzGV55WJs9NwTjaffMKyTc1iO9AtIYx9cAFNfgc/PKNhovsQ9zL2JhiMQaT26SffN379xFhb4tn82zcLiek9s1MgU0tYQv/IskFI1MT3zmahSyte2uTTTp2iXp6PHccE7+/KUnuGI8DOsqIH+dvkLQEDziOgP0QTHqlD9T2ik4WAi6Vih6DO23s8dmCYgpOiomnjLeVjFRy3SR8oyvuVK5yflDqEZdRPIInWh83RYcHtLsRZYRv1XHjtK6aLNs5Ect7IDY7d80/xCswONBMX3SGQcHxvSuU5p9gr0OU4PNPOEPuw9MUljSvq1/oQwy5uHZcdu2 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(83380400001)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RsMbPQ3zS8+EZKEwvePXCTrSCnln0OT+mqO1FJlXViukuTitE6jYx7dpoCSK?= =?us-ascii?Q?Vd7/RZ0cFetgA1wCNvVaL0AZ9Rvsgpn0s39PWgTIuvwcDIM2yoOmg0NOrxnc?= =?us-ascii?Q?tTLTNqqvg8ZWKMJGdjqWog6RcSEKbNOauwTCRlSIc1EW2Eq1NjuptUudNdhl?= =?us-ascii?Q?lqVVg35x9Rqk248XkWs34AaWmTq7Kscs2dqsuARcofj/rgL/KLGMy6wDmMrU?= =?us-ascii?Q?8CyCiQg2ApnqozHINvUEEUKaM5Iv6yBCjHoBASVrac+uERIrk1A8KGnfKlT2?= =?us-ascii?Q?f/Ql/fmK2M7axyPtZRoat3UNY+8kLKrxnx2QXiFavADm1CvNPUHET8GGUgB3?= =?us-ascii?Q?gkqrxgxxewfDfIbjTHr8KGZhrVMC8C8xq1C75WJf7A2A+e9acKUeC6571ujp?= =?us-ascii?Q?V1QnWXUJEw8eNmQ3JebbrHupNtGti9k3H3WZP85MUYk7DWHt/Df3Z712IBsk?= =?us-ascii?Q?onygUluKUwCW0sAeB0Z5W452dzlIqOQhW9mJI4tcusiiVtfFDy4MdEd2otUc?= =?us-ascii?Q?CmTA9X33IxOh1HUEH7CNjCBJde20ioPUqBhjLzi1IFL66wY5pjyh5Gd3DCE+?= =?us-ascii?Q?flWI5geF5tek/YEU/B741XojupKOkN5jmEutQSjTo6qWJdO5pJYQkdKPKsfZ?= =?us-ascii?Q?oNyfPzZZhhceABNW77uzvJNsK8oK3pGlPMkxA7e2IlGalEZmlaoMy3gp+q68?= =?us-ascii?Q?7Oedy+kPd/5K9lKdB9Pue489kUHyEQtseZRRZ9gWEMcVxLIABknDFZ2unB5y?= =?us-ascii?Q?kvRZaTZPJKZ5hrjS5ZHsG7AjexjsxRmxNvyRNP3/LhdyMzrT/7lM6HX36g9t?= =?us-ascii?Q?7hOaZ+eyNychTMzexzD71UX0yNbsDeeaaR/eFcoCaq8WkYBvh1j9sJQq7P39?= =?us-ascii?Q?xCaAdSaiYrd4uEq4oB/tM7+pm3+s3ZCHpmqi8TUkyLZQ46QM5C/SgxuljUGw?= =?us-ascii?Q?HOL1fqEaomdR/BeFRcaSkPz8KNmBww41CUkmkZVDbZFylfIzwDaGhpRVpXPs?= =?us-ascii?Q?j7xI3mBn7cq6XuRNfJ/iyOwv/kLh2pDyy3NspsMTvQKknLysHl32OoLnUFHf?= =?us-ascii?Q?MNuvP0BsJ6BUQ/b2ZuhLrSEveF2WVFx/ZCUgUc78t00B+lXWv/aWJ96kx4am?= =?us-ascii?Q?IU5SbDSMUC67dGHPKFtwEVv1Dm35JiQ3ADzoZmQVAKtpAZ/no9DONHIERPyT?= =?us-ascii?Q?OnKk6ruB6QxbC/Yn4FqiAoZNATBK5q+fwFkKHfusJQ5lxSuaTMQrqOscu3XM?= =?us-ascii?Q?71uhH0/j6Q8m0vIO9Gp16uonSSRYWdswe0bSrOpr/vSFkJICZoLlYt0VP+4y?= =?us-ascii?Q?khg5OrXXoJ78namHPnsL+xLiDkNoc0dBE6jfoY1NXOA94/BFXftI9JorBrqe?= =?us-ascii?Q?67WfjjQ7i9K4cX7fJXsjkm8zLbUdJ4vFZHgCSVoxXfghjJqLuWW5tIK3jOAK?= =?us-ascii?Q?tqcuMj1myhLfNX7j3U9UoR2qMNowWmcP3RFZY3mIXs3fpj/VvbxDxcceUuH3?= =?us-ascii?Q?V/y3niXyuUr0m2cd4QrVqb+qh3NZBzCukoCIncarXSRi/cD4wDxRfqJTNOUM?= =?us-ascii?Q?jMzXirt+gFY6mTFHTVgh9QTUOW3E/T8bPIvGjbic?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7b03845-1329-4ea4-90d1-08db76aaebee X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:07:47.9699 (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: Lc/+7W0Kpuh2RIuOanlpJH//Ep8sDfJaNOKRiAKQBMEb4G8o5+fsIpWFFFJ/uyHz+7HhE2/iL6bWy7KbM5dyGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" Update scheduler API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 72c618037386..b4b766c7a68f 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -240,19 +240,19 @@ struct mptcp_subflow_context { =20 struct mptcp_sched_data { bool reinject; - struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; + __u8 subflows; } __attribute__((preserve_access_index)); =20 struct mptcp_sched_ops { char name[MPTCP_SCHED_NAME_MAX]; =20 - void (*init)(const struct mptcp_sock *msk); - void (*release)(const struct mptcp_sock *msk); + void (*init)(struct mptcp_sock *msk); + void (*release)(struct mptcp_sock *msk); =20 - void (*data_init)(const struct mptcp_sock *msk, + void (*data_init)(struct mptcp_sock *msk, struct mptcp_sched_data *data); - int (*get_subflow)(const struct mptcp_sock *msk, - struct mptcp_sched_data *data); + int (*get_subflow)(struct mptcp_sock *msk, + const struct mptcp_sched_data *data); void *owner; }; =20 @@ -269,5 +269,7 @@ extern void mptcp_subflow_set_scheduled(struct mptcp_su= bflow_context *subflow, bool scheduled) __ksym; extern void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, struct mptcp_sched_data *data) __ksym; +extern struct mptcp_subflow_context * +mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int= pos) __ksym; =20 #endif --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2059.outbound.protection.outlook.com [40.107.104.59]) (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 5CC197FA for ; Tue, 27 Jun 2023 01:07:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C6rIPZucCx8hWf35iOUo2rIl57ByuHSup8gBKjzG8EI2HZJxP2uCXt7noixGElcz52o2CG3PkJN3l2rkpJ/MuNg79ODya2BIF2PwUfHvrNkxw201JQG+chQH8OvB5mz/9utn3FgfJvFd1+oweepnJs33AS3rCNMrW+HPQNeGdIGyAbsk9U910WN+S9QiXrYGc1kKucTcBf7Oon6L+3e+tH74Z3m6pgnWPJJSa7vkasZOr5mWeNO5QuUJ5MjU/CRjjWvaVFGcJoE8OvARvP2uHxrFrvEq7BBQX28p6JJWsmfzzg2naL07NKUjPobvFbxzJA7/ZUS/qXm9noY1xhDECA== 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=dH/BCo9b6Ymj3RYk1zs3W/CO/8hYS832oSxhpwKvazg=; b=PVbGqtn0zAaMv/lpZ64tIGehPFCOAf1MKVQISoxP1ebANt2og+erd9VCpuRIPpK04I6FXeWNN70PL85/8ql/+GTvogzH9VcmQ+XM09MqbrHN0MzoyUSRaK3Yta20ZY5B585jnA+DllEap7FadzqjYwiHlzbKjZvQFI+2Z+xE9vvptjX+/SA3qDNNNWqRpG4zdA+I3QhMxPSo9tA9PL9dZJLYwPHfZalGNTTUZx9BL7kHq2nJCQnDOjw7RahNdVHEpy7YQu518vz8+v1e74szHpBc5Y8Yj3bCGUsBWAihhpi+iDAkukh3FGUiQAKi1UJoju1ZyVtMkB2l/WLhWdojzQ== 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=dH/BCo9b6Ymj3RYk1zs3W/CO/8hYS832oSxhpwKvazg=; b=Tkfy1NrTAHt8N8OnQjNw3otFXNdWFbAnxkrDQbXwrDAYSkft8ape/kBJRLRQPUi5Ag12sRd4r3w55sBu6tFyP8uiDosaddeVuJxbybJN1WBIuWHMAPzBOebiWYTLft2J/wz0Muu7OBNnkUbEBRLZXFB0rXk0VUrMEPpB4+7zkZOHNcNeuqqaNj5jGGpOkhKTAO2rVNZYq6nfvY3AZwRC3kEwkeGwf3KX1YDo7hO5HhuUEo/s+/Ja0VnIzY0qD/o9F48bTvV1RgyA28NOk9J7HsYA+PiXLAU6ikYBMtMcpsPVFU8qOofIJx5WoV/zwPGwdrdl78q6qReAxhhnK4ryZg== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:07:55 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:07:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 08/11] Squash to "selftests/bpf: Add bpf_first scheduler" Date: Tue, 27 Jun 2023 09:06:51 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0031.apcprd01.prod.exchangelabs.com (2603:1096:4:192::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_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: 6afec71d-1bf3-4daa-d415-08db76aaf015 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P4T04IlejU/I4pcVmxWpL5UOqeiISRikuMA1Y3aTf2hhaln0xYA4wOfmyFxGswBAa4G6xQNYBF+IUpKiwMfHA4Hgb1OzLbGKzD4o6B0EhgdZhiZT5GNRHi0PLWqzOLkl5RjTbwq4S0Zx80W5spFZMJjPSzbyg+YhKCC0huQ/Jd5ljNFi+3ckIgc1oRLgzjPTYxUpdd/5aY1W06QkuFnTwAX0/qBNc6iTZSLdAHKirlR0c1LrGebwQFALuShr4bzAGFR1IcoczT7iMlY59fw5qKIDuhlAtC3WH7Zs6LeiRYg9f87ac3N+sqW3qs/9jwdnTsTqDQQ4aLgVO3YIiszMmnlj3qGZQECC48cGcWG8GwepcIbqemoPugWs7EscL3+eYw8vWFlyDcO4FBNLAD8pgqmMUxq3EtE/KE7+NQEIAnro1rU9yKelvL0lxPyFBzqiUKYH7DfVcSgcVehdLld+Bshq+Nu2lOJxb9PpEzjHwwO38HoTn+OXBTNMu3Y3W3y31gZ/H8c6/pDhWe+dd+FTQwjASWnPaerRSMIgfE3hFXWjgrzm4s4yzIvaK/wbzQVc 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(83380400001)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ollYFHntfwlvLupZ7CyaOIX3/QwL9cmbeiXtjzmGX5qFl+/+2PmUgylVuASN?= =?us-ascii?Q?y5Al12NS5FkWlmbBBHEqdJ3APIkostZ6iF2Huwbfl0hgWBG+a/K56sqpIi4U?= =?us-ascii?Q?F0JmTrL0SH/cOv7fEBmPcxmYqDlhl25OG/1SoxaVgNwTntRAvvIXObKwKjFA?= =?us-ascii?Q?IaNPb/pSZauCZNJOlAZN6G4zCzkvGMi4POAZPTg5CxhUernylG3d4hcdxDJI?= =?us-ascii?Q?V49tkWCX2RpBHKDOliXkSV12Go9u513xj0sPKYi0qNtDz8fB/Y02HfOPcMAo?= =?us-ascii?Q?GYB5Qg/gG2rJ1ac66U9ewxRHQTUohGVYsV+3BCKA3e7kXW/zTZSW9pXv82V0?= =?us-ascii?Q?EEJZ4f/ll2dWSEUIU3z1r7du8UYrFKU4tkrReE1zczz8HZzVicvr2L9UTNFe?= =?us-ascii?Q?8MDE16v4LzyvSdMokAaB42UDvPpZTWh/e3gkqfiJHhbalrzYeVukaGpWXMAe?= =?us-ascii?Q?6AObYvDkd3BVuUZZxTPmVWEWCjwd0SRp8UTrADzlvniVLvBNgDrWSF3XQ7fk?= =?us-ascii?Q?jnrdVUuKpuFdkQkG392Ba90Dk9vEuAAO+EPpYF1yOZ4QpMEcHa+a0/BPr/Kj?= =?us-ascii?Q?bCADFlikfq05HyGjQ5A9KtxuovRi3z1MCXy0ag/3Etg0KvZctM4oy7pQEz8S?= =?us-ascii?Q?ehDcXjsgcQ9yPEWwR6mApeBHsk0FM9s+kM6YrxHU6Kvvn2sziccoggWL3fIi?= =?us-ascii?Q?u6sVCNGqshA7Nc+dGh9tkPvO3re4kIH/44o1F1lGcIoLHOPm3fhsUurCA0h6?= =?us-ascii?Q?nUFouPgkVcuYODyMdS3q5GgWviKEh1kzaptb/1RQSSiQY8of7zC1fhgxICkD?= =?us-ascii?Q?xfJpAQgzHNRWkXa8SfJJQKMRr3tyNV1NTK0y6M1aF6qQtpP/Bq9k10cX7Urg?= =?us-ascii?Q?DfyqR62aIUBi4L/goT6i5PkZYn/I943Gtf9DawHPt8E/9zHuuyPXxel+FtE3?= =?us-ascii?Q?kuZDEEI0+gbAOBVhCtZ5/gQsjFSW3FkIKIQPXxgIQoYruUZAAsdMPwg0XG3E?= =?us-ascii?Q?TAD3ktre7XyImOyiKGVSwZvVaQCVPRkjd+xPSbUzmDowBQp5lI51Zmr1Yr1s?= =?us-ascii?Q?cygQ3vKpaMjI8BikUEUJyTNyDNqzn2r9/X5OROYkQybE/rI2dQ1IfYrSpWIP?= =?us-ascii?Q?jW/SSdFksSH4+ib7GCbhtR5cr9QkU+eYD2ra1/M6JIrFlAUo6ctweSQnkmAl?= =?us-ascii?Q?75xrzcpcp3RmW4W8Ge0t3mUs6tiZ0L2aMyN26cuzhKag03Qpq8sZGg9WbJfc?= =?us-ascii?Q?ixsb0or44tX2kuvM2aj3rMjG5aBz6ffxKp02tC9Tdo7GcrFm6jvdLq7ZwORn?= =?us-ascii?Q?Mn2qSz1Jw3DJeUT85VYtNcCM4ZolJlE5k4rcdBYd8HR0Lcfv08R1MraObbN+?= =?us-ascii?Q?4aygQx8SuDts4ufEls7eiaFL/1zQqTaFgd3etPV5bggjsH1LZqQmfRB7tkAW?= =?us-ascii?Q?lxAQCD+OA1rMNB5/JclowsCYcAW4JTLMHcU/UluO2UKjw4N/A7uuamHP/5TE?= =?us-ascii?Q?GgAAt1lI+ZpqzHaHYZs2acEI0oGa92l5ga5sC6O22ggYw+e8ceKovzxg9s/W?= =?us-ascii?Q?sPFXtoW8/oA+/FmYzN27MhEVLTh40uYCVM38Y0lT?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6afec71d-1bf3-4daa-d415-08db76aaf015 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:07:54.8957 (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: mW2Xa1uEQreXn8ezTMQhSe2gTw4ZsBGJXTtFDY9twDN40mJ3TOrP7YZe1Xqb08JO+ZD3MT+iQHhSdx6kamvwZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" Update API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_first.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_first.c index e4caa2dd8c6f..3b6669d536df 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c @@ -7,25 +7,25 @@ char _license[] SEC("license") =3D "GPL"; =20 SEC("struct_ops/mptcp_sched_first_init") -void BPF_PROG(mptcp_sched_first_init, const struct mptcp_sock *msk) +void BPF_PROG(mptcp_sched_first_init, struct mptcp_sock *msk) { } =20 SEC("struct_ops/mptcp_sched_first_release") -void BPF_PROG(mptcp_sched_first_release, const struct mptcp_sock *msk) +void BPF_PROG(mptcp_sched_first_release, struct mptcp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_first_data_init, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_first_data_init, struct mptcp_sock *msk, struct mptcp_sched_data *data) { mptcp_sched_data_set_contexts(msk, data); } =20 -int BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_sock *msk, - struct mptcp_sched_data *data) +int BPF_STRUCT_OPS(bpf_first_get_subflow, struct mptcp_sock *msk, + const struct mptcp_sched_data *data) { - mptcp_subflow_set_scheduled(data->contexts[0], true); + mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, 0), true); return 0; } =20 --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2063.outbound.protection.outlook.com [40.107.20.63]) (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 341EE7FA for ; Tue, 27 Jun 2023 01:08:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dkUviqdr+slvKIRsSMyLyMIkZApj+JORUxHAowoxEjRnUIf0MyQm9MmdvX/zHef0A6pXd3p8hAFFBXILm/bOvfgPzPWiEHWtT5ZWInBk9AbWiUToikXuV0oG/nnfj3wX7HT8MH3ufpXoO6dUcznoffffWxQCRIoI0dsJbHrTYpQBNksItPtoddUCdj56iMEoHSiESuO57dh7iFYBuf88lgXvhPnekkousNYrlXgSlPoikq4uFf1VQJKO/ZOwQVkDe04ASzqGBhy5Z79NmNWsOChFPUtlGW6Fp6P/xdJANfwyH/YLZh1etJCMDd1RulGl3ltG38NYuI4EQfIR9w7Zaw== 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=gGiO23idH7WqjqFNG43TvUxEhjYK9d0fVxColXMTePw=; b=aLlIkglALpLAPVEAIxwsuafpEHw9p5I3KZaih8njoeqXh47+iQmbG+sRIpL6YC5dTCaDN2gdgbtEHtBWuRrrk4Moe9kICU0lETSV0O7IzOhfZ24+9/RpdYJXmhWuRmic8bwX95+P6A0NT2t4EqE7E7MiE6UdmB1f6knP6ksPY0twoiJUKYKpATjRnkd5DdugRhVtiNpN9QcH5AeUDvNvaAvQByWma3itRkaqciBu44X/vAcJzO29bk3BFWafA7koc7Ty+RTCNi5Ew4I5QGLv56UFkaDbzY0rdbTpUhd7sjBS9SHtrRROCOrSBxg9/B8/Bxt3gtCRJZlvOdOzzoCVkg== 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=gGiO23idH7WqjqFNG43TvUxEhjYK9d0fVxColXMTePw=; b=FTAgfHwtDlFWMpXSBoQ5ffxLVF8lFkOECWs0iCKcqxx3PNi/kJDHgDXCp4JemI30aPpC1RmzNMzsxQGckM69evVZbHHgc7xggs77gaXQ3sJV7YMlG5rkzsJ+Jx8wRGvZFbNuzSDD/60Be2PSqzhCIS47xNcKEsWn3lAVCNVAizleLnNbJin41npZ1+digpXgdu0Co/ZaCTN7wtndeHeU/nMiokF3oTRlW3YZKkRzyuDEifFt19elhCSEoHRL2cVrunDtueRSuqOHmWlpFNq7bSMuTBf7sIe6XKdLafKkRb9cNI7gFJpcOY0JpIB6TAt8FXI0RAkgI00bLNHvFLvVrA== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:08:03 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:08:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 09/11] Squash to "selftests/bpf: Add bpf_bkup scheduler" Date: Tue, 27 Jun 2023 09:06:52 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0008.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::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_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: e4d12967-ea0c-4209-0d1c-08db76aaf4d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ni2QQbAIhAE5y/08JHwQdLNMB8/ZeNpjfCmfzIEcMxX5+897PcW2np40UeUjchP1SluiFmllTdZwBUTZpl2BuUONZke2/PKzLHFlnDcEDDrfiFTixVJopLC9rpEbcrRO4ytx08ltNFZy+PxPqjCpTbVK+quEeoXivNp3blJENTewnBVi/pDz7Ep00sdcyXWnWEUTgHvgJoNkDsFp4UgA/sD1X+Y7GUrH3aCTmJ8+tmxVCwU9LVRz3O/QK9yNA6CnfM1nMsFE2VZDPzw6eWfiKcJrK3Y3cNBHsKyNBIgWr1CFTPBxC0gqLwB6haPJ+LNK3j8LCuu6XinHuL37CSQ5MSxMxHT4TxEbJAu+JaJnOe0AwhX0ioe2C0V0h5SoX7XoMCeeypA4kSk70Ls6eiMVC+OsNYDnQIyeWShswup3syH+WB3kdSLxVatZK1XV8trhST/e1FeRivSBxk/u1SWoe/GpFmxWMxQyIE72XdU+rNmxVJny0HZ7J4xUvMgJsobLCi4n1ftfu7V+a0rcY853Nu4nTBsP7oj8Gfc0WvKrxqPSEnkUyQb7+ZBmBEJZgk1Q 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(83380400001)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JrUYoNBLDk3EHyHrA8U4nxoBqOTTs6V4uSdIRhVq6SAaAzD23X+RU2rIgjnA?= =?us-ascii?Q?tV/3kUXM29u9nZ7GEtjJimKEPvnmNDJOKshm+tZatLd6W0XlBO+D59X4AV1v?= =?us-ascii?Q?KQvvNv94M7ivwU6A8BrXrdaP7vPX+QUCo+YoZ80jLkTERQrHC3sonyI+YlPO?= =?us-ascii?Q?0qSYhl96/f+LmkxutqWNwkrxcQrSOZ//xbxiDh2DrnEXY1N60QLtPQhhRizW?= =?us-ascii?Q?zxQRneoZQ1Nqeu/S2MYf8xsmKyQnsU2u1g2+EF64WMuo6Oc/jUIAVMS3ee38?= =?us-ascii?Q?SD9gHDNedOW1dwNHd4xdAnO9e+YIRjCtZT6wiI0uGkFhGgvo3zKxCO5JE+rm?= =?us-ascii?Q?pmeZPIxxmqsczZvl6RY/4Z6ytnT8YR9JRaix1Ldnj6uwMbnYtULzkV9ZDKY9?= =?us-ascii?Q?ZFhTzV+rxri6fbkpVrxsexFc52Rs/xBI0x6izjYmgGOhQ0xibsRkD+5jwa8L?= =?us-ascii?Q?7XRLzVF2sJJHOJFEKK7Pio2C75FOOXSOPYQFuf3LVwzt5lC3mkLXitqMzLiB?= =?us-ascii?Q?u7EBTfG/bi8G9gYj3hGNnSoPOfYfbK8Cy3J/2EgtOYkLi3JG5WbFoUtbtVrO?= =?us-ascii?Q?jJFaJS9qNNcE9vxwmj89RAZsvSrgLgSpwfLuT4ww1W+aezE5daFDMc0CBied?= =?us-ascii?Q?fVe4mDLbw1S4veFmDDLuDhO2NbY4vUiQR3avAMmPzLrAtM1Jy3HI2/HMmlS4?= =?us-ascii?Q?/zHiQYNLYhEx78vQuM0NL6SG71C2vk2RP9AJr3qpsrNXJrv9X8TXRn8gIt1y?= =?us-ascii?Q?FUDzSYgopPcnweGvMikWyaQ1HaPFT4LAAdw3pVPwh28hoX4QBKdrm8clJYrF?= =?us-ascii?Q?p+nfoLJhFkLK5I6CrY9XzmaSnSB8fH66QnGJUN3jVYE8ZZVKCYza6AmMa5o0?= =?us-ascii?Q?HxFe3mnhBsbNMjSyylGoUbjK4IZ2bPDUxrbA/uUoXDVP07KDFfiDq89LjcmU?= =?us-ascii?Q?CGm7rzFdK/UoNrQj7TLSSvJo7JCnzr7Ne1EFVQeu6Gy4KqYD74eeUa849QQI?= =?us-ascii?Q?53bdfRRfHm4jR150z/r8gTGjtdMjhP8M5puozpqtuyKpVpqCAhp5NEs0oO7G?= =?us-ascii?Q?TUCS+h7ydFESa2n6AZIPg7KrU+dbwThSIQqx9f/IR8N4nCFOlvhH7TAsaQJz?= =?us-ascii?Q?Kixv7Do+hip4bv1v7t79Spk5xCMQMtpFraOypNLcGP7dJ0bFJ/8Nnpiod8RG?= =?us-ascii?Q?wFoc9uJOJh6+G4D5Wo+xyKIZ+8VLTachKK+ZxRJ2Z+0b/9rZuvacN9hOjp+Q?= =?us-ascii?Q?K7feQjdxlWSszNZ5jfr3U8ugyFbeQZy65+Bh/qVO72KBXKzEgEOBsIveatia?= =?us-ascii?Q?92YEO7Md1dorPyVymybAP7CKr8/2LPAPeF/Cs9eetLFx7IF0EXxgMc9RZcEI?= =?us-ascii?Q?UTIQ3nCHqC9Vy22yJu7PMFT8Rnsxiq7CeywaZovK7HyEICIqf9XjdyIw+sAh?= =?us-ascii?Q?Gq116asAD9j7vkfmHYSSLoPYx6A1hUwFsZowwH27Z0BJ6Z8ekNBdlxAZkG11?= =?us-ascii?Q?V74eI9ysP6ADgJcjah9WZ4DfxmfZn/7A4smLkHai/l7wTWfocLMF47glvIcd?= =?us-ascii?Q?3ZnZu7yp2khY0hCNsBUG0Nz+KMs+BY7tBnZ0ZeT3?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4d12967-ea0c-4209-0d1c-08db76aaf4d8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:08:02.8696 (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: bzZ64iLXMUPA1qM+WFDmmR/4NJc31oEOm7gvrmYNR2f2E5ismKrwLCN9mBeGsf6z9VXqot/DREHwCRUQoUU3pQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" Update API. Signed-off-by: Geliang Tang --- .../selftests/bpf/progs/mptcp_bpf_bkup.c | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c b/tools/tes= ting/selftests/bpf/progs/mptcp_bpf_bkup.c index b2724426676e..e5ba97390e17 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c @@ -7,37 +7,40 @@ char _license[] SEC("license") =3D "GPL"; =20 SEC("struct_ops/mptcp_sched_bkup_init") -void BPF_PROG(mptcp_sched_bkup_init, const struct mptcp_sock *msk) +void BPF_PROG(mptcp_sched_bkup_init, struct mptcp_sock *msk) { } =20 SEC("struct_ops/mptcp_sched_bkup_release") -void BPF_PROG(mptcp_sched_bkup_release, const struct mptcp_sock *msk) +void BPF_PROG(mptcp_sched_bkup_release, struct mptcp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_bkup_data_init, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_bkup_data_init, struct mptcp_sock *msk, struct mptcp_sched_data *data) { mptcp_sched_data_set_contexts(msk, data); } =20 -int BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct mptcp_sock *msk, - struct mptcp_sched_data *data) +int BPF_STRUCT_OPS(bpf_bkup_get_subflow, struct mptcp_sock *msk, + const struct mptcp_sched_data *data) { int nr =3D 0; =20 - for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (!data->contexts[i]) + for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { + struct mptcp_subflow_context *subflow; + + subflow =3D mptcp_subflow_ctx_by_pos(data, i); + if (!subflow) break; =20 - if (!BPF_CORE_READ_BITFIELD_PROBED(data->contexts[i], backup)) { + if (!BPF_CORE_READ_BITFIELD_PROBED(subflow, backup)) { nr =3D i; break; } } =20 - mptcp_subflow_set_scheduled(data->contexts[nr], true); + mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, nr), true); return 0; } =20 --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2050.outbound.protection.outlook.com [40.107.20.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 0B1287FA for ; Tue, 27 Jun 2023 01:08:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GuA8o1F6MEIiH46pwX3Pfe6I4VrVRtYPHx8fiQNMsIWlB5JI9xvtgCmIxy7u141CXtFkmxB9zEPL95qY2uIPTYz+Cpjv17dOh3i3Got+V/M2vEaqk6r7BZppFPdp3a5Fl1mgDbKmD8dFMoZVukZR0c5ksTlKG8u6MpB+JKCTVI/ADyeEtpTMlHkb2IlGIjyPNYS52MGZEpG/+73vljAXkZJW4PGIzkwmzSBl4Ju3MERkTIXR9e/Bi5YAy9M8nHD0bAYVBLSzXA7x6JdzhbO74tYRD9q/qzNCI2/GNJTteEnjyGVaSh9vnb5TxnUk4RoqC9CrWgSvvey2xmQcAorsAQ== 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=j2M21LhEVa+TV4kVcZDTDriCjy4o26GIos576DA30Mg=; b=H/T196LlzpvA4c6kOECU/3TlZjp4yeq83UUyBTDiYwacZ2DVHNt4Hc3Qr/KeXgu/6VPAOIVmRbudtgWj65bEuDcFzYZl3jRw5KYxPIIsm7bGVOynDlvDmyqStVt++U8lHggmxXoQOmft5YNe/glLggA+oeAbCMsNgTSYoW2ezYWWZd8ElwO7y4n7AhqxlZBGzZx70VRcBSn3WPL3UrM5LVEiM3MYL+xqZNxKqsOaBRZNnkRTaqtVkqzB+QhX8pPnqMSzhJEHkb8T8OH0SEDJ5Ivuz07JLRPainQnNJmDiAPvJeRtaRkbgI8v79CdO962hq/rV1F8NSynWxMngiUhgA== 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=j2M21LhEVa+TV4kVcZDTDriCjy4o26GIos576DA30Mg=; b=AceQmsCqa+iAQ+MaPrHg05z8M4xeZbgTL0CIQmPujDKBI0vM2M0bkry48OiCdFg14gnDMvOrMejlp9TtVwZbb6HVLbwvgLhryNTZk6LWNX0NSt3dXTAGwkQW7rYCdRiHSwED2R3VSIAQLLboIgDEZaJBN5IkeqWC7Cmja0aTVSAUOErHuZGcNf4Dc0kR3u4GiNmkft0sjD5//n6WvVYdS/svz99PkizIEAFCw96vImZHlrYIsd2KV6z2OkBwR9zwikUtrXF53Dg3PNdQp1vzo2MrXqvp0z+CAvGv1M3PJ8SUmnWK3mPTthtmnmq/I3zvNepumsRTodZ08GxmfsHxsQ== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:08:13 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:08:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 10/11] Squash to "selftests/bpf: Add bpf_rr scheduler" Date: Tue, 27 Jun 2023 09:06:53 +0800 Message-Id: <664d3df8d7d05c3cf5d092b6fe5c8e418a44cb16.1687827857.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0016.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: 187baab2-456b-42bb-0cbc-08db76aafaaa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ISPPw8vfYx6D1IW9bEpSS86RzpQKlaGH+EASjAvO23figJ82kekxEYYFaLMtfHXIXVxbjoMET9OG7YAWEzC8wCj/dqnbeS7/Uh82pKTjBInO2CF6+1Wf05WpvVrDAx6VCyMx23MNYE2ljr+ufS03OpwdLpxvYr4BXKFVAMQ1HnipLAxjV1LRwbpO6nx3mHRoPeo3m9E+lY+euNI3Kp9xs/ncKIsIBCudu5CHxsSoAYoE3nyfCfVD/KMqUHz741+jtN25Y/4Un7UA2jF2AGZxQr7NSyQI4bblq6zhtFcRmqDZ6LMgc6Gq/lKuCaTL339+arQsDAQqGS1u0j/tIATLtxBf6jSx2HwnI3jetpKtMuTGw1c4FAU6R0/yIGXK8+BxvY3ez8PT/fzavbrbZuFBt/sAWK8y2J9Kf8kKJ8j8Ff+tVC2ctrGHJFVeFfF23730Tgq/GFL0XXPGTuCJ5m5y36Thw8+wnXmCZAd/RMeIBaw4JTcSeDETR9HnSc+Asu3neoVk2TRB1Fh5s/rET8xNj/P+esvGk7mkK+hYxjEE3D3rFPjwGAb2Mi8Xc6WuLBCt 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(83380400001)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Wt1b47GNYuqOqAZ3D7OyXYfVZhF/Et2qclzBbneA9OE65eChP8lGn/xUKcQC?= =?us-ascii?Q?NAH+83W1o+NaR8e2VSbly4smlATnehHke/Bt/VEDFnqOCuoOKKhwn3GFdHYh?= =?us-ascii?Q?SWqGBHyyqWophjZIXKN+IcJDdqdmQPRaZfFQZuzGYWrD1H3/iNmhEWBeVAxf?= =?us-ascii?Q?2J2sbCDCV9yveEaEi7d5bFOz5q67lkN1dAFQ7mMBbGrttdB6LCxMz1Gr7mdh?= =?us-ascii?Q?UHiFxST7FLDshE25w0MaTFnBtX8YOW1XnE37MygxkfsW1aFFUDkc0N5SDoF6?= =?us-ascii?Q?Tri+PBQKADGIeS7BPYIxuH7lUGCr+3c6EgnDM+TyYr0X2BgEuhscCTcZb/pu?= =?us-ascii?Q?2dwHwoEwdyJodAJaAD0S9RebiKEuLp+5UUETK1nl75o9IACIX9vF/Lz3IOsi?= =?us-ascii?Q?y1AjVJWvJJUyUFM5FGKL5pF8+TfwTLXC8tgTVIGCQHKlDcAFxyqkLuA1nnv9?= =?us-ascii?Q?t6JNjtl75eS6ouv/Qx+vdj9qEuZd0LC+/b9LLVDblC0xv2nTkQUDoLo3IMDt?= =?us-ascii?Q?3UcGWmSSu4vMuZLfFprQ68a/8Xw23nWs/fbZu/Ixi5PeOEAyrk/9+wi1Sq9I?= =?us-ascii?Q?hCLrjUv6IG97j4llot+JiNZcJHWZ7WbU5AJ10OsqRTW6tkAm0bN6cxNioPnI?= =?us-ascii?Q?/lVGTH928klR6WBDgl2YrTRLE7XytoZd8yMQao/t3ifY1CiWn85b5Lh1JUvI?= =?us-ascii?Q?UdrYo6stwWO2qm89htAslxOaxROeigHqjpyFSnC6VMsxcFP2Ouees3qsFrPP?= =?us-ascii?Q?fOzbp4M8qqtLmRJaDyZndOk2IZCCfKrBY38Cyq4AbGM7HYiWTto1hm2oNxzo?= =?us-ascii?Q?ifhVIRkORBm5JdLW/zi6wCd+k49hJk0+ks2lubzJPfO+ZVYVXLdz3dmLt1Wf?= =?us-ascii?Q?HUyU7sN7iEkfdXRpGx/O6oTyH6zR4SB2PN4Nl2eH6bP3bznKqgnivnXPW/lI?= =?us-ascii?Q?c7vNgROpQiAEuX/mydjJQ77gb1s9Mxley/Zh48DMCWkyclw1p9PZbZ8YgYV8?= =?us-ascii?Q?UBP7wXzOWX77JEutWJ/XD5ZyJLVc2W0mUwo7wE3Wg+lLWeOheJ68JZT4mWqg?= =?us-ascii?Q?wdPdwzMLHx6KdX2SGRbXIe/nzYf72AHlRb/7JlmxS4Xd6M3ylxyheJl2MaEt?= =?us-ascii?Q?aLq6gRuKd8fhwAv4OVy/Z0Vkv+1GYwlMo0Q4PFUKV6iXwuWfLzXTY1JuSdms?= =?us-ascii?Q?wrVWLleyNXPzA5cSfdyWli1AFF7GN4EyzYrru1wCUoLlmczEouxa59TVPeJa?= =?us-ascii?Q?dhnMp/ono37EmHqeU9mG8E+j+cWAK3TpsAR+razdEEAkz7olsEldalXALPhg?= =?us-ascii?Q?GXxO7pv005OWqcBLB4lPYpoOlh8gQrKCEOyebVAyawQlD2cPMcWVT7x0/KNh?= =?us-ascii?Q?PR+7ktlqdFEe1OtgYp9dgfLTZJm5SjeEdiS7vnnLtiMubmBN/u2c1ZBg5dpv?= =?us-ascii?Q?APhIet1NrOB1mrp1kOt/aRdiA7zqZOJeMwevAsxaDf3OYaTfZqUScPlVd7r+?= =?us-ascii?Q?FHwSo8RXpwS5LMBjmICzUSLe2IYrc9Q4rZ9KEbzfE+X4/ZDoZ+8P8yEmN0Qe?= =?us-ascii?Q?JrfVY2p4UvsWn6+XKBoPAOiqNEYhWUqluAgQbw/f?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 187baab2-456b-42bb-0cbc-08db76aafaaa X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:08:12.9085 (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: R//0cLtzMVve+Eou2sbu0OxLbVtjzLT3z8HanX/z8CfqhWHr8THdVm/KlG4xcVxw+ADVCvbSSCCj9c7JHGDqAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" Use sk_storage to store last_snd, instead of using msk->last_snd. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 6 ++- .../selftests/bpf/progs/mptcp_bpf_rr.c | 44 ++++++++++++++----- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index b4b766c7a68f..945dd46c98c0 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -259,7 +259,6 @@ struct mptcp_sched_ops { struct mptcp_sock { struct inet_connection_sock sk; =20 - struct sock *last_snd; __u32 token; struct sock *first; char ca_name[TCP_CA_NAME_MAX]; @@ -271,5 +270,10 @@ extern void mptcp_sched_data_set_contexts(const struct= mptcp_sock *msk, struct mptcp_sched_data *data) __ksym; extern struct mptcp_subflow_context * mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int= pos) __ksym; +static inline struct sock * +mptcp_subflow_tcp_sock(const struct mptcp_subflow_context *subflow) +{ + return subflow->tcp_sock; +} =20 #endif diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testi= ng/selftests/bpf/progs/mptcp_bpf_rr.c index e101428e5906..21144e96ba56 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -6,33 +6,49 @@ =20 char _license[] SEC("license") =3D "GPL"; =20 +struct mptcp_rr_storage { + struct sock *last_snd; +}; +struct sock *last_snd; + +struct { + __uint(type, BPF_MAP_TYPE_SK_STORAGE); + __uint(map_flags, BPF_F_NO_PREALLOC); + __type(key, int); + __type(value, struct mptcp_rr_storage); +} mptcp_rr_map SEC(".maps"); + SEC("struct_ops/mptcp_sched_rr_init") -void BPF_PROG(mptcp_sched_rr_init, const struct mptcp_sock *msk) +void BPF_PROG(mptcp_sched_rr_init, struct mptcp_sock *msk) { } =20 SEC("struct_ops/mptcp_sched_rr_release") -void BPF_PROG(mptcp_sched_rr_release, const struct mptcp_sock *msk) +void BPF_PROG(mptcp_sched_rr_release, struct mptcp_sock *msk) { + bpf_sk_storage_delete(&mptcp_rr_map, msk); } =20 -void BPF_STRUCT_OPS(bpf_rr_data_init, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_rr_data_init, struct mptcp_sock *msk, struct mptcp_sched_data *data) { mptcp_sched_data_set_contexts(msk, data); } =20 -int BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mptcp_sock *msk, - struct mptcp_sched_data *data) +int BPF_STRUCT_OPS(bpf_rr_get_subflow, struct mptcp_sock *msk, + const struct mptcp_sched_data *data) { + struct mptcp_subflow_context *subflow; + struct mptcp_rr_storage *ptr; int nr =3D 0; =20 - for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (!msk->last_snd || !data->contexts[i]) + for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { + subflow =3D mptcp_subflow_ctx_by_pos(data, i); + if (!last_snd || !subflow) break; =20 - if (data->contexts[i]->tcp_sock =3D=3D msk->last_snd) { - if (i + 1 =3D=3D MPTCP_SUBFLOWS_MAX || !data->contexts[i + 1]) + if (mptcp_subflow_tcp_sock(subflow) =3D=3D last_snd) { + if (i + 1 =3D=3D MPTCP_SUBFLOWS_MAX || !mptcp_subflow_ctx_by_pos(data, = i + 1)) break; =20 nr =3D i + 1; @@ -40,7 +56,15 @@ int BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mptc= p_sock *msk, } } =20 - mptcp_subflow_set_scheduled(data->contexts[nr], true); + subflow =3D mptcp_subflow_ctx_by_pos(data, nr); + if (!subflow) + return -1; + mptcp_subflow_set_scheduled(subflow, true); + last_snd =3D mptcp_subflow_tcp_sock(subflow); + ptr =3D bpf_sk_storage_get(&mptcp_rr_map, msk, 0, + BPF_LOCAL_STORAGE_GET_F_CREATE); + if (ptr) + ptr->last_snd =3D last_snd; return 0; } =20 --=20 2.35.3 From nobody Tue May 21 22:34:18 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2058.outbound.protection.outlook.com [40.107.104.58]) (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 7ED477FA for ; Tue, 27 Jun 2023 01:08:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D3K8bNIdP3M10o8OCM2cRsH12RNmtN3fWNGpSW5cPhYLb9PCMsvwtGP4iT+sW/1f75+U8n8L4g33bIKtcNV/Pgn/zWwTvgivP0tNfnFHhXBzjLJ6V6KBmxtXLQjEm1IoEnz8PomvH/P7tcTDIpRMZvkFFz1SvSEVbrXaPDk1SutxxXZLzs1d0rQa957Mujko9eytVsZO5E9IarDF+EUTgdKvK71dU4Q/O0IsinO83ZocNZ08L9yirevXOasGXee+pHRRYULx3kaATkTm7apv+cNU0VRjYwIKwsGhH5TePkgK0HUup5R5Wlglio6oRefOt2SYnAtXx16LVGEyWilfrQ== 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=qX5jkomJDA8IfAV5psH5ZNuC4EpBheFrTXQeU9XkWqQ=; b=cAk8T6B4JY4j8xdr/7n6//ih5VaxU96qkVltbilFosDRrTqM0cK0GWs/JhW+uZbvAP2GiL5DLk2GB1ayuWF5LRxXBqC//QcLbCr1iD3RWtKQ8GFWzyUCx6f6iAj/PJYEAFikqgergN1oSEi02sum/qB47Hu0Pr56HIGQaA4U9UH8fFyBIhERK5Tl1uRyZ00bz8sGMnJRLuqX43Rl7zN8uKWPVIaRthVWNo9T95wSHlsdgOnybTQYoaNSWHneqOI4FB7UOMgrQZTXjflVskZozVs85d+sEVY8IsxkuBrH2gSstJthNU3RpHBDNbCvKVmum2wQkjf3p2DfA0V0gMaXkw== 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=qX5jkomJDA8IfAV5psH5ZNuC4EpBheFrTXQeU9XkWqQ=; b=DSyMqDO11Pu8MZd+p+ZKpc55BiuVHAIPVbjxtWK348r/uhrzTLUHPCTsqdiF1K4OPVit0NW6rUIYmfhAh3K09RBaWFfJZvBSz4B0ZzuHjdubQYbc0K8wSWpOvtj1YfQ9aogZnZMJJQ5ANEQP7TBoCkNuOd/SckUgEjWZhYD+snWJNrmHwDzXY2VgQ3BNbiq6VYvBlEyJLrmgo0HWYqcqRMKgyq+7VRxkqua7mncOgnL0DA3qHj+208WHLy9j3SH3XdlzD10f1fmLSapzBdVl3xzqW/hyNuiZHsx5Wm4S7C5u6O4QW98sA4NnxdM4XdTTL+rwYFyTc7cKO8yjMM+aUw== 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 AS5PR04MB9922.eurprd04.prod.outlook.com (2603:10a6:20b:67c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Tue, 27 Jun 2023 01:08:20 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 01:08:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 11/11] Squash to "selftests/bpf: Add bpf_red scheduler" Date: Tue, 27 Jun 2023 09:06:54 +0800 Message-Id: <5631a5c3aafc101f6ba7a6caba9599bf982979df.1687827857.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0006.apcprd02.prod.outlook.com (2603:1096:4:1f7::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_|AS5PR04MB9922:EE_ X-MS-Office365-Filtering-Correlation-Id: 489d14f3-65d0-4e5b-e995-08db76aaff0c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jfqXwc0EntJb7rOHZPJyNkFa9AZxwyO04y2CRU213jIKbaZX5MiwjSbapYHVsJyzbGkrpiPMOKjGj+gIcufmd4cMZN4MAAMmI6QQa2+GMP/CkayfXH7Te/FGjHaSYVxHt/Cx1ar10IPXDve6cLyZhXPmVtbvm+WSKgZrgqtXet7lvdeyblMv2YMfstSEB9BQ28Io3FQJSVhg/18+D0nwHKCsB3CQOX+YP3ADOP9VnsD7rao+lGxLZTxDiDgN3vPSQme0iuvgm7dUSqwKXjStTylZPub+Sd2CJ+Pz9JnnCMWfng3S/KmUidvh3bOW77SYR2Omd5BeN838AjvDYNx2xxPHiHuHUuVs928Qd9Z2kci0GsTjeCrUCMEt3zLhc0/fVB2VgwgPNzsxijj8K9bZMMA3SlzFq3gOSm5LT9JWz+8nwmJa+IcZhTeZICXoKlf7L0zInE2O6vgzdWCz+QFQc9gvL/L6+GT+F5qchfSu9Q+Cmv3xxEIlb+Ew9MfrKUlFVKNf5ByfFYzSpqmqxSG3mGxRJJKCFmk3mPVeUbHBUKLwHkscPTMM0WF5RSeQPBjS 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:(13230028)(346002)(366004)(376002)(396003)(39860400002)(136003)(451199021)(2906002)(186003)(6486002)(107886003)(38100700002)(2616005)(6666004)(83380400001)(26005)(6512007)(6506007)(41300700001)(86362001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(6916009)(66476007)(44832011)(5660300002)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/Jy51blsz54rQ+zbaMXkJ3gbvdd7yvlEuDyg2xBbAtes5QwuDKQfAWGfUHmv?= =?us-ascii?Q?or64iysOym/E/L9wId2bTQbCQDNCBi2UdTOZ0aM/G+Fo39/sphObUCMkX1/p?= =?us-ascii?Q?GGyhzOMgMnqWHiaVieEZ+QBVJYpE5KRv9967F9xQGk5NaPgppxHX7y7gA2dj?= =?us-ascii?Q?l0cgpzRu/RU6MRciiObHklxSErc974+bZb5TGrx98OZM4rYmn7RHRIvEnYZ5?= =?us-ascii?Q?2bW+bMhYY+gopH/SjaEuZ28lhkJkofV6xmsLDSuIlXsTez8ikooZzYLNw+GN?= =?us-ascii?Q?0DBgyCsLMckGifnbVIvomOnsMr9Uv8Dv2b4b8rAJPu93sU1xFbJxv4WTSh8A?= =?us-ascii?Q?CiDonU3My0JjRhd+TvR46g+IucHhp5apS+XyE2tR5//tzY2El7Fu2idXxXV1?= =?us-ascii?Q?ll+CXTylpTC2qxVyswTcvC0/I53v8pGbf7qKjztuAFjX585Iz8m8RmgsOKBw?= =?us-ascii?Q?ZgW0HIO80b1Mc3h3eIamn9sLcHZFs7xVPnecrRBTnUOUWsKAPaUG9/gOEMFB?= =?us-ascii?Q?F1aWaNofJRB/Js7IQq2tcuJ7psDxG7QQuJMSfAli/Odf3xs8X2s4iF+SsYul?= =?us-ascii?Q?e2JmI2UuZ9LNCK3ogjVFZ0Tw9tLU/aARAishrmKFz2WRgURq6buRXvltrua2?= =?us-ascii?Q?bYmJqR0An++QWRHWuQGkG13ULCNQRdKlGwBHHQjmwzo1z4vrnuVjsWwGcpxb?= =?us-ascii?Q?9WO4tkhfi8fkc2gYEawYZVpFcgYpgv3gEPR1Ei1MG3V49I34iprGuNtSzNRw?= =?us-ascii?Q?s7MAFgD4EZHkRBqrqI71OoPE8r3WbZYPLr63GCKQcx5S1WEmYoS1oSAJ44oA?= =?us-ascii?Q?ZwuoE/tv+gj+oYxwpAzG7B3aWEDjq3l4PXKpp8nGJey7fR+XhlZZVjnsC5M7?= =?us-ascii?Q?CNGDwOMS409XUfqY99RKWf0fiCEJW0uevtjCCVVDkVBzpaLKsIOjct62jrVD?= =?us-ascii?Q?qYFC7OZBMlSeeCaaRWmZWxmzXTXFLS56WFb5d3neCyz3z7+pSXInYRtzRb9w?= =?us-ascii?Q?jiGPBQ/w8MaGDO6JHtC4puOZ1w4rtxKiHEG2u7w2BXixSJUDgLR3GR63GeGo?= =?us-ascii?Q?6H5OUL/vLYbLpSqKiJFX3NAza102IIS5D27kmz7eJAQf5LyAT+ogqJq3rZ4/?= =?us-ascii?Q?uOOIVKtaSz5Z1ZE6AHiyb7uZgBlMWyqZmBjfOW7/IOT01QF3eulC46niBuDJ?= =?us-ascii?Q?DyUR6QD3yB3LXg3pA9hpX31efm6NrxqWCP8KlVKUNPU6JznPmKO8o4Evy+/V?= =?us-ascii?Q?IL764r+4S6yf63rOYopLUNcqcEc0fVMkehf1QBa/SQzrf0GUR+VvoYxZ8W0B?= =?us-ascii?Q?FtNXJ2xD4ZYv4zsRd/gcZDBoICjrDjg49DWEr2sRC7dp3TRt4AZLuDf+/MG+?= =?us-ascii?Q?vaAcPEFb7tHgB2yQge0bM6DszfNiqAFt4JZNE9gssKz7+3ZX/4QQH0IWK7hk?= =?us-ascii?Q?XZjKyvedV4wFLIJ0rrkrhPQMmmrb8TUfhmeq4M3MIw7cesMzywXN7E5l7noI?= =?us-ascii?Q?AnytecLgac5Zpad6FFLUfSQEYqELDVtTuX1x35iuCP0HwnE+iR+0esi4fv9/?= =?us-ascii?Q?gWxqGfwDWLJhjgo243AW7bLuDlRuiEECABxxfDC9?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 489d14f3-65d0-4e5b-e995-08db76aaff0c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 01:08:20.0651 (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: bnrlNSzkbIAERRHjXmEiZbCamlzur/endG+tAs39FhNB3XQPRsPBOpxshQhqwU73k8XckJgj668mf4T//VN9GA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9922 Content-Type: text/plain; charset="utf-8" Update API. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/progs/mptcp_bpf_red.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c b/tools/test= ing/selftests/bpf/progs/mptcp_bpf_red.c index 30dd6f521b7f..576e4acd1fa0 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -7,29 +7,29 @@ char _license[] SEC("license") =3D "GPL"; =20 SEC("struct_ops/mptcp_sched_red_init") -void BPF_PROG(mptcp_sched_red_init, const struct mptcp_sock *msk) +void BPF_PROG(mptcp_sched_red_init, struct mptcp_sock *msk) { } =20 SEC("struct_ops/mptcp_sched_red_release") -void BPF_PROG(mptcp_sched_red_release, const struct mptcp_sock *msk) +void BPF_PROG(mptcp_sched_red_release, struct mptcp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_red_data_init, const struct mptcp_sock *msk, +void BPF_STRUCT_OPS(bpf_red_data_init, struct mptcp_sock *msk, struct mptcp_sched_data *data) { mptcp_sched_data_set_contexts(msk, data); } =20 -int BPF_STRUCT_OPS(bpf_red_get_subflow, const struct mptcp_sock *msk, - struct mptcp_sched_data *data) +int BPF_STRUCT_OPS(bpf_red_get_subflow, struct mptcp_sock *msk, + const struct mptcp_sched_data *data) { - for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { - if (!data->contexts[i]) + for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { + if (!mptcp_subflow_ctx_by_pos(data, i)) break; =20 - mptcp_subflow_set_scheduled(data->contexts[i], true); + mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, i), true); } =20 return 0; --=20 2.35.3