From nobody Thu Sep 18 06:42:58 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:ad0f:0:b0:4cb:58ce:be2f with SMTP id s15csp1153740pih; Mon, 23 May 2022 04:33:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHRcVpfVwd6o6VImyzePDfkrk9ewCu2KTbAmLP3Y3xIE6WjRSjAzReEfLEMyOf0J6po+za X-Received: by 2002:a65:6bcc:0:b0:3f6:1815:f541 with SMTP id e12-20020a656bcc000000b003f61815f541mr19442042pgw.183.1653305628798; Mon, 23 May 2022 04:33:48 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id p9-20020a637409000000b003f63e14fda0si10331258pgc.451.2022.05.23.04.33.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2022 04:33:48 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5434-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=NCyUN7vS; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5434-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5434-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 7D8E52807F5 for ; Mon, 23 May 2022 11:33:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 90C4963C; Mon, 23 May 2022 11:33:47 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 A9C137C for ; Mon, 23 May 2022 11:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1653305623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3yDp+38AYaVgpufJ4A/XAHBGxX9NgfsMdAb7o/7Y5xA=; b=NCyUN7vST0ZY38YeRRztYLmOmCzC1tV+UzeMYNzdyBV3QPycXsOOwuH27GQnvs3DndBxXe t044a8CvtftXnCoVlel8CFCE6gTnP94JezemOzF5U9lCI/IoqzQpTqEspOks3BGwuR4JK1 4l01khc28x7G16gb5P5ZmEZaSzRzJGE= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2059.outbound.protection.outlook.com [104.47.5.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-3-UvSa0IrBP7WuCDMEZNYYZA-1; Mon, 23 May 2022 13:33:43 +0200 X-MC-Unique: UvSa0IrBP7WuCDMEZNYYZA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MTlj96a/Ryev6dCyPo4jEy6gbwTzWXqA5il8R4IQTmJEkQbaTvo8hGrVaZbzOURWMjdfp2PrvRcq24NJmOf1JtBxG2hnCBOA+mi9YRtt/PnpyZheWGCkkWyVqykmvQZ9mDvhfWltVMVygyWxdOdPi55BBINAiIs5rNrsMSbRfDo6psymm0Rwp+tYDanwV+rupf180/H8Xg0Sxh+IhRw2R47SrhrA30SvlWu+rbhfsMJiYvq6RB/t0DJGJGo7P1AFtzbzZUTqB4tLkNVbOyZAIEagIFZBJ1DF4a32fbKW5PZxlxJ3x5ua/uGVnU/jI1w8Kfys9P6JFd2LBT1GTPMnQA== 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=T8S0flcEMHDLxDnsvsYWyw20lwGo2q47JxK1JL4+2Ps=; b=eqYpLxSHx8kcDCp5b3zSPNSkl/mabOQq6z0z610M2HLheYuX0lx9tswthzldDuTIUrwuEjPMwWcJTEsXZYOe3+/JL5lGXwq+pwa88gSoRazrws+CUBxZPR5CDoa6wNcdM2DJkii1LRJONDZSt4XMQ1fwA+bYhNmCECDop+6g/R9+v7u7lqNXqkrH1ACi4+IrZBrxoT+j2gOrS4knYv8OjgWT4l36JamffXSMBDzwxhFuuy3MVhcBV6ZmDxOxRchVr9+/qbj4ehTh55HbnNAJX3ykaScWG+Kwt/TPwl1F5uLIqTV5EZwOXPyouFpYLlZIPQLcMcSCkDHnw0Xt0rhAqw== 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 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 DB3PR0402MB3899.eurprd04.prod.outlook.com (2603:10a6:8:f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:33:41 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6%7]) with mapi id 15.20.5273.022; Mon, 23 May 2022 11:33:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 1/5] Squash to "mptcp: add struct mptcp_sched_ops" Date: Mon, 23 May 2022 19:33:35 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0019.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::29) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94f96c9d-a80d-4994-7aa3-08da3cb01662 X-MS-TrafficTypeDiagnostic: DB3PR0402MB3899:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kngodd+jiXNIlhTECopFODFMwKdAiJnbh4EOW+Le5nUxt4cE+L+5mW+efVKVvpQhlBnYtS6F4fYGpnqGOVSV19Q5RiQUdwDDiby4Q7DhiSaWrRL79usThc6r2tKCbsUY80e0PNQjqt9T4Vvr4gvsWqyYXUJwrLiIUm7KuQNcPVs+rMRaSfJySOC87EgeUdmOx1RyygJ3Qqk2AQIwEX/FxKIs04xs/S5xn8O9PeMD11vNKzRe8wMvkK4MlppUNJIH4u2CruJYQtY9+vVGUs2MlVdMunPJr8RKWgPtl3DvrnoicIq0n6y2JNXRC1DIrl0uCnez8O6ONzBQOswggFts0R0aPQFCoGX7hyL35UIaaoD824yGhcw1sKWMQuU9vGYCMZ1Szg1zWX9ZewR6+Zibh999ycZD7L5wLydTOy6WjARn2Diq4eJ+bBzJSl6m5O1zmWzOqry7brAWVosxS18QBkb7DdX+tJz+S1N1qgioSeiqk4O0qSfeeEI3Sepb6EM5tqFpDgl94Fcwj367nyoPCa+wNjOqyYZYSeW1Kofw5RmPEKReRzUtOLwZClDGtAbpstWMNIstZdEGj/RvxcbIOOoGJ8Z30t0sAKJbV/UP9L3wYGuqvB24yClZVNzns2p1tWre0OCMjjwi6n+VLbzObKKflip4zY+7/t6X6Z4CHmf5GMQ2vm0J9bpKNQ9VhD7bPJcatHcPKoPvDDoc5KpDyA== 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:(13230001)(366004)(2616005)(186003)(6666004)(508600001)(38100700002)(6506007)(26005)(6512007)(44832011)(5660300002)(6486002)(83380400001)(8676002)(107886003)(8936002)(6916009)(316002)(66556008)(66476007)(4326008)(66946007)(36756003)(86362001)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oeIOHxxmD2NAxAYKA/yue29m1wK5p5VbLCx1XKbowtoV3KxL553L3XBQBZod?= =?us-ascii?Q?SsmN+1wLz2sEQmky6AhfKDVHxebDKe+V/5fg4dT+jADei+6oxVK4DfsJS+xZ?= =?us-ascii?Q?AKlkplDFT0QtHjiE2ZBGtOrsFvyfyE8SIJuWr5c/s4LkPVsDJK0Cu5Ek3Vn0?= =?us-ascii?Q?RCubk+1noqyhWGbBoQReoBHu1z/espaCv0oSP3pNdf4gZX7cYoGtVmuJ75LZ?= =?us-ascii?Q?sG8VnIY6PYXTnKvbQ9I1KdAWufVPwPGB9ix/ppB+tf11c++NSN68L5evUSKQ?= =?us-ascii?Q?xvrAlaE5fDER3tNF4/U6pdoJi1w4gWosO9WGaRTMVbTFvhFyhIZyn3+U1XXm?= =?us-ascii?Q?aSNgpwqPh8EsL6rFpwUAFB8evhseOPXlcXdM1tqAdW7wriwpOtMyQBDq7NUp?= =?us-ascii?Q?Ocz0IoqxcfLYVvYa0E3eUpA9xaMq7D6Ju4LQnPbbjNK1gcvffiobDd4ynTE5?= =?us-ascii?Q?iRJDAiYc20Vs9AsAPHWQzp5xKIRJQcBDGUahhGTkS+sTXu6ccqUeJU4ZHkCK?= =?us-ascii?Q?PMP8+7HgAOm7rzqoy8KDmDTl/kN/RWN2Ij2P7jt379NQesqsO3u5svXFbzvE?= =?us-ascii?Q?f9IKItiOAkUPZ7fwdPTHnETqvjPfaYFtp7ecDepmvD2iiaZnW1cMweL1QuoS?= =?us-ascii?Q?YdR+ws8UpiHmDO2W9KBYvbag+AJxz6WvvAw4gAUBLBu32C9lG/IRY2iTl+R1?= =?us-ascii?Q?m53F9nEhbU9qVN61Sek1WDTpH+KxXI2B37XHRPCHUGqpXfXDkUvcKgbnJcoP?= =?us-ascii?Q?wITROSWqud9nttIm4Ny4vxaz1i+zYumREzmkxEmqk89cXpRA4RC9ySJX5Srg?= =?us-ascii?Q?Y9rYPIxyIfhynXvbZUN0zLtXvSVvRA5Z4GclfldcFAvsBz8xNUOETQEhWQss?= =?us-ascii?Q?KIENP/lvBaiGXkGHpMDJS43/LKSFlomtal7GUTq4GdJKhM+GcBIJVEkaO9Qn?= =?us-ascii?Q?GD0+uDvsLDagux5DdPY3/ss0K9V+OUGKub/ODyUMjM+rBLrwKVCvvDclla51?= =?us-ascii?Q?5sczL1YuQeDAtmANfkTQf4x6Iu90U/819E87kT2z2Q7ZyTKZnlY9YBhL5zYC?= =?us-ascii?Q?6bxMqLnyfD94OouPJvvczhCVcG7K6m3geGP0VEcI1JqmiYNjfvDKh2keRErQ?= =?us-ascii?Q?CvW4C/M8lR+O4vtAor08mCIEXSQxdOdIipkp4cjlHEoNwmaXVVRWQnpOk1d7?= =?us-ascii?Q?HV5r6GevNGcwOX/ZpsrhlgD6YEghKv3etUpvQgv+P6r8Fgspy9xtVzdJaqyY?= =?us-ascii?Q?DQiKseuTxWA4c2fDD4BU2jhVuLnkISycQdvCPP1Hoq/NxNghvHMhuQenYFQm?= =?us-ascii?Q?vL8bMFd18v87lL/thbZRDSdnJmVWPpfAeM4UTngp1QkEAadKqAMMwUA1VmIq?= =?us-ascii?Q?bLO/McBRASIfXyiDiL4DVtohDNOYGc31A+NW2bwZxRDSZT4UrXDg0Q4wB+fx?= =?us-ascii?Q?JvBwQoomNG55vH8fL1L5GA9DHpwMqowwsovOw9qjCwn+Gz3OSddhT0aOtLyF?= =?us-ascii?Q?jvCsQYj7HXslStilACqDrygwIzwrTGJGn3vsGG0jKb4oSDxNS82yXZOUozHk?= =?us-ascii?Q?JtrcIbd2/2IJpOBPcFCTV+SNKZGH29S1kTAeghQoRD93v9QKwfrwf5hzw14R?= =?us-ascii?Q?Z4b0Rp5Of/EJGna4bkXBxdpQ/Dkrjaxur0jWIARZvilB4L7PZ8U4E9RrMqYM?= =?us-ascii?Q?5mrHOdp0lAAWUQ2EQAsREnI9iYex7oPVMGzXo/9WNyD0iWLe+i+dFJZX78I6?= =?us-ascii?Q?WCUufTtYLwtneHtGJ2D9bnFOqL6GMWA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94f96c9d-a80d-4994-7aa3-08da3cb01662 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:33:41.6934 (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: gh7FnAM6gr13oXKGHcu/Ohe2UjwdR3v2crHf+3P2LR4KjM2o1hWLcxf1ulGEwA93aYj+J0PGtMz0GGzmQ713jA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3899 Content-Type: text/plain; charset="utf-8" Use bitmap instead of sock in struct mptcp_sched_data. Please update the commit log: ''' This patch defines struct mptcp_sched_ops, which has three struct members, name, owner and list, and three function pointers, init, release and get_subflow. Add the scheduler registering, unregistering and finding functions to add, delete and find a packet scheduler on the global list mptcp_sched_list. The BPF scheduler function get_subflow() has a struct mptcp_sched_data parameter, which contains a subflow pointers array. It returns a bitmap of which subflow or subflows in the array are picked by the scheduler to send data. ''' Signed-off-by: Geliang Tang --- include/net/mptcp.h | 8 ++++---- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 6456ea26e4c7..24a9eb32c1dd 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -97,15 +97,15 @@ struct mptcp_out_options { }; =20 #define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 =20 struct mptcp_sched_data { - struct sock *sock; - bool call_again; + struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { - void (*get_subflow)(const struct mptcp_sock *msk, bool reinject, - struct mptcp_sched_data *data); + unsigned long (*get_subflow)(const struct mptcp_sock *msk, bool reinject, + struct mptcp_sched_data *data); =20 char name[MPTCP_SCHED_NAME_MAX]; struct module *owner; diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index aca4e3c6ac48..17d97e21b1ea 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -231,10 +231,14 @@ extern __u32 tcp_slow_start(struct tcp_sock *tp, __u3= 2 acked) __ksym; extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) _= _ksym; =20 #define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 + +struct mptcp_subflow_context { + struct sock *tcp_sock; /* tcp sk backpointer */ +} __attribute__((preserve_access_index)); =20 struct mptcp_sched_data { - struct sock *sock; - bool call_again; + struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { @@ -243,8 +247,8 @@ struct mptcp_sched_ops { void (*init)(const struct mptcp_sock *msk); void (*release)(const struct mptcp_sock *msk); =20 - void (*get_subflow)(const struct mptcp_sock *msk, bool reinject, - struct mptcp_sched_data *data); + unsigned long (*get_subflow)(const struct mptcp_sock *msk, bool reinject, + struct mptcp_sched_data *data); void *owner; }; =20 --=20 2.34.1 From nobody Thu Sep 18 06:42:58 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:ad0f:0:b0:4cb:58ce:be2f with SMTP id s15csp1153824pih; Mon, 23 May 2022 04:33:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMOOWX1d6XsS9ZUgrOPYdjiZQ/7wWG2hQtkRAPC07qr9mqXao4xX6lACJ2Em8LDbaidCSY X-Received: by 2002:a17:90a:aa8c:b0:1df:359a:1452 with SMTP id l12-20020a17090aaa8c00b001df359a1452mr25487326pjq.75.1653305637097; Mon, 23 May 2022 04:33:57 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id f125-20020a636a83000000b003db43fa2ed3si9768891pgc.713.2022.05.23.04.33.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2022 04:33:57 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5435-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=cG7MeGUf; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5435-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5435-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C995528091B for ; Mon, 23 May 2022 11:33:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A3E3463C; Mon, 23 May 2022 11:33:55 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 2EC1B7C for ; Mon, 23 May 2022 11:33:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1653305632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=17n/n+zZTKkDrOGtM9M/ybSxw/ljaKDcsnksZx6dfZc=; b=cG7MeGUfVvmFdc+I+2Tlw+SyYBGeWKSOdh5u0UTYyfhMrnAotCTn15nXC3LjVjz3uNOIzD AdjbtR1XU4Gv/fLIsc+5NLnoeHRoS1V7qpkWzzmZP2eJjTvCb5+QPigEwaNAVBrSCvDdVo i1c0gfkXrkXD5zI/6/8JccVvDvVYGNE= Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2054.outbound.protection.outlook.com [104.47.9.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-29-1bflxu8OMsCB4pAEnmh9CA-1; Mon, 23 May 2022 13:33:51 +0200 X-MC-Unique: 1bflxu8OMsCB4pAEnmh9CA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jfIxXPxlJbpGaPjRomVg/ktrRxqP8vB2kru//b1rgaYDXWnvQk1iANVa8ppenQIXdERNnavKj0lPpFhfNQrUF4oL1ybddr5IIm1xjGgs4zOiCW+28aJNGoezDHSi2lx12/xwQ4ZR7aDtXv0BXfIomtN/j2Rk9JVlQ7s2WwbMnaK4Ymiwo2sm4EpfFw/3133PRsCv2xsf8PZk//ofrW9hB7lPzWfQ/amnU2+EFuVZmODq/Ss9NLyos6T0S/5s7Ly7zEAIHdxb7bHJ8i1pL7s+14w9QKKY63T6TQs4VF2DRK1sWGw/i+YQViXZZwhs0recaI2cy97l8Z+nrc3ULGL1wg== 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=2mXNueFtOlAKlfyg6YN2SnAi89vAEZvRizmUrnz3U18=; b=iQ/ZcDrb1b+5yPxOgPG7U9E7U3Y2/OeUKNPQBYC11/JNorslJrBHRdSTjLE7PZ0is2DsiXGhPR7twVrHWPuAkxmYg29fn2DD3Dhh/pa1BFKek9nzAiSpmcqgGb1+YXhOLzLrYHv+EIy6NugjlgufYIpm/xtlVeeFxxUd7qD00rpRfYnC5uDkr/d+i1WZfugeF++4hFZuHtHkmVpaREzVumzKXCJnylK2MemltMpADmO9mpMqm04+bYlyyKmTvKi6WWtnnt40M0WWDekmu6AjpbUwCnDKDjYdeD5nz6zuexgvNbuSOhPSx6ax68z49cR+tQMvHLgSO6UAEXniKqEITA== 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 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 DB3PR0402MB3899.eurprd04.prod.outlook.com (2603:10a6:8:f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:33:50 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6%7]) with mapi id 15.20.5273.022; Mon, 23 May 2022 11:33:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 2/5] Squash to "mptcp: add sched in mptcp_sock" Date: Mon, 23 May 2022 19:33:36 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0011.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::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-Office365-Filtering-Correlation-Id: 9b684003-5f16-462e-36b9-08da3cb01b8b X-MS-TrafficTypeDiagnostic: DB3PR0402MB3899:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g5EsmVdyfRpX/dQHQYwdv/qrPfQ3iI++A/aw/H/Wwokpmk/MdGLJjVj5Nix0+MqoIe4PeJA87uiuXaKF/0DDZi8GeoImlSBwT3T5iLiWKeRJpfxSN+icZu9j0BfexNyvwaWTwZ47IXQWfUo1d6wpmT9KtgMmb1pcO4ZiDnFuMk6YvgQGdoBoIMzJjoZsrfYDVett8eV0/9GwfY+QJ8ZrHb4cdGOZZW/011h6RosKAA/Ox/HblY8F2uwXkQw8NRKMwP7/uhPn4H52T4IqbFqJLdXVF04M+ttH3owZoxZ5eikO1IG/iXQQ1CDx9xyJ1gvdktc0bBFYBikhe7JJmbfmhA/lUWcAn+lnlWsB4FWEGiW0PtBDsUDYG3t0lkOg+Vt2f40oBrrASOx6vbzt3rvvwjaV8pFzFGRPQAlBZz+eVFyUJZD76q86fr2rzadd+F6XqNcAGMYPpWe3FNaLHXDinFiw+LkdVwzDd6iE+4QwuQUI87NukZtayO60K+Un5FiDD3o+kQ9IvfRYwv4JLUdjTUCT+FARm57SsUQTrL9p29vZr6bJC4o5qN4mWzKIlfl2wDgfNBUUH4pdIvoLCGXT9MAi2jdy3OeIAa7MUA2zy6FPQX4bePQ6rmxzx+nxr9PrmQGX7oEv9ZkRapJMFlKXgKqsyv5cAPHALzkYcztQnmveNsMIq9/CR6Ghgm/blXv+EiKHaIPXWNjl1RmZ9p8PBQ== 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:(13230001)(366004)(2616005)(186003)(4744005)(6666004)(508600001)(38100700002)(6506007)(26005)(6512007)(44832011)(5660300002)(6486002)(83380400001)(8676002)(107886003)(8936002)(6916009)(316002)(66556008)(66476007)(4326008)(66946007)(36756003)(86362001)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dgsxo2TgcsS8+AEUdhw39+b6yXLtkoOF4fGYYIcmXJnGZXymBVd6ZYZDYROm?= =?us-ascii?Q?T3ux4HppU1V7So25otevAeg2v8CYf/zfA6ZiRINGlpqKC7ZaBV1BLEM+MY5B?= =?us-ascii?Q?qYlaMYMTA+o0vCN7vu+lPymuEzl0z18apr+TzS8dfxj7+e028FeM5974MTGF?= =?us-ascii?Q?2+hAjv0vOc3HcdRRvgbzNWIFxdbrQNJO/J1EeV+QGRrWdNcV3K/XSuxYh6LV?= =?us-ascii?Q?RqxeX6CTkF/FSLDO/2ZCmJg+ZJKnUPsXqB/av9NQ+HL0nu5whsdiQlM+jDqh?= =?us-ascii?Q?yCjJdugdelqtfBMh26npBDdoXDt9w9F/6lDMumuo1hZDyaasrhgx239y5XPX?= =?us-ascii?Q?twpEDJ3wH79GYuPuctkHEDTBua8h6zGrup9ZNE4IXs5NjDF0xPePV7YMXU6j?= =?us-ascii?Q?2hGvVzOnR2abLla5i6bhuBQYHkOSIhIQO+QdJUMZuARY5R/5+lreIfFsQjhX?= =?us-ascii?Q?e3e7sluSLH0MjKpW8EuKdmaGCCsxLAAbA4fXsLjI4UrtYhkWAnu+1fCELYf5?= =?us-ascii?Q?QH3hw3TlRZk3H/DDIvEKkAnA0nmuk3uxs7Mm8T2MTYXYs8HkN9EjqzZkqQfv?= =?us-ascii?Q?p9C16pJCNAT66RV0yZRHWJIAHFFRhjKlLZNFvkhZfj6QVBTf04AwpsRqZhhM?= =?us-ascii?Q?CUmY2czaC2EzE+674T8qZ3NU/ymJynl8pXguv0/WsZ6WWJVUkSVcawtdBrZY?= =?us-ascii?Q?3WYt8NOxc/MX3bPPRdw+Uj95bp4aJxsDEMymMY4TQG6NEwJJtcMS/YIxzr5w?= =?us-ascii?Q?k9jLgeorRxXX5FX2WhlGReFTMuqqQiURKhqu3c3AVX6shedabCQwXYtDvnX1?= =?us-ascii?Q?bx9VZScHathtiHMWDh3rBhkdYypAGGnpx5waOJ7RxLw2sAjF0KQPBC4pyJZi?= =?us-ascii?Q?uyUINxxxElq7G18+q5KNXw+g7Nfj4WsVneQlbSHy4TEt+PgYUGF+XDIaueg+?= =?us-ascii?Q?aclqkpSFnQCM9q5qwPFP2uWKUm0gvvocjsBHTi+YDxNafYgzvcDgPs3XAS/Z?= =?us-ascii?Q?wUGhjC5N+MZhaLsggVXwKLvuSNLPdSkiGDfK8Y9wJO9+lsTO6hwamkEUdSlp?= =?us-ascii?Q?Mit7aD3UZ0z4mqn9gWnCU1WltJq/LB7Da3ApvQNneFR0/dVzb+lY9R2XYZAb?= =?us-ascii?Q?z8f/ERxmy+I8zMD+7wvoVx3OP64us/poUfXpbmMngZ5gyFWho+7iZAb4ALWV?= =?us-ascii?Q?huM9V6/dtxOqH6lMV29hhxJXBFx1Dcho4ChuHs6oZq1NFoMv9RYgY5aNF9YS?= =?us-ascii?Q?d3lp9JdXgVCDAYXVbC/H+viF4VwioxmTBjrNkPINesJkFILAYxdbh+jdvF02?= =?us-ascii?Q?ZAhzkfMCCv3WMdq/8YUBzhPLoQBy9jC08Sg32El81g+h3mvpiEinIN0cFm0Y?= =?us-ascii?Q?n95HFhLTyYgQy7/WkZuEkmTtTncnZLvP9SP8M4BQjx5aUEarndhx0QiSJzt7?= =?us-ascii?Q?DwYMQjg9snQ6MkcSXmiB+95mfOLjuONR8OoD2yiV5EICTHOlsiOiBG5BTyqV?= =?us-ascii?Q?+LPZoLKypEHIYtz1nE4mAZhgsDrAyw4s3zp67LFlQnAY2tYIp6RSg3sKKELn?= =?us-ascii?Q?ZRgk/g+mqlA7v+HmiIkLbdGqtA5sEZw/eXyq+lDFrTNkBERW5wEZKSkd815b?= =?us-ascii?Q?xYF6e8opwam02fNptCyFeR90cBtuXNvXwZYVZMF8PlQEhq8pw+Q51ih5BDIp?= =?us-ascii?Q?g3vFbASypSTy4Ja7aBmZIk8XJd23vHectpT+aHwfZzqV9qQXhlU5hHaoJrBY?= =?us-ascii?Q?EDaCiqq1l1KEaY8bkkM2/7DGL38I/c8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b684003-5f16-462e-36b9-08da3cb01b8b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:33:50.1459 (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: SMMCBUgNXZcNr3MieEqVnnQT04tNddjJlq63LsDbDuKUebXNFRUWbT02MDDlKHzmFE2nHwawF9N6YHUd4Mc8bw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3899 Content-Type: text/plain; charset="utf-8" No need to export sched in bpf_tcp_helpers.h, drop it. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 17d97e21b1ea..cb3db7ea36b9 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -257,7 +257,6 @@ struct mptcp_sock { =20 __u32 token; struct sock *first; - struct mptcp_sched_ops *sched; char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); =20 --=20 2.34.1 From nobody Thu Sep 18 06:42:58 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:ad0f:0:b0:4cb:58ce:be2f with SMTP id s15csp1153893pih; Mon, 23 May 2022 04:34:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjDU7yUVS+nuQrwIpEE62kI4hK2Jfn4t+6y98eW7QgZf69MyGoNmFK60PRvpkZJr1nf062 X-Received: by 2002:a05:6870:e746:b0:f1:f059:aee5 with SMTP id t6-20020a056870e74600b000f1f059aee5mr11071860oak.12.1653305646435; Mon, 23 May 2022 04:34:06 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id y9-20020a056870418900b000f1f138f30asi9414311oac.260.2022.05.23.04.34.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2022 04:34:06 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5436-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=eQPElcmD; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5436-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5436-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 088E52E09D2 for ; Mon, 23 May 2022 11:34:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9E4D063C; Mon, 23 May 2022 11:34:04 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 18A6F7C for ; Mon, 23 May 2022 11:34:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1653305641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cuy/lFZZjfGUs/UiGO66+j2+HhssAmN8KaUYPxSDPEI=; b=eQPElcmDSGddyVImU/fkWYbNF00iQpdRONGCLCw+Eo5MQz+wwXQEiRcB2EZNiPZl8z/U5B DRPZhnLI8yxgK97GuvcRf75OZdw3BtDkdqihU8LoYtOrfx88vfmeYvF0I1bEhU8nU/sEaD IkQx+r5CvnhifuraZAM5agW2CgFQX08= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2056.outbound.protection.outlook.com [104.47.5.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-96qtEqIuMlyXEniM451LTw-1; Mon, 23 May 2022 13:34:00 +0200 X-MC-Unique: 96qtEqIuMlyXEniM451LTw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kUnb6FH6qYuSUo4FaPEx6+rdBEeHoekLpEWVar+RBYEkx8f2fX+tE2ujZHBFSOj3zENz4+mudC2p7jEvEVc5uEPYu5OT3KXvBZNi31Y9uT7gVGXfvvnh3J3mPVOObFdqZi86mgwHUIF7derh9+WZ77t+gomq5Yaaa/VY8XnXxNokDG2Up46y4/THefsc09n+gOGJAbp3+2eMaq4j1xGpDYotaS5AKz4SzemwrnAFiAskbnxM6TVYJ5IOy1y6YgpX4dKPeIa9/4RbVqTd8FUXC1smLDd7lZ4W6m/2NXFNIalFUicbPIbTrG8JVQnnk1PRq2eMgYgCjck9Q4eTEVKILQ== 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=+/VGgAiZlqtzFB+2ggZ47SMWmE6nwftlmiBoW6X6Ns8=; b=mzDoeMfptwSbBTRJX66uWWXLW2CHIgruoHJZAqg1J+xCS6NQ20Pfzx4JyU3GYBLc6HvcjqvlVp1q4cXMhabswBK568vnHYbmCgGZkGpqU1QTnGBUGpPT/OhUCe8y85dx1F4QAHe1IqzApQYzrMl3vU0z5FYtoUiCj7iTJeL/HH2sVcJ5/3KykezZxZay4OztceIzh7AJ+kdscdhzvtoxe18lS/X9CL0Rg8X+VlWryz7r/Xz3YEIXvp5BjeAGofdd3MsfFWTznVGQrqUOyX1mBNRnW2JTgC0UtZ6x03vqC1rixjD3LHsJTsG5GgXs9+WMOwoQyAseuPwL5PtFx+J1QQ== 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 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 DB3PR0402MB3899.eurprd04.prod.outlook.com (2603:10a6:8:f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:33:58 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6%7]) with mapi id 15.20.5273.022; Mon, 23 May 2022 11:33:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 3/5] Squash to "mptcp: add get_subflow wrappers" Date: Mon, 23 May 2022 19:33:37 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0004.apcprd06.prod.outlook.com (2603:1096:202:2e::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b25a6f8-6abc-49aa-cfe3-08da3cb0206e X-MS-TrafficTypeDiagnostic: DB3PR0402MB3899:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0FAWUqT7tNuzTViyNQPPc0I2AHTnPNd5rvmhX+VLCk0WaifM/lMnLAOOLBOHC+upSUQqOTeqDQxPptOSV11Jo923ORMVwCRUm5WJP1YdB7f47QrTsxdjEAQjAQsx9WsWEtvHrs+JY20bnj6rZmQ6MFeKpNknMlPDGEJkC0ikIrSsDzUDW5HAPQFPd2xI3BI+nw1gkYP04HGAOD995ZEs5X7ghL1laQzwlzT40H/Uu+IFhPglahRSMNpvfrRm6u71LPfP6tF8+vKqqLtrkoZOa0B10+XfsDoulgHcyJL7it9pcm9k5l1eqIeHQ6CAe29ojnRRECTW3uFofrEBLIG4DFnpj5/9Ld13UD+TGcNFYXRykta3wzoGbzxFJOle6KLnqbttaucmgXaIpS94lf0rQNx69iaGkUs4YlBSHXn5W2JgF6HYDShGOlIBHVPvcjILYbULoxnlNjU94flxSv/RA7qFctmFnuN4ovAY80JxC17DKqD/yONU/pCK2EGRfado57/asGICYhGUwXhkzgMAxP31rA1QXGEhU6yUtSdKQ0iwxlvZsJm1Stq8uH54e2UWwbjuv2QwCXlN6bMOOJEiocna9G2Ebt4sIDE4xl3aRs/CAcSlX0kTBOb3YMie1cWwwbZBbZXcNJSgQY0pO2tgEnDUfEos7II2geqbLqNqwlHSUfE0KqxJtL8YnlDjEnHlDnUK5dT/gcKUD9ImEbwjLA== 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:(13230001)(366004)(2616005)(186003)(6666004)(508600001)(38100700002)(6506007)(26005)(6512007)(44832011)(5660300002)(6486002)(83380400001)(8676002)(107886003)(8936002)(6916009)(316002)(66556008)(66476007)(4326008)(66946007)(36756003)(86362001)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ky7KDoUyik1aRGK86YW2spVSdyWBjzYLVuGZfittWFqTlPrN3wMfrP5zSfbM?= =?us-ascii?Q?I2QTb0ZXiy5gh+BEIyLMzdwJWczQSy52cdQqA+caSdF0a97LEpjCLJ2cNLmR?= =?us-ascii?Q?dpRZ1xTVGhOkiFRI8HsExCX4IUrF2kk0y42YVrl8yJwZ55Hw1mK4jGoKO3Nf?= =?us-ascii?Q?e3DTqF9k5IlT9yUpq4X7fbCJ1buLqaJFzTekdg0xK0UkssACHuNPirEflcOP?= =?us-ascii?Q?z7ebhtOgUralL+j2j5RLbaxWjjU/XytY+5EVR7bFeqgAkaklhKBCTwQD5vQq?= =?us-ascii?Q?g9mSKK03MKUFYJQQmzHjkleIl/LHyhLWv9ZxguOhefEJ0ABx7byP8M2TY1gs?= =?us-ascii?Q?aVzdteCU6zlrh666EsBErUfb3nqvb6fxWDUOLH/jhUGOHzMkhSwY6v0RnMxJ?= =?us-ascii?Q?s7IVcDXdHcC9JFnSL5CYidt4SXSDopVki6WvyjnNMVxX9jCUXXClJHNawtHi?= =?us-ascii?Q?gS6coxR8IYdpwrQ4AdrXwvupEPuPDoX2hPrGKDoXMvk+NpZkHPN9JOpm9XkD?= =?us-ascii?Q?o4RFnHcoBYKQvBkuNs3yX4ErmOE+ZQcLrA66YaxuC0idEFSWXq567PqiDmqO?= =?us-ascii?Q?L4MNNZEd18YtKxzd05K9PObOnubNluA+YhpB+RAXpkrexpYRgPi/93PDvdNw?= =?us-ascii?Q?LIVGqU/6R+XT1Kc7OlwmxXbyZo7sEBm/5JPC5+kWeY5HMWp2gVBus/rT2cWx?= =?us-ascii?Q?Br7arbVyPNdEpJq/6WMzyRfplmqUyzl8wHgQkeclkfE9TmBdy9BqPCvRscG7?= =?us-ascii?Q?fLkuF4nVWzNuA7U4nEuYsWcWcuJYeDabRsxXxjtawg6v/uPh7cvxAjohOLlK?= =?us-ascii?Q?jhXtRfAYKgbD+9XWXsMAg9kKur+FEZIdHGXR/fC4ZPcHNXY4VNsHcSUD+CUb?= =?us-ascii?Q?DkZnhuJazy6l1JeQN7r5T/DcRb7F/Pz9VlyvJRg+FXl13APp5pvtlpGG9qEy?= =?us-ascii?Q?GXOyK+F4wgyxGgfRCWhuKqFkR9OW7iddJNfESJxyhL4aiWL0RrUJEJGW2kVU?= =?us-ascii?Q?Da2OhZquKPlBLOC6E0dCXUsAGqAL4RltIS1d4R4WDSE+VvkEnmsrVwv4MpyB?= =?us-ascii?Q?QGX6B1l+oOcdE6+DknRIXK1MjzgLEqaxyXE8lzqXt8lt0I5ZF85f+oF7j2tF?= =?us-ascii?Q?yaUgDYHE8lmwfzsqFUoL4B6HCEKdiHG6zIRybO+WFXy9OwJDDp5XOtMSwGlA?= =?us-ascii?Q?Qb+sxvOPS3/aMDA4Z6WnuIC5m8+3KGld5I2KbJVqbJJPyPSG3MJNTa9WyHsq?= =?us-ascii?Q?P2iaG0kuqsoglE9b9xSu8t0bCB0v1zKlO+x07QxhdMAVxDrquuaKscZhILXO?= =?us-ascii?Q?42dddeohHNyGvp3ZFe4p5eU9ky01f7yNRUJr9vup2CAe4i0Pk3FiDKMBQeiO?= =?us-ascii?Q?SmxikFTil9OdFIaTGvpTUlKS8z1xlvm1emvxZmT3olTrM0B1kjZFk031JFbH?= =?us-ascii?Q?v0vLSogBRubl0sOtFGiSL0Q5AoHlINi0EFunoaqXhi/axrkmL4JkfZHL4wSX?= =?us-ascii?Q?5FOk9Dq0savGDJ5jrKEw38NHd268dsSKopA2HReC9IXtp6o2JCM33WcpxsEo?= =?us-ascii?Q?9GzjKth72ef/ik8hRKgwq5y3uo910NAUKryWKPwP1nqY91CGioT3HaZV4GKX?= =?us-ascii?Q?CHy+wnfKlDlji/oGSIA6819ZwXZVH09TZWoIpJq2VrVhVPDk112uKdnrsrw2?= =?us-ascii?Q?5V3IshzX/sUk3QsOtGkxA+Ga0hXWjq+lgWZGN54NN1Pkq5CVcpsGzSAJFQnX?= =?us-ascii?Q?FMeJRhq+GTx0DVgt05ZL5u7o4T4hyoA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b25a6f8-6abc-49aa-cfe3-08da3cb0206e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:33:58.5827 (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: oKwfolRUTgBfWV+4vtZuFqxpeXAQkbB0YXiwDZgfjKj7Lj8l4Ji2ZYL4CaVkJBYja74eZsEHTp5/AXdbv498EA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3899 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' This patch defines two new wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke get_subflow() of msk->sched in them. Use them instead of using mptcp_subflow_get_send() or mptcp_subflow_get_retrans() directly. Set the subflow pointers array in struct mptcp_sched_data before invoking get_subflow(), then it can be used in get_subflow() in the BPF contexts. Get the return bitmap of get_subflow() and test which subflow or subflows are picked by the scheduler. ''' Signed-off-by: Geliang Tang --- net/mptcp/sched.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 3ceb721e6489..0ef805c489ab 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -91,8 +91,19 @@ void mptcp_release_sched(struct mptcp_sock *msk) static int mptcp_sched_data_init(struct mptcp_sock *msk, struct mptcp_sched_data *data) { - data->sock =3D NULL; - data->call_again =3D 0; + struct mptcp_subflow_context *subflow; + int i =3D 0; + + mptcp_for_each_subflow(msk, subflow) { + if (i =3D=3D MPTCP_SUBFLOWS_MAX) { + pr_warn_once("too many subflows"); + break; + } + data->contexts[i++] =3D subflow; + } + + for (; i < MPTCP_SUBFLOWS_MAX; i++) + data->contexts[i++] =3D NULL; =20 return 0; } @@ -100,6 +111,9 @@ static int mptcp_sched_data_init(struct mptcp_sock *msk, struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) { struct mptcp_sched_data data; + struct sock *ssk =3D NULL; + unsigned long bitmap; + int i; =20 sock_owned_by_me((struct sock *)msk); =20 @@ -114,15 +128,25 @@ struct sock *mptcp_sched_get_send(struct mptcp_sock *= msk) return mptcp_subflow_get_send(msk); =20 mptcp_sched_data_init(msk, &data); - msk->sched->get_subflow(msk, false, &data); + bitmap =3D msk->sched->get_subflow(msk, false, &data); =20 - msk->last_snd =3D data.sock; - return data.sock; + for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (test_bit(i, &bitmap) && data.contexts[i]) { + ssk =3D data.contexts[i]->tcp_sock; + msk->last_snd =3D ssk; + break; + } + } + + return ssk; } =20 struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk) { struct mptcp_sched_data data; + struct sock *ssk =3D NULL; + unsigned long bitmap; + int i; =20 sock_owned_by_me((const struct sock *)msk); =20 @@ -134,8 +158,15 @@ struct sock *mptcp_sched_get_retrans(struct mptcp_sock= *msk) return mptcp_subflow_get_retrans(msk); =20 mptcp_sched_data_init(msk, &data); - msk->sched->get_subflow(msk, true, &data); + bitmap =3D msk->sched->get_subflow(msk, true, &data); + + for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (test_bit(i, &bitmap) && data.contexts[i]) { + ssk =3D data.contexts[i]->tcp_sock; + msk->last_snd =3D ssk; + break; + } + } =20 - msk->last_snd =3D data.sock; - return data.sock; + return ssk; } --=20 2.34.1 From nobody Thu Sep 18 06:42:58 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:ad0f:0:b0:4cb:58ce:be2f with SMTP id s15csp1153936pih; Mon, 23 May 2022 04:34:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMSfMZjvJTGRhGJDjmD4Tk7lFJRHcWz71uaQMRD5o1vE6jwy8c4uF72miFAW1g74BqpWNu X-Received: by 2002:a05:6870:e307:b0:de:e168:c43f with SMTP id z7-20020a056870e30700b000dee168c43fmr12210927oad.140.1653305653711; Mon, 23 May 2022 04:34:13 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id l2-20020a056830268200b0060b0a1bfd3asi3251428otu.228.2022.05.23.04.34.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2022 04:34:13 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5437-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=eYS01jZI; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5437-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5437-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 7DE7B2E09DB for ; Mon, 23 May 2022 11:34:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 30B2863C; Mon, 23 May 2022 11:34:12 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 9A79D7C for ; Mon, 23 May 2022 11:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1653305648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d6uYA/QkJlA15vZpHkmitqEOnFSf0okrFwFM2m22sk4=; b=eYS01jZINZ/pqf0BNzSUVkwPBM/VmAM3lMKA35BN0UpuoxwAKFZP3B+qN73Rj38yE+tWpq KpikU/FFsU//P/1iItUhSpKVlATJma42GLDurdqjUkZicvBPXL3ml5MqrdmFGZ9nOXhBgt +frYzw4G08cJwXBbFEw+8xjOVhEoeK8= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2050.outbound.protection.outlook.com [104.47.5.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-37-ekQEoTHQMea0T55aljTfYg-1; Mon, 23 May 2022 13:34:07 +0200 X-MC-Unique: ekQEoTHQMea0T55aljTfYg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XyOyqWZ6aWVZTIuE4HZ6lqGDgFdsNR/34eWwetm+TKflApaT/qGmYfxZgdGnGnfJngE7DKg3QSa9aFqwKS+DYf28ogucc65cpE44gqefkBg8ADxC/9dmQjXVJzLeCK8cZpDMq5zxY9tz+eFAQp6kD+/E74ap2h0QU9AsBrCjoCWmhflbsDaNEMlYdb0UAfnIZ2hV3Rp6Tmn4DtJu1gr8A5rwf8DnZk+clDLS5HhMauZCqHlLd/ofAtT4iEvhg/tSbP2HAuXbzmkH2SPGnDRQlyTbD8/ef1AKwzZ71vG+DKq9oLC05wiNg9dqBzb58vlkOQsusdeaRk0NGPBM95p1/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=puVkancq39fypxqXnHmph7ZIbzvnblnYuc2GOiqL16Y=; b=m+zsz2B+LFRijyfDJa0XdVXs+ggNY/p0+4+r9k3xYU63cnOGgJK+KFYQ45y1uDw3OdwUXlvoywMRHvLmYn+opalFimyljtpLtpBQ8dceXIzvTyqKxzMPNXl5WOeCnq3ve7rmurnLc4MBBUCSYhrCEkPVYLt1+URISTO7GU9fgPyy2PYMvd+aWYjg2ZZ0bwr1AqSaTijtq60hDyMMDK1wz5faEr7FciF0dVw6WQOp6Pd6ayVM8wWdpWwRdTa64L7DuEz7yR8BO4TJ/VlG8JV1MrR6cVVVCk48yvaabB6RKGojdkj5wu6Cq7wGknywHjG05LnIixYjhlSCxvQ9CDnlpw== 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 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 DB3PR0402MB3899.eurprd04.prod.outlook.com (2603:10a6:8:f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:34:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6%7]) with mapi id 15.20.5273.022; Mon, 23 May 2022 11:34:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 4/5] Squash to "mptcp: add bpf_mptcp_sched_ops" Date: Mon, 23 May 2022 19:33:38 +0800 Message-ID: <10e0e0ce3da96fba47e47ba60b256fd28cf63815.1653305364.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR01CA0064.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::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-Office365-Filtering-Correlation-Id: 56b3d82f-ad1a-4669-e408-08da3cb0250a X-MS-TrafficTypeDiagnostic: DB3PR0402MB3899:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o/yCMfjSaNsGEu73tpijUb4VKce8dcKsrS58qBI1RpNjtxItVcNf45QR/UI/bSFLel7oDUIUh3dCl72TQbjCM0hrsVi6uDc/ZKUimZ+UrQC8dWMhr0G8Jg68jj2OHywp0NoQG1DbAQxMkvKX9gUKBr9luH5+HkGpz3uCrwlrfx2pe1U07PYerIDiSdBrud5nCI1RKpai4Gyh/iIYjTi/K0GA1P5fn6w2SNpORvUjOU5mRUPKepmbcwQw8De6EUAmSw2XT71q28dxYNdc8GbfRNuGP4nkzQ0JDXPxeIbuAzkvY7SBDzhIGaoQFHNQkgKau5CdQeT9eJW8ad9CUvL2wm+K16aNFR+KMO0W+mwDgrG5ckNLOv3xDZQ1CLlzAYo1hWVNsCbW72KEMB5QHppwixQ3QEUOOXKMS90/eNmD29TIyHh3u8OVW1lcuI9caxle1XldylicPf3VW96p9Cg6gX+vuMD4Tg360ANXUtClGOXcvfGkBRdghZ8pYMfXlMyIkjT0Ob62k7EAb2vcqIPGJknY+Qlmy7+2RSe3GJGxWctEjvw2wGMMKZHL17tarKtJ88eIEk5gsuzD/Q/Lwc7WSU5ngGWbVhuX3xX7JyGS0bOWzb4Q4Wwyz+5cQ+Mu6xt7rDYCbnCmHWulZp2DFctL707McfQIzESnTQgDdalK3xh1QsXn7pQo3br5jTKO5D/TNdh/U523mIzWGcRML1YXEg== 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:(13230001)(366004)(107886003)(8936002)(8676002)(316002)(6916009)(86362001)(2906002)(66946007)(4326008)(66556008)(66476007)(36756003)(186003)(6666004)(2616005)(83380400001)(6486002)(5660300002)(508600001)(38100700002)(44832011)(6506007)(26005)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aEKgS221tkFG9AsP8q0Tj9OxMHzmxfBASBVI1sA9YZrCLzKxJYKwG9MG53IQ?= =?us-ascii?Q?CTJrYZx2aFNWfC6gi5k6f2av8mvKk2KJMQJ0R7KLqiHBzUFkFhAfeRynQVk8?= =?us-ascii?Q?6YmIEqOsdMBUoS1iCg5JtO3Q/RDeowU8JZ0vX2iqPo+NtsNkRM/ABnDUxzxj?= =?us-ascii?Q?qRJeDK6TPf63Uo8gHBD4+iY4/1Z6FxX4u5v8TKZ5K/MEyBSf3NbssOJip9yi?= =?us-ascii?Q?DlWli1gfWMEtCv8Bf9sAgGiFwVjlKN/wOHC8ylKGbkqPdUQ79B2rv2VUCXGW?= =?us-ascii?Q?Mpml9r25KyOkP1rBFdy3ItOb8leGCwuXfS5EDexWC33gCtjBotWQHhCVlYBG?= =?us-ascii?Q?ioXs8yXV9lWmD80AMrOtgcrtA/A9+KafToUc8mRR4NNrcoXtWWgVSjqFFyMU?= =?us-ascii?Q?DJcoIsY3NVBEFQYG7dUx7WLHMlUrrLq213T8D4K83VxwWT5d3oOhpSgGls9Z?= =?us-ascii?Q?yIu/deLujTmjQVBPY+dOXH0b8atQ6rSJaV37SBjWhPXJp0YlsgqJcgGKow3C?= =?us-ascii?Q?TIEBk26Lnuf3D5j5+/IMby/zVMRlMcoVxO0uCQs1OTpUfM4qgVeOJbXOaVSy?= =?us-ascii?Q?limcZXtnwoOI+DaQm9ivt+N6fqE9/FU3t13e7fXoswtTnp9iirCsKLvtxY6A?= =?us-ascii?Q?3OZBW+sYA8wLDkYDfuYIw1ymjQmiNvEtzC6FTLyD8d0X9CHBEwOsYXPYgts4?= =?us-ascii?Q?mw5S5OCLWNH4a2JPaY2aGFTXbtL4SsecKyUgon+hJTfXr7tp4lOZ0xlwEy3K?= =?us-ascii?Q?YMEwfwwCre+RPuqMUCY58+g+KR2FtPOPWRQc9UCJ0u78g5Yd66DSOTObnLAU?= =?us-ascii?Q?4JQqSMtf6wF8YJS2CshD36WBStkhD0T+V/SjjlrBydNiRPHofkDcfR6mWIJw?= =?us-ascii?Q?JW5QsXymYhpD3Q44v3aA3rQvyvuVl6gi7byYD8hx5YqmnGiEqH21AhvjqWkX?= =?us-ascii?Q?61PVPwPm88h8YA6usjQyocB3ijEXxfYSlVXJEB0gWJgntdDiINCrqO1M3PwN?= =?us-ascii?Q?7hhyeIi5+oBkFgD3AVQ/wTpiQsuU3yF4DMSTnndlFS23hATCP+tuDQtqpJRb?= =?us-ascii?Q?RirujtYcfs3RN5/dIKCCxVWPkeYtXv1ry6a9KNaYeQWmiCId0871B6H1AuiC?= =?us-ascii?Q?6+LRBdXQTu/f8LXJkpAt4D6k0QjrLR34iWABwBfHIbRsLbk7954N3HUX5uzp?= =?us-ascii?Q?edfOdXr0LBtp0yM/67r1mpSW+N/Fh37ty0CC/8eP1cWm9jzaEQV/SNFSlGhp?= =?us-ascii?Q?mc7f1j1U+syebo2JcjsEXnF0/5KHgRQHHOW0py978iWHzy//9Rado2vkd0YW?= =?us-ascii?Q?yCOWidxayeLRqOfz86IAKk0VjHc/oi6edAw1Tl/jnMGNG3D7KRAHFZlWjerX?= =?us-ascii?Q?/8UsrLsUUqAv4xQXfO9XCJqkE1cAe+1n4esHD5vHM1oy+NRD8Kfitrut8R/u?= =?us-ascii?Q?2+L4hS/eL37pZ6nM4H/F6nBgVP+v5+Yj8VsukxiMuhB8jJKZqBS0oUdZOF1R?= =?us-ascii?Q?AAHNDRr5qband2TrRkWL1BVY0DrNPzBTdyBJepj4en363eXof1kGRhmroNVl?= =?us-ascii?Q?vqIgeveStdhnLZfGF9ZnLSnL9PeAtl4w+OCe6cIZlvH8JBCCfJaakuIi7JJn?= =?us-ascii?Q?HtQagzgN6r/1dTr/WolOl0w+MFhqwgJZA3zl4N0lkq6NZJF2t9ofuXYpV9yI?= =?us-ascii?Q?+I3a+7jJlxgW8/G9b6KiQNewF4R8rDLUqIo2oAUhJOHdfOpgZMuii0oIOrwW?= =?us-ascii?Q?A2vVEGZwRl1u2VB/ZyOgmVeWgo3DOiY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56b3d82f-ad1a-4669-e408-08da3cb0250a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:34:06.3165 (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: c+uG+N9Qi56L2ZH7xptie9Puw/xA6jW21LwcumwkTOUCX/ECbkxZd/t1gjFrebtC8ZjnzxVehkzH85C7E/LEIg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3899 Content-Type: text/plain; charset="utf-8" Drop the access code for mptcp_sched_data. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 338146d173f4..218f78514bdf 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -18,8 +18,6 @@ #ifdef CONFIG_BPF_JIT extern struct bpf_struct_ops bpf_mptcp_sched_ops; extern struct btf *btf_vmlinux; -static const struct btf_type *mptcp_sched_type __read_mostly; -static u32 mptcp_sched_id; =20 static u32 optional_ops[] =3D { offsetof(struct mptcp_sched_ops, init), @@ -40,33 +38,9 @@ static int bpf_mptcp_sched_btf_struct_access(struct bpf_= verifier_log *log, u32 *next_btf_id, enum bpf_type_flag *flag) { - size_t end; - - if (atype =3D=3D BPF_READ) + if (atype =3D=3D BPF_READ) { return btf_struct_access(log, btf, t, off, size, atype, next_btf_id, flag); - - if (t !=3D mptcp_sched_type) { - bpf_log(log, "only access to mptcp_sched_data is supported\n"); - return -EACCES; - } - - switch (off) { - case offsetof(struct mptcp_sched_data, sock): - end =3D offsetofend(struct mptcp_sched_data, sock); - break; - case offsetof(struct mptcp_sched_data, call_again): - end =3D offsetofend(struct mptcp_sched_data, call_again); - break; - default: - bpf_log(log, "no write support to mptcp_sched_data at off %d\n", off); - return -EACCES; - } - - if (off + size > end) { - bpf_log(log, "access beyond mptcp_sched_data at off %u size %u ended at = %zu", - off, size, end); - return -EACCES; } =20 return NOT_INIT; @@ -142,15 +116,6 @@ static int bpf_mptcp_sched_init_member(const struct bt= f_type *t, =20 static int bpf_mptcp_sched_init(struct btf *btf) { - s32 type_id; - - type_id =3D btf_find_by_name_kind(btf, "mptcp_sched_data", - BTF_KIND_STRUCT); - if (type_id < 0) - return -EINVAL; - mptcp_sched_id =3D type_id; - mptcp_sched_type =3D btf_type_by_id(btf, mptcp_sched_id); - return 0; } =20 --=20 2.34.1 From nobody Thu Sep 18 06:42:58 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:ad0f:0:b0:4cb:58ce:be2f with SMTP id s15csp1154110pih; Mon, 23 May 2022 04:34:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBUyrzOqHOnXkQ+f10u5iS+LkGgrfdeiKyEXEof/JDn4piLq6+OKsQDJfwv+YflN8j+c0i X-Received: by 2002:a17:903:11c7:b0:151:9769:3505 with SMTP id q7-20020a17090311c700b0015197693505mr22425896plh.72.1653305673892; Mon, 23 May 2022 04:34:33 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id u22-20020a632356000000b003822b0c2142si9909010pgm.279.2022.05.23.04.34.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 May 2022 04:34:33 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5438-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=PMWCVpKP; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5438-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5438-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 8F5B0280A70 for ; Mon, 23 May 2022 11:34:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A615C63C; Mon, 23 May 2022 11:34:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 EB23B7C for ; Mon, 23 May 2022 11:34:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1653305669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4Y33AjUXSWd3OP4RDXO2n5NPt6zUbnR1AUzN7OeCYfM=; b=PMWCVpKPaKM2N2c8KdFqhb4lYsDcMdCUzDTRx5GJWAeV+SE3r6eS9PcZrUc3hq1jYW8uFF VNGTfdUl+D1IQim+XEhOMtU0Crp6zxKCybN7OXbdeldXkDQWEPB85B6I7W1sU4o0QE5feV 8TybXXhjJhLCMa7RAOQasf9QOg6wvH4= Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2056.outbound.protection.outlook.com [104.47.9.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-19-KTPKgcIYNI20OyKThqEUlQ-1; Mon, 23 May 2022 13:34:28 +0200 X-MC-Unique: KTPKgcIYNI20OyKThqEUlQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XeqegTpUQ3Rh6r0gpn5m202UE3OVogFRH3LCVmqQ/vR34+RWnSNYPeAj3lYo5FYUQoD19J44wfSl+yHT7QCA7OfKL8l7Juz0JBgwSRR6T4qEnMPPhKoP4ZeJ5R/yG9CtuMVu5KL+J5MPP/5TSeubn5uxFQsjfjr8K31JQfaSM7faG4GULBGmb7K5Ca0NmATuBpvDsT1JFZLRprkQaSKfMAGEEag2UglLB5Y0HiEZfUf0O+y+9KVOyorUHyr+2IWk9fEVMo0hDLteUimEyc2WwwfaQ48GCSYQ9sUF0o1u3OARp01pAITPlw/KLJEPYsogW5g1wUnByFfIOSDpu+NAEQ== 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=HTfiBxvsus/mUkvL8arYB+EyiCRDIEPyGJXyb35fha8=; b=OGWvjWX0FOebfj4Qg5HRSXhAPZY4Rd6y0nIg09U0c4YbDVxXC3++wnaRx27lppCh6qs2wpjOKunCRfKhwJa3DR0HljMCkjgEPqdy004vhblZvzmvjE7PlQyx29AtDzdxhd8aFaUqdqtNGVFCqbr9f2+CPOHa3Zaf66M8ySCSLm06nu+BKN+HsyadzJvu459qFJuzP7q47M2D/n29x9Lura04Jg5KH8SAn8D21SHH3vJe3ZvwiFKK8dqpH3r5h+o4HDNtncW7TTVr3/5YcK9tOyONk8bxyrA2cTtYx6aFux2udpa4x27ERvtr+ObnUp//MqsRWFWaYzMax3+zBcMJ5w== 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 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 DB3PR0402MB3899.eurprd04.prod.outlook.com (2603:10a6:8:f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:34:27 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::5557:2d1:efed:96a6%7]) with mapi id 15.20.5273.022; Mon, 23 May 2022 11:34:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 5/5] Squash to "selftests/bpf: add bpf_first scheduler" Date: Mon, 23 May 2022 19:33:39 +0800 Message-ID: <94abb5c4207ee3fc0827c77816648ad37dccf5d0.1653305364.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR01CA0056.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::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-Office365-Filtering-Correlation-Id: b64b9248-8850-4fa5-9b54-08da3cb0316d X-MS-TrafficTypeDiagnostic: DB3PR0402MB3899:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cDKPrmis9mv5i5YxLYL5LqkLG0oBfXlpnkQ9o6ua31pKx64DO3yM0Q6vFd8D7qU1JZKMSvNVpZPM7bSaQkXrJp3IaVFaDWVqzP9tdvf5WvFieND1yORW7oSOxoKqDClhjdH7V546EksE9HxUDQi0EF7UcikrMaT5OWeRz+RQwE8+ikF/sNwjYE7XKPz0/nWXXFLrYpbZnZLcFMV6zDxgZRMO1yAIhSF2t98VrRuz1ifEBIzXs981ukBSk+rrtQKuOPcWdLNLYGus9SSdSanORHYvDSM8NtXYgnvg41DoRamBf7CcNCZGQc7oXGGfe9DDnMJb/2/sU6yVapwEw8nbwYL8Aruh0wtWoLcn4SeYtxiMa8o+Ixcz0VTVoGAyJShny+8mlhAL+89TjidLzM6WlqGtMKHX3/x9bh9BeW0eXFb9FreByjqk6x1ny4cSaMI+qDcqgaVB7yCtB1mDsAndN2EsMDm38yc6wuiS5s04nSaWCv5L09iikBTrMmzhXKRrGzLoRyAgJGq5OhgTvWAb1ZDWSjDVou8t8j2ShFdEJ1My1x+3LiN2TvI+mLaPY3U74JKc9L/Dfh1H1YaD22CyDcxBWCM3LuIVBQ10M252pWY7SldFKVHjogpW5qmMEzpT0MG5pp/R5P+BR54+vUZT3jvnOUUyDI+vTuZtZTN+i4AeVK1jjxiu8sMDX+5N0EMBWZ2sfKxdQgIWvWYOFxicuA== 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:(13230001)(366004)(107886003)(8936002)(8676002)(316002)(6916009)(86362001)(2906002)(66946007)(4326008)(66556008)(66476007)(36756003)(186003)(6666004)(2616005)(83380400001)(6486002)(5660300002)(508600001)(38100700002)(44832011)(6506007)(26005)(6512007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oQkKxn0IEtiJNWhiwJQF2Uvv3crauGqydDYlZQN8El76+aaZFQ2IgefCBdaQ?= =?us-ascii?Q?BqGRU822IDA4H5Qo19lpvzKVo/BPXmTX4T1nWhbEDzp2dYmVgaRdN8QJyAS/?= =?us-ascii?Q?nusbrWUjadg+LQ/xEeplQ7rIbsGDz4oCiw19AaZFv8uplx9tOTXOyfLIcJlp?= =?us-ascii?Q?Ua+tasDFsZdaze7EwgKryGXOLbXjjHvel2Q8b3h7WV6i5y81+ZrrPTH0+TMz?= =?us-ascii?Q?wFJmzb/GLv6vekIEGHeWSZz2uxRqElSYNHKbeActAR/AzkyffVOUzxSOvZXZ?= =?us-ascii?Q?lHmjZFyY1SD06R5ULN1ovz1HcaKNlw6ElVUpHOxbayyORlRwvyF7uOmSLUXu?= =?us-ascii?Q?+3+xVGvNJ2R7UvySQuKgMMv6PjGCt0I23viSz+4+vTgTpB3fqDqTkbfhPGAc?= =?us-ascii?Q?tZzfuoeGA+52wnz4OpOas5I/+ZRcow0E4tgdEUsoYZ0L2gUmUtVsECMv5DK2?= =?us-ascii?Q?gp67iCP9qHImvdZrKLzL8pXV3NytwZH2M2xIvmYzVha5qrjtTTHoR2V1yvEt?= =?us-ascii?Q?W0ccn1wkkn7OyrNiX9+gD4TYBcVyb5dmEzAXGCIKQf3jYbz2FjEFmkqEk1pz?= =?us-ascii?Q?tVDDi1eBNVcmjThJ0iOx013nB18+xeaPe9GpWwehNeDcXHup8UWZ3ePJxiVk?= =?us-ascii?Q?zjnFbv8dBrMgExcIIrPGLm6EW7KqkdaBnN8KfP1RDuZ0wBgutWR0YofQFW70?= =?us-ascii?Q?KS8EPf2DWosIMPPFRRLxNPvzh9M6T6I/xTCnzoY7ktWYKOlc4nBdUclAEy/P?= =?us-ascii?Q?7uH+NqHVHBJQu6I2O7zK4r7WqriT4lGTC6VdIgIUvqw1y3BEDP44wW1tCaEc?= =?us-ascii?Q?UAGDfJ5v36vMvD3PM1wAeQPY0a80oYALJewRRhG6syB5DedD2c0cjxgyF9qk?= =?us-ascii?Q?suKHskDmi+0sD3gdDdIC1UScwx7l3UMLJVPj5eH/8Q6Xh18feDbMkJljE9yM?= =?us-ascii?Q?eHW5PiYDQQLA/JAWW4BVPOQU+2AsTARgnEzCi8d+INairC7APKSUwMiIdRcd?= =?us-ascii?Q?cL45K37501jbrK16Lv1eAf+hQfc2DhPAVRrE5ehZI43O90GQDI6YS23sFss5?= =?us-ascii?Q?IKJDZrIMTBhVYFdaRPrAVLZLLeO208VQHAc7uAWzbzr7MFLG8qz2NuWjoVih?= =?us-ascii?Q?rgNpxlpFtBcMMxmtAqY5VGBrXaJX8vGRHZbbIqdjMs0pDTygizgCYORFiNFs?= =?us-ascii?Q?zn0sNwfxU9TPD4xT9zA5NxIlHKuccGz+Dne9lb2m8naG0M1wpfz+EIOTXyiE?= =?us-ascii?Q?L2KYluijtCxGDGmb24KmDMOVR/rATzmMOVhGnY4IPDt2jvZFi+rYnfKZtRho?= =?us-ascii?Q?k5yizV5cjrlRNj+LVAUGdh463T07VCgdzaB5bsy4mluETNLqqW1TGjtH83sr?= =?us-ascii?Q?3ftoF5n/mPRvo61A/d1Res3j0XbLHhiuGOTTT7qqkeJOsTrZ5JPnoyG/3hlr?= =?us-ascii?Q?ZNL2iTLqqmcc+GWGy8IpXHgSyb0M+ep4AyW3XW8wJ96GFnBUFuLRXS1F9LDq?= =?us-ascii?Q?GXbv5ioyLDm/CwXqU4lzpVN6h1qcEny0PoONo45/H3XA+ClYY5DUWUIi1bRf?= =?us-ascii?Q?LDoI1sZdGJbv4sFiVVqJQvlg6gcGiWFr/G3ExOmSqYDRA9mCPJ8yiGdp+kUR?= =?us-ascii?Q?o95b8vSIlVdgjuKfJjV67IoYEru62ZnCUe8ooyUJY5hsQcko1FTQ6dv325jy?= =?us-ascii?Q?Cd0HV6NczEZynpNmak/6+VhzdtpAkm2wyQubWGFZ3LDRbYjoW+ywmcPlD08G?= =?us-ascii?Q?Ctj7YDAxP99AQXQucCFJManKUeG7K1Q=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b64b9248-8850-4fa5-9b54-08da3cb0316d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:34:27.0648 (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: JVnk+xH3RoxWjBnuJVzYgnfDkQrkAJSVG4mH0v3P/NAxwAEZur8MKK8cLzueO0NdIY3lgu6riQZJ1x5IqM3rDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3899 Content-Type: text/plain; charset="utf-8" Add set_bit() helper and use new get_subflow API. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 11 +++++++++++ tools/testing/selftests/bpf/progs/mptcp_bpf_first.c | 10 ++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index cb3db7ea36b9..9c7d33e106a4 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -260,4 +260,15 @@ struct mptcp_sock { char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); =20 +#define _AC(X,Y) (X##Y) +#define UL(x) (_AC(x, UL)) + +static inline void set_bit(unsigned int nr, volatile unsigned long *addr) +{ + unsigned long *p =3D ((unsigned long *)addr) + (nr / sizeof(unsign= ed long)); + unsigned long mask =3D UL(1) << (nr % sizeof(unsigned long)); + + *p |=3D mask; +} + #endif diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_first.c index fd67b5f42964..e5dc53965642 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c @@ -16,11 +16,13 @@ void BPF_PROG(mptcp_sched_first_release, const struct m= ptcp_sock *msk) { } =20 -void BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_sock *msk, - bool reinject, struct mptcp_sched_data *data) +unsigned long BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_soc= k *msk, + bool reinject, struct mptcp_sched_data *data) { - data->sock =3D msk->first; - data->call_again =3D 0; + unsigned long bitmap =3D 0; + + set_bit(0, &bitmap); + return bitmap; } =20 SEC(".struct_ops") --=20 2.34.1