From nobody Fri May 3 08:43:16 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp764297piq; Tue, 29 Mar 2022 00:09:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTMoWXLU3G4DcKMZr/A3rjkNBo+YbGHXWijg3cxKtUb7pbVdNBA1DoBonENEL0iKbEADRx X-Received: by 2002:a17:907:a08c:b0:6e0:13e9:d4a3 with SMTP id hu12-20020a170907a08c00b006e013e9d4a3mr32475830ejc.548.1648537785917; Tue, 29 Mar 2022 00:09:45 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id n12-20020a170906724c00b006e0b389c075si15448712ejk.932.2022.03.29.00.09.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2022 00:09:45 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4511-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="RP/XF6dd"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4511-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4511-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 65E021C06BF for ; Tue, 29 Mar 2022 07:09:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E62AF2103; Tue, 29 Mar 2022 07:09:42 +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 0889220FF for ; Tue, 29 Mar 2022 07:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648537779; 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=gI8OKjCaCLZUzemyiLtMzVziY2WaIQ/dWvcn5/xEWtw=; b=RP/XF6ddLnyCJHA73xm0NMhXtSmvZsdEum65JXRVWhSHLP0eoNlfFEnWAQnsg0zV/ECZRE bUXZsR0vIKV/fadbm2YlDrLz97dePRVF9WauyEWsMq54NvWLlX1PAQofrSEUh+KF/FDMLd bRuIE3DO2n8be/gqH1paLMB+oqkIk2s= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2175.outbound.protection.outlook.com [104.47.17.175]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-31-hNgF_QuyP8O9cpxVsamoyQ-1; Tue, 29 Mar 2022 09:09:38 +0200 X-MC-Unique: hNgF_QuyP8O9cpxVsamoyQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=egzDkOB0MpXn2AU5JrEVjREXoIGdp1pPlq/rGL/OZ7CSxwryv6nWDdj38pwfqRqArJAVMP0M7ki/FUG6UDwzE8xANe7RTE3AvORcBHuS1tREZbEFLIF5lzENiHVsym3hO1m2GsdqS8fMvgvdt09EN/bl9byq9jBGC60f6sQJv959s2NO/ndq7jSfIUYQ/bnGvPr1txZGOXbzo12G+CnEvC37HQv05Dhf6opQObhVjdnGkQWa5hOYSzNShERzoHViQBU0Q+qWJel/NWFvvZ3wSSCU3dm7XHu0qdJ9mRaxIRGZ44GsoWtymaWvWQkz2WXukwXzKZzjTP0NwsyY/6W7LQ== 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=nwOIokwTiTBz96nVEmnsIyVuC7LFShvt8zZaMX5U5jg=; b=nXeAx38azU16J06rL5Uq0V4XVYAQlYrQl+bg+9X+57T8h+WhNQ906E4MxTOPAlut1ErsEYiOps+dF48c4MkTvxV+FK56FuNQIMW7NAH1uRehUHCOIoo05448z4riSaWIgO7WgS9bLBsLmt0yDasByU2YU+N/PLr7b2GetnjlANLkj6eSGbjrMbZgA19Hphi75z3/1lBtvvbcDcFiPB/IY4ePfQ61WIPhjB60xdYXGXKDnmUtHqoEaQ6dS82gSaiS5TkRbkKnYFKLYEsgoRAdRq15cRqxFO0ADus3m5GnU1uXhaC3lcPyfMvbtA47htpAvFQvzDVJbSsRUK1wGboxFw== 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 DBAPR04MB7335.eurprd04.prod.outlook.com (2603:10a6:10:1b1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.23; Tue, 29 Mar 2022 07:09:37 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 07:09:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: fw@strlen.de, Geliang Tang Subject: [PATCH mptcp-next v8 1/8] mptcp: add struct mptcp_sched_ops Date: Tue, 29 Mar 2022 15:09:20 +0800 Message-ID: <9371e3be95302900e3dde3cbcc7708cf500b54d0.1648537203.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) 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: 022a457a-b57f-4601-3341-08da1153158e X-MS-TrafficTypeDiagnostic: DBAPR04MB7335: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: 4UEAQl3ARZzd3PG44UQS3eQfdwaLNEp+Cfa18fRdLyFo4okzf1vBDz4CIIb/yEU8180VLvtsN3EnMzWbwUDK1nQOMXTiXcC3N2ZXouOEhJpa1PxIHKZuj/A0luPaoO0u0Q/xdc3nj40o2mzYcfqlxP106kc/LDj/7p2vYLJx4dDaU8bM9+u9GDHpOfmTVucv00X5hZk064kGaDlYxnr4MA2UbjQx+/EiCdhkU/4ugO4kIp5Nd0+JurOoDp7bIn8TU1J1vhM450w5rKnICoENOSp8tuUXb+d9lS23l5hofFr2lgc2s/asyTFdZ2jVPldK7vStNBRlEhkeWJ1vEGXd23mkkOPaHO6xt8292vI+YvK6UohLTwGhhs5UaHEFgY6pJhHr4DOTi8E2bwB33nvJZnQ6Zd35qc1Ecfw+C4doinuUzUE01DzqzJA6mIXUkUS56CHo7ei5beoSw2Nsn5DoQBUdr3PevHfiqb4Wl28l6Rr4J5c+VirJPGjux7YTM+QMNLGuUAi/okTIi/x8eQFvENPkToevldtR8FPMGkc4jk8YARfFhbYrfRHhtIkvDN24UjnTbpz3dKdCtxca/G4j8gkQsPFxJAMUwqVOFwacXhE0zmy42F4lczqbtCd0Hw4b+XPaqlGMXvrEG78LvuczRfuhqmoACQCdBDyJN0HbUsvss4zBL7HkvbVssbCkZYpWw+kmEx+s+V9KeFv5BdKj5Q== 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)(6512007)(2906002)(83380400001)(36756003)(6916009)(26005)(316002)(186003)(107886003)(38100700002)(2616005)(4326008)(6486002)(6506007)(508600001)(44832011)(66946007)(66556008)(8936002)(8676002)(66476007)(5660300002)(6666004)(86362001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2dTZmayhKqC8or+IE8V2VWLhFhYtZ4NY6RvSB+Sm7Af+DwW0QsnFKCINuxy6?= =?us-ascii?Q?bTUIYGLUVLXpZDIbs/Y0i9miSTcM6JjvJw8+IQobFPDEuZqMYAYkSzwNTDfr?= =?us-ascii?Q?1s/OEyrTEuM0I1APBEyIBbwwvo3vcj9uQ3oiw+80Y1NRpA7y/5wpNOe+vVfN?= =?us-ascii?Q?SNAkhCmpTJn7NkiLsitYDnf7NqxT8T12cEYh21lqwsob8gsA+bVZl8Af+SSM?= =?us-ascii?Q?p7liPW6JKbzyi0yZ2+AJFpGS8gU+F+eudpNkUivsWt2N9OyDL5VQLiTrtIt/?= =?us-ascii?Q?hqyBlXtY6//n1/kHYykBAM3WvkiB5VNVla2pO7D/qzCW6zhXeMfNaIazuPTF?= =?us-ascii?Q?3F2Meuy1M35KVT0g+373cE1YO1vgbJroSld01BoxYsneE3GWWFL/TuG9pGp8?= =?us-ascii?Q?nqtDFy2+I8asOlgUWOkbTU9ihziIa5BLUTc363NAqknB/J6LLGLGb6bnbUEp?= =?us-ascii?Q?M2Xn0FE8R6EjIoTUreI08Xoylpm4V5ZXTXmKSrd3BhRiKNZJGmeGgAduVPQf?= =?us-ascii?Q?s2hVRzEZrqgJkmSoSJhdpskP5w3r/gV6x35mNpAWIMxf66M+OV4eBRwVMNJ7?= =?us-ascii?Q?tC05eCrSJRHVeVDROuw/gvPSD4xgUpcPa7ZChAyJC9tW6upV5DkDqwWY91oj?= =?us-ascii?Q?qYqszgaGu3Dop4lN2tLroqnxVBoQTIZz7p6Y/dsE2WZ5jtV1KJdIMmoVFShi?= =?us-ascii?Q?CGQTQnOB5+BLnx5Gx2LV+kt7itgpENu8nvTRFhza6wwy0vsM9cPhJek6Ophc?= =?us-ascii?Q?GA9BjiLOFdiSnnY1muwYT68pYryEZr6vqXyCTIbDuxCQy8ZvyACWs3mk6D18?= =?us-ascii?Q?kto/1F7ldX4QJsQwwmRaqnd6V2Ey2YsF2BLYOycEKgHBY/hJ72m3K8aI3wQe?= =?us-ascii?Q?PpR4SUTwgzjUqIcElbS29iuSe3FEWqsTqq2zxan0o2tl4Blqoyf9B41lRTaL?= =?us-ascii?Q?izTlQQOEF//ObtOk36Tdi3XDMAqEuyJ+gNuddPVcA8ATTQcJdbo9FBxBzcDl?= =?us-ascii?Q?XgDX3bpa9c45P9C8AFCaZ0X5JI5E5ZPpjZiVXx2xQfhQBwnXsxWCGRUXhGPa?= =?us-ascii?Q?sQFe4QIoQvMUbZ1QFRLSVcNNWfPrS7tkQ97BDeOzcwQOIilPiNqPy1QsjaDY?= =?us-ascii?Q?r+uZ8sD1VvJWgKEo2rMyJf+IGFQ+Y2VqWOgwzcCmuVgr1jEPkCos4HgdRxYN?= =?us-ascii?Q?2O6Yr534+EFfJG+VLCKtuffyjndwjqYtllVlsRGYmuGRFV5OKt6djlh0rcWm?= =?us-ascii?Q?FuJeKMA850RPTCNMJYHDnoparVyc/zPLXgQ6leTA+t31XurBcVqeSHZTU6ZE?= =?us-ascii?Q?gE63R694T3c+sdAvkOYmediNNXA0gQC4ozhQR4rOW46iPPf2RbXplmsxCBoe?= =?us-ascii?Q?6pc1naL0aCsrl+YCGmcY+fPEuO90ZhFtnesRyMNFgKlOjSq91pL1aokxwTgo?= =?us-ascii?Q?YlLzW0uFigr1WRdkXo9en1Zrg+kgaDv4DhmM61XOdRXDlhY3sdMX1Psa4V08?= =?us-ascii?Q?cM5nPFk7Hs3tKnMf3nruMSAE3rFgQXBd3ZKSMagvvICfybsNi6w4pT/0IEVE?= =?us-ascii?Q?IDn/2+M/+h6FAaLDqBgocLE/F4EWYyW8fvxJvgEOp0rBkTR+48oaNdf0CSqI?= =?us-ascii?Q?XUVC6KInp8+xLY8dpOdd4UT0/rCCBUr0Xg3+r4VNnBxDXVgaD7veYrA/NpfQ?= =?us-ascii?Q?ZfnGlJuKJH08I6vImd718qQmsGlp9Nfw6BdG8DlJQ9p4o6ndl6NqlJ/7FCOI?= =?us-ascii?Q?fhsBU55DiTIJjjVWzvzlThLYILY3FL0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 022a457a-b57f-4601-3341-08da1153158e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 07:09:37.1694 (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: RIvq0ydhS0JOHUbSAfU/qsCNraGryfJ0UEl88PJcTehmgylaQVf0YZaNiySjRynyfXsi/JtGuvvmbBBbVoHTRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7335 Content-Type: text/plain; charset="utf-8" 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 or delete or find a packet scheduler on mptcp_sched_list. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 13 ++++++++++ net/mptcp/Makefile | 2 +- net/mptcp/protocol.h | 3 +++ net/mptcp/sched.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 net/mptcp/sched.c diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 8b1afd6f5cc4..e3a0baa8dbd7 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -95,6 +95,19 @@ struct mptcp_out_options { #endif }; =20 +#define MPTCP_SCHED_NAME_MAX 16 + +struct mptcp_sched_ops { + struct sock * (*get_subflow)(struct mptcp_sock *msk); + + char name[MPTCP_SCHED_NAME_MAX]; + struct module *owner; + struct list_head list; + + void (*init)(struct mptcp_sock *msk); + void (*release)(struct mptcp_sock *msk); +} ____cacheline_aligned_in_smp; + #ifdef CONFIG_MPTCP extern struct request_sock_ops mptcp_subflow_request_sock_ops; =20 diff --git a/net/mptcp/Makefile b/net/mptcp/Makefile index 168c55d1c917..a37330760b0c 100644 --- a/net/mptcp/Makefile +++ b/net/mptcp/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_MPTCP) +=3D mptcp.o =20 mptcp-y :=3D protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o d= iag.o \ - mib.o pm_netlink.o sockopt.o + mib.o pm_netlink.o sockopt.o sched.o =20 obj-$(CONFIG_SYN_COOKIES) +=3D syncookies.o obj-$(CONFIG_INET_MPTCP_DIAG) +=3D mptcp_diag.o diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index fd82fd113113..9d264fd4aabe 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -608,6 +608,9 @@ int mptcp_subflow_create_socket(struct sock *sk, struct= socket **new_sock); void mptcp_info2sockaddr(const struct mptcp_addr_info *info, struct sockaddr_storage *addr, unsigned short family); +struct mptcp_sched_ops *mptcp_sched_find(const char *name); +int mptcp_register_scheduler(struct mptcp_sched_ops *sched); +void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched); =20 static inline bool __mptcp_subflow_active(struct mptcp_subflow_context *su= bflow) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c new file mode 100644 index 000000000000..c5d3bbafba71 --- /dev/null +++ b/net/mptcp/sched.c @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Multipath TCP + * + * Copyright (c) 2022, SUSE. + */ + +#define pr_fmt(fmt) "MPTCP: " fmt + +#include +#include +#include +#include +#include +#include "protocol.h" + +static DEFINE_SPINLOCK(mptcp_sched_list_lock); +static LIST_HEAD(mptcp_sched_list); + +/* Must be called with rcu read lock held */ +struct mptcp_sched_ops *mptcp_sched_find(const char *name) +{ + struct mptcp_sched_ops *sched, *ret =3D NULL; + + list_for_each_entry_rcu(sched, &mptcp_sched_list, list) { + if (!strcmp(sched->name, name)) { + ret =3D sched; + break; + } + } + + return ret; +} + +int mptcp_register_scheduler(struct mptcp_sched_ops *sched) +{ + if (!sched->get_subflow) + return -EINVAL; + + spin_lock(&mptcp_sched_list_lock); + if (mptcp_sched_find(sched->name)) { + spin_unlock(&mptcp_sched_list_lock); + return -EEXIST; + } + list_add_tail_rcu(&sched->list, &mptcp_sched_list); + spin_unlock(&mptcp_sched_list_lock); + + pr_debug("%s registered", sched->name); + return 0; +} + +void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched) +{ + spin_lock(&mptcp_sched_list_lock); + list_del_rcu(&sched->list); + spin_unlock(&mptcp_sched_list_lock); +} --=20 2.34.1 From nobody Fri May 3 08:43:16 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp764355piq; Tue, 29 Mar 2022 00:09:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpHkmfnGy45I1742gSkCjrzFYpwh7GcUuYeybYUv+KGgm7hseFP1dPRV54H60StHUv0FR0 X-Received: by 2002:a17:906:2991:b0:6cf:1fd4:39a3 with SMTP id x17-20020a170906299100b006cf1fd439a3mr32502327eje.21.1648537791171; Tue, 29 Mar 2022 00:09:51 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id bs1-20020a056402304100b00418c2b5be4asi14846916edb.300.2022.03.29.00.09.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2022 00:09:51 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4512-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=nEdfA2tC; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4512-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4512-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 297EB1C05DF for ; Tue, 29 Mar 2022 07:09:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 16E212103; Tue, 29 Mar 2022 07:09:49 +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 566F320FF for ; Tue, 29 Mar 2022 07:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648537785; 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=f2EWFXOm7umpvVUDW3+zQzHBtq7vOvrQPv3DnXMKD40=; b=nEdfA2tC5XJENqQUCLPtK3h3ePExA4hMe05DRS8CJ6bBkU4SThkOFTqPt18BOnYESISOx2 xkQ8kCyIleQi3yc36F6wjO+MA0sQcLSAjYfU4kLt4c8nRfBRgs9Dwc3RdRyFD5Dg82Qycl q8m2sYluuKxkELziuzg8WuO0hlPrZhM= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2173.outbound.protection.outlook.com [104.47.17.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-41-G_Tg-0fJOYObasMIMSmp1A-1; Tue, 29 Mar 2022 09:09:44 +0200 X-MC-Unique: G_Tg-0fJOYObasMIMSmp1A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AW9ImFi11M7toTWAwX4j45ngPFNTzWwKPGwn98sZpezkx4fr2mBqK/XaJ+S/VWlBQgos5wngGvKmHNl+CfcU+gIQbq4QekjmvDBX6++sBEyRDAYcNG0CHJrThBn4Mqt2aLaMxv4kSZZ07T699TxBG2MXE6CwPpziJoWkkjHDA9mAJSrUGIPuaOHUHnhFui4NxHszhUR8B6TrxEOCCEf5awo9QgZwNTt3KV4bbV1Rids/UDap5EOf3JFCIRS6cjjGn3zaXb+KNexkM50hpPKdteDIL2CIZxT3tdFEiULX1HUGgWrkisQiO3mQoV/3pyV5Deu7C8jTnTkhTF5kynK+PA== 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=q+4Rg4Gr3iKZnA/EePnh1KwHKsQMmy8fUEmU9ULDMa0=; b=C6Y6tX6gy/iNavp9UbeH2yX8/Uy76s3KReX7J0dxx7JPb3f+tOYujoDdYkKms57g/lJWQOTehHTeXSao0NdMOedGC08XGyYocMeHYRBRpJHwAtfj8ncYIeJBA3mVbim/ytdZ6iQqT5hvgaaMrAO6ql+FBbEJtAZ/+MLt1DsDb5F9+95ZTmjTN+Ge6cxsGcKvERPrzQX6zjJ5ivCqlnV3iiatyFqaou8AvTyFiEbZmGbZP826m5gxJ1k6lAbsjTFoznQ0cJw8+1Uy0CunCRjjJpYigAGNNZk1VspUVyU1YmtHBLUMqINIAR1b1wL16cUk2tPBXxXObpbCLtacnIHFbA== 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 DBAPR04MB7335.eurprd04.prod.outlook.com (2603:10a6:10:1b1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.23; Tue, 29 Mar 2022 07:09:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 07:09:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: fw@strlen.de, Geliang Tang Subject: [PATCH mptcp-next v8 2/8] mptcp: register default scheduler Date: Tue, 29 Mar 2022 15:09:21 +0800 Message-ID: <080d123961d28d18678f642f1526d448cb516e27.1648537203.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0102.apcprd03.prod.outlook.com (2603:1096:203:b0::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 459f3f75-db27-424f-a2c3-08da1153195f X-MS-TrafficTypeDiagnostic: DBAPR04MB7335: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: vNQ1XJ4oFir1YKLkZYyjgssG/qN0KDp91qYG3QhBVFIwK/oklWje3+7KLDN2YcVn/91LY0i5YnZyWe3mfgauqQ6VS72Szt+rXxgevpjMArbbbzkEOLGFa4ot8pIi/oqM8D68bCbh+5tmTgunsJe73zeDAoHRjZwqxwPNMi5lZL8Fq+iP1iBfBevSyQm2zfBFdZvItn7W7Jgm58TIDVnsdkFiZy6Nj0I4kDWAswtYozuHdlFzBjVrpg6oI2D9z8wEcnn3cyFb0QUh4zApVYIiTgkRIbljin6qTPB7+BTovY6dFZbAuB+/X68njT/WlIuRtEUbGhyNDfEh8lYKY1BH6y/B0hu3RKGkA6HXBAhtvZDhjZm07ObIStXZp13iCjLw7FxoE7nSfUqVhAo/MxZehaKNv/P0dJzXaADCKUc16UXQuC0kl9Xtrj85/MiC50itgBZDLUzJUcTo9c8ZngXmka69fawutr8RRct9gNO1sTDeNht0wEEig3/Nbkc9h+6kC5t8ApaKjupByey9FLvkN81UawKEgJL2CCbNrgfCwFvgA2AcvmYrG08JT3HRvfxLGg8YLklr4gzhT5yxvHn5qZ8mpfpyx9M/MV1YnB4J4vSTVY3OZBdemx/CBHhMPm9Ys2/0W/WbZwqnFODEnbbBAtpl91vQr+5W36iJig6Ip5p6Y+OR0nsQa9mNK1iPnzsyHlWAjdHSXObZipS75sSJpg== 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)(6512007)(2906002)(83380400001)(36756003)(6916009)(26005)(316002)(186003)(107886003)(38100700002)(2616005)(4326008)(6486002)(6506007)(508600001)(44832011)(66946007)(66556008)(8936002)(8676002)(66476007)(5660300002)(6666004)(86362001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZwthK/olv229K+iU7ohi3dFHlZm3H6hCew2M3PGtzauQRlI8Tv9hzIpPl1Oy?= =?us-ascii?Q?0oyFG4eSuL6Jx3JvlEqgFCB2GinojlSPY+X8N5T+iSG95gCRwHoKMfPv8ckO?= =?us-ascii?Q?FwIYRYc2cGxBVq08esQh6vDAI4sVikGykei7SXPH9QE/yvgBmNfwKyF0g0YO?= =?us-ascii?Q?oApH3yytJ8o06yKEXl20rSwQuWj/noQnV4oqKjKeKLfvFaCoc6+mBYIPpoeq?= =?us-ascii?Q?we6c31R3uVIqmPrzilV96tWpV79dzMfEoSWZwQCfTLA22xBAlC9zGlhJEJnF?= =?us-ascii?Q?WaVB5xGzLHc7u31/c6TMPQvgH1FWodN3YWivcU1e6KT8VNjvWgEAMsjAbKNP?= =?us-ascii?Q?FPvpg/X8et5qR0296Abzn2W2whc1HO55G+eOwRSkWjJlqa2LyAt0+59yPZm5?= =?us-ascii?Q?9VOVI3EbE+bi6onYKJwR8sSlpM+DJoGfhZzfYPRgzmXqJWThLeWlIsVKqtOo?= =?us-ascii?Q?x1UZY8FzXMyIiFGXGU/ZJuFAcntRxSjeu/lgf1ogFVVZ7/1Qxry3J986LLNv?= =?us-ascii?Q?05UshqtEweT7gNlFCgvnYNakQgJY36XR4tGli1CtlPxfBX/XT9gUyMGrETGu?= =?us-ascii?Q?ag8M1WA+xF6kAniWiY9pEHJeFCoC69+nNdSnuTceWe89l+ZBD+ppWdCSaD/Y?= =?us-ascii?Q?WmRXgli2rRqPfrzeabcmHOhWETsdWF6qU/G+hoRNrOXDqjQUxkJcaw2fQM8w?= =?us-ascii?Q?8lfXP3g7MhFhhfMOAa2bh8KDTu0x/zVgj1+OmVvq0rSctweOi06DzoJTm9UZ?= =?us-ascii?Q?NioybWWE3IGX7cB5pqVPiJkkFAqnNcPRnz8Z2Y0lUXHTDiiEyf6ouyrDOX3w?= =?us-ascii?Q?QXl6xECjQxjuQ2S+jL03qSQd17byzcteq1HPsFKHsqd/V1SnNhokr9MRPI3Y?= =?us-ascii?Q?7wcR6UD+qw2dUDYBFrIEZ/HjHRd25gE3Gg+PEaLBEubVRElFQ+e0JWrn9ClV?= =?us-ascii?Q?/263mUqkRhKM9HU3+WzsE9ZiXzDQeLFnjOa/C+8wM6AdledJtFAEZTSmYvY9?= =?us-ascii?Q?Aj0V5ZMyJQfbjOm6w8cLGvt0hvvwcg8Z27SGmvBf/PZxHIB7n3718Z3KNP0h?= =?us-ascii?Q?iD+Sep9eKLsFc7+XyEyQ5z+cEhxbFFj1k4gsDcM2CKWdXYCNEjfRQVCQbl87?= =?us-ascii?Q?AWxzugehqD1qIBIKwwuvLX4WUQh03ALW8EaVGE1dnI7UTb4b0ix9qlIR562t?= =?us-ascii?Q?LKzyd4r3ajf+sAfOaKDW2aWzy3TGg5LYw82ElNRl6chl1YfMW6lvrfD40jAI?= =?us-ascii?Q?cMqo0pvi500BRyT22w+jcQBg8tXJqCzlFch8HMiVNw4aUHvfgiSs13gPKadQ?= =?us-ascii?Q?b/Rc/lybhG24qvUkD6yC5FhwNWOYvGQ0+USbO59e9/nserlvlOCHkUId8ILx?= =?us-ascii?Q?GP5pl6IzoSRe/38fFT5qgJizCfJDi36Jcm0xl5QIiOGLhtJUXpnYu+c/L+y4?= =?us-ascii?Q?QgaO3HMFtMLP15yOhtkpCxXrYlcPBY4X2r1eyC4nPk42fKGAmNTAgtKG26ps?= =?us-ascii?Q?zm2TMdGiQ5oks6gSustPIIXk9fUBT8v7r7FpdsDryfV+tpibvRH1X+oZyeF7?= =?us-ascii?Q?6lmTB/eIlHBFvysGWFZdiGQPQtJqCd9IaxCf9r56mwv+zXu8EJqWJiDPk2A+?= =?us-ascii?Q?b37BS5epPHwSg0H0E7k1HXCgu7GCYXyN8Y9G16ttxjMAEjD5S6wL2wSJJyCr?= =?us-ascii?Q?6xy++P/kJA5GS5Itt/e/mVt6bzutBVOgxg+pKmo3DPfprbmJfdDbsIMCPWeN?= =?us-ascii?Q?85Az+myA9QhjCwYk6WmxftSsNDWdsN4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 459f3f75-db27-424f-a2c3-08da1153195f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 07:09:43.5751 (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: xl0bdv3geS8/arV88xusFJ8A60oPPcBRPyqITO7Chop91eWbLkDDjTzKLZmCx5ig6dxUncDNamLmjpo72m0/LA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7335 Content-Type: text/plain; charset="utf-8" This patch defines the default packet scheduler mptcp_sched_default, registers it in mptcp_sched_init(). Skip deleting this default scheduler in mptcp_unregister_scheduler(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d3887f628b54..6c2d6b932d25 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1424,7 +1424,7 @@ bool mptcp_subflow_active(struct mptcp_subflow_contex= t *subflow) * returns the subflow that will transmit the next DSS * additionally updates the rtx timeout */ -static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) +struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) { struct subflow_send_info send_info[SSK_MODE_MAX]; struct mptcp_subflow_context *subflow; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 9d264fd4aabe..76b98240921f 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -611,6 +611,8 @@ void mptcp_info2sockaddr(const struct mptcp_addr_info *= info, struct mptcp_sched_ops *mptcp_sched_find(const char *name); int mptcp_register_scheduler(struct mptcp_sched_ops *sched); void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched); +struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); +void mptcp_sched_init(void); =20 static inline bool __mptcp_subflow_active(struct mptcp_subflow_context *su= bflow) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index c5d3bbafba71..52828eb741c0 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -13,6 +13,12 @@ #include #include "protocol.h" =20 +static struct mptcp_sched_ops mptcp_sched_default =3D { + .get_subflow =3D mptcp_subflow_get_send, + .name =3D "default", + .owner =3D THIS_MODULE, +}; + static DEFINE_SPINLOCK(mptcp_sched_list_lock); static LIST_HEAD(mptcp_sched_list); =20 @@ -50,7 +56,15 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sch= ed) =20 void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched) { + if (sched =3D=3D &mptcp_sched_default) + return; + spin_lock(&mptcp_sched_list_lock); list_del_rcu(&sched->list); spin_unlock(&mptcp_sched_list_lock); } + +void mptcp_sched_init(void) +{ + mptcp_register_scheduler(&mptcp_sched_default); +} --=20 2.34.1 From nobody Fri May 3 08:43:16 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp764425piq; Tue, 29 Mar 2022 00:10:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwb6R/5cFK1jUH2GmS6Bs9pSMrCeDsiCqZuMpdpB/rBkT4E+iJz6geq4NGAFC5iu6khZ1Dr X-Received: by 2002:a05:6402:440d:b0:412:9e8a:5e51 with SMTP id y13-20020a056402440d00b004129e8a5e51mr2708376eda.362.1648537800176; Tue, 29 Mar 2022 00:10:00 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id bs1-20020a056402304100b00418c2b5be4asi14847254edb.300.2022.03.29.00.09.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2022 00:10:00 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4513-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=GeArYuB0; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4513-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4513-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 536151C07F5 for ; Tue, 29 Mar 2022 07:09:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D1E912103; Tue, 29 Mar 2022 07:09:56 +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.111.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 25A4920FF for ; Tue, 29 Mar 2022 07:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648537793; 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=MdHV+Yxcnb4lJlcH3UDTLYzqQiwff72jxt+g/SzyCnY=; b=GeArYuB0/Q5TnB2Au84vO7zMmHHxA0i5PJSJqf8ULCx7nSOSPcIorZ9BKwA/rM5JZbqR/G PXFDG+gD8+XeqPL1pGYjB4gJMplJJCU2nDarYV8jVrWTEZB9AEXRtycmlCivA3kGy2wr+z lup3a7FW1KP8VVbDmXtrjL1RI//k5k0= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2174.outbound.protection.outlook.com [104.47.17.174]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-22-GjHDMAzoNDecQgmpYcP-qQ-1; Tue, 29 Mar 2022 09:09:51 +0200 X-MC-Unique: GjHDMAzoNDecQgmpYcP-qQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GfCNgsADdmFTqTJ4AAayh+1iq6vnivtqf3YJWl6NU24q0UDFyeTjjBG96LNbOcSuHmtYwCdh8W3JUnUoGKnHsHqHtXA4FwSjAaVtzzogeAedqsPRJQd2Yak0wsFIufFQ9gKGETHi5vPikKOz0qVlYhPRjyZyUSIKf2SGSlJJoQOlwmH3udy7sZsTvu6iltq23FFFmtGV5s2fj3pFm6XAk51/MbGjfdkJ/iDGyH9qAGnwgUTlAXRMf003/NkCbXKrR6oqg7GddLFR9dnUrv4n5Iu32tsfNwRlDwIUYNB1hNInusLwp/yh7arsp0DSyWOEM2KdAwCNvU6pq2lX2T++RA== 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=dOFFrwF5WwqeyUWL/THPWXxSVU7wkHZ286dmOq3oq4s=; b=Kq9LzE7uq7qy82unga/FvakY5UEVnWx4GtmV3cT+fU1l/3UAcmePCsADvpcPAR/m4DUTJPJXEkLyoEBNm/JpNcVPZWBO0/ijpbPHXRCBkLe5iypWbF5XvwZswVy8dPqIaYyrMRP+XN8jSF5KZkp3D5OZ3EAuXizp+Rl7NVtibu/MDQjHrfOzhguhGmOPuQ2ouyzd26JS0UA2hRedipohcIkkshcoxH8Qy/B7mskjdP39Hy3fR8mKsdgsgsgjkjCmhyiRqoEmt3qcqj46DDjHNBUdkxUZ8TunIAnnQgKF2TP7793ZwWlKdVcsQh8BKVEavRFHalsrQcB/6XHHdfNiQA== 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 DBAPR04MB7335.eurprd04.prod.outlook.com (2603:10a6:10:1b1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.23; Tue, 29 Mar 2022 07:09:50 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 07:09:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: fw@strlen.de, Geliang Tang Subject: [PATCH mptcp-next v8 3/8] mptcp: add a new sysctl scheduler Date: Tue, 29 Mar 2022 15:09:22 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0118.apcprd03.prod.outlook.com (2603:1096:203:b0::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-Office365-Filtering-Correlation-Id: 2f48c4b3-0939-4eb4-6027-08da11531d3f X-MS-TrafficTypeDiagnostic: DBAPR04MB7335: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: 3A9JprFt7N+Hy5kDXdyahevrLqoGLkq9DKQk+UzBaVQfUiprf0/25SjfpnWvumXWbRCQl8gvRIt62PotbfMrC8jmAG0jX+f1VofLoaK2h4FAUmCsDyN0CfNNKaqHQkAa6MHgMNYmQFNuniYVVdRy64ZQpEmUzTsQ/yP5DovQ/mKXggnbo+LWUorQZFjZn5u9mHDf+28yX1DNhR7crHxVV4HAkURRn0nEx4B+ERPgyOHzKRac/rb0ojAMUc1V9sE6pX2x+Tr7KyfqUIGO+As1KIJdowj8ZpjEa4ckt9+RDuO80TsjAAwhONIGuJxVebl8skKkRDH4msFbZRklzvCMAikUKhjJhiPTcXQTCn8p+xxRtk8z0H3+1UReu2pVndmzhudGg/uCYxE6Flaz3Jo7J2SQPLcukdKkueSEhbHHFp6z0MSkWuZgBLppN0ztw4EAl2JB7Les75E2AdQ1hTc7dd42bdxmXo9LmR5W8Nq/7nW5hkB/vh889pDVueMRcchmZl3RNy4An3U+UF+uOAGJR5/M3reClKpuJlAUS4EsTzqfzVSYq+gOwCNcyEphkvQKLHhoROgNmM8d8oWZOleEWLVEfIQulQmt9TniXGPqYQZ371NBO1Wo/D3/jxjpDXjZoaavEK4HyAfQPCvKCkprhJLxrGfUIa4ECfd6zMSCt4of69MsU+9rTVB8aJqVpzryjenCnSuCfaYzuY80Va7cWw== 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)(6512007)(2906002)(36756003)(6916009)(26005)(316002)(186003)(107886003)(38100700002)(2616005)(4326008)(6486002)(6506007)(508600001)(44832011)(66946007)(66556008)(8936002)(8676002)(66476007)(5660300002)(6666004)(86362001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FFdQeKvz2v/NvRpZecFpdmfz3UGtD+k/wnsFJ73lkocuQQfe7zRNSF8kffSg?= =?us-ascii?Q?Hn1pnubrPZbHlqWwQY5b9vqj09v7F6/qeWTZDc4htTjouWeNfrl5d8WYXpeB?= =?us-ascii?Q?FY+ezk0U1DvCCtwRkFSovLbHwBb+jyEnCdAQL0Kb2DVSMlWpA7jeKIKU3GVR?= =?us-ascii?Q?kkPSlCK6Rd87tEnz9IXA0QJ0DjMFvDaVDINgcgQa1VoI905W9W4Df7YG8o+v?= =?us-ascii?Q?S9JoqlB/gahlcXjAjqURJxtpH5vZelwzEDJMxGI63yDDu6ivDtcYTjx0ZbcT?= =?us-ascii?Q?YU5yt4EQVaY0j+Gkfoixp7s2022xPBDcNyZWgbEafcTzCpNu5D8bNxTTH2Mu?= =?us-ascii?Q?jk2YqL+d/+MNe+mlWzRfLhctUdRXKcBlgm26rN7LTG8xpmYrR3ctK7caxj1H?= =?us-ascii?Q?t1L4ciJTb/D1zyI2yadLjbv0wfu0sHhlWIYLJDEqoMO35R2YfngfyNWN1xRV?= =?us-ascii?Q?IAkHTH2QwONzZseDLjjFHvxU9k1GsmOQUL/EyTj+oMA5bd+VX8xd6nz50R+j?= =?us-ascii?Q?PHA5K77Gfjrc+JkR1e9Ty3MbJZOwgXL8vcRj12v+AQtpbzpH1EaBFzMvU3Eu?= =?us-ascii?Q?Ywc/1+sUdRXZmg2bGez3ejmkXtZTGuOkc74B7sJiBL13+OiFui8NKedwfzr2?= =?us-ascii?Q?VfFfxr7awjJ4xcwGg+D7BQpBRVTuEY7Hh2YYchC9czp1aK+NmCynpkUgTbDH?= =?us-ascii?Q?2mPbQ3e7Ub2ZvIBMMGv3ac6Y+7NOjeXUkCbDATACc3R9VNyQRCdCq3Gzheu9?= =?us-ascii?Q?6TXjhCMqDGE1/GLmsPtRe1yR7ArL9YQeZfrWl7XLrvqYy5KeNeR6ERuT1uF6?= =?us-ascii?Q?F+GhOjxG66oywMLfMnSWtsojPTTKFiGZ2ptCaV1sk5Ohsd9v625Q66RFHGN+?= =?us-ascii?Q?/2o4+mLZr4GmGTviAKthnxokE0xYoDuma3z5UqHCcaM9yoKxWlomqG+G0Itm?= =?us-ascii?Q?t5VigjtBZY3jO7ziAjGVQP41oB6Mrd3BMS9k1Mov/HH1ualLjf/K2ePhsSxl?= =?us-ascii?Q?OesNfANXyHFwGZkOyXCVJnuEQok+CUuWJ2MBToeopaA+zlYdjFfJUINE4wwb?= =?us-ascii?Q?R8jOoFNKluTJvxIxt+y/C8W2zjc1ykbmrsL7aELAPBqlfUCAG/+KPMRh1dTn?= =?us-ascii?Q?Uqa2gSzqNFe3XNCJhy4Q4TVVtiJSHmQBghhgbttX/nzfAo60l6kZppYBGHul?= =?us-ascii?Q?/cO9ZSM2kwvUSINkir0cLSyh5Jnr4A+TAy304Wc2tKbWwa1vKArtOtN7GhYu?= =?us-ascii?Q?f3ucpuVJ9M5GRp2e0hN5QRyeXEZut5T7rv9QOg6pzI/Fnp+NQxEarQlSn1ss?= =?us-ascii?Q?bD+0ru45eDdlgMCD/wlUoQ1HowfbRVf20btuW6KzNm1aD/RYPh2hvpjikBOA?= =?us-ascii?Q?h4Qu8CPH0kyUk3G8inbZm55sMjwXVDZZ7Z+acQHKqq4L/7v8ZP5PF28XwJux?= =?us-ascii?Q?inW0GS6QjknWVY4ftKzaY1TO3xHeAjxpSgzlXzh5zzg9O/NZ51F1Wrsl74d6?= =?us-ascii?Q?lGdCnGRCjY7gC94MSSjJkncMZbsKgkksteXAw8gIiVxtENVOIwuD3MkbgfV2?= =?us-ascii?Q?9lbHfGIGPO38WyB5bwJGqOioUY4vMcSO8J+D2D1wJhL0ywpxdtqQKAXWxBRq?= =?us-ascii?Q?Vpdi7trbGPttWATJe+I5K13OoMRScYeDbdTxInUBBYVlOs06OvEt1f6KE0DX?= =?us-ascii?Q?KuX/OWayc3PRnb+vbXiHA1zl7pgC94a7Pn7MnDzO1oOtGVJXuXZNbt3kdV/K?= =?us-ascii?Q?6QGt+l1paOvBFB+KL7vlYQv3N9WVEls=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f48c4b3-0939-4eb4-6027-08da11531d3f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 07:09:49.9965 (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: GsPD5sLtW2ckIzGKM3fyyUD0lbHnmNCFFbqjwf4VA3pwJKzMxO0U7iVLRZfEf2yIvj+L0i/5X9sGpuOOt32Shg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7335 Content-Type: text/plain; charset="utf-8" This patch adds a new sysctl, named scheduler, to support for selection of different schedulers. Export mptcp_get_scheduler helper to get this sysctl. Signed-off-by: Geliang Tang --- Documentation/networking/mptcp-sysctl.rst | 8 ++++++++ net/mptcp/ctrl.c | 14 ++++++++++++++ net/mptcp/protocol.h | 1 + 3 files changed, 23 insertions(+) diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/netw= orking/mptcp-sysctl.rst index e263dfcc4b40..d9e69fdc7ea3 100644 --- a/Documentation/networking/mptcp-sysctl.rst +++ b/Documentation/networking/mptcp-sysctl.rst @@ -75,3 +75,11 @@ stale_loss_cnt - INTEGER This is a per-namespace sysctl. =20 Default: 4 + +scheduler - STRING + Select the scheduler of your choice. + + Support for selection of different schedulers. This is a per-namespace + sysctl. + + Default: "default" diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index ae20b7d92e28..c46c22a84d23 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -32,6 +32,7 @@ struct mptcp_pernet { u8 checksum_enabled; u8 allow_join_initial_addr_port; u8 pm_type; + char scheduler[MPTCP_SCHED_NAME_MAX]; }; =20 static struct mptcp_pernet *mptcp_get_pernet(const struct net *net) @@ -69,6 +70,11 @@ int mptcp_get_pm_type(const struct net *net) return mptcp_get_pernet(net)->pm_type; } =20 +const char *mptcp_get_scheduler(const struct net *net) +{ + return mptcp_get_pernet(net)->scheduler; +} + static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet) { pernet->mptcp_enabled =3D 1; @@ -77,6 +83,7 @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet= *pernet) pernet->allow_join_initial_addr_port =3D 1; pernet->stale_loss_cnt =3D 4; pernet->pm_type =3D MPTCP_PM_TYPE_KERNEL; + strcpy(pernet->scheduler, "default"); } =20 #ifdef CONFIG_SYSCTL @@ -128,6 +135,12 @@ static struct ctl_table mptcp_sysctl_table[] =3D { .extra1 =3D SYSCTL_ZERO, .extra2 =3D &mptcp_pm_type_max }, + { + .procname =3D "scheduler", + .maxlen =3D MPTCP_SCHED_NAME_MAX, + .mode =3D 0644, + .proc_handler =3D proc_dostring, + }, {} }; =20 @@ -149,6 +162,7 @@ static int mptcp_pernet_new_table(struct net *net, stru= ct mptcp_pernet *pernet) table[3].data =3D &pernet->allow_join_initial_addr_port; table[4].data =3D &pernet->stale_loss_cnt; table[5].data =3D &pernet->pm_type; + table[6].data =3D &pernet->scheduler; =20 hdr =3D register_net_sysctl(net, MPTCP_SYSCTL_PATH, table); if (!hdr) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 76b98240921f..e9fbed723caf 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -586,6 +586,7 @@ int mptcp_is_checksum_enabled(const struct net *net); int mptcp_allow_join_id0(const struct net *net); unsigned int mptcp_stale_loss_cnt(const struct net *net); int mptcp_get_pm_type(const struct net *net); +const char *mptcp_get_scheduler(const struct net *net); void mptcp_subflow_fully_established(struct mptcp_subflow_context *subflow, struct mptcp_options_received *mp_opt); bool __mptcp_retransmit_pending_data(struct sock *sk); --=20 2.34.1 From nobody Fri May 3 08:43:16 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp764446piq; Tue, 29 Mar 2022 00:10:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf5Wf4HzI+Dj+O3dGPEecxhx4wOIGNM3ma/uerBSh0TS9Yl+vpj5jIaagFAMJ4YAVubO0L X-Received: by 2002:a17:906:c1c6:b0:6d5:cc27:a66c with SMTP id bw6-20020a170906c1c600b006d5cc27a66cmr33525366ejb.650.1648537805480; Tue, 29 Mar 2022 00:10:05 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id u22-20020a50a416000000b00418c2b5bf82si16150676edb.612.2022.03.29.00.10.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2022 00:10:05 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4514-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=bOKxyj93; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4514-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4514-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 ewr.edge.kernel.org (Postfix) with ESMTPS id D86461C0966 for ; Tue, 29 Mar 2022 07:10:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 600E82103; Tue, 29 Mar 2022 07:10:02 +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 9CA4C20FF for ; Tue, 29 Mar 2022 07:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648537798; 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=df2jRxIA0Y/ABAn/8uK6G3u0d+ynwFDV+RCRXwFkJSs=; b=bOKxyj930qlJd7YJxpr3bSxq2lV0JqCE3qbb8dPo3e8iQGRd9QvvIgqgjUd+TEbFOhsAmc fLImAp0t6XC0ChYVZHc9o+guIkgBF3rSVPtezxvhu6z4B5wqaqideaUsPxoNA0ocdYMs/X OwRHAOGzQp0dGKZcHG/UFqxqWQ+pGwQ= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2177.outbound.protection.outlook.com [104.47.17.177]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-jajkMgmsNJ6f8ADkpLsP8A-1; Tue, 29 Mar 2022 09:09:57 +0200 X-MC-Unique: jajkMgmsNJ6f8ADkpLsP8A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eGgyaJtfga+eu0m7A45FCRksIlh4xV7drXhGN6nd0U9hLBfMvU734N16tCBgRQxXyOspgPjeRSO1/khFk3UPOxtayl9NVUkg5vEF32BmIJj/GLvTVVF47B3qYsSozTfkveQk7EyfsgaFog8sDFEGw1ChHYh/IiwD2rnM5KGxszPOZcYctfKldV7UoNDhbc9wp40ddyNf3bUG1XRcX1UU8V0osjoa23RY91os5IYYSjUmNrPx3TNH8hkqY8jOuHuYiS64CCnDfhhn6WRRAm1O/4+wU0k9u1ZaDOKFBRGGz9xXKhO+93Wj5K87N0M6J75fiO3gI5b6kk8hJtMhfuvYAw== 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=5cAviDVumocNGXcupv+rJCHxwSsWxV/99bHzvvp38C8=; b=NgNuai9c3Ngsme3ZZ5YwjIwt2chSkSEnIAasH9cYUyR3ezaq22T0s2GwZHeo1/uAt0Vln9tKYVbS6X76M06BxrRdNAK4VA9u5FSx48STqkDVyjRm1Aghpfh0OvVWupRE6NlKzg2xuxK86OLsdAFoGoSAyaEAx1PoieK9CGU/RsLFkXkUuwLG0z6NnuclkW7ECvdimC7jfpncN1h3/3wSqKZ2snjIob9dSCXj0NyOtKzlNcjtjvGX4/kd8S+D6lp+ykKzcKmbdh8Ev/3h82VwCDbv6LOKLq2xOJpJAI8jzg/vtRDX4I9EUHg7V2s+LRMIiyEp//X21lDGnU5yxYqbTA== 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 VE1PR04MB6735.eurprd04.prod.outlook.com (2603:10a6:803:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.22; Tue, 29 Mar 2022 07:09:56 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 07:09:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: fw@strlen.de, Geliang Tang Subject: [PATCH mptcp-next v8 4/8] mptcp: add sched in mptcp_sock Date: Tue, 29 Mar 2022 15:09:23 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0107.apcprd03.prod.outlook.com (2603:1096:203:b0::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-Office365-Filtering-Correlation-Id: c7fa3a40-38ff-40ea-f468-08da11532136 X-MS-TrafficTypeDiagnostic: VE1PR04MB6735: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: eH04Sc9Fw/U3Cl6++5XhjU2XR2Pz1Poszn8hz9JFVgOf5/IY8JrWgxU3EmDhNGfZQRiV80Os3T5GBSEwi5M1f7Cig4ZkICMLw5sFBJ7GJqLFZ5edvEolVQnpKyKYzI5+Slmg9dHOzl7Cg3O5Pn+n4Pd6DUBDblbrJej9czqcl0QR+i38kRDaRx3JYY9wQCMNCZ4Fe6KQ4GN6UfvWy4HBcShgWzDHcSWSTbtDyFaHRrOn6Ao/YxQnkenGH6C8LhxAaI+CVil0qGT48DmlvetqhngL8Nu5w7G6iaGbbPpt+GYBYy27Cl9qy4BsEkbKqx5dD3WhnMXgPln3J0PaapZyGUTqGoC3NHc9Pllh2VCiYzpQsBiAiP1qXFSBkXdxxbRuR6QGBeQyyvSOlodHCufcf68mGV7tzq8N4jcZvyG6313G4Kafn8hu3WgnDWfVlRf0Lt6XGfqGNCr9SajBpnAU3a14iYuujGlfk5PEg5133ppLRKZ5LArZVd6zI2ExEuPp7B4aWmnXDwL8G5kGo8Eevfs4dI/cOMp52P35zcfsWAe0lsK+a0DeTSpXhSMuYjPcqkFXFQHGClM50Yfy9kTd7LuintTtuk/Xqx3Y4A6raPNMRcTi7a7hSq3wnoHDL2+dVHkKCEcKdRd/RyguGDsUFJFS0qfs6csMubY00Mf/sf5aEfxlqDYtTLoex9i1fzCh 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)(6506007)(6666004)(6916009)(86362001)(8936002)(8676002)(4326008)(36756003)(2906002)(6486002)(508600001)(316002)(2616005)(66556008)(6512007)(66946007)(66476007)(44832011)(107886003)(26005)(5660300002)(83380400001)(186003)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LEtSJEjgqjMHWIe+PtZLrqOnxJRxDcmvAl+qJCkwzsvwpmycAekxUuzyo6V4?= =?us-ascii?Q?E0yo/ZeiuVt8n4OfdnG1RX4iYXMjzlTQzgk+2nl721OVnzqcpfv+punltp4p?= =?us-ascii?Q?1l0+jNUseOTFBi4Fv/lqOQdYq7U8JjAWGIRQ4O5J1C1IPidvGt0D0wCmRhVE?= =?us-ascii?Q?o7F4/dwwQqYRJ2iG8mtdTOQt/MBwTExOX6b/4uHIVEJzwT25l8tOm/izjlyM?= =?us-ascii?Q?4SEYW3zY97+l1ad4HKgd1xFBjVWBnNJGgqH1fHwbMAffylriBsWCKfCBj0Fc?= =?us-ascii?Q?8mOCzOpOSN0qBr17twYPKrRfHy4zhI+dTahjymM9i63YLOFBNI1FnSk7TWm7?= =?us-ascii?Q?BrZBVJD1ThsdizALz4W1V5cnLFovuBznjx3cMtOIdQWJ2yerNXdGFNFvSOgH?= =?us-ascii?Q?/lJdmtHGctvzmqHVt8zdpR2jr2xY7UypddPm/ZQhwx65GtFyC3mCvMfTch4F?= =?us-ascii?Q?Tk3x7ncY2L73nHfsZ4G/yFLGvo/Gt48Ngo/fCdJntxLJVigCv9dv3+cn/mJx?= =?us-ascii?Q?1WrTq94FaE/pUosmT5t8VD5FibLKe7lohrrTl/eVNnvZF9I9apDV7Ni4OfLr?= =?us-ascii?Q?xl5elXvXQ0HD3oF1OWlWoRJEuQlMUwK6b/SVTTsPUs7PR6S9Zjxjo1r5kGN1?= =?us-ascii?Q?vg2XEwbpVT2CilwpZ9REoPE9mhWsBCA6HErvPsEW9GSDU+Zn77/ctKwWndTT?= =?us-ascii?Q?b8693/fC7+yiFLFp7uH5vBLupd7m+C6V0c30R0y6X5hQ+y4uDJgTT4OShq7m?= =?us-ascii?Q?bwbRKeL0RyL+F6NS9oI4Gf+Go5SJGzD5x53/IYUH/HERLF3SSsNonRG0amBO?= =?us-ascii?Q?4KvHPYlI+iXD34mr7NV+y0QCAQrMKLLBagOycdTbHBwUpZjk/KOThdjSYuTj?= =?us-ascii?Q?BhHJ+esOO1ckTlleKRWlbFdYRjz+pqY+msh9ZcazDkGFEptiv9/efKcvHigc?= =?us-ascii?Q?GIRu3kT6GWj1K/W4NC8Tmc5fCIbRt4UN/wWzgLQSnPXubjuHAWwaFXpFlC+3?= =?us-ascii?Q?JzY2A8guKbP7VNqbvmSR6l1TF9kERN92yVLM0T/Gdh/1ySTGNKJ3iKXM2lMg?= =?us-ascii?Q?GP0HBW6tWpPn4ZhFOJrxhP5mY3jwZuaZ0QsPRlRBuL4FTiJpazGWe6KY3QhL?= =?us-ascii?Q?snJfN/rhR4VFNlvM8+dqUZMW0QvcTT/GEvHEKhIVLzSHUCRPN4kkhGbNRueU?= =?us-ascii?Q?VR4tl/L/WWxn0ZS552T1tNcugkjN2ILZ76xLRp9HD43vFqD0Ag57UMAm8Vhv?= =?us-ascii?Q?6U4H2VA//R7aWfXk70IDvjcFsXskmYHE5WFr7aPPfWLDEA36ytIj+0853LfX?= =?us-ascii?Q?7aclqca2MwD4wwJkI1PUol9pf+0hqtgoFz2qMEi05QuDmcj+xe5xxNibI7CC?= =?us-ascii?Q?uEXHMKjUFMJ1Em+ydno9pCtKCdP83hNWBlB/YS0bYuE4DYBzgo6OS5+gBahb?= =?us-ascii?Q?duj1XPs+EGF8S6a3V7RbU9AUNXHPgEDovdx5R64RsLLeMndkkp4z2qzcI87e?= =?us-ascii?Q?cdY5jwVbWx7hEc2u8/X1fARHw6yTjFR1f7SezJDcsiWp7PP9tQEYOGcc0sS3?= =?us-ascii?Q?5dc4C3nOCXGHRGN4qTt27auMMVj0ot+izJV1WIa0y0ufM12LRkvsdN9ZBJ20?= =?us-ascii?Q?gO3pzw4xzZkZUzcyl/O8dOq0u+5rltyV05+SKVMrSMx/TVrB/Or4E5wzGRHo?= =?us-ascii?Q?PWC1cYcLpeJ56hE9lpBoNWQ5gq98K/TJW82kc5gVnzJpK2AlP+sPv2RTPgo4?= =?us-ascii?Q?ZjHxqnLZtntGkqK2p+ReMDg0FVxjhgg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7fa3a40-38ff-40ea-f468-08da11532136 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 07:09:56.6991 (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: g1ZaGFhBHA/I4NjMWTzfZCsBZA+gHGEQwzzaFNSew7FHgD1ML8bakoUQNv9TrMbdnE3l06Gq707IRWPX65G+Rw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6735 Content-Type: text/plain; charset="utf-8" This patch adds a new struct member sched in struct mptcp_sock. And two helpers mptcp_init_sched() and mptcp_release_sched() to init and release it. Init it with the sysctl scheduler in mptcp_init_sock(), copy the scheduler from the parent in mptcp_sk_clone(), and release it in __mptcp_destroy_sock(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 7 +++++++ net/mptcp/protocol.h | 4 ++++ net/mptcp/sched.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 6c2d6b932d25..e65b4dfcb758 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2657,6 +2657,11 @@ static int mptcp_init_sock(struct sock *sk) if (ret) return ret; =20 + ret =3D mptcp_init_sched(mptcp_sk(sk), + mptcp_sched_find(mptcp_get_scheduler(net))); + if (ret) + return ret; + /* fetch the ca name; do it outside __mptcp_init_sock(), so that clone wi= ll * propagate the correct value */ @@ -2816,6 +2821,7 @@ static void __mptcp_destroy_sock(struct sock *sk) sk_stop_timer(sk, &sk->sk_timer); mptcp_data_unlock(sk); msk->pm.status =3D 0; + mptcp_release_sched(msk); =20 /* clears msk->subflow, allowing the following loop to close * even the initial subflow @@ -2993,6 +2999,7 @@ struct sock *mptcp_sk_clone(const struct sock *sk, msk->snd_una =3D msk->write_seq; msk->wnd_end =3D msk->snd_nxt + req->rsk_rcv_wnd; msk->setsockopt_seq =3D mptcp_sk(sk)->setsockopt_seq; + mptcp_init_sched(msk, mptcp_sk(sk)->sched); =20 if (mp_opt->suboptions & OPTIONS_MPTCP_MPC) { msk->can_ack =3D true; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index e9fbed723caf..74d2b05f5d6b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -288,6 +288,7 @@ struct mptcp_sock { struct socket *subflow; /* outgoing connect/listener/!mp_capable */ struct sock *first; struct mptcp_pm_data pm; + struct mptcp_sched_ops *sched; struct { u32 space; /* bytes copied in last measurement window */ u32 copied; /* bytes copied in this measurement window */ @@ -614,6 +615,9 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sc= hed); void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched); struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); void mptcp_sched_init(void); +int mptcp_init_sched(struct mptcp_sock *msk, + struct mptcp_sched_ops *sched); +void mptcp_release_sched(struct mptcp_sock *msk); =20 static inline bool __mptcp_subflow_active(struct mptcp_subflow_context *su= bflow) { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 52828eb741c0..5d20d252088f 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -68,3 +68,37 @@ void mptcp_sched_init(void) { mptcp_register_scheduler(&mptcp_sched_default); } + +int mptcp_init_sched(struct mptcp_sock *msk, + struct mptcp_sched_ops *sched) +{ + struct mptcp_sched_ops *sched_init =3D &mptcp_sched_default; + + if (sched) + sched_init =3D sched; + + if (!bpf_try_module_get(sched_init, sched_init->owner)) + return -EBUSY; + + msk->sched =3D sched_init; + if (msk->sched->init) + msk->sched->init(msk); + + pr_debug("sched=3D%s", msk->sched->name); + + return 0; +} + +void mptcp_release_sched(struct mptcp_sock *msk) +{ + struct mptcp_sched_ops *sched =3D msk->sched; + + if (!sched) + return; + + msk->sched =3D NULL; + if (sched->release) + sched->release(msk); + + bpf_module_put(sched, sched->owner); +} --=20 2.34.1 From nobody Fri May 3 08:43:16 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp764492piq; Tue, 29 Mar 2022 00:10:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJym6GMdrhc3/ADTy3dGKjG4nif2+Ww0DTZtjq0iN61xJC9tfjor8k8y/JrwAkHwCmRdxxHN X-Received: by 2002:a05:6402:27c7:b0:41b:51ca:f542 with SMTP id c7-20020a05640227c700b0041b51caf542mr1544393ede.149.1648537812816; Tue, 29 Mar 2022 00:10:12 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id t14-20020a508d4e000000b00418c2b5bde2si15969234edt.196.2022.03.29.00.10.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2022 00:10:12 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4515-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="Ggy6d/fR"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4515-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4515-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 ewr.edge.kernel.org (Postfix) with ESMTPS id F42131C08F4 for ; Tue, 29 Mar 2022 07:10:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BEE362103; Tue, 29 Mar 2022 07:10:09 +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 8200B20FF for ; Tue, 29 Mar 2022 07:10:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648537805; 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=4roFYMj3xBnR8JvEubsVAWd25yKE4LrEKPIR59igJiI=; b=Ggy6d/fRfJK1k6kcbROVkTCWAH15i71doKKLnqTvdo1QsR0fCrJQxEYttVyyL2wFE5/HxG obxqgvtvahNh38JgrE3tyYhNqewQv4M+xyVsbOtAiDFE2f0vS001GB63SISK8s4E8E4jhB X5xwgYOXxnxBtj7PqKXIwTpM5Gyh6uo= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2173.outbound.protection.outlook.com [104.47.17.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-15-OVqg7OEBOuO2w9QZVchr3A-1; Tue, 29 Mar 2022 09:10:04 +0200 X-MC-Unique: OVqg7OEBOuO2w9QZVchr3A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QfQSyABjXPvgV2IzNxL4ORgq0Ai6VbpWsjYePP/5w7NJvioxthTb0A4sIvlOFfsgRUW4mZajKc9ZA0vabsv+hgzwHoseWEfIvYii2IOyO0i4sPM5VzHSKlekKcu9TfkN+G8GTewf2wE+q9Rn2knStpXZiyEjTR9Hjt3zpOgbi3OJu37RSXI7XyimkFmjZUrEtoYkgVfrczhIvCjSaihBuKo4qyyRxo5BBTLrZqTaBuu1C6dinoemAr5Ms0Xt/VWptXxGzYtjxYq44DtMqOqJFfiE6EgrSy4MegB1kFG68UVseMOSyR8M53ZzoQ+izgAOvkTbsxBUKqFsqWqzEPfKTw== 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=yeqWi/4+3cM7I0HdZPm7gIUU9/c/ZenRWeY1oDrKoro=; b=BNVAg+/gVZl/3cqfrVAg2PjHHTkXLMQ3xEqdQwZXoKdVnb6cLJ2BQStiWYTcPbpdAiehjzlr1djqQ6h6b3cR8z3oU/YOq4FMTIMo+GOnxMeypSsrGsbXUViJwFmHKiAfFJZohoBNGL0Y1o5l07m6akL1Cnfy+uPe560Q842QDR9WlQ5YoCguygHo15LeluZQCdkv2Gu9vuzxsjMhZJpIbJmPrdeowGwWX9QcYDkbNFBVxaSG8Nddjyxx8+37E7RQwm5T/GeUKjL0Xf7zhY79mci1rBPnzqsDDXMfv2K+622Af24N6PN+ixO2WsrjTgB7hHPcEfXSuNPu6N84vrz/6g== 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 VE1PR04MB6735.eurprd04.prod.outlook.com (2603:10a6:803:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.22; Tue, 29 Mar 2022 07:10:03 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 07:10:03 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: fw@strlen.de, Geliang Tang Subject: [PATCH mptcp-next v8 5/8] mptcp: add get_subflow wrapper Date: Tue, 29 Mar 2022 15:09:24 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0119.apcprd03.prod.outlook.com (2603:1096:203:b0::35) 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: e89160d8-2c9d-4ca8-3afb-08da11532520 X-MS-TrafficTypeDiagnostic: VE1PR04MB6735: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: SUkPOLCtFLJH5P0hjEETHzhtsCnBATLabHNIltBDU3ViQLDHOHG2K/uYQ0nf5+aq0EbLR2knirAdjN953UJZpkmq9RZtOjEmsK6S5sA77yCAqpWMDjBaqXx9BtTA7cw69XjsHpMoCSD1unKkZL9wmE8k9Rrt+NGHeyW1q0flj0/iFUVJc93rnfHLFwv6ww46VkUVk8UMSdz8Ufx6+XlneN9IUGfI1J5mh6cHSkG3OO2ClqIk29C3Rc3wC/+xCCa4cJe7qqbiabkEshBnnIUvt3mk/FZP6SBsaacsa5IS1lzTeMsNEac9f4YTrVvZUyJfzm4Smepzkd5HHO64sRsqVCUAt8stnGIEl5PpotEYs+3eqya5cDRg3k8U6aV+G0QVPfEhNhuQhUfF2D4j+Y6q2vJ5d9ks1xpyveD1ifDbIecUMVVxtsqU4/JLcw8ZbHeQY89MPvszdUqTVsUzsR5tyBNqq+KJy1PBdU2WOLmXqjUQuVv6J9BrBICPKKOrio0JfhEoHmqJGEFSZW1KBBUqmdlF0u+QomkyRph/5ZpeL+UVNIl+7g77DRKBm8GAgHWk5fQTZUmXSh0lG1ihshSURAuWCxXVx6+6znuBW/6vQZVXNZlbnd7Htx6f6FZFtE87dADkbr8RQi/indymkUjZHkHL18/dqAy3MOB5iERi32aNvc3ux+mnv8Iuq22p2GmvpZTo0TBLgmHC5nryDeUKgA== 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)(6506007)(6666004)(6916009)(86362001)(8936002)(8676002)(4326008)(36756003)(2906002)(6486002)(508600001)(316002)(2616005)(66556008)(6512007)(66946007)(66476007)(44832011)(107886003)(26005)(5660300002)(83380400001)(186003)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nWfC3yIBMUXeSXNXMkX2e85redAUBsvIKJjnlZK14DwZ7O4iHP604UkWyDj6?= =?us-ascii?Q?ZcsAxIDkNCQkgmFse0RMKDzCjp5y/IeLmmNWxlLV0tGfsitsW6VQphI4M/en?= =?us-ascii?Q?xF/1aTlPwgl7bWVNvejxmZu4KOLlSdnI49x1zXi5DiQ1+l+A8JwPCpm0vHnf?= =?us-ascii?Q?enG7u+KqVo9sKPrYDRC2PHsxo0nQnfVOSMShNxkEOkTeLt6BIj/Wz2zO5woQ?= =?us-ascii?Q?c+JsOdbp1ESCnqgLCZQ4JS/qkrB6gdo1ZwrQLLAl/TvKnw139Y5P8u7Ucafp?= =?us-ascii?Q?y7T4Cxi55dDAfYTEpNtqjhmb9mfYbnt30CjUd5zHqbcdy2UFvr1JXQ7XiJWr?= =?us-ascii?Q?J7KcsMlOM/fGBm3SfGm2j3DA1p0WDAwG+g3d6J9S3hsf1LUuyUdNwPAVXqc8?= =?us-ascii?Q?nKZyyW+Tw6Yca8ON3neHBXVfLbspxCJElb4RrYklZsuZbI3U5Iv1l9awTnD1?= =?us-ascii?Q?h0UMtQH6S7EDxL0OQ9GCZeKztObFRtFp1lyGLiL+WZOqCPSDQmQNGD3P+4f9?= =?us-ascii?Q?rNlV6n1BvtQqWOk265/aIcku5zGha2y6qic2AuPNQj/ANh56zGeh/rwGW3Gy?= =?us-ascii?Q?JIXpWM2rQ3+G8Fa5ZWdn2hkivVzTW7dXcxELuGh8iCUkPUQ3aRUvHH2AdCRH?= =?us-ascii?Q?2QsjaTRMDQRGGIVtKw2P9swUa/ni5F9/HSsenX14tAGdTSQDQUWdU6b6FFVm?= =?us-ascii?Q?XIge3gCa72/A9KTiA6mYNhRtG2IOu8PTC48IxVgCw674+rjuJk+M25v+dd85?= =?us-ascii?Q?A6m6FzfkOzpptHL3KjdGZocx3UzUQWZpR2YaS3LDyiregNspf7dfGOZX6V42?= =?us-ascii?Q?f0ms4A03lmAHMb1n0FoFxpulhD8nxbs52d5hUAxqdaEgBnEgjCRw4Gg87RpP?= =?us-ascii?Q?X5pLSiwUceXUFOh6YxNBzU1uj9/ir6/MgrgxMIEKV2LYTt7uhgUeZHXFBRTk?= =?us-ascii?Q?cvv5rCsjU0dZptaTKKn630XJl5dYkVtDK61a9J2FLy496vh6JPG2AIzTKLEk?= =?us-ascii?Q?hwiVCEiejzP08hQ7poGhmcFyt19JNfT4MUF4PV3uF1d0Do0yPOtPhel2vHlX?= =?us-ascii?Q?Cc7p30FyfI9fEfJSbkxloSkarOVwRrZPSHXZZ1RY83+7TqEFftMsYuwZe9iD?= =?us-ascii?Q?rS1qhy83SUWAy+Sepgxqvv2boldhnnjIjoM0zyBMHwqeId+4whdWqL/88fp4?= =?us-ascii?Q?C/MR7XdZXoXVcIru/LYSzX1+7DDIJ1zOSacADjEkJ5uU+hqLG5SgwdK1z/WH?= =?us-ascii?Q?arZHN36EB6aiH79DZzdaMMmBSbjSRkx/lsNwnhrl007r8630/yYyZs2CQe5T?= =?us-ascii?Q?idBDaFD94IlNiuxrzGl7UpQ6EH5SRJBOpgM9+UlJZcJKZ3tqh9c8lSw1dTXB?= =?us-ascii?Q?IJWxEvrthYnMursN5epi5ztZIC6lwXvAgBLuHEBhfcGwsXSKKLI3YmfVdhsH?= =?us-ascii?Q?UFqXVXHB3j92O4dTBPKSOXzMS+3wj/ARbV6GdSc2KRv/ZtDUG0tShDDb1CPn?= =?us-ascii?Q?beaAtydFH5HqVum2NyjnjqgtcAvq/HEXjOPShVgisWaHy0I9J+JVtrvkFdNv?= =?us-ascii?Q?KDFxGk3dfOx9VKUq33TOsOCuI8M4Z1iazqm9O71hIKG5Gr1YAh/CpxOXp1nh?= =?us-ascii?Q?hnHKzxWILpuklF/K0xihwBaRVSciQwIvFQOhgvTYosxOnWQoComeYYRAWpGC?= =?us-ascii?Q?vaIpj26hW3EyUSv/7cNEqushv1lOLlmor8QNVYjWA3DHd9kldO5DjCX6441S?= =?us-ascii?Q?6grvYKhQD2bihQh8OaF/d5i6YE1Usss=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e89160d8-2c9d-4ca8-3afb-08da11532520 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 07:10:03.2141 (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: VJ7YjoLXPyb57Tu9gcj1Nz0wFtsNXawMZjsCIxrFIDyIxPQQNSuIUtdHUjaghU5aJyMSXdnIzUrxUttkVXX1kg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6735 Content-Type: text/plain; charset="utf-8" This patch defines a new wrapper mptcp_sched_get_subflow(), invoke get_subflow of msk->sched in it. Use the wrapper instead of using mptcp_subflow_get_send() directly. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 6 +++--- net/mptcp/protocol.h | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e65b4dfcb758..ac00647d94cc 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1567,7 +1567,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) int ret =3D 0; =20 prev_ssk =3D ssk; - ssk =3D mptcp_subflow_get_send(msk); + ssk =3D mptcp_sched_get_subflow(msk); =20 /* First check. If the ssk has changed since * the last round, release prev_ssk @@ -1636,7 +1636,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk) * check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(mptcp_sk(sk)); + xmit_ssk =3D first ? ssk : mptcp_sched_get_subflow(mptcp_sk(sk)); if (!xmit_ssk) goto out; if (xmit_ssk !=3D ssk) { @@ -3137,7 +3137,7 @@ void __mptcp_check_push(struct sock *sk, struct sock = *ssk) return; =20 if (!sock_owned_by_user(sk)) { - struct sock *xmit_ssk =3D mptcp_subflow_get_send(mptcp_sk(sk)); + struct sock *xmit_ssk =3D mptcp_sched_get_subflow(mptcp_sk(sk)); =20 if (xmit_ssk =3D=3D ssk) __mptcp_subflow_push_pending(sk, ssk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 74d2b05f5d6b..a60aa588b1a7 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -619,6 +619,12 @@ int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched); void mptcp_release_sched(struct mptcp_sock *msk); =20 +static inline struct sock *mptcp_sched_get_subflow(struct mptcp_sock *msk) +{ + return INDIRECT_CALL_INET_1(msk->sched->get_subflow, + mptcp_subflow_get_send, msk); +} + static inline bool __mptcp_subflow_active(struct mptcp_subflow_context *su= bflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); --=20 2.34.1 From nobody Fri May 3 08:43:16 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp764562piq; Tue, 29 Mar 2022 00:10:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyY+8pUOu9T7J1Nu/BqpE5bAWHUW9HUrJkNA9gkEF7i0uMHxOYE4wRsPPYCbUHZ6sRKNBQa X-Received: by 2002:a17:907:7f04:b0:6e1:39b8:d1a5 with SMTP id qf4-20020a1709077f0400b006e139b8d1a5mr1297200ejc.83.1648537820534; Tue, 29 Mar 2022 00:10:20 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id kw13-20020a170907770d00b006df76385f01si15760135ejc.929.2022.03.29.00.10.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2022 00:10:20 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4516-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=UtmmUyar; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4516-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4516-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 ewr.edge.kernel.org (Postfix) with ESMTPS id CDC9F1C0966 for ; Tue, 29 Mar 2022 07:10:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 925152103; Tue, 29 Mar 2022 07:10:17 +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 B596520FF for ; Tue, 29 Mar 2022 07:10:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648537814; 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=oo3//fx14XjCUefb+pfNy/oJL8lmMWbhrHvuCa3AHI4=; b=UtmmUyarzRhdo4IDaYzAOaNpmGYjFbQflYZoWv4qeZfxi34Sowwm4ePoO48jKM+5LHZmEI Yo8W6hRjcluIdtRGSz01O/DWYcTlrChH30vSvG2oQU+hjjkLSAqRvOIwwW0rranwTt+Phi q1FGwbvklsGizAD49I7MHykMD9aW1bk= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2169.outbound.protection.outlook.com [104.47.17.169]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-7-5ZiOiGk3NTCuJshWzyVA5Q-1; Tue, 29 Mar 2022 09:10:12 +0200 X-MC-Unique: 5ZiOiGk3NTCuJshWzyVA5Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VtzSo79FHfI2rIjbyZIkrnCo/U/mDXWkbL23is5oITgaQ6XgsTBnKIs9YAiB2NefCgTLSOdWUBpGMe0ciblSuRb7r5OckO1ahv3cVZimOlbs0THA0lrFf/gS8LitJE02WkIvJjZRV320BNkfX+DHa2cN8G1HFTVwyGbIS4bi+Y6Kl5itUShTYkVwyNxh4WvAg33nxS6vQm68cIWB4Zc0GkivtQo0YVw9YORLqCNCxeIi30/8szcHzoKScnpkrZj9XwJM3GuQChCWiGmiyUJOOonAR8mMgJKijqbE/J+tIO8tACn00/x5DheF/eJr5fslpZAfodVhyJXr2XVkIpJYrw== 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=RckPJ3GmfIEin07RhOIHtDwm8KHZir2Jika9vk0kB9M=; b=fX2bymYWeXCawm/QJZBAwcxh9IB1i9xB7qG2mP+pzjBpSOe4EhVc1/gQ7KP+9KJxwF0qdhrVWJygSVb/1QqaR8WJYxc6fcLNmXEAtb4j11Agc4DQM5iyX4ep8/z3B2VYAQH7VVPZ6uK6c4tr7RAWkbgdfaVlXoiH+evIMZEi9USex55zsCtceUj5Aef+Vlj/z4K7SPEuDIUkfqACbUDoTDlOAkssZtrvGWf7qs+J/oApXvIvfsjrXwpoEZ/8kthEoHSkPJWmFhloJVgPtQ8AsTBUNifsiyMB6hwgOq9RNNzXKwmQEEflpN6ii3KIrP/IAzOss8Ar0UCZCR+m7B92sQ== 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 VE1PR04MB6735.eurprd04.prod.outlook.com (2603:10a6:803:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.22; Tue, 29 Mar 2022 07:10:12 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 07:10:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: fw@strlen.de, Geliang Tang Subject: [PATCH mptcp-next v8 6/8] mptcp: add bpf_mptcp_sched_ops Date: Tue, 29 Mar 2022 15:09:25 +0800 Message-ID: <21d4ddf37544ad71bccd4d4d027301c822ebf9fa.1648537203.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0098.apcprd03.prod.outlook.com (2603:1096:203:b0::14) 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: cdd9acc7-7579-43d9-6a9f-08da11532a5e X-MS-TrafficTypeDiagnostic: VE1PR04MB6735: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: yfwP8Yf+69ARGAGsPKkU3fpDssRlghUSfQvmfiiX3uaZ41wqF+HVnS/u/PooJwln4vQspONWZCz3idnJSWJbTqL3OxmG6NJRVFNiZooInfMXB4uyCbNch+kPPz1dG4TAg5r8Jq/xH9T1EoxT615d9PkJk5vjW3JbkLvfJTAWz67YrO7HN3u62f+Vm9ucgTTvKGN24T5PTqzaor2vl/n1zuxp4cwWphHzN3H8Jzu0t+nDxAlkZP3mVwFwR339BWeNrRyeH9FwVVw7h3sgWZgiy96XTgab4rpr3Y+iCU7FoyJIAONWUb/lybUeJCCXg0d6nayd0nZi/8IvkB7oISde0MpMMEwTfI7ykbzHICyxXHOi9X7//08Cd+eb68hkG9W/Q7ZtjTnwqgc1JmBskhGVJYoXdpjgJDjTHHghLBp8UjkWAAHewY2zjNEKoZHWQ27gPCitg7iuOYpk0uQhPfNZHsb8a5lAvf2Nj9MNSz464UKzNCBbTsCuFH3Ui2dQ7wKuo7EO4V4Bh//Sd4GRgOzyzB3pFseO9kLBoyRLxF4QfU1QoBqjDgZPJod5O0TTnP7XYOya77VLAAWrs4KeHoFrgTEXRNAinj9sxlQGgrE7ZscTXTEEEjyLOfeIRA5d/nW0mj0pO64lry/3IrCg9I+kaM2HGajC+DbKCHYds63Ou1AUmnEb0TuTxFz/e2umG4ADvjGZmwBTKytkmhQp+DBw8g== 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)(6506007)(6666004)(6916009)(86362001)(8936002)(8676002)(4326008)(36756003)(2906002)(6486002)(508600001)(316002)(2616005)(66556008)(6512007)(66946007)(66476007)(44832011)(107886003)(26005)(5660300002)(83380400001)(186003)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Po/nN0wJ3fdtF1Fhi8aO39IPADUWTyui68cTkgA2iP7zNj+HXVB6ZdZnqUOG?= =?us-ascii?Q?0KB8FdZAudLGaZjdfFwxo79Cq8K8xyxajhuTbttToQufEmcR56GMLSAEP9SZ?= =?us-ascii?Q?Qj+mrxrp46Q/Zc7HmMj8bUuDN80YgPfZr/5WgG/r++Y96Vy5TUMbLMuLxWmz?= =?us-ascii?Q?7x1vJwlx9QISJG0OCM43QQPMd7vB+5tgK0QiT+sKAAUTXe4UX8mvGMaxlUu6?= =?us-ascii?Q?lkbFmKM4hNHHE4C7fWlXXcGFOYquad0E7TBBb4cV+xSJD1UHoEv8lv87Sv8B?= =?us-ascii?Q?GKxmZJxjXjyE3iZ9tDJ6VfVqRjIcmkTInCYTqzMS7RdlF+GT7i6QvblHtrQu?= =?us-ascii?Q?ggSMpWoEOkQg3QtkeR3m9Xl53FSKoK3QJXMC7TC53YrDzl4ZU6PxyErngPrU?= =?us-ascii?Q?WjkMCD0C+m+fhD/KqooC8kKbHNbQm4/I4TFd5zsmRqZT0aBsSejbaqgFTcyY?= =?us-ascii?Q?gHfSJ39fsx/JJUusfEalneAmp7FdJ7Xt5Nwj918hMSxzbX85l0t1bmV0JFD6?= =?us-ascii?Q?eVqLNuSZ9FN4Tu7BAAz1RjnSCEAKn/iTLW13WuMGfMMNHxoPhT3VRaHc3kCX?= =?us-ascii?Q?Va53vdLbend9xpROj1z31yzpp8jpSK7/yR+Z9L/AdEyi73i6mnm6nrCWlfw3?= =?us-ascii?Q?/Cn7H0ZHnJrR+39NA4343GMQlKSYBLdVBdWHOMgJsARjoUknexbLRE+NsHqC?= =?us-ascii?Q?zHQEIGrAjpHESqHaM+2LkbGQI/aY2De/c/7lKFtQE7Z6/q0EuwdUPD+94UYW?= =?us-ascii?Q?+JeXakeLw5Fxc99SHhpnjVrekrtVnO776ZehjRILXY0HlfNM9Ewy8CfM2MJM?= =?us-ascii?Q?3u8jKRylahyA80S7FnU0F5q/OHN1JktlUEtWLOw4f20JNZHLlij1xkarzvF/?= =?us-ascii?Q?RQz/6wxxcAsxTh+2PfVKlO8Bxf0p8nyfMRjrDdPLGRo06dk7+E+WQcFrNPHm?= =?us-ascii?Q?l/O+8uyzrZ556j0vAJNC6SxfX/Pp6exlwPyNlGx7b9PQXqlCb90fV9kNStOi?= =?us-ascii?Q?soyhwA3UMfVT93kordgBonj+05+3Wg8lXXKp460w8tmpjEW5HW9NKaeFmU/g?= =?us-ascii?Q?lOGQc4TPTAggyvH5yPgkx6IxFEv7X50vPNGe+wAbQs9hzQq3H56XCsXXrV0Z?= =?us-ascii?Q?4orTig9lUToUaqbiyVkA1d6Uf3Lw9b/23Kx1Z70H/zH8oK3OZxS0v3jNM4hs?= =?us-ascii?Q?6grzE7fxyq22jadrUtCI9Hir7xQGWn++FkkDG5Ic3mgjMhiqC92GTfKmTRjp?= =?us-ascii?Q?7eCZMyZSZDbJrF+PthN2RrbdY4j5vEamyBqou4TK4cqg4br7WHe3Y4pNl0+S?= =?us-ascii?Q?xBlzeIVx5CUhCMXNxKm+ky3HRTFDeO1HywF5Nw1D0jrWTS4/VJuw6lkuDGY6?= =?us-ascii?Q?omOIpmabMthFvWay/aW/+0w0xQgdmDPdRoLBQHAShxYlx+bOcQpwdLpsZ4An?= =?us-ascii?Q?O1rmmjmvj4N5mhzkFJNJlrHDtWIg2LPn9d+UolZWvLPlkCsH2cxJKDmfDVsj?= =?us-ascii?Q?/i1hQJLEQRQyr0l2O1AfONLCq6tJSzk3/NOG7E72VlJu5Zki0cTm4WqTKbXy?= =?us-ascii?Q?ILArAydAK6muRNiD2s+9VIdk+cTkHzgmw3lZh/yIhbCkkPefavJ8zfkb3au+?= =?us-ascii?Q?vJBRX/bQ0caRE42tLIYtCN28mkmdfUmJVMau9OOS5Lbywg2K/mBLWJLIg2CF?= =?us-ascii?Q?JFaIjdpDzPFmdOoRzaU0fn6yuu9C1jnQKw4sS0IcBct104Bdqrs2By1VMneG?= =?us-ascii?Q?DC7EH/Genl7gDSa4PuY7qoEy1XLG10o=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdd9acc7-7579-43d9-6a9f-08da11532a5e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 07:10:11.9947 (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: CFSCGShfY0BMSBxL5gOAylPMceCjmqq7Bl8QQFGJqrcKK8Vy1vqYYHNj/avjjQLudipq4NPlzcP50wM77NzpXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6735 Content-Type: text/plain; charset="utf-8" This patch implements a new struct bpf_struct_ops, bpf_mptcp_sched_ops. Register and unregister the bpf scheduler in .reg and .unreg. This implementation is similar to BPF TCP CC. And some code in this patch is from bpf_tcp_ca.c Signed-off-by: Geliang Tang --- kernel/bpf/bpf_struct_ops_types.h | 4 ++ net/mptcp/bpf.c | 102 ++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/kernel/bpf/bpf_struct_ops_types.h b/kernel/bpf/bpf_struct_ops_= types.h index 5678a9ddf817..5a6b0c0d8d3d 100644 --- a/kernel/bpf/bpf_struct_ops_types.h +++ b/kernel/bpf/bpf_struct_ops_types.h @@ -8,5 +8,9 @@ BPF_STRUCT_OPS_TYPE(bpf_dummy_ops) #ifdef CONFIG_INET #include BPF_STRUCT_OPS_TYPE(tcp_congestion_ops) +#ifdef CONFIG_MPTCP +#include +BPF_STRUCT_OPS_TYPE(mptcp_sched_ops) +#endif #endif #endif diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 535602ba2582..647cb174d917 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -10,8 +10,110 @@ #define pr_fmt(fmt) "MPTCP: " fmt =20 #include +#include +#include +#include #include "protocol.h" =20 +extern struct bpf_struct_ops bpf_mptcp_sched_ops; +extern struct btf *btf_vmlinux; + +static u32 optional_ops[] =3D { + offsetof(struct mptcp_sched_ops, init), + offsetof(struct mptcp_sched_ops, release), + offsetof(struct mptcp_sched_ops, get_subflow), +}; + +static const struct bpf_func_proto * +bpf_mptcp_sched_get_func_proto(enum bpf_func_id func_id, + const struct bpf_prog *prog) +{ + return bpf_base_func_proto(func_id); +} + +static const struct bpf_verifier_ops bpf_mptcp_sched_verifier_ops =3D { + .get_func_proto =3D bpf_mptcp_sched_get_func_proto, + .is_valid_access =3D btf_ctx_access, + .btf_struct_access =3D btf_struct_access, +}; + +static int bpf_mptcp_sched_reg(void *kdata) +{ + return mptcp_register_scheduler(kdata); +} + +static void bpf_mptcp_sched_unreg(void *kdata) +{ + mptcp_unregister_scheduler(kdata); +} + +static int bpf_mptcp_sched_check_member(const struct btf_type *t, + const struct btf_member *member) +{ + return 0; +} + +static bool is_optional(u32 member_offset) +{ + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(optional_ops); i++) { + if (member_offset =3D=3D optional_ops[i]) + return true; + } + + return false; +} + +static int bpf_mptcp_sched_init_member(const struct btf_type *t, + const struct btf_member *member, + void *kdata, const void *udata) +{ + const struct mptcp_sched_ops *usched; + struct mptcp_sched_ops *sched; + int prog_fd; + u32 moff; + + usched =3D (const struct mptcp_sched_ops *)udata; + sched =3D (struct mptcp_sched_ops *)kdata; + + moff =3D __btf_member_bit_offset(t, member) / 8; + switch (moff) { + case offsetof(struct mptcp_sched_ops, name): + if (bpf_obj_name_cpy(sched->name, usched->name, + sizeof(sched->name)) <=3D 0) + return -EINVAL; + if (mptcp_sched_find(usched->name)) + return -EEXIST; + return 1; + } + + if (!btf_type_resolve_func_ptr(btf_vmlinux, member->type, NULL)) + return 0; + + /* Ensure bpf_prog is provided for compulsory func ptr */ + prog_fd =3D (int)(*(unsigned long *)(udata + moff)); + if (!prog_fd && !is_optional(moff)) + return -EINVAL; + + return 0; +} + +static int bpf_mptcp_sched_init(struct btf *btf) +{ + return 0; +} + +struct bpf_struct_ops bpf_mptcp_sched_ops =3D { + .verifier_ops =3D &bpf_mptcp_sched_verifier_ops, + .reg =3D bpf_mptcp_sched_reg, + .unreg =3D bpf_mptcp_sched_unreg, + .check_member =3D bpf_mptcp_sched_check_member, + .init_member =3D bpf_mptcp_sched_init_member, + .init =3D bpf_mptcp_sched_init, + .name =3D "mptcp_sched_ops", +}; + struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk) { if (sk && sk_fullsock(sk) && sk->sk_protocol =3D=3D IPPROTO_TCP && sk_is_= mptcp(sk)) --=20 2.34.1 From nobody Fri May 3 08:43:16 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp764597piq; Tue, 29 Mar 2022 00:10:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwz+kwaX/rNL8u/zpzpnQ3c8gWZvjfOEqixzF4G8vGo8tmdggfzY4nbzYabBtaa7ozJxYWw X-Received: by 2002:a05:6a00:849:b0:4fb:1112:c19f with SMTP id q9-20020a056a00084900b004fb1112c19fmr19894993pfk.74.1648537825397; Tue, 29 Mar 2022 00:10:25 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id u2-20020a632342000000b003863116c04csi16143623pgm.192.2022.03.29.00.10.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2022 00:10:25 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4517-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="M4Y/zMpY"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4517-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4517-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 sjc.edge.kernel.org (Postfix) with ESMTPS id 0E4953E0EA1 for ; Tue, 29 Mar 2022 07:10:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2BBC02103; Tue, 29 Mar 2022 07:10:24 +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 435F420FF for ; Tue, 29 Mar 2022 07:10:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648537820; 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=DwQo84Ioi3cWP7i56o3JEn1BeyJtDLKugLYuEqOUkFQ=; b=M4Y/zMpYEVQsLiq4/eDxEvYaUs3b+gysH2E4uQOVJ8Ye8MQYswXCzHergNhwIjzFi9XupD P5ADJOALMjneyWzWvH4MlAA4vapd578eHJMWKEx2KKgm+r/hRvPPitUSCDWQlDaUkrHMsc 5Q5y5MIzV6PRjC2TD65sHNl5lOVM8k0= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2177.outbound.protection.outlook.com [104.47.17.177]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-23-XaucOW8cMdCCGGgXQeJG0Q-1; Tue, 29 Mar 2022 09:10:19 +0200 X-MC-Unique: XaucOW8cMdCCGGgXQeJG0Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RdoXi5Up9C+PXi/0z/is7hn2AfdYVJhRHukYv22vin3er4UxXzaaJmk3aDfXkAThzZOqCN23VXl+92pnWuwV7CntSG3vctcd6GZyUlLV4aVh00QQmuSdpUJVOMfCXlmARvx1ddOGoP3gmQ0UCm8HkcGhF08zci3OoZ5Xkto5YsbIdWCdTks0QLnqTafdR+vkLTFL2VGFXyE5tWbNEEQISlfb7CNxZePoKHhIkDEigsZMrfRDOlxQZI638YPa1QJ0YuARN61ijMeJ+d4GebamWPilIVMSPSV0bjU0BCYCGtMEpIZpEPs01eLGU5aN9rfeQ9/sPS5H0oXydqH0L0lzLg== 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=N4KNt07m/ibxXdhnDHr1bnpr/qhcffA4QQpMG1/5N6s=; b=VM4O2DVDaPle2C4P/+nKo7FG5ql6B+4ODwMrF98BVa8/OFfCUjtnJIh8/KzlCW9mJWmBma8kJkd2NvXNNAdEUWrnc3XtqL7auBipWLxFpRtlpMQx3lKJ0EivRfmkyR8PCWY6o+4dF4zt+ZCZUWgnm5b+n3oUS4ZTdcfRBpb8GFWRlN2dlV2IPo1ZK7JfXlpPJgWlyxwcqlAFWCM8syVJ04s4vkv1xfAfLwN+AZ30QS8EMQkY7hFtEek/VMDASUpslQAp315WzX2kLLMrT1eVrQfjDgOeCzfDbr3XVz1GaMdrHq3fqD392Q+N6fWjjLkn0ZRoFMZiAb4bJwTiYO3Vkw== 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 VE1PR04MB6735.eurprd04.prod.outlook.com (2603:10a6:803:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.22; Tue, 29 Mar 2022 07:10:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 07:10:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: fw@strlen.de, Geliang Tang Subject: [PATCH mptcp-next v8 7/8] selftests: bpf: add bpf_first scheduler Date: Tue, 29 Mar 2022 15:09:26 +0800 Message-ID: <7643e229a68ece9ec5928fb1ab3c50e33e10d6a6.1648537203.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0102.apcprd03.prod.outlook.com (2603:1096:203:b0::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69e4c19a-ad96-49c5-2c24-08da11532e00 X-MS-TrafficTypeDiagnostic: VE1PR04MB6735: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: PWCo2JhXCuwqBG4HLyzDxa1rEsMz+WLROsAevHNI3p16QIybs+kVxWmmv+PW/0vQMd/tDtdpYMilzz7wlTVI25P6awP0yiqBOnNrunKeDWwYsczzSPYbjX5s6VjMrLQbwzCuWKHmG2Guw2dvqS+M4qyOvILMaITpiqHQoRetcESn0EHYwxiQVH5l3D/ODGeDqcAhHO6kYlSJ32U4kkV5y180+M2SUemsrzjfttJm7abl+EAORujaLyO9Heg054IaJpMIfZsO/87YpKcgaYDTBhzqHzsWy1IyqSQbhJBruZRfD8+J/lI2nGPmsnYwkGaw94l6E0x7MfPlQb2++4+7B338eBWQF5Xpe5g1jO2ZqfbTx6hbf9FIwLGn0c1zXMju/hYKrOxmtJ8Ya4u1N60ItQa0FFdClnTJDTCYxRTf44OjNAUylVUMRCTOvPb9+WiiS/ZBE0nOAd+6WLuAuMZE6Fxj8kpKc2mANVIjyPvUbRS5pM1xgvvT/Pps65jk44EjKjQotUbxB+JCACtJHx6/ge181QCs/VGJRIa78CexCRAlepkIZIPCeRuyNVx8s9/vu8WqKW/sRSrPDM5EdMk8zOracJrD5SsrsLanzwqAcOYDvV8E+FJyva9VA8gor3dcWW0jshWCdXfGdhXfvN5rWxrvQV8MYshSimR+2BVqnSs0hs8wiLg9HsoXik6QLC2dn5RkmFC/Jaw9xPyccoBViA== 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)(6506007)(6666004)(6916009)(86362001)(8936002)(8676002)(4326008)(36756003)(2906002)(6486002)(508600001)(316002)(2616005)(66556008)(6512007)(66946007)(66476007)(44832011)(107886003)(26005)(5660300002)(186003)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hojpgWGux7YVBbMwN155OYKS/k+Ql2CNFbXIX6JDq1jI85f9+r8Wri+xe53c?= =?us-ascii?Q?Jn3TxL5ihOHRcwZHYb244fgHaGFKdG3tkUhAkNicV8iKz3pfbmkBgeDEJZy3?= =?us-ascii?Q?utQRwkEagmahf5LbBasItBBDyqirbKKHPrveO8urEPQz1+VZ54EA0G9esg9f?= =?us-ascii?Q?7hMGQyuZeCqLVlkiLOjZM9P9Z1ZKNeWDp2DJtp+wxzYNli+3vYkXFd2NCfYl?= =?us-ascii?Q?DB8CFGebgInE7cPCbS/AbR8IXGIu/v/isHGE7uiQd32q6yELVnsI9F5gEiJK?= =?us-ascii?Q?S2egwEsktNY/6tCFoLTlZAEyfLOySeqm9UDvGPMPfsGt+/rNeYb8hcd6ICxO?= =?us-ascii?Q?BvZY6CSRuq7vv1lgbbeCL8AN9RNlqjDoD3WOuVtqTKPl7372N5+Akq6xLhlA?= =?us-ascii?Q?7qCOlSUkcCkO7YwAijixd9eoi0gSqGr81ZyH9dmvotuzbqJorZW7jj/ycHCw?= =?us-ascii?Q?vowmcU7PFvbt1P1rp3Eey8O5JzxRSjUMRjFprq9ZURDzqxYhlqPo5l/sKghr?= =?us-ascii?Q?t/BCP1I7++1vSQvBNwVTGD/MkMzQ7aif63CaiCkznO9RtdcQrQD/qHYFfJlD?= =?us-ascii?Q?uoApRWvBSk1yhsfhA58SuUosmuN6nz+BiAiadd2ikZEjGV2Nh/EW75FjH7QC?= =?us-ascii?Q?daKR+vVMSxqrbU2YbCeY6r5ESxx/jxxSjwXrL2F/dIfJdv8zzgnPGeLmrxPO?= =?us-ascii?Q?OeY2zC4sMGgpe01ry1vOnUDjwkK+EykieSgSPrVnZ6UTblo4kYDgcseR+pge?= =?us-ascii?Q?XYzNMOX/9ifzyM25YsBoK56u2sTTfcsXbh8CYTpr5JjfP0Rt8TUvBPoNer38?= =?us-ascii?Q?RQ4VAfq7xq3UfFCcFrVZKQoWWJy7Lm2B6YhBxSMbr06kbfblnsa2POrDXoid?= =?us-ascii?Q?XOIxPOMP3Htxa5z49uHc9RSGW5lwAJluHAhlj5PZAbXmRu6/r779cGrtKy0D?= =?us-ascii?Q?lL/xFxCrgLcU0r1LDW1UCitdX6oThit2dQ2Wo8Qp87jbfvyR3xqb86AM6ozg?= =?us-ascii?Q?IUbFAIwEypAf1yqaNTgyi5f8EFsfB7iGPnw4g6OUYVUH+yti0ZyqFPlMfquS?= =?us-ascii?Q?0EmcsWSjQf32LXnz4UsX6A4RgMrb4T+//ocpBXikvw9EXjtha85w8W28k20b?= =?us-ascii?Q?ce+Wb9/gIfuR76ks5+vGVhr35p2Ea0ja4RoRpqer7wxKOMvPK5QYgi83ONbU?= =?us-ascii?Q?3FS3DnznifLUAxp5Cv+RzMIRtml/cV7IBWgnNm17c28rAz3aUtdtHGCutjSr?= =?us-ascii?Q?JDCvx97bXKHgY5NSf8NA0ugUP8j7mBdCUP8o1ITuWe0zCHkUOPzzdISOpUGP?= =?us-ascii?Q?9rTpYH8NvSe1wVHwMtNYmVQ4xcPU5ip8/QZfJgFa4wP+6dnJJ2RY31MddkIG?= =?us-ascii?Q?jTLe130ohAqDAm2ctPpSOPRzo+LX3usfnllH8k162yr4WrGS/b21A0PoqKSF?= =?us-ascii?Q?4UXugjhPNuTUi93RZcKh1V0uTxuwZTjHfWx9K0O4Dl6/23bFfJflv7NapKy6?= =?us-ascii?Q?Ruo8q8IEx0BLHWOYYY9iWwl5BQ3N4zrx0joZXPUCHhocfsDpLs8IhRpoAyJw?= =?us-ascii?Q?Gqyv2OmJdhVTnjIb+k8sMbTHjxwp6Bpn2ZWwOFh4SF6RRRIDbhw/bLMc7QxO?= =?us-ascii?Q?jeCjCLdeHP2y3LyFg1VEn+RHQDBTOWN5gpGC9PRZG1JkpYjX9rDmhxMUf8Vx?= =?us-ascii?Q?0ZdzXybi/qiCpdzJnLcpNG2t1Jx0nJCaeZDTdpQf3MvLbS62jjoNYMqzkHo0?= =?us-ascii?Q?m93k4YDkfbvUxFRB1FwiMO0P1ZLUExE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69e4c19a-ad96-49c5-2c24-08da11532e00 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 07:10:18.1036 (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: nTTFGNRc07MHsuc8fKoYu9IMLOJvDm/qR81GrSeYFomB17bg9LZfJMnjo5P7tVQaI5FFD2TQ/KEvuONnhwehpw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6735 Content-Type: text/plain; charset="utf-8" This patch implements the simplest MPTCP scheduler, named bpf_first, which always picks the first subflow to send data. It's a sample of MPTCP BPF scheduler implementations. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 12 ++++++++ .../selftests/bpf/progs/mptcp_bpf_first.c | 30 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_first.c diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index f92357597e63..5bb21b24231f 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -197,6 +197,18 @@ struct tcp_congestion_ops { void *owner; }; =20 +#define MPTCP_SCHED_NAME_MAX 16 + +struct mptcp_sched_ops { + char name[MPTCP_SCHED_NAME_MAX]; + + void (*init)(struct mptcp_sock *msk); + void (*release)(struct mptcp_sock *msk); + + struct sock * (*get_subflow)(struct mptcp_sock *msk); + void *owner; +}; + #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b)) #define min_not_zero(x, y) ({ \ diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_first.c new file mode 100644 index 000000000000..3ae5c1eab5f5 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +SEC("struct_ops/mptcp_sched_first_init") +void BPF_PROG(mptcp_sched_first_init, struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_first_release") +void BPF_PROG(mptcp_sched_first_release, struct mptcp_sock *msk) +{ +} + +struct sock *BPF_STRUCT_OPS(bpf_first_get_subflow, struct mptcp_sock *msk) +{ + return msk->first; +} + +SEC(".struct_ops") +struct mptcp_sched_ops first =3D { + .init =3D (void *)mptcp_sched_first_init, + .release =3D (void *)mptcp_sched_first_release, + .get_subflow =3D (void *)bpf_first_get_subflow, + .name =3D "bpf_first", +}; --=20 2.34.1 From nobody Fri May 3 08:43:16 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp764695piq; Tue, 29 Mar 2022 00:10:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySmXhVu0ZViXPktNBkCMkcb4nNiHnEWHTFG83Y3MM5fBZNDA317dBTSjpDzn23qxPmeHO8 X-Received: by 2002:a05:6402:3452:b0:418:f963:42a3 with SMTP id l18-20020a056402345200b00418f96342a3mr2773446edc.12.1648537838233; Tue, 29 Mar 2022 00:10:38 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id v14-20020a056402348e00b0041998f14e58si18974584edc.468.2022.03.29.00.10.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Mar 2022 00:10:38 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4518-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=XDAW81p2; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4518-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4518-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 6F6101C08F4 for ; Tue, 29 Mar 2022 07:10:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 11C082103; Tue, 29 Mar 2022 07:10:35 +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 600D520FF for ; Tue, 29 Mar 2022 07:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1648537831; 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=BBnnxMsNIvMDz4Kz/K1v5EXx5ZLasSvdZFAEktJq+P4=; b=XDAW81p2iMXiIJWhCiYFFZkbeA4evtePbHq4+ppSGSH96yevNRWGgiq7T5OR8ViX21uLhN qn44gjraEY50+7hz/4R+SKczOg3gggIej+gCgdsb6DIHj0uXM3++2f45di2xc9iVPWjqjz TbQqPougxgdLbwYbw924gyTajofoFBI= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2177.outbound.protection.outlook.com [104.47.17.177]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-17-U_8E7-7PMSGv9x2LUXdBmQ-1; Tue, 29 Mar 2022 09:10:29 +0200 X-MC-Unique: U_8E7-7PMSGv9x2LUXdBmQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V92m9Fr8z8FqAyEJAm9N0zYeLCy+6llX8ct1k1aMDsf/OTEPTUkxO5adUYtbhaRH+yWqA0GDdU60kHP7KmYU0/fbyOl7eFUkm/vvJC1//+pbXFPN9AQ2yrgcf1fkXZBo5ZiNHN4nnKetwryI4jt7SNGUKGiyaedv145X99kTSCvcCG+IyrffonuDmBMdpi6Sorb1rUiK19zzyLzGK6/FG9G6OCiylgg66SafqWebPyuwUWqnNTV/L12CbK6/IwlpdppPgoCZyYQfuvOSBw8odoEPabcoe/qntYMPOEgOoBoEv+tnXpIPPnrCz2GGQm4iAW80BbxVFtahrVk2xSCLZQ== 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=CAjewwUghJ5yiB7iJ15vJjYmPz7q7hU4+Ycqr6tUtdo=; b=LU3CA2+uM+/vIxi5fyppuJQ3j7hGFQRfp+3QExZ3/YRn+hyUuGips7Cm5E+suqbPjWHtFrYPIp0LpXoRWyag1ITQkjQxIAnKMrnWJf7ZhiK3p+BTaQKgWMvRbjw5W3fq9H31oiqNV4nftCI2F2DEAY7bW41hZCggtrl6J4mywDa5t57CMBD06lkZ/QpotKV4tdaFxa4rY96IbpVIz0P1w2jbY5fB7SbkdcKv+LwYon1xGKQ8XdahZwGXMkg2gtqY2ZLbU10Ri2dn9JkS4KGW3IB0gLzQdQcS0KX+7XT1nakL0uEKwDpjek3QqfIvGe5pYrdYudFA1ZDJwCDUf1dYSA== 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 VE1PR04MB6735.eurprd04.prod.outlook.com (2603:10a6:803:124::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.22; Tue, 29 Mar 2022 07:10:24 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b110:cb51:e09f:bb05%6]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 07:10:24 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: fw@strlen.de, Geliang Tang Subject: [PATCH mptcp-next v8 8/8] selftests: bpf: add bpf_first test Date: Tue, 29 Mar 2022 15:09:27 +0800 Message-ID: <5ec49efb1dfd2777e779bf4362c6bbe67d89089c.1648537203.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR03CA0106.apcprd03.prod.outlook.com (2603:1096:203:b0::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e2864595-c3f9-485d-6055-08da115331d6 X-MS-TrafficTypeDiagnostic: VE1PR04MB6735: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: Tid1WuOt4Sd4fgggv6tKAWkZvOXNyfFhrHFZ0+Ufa/BvSztI1trNsuKYMugMVK01yhr56OiG/NkqLliKxsLC24Q2L40iHKVtzhcOU6q/ob4HJrZeo5L71Yd9E7VE1I1MvPiHVVUTc2we469bBvb7diL5iqj8bx0D82L2i5Ad9iYZz7ZeE2sKxHQ+kDGXsPDdmOK4hQ2ONYhQW0Hg4dD5qXrX8pDneOgpuWnXz37hRDWi2W/Pl/WaNTM6VpLPh6ZDq3C9x8z3fmhb/EIN4F5NmnExP/xrSpxJgjeI41p+c+XSBOz6/ORcebCJj8sPjlGREVJrHO3CDJvYyuJdhj/BIAhvH4FcFTy6poe28Qo/5eTN1kGWmo/BCqdZgWHA5P34odpSm4KgmgC8nSsoOD2+igqVZi5Vycj+QRcGWZ2WNl+izBHWwZSa7mcJK7k0p9nUByW4hKpER6ubojGmfwW4DKIm4fHwe7R0QeMcO3Bp/4Mj8vBz8PAOSbmLv6zykmZxeA5O67bp9QxAkstPmjbtkEarCyNGaoLbARBw/ZPFujbqqL6GYhseqSc0RuyQk9ODig+pJ2s6h/ZMOMiDhWyh0Br41ean96SKEaeo3qRlYYm6TuWO4fnfeakGM5w2puEPF964qee9S3dDmvu8x99hxi4XjNVYN28w0I7ASz22fpTSIPhLuuFOnx6nzq1Z6ytB 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)(6506007)(6916009)(86362001)(8936002)(8676002)(4326008)(36756003)(2906002)(6486002)(508600001)(316002)(2616005)(66556008)(6512007)(66946007)(66476007)(44832011)(107886003)(26005)(5660300002)(83380400001)(186003)(38100700002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pkCey8DCIJURV6PL9I8b6SzSg2WT10tlcf/1rs7KnnIey2kGHZ12RlGg5lTN?= =?us-ascii?Q?AbGfGf6euI6AldFPQNDqcB8IKt+we3M4Th6uskyMGL+x9vSMcjsGyWdrFReK?= =?us-ascii?Q?3Kpl7avsNEjOaDXq3ZJ4LqndKPBT/SdKFbX0r+FmWMk7fkszCdBRjTKlvbFh?= =?us-ascii?Q?Bs4a0oMscEkv0YPFe0Rhu92NKZsh0gupsknUieqCl2M50zkxc1xx8Ri1Qvil?= =?us-ascii?Q?MaPWx3IyHayTI50X6JNiWvAfp1YHLZLfx1z0MRiEK2FN6bTGEpXQpMiGnnCu?= =?us-ascii?Q?PfQFcEbdz5tx3YF/R/n05A289BmQyIm5zt1AHF+Mh1PNJFB3n//r5dqORJyN?= =?us-ascii?Q?ij0Ayo8ePH6w8OLT5bM5sapgzCvG6GYnkdPMydOt7GjglSLvYBHPYOJT53py?= =?us-ascii?Q?b7YCE8VCc7jpCny6DKU4jcUdHFgcR1IQ94dLhQRFN6qwNbQQDOtEgj8YYWWt?= =?us-ascii?Q?wKz2acFp8HjjlmT5lQO004hiX5qZIvtZ8ybqr2rluisqP+ZsUCTad5hjHLIc?= =?us-ascii?Q?epw+cJ/BH9Qmc7fcetu/LhptW8a2wzyLq6uQwxNrzQK3zNecUuanGk2E9XTn?= =?us-ascii?Q?Vslf/EMPr3KDh0sMf1+GQ66rgShDJqSsdWPg4CRelFoDlRB47HPmmsdyKW9y?= =?us-ascii?Q?TACqswPSjUIE5N7IcAXEwkdOEU0SIrfU539cmwIJBYRojp9CqJ+3oMqqXS+Z?= =?us-ascii?Q?fZGI0nrDkp9m1797RhzGQHZ03i0NdCmHyOXjlsT6c9i9l5Gg9Vergwi/2yR6?= =?us-ascii?Q?tIUpnlWwBPXJ7/YPjgdd6+WLznxOZ4IWON3enG1uCxZ4s+rpyyTUf2nsoVBQ?= =?us-ascii?Q?B9N6YT+BzclxpsjCUzFUW5ebDa7GB8PWnfQPW+Z4k0H7tfHZMwNOae8C1ah1?= =?us-ascii?Q?FnVMP7VGnFD9b8nCn2IfRBfBNI8eXM1QNHZI6Z/ZQB7TuCIaIwi/LZI3rDtk?= =?us-ascii?Q?j44JvE21byN6gsvgIn+FVT4tbhknpvchNYoWbjwoPnah8+xei1O9R/UXljKX?= =?us-ascii?Q?WySxQUpxTSosLh1QA43yThq9xbK2+XuzzQJ4VGOYeMaO35WxD1ngmIKh9Syx?= =?us-ascii?Q?GmBbTbE232tF5QJBnisgSIHCEymHoEJdF01FtUOzKfFi74keHiP2lB5ZzcNX?= =?us-ascii?Q?st4I0S6j0RCWwQzaHWUx8W1heOrAs1IdlNQiqM5zxO9rMX1Ruo0dw0rFxE27?= =?us-ascii?Q?TPIjQzcsecOMth/1yBf2xOeotlgADs7H2XBeFWFQXmJ+B9N3w8w0NdC3ixlB?= =?us-ascii?Q?2fq6UaGQH9Bx5IJPVW1bo7K16iKya1d1+b7l6+EIc7YQLYwp5tecnh4Z9yD4?= =?us-ascii?Q?2+RJl0aiBucl7wxecKvCM6M0cYWUoWaaBZd81LNrs1P29oCYotc/1mELZ/JM?= =?us-ascii?Q?bESSAdzqLch977He8wHuM+JBwYBPwIxHRhH4GO8GpLrxfs3rWu74wwGff8nC?= =?us-ascii?Q?wPG3wpxR3loqAiLP6TlLcK3IXSSzdzoYqQAvvqxe20HyhMcmKmSENWVRQefy?= =?us-ascii?Q?ZZB58XrwYk1wy3gRElYZRdN2M4Y17IuhdWQNbh0+++h27VUXpslRpjvYiq0y?= =?us-ascii?Q?XCgKnL3l9JmO0afw0GwQ1ZFEpch+7n80HLYUD9CYr+s4AWPy31DjJvkvZ5D7?= =?us-ascii?Q?O2lPEM/4zhaJWYABhr+72G38E4VWUE+Xg1LaXmZZr1yoFKS54IPYALnoXdKd?= =?us-ascii?Q?Wf+5okxlKKWNYYZKxSE35RsuLUxdvNgtKU0FxdIIspgZm8tEsT8tWr+oQJpg?= =?us-ascii?Q?s4qkq2Ag7xus+OLMP5Mtb/T0Gt9iwSI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2864595-c3f9-485d-6055-08da115331d6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 07:10:24.5249 (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: oL6A8RfZATK3fhHW3WaP6lco2IGy95FIF+zFDrutcjJmQYEGBw7FZBw8ENk03WWeRKOctqp9rJwZoQDidhhT/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB6735 Content-Type: text/plain; charset="utf-8" This patch expends the MPTCP test base to support MPTCP packet scheduler tests. Add the bpf_first scheduler test in it. Use sysctl to set net.mptcp.scheduler to use this sched. Some code in send_data() is from bpf_tcp_ca.c. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 9b73ef62ee74..715d1b2d6fce 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -4,6 +4,9 @@ #include #include "cgroup_helpers.h" #include "network_helpers.h" +#include "mptcp_bpf_first.skel.h" + +#define min(a, b) ((a) < (b) ? (a) : (b)) =20 #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -19,6 +22,8 @@ struct mptcp_storage { }; =20 static char monitor_log_path[64]; +static const unsigned int total_bytes =3D 10 * 1024 * 1024; +static int stop, duration; =20 static int verify_tsk(int map_fd, int client_fd) { @@ -251,8 +256,117 @@ void test_base(void) close(cgroup_fd); } =20 +static void *server(void *arg) +{ + int lfd =3D (int)(long)arg, err =3D 0, fd; + ssize_t nr_sent =3D 0, bytes =3D 0; + char batch[1500]; + + fd =3D accept(lfd, NULL, NULL); + while (fd =3D=3D -1) { + if (errno =3D=3D EINTR) + continue; + err =3D -errno; + goto done; + } + + if (settimeo(fd, 0)) { + err =3D -errno; + goto done; + } + + while (bytes < total_bytes && !READ_ONCE(stop)) { + nr_sent =3D send(fd, &batch, + min(total_bytes - bytes, sizeof(batch)), 0); + if (nr_sent =3D=3D -1 && errno =3D=3D EINTR) + continue; + if (nr_sent =3D=3D -1) { + err =3D -errno; + break; + } + bytes +=3D nr_sent; + } + + CHECK(bytes !=3D total_bytes, "send", "%zd !=3D %u nr_sent:%zd errno:%d\n= ", + bytes, total_bytes, nr_sent, errno); + +done: + if (fd >=3D 0) + close(fd); + if (err) { + WRITE_ONCE(stop, 1); + return ERR_PTR(err); + } + return NULL; +} + +static void send_data(int lfd, int fd) +{ + ssize_t nr_recv =3D 0, bytes =3D 0; + pthread_t srv_thread; + void *thread_ret; + char batch[1500]; + int err; + + WRITE_ONCE(stop, 0); + + err =3D pthread_create(&srv_thread, NULL, server, (void *)(long)lfd); + if (CHECK(err !=3D 0, "pthread_create", "err:%d errno:%d\n", err, errno)) + return; + + /* recv total_bytes */ + while (bytes < total_bytes && !READ_ONCE(stop)) { + nr_recv =3D recv(fd, &batch, + min(total_bytes - bytes, sizeof(batch)), 0); + if (nr_recv =3D=3D -1 && errno =3D=3D EINTR) + continue; + if (nr_recv =3D=3D -1) + break; + bytes +=3D nr_recv; + } + + CHECK(bytes !=3D total_bytes, "recv", "%zd !=3D %u nr_recv:%zd errno:%d\n= ", + bytes, total_bytes, nr_recv, errno); + + WRITE_ONCE(stop, 1); + + pthread_join(srv_thread, &thread_ret); + CHECK(IS_ERR(thread_ret), "pthread_join", "thread_ret:%ld", + PTR_ERR(thread_ret)); +} + +static void test_first(void) +{ + struct mptcp_bpf_first *first_skel; + int server_fd, client_fd; + struct bpf_link *link; + + first_skel =3D mptcp_bpf_first__open_and_load(); + if (CHECK(!first_skel, "bpf_first__open_and_load", "failed\n")) + return; + + link =3D bpf_map__attach_struct_ops(first_skel->maps.first); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_first__destroy(first_skel); + return; + } + + system("sysctl -q net.mptcp.scheduler=3Dbpf_first"); + server_fd =3D start_mptcp_server(AF_INET, NULL, 0, 0); + client_fd =3D connect_to_mptcp_fd(server_fd, 0); + + send_data(server_fd, client_fd); + + close(client_fd); + close(server_fd); + bpf_link__destroy(link); + mptcp_bpf_first__destroy(first_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) test_base(); + if (test__start_subtest("first")) + test_first(); } --=20 2.34.1