From nobody Fri May 17 01:43:53 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2078.outbound.protection.outlook.com [40.107.8.78]) (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 BAC2C525A for ; Tue, 15 Aug 2023 06:29:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dyvL3aO4f2h/p0GAq348MgXvoRsIldZ/G64BMjFS4DaspZ8YWpPE4jjTjiyRKw5oPuYpusRSvTGEAAp+qNzrn+ZCf91xw3jfHJ7DdyBacYQfFAt473+SdImTLqf1DpZK8vR8/JglApcf72ac8e9Y5Ql4VVg6APtyH86whVBKx+gWojIJkfSeFIBUW/XYRvfUML2f7vmPUdr7tmottJ/u4oTI7aexzA5ghISQ8pVS8wVq2y1wm7N+mKIikhebs534sAHa3Bs9ErGAlLlAqcS6lKwxvNJ+WkpiRUqf8BwemBgGAARIUd0UMc14n9toE/hMSRxh4SqLKSSNQovhXMkaPg== 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=IU/m3HCap44CvDzKFr9OZIWSUp/EuPz2jdGoZfYq97U=; b=bXi7qh8KPwY5Pttenuw9eunOFlNOSvfmQKriBeRzsG+y74VQBsWAQps90RRWXJBxY0bgwM/2REjodO+aIV0qDl51KZoWa2L6vP9OkZoZp4iQ2Y+fgIKyAV1S9oH5gQ/ZmVcSWMiOoL03JQTNsqe7RuDa9vH1DSVqFBjXpqLGtXhgx9Et20gJXRe68NJ064M9pBCE2WOQRKWNkzW/i5ueaI1dRpp338GqcpbWHXIzB9YLOF0viPcZ9sH0e+p2z6yBoF637QWnf2tC8JkGUn6Jb/h+u6bbW4V0R6u/aixW9dJ1PqLgz+HNPNF9JpVXON210zwGYRHYWv09CZkUOPG4sQ== 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=IU/m3HCap44CvDzKFr9OZIWSUp/EuPz2jdGoZfYq97U=; b=OiSBz2VbjniSHdl6iiTuufp353IA/u37tJ9pCk1wonLA78+TfYw+jPSuyeNZhdr3KUQPjfQAYJzMUklDT+aXL4s3LaUzD9TADGs2ZCIydi3iOLDWCEBF2+obH2Se9YzDPR7GFTMY1B9gz+IRkBcdcCV/jHEZ2md7TIHkrhiztjndxnJXCdeOmOlB3n2gAxx+a7NWe/ERZQrTf5lpzPXdyNQe3C7uSMi6tuLR4hv8Y15Uq/ACaG/o0YnB/fo+2dn+MzH+7g8diCnhxsKZBy+lH6eI47TEq0xwR/gI+pneR5eZNU/8WN0Sb/m4QZbydLhWBxncwVF/C14P3z4lfKfaEA== 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 PAXPR04MB8686.eurprd04.prod.outlook.com (2603:10a6:102:21d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 06:29:30 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 06:29:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/9] Squash to "mptcp: add struct mptcp_sched_ops" Date: Tue, 15 Aug 2023 14:29:21 +0800 Message-Id: <33e1e499fe4ac2f7a1b34dcc366819ae1830fcfa.1692080803.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0277.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c9::7) 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_|PAXPR04MB8686:EE_ X-MS-Office365-Filtering-Correlation-Id: 533ffbab-c682-48e0-9fe4-08db9d58fb29 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fy+nOoMNypDqfe66VGMSg8wVqpJdKDmMV97knfu0PrpxWmH3APwVg7WA+6ytwnSJF2zE77ho1pHGLJTkUJc1XIgWU1XJdNWAV6tKYqc3mgDgPt91A+ywRP6dRxj8rXhKnEfYY0373RT6Skonc62gYEd3tIo8Askjihve0o5+mSvI5Fi9VvR2FvSqFXH3ZZ4ZT0o4YPojlHMp8whve7wOWP0cxIjnwy64MhkNCVJ5XitRUqfGt45enXIWrpOcCD2OEAOntNfEgQ52vanOlhNuyB3LfiKfnfSzlLGSqCoq77G4fnjiqYoD92NrjcjGimbgMXplz2Vt7z81GcXkV2ysiDHOVPqLG4ltMR+IySeryfxwBw+htnINp9azCqnW2EtvoLku7mwmed+UK/OhTTUefta/DjYdUzM6Gwir/kioxCqBJQCcdGCGTgMpNNcYTtnRt/Z2P0cVChpZt47Krxy/KXG/j4BOcDUKLubANCItYWyLZQ1CH0B9YO2LMO8xkKWm8t7OfxQFgU5GGHRv/6lIguSaDZ3GDx/b2lbU2/GyqwB6QuTmz3zdRlZJhQcmRbDDFwM11Mf4JMoXCvZbxFpV4PLE/BgmSTiCyHmgGfejWdU= 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)(136003)(39860400002)(366004)(346002)(396003)(376002)(451199021)(186006)(1800799006)(26005)(107886003)(6512007)(2616005)(83380400001)(6506007)(41300700001)(66476007)(66556008)(66946007)(6916009)(2906002)(316002)(5660300002)(44832011)(8936002)(8676002)(4326008)(478600001)(6666004)(6486002)(86362001)(36756003)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?771Vc+e2heKzncloeQ99rrzr9XOzx3sgAoRm9razpjOzoIl+tZnsT0lU/yiV?= =?us-ascii?Q?99bZPvn3exjG05Tm1quwrLuxLAnAsw+7NGkPQTjzJeqGZOpbMyFzirewPzjf?= =?us-ascii?Q?eS0JoDgIS90J2xFtoIhBdjJb2TtUsFmcUyOBl3lJ+F8AqHRChxa6EhtB9Kvz?= =?us-ascii?Q?+Iwg1zDOyzjBXdjLZ8CKGxWavvsKvZ2lN2qiGxSheHz6NaYyx13yNPO5tKjx?= =?us-ascii?Q?OdNb1ax84yQq9UxkPWT047pGGYthEUM0nwPMpc5N6RtJXiKL4PuHqK6CuqFY?= =?us-ascii?Q?lZVatDhGwaUPuAZUfZQj0uP+U5s6fISmW9d+RZGVB1RIauiPL5hm/DpF3H8U?= =?us-ascii?Q?YVzwnGp7wT3GwbIU/EzwhEMoXIQReT68MzW86gPyL6/oehHTe3mDI3k8lu03?= =?us-ascii?Q?zlq5BXQCPg/0EwduIl3n3tzyRKo8WsO6aIjYO42tC0UYcmu7C0hmg/KEXU/2?= =?us-ascii?Q?GlvKfvf32TaC+1eye1geHdrKvfo52p8Sr9PYwh8e2V6J4WwAuqjXC/IRrPYO?= =?us-ascii?Q?AyOt8tlXgGtjrT4XYJs9NRnCjxX66oLBZzw2bBiT17oLlKAqqzoRddVw9C7j?= =?us-ascii?Q?htD48uKKjefFs/787sjNAhnDIqwhU6MMKG6nPfTBosnVRv+bn+5glCLYL7ek?= =?us-ascii?Q?5hVjhDEdY3XRDjw0Rzn5Xb9ntIQyOBZfR0+pRPkBicYVix2CIo7dpzuZ9ms8?= =?us-ascii?Q?BQdHWFYp2qIdM17gNl3jp/iNGK8yOsdLsOkcJo4DGIeeGMX7HUHNsrlJcAm9?= =?us-ascii?Q?H/0a5uF9wJxzfaKUAI4q0ZUQb8/XsvpE7wdj5M0Yk1x1e85q2u8n55dkE2Is?= =?us-ascii?Q?K/fTKbs4m1ieeDVH7PV/Hx5tcytOryht3uU4r3oGmR8/5B4vRBQDbv/QrM1W?= =?us-ascii?Q?cRzUGUBvZwXH50d87mQI8AdfnxfeY4bA4Yf/T5nJkotc/vIBQIJN+WPm5p7w?= =?us-ascii?Q?9TuZjWsfeCP1d79cFMDMcO46PWw1h/DD/jzDZSHOl7B+itWTFDHe97ACmBm/?= =?us-ascii?Q?YDHIDzVw9UtcHRvd6Hufx344m1ONELgYw/U8meUpjmO0pnVbap1Y4q4AlW1T?= =?us-ascii?Q?ZzFo5w/UHbzQr6r4viNcxDfA1KjKNghrJ3/mF17guzJEKYoRqstIrsCUKODl?= =?us-ascii?Q?qJgQAqtd2dxzmxyjatyxokxhYHJj5jEin5ETkWU0fGATx0ZXdIntKSa2iV0a?= =?us-ascii?Q?HHsaOTK7tL94F2CzyfBJAoU+6BdgWttMWFwUYTQLS1mg0ORGLFA2yJqtMmsh?= =?us-ascii?Q?FYAkjhzDkWFVJStGY/wH5rVa+Zhz8KFemEkdMSxIl5T9YmjgoHG03R9O5s53?= =?us-ascii?Q?1ho2QLaUcQxzvXu4C+1Aam01JFhB8fZocS1oqniehRz0QqWhv0Ji/r3FpU7v?= =?us-ascii?Q?9JkaZBCC6yswpbXV8EG/CsV3dlFgU6UfpG/DUIyAi3q2Yfjy1eCfjUHFfs4D?= =?us-ascii?Q?3NHvy2AGmL8U8w3sRKIS42BPYc5aKaaov2AlJi6kLZdjCFaFJM6s5zAxQvsz?= =?us-ascii?Q?dbkvDmQAcP1eamTfqHx9ZWVpCIaBgsnAMwqzHVy6cGANMTDWP5eRVym9fyzK?= =?us-ascii?Q?2ZqGhxT/ORUbo30BQmGTwX0W0TMgEHuvn5bHqQyp?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 533ffbab-c682-48e0-9fe4-08db9d58fb29 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 06:29:30.0737 (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: nexgzriZW4Y43wBNIpqUW0rH+588Xx1E7S0Qpb7MUyOocpnWyFmTXuZCDynle114gB2bLrDRvhTEMvg8g1hzJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8686 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' This patch defines struct mptcp_sched_ops, which has three struct members, name, owner and list, and four function pointers: init(), release() and get_subflow(). The scheduler function get_subflow() have a struct mptcp_sched_data parameter, which contains a reinject flag for retrans or not, a subflows number and a mptcp_subflow_context array. Add the scheduler registering, unregistering and finding functions to add, delete and find a packet scheduler on the global list mptcp_sched_list. ''' Signed-off-by: Geliang Tang --- include/net/mptcp.h | 4 +--- net/mptcp/sched.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index ba0e1ee68a05..fb996124b3d5 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -106,10 +106,8 @@ struct mptcp_sched_data { }; =20 struct mptcp_sched_ops { - void (*data_init)(struct mptcp_sock *msk, - struct mptcp_sched_data *data); int (*get_subflow)(struct mptcp_sock *msk, - const struct mptcp_sched_data *data); + struct mptcp_sched_data *data); =20 char name[MPTCP_SCHED_NAME_MAX]; struct module *owner; diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 4d81d0c1c096..049c94678d9b 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -59,7 +59,7 @@ struct mptcp_sched_ops *mptcp_sched_find(const char *name) =20 int mptcp_register_scheduler(struct mptcp_sched_ops *sched) { - if (!sched->data_init || !sched->get_subflow) + if (!sched->get_subflow) return -EINVAL; =20 spin_lock(&mptcp_sched_list_lock); --=20 2.35.3 From nobody Fri May 17 01:43:53 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2057.outbound.protection.outlook.com [40.107.8.57]) (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 7B8CE8F50 for ; Tue, 15 Aug 2023 06:29:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a1JpS7vDWxOO7s3p6V55rCIAOcX+a4cySTTCNOCyTbICYtfCrTACiy74uXjEHBczuDje3nbsN1t78QZarjTbmCmwrHQ/crA8+enZFMNiG/S40LguUyKh0vYKAJSpRGObcrgfzBok1XfTZ1KN43p1fRQ1ZgIABY6orHz8yN7OEfQ5psr21ni6yzfC6/eP1xikzhT+DoB5bbD+ajjIGdPzs8S5xrJPW4xt45MpK8ZCkgkV9vGO+gmdHnuFz/M+vftGGFegxT3fvVjf7PQbxyprr06jn7IfdPxEpS8zpwm7dYGvSAcvzSyx/+es88rUCuwblA8Sv/HfgT7WlLTtJ7Xp5Q== 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=XLf8q6SCzIzRDq5ukQRsaSS8bWSp0sz+B1omeJCaeqc=; b=HoLOg0NLv6PhgD1hZRKuqI29bNA0ou5sD4qIHBbABrTk0DsDGX+KFi7HngbhFd5UmTKk+HFzV7+3RfKvaKifDlxIXz4OgUOHnwDaptCrJaoasVFvDtp+rrFwqZLHnm/8+yT/NMEXPNg+ygjK6uozET0rNkJAmU30xcBjbaxazFkKtcql9y0j0C4f1mUH97hbrnciMUMB3Lrbw+6jp2Y13Cg5gfm1/jBMF6RR8hpi44BH+PopIrjl5EpZD28Lztu+LGBcz8D+VRNqAE3qLZBUvlpldQx4JukMssCQUZfHbAI4shticKEgLWwyTgiNdafeY658Ptw4Tm2McyIr/RrMrA== 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=XLf8q6SCzIzRDq5ukQRsaSS8bWSp0sz+B1omeJCaeqc=; b=LLujYPDk1iokKpNJCieBMqXUQifECzvVVnPAfv4UB5CFzRu62+OdkI7axYHCVnRMFranuUO6cWysAM6Gwm4K0Tu1g0vPCplNT3p5CrFMLWKTaG0odZlOA7Nsz5XpMsQHlI5om4YhZmbo3VDcEVvH0V76Br6vWJPwo7ZfuaazTqEeo3Z5sqOjvnyo49DSW5qRNffL1NlNEmQz3PO3zLvip4lRt2t2AKZJp/ookW1N3B6/gQfzZ4FPFoYxj8G3Wd+hSCjrFC+CoKmkHuXka8tSS9pKrA4As0taW1jW9zvgQgHr5IXKjqihX2MYrqluZwVHkVdPIh/uKn4w5da185fa2A== 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 PAXPR04MB8686.eurprd04.prod.outlook.com (2603:10a6:102:21d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 06:29:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 06:29:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/9] Squash to "mptcp: add scheduler wrappers" Date: Tue, 15 Aug 2023 14:29:22 +0800 Message-Id: <76d36be7ca5f426b84597d38a3c413bcb87ff7cd.1692080803.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0266.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:455::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_|PAXPR04MB8686:EE_ X-MS-Office365-Filtering-Correlation-Id: bdd84776-f547-43be-d32e-08db9d590172 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y+TiZ5Qmk96Iv1vCSqmRf66h/E/MnFIZAia7y4I9lf3abgHX+FHiOI2R2MYjEqE9b7kKEMR5FLEGsnNbdpRhtfq67CUWTUVM/XzN/LKb33ONvvci1NI5dHBMFoZvaVBDx29R7S7kdzdpd4RvIq8feNnGkFPRrDj4RvHWM5k/dJcfpaDnHKJghk2ORnTh/WhGllguXmX323STbusDLcYrQDU+pnY9Ev+G0BSAEh/R6jVCKAdftiH51kaA0SWZSm4W7KZ3umPCZrmyCe66TvJEvcZlF5FsxM+Ys4Obi5VycX34cnCjLGLCp/LhlErptsrqaBO3TBgE7GGq2HWcLMFNjhdMCfxzRRNwHHSoYE0li2HF5pYkRd8L8LqHs01KWtPjTEpi6b5+YrvrPMKc2ywyPlSd7Tqn0YIhDShP3RmKmHVM1Kj2JRAygjlSpPUXiQ9VreAoHcKCpbxElp/oml8SS1Ef8O2ZQVm7RdCmVMvTgrgbTI9tsy+ZSFXIjs9G/czmdMAfLSuXxaJrk7z7fsJH6GnKGTEBMzZWeZQkYmRR+ZBpbkYlbOymjiifNu+eLhfg45kCbH+oHhsSFytx0ZLTNEK0pSaD6GygVPfX3jHvbqw= 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)(136003)(39860400002)(366004)(346002)(396003)(376002)(451199021)(186006)(1800799006)(26005)(107886003)(6512007)(2616005)(83380400001)(6506007)(41300700001)(66476007)(66556008)(66946007)(6916009)(2906002)(316002)(5660300002)(44832011)(8936002)(8676002)(4326008)(478600001)(6666004)(6486002)(86362001)(36756003)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LMbRU7chE6GCKsvJwZTy7qXgy+uWjTbFWgX7f6tS2PxBJGMKY9J5IqdVJyKr?= =?us-ascii?Q?9u2Cp7ouRNAOsKqOOE2E8BlKeoogJ/tmsVR1920oOSoSULmNyA1ljVYu0cKF?= =?us-ascii?Q?L60JR51lgWOhTDcBbVEJO8tf9F1QAqaFG1raQAMRfWSQaEhPWipYWw6uRbon?= =?us-ascii?Q?BissAFv+cyyZdZA0myDJ+r3O4N2BDKL8CSqxMF6JufDhSNjsCu8HRXrGDc7l?= =?us-ascii?Q?tnvZGHwomq9VqGjanoRKH1h5PQg3b+3yB5UKPiaBnEyPlijQqv7qHZvw9TT/?= =?us-ascii?Q?KvZ5rNKIAhnvaa/Is3YcTwv8xTgs4QT6UZr2dMiQv8Y/QhMKz1o9GR1B7v0D?= =?us-ascii?Q?j5QPuIhqOhF+Cy261h5zn89IXHSe/iYQFrN7xrTjPiGPekyKaOo5TO1LH82z?= =?us-ascii?Q?sbchA6mEaoRGmR+gkX3MTJKw9qLDPQILvy8ZGspZJVNqiAz+p/jnRLMgMqUx?= =?us-ascii?Q?RV5XFunLLWu+643bVN5BseZD3Linunra3nQYFbB6nzyOLMLcCuL0Ja5dNOkL?= =?us-ascii?Q?RimNnwVApjgLZncd9C5/Gr1YbMB1xCLDBBDqwM6K9Z2M/RKwOCWYeK9q/ChF?= =?us-ascii?Q?pI1+FZyBLmhC+a3X3U/h4Fh1m2Nv837QBGiGdhJDJJ4KWCSNd26bXAsKVxi+?= =?us-ascii?Q?UDaLwi0X3jE6H8N5qPmYYVDCNRk9Cl4PjF68UtPI43lr/C6+0DuJUe04My15?= =?us-ascii?Q?4TBIRerfkHssBthK88UrplsdJpr2KYwGKWevOa7u0ZpxTYcWZI/fRhOvJyHP?= =?us-ascii?Q?jBa0s12eYJkmJGxnMQ3aAnKKA/c21lrXPzZIJ914aJ4Z20E3+ld0RboGDeP4?= =?us-ascii?Q?ooix05JXjV7KmvI94aMqs55kgpz5ZByPRgUJPosUOs96SLr4tYtO3NKHXyIg?= =?us-ascii?Q?T3YRaboze6Rcp8Mq3IR/0fjtNpfChI2eY+oyHejlN1nHpWrIK/Q7xOUjFOt2?= =?us-ascii?Q?Q5PfpwhR66u99VaHWqF7YPAEFK+5hDDn6MxmoazPQVR4QTPXwYcXfCKAuTbd?= =?us-ascii?Q?qI8JrAQNSDbjNX5P/PCAmA6si+/YN/w30X/pmXxyT1oh/ZJxpcZmRyZUP3KU?= =?us-ascii?Q?wXzCa4BkZTVYOzDIQ6PUehFatmv9GUpY+2MJA+KM/Gi442WpyyqWmIm5SRH/?= =?us-ascii?Q?7Zj39chhOLbW+iAhplL99ZgQ5ZiSZ51efBj7wvU4zEjaZttUpwL1jxDMERlW?= =?us-ascii?Q?solbORyMlfe1cXYG+7n2VW2xg97GXXEsM1nvwYReNzVp/05JWQi4hZPHeELA?= =?us-ascii?Q?sXoa2mlz7yV5jyoacm+D1S1E0Q6NHrD6en457AlW1WMYa3oZpTMpKmRyKG/I?= =?us-ascii?Q?gUClzvtuXSgs5Dy5Sr+wO2siC9QdVBXChxks7yVIuz49PLOhEhMtXbsLAslJ?= =?us-ascii?Q?4EaQ9pv4ZMyWKASNAogVFNvJab+/dfyN8g0kaX0qBPGZayixWOH1fRjQkMks?= =?us-ascii?Q?tuDO8jywe9kU/0SWV/IPNRR4PK9376tu6TKaY9dIPdREx41b926U+DVJuF4T?= =?us-ascii?Q?h/3m6bDFUgzhjoZnC1pWM8BA9fdclG5/A9/f5B1nkZKWPpFmHA/QazSGmL+H?= =?us-ascii?Q?+FZyC0r5R4hOW3RFH7aLff7F2HiwLVvA8yxQm/EC?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdd84776-f547-43be-d32e-08db9d590172 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 06:29:40.6108 (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: LfaIFqyuW8ugNddclIMdFIPc/ghJO/AvKhx+usqQXyXitGoGdW5cHVKeUtDRv3z3yrdVdUjZSKH0WWaOlBHb6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8686 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' This patch defines two packet scheduler wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke get_subflow() of msk->sched in them. Set data->reinject to true in mptcp_sched_get_retrans(), set it false in mptcp_sched_get_send(). If msk->sched is NULL, use default functions mptcp_subflow_get_send() and mptcp_subflow_get_retrans() to send data. ''' Signed-off-by: Geliang Tang --- net/mptcp/sched.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 049c94678d9b..31defb8c4e30 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -161,7 +161,6 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) } =20 data.reinject =3D false; - msk->sched->data_init(msk, &data); return msk->sched->get_subflow(msk, &data); } =20 @@ -192,7 +191,6 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) } =20 data.reinject =3D true; - msk->sched->data_init(msk, &data); return msk->sched->get_subflow(msk, &data); } =20 --=20 2.35.3 From nobody Fri May 17 01:43:53 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2053.outbound.protection.outlook.com [40.107.7.53]) (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 C17B2567C for ; Tue, 15 Aug 2023 06:29:54 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lIwetWB6ckQUO9S58xvRrxrtG9CURZmgd3P8lYB41XY0TpMAjxOrNC9LgSBt7pIlfA272MK0cdCEiTYN6STrlQ0stFKIouHIfSs91U3GoQ1BkV439K+jT12KN+CHRc0Gey1RY/EozbGhgpG1y0kXP/zLB4KXUDdFNTUneF21KKLObX/Kqa6vaEcCIi+kHnUGhT4a3s06tHDMX78j0E3dN3ESo8e6LO/3P57ghiFT2cgZWQck2OZDjL+8pr4DKqtBCjmrp7ufBgWCbIidyEy++N31IHfJXZ8GNYSM8ojqDAzE51JoiOhbHzJgitgAo7gUeD7r4hjUCAkybBPN63cEXQ== 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=8lmiede0Q15VwH7mbjSjdRDdL/6M/XbCSDuuD1CHR0Q=; b=n7OwGkiNaR/1SzTrq0Ka0TKWuYceHLbGOZcTS1BEvUnZw/wPKIvRRBT9aeH5p4yRY5U+ew5q/zQ1thSrV8D2F97W/5s0RVmlxBk+FvtCJ9IdPpGabt5Yk9Xjh9FvNwIjJ1mL2l/Y91SDHhZ/hkoZZU4V3QYOCuHx6X1lCTWkLLylPjPV8RXvTaBrBMzt6jWAcu4MiIpY/RwEbYkrCleEa0xXOJRR9z0sBeALgArLoJ6qmjqdGSx8Ps+8dIDqCq+L7FKcKMDZGW4kpmCzPKsR5blBKpLpN+xZ827IhwrAPqQ5mdogqUFHtMK5BDza0O7V342boj7Q9AW10EnArD68Tw== 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=8lmiede0Q15VwH7mbjSjdRDdL/6M/XbCSDuuD1CHR0Q=; b=yQlG+Jt5bZQoGff0ow1znh3TtYKy0kfItP8lu4JEAgj8M+u/qKGzIGb7+RJRahP6jTUFH1raxZT6p9lkD7jYkT5PtXl8EembveDh2yUEf3SnpLrJn/rDySzuZZwoDGdv5/ZrMizzAqAX0wVNaZvcOebxk8c3QwPMFnjjaauBoQhbnS2DxnbBFRmShf7c4Xr5OFy8RdSb5yetqKkzrX8NK1pqEdS4Y2UPEi3VlNK2usQ0ksYokJvzlgBa/N4z46fEE3+KE+D+9Brmujl3bzXwj7K4qWs7xA3j0hHhuIIsXsLjxV9bcxttcRehtzvCGhrD+RR+DfpVGQy66dOtyVowQw== 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 DBAPR04MB7239.eurprd04.prod.outlook.com (2603:10a6:10:1a8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 06:29:51 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 06:29:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/9] Squash to "mptcp: register default scheduler" Date: Tue, 15 Aug 2023 14:29:23 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0001.jpnprd01.prod.outlook.com (2603:1096:400:a9::6) 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_|DBAPR04MB7239:EE_ X-MS-Office365-Filtering-Correlation-Id: 2cfaf69d-7af5-40f2-bca7-08db9d59076f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aXuxuVSeJHB8ie0U+i9nm4jVHMhSBCHNvIBBXY3yKniE1X7Xcte99IRlfBSTmIuG/IqExLW87iow4Rfi7LiON5DvfKTWirziR49z/undp2C4YO8HH5rP+GiO08fRU8ds0MrywrHtk2NNlgr174PYLLm4p2cpiqeEUJKcbTRzQ7MNRH3CRClDKYCvHXmoFUuQq98otmh1Q3Jpv+0N5dxbIyo7RfH0eijbBztJhvTbDegGcmPsXwko9CupWC8OMFJoVlw6JBPZW8iDc4PAwyqBO4nEEc2JpK7Oipy6envQOBzlaii4H+FcmjgsOqdTgKLInETOJsPfJGaqmOIU2es/d/fwF7sqMiYh4UptFBa3A4+N9uJluyyjuEZFQqtGIGxnQaF1YkHUSdHuJm34Kk5C3QF3mxe22dY5+IS1Uc5uRyEb5dVoUSik6V5a77wcScHEj0KRRfDTF2kbGmLXvW9Ordwg44QP/cPKnTZi1a6e23wAhCterSC9a2TZLLFD5xB7wo1RXp8gsWSEell4xvVH0+E2GsZ2XzQ8IbSWVwNY4RHRu4Rn2qsYskuC7TIXWEK30c4lgGf6kmpPw3dKOcJ5F86Da2Xdyy9AGWEnERfDjJ0= 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)(39860400002)(396003)(366004)(346002)(376002)(136003)(451199021)(1800799006)(186006)(6486002)(6666004)(6512007)(478600001)(2616005)(107886003)(6506007)(26005)(2906002)(44832011)(4326008)(316002)(6916009)(66556008)(5660300002)(8936002)(66946007)(66476007)(8676002)(41300700001)(36756003)(38100700002)(86362001)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MyXO5qE8sdl4EdD9jQsQuqHpVxF8Ly79tNw0o7wPZajy9/Yl1tNrj/WW9kiR?= =?us-ascii?Q?YZthZeB2WheoE4Qz9lyMG8WWlPRqUCa2Zqy8kFyuDmschOmQdy2zI9u5tARI?= =?us-ascii?Q?oKNJSm48BfxzOeWRvqmWaUOioL5OA7nKeoJBKF3C6U7aoNci4vwukdJFpOW1?= =?us-ascii?Q?R6XCADRqGEXz267FISwvG5PDyaz+wVBnaCsY9Hb2Gnl/wuI+56O2PAKzZ6DC?= =?us-ascii?Q?s9Reey6dqVkwNWyjrddMk/LgLsLy4McevoUsN2T6Yln7hnPQnZxNBv/RtI40?= =?us-ascii?Q?ScMrq5eq56ElUimB0unUj15uZdq39EH4WcZStg6rySHroCOGot2FAGrf/ASZ?= =?us-ascii?Q?16RXRed/spRJ+IGvipNSI3QuMH4UBQGIKy+9L8oY6apto1wAaniSYxXN4hR/?= =?us-ascii?Q?cE1juqAY7vidxniQIFtrei7L7GbSrvKWPnIaTDjwDgBms23+InsJm2ThLMr/?= =?us-ascii?Q?iY8sOI/aUmzrr21FF9zPGGh7lXTptfWB+ll3GYURrpalUJAzfnHLpZn2P1jD?= =?us-ascii?Q?xzNQ1uu2iNk6RDLCk7R/DVj1qrpl2RVAmuktu66yuWmbyjdGp2xSqfx/uCtd?= =?us-ascii?Q?D/06JlvOM+xmbMBxwIpSiJSPZL8VIRd2kQXcA9PJ7J9AG/19eF1w50zmIFDm?= =?us-ascii?Q?qA4KbqiPfW8MPfFL+6PvCqNxxKD3BmdC5mbIEnAQjZmqay14/Daej1zRj57u?= =?us-ascii?Q?sFbIQ8IgBMYblIH3xM1wC1aslICgoVMQw03HK8egGaMhD3DwO0Yll/ze6fIf?= =?us-ascii?Q?mpEclInYOVmFSyh253YUJUWenBm2UNqvVeVekRd62isR9c9P1qKqp2qLqyll?= =?us-ascii?Q?+l+o9mDmdU92ysK4jw12e18CAomZlk3HN8MWNdTrwODkCq/973/Tuq/bzvwC?= =?us-ascii?Q?1kI3+XJDfMrdlqRIZQR4FnRmMEXQG+FrSv36ViVJo7fTHgDCF3UOd6Z48zMd?= =?us-ascii?Q?XF1T+R1JOkCMFVRtKmHOxLKRxg+9Pw6IRDKi6zTJw2ECkD8HykUTDeteNu3x?= =?us-ascii?Q?oXfHWxbR7P2gObkEu5TT43lHZqWoGAih++TX8fl9Yd1MJwiVxf81HlnKMrCX?= =?us-ascii?Q?90QnqDXx3TNHD/vOJwrK4KW/zVf8yXDAq0ORwW2Fy9hvlx5n4U89+zuisQxa?= =?us-ascii?Q?DtOilviJKLIoAta4ihouWsZG0RqHbmOfRP53LBRRto4/8GbeBYWW050d+JOG?= =?us-ascii?Q?sYdSuLSE6n1SJZpLuRpm+Qrh1jtLnA7GAjCGU9KtS3yg/UcmfFjKY72QS+I6?= =?us-ascii?Q?yieGiEt8LTCcxF/DMnK3WxVk17qfFzoAgBpHMk5E/T+ArDH98sEXbmQtzmCH?= =?us-ascii?Q?m3Yj+Uq9bdNmdJM6BCwdHfaU/ggVngBdGFUFvlByWCxCG7Oz6I166C+DVpNo?= =?us-ascii?Q?goWWhfpK8Ji/eMagzWpGyyDh+quLdLzBbCXP9lbsZuu56/jHoNmJnrGxb5B+?= =?us-ascii?Q?LUX+6sjZBzfMNLItMKtHQcJ3FEOG58tlpW9XaVNx8E2tG5Ql9+tNqCLMmh3t?= =?us-ascii?Q?s01q73tV4Lt531bUY85fJUsxvGuwWMQ4EAuTYlrjgjmoA3sltHgCQtjQU3PR?= =?us-ascii?Q?3f5nesZCnXq8XlWxUoInsLraW4ciUOxjgUjGVZiY?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cfaf69d-7af5-40f2-bca7-08db9d59076f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 06:29:50.9194 (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: D+OERoATPx+74oTjui7/7vahNdplqPgzZNQxbQ5CgNMb72utxRCwDMLI1cfNMzT87T6Mrv6nIgV6c6xvXNW19A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7239 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' 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. Invoke mptcp_sched_default_get_subflow in get_send() and get_retrans() if the defaut scheduler is set or msk->sched is NULL. ''' Signed-off-by: Geliang Tang --- net/mptcp/sched.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 31defb8c4e30..162604f3fbea 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -16,13 +16,8 @@ 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 mptcp_sched_data *data) { struct sock *ssk; =20 @@ -36,7 +31,6 @@ static int mptcp_sched_default_get_subflow(struct mptcp_s= ock *msk, } =20 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, @@ -150,17 +144,9 @@ int mptcp_sched_get_send(struct mptcp_sock *msk) return 0; } =20 - if (!msk->sched) { - struct sock *ssk; - - ssk =3D mptcp_subflow_get_send(msk); - if (!ssk) - return -EINVAL; - mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); - return 0; - } - data.reinject =3D false; + if (msk->sched =3D=3D &mptcp_sched_default || !msk->sched) + return mptcp_sched_default_get_subflow(msk, &data); return msk->sched->get_subflow(msk, &data); } =20 @@ -180,17 +166,9 @@ int mptcp_sched_get_retrans(struct mptcp_sock *msk) return 0; } =20 - if (!msk->sched) { - struct sock *ssk; - - ssk =3D mptcp_subflow_get_retrans(msk); - if (!ssk) - return -EINVAL; - mptcp_subflow_set_scheduled(mptcp_subflow_ctx(ssk), true); - return 0; - } - data.reinject =3D true; + if (msk->sched =3D=3D &mptcp_sched_default || !msk->sched) + return mptcp_sched_default_get_subflow(msk, &data); return msk->sched->get_subflow(msk, &data); } =20 --=20 2.35.3 From nobody Fri May 17 01:43:53 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2052.outbound.protection.outlook.com [40.107.7.52]) (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 AD100CA72 for ; Tue, 15 Aug 2023 06:30:05 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D30bl7cHXpnm4sSN+SCPwXmb2TWfqWCk0v2pusNdfXlc8IwOs/4h2Mxil7+sVUjxfZunGLnDwmJDTdLntemu58nL9+Jt1EwYzEIT3i2k9OnPvCmOJmMXG8fd26tWGj05QjFDiD5QDwC4OoOUcrXjKSPxHGkHIxqPDb0ak8VLXy/Ziv7jdhEoc2udvA19/8FCeGQl4oHDafybaiIggPDXpJkm/wsI8piI5ss0ftqHZCXzlxvrckKWf/j3mO2lDUVVfaId+Pl+BEFiteEetM3CBnf2oFpiRrj+ytbtzvtIQBQbSvxWZyy19sRQAvNPRij1MGj3DvePxsXBDJHMMqFgjg== 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=RtEHpILRXNCUBDtuGrtvHBU3KV8D0jwdYNLqf+W7aog=; b=ZcZ9rPY7vZ1txoiibQtz8VfBtVD2CylmbAtGaPU+COQoUXfej5lbzWFHmP/Fxn11zV1xOz9t+0thT1j1TQZcKBoII7kpER6OuSpXoOU9SSXpC4OhMW9WjA0jiCpqjREJADKvOiBKZE8DA4whrTabaMFJjC5Zltz+zcvr23ojyotoupmAoZMLTiOok5/n2h/emY4zt3yipssU/QbFMfdGAmzmAE70RB7eBxn++rNzHqXZ++sor2z3di2u/AFpprSYrLYd21vCNGepjO9Kbu0zYrFzz3rg3pBFpV540+XmanveQib3zwDvcAeqPLsf3vgl94IqrG2cDSX17GRiwVtBmg== 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=RtEHpILRXNCUBDtuGrtvHBU3KV8D0jwdYNLqf+W7aog=; b=JIZhDu5T/KtKzE0XqOuzZ0N2GDKwDzyQZ7wBZ767rSWEpV3ITpivi3aV0tVtwFAy3yBX3/HzYSdmN+97X2+s9AWVymjlyEL/DjUm1acvZFZF9pxeaJ6qcPs9+uCdI8XKw9l/beb+TYRKBlwXhcyy7iaB5iDm+xzgp1uRZ8/GgXwWzTanKgdyQEdFImkSUUSrjI94Pui5HaAPjfLtnHW82B0DyV2swz/HGyCS1s5LVFizO/X1ubmj+M0a7jC6oKAwfEFYJluPMbxBaAyyd1Ic3Bi5iU+7ZjJ2YkcH3jmLHLvXLFJs1rqDuIAEDut04utdxIVMDKNduxCd7Fsqv1yzig== 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 DBAPR04MB7239.eurprd04.prod.outlook.com (2603:10a6:10:1a8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 06:30:02 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 06:30:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 4/9] Squash to "selftests/bpf: Add mptcp sched structs" Date: Tue, 15 Aug 2023 14:29:24 +0800 Message-Id: <8e58124be7cd6598bf19c5e8a507077f4e5ab716.1692080803.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0005.jpnprd01.prod.outlook.com (2603:1096:400:a9::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_|DBAPR04MB7239:EE_ X-MS-Office365-Filtering-Correlation-Id: d3b95402-1f03-4529-2f69-08db9d590ea0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QdGcs/VToO/fcsPZyAA3lTti7MLWNDhcN8ocMUzjAL/p8E5XK8DY+MLHsrccrMXQlwCvGtxGDWr9nJubudr+vtmk44oEQUIepLowErMkKpY74KPtyuoHPEWi/JWDLRDInNAdFAGqGfdtbu/p54TILyu8r4v33wSSKESm98zEnzHhDFZ0PLKwkUHPujVNVJWcOLSGzMXaqtTMfrRMmrYvlnmWrpc6I1BfD46nTVlABQds76ACnhRiBuNZBxFRJCjpR5hdu36O3YghOGDBwZChJoYy2XuKFnIij7B6wY43Hw/Xvo3T+YnsQOwUd0ougaCzcJUfVHFCb/kLIyV+HAaOR/20FIQX33vkBwr2pYm2oLcx+pLSBiY1nBTGztHvP+ORlW2s25lEf/Vs7dFXCNGGfozqdc9zFQVOdSeSfikWAVCXoTm7S+9cu+ZFSwteTn6TdWGRKiCg4DTGJK45C9msL6yEEzo5eK4jd/hoQPq0j4lPH/AH7tWm3PTzmqA/X+2bhA5GZpFrQ9Zh2ynop5c1OOvu+SWKw8tA8Wq+yHFBBzHrgB39USuaXAKFiLQs3ShyUQ2EAfyD97Gxp3fEM+g71pbLetx6gEKNIA4pxLMkVS0= 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)(39860400002)(396003)(366004)(346002)(376002)(136003)(451199021)(1800799006)(186006)(6486002)(6666004)(6512007)(478600001)(2616005)(107886003)(6506007)(26005)(2906002)(44832011)(4744005)(4326008)(316002)(6916009)(66556008)(5660300002)(8936002)(66946007)(66476007)(8676002)(41300700001)(36756003)(38100700002)(86362001)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0FhJolJLGjjf/pLL/iiSbZ0D5UG5h1INz0PbLfyLCtgpSNHrxhl9droXORuS?= =?us-ascii?Q?5yOswCm5UG6Gel/lu0vqhA9JVpIcqm/crz7S+H2s1lVyh0kal/3Q4dKYJ+8A?= =?us-ascii?Q?LdBFjBzJranWpeQCRTJGbgbvIJxvZCKm3Sqq5AOOPCRm5wna5bIlIYKP4F2k?= =?us-ascii?Q?AsN0BMuBHreYgAMpqrzekQFSAOB896EHB9mBg4lOohi1R4ahmRkt/y+APm8b?= =?us-ascii?Q?lLImaRY2RuybGfq/qGCg+ZijOLGTf9HQlbDCRBv7p8pT6SN4EHk/0CG4HFtA?= =?us-ascii?Q?BJZJ+ih79FZ/x+ziVd7Rkj4O67JLKk4VGPqzUll5vHOFxuJt4sFyu+DlHoX2?= =?us-ascii?Q?p405Con1yarGvbvHypKDbF3KhZpw+sk0ICcMtBZ8pyKRHlq/HJcD2IBX2tHb?= =?us-ascii?Q?k2FlF0TwDWKBwneOQUhOWg3MixzJmLP4YnDxe9upgzlV4WZClQqAHe41NTz7?= =?us-ascii?Q?eWiUe0XuiFCrIPAf/um6RoCfxkzQG/6uNAsprTb+pMKbFPfikkcy7Kjxo7H3?= =?us-ascii?Q?faX9r9GXA5ov51n4E9KFbRdqbY+zPuI0r5hWJc3PcSYCU73mgLiDr3Ck8YII?= =?us-ascii?Q?NUefGCPIeT8UWI7HtjYvqz2RPxGW6R2TeX/UEvrptAaJ7wwvkJcysoRbCWLd?= =?us-ascii?Q?vyI1Oigf4qt34LDGGvonjfiNUyT76kjgqa/24LA2nc8Qr1bC3mjgpbAhL36Y?= =?us-ascii?Q?NHmSgXKtACe9Ch4ovspsAnJLU7hbfM5g2UkBzjbUjaF8PDT9IAPpNe+tIf5G?= =?us-ascii?Q?lDctX1BtxoSurRGaAPRrH1+m474aJtZCfDhj/MEdWK+JZ72sSSRi/HJnt+IU?= =?us-ascii?Q?CZCr6u1hiGZZebs721fyl0X4Uz7EGqgnZyDRQmqEiSYIh3IHoLX3/mgUxs1Q?= =?us-ascii?Q?p1mVOefmdTGRh69Wm8z5nl7XmJTZovSohMDRCQBByNpu90MMkAoRjYieXfwG?= =?us-ascii?Q?tkv2dPDyRLtrKmEQwsPoAh+iIEgEnOoc6KSm7IcX7DLTRDUJ619eChBVPtVd?= =?us-ascii?Q?Cz+li+TdKJBkNaVRFXMnwrSHEb9kx4xzSlLA4lQQhDL4UmJ6xFF99nwNWqCV?= =?us-ascii?Q?KJEe3neHFlONDXHNmJ0Inasd3bXIb3hV0eWQBtygVryvqC7u8tRV7NC9Z0+j?= =?us-ascii?Q?cYtCPXdmIVbeV+DbJfBHw94fK5vXvVfnitSzguqjpq8K8+Epj2fbxTMiK7R1?= =?us-ascii?Q?bFIDW7bP3f1Skiw9ABi4ihXyYD9kark8M1iymvDsBISwM9Ekh3aOP2+nlZze?= =?us-ascii?Q?dmwMQM92wytxQ/fVqK7e0Wo1bRZ6un8ztkKiR9nDoRrbBVyG/6m3fuwKKPke?= =?us-ascii?Q?8gSTpIJ9o7msoeqaud3TA227hoKe7tvDkqX8B8S8EIzyPsKnaQyWThle70zB?= =?us-ascii?Q?aYgoltEbaQRUBLt+so0YqeDeIvW4oiuFh/GbWL3UY/3HjIgFlVvINq0b5U5R?= =?us-ascii?Q?C5cWiyOOVeEbfc6VcZVvwb0t4+XqjmczBH9DOcPVgLkQLXV3DBaNZJcoLpWH?= =?us-ascii?Q?V0uaf7umPPoy4k+J6bWttVMFYlZA+i+PelEzpasCSYU3EG2HLHi4m8c9xlXx?= =?us-ascii?Q?o2+yeVXzBMxww7eRtnuVQC1/01+PHehZ8U26k6EH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3b95402-1f03-4529-2f69-08db9d590ea0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 06:30:02.7555 (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: wJTXSMkerMSW+oTwLwBk2oz9zgQ4DeCKMssWRhGNijnnRT2x1RmQEAM1ciCLwSqKSUTBPTl+YarYubq9TwAe/w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7239 Content-Type: text/plain; charset="utf-8" Drop data_init interface. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 776c54948a4a..b687f91f2da8 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -253,10 +253,8 @@ struct mptcp_sched_ops { void (*init)(struct mptcp_sock *msk); void (*release)(struct mptcp_sock *msk); =20 - void (*data_init)(struct mptcp_sock *msk, - struct mptcp_sched_data *data); int (*get_subflow)(struct mptcp_sock *msk, - const struct mptcp_sched_data *data); + struct mptcp_sched_data *data); void *owner; }; =20 --=20 2.35.3 From nobody Fri May 17 01:43:53 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2044.outbound.protection.outlook.com [40.107.7.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15867100C9 for ; Tue, 15 Aug 2023 06:30:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bgvh6CK4G/aElPWHGkxAZ3OF4ty9rM3VR2G6nR8uT2nT6EbXAjsWbrsQy1yi6POxwYZZYH3QbP9pXtXrg7fTm3PfY/MdeCSNtdctM6eUO9mx/tdySqz6WXR+lXC26aq6xGSOUUUu6VBYuE2XnOefzCDZGNQsQre2eVekNCjYingOOT6we0+6TA58as4ulCiymRKWThCUPQAU62OoIufwY3ArH/7n3p++fPN2fIJcSdmOk0ub2YTLmUL/ugI4OCy6obB5MujJ1rmMpGcldFQ+2wJdZdtn2EAMVvZUFtyc7U1Oeh8fpLT0XF/T6auNsP4c4usa9ER9ksz/eQOqxQzKxg== 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=iTF8AqcZHoSkebtOMd/N7qBdCoMquvrozXLfK7kkoH8=; b=J4gLhSLHdWrBLr/cX947S0A8fWGzfx+jDXDCEpxR+EhRZ0uv1OWWlOADk+aiy/nPqw1t9OoRqdd9Ag1m0mLla7kkgnVEmeWFjbf8JGX3QV6BWhH1C936PXY/1TyQBW5QjxXTHpFLOKHerk8IrU+DNAy80xWn+9IGHbFMozsbKd0adxU29m6KyuRXhaZ9XvyyewxZT5Zg//fky7YI+0WEOcuvC5YbAqU0f8Iyoz8gxA1dwLrgyY105GipZ6ceLqurdM7rp/8fQmpEHuAAC2vPLqI7ROKC9N/G3i7F6LiqbBwdjsyS31jdIpZenCUN63MxB9j/azjlbZ3QsIJ341vITw== 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=iTF8AqcZHoSkebtOMd/N7qBdCoMquvrozXLfK7kkoH8=; b=3Mn0fymV0PJiP8yioBdxnENLntoLs43rGthCvwoUjQUbLgAcLhI/qe87XKX5Hye5/mALXXXW4QlwLRp/688dBIXCqOA6BoAixUfAVXCf30XrVWW9WVZKq05NB1FHAz7MO7H2P+/QLmyTOMMGTL+JwHGs0cYHRMUXaL8tqNPZVjvuZ4chMmqI0gXgKe+1aod+wqYzWq6xhMmQ/oPiIu2Gpbk/cxIXn220FlnJDTAjNWN0ND211Y8Hd2QCHaGO0nn8mNnbVlMeawevt5jEp2ViLtN9ts/fYxmOuh90qYLKa4DHNMrtKpdv+nl8ZkjrmfykE9bVjfCzhqjdA+KpIo9Seg== 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 DBAPR04MB7239.eurprd04.prod.outlook.com (2603:10a6:10:1a8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 06:30:14 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 06:30:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 5/9] Squash to "selftests/bpf: Add bpf_first scheduler" Date: Tue, 15 Aug 2023 14:29:25 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0184.jpnprd01.prod.outlook.com (2603:1096:404:ba::28) 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_|DBAPR04MB7239:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a353ecc-2ecf-4927-6ee1-08db9d591559 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l6Huc9cZOFYqmW6SXNBP64BqNBEKx4h79RdCKhSki+Uq2cYxy0eN6Vn/6z/o++p86REuC5aHBFcVeNpYqd3bF5qlk1zTtj+j+WskG5kxJwC7OYukd7jK0uZi9x2cVHbXALjwM6GNuI9SsBDbmbx5DItvdKY9tYcMH68iBZ7Gt7zo52Aec45Evop3KnGPsgZ9qE9MhReqRyqFBS0adz7daoOt+QNSvnWwz97/Z9VcQb2nAgERhrpDtD1tg8qwgwxd6hlyHeGW/oftI+YubjqtLrPOQDf0+II+oIJsdiJxQdOCLyo2pr4/p0oQQHPJd+t2nLIREU8SYnP2ZEah4qp5CWk4qgXlmGpSCjTPmtahv6T9+wBFeIfR6DL3fTst1HAZfBRk3PiXI+6DkjjHsiOUkkclBuriupgR2i0RjNezcAIcwTuUP7kjid1uhRbDOS/LycjQIBj2MW+uioYkhavflUxARn3QkOXc+IjNpntAxG8m9RFHBzrWI5lYkw6FBrgaiilWewat5Xn7UIVjzCuGx1iWQjRHLgwmZZcVl4EOO82+IUL49cAgTHKPXpzVTLoc/gZVbHnelU+AHEVZQUg33f5GlwLmxsXu686NNvdlOV4= 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)(39860400002)(396003)(366004)(346002)(376002)(136003)(451199021)(1800799006)(186006)(6486002)(6666004)(6512007)(478600001)(2616005)(107886003)(6506007)(26005)(2906002)(44832011)(4326008)(316002)(6916009)(66556008)(5660300002)(8936002)(66946007)(66476007)(8676002)(41300700001)(36756003)(38100700002)(86362001)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lApjE67svhlr9Htptc323UakAPjNSk1YmjF9qIW3IHw+2I+iK1YO+Qlqi8co?= =?us-ascii?Q?EAgrXs4eqfINcnIxifk/7IdFQ4v5ICwRKJ1RU4Dkic27J7QkvuRBq8qiheH7?= =?us-ascii?Q?z0lUIn3pJg+mb+5/cPBA1VtFeBpi/YlvyKiFywkRWvvA6P2IZdha0Kuxf7zW?= =?us-ascii?Q?aN9kccAF5YZHIbeUssFvS1dX3CwOfNzt9yFNivrJ0m92N9V9dGsUVqJ2do0s?= =?us-ascii?Q?Zlzdo37PELv3oUz72DtO+c9YN2inRCdEVJudAH5x7leTm9nLvq0+fE8xpMir?= =?us-ascii?Q?6F3rhaeYvpUQL+7CeZgwxq3JRvnpWqxUCGIS65+4R8xwO6ndATgicrhwdzHb?= =?us-ascii?Q?pcJkz2SJamzo7ZVCy9c9Q46ARNSJJxShl8ZSvcKqDZ173fr7DZ5LZADGRdfF?= =?us-ascii?Q?at8ZrhGVlJgY3FaLJlNBSR8aK9nbw/meKCsxGtNBlDZUiVgyGkg+917WtA/I?= =?us-ascii?Q?2I13kkqJjojjZE7Dax81KDGiQjA7l1bBYvjoOUTviEspVvCy/Ei+Nn1CxUxS?= =?us-ascii?Q?Gd1K4UBmOdNis4RlAEaJoxaH167VWtqp+Z2GG1XU/GpfcDTgdhBVb0GiYY8u?= =?us-ascii?Q?bwMXtWNyNLacnYFW7HcB/ft48UqW9lXMI9Ovyj/pbVhWOVs4HjymQf5nvnsb?= =?us-ascii?Q?DE56NhO+DyB0AW1NIZ5T5gFmmF7cGuu7AOhOeJ9aqpHhLuxoq7rXQ9nhggao?= =?us-ascii?Q?4jTucqT4M4MjuH23KbFozX/txQGHdtIBnNwKjkFvo9MZVXAAuCQ0BCg8++ZL?= =?us-ascii?Q?3JeYxzOvSRPQo6UmlKjMAteoL+J4TQCZXYgB9FA4wHjXzJydisodEVCzPSQw?= =?us-ascii?Q?vdK6UIHuak+1KBd3C4lnU6LqBO8rJ2g7xiN0KnZNRjcu1+dpy8xboWvnBajC?= =?us-ascii?Q?4fXWadAc5f7xYLJzscQylaREfovoGnuWZ0ajbZlkNEmPjAE2vVaFKwkaBwYI?= =?us-ascii?Q?IMSAR8FrIsT9f3ACXU5k9/iF8oqAv/yddC74ZGgwHSzQfyQQelb7mAPg7qvl?= =?us-ascii?Q?BToMpgQp5fFxfdLGY59cDNVEuF2l5Jv9j5YOc5TkWFOl5wHZg3y6Nmzdl+mr?= =?us-ascii?Q?awgv7tJPaQNyA91LOV9M00/VL10tg0/bauq4gwOuSUjCfU1VPr353bck/xx7?= =?us-ascii?Q?uMFSUsckK3giCCq3LtY2PNW+INyZdiwMdInBQuz7i69ojW0g+6KfHdP6E+fE?= =?us-ascii?Q?LLWtriygqfGCEhZ35jEXiZCVLBZmKJJ/XFNEItAYz8Pd+VwoJ/FlTG51UOze?= =?us-ascii?Q?XTjksM8HAmPWugOxOxlk4K+l6nfSVUodBvjYKED2vd/5W7WUacuv8tveQ1Hu?= =?us-ascii?Q?u8vGgY1zPcTOiyKuEpY/gfYllSx/tywNQKIoznBHOYfR8UvFuLJ0l6zVWikm?= =?us-ascii?Q?zsZrvd8nRvwGHTcHnjfRTiBeVs0ZRgyH/o81CotHxa+uGTiV0bCT7nBx2lre?= =?us-ascii?Q?APLY3q6Rbr0smUS2dUPO0x4uTS7m/ewUIluTAPXEpPrL5IxzEl/9K8P21cjC?= =?us-ascii?Q?CbBusJqTlvB4bHOwPVhgAisBrijPRigXj8qZODphTU7nUWNcJzGg7jvYxeEV?= =?us-ascii?Q?aI78Ulst3/lfkIcSxykrYyfYIocWNlvzoKuC2YgW?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a353ecc-2ecf-4927-6ee1-08db9d591559 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 06:30:13.9838 (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: jSXWPYrUUS+llklQFFrRUKptZUuRoMXW8VwAznqNhNOPHdyxdvmKXg4v2TZfbUAeiROpvaDwKTdus/+shhjKFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7239 Content-Type: text/plain; charset="utf-8" Drop data_init interface. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_first.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 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 3b6669d536df..ae0eced5b91f 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c @@ -16,15 +16,10 @@ void BPF_PROG(mptcp_sched_first_release, struct mptcp_s= ock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_first_data_init, struct mptcp_sock *msk, - struct mptcp_sched_data *data) -{ - mptcp_sched_data_set_contexts(msk, data); -} - int BPF_STRUCT_OPS(bpf_first_get_subflow, struct mptcp_sock *msk, - const struct mptcp_sched_data *data) + struct mptcp_sched_data *data) { + mptcp_sched_data_set_contexts(msk, data); mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, 0), true); return 0; } @@ -33,7 +28,6 @@ SEC(".struct_ops") struct mptcp_sched_ops first =3D { .init =3D (void *)mptcp_sched_first_init, .release =3D (void *)mptcp_sched_first_release, - .data_init =3D (void *)bpf_first_data_init, .get_subflow =3D (void *)bpf_first_get_subflow, .name =3D "bpf_first", }; --=20 2.35.3 From nobody Fri May 17 01:43:53 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2041.outbound.protection.outlook.com [40.107.7.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 9C7431FB4 for ; Tue, 15 Aug 2023 06:30:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gjiA0k2b4VPBl6FHctquapxoTxx0g6STU5L3qPobzjCYjBlaMyu7yznSMO6MpxlSfTjAZ9o/KUMIedFXYiCP5FSnRpeavzoPoKw0sGo0sbxpBkMJlg8O6N9zxzTd8wqzdI91Dl2xiwnSxxK/hRa9dx7WrrQJf+MCaLJM/t9n7/okw6mbS94Lbgk390rpza1cBMTkrq0WQpGzCj59lBX8uu+ftWC5AYGyCCzFkPfiMAyoTusRX+njdNItlLRU+qWYeUq1bPLPLeViZjSSxOmM0yNlRAbhUIJw5guxU4yknVPBWs/+8ihcUAWw1FTV+9qbiGS+5P2LW/M4MngkIKDX1g== 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=OocR4KM0tHg3NC9ZWNWfD0012JZHbfPUj894DL5ilM0=; b=K4lE1rx3is+owVH1hDLw8/zXWSSFXcNr/j/z0vW/R7dYnLkkb1PkUOcmsn+5Mcp5wt6pPA4mi4JvCTaxiJK3al/VxQDs/orQsByfm8wKS3Ma4W4A9zuydjAwLE4PsPEAqKZZUT7WBTWkCD+K6D7aDT9JOSk33/ZKS+MghwcHpKH/3ukobuQ8RdIPhI6wlAWhCx4jZmV7AE9q5vhStUWVaHi5kS8+5DVEXs3OIvNFgkZp/jg+qJqAWfWcPuw3bbRaZTJczvS1nlIB26BWnSjX0T7ot6ojk+Nsux8qjIekX+TqJCWaBLSkrFtp0EdFOdS2o9BSiHkhlLlBrKm1tL3Rdw== 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=OocR4KM0tHg3NC9ZWNWfD0012JZHbfPUj894DL5ilM0=; b=fg3HgK4J4eFf0dxtlkirUf/+KVzlGzMD2myRUb3nFjGcIf02OTI7lvu79Odwij7XgoywKG4m4xyWwuJglTpiL+MGaEDC/b+Y8Mp1A3nVHpeqfeCajH++M9SjWFPgbAATm2QNu3r0DO/AERdOzKECdMUnYL8gcJHM2UYg4t6XrpjtFDSdaVmLYvsgwI/yx8MTcoEZNoPWiNW+MK7un2fkp99VzyfTRqlpDrdHUsXtLCgQVjK42idJyNqNQV9F2F8TwgkXmlzWq98v1ZubuUATlfR4i2VV8pSPMcRsKKa1lL/ZNR0HojC26Vw0PMjp96JpyIuDjmjSpOmZ9HHr04OBdg== 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 DBAPR04MB7239.eurprd04.prod.outlook.com (2603:10a6:10:1a8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 06:30:25 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 06:30:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 6/9] Squash to "selftests/bpf: Add bpf_bkup scheduler" Date: Tue, 15 Aug 2023 14:29:26 +0800 Message-Id: <40a9ab12ba7ea1c508d3336e201e0860f021f35c.1692080803.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR04CA0022.apcprd04.prod.outlook.com (2603:1096:404:15::34) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBAPR04MB7239:EE_ X-MS-Office365-Filtering-Correlation-Id: a7bd93d9-e5f5-446b-d753-08db9d591bfa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lW9sNmeHAr26V6rqL+17RguTAZSp/ionZIMfT4QmA5+T3lmMOMQ3aK1XlPGm3RPYViqHaFtR0Hq8ueF+gXfPoSesUn0HcgJXo9ZPBXppzm0sOfVRr+kB9RywS/kHzu2TmJTOZ+xnAlk7T8rKyu67B4IBIKchlTvuSi70BesZ0Q6cMQ9KFo+BbEDIbA/yCn38n9DEIpCOqSIQ8BQuXATBnxQrljihlA3jc+QqapdXiHfAUbWtl1kYfs+8qzL4rn7MwVFyAeDOQgJ5OREXvQw3teTziH51KngfZt9PqIPU5pyexZmkHp5bB8KRsRiVNU70ItpsbRzvgTCjEPEP4bdyz3gad0E8Lx08/wbDoOglBxCne2R9pD/pQ6fSY86zlGC0ryRoTZykPBi/0KClEGNwcQO+t1B2Yx86IcFRE8hD5eaRbBftBRqhkq/BRNM5inp8jFBuQSaFXqflrpV2rDRBH1PpfTxdShsnZjQy0+XIhsU4JfyyfuNjDm7dtC6sgfRtSqMj0ABF07MU5q2niHdL+yiK4zqLBcWLsw3gd9HCvPBxDItoNlFUDWgx+AE7uBEQ4WnZX6t9sByGpkxOpkVcLxlZW3o8ckjc1kGma9JrIto= 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)(39860400002)(396003)(366004)(346002)(376002)(136003)(451199021)(1800799006)(186006)(6486002)(6512007)(478600001)(2616005)(107886003)(6506007)(26005)(2906002)(44832011)(4326008)(316002)(6916009)(66556008)(5660300002)(8936002)(66946007)(66476007)(8676002)(41300700001)(36756003)(38100700002)(86362001)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?z9S2jgzHKJFp38WyN1fWH3j6RW/ufeRz3fGJr5b6l3qMi5xtSEqi3SYbB3J5?= =?us-ascii?Q?bGWl7P72R0UIyhR5JLRXQZoT1WZRrHxSueOXhlwMsZH/wdbNG5JF2dw/9Uy/?= =?us-ascii?Q?AHwbfA4xtmL3KI4ZGXQ79Ww3VB+xl6k6iF8uvRSk3HQ87EncLlRranFvfRaA?= =?us-ascii?Q?DGBd8ks9O3W5qZxnarPIQXTZIBZy8q3CUtAeSCA+PZ46CyyvJGaZUFHgByym?= =?us-ascii?Q?08zrGuUtcZP0hZ6ZAPIc3PIc87FUyjXJrb0DKj/IrvmezchHh+/PiPTQubox?= =?us-ascii?Q?qEOJhbtL7+nSakAxBajGu1dBgbPk+zG94DpVGuzVvCHI7ZmW3n4x4wJGS4Iu?= =?us-ascii?Q?3UdBkhxU2+n7QyRpNqyF5d+V+fm7BZNIqWYW6Y+PQzNAdnl5hnoWMMVEpDQU?= =?us-ascii?Q?37PqKGHK/OAjMFehwJqEOVM8eiACaGeZEt75EEPtmBpNgztOm4j/kiC6abbJ?= =?us-ascii?Q?TEALEKlrhCkVNCJkQa5W4VYue6QJW6K7oP0VL4G7P6yivn+OvSBVov+DQDhq?= =?us-ascii?Q?+QKxkw4QiI3BpY6aYQY9kgIpsso1sHpbI2amYyj9OwQfzQ+FycyEcO1PP15a?= =?us-ascii?Q?jQjfY6oz7JxZYDFzPSXEhwjwyK0w5MpQIFV3jp1Pw1Wfe4HS9vIVxwWw9Jo/?= =?us-ascii?Q?yq5ab31sF4qaDto2TdxM0Rp3niCYbHOXQcGCMj59+1m70SOKK9B08GazcdHd?= =?us-ascii?Q?Vnbxhn47yiGNtpaEk7VdrKuoBd6G7bbPkr15n+PKeiKQAVEVqJhxgiPxfD14?= =?us-ascii?Q?xWOp79WpaVCFEZ/w2PwpJr5/IgZBlB2WTRGFj3lO+lXaCeqI3YnlTFhlur0Z?= =?us-ascii?Q?HJ1DDU6ZNlPaoR0nDpKqJtPrsU/opI+oqJ62hPAcG4SUOYsjoUNHn2FegKrM?= =?us-ascii?Q?H5pXpJMev1tuumWGnfzyTsLpTaXFipbgiHlJ9BHzMa5Bqh2D83jtOd4+O+6f?= =?us-ascii?Q?pgtUL6b/lpxo+/9JKLzH4v/eksTSNvufeF7L8N98ITViI2wsdSVggxS9n0MS?= =?us-ascii?Q?EuTsBFVbdiwwJP2RD4PouGBE+Kav0TTwk25o/OmZ7L9cLdQlVVCBbKnb25Os?= =?us-ascii?Q?2sfBr2HMTOHkdiFspl7PYZdRo3n09H27mxh+VHG/ucx89DP1W5g0+glXxY7k?= =?us-ascii?Q?I5jf4ulkGR4VniXeoU4RbFkXi7/7bhEJpU5CYLTgEtFDZm03wUGj5GsA2WRU?= =?us-ascii?Q?AU84W/iJ8iNU2MYPDBRsuJFlhmmTXc604coAAgX5lecGMJY7lYUY5jvTbEgN?= =?us-ascii?Q?pNsRyBzMqdbwFRJRylFlxJto0AVzYni6Ez8qVZ+D/zmmTQtOAKH9udFMWA8p?= =?us-ascii?Q?LcZp7WzLDLNwE8lT5Ca8I8Fs0huWlnxQy+SslY6eF0nCmIA34I3GFOSqtEth?= =?us-ascii?Q?Fw6ftdfHbaveKo/fe7jfX3heQ6g/BPlIVGwNvfog3Zj/+CqmkotL9xvfWxi8?= =?us-ascii?Q?74cS/NO02z80B6TrJxGbCSaOoYld8X5m+6caol06Ifxyi7tCliUl1jP8FVyj?= =?us-ascii?Q?Q78UDC3TX2X9qzK0ULBJLiV3oLjHHHA+9mC34g5C5lZ/7Y8axzp7nmlJo8BO?= =?us-ascii?Q?VwLNYMLNOnexohOfwWJ0l9Tu7jGsUs9eKTere4a8?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7bd93d9-e5f5-446b-d753-08db9d591bfa X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 06:30:25.1581 (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: JsrOKvfINSLh8Oo4tpOHnF6pv0WGLEEwKlmGoKgFrFwo3XL6qQYZWay53xm7tdGjNjNhhlexfvWLN/559Kg1UA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7239 Content-Type: text/plain; charset="utf-8" Drop data_init interface. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 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 21493a3affdb..7e66ab839d14 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c @@ -16,17 +16,13 @@ void BPF_PROG(mptcp_sched_bkup_release, struct mptcp_so= ck *msk) { } =20 -void BPF_STRUCT_OPS(bpf_bkup_data_init, struct mptcp_sock *msk, - struct mptcp_sched_data *data) -{ - mptcp_sched_data_set_contexts(msk, data); -} - int BPF_STRUCT_OPS(bpf_bkup_get_subflow, struct mptcp_sock *msk, - const struct mptcp_sched_data *data) + struct mptcp_sched_data *data) { int nr =3D -1; =20 + mptcp_sched_data_set_contexts(msk, data); + for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { struct mptcp_subflow_context *subflow; =20 @@ -49,7 +45,6 @@ SEC(".struct_ops") struct mptcp_sched_ops bkup =3D { .init =3D (void *)mptcp_sched_bkup_init, .release =3D (void *)mptcp_sched_bkup_release, - .data_init =3D (void *)bpf_bkup_data_init, .get_subflow =3D (void *)bpf_bkup_get_subflow, .name =3D "bpf_bkup", }; --=20 2.35.3 From nobody Fri May 17 01:43:53 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2063.outbound.protection.outlook.com [40.107.6.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 34F8A13AD6 for ; Tue, 15 Aug 2023 06:30:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZSx4n7sUa0LAEBzfoVIpxHYPAMWOMpN5XLXQq2e61gFVTGcshopXVlptBELJwCqljJRJPIAf1e7L/ciiLp1/yRmluWbvKw/82r3W3NXbF9O1NIMVdayC63z47KrPyuB9tnz3UPzGqEVUXMaVRL1XleJBHaMwMiXZmAAwunIBChoNs8jRZk2PkeFak5X3xVk9g40l9hsl5MDB17tCT50kLkDHJqp/Kfz5fMyOELZWIGZsGMGS8gVS5/I1mnsC1RB4uMSVPCt3CpYZuCG4dUdgxqYp9Tkb1PIAKqPh5g7XUAUP0cyW/bB25SLD4jqeSWe8Ui99dHdWQ8yG09E/wmhCgg== 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=6NQoEtDw8hfPZdmVZJNDOnN9YUxD9lQ/XhbsKM3JQk0=; b=OCNbrdePxFn7e7VpSxv6o78gL9jugL2xytQj/dHIURNvGfmml96o43XMzFmnnbUxfafNf4j54ZdI0uuAq4NIo92pO6anGl2Lzwov2CL17yOz4oXlKf5LmuQ3SujGpYV5ORonTbDH064tUAm2GGcIi9UzKij/Ggia7nNayEEqBA8/6WZprZceEg8vApWy8T/9XwlS2IuUOenOgp/jNQOfIZHIvJDS6rI1nP4rm03L94pyk5sRA/LaOq/28fW5PNFLtGSJSv8EVCLvNIoxVMhDcWAIjk6pnijTtzMd0Amyr293C556RVYZVviua7zGm5Hm4Ba6P3ay5r2UOJn467mTwQ== 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=6NQoEtDw8hfPZdmVZJNDOnN9YUxD9lQ/XhbsKM3JQk0=; b=aHUeDbJMMuACEXwiyUEVIHSi1uuWrF53DBiOaNk/anWMehwHpTZcfIK1j68q7EwLZfAb7xw1ZEilPq7yqTiXqcxaTsYyNN+t3UfCYNmVGloyv96JtNKM/+LOGP8W3f1K3QuJhUL6QiO7ahtvT9W7sUBxCJ8jGhoLUmJj1Ncov8T0Mk5aqfboouLSCVOA+PsoUib2PVutEaodC0CYcz7MCJKMWI/Srim4hkXX0ofqf8DEEuPCeqAuDUrWphOot8r1dSI6cICR+47YMIFStkjGhkZM7Bl+bJK3w71t44QJ/TFtmFdmAFtlOsbECsw+vDbp0LKE3c8Yr9OiLIliLyt1JQ== 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 DBAPR04MB7239.eurprd04.prod.outlook.com (2603:10a6:10:1a8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 06:30:36 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 06:30:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 7/9] Squash to "selftests/bpf: Add bpf_rr scheduler" Date: Tue, 15 Aug 2023 14:29:27 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0011.jpnprd01.prod.outlook.com (2603:1096:405::23) 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_|DBAPR04MB7239:EE_ X-MS-Office365-Filtering-Correlation-Id: ed01d293-a142-4504-3bb7-08db9d5922da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kjfomkdLMtPl8xfHGR/qIlspxYkh5mUo1An/4Q363apMaUl1/VV4FJ1ObXPKzPOZuWPk8NA+ZX9/f/zetGYNn89hbrbOlM5hpALBPb3hgllPQDPjIdFF6AGA9oJUZ8BvYuL9TkMtVhEbNrt3c1T/MnZfW+IINS/gepb9d3yQXd6LiKM0LEKwTyA93AoABEnRYhvlrW9An/FyuEVg+BEfXcd13bRX/ZAp0w2PgvRs/tLQ3iKTPjVWiViPw/pDgyl5jX7lD3Joto0gsZjtkng4lLrJDYNq1mchjkPwYuLdL/zBRvSHf+HrNVWCmNMJDseobkEAY02hNMMDmHEh6FajDY0fb1H3JQlXKjHqDNXQYYbzL2ZOmXN7zDWcJxTTBq+5BgF9aMb4MZYqaTjL1w2u1gX+txX6NpXF86N/KDq3CJYEm18c61RgT9dmNAY8qeQYQpRAWIV4oCpPKoteaU78DBbKkpyeQdBiaLLeG8SXGbBBKdvbUkwnTStdu0MjQ1iTH6N2I2DUy3YzrkQDdZbKwe9w76Lu4qxw/vYmHIHkN36usxD6ze4GbMvaifVHlDTOB1PJeg3/mvIUg2xnAUwEX9izK0hVDwrZCMkY5sNwPZU= 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)(39860400002)(396003)(366004)(346002)(376002)(136003)(451199021)(1800799006)(186006)(6486002)(6666004)(6512007)(478600001)(2616005)(107886003)(6506007)(26005)(2906002)(44832011)(4326008)(316002)(6916009)(66556008)(5660300002)(8936002)(66946007)(66476007)(8676002)(41300700001)(36756003)(38100700002)(86362001)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fw3rkURT6qOiNNVR2yny4vVAHDq2ON451hdn76NEDH9UD6lFQjXRRUIgdRmB?= =?us-ascii?Q?m4cfLzsaK+ULXAYWLbjmAPP3H8CLv+c6SdpytKVAAAixBKaUsKr7IEEj8229?= =?us-ascii?Q?27CTrY7bq4ELGbe2StisuTq+KIfMI2tp+7ktxorPQTXntJoT9qZK9qwEHwCJ?= =?us-ascii?Q?6CGIN4Fs2RL2x+OxoSxjPqeisgVEqtiW6y3Ia0p3vfysUYNBxxTIFiw9ftms?= =?us-ascii?Q?P2YyzF9JIA9hZ1g5TbkSwLPfOOqKa2DxD/yfIDkpDN0mzduIwqOfQh5Emp97?= =?us-ascii?Q?WQo1DYL4SjlGguAFGEn30/23+txL28eioo83vFwBDTkcRRyYF9pIjLcU+co+?= =?us-ascii?Q?kRlthL2drOjTBN0OHND84hCmUCDs+ypfsThMbgHGxOVOJ3rhU6b/1N6ZlwhF?= =?us-ascii?Q?Fh8BPAMFr05Q1e6qqTJhGcTlwqhpGvZJSUy0kckAC5UbbBTv9I9XYRpGoFky?= =?us-ascii?Q?IPbzbmUfRn25/guBlyomq7N3KJaF5UqVa5Qzo5wqInqdjSq8V2w3sErLpFbD?= =?us-ascii?Q?QGDikawqfn7MYO9JMwQK6EY2gA6HTZQSnv6l412WBCdrImpY5goCnd4B+WUj?= =?us-ascii?Q?Ivyc6vNTqy4cvcDyvy8JnAZqfW1lk4XzKnGHnjsd5bS2p3CImZO8xeZDuKTd?= =?us-ascii?Q?RLSoMPPPhg/T8ZyljTp6PV4RYQf71bqkKw6fY+sdk4aakxJKvWAL7naq5R/w?= =?us-ascii?Q?Pb462mcSxVMqDg64OtsurGughRCQyoqHpfJRLY9pZlVp2cD4YSZuqVBvdXad?= =?us-ascii?Q?VbYRvFqn7gB4Eh/JrzFVkopuZ6uslBny6uaOnZHExUVM+wGdW0KH0Wrw7p5W?= =?us-ascii?Q?newWjvqQRqZFYBZIBrfGv43GkRN9SVbAODMcbMTMOvCtpzIrbUoRfN22/Ilz?= =?us-ascii?Q?Q/QLiGsMnFMPgM7nPChNJTh3IhEYzWKuQntnosK2DGUOuomql5fY92lQQsXz?= =?us-ascii?Q?QkIs+CknqSnv3O7qJl1MLGWiD2qBgf3xNtTPy3tMlKtx+eEfeqWe2AxEQ9Fp?= =?us-ascii?Q?gTSqpqmgkScxZvH7QmuL4H9ArI9r6+PojlahW8Jj/lepxY7zoqqquaL8/YqV?= =?us-ascii?Q?mcZ/IJ0CRykC81DLhAa66mFUkjuMo+8FZhfZQp2iuBR3qsSIgc9lUR6ZPqyO?= =?us-ascii?Q?T5cSz1z/LuRo1xmhL4mCxEeH5VmjbJ8T3J9drRciRZAYfCgUwINsYZSh0DVj?= =?us-ascii?Q?8qV3BJ5a0eZic1nkqoD7zVlXDY4YmYDQ2YTx8QB2Yfr8ss2NK4/nGAGjZGPs?= =?us-ascii?Q?qCTfXNHsj9MtwPyiho/fjSfO+w9pe8FE1N14p8cKt5dLMO6v25oy42farQwg?= =?us-ascii?Q?qCWDcSA9QOXWAfD8T9SZ44n1IWNTTdtcJKSVhdTKr1lw4J+fN6ltKXXzr8pP?= =?us-ascii?Q?NC6GEsNB8Gou1qXtYMkdF2eQYrlz9J8xPcQkTOCi+0BqlR5QC5/vUEDboyIh?= =?us-ascii?Q?dlkSl+MsQD8GW4FujZnV+VZCMb6y9uVZZm5bniY8H2vOp5TdgFVJyO5RxwI+?= =?us-ascii?Q?hWfOi+ZwIPt5/i769sRuAFC79etGwG+owYAWY38HFF8ZWA99zFD4Viq6D3tU?= =?us-ascii?Q?1oIFEK7rSRQPJsrPYUAq3JfSt8y023/ga1t+y1GL?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed01d293-a142-4504-3bb7-08db9d5922da X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 06:30:36.6716 (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: FVZdpbQbIIc/EKWn6rqOr7rHtBUh2RG36U2vhDeJiApH7icLqk5fY0kOvCkHkAvsFnf5ScnJZRyZpDbUCCOKaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7239 Content-Type: text/plain; charset="utf-8" Drop data_init interface. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testi= ng/selftests/bpf/progs/mptcp_bpf_rr.c index 8d9442996e0f..7a5c058d2408 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -28,14 +28,8 @@ 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, struct mptcp_sock *msk, - struct mptcp_sched_data *data) -{ - mptcp_sched_data_set_contexts(msk, data); -} - int BPF_STRUCT_OPS(bpf_rr_get_subflow, struct mptcp_sock *msk, - const struct mptcp_sched_data *data) + struct mptcp_sched_data *data) { struct mptcp_subflow_context *subflow; struct mptcp_rr_storage *ptr; @@ -49,6 +43,8 @@ int BPF_STRUCT_OPS(bpf_rr_get_subflow, struct mptcp_sock = *msk, =20 last_snd =3D ptr->last_snd; =20 + mptcp_sched_data_set_contexts(msk, data); + 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) @@ -75,7 +71,6 @@ SEC(".struct_ops") struct mptcp_sched_ops rr =3D { .init =3D (void *)mptcp_sched_rr_init, .release =3D (void *)mptcp_sched_rr_release, - .data_init =3D (void *)bpf_rr_data_init, .get_subflow =3D (void *)bpf_rr_get_subflow, .name =3D "bpf_rr", }; --=20 2.35.3 From nobody Fri May 17 01:43:53 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2084.outbound.protection.outlook.com [40.107.8.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C96318B0F for ; Tue, 15 Aug 2023 06:30:51 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SU2ZFBnH3fJirlCNeF+G7UPt/kYnDd82Ey/jGqzBei609zNyYKrmy6Eu9igMNvMIFoNjmBC2oJ+r3VgcUty8JUI0JsaUKFVeSmqV/qlWROkWZwcA8grtRT17ZOWOYCQnOY4J3C6GVyib3kAczZxxN8yaoPjnc49WSStsw8x+DGGdCneFpkygVNWsuD7k8kSz43SRZVR1p26v1wSmXZqRd6k/HFR8x9BRLuIm94SMbN4IcO1K2vTtTDGYfKl+IpwostbusUwdUDNGl0PQYwJz/DRvtLTivYWgYH9Z8N/ozB4a8v1VAAU19poV5Uh1PqGQsblNOeAjqN9sBnTQTd377g== 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=TPMM7tCV+kO2nKhrTMllqEDLVrVmUtR+hCkg6hkRlXo=; b=m/4gmHMJ9ChOfyciEAMgii3ad+15A6wGwIVdzUwVwqAH1kTmCq/7uZyZnOhjOeME9Ig02yyk5yE/mQkl1eVkT0///bMhYkNcRDsTLSlqJeX+R/40t7Ix31aAtkYI+2RTqrlMW0xYpc9bifW5c76dumCpyfnC60L9abgSS+qwBN7S6Sr/IMlH91H2po7EGU9Vk22W3xG2JHtUU93HeKmjLwl/c+oRkqdQp5Lc2TR+dLV5DGQXpIid5JmkLEsrwSQUwNo0HTYcr02eCgVHayl7Y0Ir9SboeymJUBWQwhMgOrY1BnK2v7IKspLE3Ee3Ph1/tT5RkuMaK1jJ8QY9XYnKpg== 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=TPMM7tCV+kO2nKhrTMllqEDLVrVmUtR+hCkg6hkRlXo=; b=5I7cvEehlt1UMGtdFJqYAhny0olCP4H3iExDemRS/bqD0wKfvIySkFwPOgFnSGVigNvLOhAfez29o79qFYNbwrED+NwJUWmyibsvB/rejxyt5BYyc31+3wWNDGAUFgeHyxxEr28nJxFr9XLNwva1PasDXcPe4Tjf//iFYBF/vS7exi4ydwTUv5/iE5eqWNsrThl9e7kMl5tsI5bban0XaAOMf7QfkVUFx3n5haJim4zSjH1VvCQSK6ZuxorSeOUpkOHQyH8maAvZMXIgBDwXmna+KR6guPj+iHsdDnYz4Vw1lRijnTd4TDpmoanDG+lRzYMKT71621aemd8jVqdBFw== 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 PAXPR04MB8686.eurprd04.prod.outlook.com (2603:10a6:102:21d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 06:30:49 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 06:30:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 8/9] Squash to "selftests/bpf: Add bpf_red scheduler" Date: Tue, 15 Aug 2023 14:29:28 +0800 Message-Id: <9c9b72701b399baa03ada1781eef64411245fd8e.1692080803.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCPR01CA0013.jpnprd01.prod.outlook.com (2603:1096:405::25) 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_|PAXPR04MB8686:EE_ X-MS-Office365-Filtering-Correlation-Id: 71d1e931-e374-4fe2-5a75-08db9d592a59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jIS8H/tEWz4rdNZIUMR+4V6pVgPxV17xzV7qkw2CkMDZzi798qiRvlXEYCEeOx/PhUg6e+XAnEDqEalrgxYw1/UMg1YtJ6VjdKCgz8auip9H9E61lbOapggSyNAkBNjU74rMclL3Og/OJ+Z/dqs+dfL8I67ppykLIIVwIcHUyBZ0vGOSkrxm0UUTnBiT7SnlTY6uTjYB7f8XbI59LV8qYamHL/Nx0qmwqq3owkxogWjDQe1E54RJQ9s/KPqGzv3cAVXbfXfWP/GsPbe2lnr1aE85RhsnEYpSJYArbJwrHXTKOBwvyy0nkReneTesKDJI39pZYzAzVaDFWoyEV3FsBY83v8J+ooiwemuOT/TrIpLgGQcUN/CEuUsDLVLyzSjCjYl9qyaOEqVOZC4tqYcQaDOGKw6kil9wzNaLRXyeiZg7JYB4KR62bTFU7GdYTQwCuOemsJAC1xOpU6kryqNnInqjrazgCyJz37Xoz24IyMWKHks1faYIVrwSut4aP/bRK8GY9sEfPedVLyIdYEncvIyDaIf4I2hj3CNVIYt4hc+nIXM68AL+GJP1vJVbk5MYECxStRSYr+e3cc+HuJX+odvpyHCCohynuOoRYaMAK34= 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)(136003)(39860400002)(366004)(346002)(396003)(376002)(451199021)(186006)(1800799006)(26005)(107886003)(6512007)(2616005)(83380400001)(6506007)(41300700001)(66476007)(66556008)(66946007)(6916009)(2906002)(316002)(5660300002)(44832011)(8936002)(8676002)(4326008)(478600001)(6666004)(6486002)(86362001)(36756003)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SGi2BxJQosniSNkvSM/gl3b04W+//EhKhR8EXSlLcD70Dnsgp0y+lta3B5Oo?= =?us-ascii?Q?WL8QMJlVHgD0hxIcHMwxI7aJMm1G81HVJo/S3ADQexNlhuTY51/ZiM/wqLbY?= =?us-ascii?Q?fTRlCgiRr2VuIdOkdyARterCUMUy1gQ8zWRd2j2xv6C+OMTKtsvM4qF+fmhF?= =?us-ascii?Q?jvqwMO2dELysbuSRSuUbugqOgDOFMqVDuE3eO29xZ5JHr1Nbgb6fhPlrhpDW?= =?us-ascii?Q?12cGIAw5y7KKCrPcees/mZ8wT07Q0OJxoWrl/uivGQY9qZmcxBfbvTlFbwrc?= =?us-ascii?Q?kj1sXGJBFzvqWoiDn2X0y95UDo4+uks1zWBopPHVqfHIYLdUtVgCYWtG3Z07?= =?us-ascii?Q?mEwy2k/Wmsv8nKP1QN4f28zfNL4a3yPx2/LcJSAqvWcc+yup+Pi37Ifezraf?= =?us-ascii?Q?f3EgJOrhhaaKrlOalycWKeRbjqJSRXJKxtTc6gAXCnlxMPXyHnL66a2sZv0K?= =?us-ascii?Q?B/tSkBo++0gENu7PXm0pcOnMwh2HvCW77cPhUB6UOKvWEkHUZ5QeL9+0Wrxl?= =?us-ascii?Q?zXR8BgcAHrT4etqVgsgHlGo8ztPNMUpGPHXaqYmkJxkIjiuXrKyOzEREfsA0?= =?us-ascii?Q?/RZX4/bFbO8O6K9itIhH1G30jckVVjKxg/ZL7SU4E6o9EIIhIM3s5IHAjk+J?= =?us-ascii?Q?cC7CGJcry1HAJQmQAcQjBgsgdR5SCnWx7nlhADaLY1VocE49llJUpt4IarhQ?= =?us-ascii?Q?/8WBHFIuw6gUsnAmpPXK4ssjxJ8P5iZQtkDVV8vEbkDKFq4QYZ6nJhdVzvte?= =?us-ascii?Q?dNoSFRqk33vnFJo+/oV2gZfJBKu7ypq/GMkWz2o98F4IVG5/qhNrGA6GuovC?= =?us-ascii?Q?ku59cruTCfBvKfKPSoGGwzFrlzkpi0fHRYU7mzX7I2s3VV6b11xjHGfih+G2?= =?us-ascii?Q?/731RbB0bxxDmMxLuUzHmIg6vgbVABnjcIEvWGigtBvi9XVBGvWg+uXYoZwo?= =?us-ascii?Q?5KZIZ+mQFPy64PfVW9Sh69sBDT6NpRVkq/9lY6TPfF9NMOzpAFsRRuwfuz7k?= =?us-ascii?Q?Cn9GJxIH4Wcg0ZJWDeCYe6VZWd3yMyR0BfVW/XgV9CsH/Mcv68+wBSvH32ud?= =?us-ascii?Q?sMYy7EhYXJNAgOCnUeZT1eYHZj6inNmLAGXZCw0RE0Z5cFk7ytL9LnYLNu7l?= =?us-ascii?Q?hY4g6iwkNDmYgFMHbvnjNWJbbOIA0slPcv8ySK5O5WxN+ujzReBpHwZZyHEL?= =?us-ascii?Q?hhP66HjohG45pAkMywUCP2ZGwiWMOix6flwrViN3sdjRh5JRUOVR0W/+88Yh?= =?us-ascii?Q?mn1xE7mvV2p8FCC+51BTwwDhseCBHE2vrQgXVGdrwIuwKEU33vj2tBStmMq6?= =?us-ascii?Q?FUgwF77nswRYzI4tFGh9IL2+Lbuyk7mTv8NP4/tIv8887HBPAxQ4ht6g2fpW?= =?us-ascii?Q?4f2Gp4fOpwzb+OXCBtzfRcMklikuREyPYb8a0Shjlv5kXvaQrZzcY6RD+XjV?= =?us-ascii?Q?6+YJ4ScU/Yz4t9+mjZENVbC+o0anfNQZHU1sSvBjGfHJd+aMxvxvXjz3i3r6?= =?us-ascii?Q?5gpig3isoxKpEpwTnDXzz/57dyzIH33C5cTEb3I93hQ4fzBDVzGr0mHMTt/v?= =?us-ascii?Q?Wl72AF8vIXy9zvuZBsKLchRqax9FOMZvRQLwXlaY?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71d1e931-e374-4fe2-5a75-08db9d592a59 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 06:30:49.2430 (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: Hr/Bik/3cNfMQ3iIBCq5jCsap5p1G3zFZ+eoY22KXzEk+aQcXUnAo4VmIi+cl3pMDcNRrxFS9dbrXQTGmjltiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8686 Content-Type: text/plain; charset="utf-8" Drop data_init interface. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_red.c | 9 ++------- 1 file changed, 2 insertions(+), 7 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 576e4acd1fa0..eeeec6250f64 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_red.c @@ -16,15 +16,11 @@ void BPF_PROG(mptcp_sched_red_release, struct mptcp_soc= k *msk) { } =20 -void BPF_STRUCT_OPS(bpf_red_data_init, struct mptcp_sock *msk, - struct mptcp_sched_data *data) +int BPF_STRUCT_OPS(bpf_red_get_subflow, 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, struct mptcp_sock *msk, - const struct mptcp_sched_data *data) -{ for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { if (!mptcp_subflow_ctx_by_pos(data, i)) break; @@ -39,7 +35,6 @@ SEC(".struct_ops") struct mptcp_sched_ops red =3D { .init =3D (void *)mptcp_sched_red_init, .release =3D (void *)mptcp_sched_red_release, - .data_init =3D (void *)bpf_red_data_init, .get_subflow =3D (void *)bpf_red_get_subflow, .name =3D "bpf_red", }; --=20 2.35.3 From nobody Fri May 17 01:43:53 2024 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2048.outbound.protection.outlook.com [40.107.6.48]) (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 2D6ED14AB6 for ; Tue, 15 Aug 2023 06:31:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m8HAwHvvgV65nKStxmtiuinOAxgU71+SzIWCg6Y/n/6/WJ5bTynFMb26470IHrrisun2XQQTkRbiPyUKdh7VChmnViFChXMZ837GCNVP777mbKoVho1+zPxw9EutjoYpTtpXBRW3bUwNkcSbdvxxdPcgH3AFhNziASnmDbgOkwjGVIWpqAJlHpLQb1Qv/bzTTTLBoh3nq/URYVUS+xuayVPnhrFmX+i6z51XWvbL02kgTdK+2tr/S4a990BbRZ9i9IGRTksgCMBgVk+8Dn6aLFxKymaosTKWslLsB5fKGJqxPCro38f3ef0z4MWKCXc4/JezJfC8PxEv9erDqGkg/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=itQm72CyIQjHmA2SkWM1Dmqy0u+gIj4PJbV2pe9fJYA=; b=UaTltGK5ORcL3zi/NEmP0tXR5aaeoxtEaosCR/RCeVlyLWi9RiArCj/mHIpWyOfxUPpF7Qq8sOVfpTQGuYZ61ZCbn27WzdHymYOHhjr0MuJQwFSTmG1M4LmXQOwWuP6S/dAhd5HYjmDDpAdtLyJzUslNs14+rcd2uzj95m/P+aQK60nSQznJ+PyrDYor2bS0X35OezAgD9LG/Eh0VRFjm0L5vaAblIyxhCQEf/XT4dqCCxR7IUTNtPbx2RcrLW3WQPZ9rKVVd0PwTxLQpkW4SEaENGlFJWjoU5SVzfEvMVozdCSx+5Gns0ajmdirlxYRmIwVHpfrJGASuLMmClN8rA== 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=itQm72CyIQjHmA2SkWM1Dmqy0u+gIj4PJbV2pe9fJYA=; b=uQjthvpf2sc8BqlfC+O+evlJmDPqo62IeQT5NhgFOyUin3FR+wbbUVtSXlQK28rkQlSMzMe32WbGPqhYidftqiysrqnLEuY7ATlY+6Z7cUHHTrdCuoaBzbKDzPGQYux9diDTik4mOillcJ5Ek29mQp6aMd9eGyoRhanww1CJlq0Wn8vHJnMiumzZY2Bpl0fXS/eoOZmysbvKZIK2QBaA3dYEtj6UVmEHvBmltSm5MznQAJ0Z5XnA6i9shnZ5No1P/7a+cBmrZc5izYLkKUVDzGpdgxEn5PZ1CwbV9MZpdp8JtZHpp3y7N8OCDm80Lhyo1TRk719Rh/6/4mRvyEJjqA== 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 DBAPR04MB7239.eurprd04.prod.outlook.com (2603:10a6:10:1a8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.26; Tue, 15 Aug 2023 06:30:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6678.025; Tue, 15 Aug 2023 06:30:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 9/9] Squash to "selftests/bpf: Add bpf_burst scheduler" Date: Tue, 15 Aug 2023 14:29:29 +0800 Message-Id: <6608f9d9fea9d2bc57ec8378a7afa4fd52c66d17.1692080803.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0099.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b4::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_|DBAPR04MB7239:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f620f3e-fcf2-4ef3-db6f-08db9d5930b0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3MMsnFrc8boXoQQEWiviC+NR6wvXZGzFDK3vPLFvurOGgXwxtS2RK1IqXdsfB/sJyTwOA6YlusaS0vyDECiESpCP4mzwT4OW7MPpEi6BQ3JWbO4uTey5AyhQzTKw3EA7HnxIN0GMfSYW5X+FTs+Q63dOJUeiGeZM5gOTvdisupz8ENeVhmHJAVylt7gD3h7n5ZQbyTiasTB7oEuqo2vG0iy/FdLZhBxXR6Wy+RlkljMZHJ3EtRryGIOellNaWfZjJXPRqPOPuI04qXGj3ushyhQ31neDavrHjqfbiATfhzoPS81VIAUfvCjRZZpcK/jX5FO47ghB8TbHnutbe/bSpxpR8vY6OiJxDLR5n50YD7RE9rU31mBkEVs3/tMm9QKZxKyJOr9zo7TuGuEtS/05yri/tsAfRCbNAT7COGcCZuJaydrZ3CKKQUucu4h6UinxXsa/Q4KWpYxAVMoTSsWATtGJJKREbediOT3SRvr40aWzg7EhUbD2x7KjnBFM/UWMpkk4yj2HcOjkcpUoh1Rmld5CKnIqI9akBq+4KKu+NrxLSvd/QFiVQcZf9We/OFUiVPQdzU2El/jKnvDMiPYh3d38Dxd5cBD+55VFoaz7UUM= 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)(39860400002)(396003)(366004)(346002)(376002)(136003)(451199021)(1800799006)(186006)(6486002)(6666004)(6512007)(478600001)(2616005)(107886003)(6506007)(26005)(2906002)(44832011)(4326008)(316002)(6916009)(66556008)(5660300002)(8936002)(66946007)(66476007)(8676002)(41300700001)(36756003)(38100700002)(86362001)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0UyTgqxuhJByrvLktRBk8GYhxOt1S5MY6vF8KTdVf1O4vR4LtHUKzHS6YR5J?= =?us-ascii?Q?wMCyRrFGGsie/v53n9y/VCI9uAnjj9XGWJgGSYZrti7wTuZl+PgRv8zLRcHJ?= =?us-ascii?Q?tfrMCaGIZINwY5jAzBcFzE/mwO9xNG+7Aimrba0XdwzC4pojva3COWWMrVOQ?= =?us-ascii?Q?qsOKF6ALI7slli5j+GKNxOGYh9rgw2yppuu1QlMsdfmRPcClECwZlI6J2c1T?= =?us-ascii?Q?axjy1dZ4+KpmjauYoaOSS0ByL2trzRrQ4/8mdB0UjC63bI+nHD5aGtEekJQc?= =?us-ascii?Q?NL4PtrWVfymceKIdeZXcvv+zLX7oehwNnH0KCMQWcNWQRn92Nj0DnqRVxGDA?= =?us-ascii?Q?m3dt9WQGWAKHPsDshZm4RaY4WI2Nv5wxIZT1d7zow572tFru4lrt3cISFWqb?= =?us-ascii?Q?iAc8WjAjYz6pZVQTGKeJ2PLM4fqFhUFurPqkDT8Ey/k8tQ943Xa104/cJTD6?= =?us-ascii?Q?W9OyZChIeDXOBr4ApnkXm+zq/gStn2LZVwaPhKm7rECriu8WNWwHkMV8LjiI?= =?us-ascii?Q?5PjziPn5rK+ZpejO7THnXFMySN1disOnGvI5ug++jM7nyEkiPuPKbpSa3E94?= =?us-ascii?Q?SiRn1itVXVYvkaNHp4fLM88/DGozR0Yx0a7e7rHRt7BPwBHUHXwpSNgl5mHN?= =?us-ascii?Q?PNaQ6l+2GkntfM7++qLq03l5E1Nula6mbH83oa11pthgVRo1+Bxvm3Nsx17i?= =?us-ascii?Q?ZJcwkMPsDyo0oGY9/OI/+gEQpfY6q6D0DoytaMfn34n4pCo7lC69PdAxFyNu?= =?us-ascii?Q?WEYKdLMcuCIdqcIlGW15Tz9ZvPWyRoupH+x32YzqelrF4Qdl1Cui8pN0S8CH?= =?us-ascii?Q?NZM0NMk+THLrNli30vnycRz+7Ccllqu4IO6LHhgza5lqDCnRsfk+EJq0/RbV?= =?us-ascii?Q?xWhpxDCoJwr8d8uyR6FPhAMfgjRvsjZqWk4lKQtS0JHMHeSw+KXu+TDQmfoT?= =?us-ascii?Q?bxI3pe/2EXuFz+04YN7PmKq+WKm4N8c7KCceTQfNU/TRQl9EVb9wRDF3JG27?= =?us-ascii?Q?J6T1mSB1h0i6sjLHXMuu15f4nVM9IT3LdR8MQgx+5/XYp7CRigAQMmPpbfMe?= =?us-ascii?Q?i+OuyauDkqO9XOeOeOikjdnQR66U7TalmOrPbUldg4K0cLzHP5fBdM3ZI/KQ?= =?us-ascii?Q?ImEm3iRyF9KDMDdAcO60ApQiL2LFDzJePO9Eftmn0ITVa5Cv7UjQUNxEqJ35?= =?us-ascii?Q?MHEOh+1LXVmRgnfbL7jMKFnDAP8tywZQtThyhpVv0R7ixw05T5YgXUes4kbP?= =?us-ascii?Q?HL5xAWQodnQ2qVzF+UF1vdbL9pCI2cb5xlOBv+qH/DzDoz9ZhKR55su1JNAN?= =?us-ascii?Q?k3ee3YRLOInuulGTWEdvJskOk0p4HiX75Zx+Yqklxej98GzncjcaNPRbtYBy?= =?us-ascii?Q?TkgVZjVhNoyrNAU6USRZSgaWzpUuV3+lnTtgTNawLwC/WOzRxM6geb3P4XJx?= =?us-ascii?Q?J4cmM1RRMgnXls5tEvWCjD2ktXmhj1Q5oLiT2pZo+lIQ7h+iFmSBS1AIfZLs?= =?us-ascii?Q?NkUs6vRI/zUbuibuxp3GLulBsU5bMCgC1TxXsoBAs6wRXkkIHoZc0vgdG9DZ?= =?us-ascii?Q?jzXj7sKZHFzL0a2HCIkQ3aLY4xj+7nRq8WCk7Bci?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f620f3e-fcf2-4ef3-db6f-08db9d5930b0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2023 06:30:59.9051 (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: LGPg+n9yMZl1EAcU35CKhwaJ6S1yzKHYc33X5Y9lMJ250XmQnhO5ZrUoA2yfotNGpEzGLIkfain8lhheXMmayQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7239 Content-Type: text/plain; charset="utf-8" Drop data_init interface. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/progs/mptcp_bpf_burst.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_burst.c index 8cf2ab32c159..2962067568e7 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c @@ -77,14 +77,8 @@ void BPF_PROG(mptcp_sched_burst_release, struct mptcp_so= ck *msk) bpf_sk_storage_delete(&mptcp_burst_map, msk); } =20 -void BPF_STRUCT_OPS(bpf_burst_data_init, struct mptcp_sock *msk, - struct mptcp_sched_data *data) -{ - mptcp_sched_data_set_contexts(msk, data); -} - static int bpf_burst_get_send(struct mptcp_sock *msk, - const struct mptcp_sched_data *data) + struct mptcp_sched_data *data) { struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; @@ -157,7 +151,7 @@ static int bpf_burst_get_send(struct mptcp_sock *msk, } =20 static int bpf_burst_get_retrans(struct mptcp_sock *msk, - const struct mptcp_sched_data *data) + struct mptcp_sched_data *data) { int backup =3D MPTCP_SUBFLOWS_MAX, pick =3D MPTCP_SUBFLOWS_MAX, subflow_i= d; struct mptcp_subflow_context *subflow; @@ -205,8 +199,10 @@ static int bpf_burst_get_retrans(struct mptcp_sock *ms= k, } =20 int BPF_STRUCT_OPS(bpf_burst_get_subflow, struct mptcp_sock *msk, - const struct mptcp_sched_data *data) + struct mptcp_sched_data *data) { + mptcp_sched_data_set_contexts(msk, data); + if (data->reinject) return bpf_burst_get_retrans(msk, data); return bpf_burst_get_send(msk, data); @@ -216,7 +212,6 @@ SEC(".struct_ops") struct mptcp_sched_ops burst =3D { .init =3D (void *)mptcp_sched_burst_init, .release =3D (void *)mptcp_sched_burst_release, - .data_init =3D (void *)bpf_burst_data_init, .get_subflow =3D (void *)bpf_burst_get_subflow, .name =3D "bpf_burst", }; --=20 2.35.3