From nobody Sat May 4 05:26:20 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp36872piq; Tue, 5 Apr 2022 00:53:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrH2+CKUpstlpffQpTYCYedjzSQUppTTJiDFKKYtYWY8i6uqpgEj/O3uTVs8BONOE8okrO X-Received: by 2002:a17:907:1c0a:b0:6da:7ac4:5349 with SMTP id nc10-20020a1709071c0a00b006da7ac45349mr2186416ejc.596.1649145208430; Tue, 05 Apr 2022 00:53:28 -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 w7-20020a509d87000000b00419014273b3si8539107ede.354.2022.04.05.00.53.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 00:53:28 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4605-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=S5x2uuB5; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4605-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4605-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 9EAD61C0966 for ; Tue, 5 Apr 2022 07:53:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2F8A715D8; Tue, 5 Apr 2022 07:53:25 +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 543D115A5 for ; Tue, 5 Apr 2022 07:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1649145201; 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=GXHnfk6jl8tltEx2mXHub9NIDIzZS9CY+kFvWCi5BCs=; b=S5x2uuB5KblI0SNcCwtx/dKCPJC88zgZl1uwzOEI3RCY7jAC6pBKSmhXpto7GIGEUCVEp9 RnZmNI2ZaJp8FMe3zFpt1RRpHBHUec7Z5QsiKw0FVfJ7g+5bvJAf8j0XjAot5cB9yjWUvz fMgjlE6RvAVwl/7QlFqWuU9tnHSid9k= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2054.outbound.protection.outlook.com [104.47.4.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-35-f7ocY5IOMWOy7vvBcEnP0Q-1; Tue, 05 Apr 2022 09:53:20 +0200 X-MC-Unique: f7ocY5IOMWOy7vvBcEnP0Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CE+Jw3rh/MKplcDr4X0T4Elx+E5PzCI94W2P79cxOH96PlWG9XpS+ekwlV7JpgJvfBslZRzwQLv8qnBqDLMFNdy06xvAxBLzH06Xk6a/yjB4cRJx2PjV1wrIHZt9xymstGq+yIWV+A9puVzqx4KgzGt+HIOV46gX72ClBbvY11HYJD6u9gZkY8mJS+M3s6KHLSnXyVQ+Ioc3fYN+MCJ4wf4juYMcnPQw9bee3ELgu+0qHhtuDaPRWNcAhJkkR6S4UD16dcCoHXh2mY+CLBabUsbgN/XkYEqWYTInAVzcD+53pIcPFpR+x5NqGtyI++7XkwfiJKznG5vkACZlbrH3tw== 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=lY1WrxNdyKdyBNAdwl0Kf3PherxKbSzr/pimqbWs7vM=; b=gZ90iXUxitL9qMIYzd0UnnC59Ot5ib2iI8gmCqtmZVO93NbOwnfko2JJpWFNEmEKTx0pn3a3atLeY2u6yu48I0ikIPa0NoUJk/yvDLIB6i2Ot5NdEMHsha6WrUZx2D94XB7HxLwUJ0U5ZNl7XqoZ1Y248kBw1lJCjzBfCic17yYt7OhDOChfvSnVuSz22+uZg+NO8Ks3UbpSMSG53OrNKGgnbHl+s0gyL3z6rF6n3HU5XTIQN9fySWfZhHOlNdwzSbjg6nFBU2B2Rsh3B6vU5K+k8FsL9OaUC59IKnPySQ2oDfRpqbYqzxpPU4k2WJPoeNbIj1k6yVx3c1iCYxZy7g== 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 AM6PR04MB4950.eurprd04.prod.outlook.com (2603:10a6:20b:2::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Tue, 5 Apr 2022 07:53:19 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5123.031; Tue, 5 Apr 2022 07:53:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 1/3] mptcp: add get_next_subflow helper Date: Tue, 5 Apr 2022 15:53:19 +0800 Message-ID: <24b32ee79efcf62f10328b8832f60f4dabe7d18f.1649144853.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0101.jpnprd01.prod.outlook.com (2603:1096:404:2a::17) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 17cc8f8c-7995-4dcc-d41a-08da16d959a1 X-MS-TrafficTypeDiagnostic: AM6PR04MB4950: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: PqmyrblLhwI4p+WeB8b6RUgpTVJmPUGeAJA+FPfB6vyKYJEVH2Vrj4B0ofU/gTPXsfv7d2WXxpof4nGeKBnJ1p1Yh7Br38SyOdgwBZUHcUW30STqT20+Ao/57LGYx0z3L14AMHpqLGT+q9tMP5+vSsoq9Gfw6kYuFX5C2Oc07zV0B2Uw/xjT6iAa92VEmHvFLKItA31q1107Ce7kGtpKQgoVJ6dHMI2cK9rW4hX45jLbuebuUxPW7DwMGNVeRn8ZHQPlWr2YGVhrZPl/IoyAxvIFO8+OXg+W8UXYM6Idpdk7/wgysjA+e5H9JChbcZSkSwH4uxc2dNv9Gdu5m65xXgakOMI3sC/Rl3NGWrp56zdWCUQHwzHZqwdaVBjikP19yIEVfyQV3ycg5sRaHAByROdLjKtkM1LUZ2rLjNRE+89QwMfP10K+Ap97pGaCgVW7+HJ36cpqDEaK2c24VYN/aIxmuc7Swx1tCO4ZfpWHb7JkfcvJw/coKUrMtrHdKq7DKO9fvjm0gKdVJCPKj+MkaV6S4B3Inj6ed65IZ4lksGC4hwPHEKxbeZsv9eFa5s4edESMjakbgTBtdH92VFxyzmN9l1SpUxTtuEo5aDTKgHz7C6N4+BkgWTIMpDnOdsx+xtvJDhY2xmd8QeU3xNHf9KpaHfT7rq99tuuAMxzdS4HL4W/aPhi8L5LYBOb+AUotGbxPL0LLxrsu2W58hddlHw== 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)(107886003)(6506007)(2616005)(4326008)(66476007)(8936002)(86362001)(66946007)(66556008)(8676002)(2906002)(5660300002)(186003)(6916009)(26005)(6486002)(44832011)(508600001)(316002)(38100700002)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3IkWr6U7DcdYy4TZCnK34F1jbRmZxGi2cMR6KOpNRYqJmlZHXG7T+gqnm77d?= =?us-ascii?Q?LtSdNgE/4klgeqkUu1CHL4RTSeWbUAInmGVsgGYzxDi17fHHlOlo+B4tzrfs?= =?us-ascii?Q?YiyV04sskrlV7w+FxWvUo8SEf7Q4ttbkot3zq7GKzCIq01vqfFTTQdy8sUn1?= =?us-ascii?Q?C7t8pQWPpLRyKzcNDwqGsfcQlMVFnSBM8x+fZipiB5qRMWCKNVgOgrphJXcQ?= =?us-ascii?Q?aYAwhVqyg87Xizizr/kmQzMuRNAC+R03tkI1qZg2R5OZLZ5t9gJXi3XvDD6H?= =?us-ascii?Q?gl6eNIbVRBvJYIQmTQ7SCKwyyYE2XTeMUbSHPsx36Mh0T+U86hrfPtm13zcT?= =?us-ascii?Q?Rq8vOM8bsJJBYmDJQ3G4IZWVdp8cVWRYSlU4NoZaZ3NdNUh2uTRfvdJAB8mR?= =?us-ascii?Q?84fmzIUlqVcLTWK4iLGPiE97QFZ0qbKFUrZQXrvQq0hDiFMOQY3qLJGVxlsM?= =?us-ascii?Q?uvipO3Uzobcqe/PZR0xhhqPUeGbDbdy6PZyCnYV3Rk/cjOCZASgwc0cGSHzu?= =?us-ascii?Q?VM47KHa6aJOW0iUucFg153rWxXYgBMNJA4tGPihDCbAsTdK8MJ94zofFfPzJ?= =?us-ascii?Q?OJp2OGAzbyUPuDKMlydQn4KLQYDSE42cHfT+xguBqUbsxYcojGOfANELBL4p?= =?us-ascii?Q?L8soV1awUCsO6FL4fx0ovFXH7dCzdZc08biHAM8+M3AZAbMQjfpG4RfbRrle?= =?us-ascii?Q?uROeW3OEGP0zxb+8EAq287rQ74uBMFiSaBNxqM9uQdes73sFLwazXk8Yi3kC?= =?us-ascii?Q?tdV+j4xmyIm2hPi0qZfgRbuB7IVZtKt2xjSxHNHaF6I9ry2IwmIWyqJHYLml?= =?us-ascii?Q?KbyJLGBSY+0IC+hr/34LxFuU98s993jVSmq1V1FeyhBqZ9XcAbjgvXl6BL1j?= =?us-ascii?Q?5UEqYb0zZSNJ5QIFsJIwcHpImlPt391rr7Kt1iEHUXxUV3KpIeZVNW/Iw/Aq?= =?us-ascii?Q?11106wgTmAQiZ3MjZ96bjKntSDb/h6p5SHQfu+7Ss+zIYpZ7fJ48jjGSxoI7?= =?us-ascii?Q?AlIg+f1as4U8zD90eVS5UshDuFF8K8oKqB9WKd4j7t+yhJDPESZ3BShRgj/z?= =?us-ascii?Q?cyFSKM+a5LpVSOA4veTo53Y4uC2uO3EIqnUCPzixvIsHg2NOj+9Texcdpyoh?= =?us-ascii?Q?fSXQwoJSNwVtHpeYQFQwNropqnUkm+nSiRrX0/M3q8i8FIRcMHJPV5ZRsc+C?= =?us-ascii?Q?Q7vBoKS+452rQl+NDCr2mvPpVuXNUM63cuEBGQeL93YUgBfz+E1L+ahTH+Gh?= =?us-ascii?Q?G60gAlO7rLIMMVjLyHyxF+/ceq7R4pJfQw9sN5aHu8EowQMO2By1mC0+KmE/?= =?us-ascii?Q?Z94JWA3RKtiU0GACGUsoaKzuHdKpGiFzdWLdKGVq+4LCJoN8Cd0v7V4QTgIY?= =?us-ascii?Q?K18furun7RQK4fiHHFq/CTtiasesD3EC+woMPj07l9u2sgzZw8VqH0X5ioyS?= =?us-ascii?Q?0w1/9GzLfT/4XDaSuTRe0OPlzdfxKAgMXdUG0Ri9stzlhUcndNSU63+rcdWc?= =?us-ascii?Q?EkJnzMaz2/AK4B/TDx0qBQNlLJnmgQLNWsTs2SQl7Ek7n0KIcrbWkdmmCCTY?= =?us-ascii?Q?l35Z1tLhABEZzrm4b2qCz7DVFrADgopUKD/NjZxi57XdXmHAF7SYCPLjX8v3?= =?us-ascii?Q?9kOrui51jt0ogfxVaCFdFhK5RFTbMZLMvxo0/NwS48wf0ZYFnRWKLhmFsWND?= =?us-ascii?Q?j939jpSrnm2T8CEL2YBsYEBqJu8VxU1rE6VnuSPF7EItO40QusN1ubTgeg/9?= =?us-ascii?Q?ex2rMza8/xMdwxWpk3p/kAJLPY+nfZY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17cc8f8c-7995-4dcc-d41a-08da16d959a1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 07:53:19.7119 (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: PjYdKyRdGlSgrAWhsohpd6IImfsN5Do5YjNs0BQNvyEL4dlcnKc8wxOiSEvyU9PLgTh24APQH4J1U0xr7pcqJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4950 Content-Type: text/plain; charset="utf-8" This patch implements a new helper bpf_mptcp_get_next_subflow() to get the next available subflow of msk. Register this helper in bpf_mptcp_sched_kfunc_init() to make sure it can be invoked from the BPF context. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index a3c41c079fe4..94671d5e80d1 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -114,6 +114,22 @@ struct bpf_struct_ops bpf_mptcp_sched_ops =3D { .name =3D "mptcp_sched_ops", }; =20 +BTF_SET_START(bpf_mptcp_sched_kfunc_ids) +BTF_ID(func, bpf_mptcp_get_next_subflow) +BTF_SET_END(bpf_mptcp_sched_kfunc_ids) + +static const struct btf_kfunc_id_set bpf_mptcp_sched_kfunc_set =3D { + .owner =3D THIS_MODULE, + .check_set =3D &bpf_mptcp_sched_kfunc_ids, +}; + +static int __init bpf_mptcp_sched_kfunc_init(void) +{ + return register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS, + &bpf_mptcp_sched_kfunc_set); +} +late_initcall(bpf_mptcp_sched_kfunc_init); + 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)) @@ -122,3 +138,21 @@ struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct = sock *sk) return NULL; } EXPORT_SYMBOL(bpf_mptcp_sock_from_subflow); + +struct mptcp_subflow_context *bpf_mptcp_get_next_subflow(struct mptcp_sock= *msk) +{ + struct mptcp_subflow_context *subflow, *next; + + next =3D list_first_entry_or_null(&msk->conn_list, typeof(*subflow), node= ); + mptcp_for_each_subflow(msk, subflow) { + if (msk->last_snd && subflow->tcp_sock =3D=3D msk->last_snd) { + if (!list_is_last(&subflow->node, &msk->conn_list)) { + next =3D list_next_entry(subflow, node); + break; + } + } + } + + return next; +} +EXPORT_SYMBOL(bpf_mptcp_get_next_subflow); --=20 2.34.1 From nobody Sat May 4 05:26:20 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp36904piq; Tue, 5 Apr 2022 00:53:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyirOIctRvTDTdU/Nt5cIZcvjokSGORMVlcQ4SVYod7Z3c8wFsU69GOSZcFDmY2CE48AvdI X-Received: by 2002:a17:903:1d1:b0:154:61ec:749b with SMTP id e17-20020a17090301d100b0015461ec749bmr2264173plh.52.1649145216267; Tue, 05 Apr 2022 00:53:36 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id e19-20020a635013000000b003991d7d27c9si5610400pgb.865.2022.04.05.00.53.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 00:53:36 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4606-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=XJsvbw2d; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4606-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4606-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 0106A3E0E4F for ; Tue, 5 Apr 2022 07:53:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E501415D8; Tue, 5 Apr 2022 07:53:34 +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 303C615A5 for ; Tue, 5 Apr 2022 07:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1649145211; 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=mPYZIgeeGh3Jsu16ptEas1eiGVhJlV8x1PzOtKjsGb4=; b=XJsvbw2dCJSUYXbkPHAKO+TZ7nHy3hSeki7bn61emdxsCVQzb1ScAftYSrJmo3e3APrB68 5t8Poq0A3RNqncli3UvHy+N8q6u5HCfwHdRH3VlyvTD/vAO8+iRPx5JZchvDKu/MvTqEdd aCB7lqG50977SZ92mEvyNPbb65OSnZ8= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2059.outbound.protection.outlook.com [104.47.4.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-29-SXMks8gxO-aN-QG6GypFKg-1; Tue, 05 Apr 2022 09:53:30 +0200 X-MC-Unique: SXMks8gxO-aN-QG6GypFKg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KKGbBwoQdmtVBqLKIsFXANHs5gvzgJSf9VqsS/PKn7rDtAVh4h43l2Ba6wVZfvJLBbS6dhliBZXeLH/MfcV9kCLzTcCi79NJupQ05H2qopsNYNoXVmts3IueO+osqUw8+IJI5zXNCH2/6dHsey9+5hlBhCjLgNyPOiRRJVf2pqBvEVqUAROne2+lkuG77kPUzo0cJ09kK8zxTVB+k7VIHYUGxF27pwJw1hgx4ZjEIlbcKXoMM6Sr1fxmQwhBW/11+HKPHN2drbBg8poq+0wLmjKPf0KR4pQVNN8TVH4hdbNQ+s2LNJYKthxmdYSagW/+O0vHb2IRDlG4dUbJ0bRJOA== 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=H58i5Ml5vGEYCG9ssbsYP5F+EhrCZ/SVuUksjLT1Ldk=; b=UPP+yt4767k8WKmK0BH4sYCPBZSFMeOu/9tvu63qrQec9z+ST3y4k05U8s1bxALPku7FMWOCQlKOrXJQZo/t38Amj+zJD2nR9fSYMAWsleg5XVqHGSeBNEwfFr32oVYrMRG0+b6uN00haEmB2bthnnBhQzJotQuEiAMIlpgDtLCDwDNOMngX2HJWD4CCg8PTI3W2NfzDX9HMVRrsS0/PCpOn6yQ3vi9baUjpyyEZZ+MXYKKlUwtucaZiKEdFtA3L92outbwvo8M0g/N8fe99DyPO2yTJF+aDTclodEXqdqUQMbvWO3n8/BoJcHhJEIE4aUzaNiCo7xCO9GY3tVMV8A== 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 AM6PR04MB4950.eurprd04.prod.outlook.com (2603:10a6:20b:2::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Tue, 5 Apr 2022 07:53:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5123.031; Tue, 5 Apr 2022 07:53:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 2/3] selftests: bpf: add bpf_rr scheduler Date: Tue, 5 Apr 2022 15:53:20 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0104.jpnprd01.prod.outlook.com (2603:1096:404:2a::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed99988a-1b30-4871-27da-08da16d95f25 X-MS-TrafficTypeDiagnostic: AM6PR04MB4950: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: z/4eUvLVmJ7aC+KSa/mnUOmLXpJqG7IA+O+DdEoC33zpiU7/jIBMMoVXiWzXtvGcQoZmkuTRSLh6gPvDtGY82rnmc9K1tojPWrNvGysNvl+wrqgYaI8h73P6XU+FHt0gEIbyOxPXMsKQlXUUSGYbwYqlwiQNhMVXgovFZB67+wnN7exCdB7QSjDfq3FB5xvvB0btB7CCQVQ7M3t5A5Ag5DGiPa/2HAaCo7y2USC5qGzOILW8pmHnXigTb2Z711974CZOl/d7P/+dGjVJhssJLPTm/bp5lXEk/M5/hJzbx3xpF/LkP49cmDVrP2wV7FlCiajEAHD35Rg/JfGpkgSPzR4S1+eE3hPohLOkD7576rCR8mB5PL426pg4XdRDKtVKWALuoDG7TzXXWf/8NVfTcjt1RfT7oQ2aWd9YSSeLdQflsyhF5gzvG7K+2pWosANGqs7dTRMHK/odn29zVZ+akvzXAar+hNHYM8ShUIq5oDrx72FReyj6owoWzNXtwjDU7ixNo1Rm7Ut6Z+BEOivhN4N+r7QW9IqTGFwOrKZ3jCNVztY/NYL0yQviOj7BQMFT1ydTlR0mEHUrJfczJU/sz7JoUbFyK005XXBXfRgGVXJe9mG0t5RlJj1yHWXBUfzd8zd9I58+SNGdx1xXoiAXcoKxD9reUy4Wq2vbCEEdB/Fer+XU5ZeC3+CbeT+g/6QYWMtqkho0EkX7Os/EFsJIYQ== 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)(107886003)(6506007)(2616005)(4326008)(66476007)(8936002)(86362001)(66946007)(66556008)(8676002)(2906002)(5660300002)(186003)(6916009)(26005)(6666004)(6486002)(44832011)(83380400001)(508600001)(316002)(38100700002)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Jqr3cZ+b5nqCdMlpDUsRSdbq2Rk1NN0fGLrv0X9aXmJTEA9rJLPnWSAOvHoo?= =?us-ascii?Q?fDKcGau8lnps+OZBbvhhJgXFC/LQu4mfha0nur3Eg9QfcLAGkwmDi0caVYZB?= =?us-ascii?Q?7Ldkr6DjtJMAijXgCMgK0Debsw2Kqik5nZ4iOGBoJSSxWOan1/aJXYYlSYEh?= =?us-ascii?Q?QxAmhCYngWc7iYJnf8izjaZvffy9YXAI+KWWwHBSeTJ8uujjJGFJynhg0Ith?= =?us-ascii?Q?MHRE0Y5Iv1zi9UEkACF+EpuVFcugwMoGmURAxkWb4XhAvoXFAzKjoGgoTCcJ?= =?us-ascii?Q?0+5ei54ZaDKXPCEWhHtfwlK9MVDC9f5hSAYSgju6/ah1ip3g9iD8p50t0TTB?= =?us-ascii?Q?nzSmcCjncoaSsJByxPUk+Cgic7QvreMWs9+j8gHX2nK84JpfwIrMErhuxJ8f?= =?us-ascii?Q?ZkWwHTwtYoErhZRWCEm0YiI//QP1Fb0hUBR2aN22v0HnFZCmYcWIjdzfA0Uz?= =?us-ascii?Q?TAdEOibWifzmmOJRgnCWfxWI+EjqdZDipoLjgFzJ6+lJn0Wk0FnziDpSNDHj?= =?us-ascii?Q?fNPIEbdGlUUmtoOQOLB43waHiQ9nIUDYrenG+Gm9FXIE5iWH3LulYuuMHX1v?= =?us-ascii?Q?IwG+hRJcdp5bkV/dtYhffHmfYrYxYJKdmX+ZuavMDjz2+m8PWyG5a25SUJXn?= =?us-ascii?Q?wdiMv50jtMhtYhGkhV56lf0+0L/Xc0zflSW1l0iPJz8seWRqJy86EGJr39iY?= =?us-ascii?Q?gFrZJAhI0Zds2f31E1DSlTHGHPzl/jmvsNfJFvcNSt4Reoo3EiD7mYhyq8uH?= =?us-ascii?Q?ggwsZ1RbrUo+wRvuqeR4w3L5DsX7ryKE9mXYc8OwGldE0MpNV0A9g8CiYw7h?= =?us-ascii?Q?fEifjkSCM1p303DJrv00TbnOT2zOAAMVzzemadrtoXCB0mTYY6xbFFVENXBj?= =?us-ascii?Q?yL17WohvNCeKvV2lo2mXlYKtC1RSmtRuItjTiZJsW07kORgA+JeqN03yZxnZ?= =?us-ascii?Q?HmDB35dErSes9IDwvFdWlGAQGkMDZoYl0HWSJ1I06/UyjpIEVit+Do0fLoZr?= =?us-ascii?Q?9IurD1ldsWALuR2rQBRtjl4cU2wGDpcAh9Bjbik3i3pwbRDq9SV62x4NbqoV?= =?us-ascii?Q?ksMK7vLAriwc3SE6X5K1n4AtcCmId5LGQtvt50SMMIIOtPXRRVIatRUysyWa?= =?us-ascii?Q?wa1bgR1X43Lpt+fPBv+2fSDWdC4rcXcoOiCP+2gTrYkOeOGRqU/FQY3B5wia?= =?us-ascii?Q?A0q8yvXnC7IypHXlOtknZQB3YsJLM1Lzy/gPZr6ZFA4QEmAUC+5tXhaE7go6?= =?us-ascii?Q?ri19bEUe5wcKCr1JvIyf+dE8KNTljXRrc31630UpdMq2SxOz/dm8luATR42s?= =?us-ascii?Q?wdJJGHCrrn0q3DlzgO9Al6t5uoyiDxyqfi6z30wrKaEVGFYE2+vxdbrJtA0K?= =?us-ascii?Q?nbbf93sYpFPB2KKY574wk+QEax7F1zcFZ6/QYIWbpES2MVkaFhcG//+F0oAK?= =?us-ascii?Q?vsUufqNFg+R1I9xATwFxrnVLMlKqHnFs97/MB2IYeZwQ6kV4GuTIyc4hkz+9?= =?us-ascii?Q?qmJnAeqUyvsqHzRiKDWcnQ/JOcHkYSfE/YwOL01nmNJuFHIghaW1ZS05R08a?= =?us-ascii?Q?8vyK6iN6JhiHB0ISIyvZ0XmOzCHEhzRBIhQA8aSVE2TGfqXKz2FHw4TYZDd6?= =?us-ascii?Q?tucH3oTMs3RiXpuc+zB7uSyEcjvaO2inSrUdkvHdNE/DmV69tEU6mBgRPWyA?= =?us-ascii?Q?WNhfes4mZkbdi9XqPAdzX1B4UIJcEEx/BZQAEKuOfEF4KeLgeGg3R2nGcVLv?= =?us-ascii?Q?c80zTJR63+Lkih9psae4IxgPfmIMpj0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed99988a-1b30-4871-27da-08da16d95f25 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 07:53:28.9612 (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: t5x43Dct53VL+DE+hsyOnxTc/rZWeUq42jAXwQHJmUTeHQMAnCEllUPCpz8fLySEXYE99utwSzBABIx7GsFJtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4950 Content-Type: text/plain; charset="utf-8" This patch implements the round-robin BPF MPTCP scheduler, named bpf_rr, which always picks the next available subflow to send data. If no such next subflow available, picks the first one. Use the helper bpf_mptcp_get_next_subflow() to get the next available subflow. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/bpf_mptcp_helpers.h | 27 ++++++++++++ .../selftests/bpf/progs/mptcp_bpf_rr.c | 42 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testin= g/selftests/bpf/bpf_mptcp_helpers.h index 5135eb6710e8..972fd2e56ed4 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -26,4 +26,31 @@ struct mptcp_sched_ops { void *owner; }; =20 +struct mptcp_subflow_context { + __u32 token; + __u32 request_mptcp : 1, /* send MP_CAPABLE */ + request_join : 1, /* send MP_JOIN */ + request_bkup : 1, + mp_capable : 1, /* remote is MPTCP capable */ + mp_join : 1, /* remote is JOINing */ + fully_established : 1, /* path validated */ + pm_notified : 1, /* PM hook called for established status */ + conn_finished : 1, + map_valid : 1, + map_csum_reqd : 1, + map_data_fin : 1, + mpc_map : 1, + backup : 1, + send_mp_prio : 1, + send_mp_fail : 1, + send_fastclose : 1, + send_infinite_map : 1, + rx_eof : 1, + can_ack : 1, /* only after processing the remote a key */ + disposable : 1, /* ctx can be free at ulp release time */ + stale : 1, /* unable to snd/rcv data, do not use for xmit */ + local_id_valid : 1; /* local_id is correctly initialized */ + struct sock *tcp_sock; /* tcp sk backpointer */ +} __attribute__((preserve_access_index)); + #endif diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testi= ng/selftests/bpf/progs/mptcp_bpf_rr.c new file mode 100644 index 000000000000..0d0f639c8745 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2022, SUSE. */ + +#include +#include +#include +#include "bpf_mptcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +extern struct mptcp_subflow_context * +bpf_mptcp_get_next_subflow(struct mptcp_sock *msk) __ksym; + +SEC("struct_ops/mptcp_sched_rr_init") +void BPF_PROG(mptcp_sched_rr_init, struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_rr_release") +void BPF_PROG(mptcp_sched_rr_release, struct mptcp_sock *msk) +{ +} + +struct sock *BPF_STRUCT_OPS(bpf_rr_get_subflow, struct mptcp_sock *msk) +{ + struct mptcp_subflow_context *subflow; + struct sock *ssk =3D msk->first; + + subflow =3D bpf_mptcp_get_next_subflow(msk); + if (subflow) + ssk =3D subflow->tcp_sock; + + return ssk; +} + +SEC(".struct_ops") +struct mptcp_sched_ops rr =3D { + .init =3D (void *)mptcp_sched_rr_init, + .release =3D (void *)mptcp_sched_rr_release, + .get_subflow =3D (void *)bpf_rr_get_subflow, + .name =3D "bpf_rr", +}; --=20 2.34.1 From nobody Sat May 4 05:26:20 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp36961piq; Tue, 5 Apr 2022 00:53:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaXMKkITyHZevhZWXmmfjytuk3PpdPhOreoYgxSaPxElDXrroOP4k6fvl7crX6epPgCWvN X-Received: by 2002:a17:907:2cc4:b0:6df:a036:a025 with SMTP id hg4-20020a1709072cc400b006dfa036a025mr2396798ejc.554.1649145227847; Tue, 05 Apr 2022 00:53:47 -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 g12-20020a17090613cc00b006e7a128d1cbsi5082966ejc.155.2022.04.05.00.53.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 00:53:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4607-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=W31NJhBi; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4607-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4607-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 4D8311C09DA for ; Tue, 5 Apr 2022 07:53:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D7ED215D8; Tue, 5 Apr 2022 07:53:44 +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 CF84215A5 for ; Tue, 5 Apr 2022 07:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1649145221; 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=PdwYXfc1w2T/XdFkru56tEfsMTvmiglzhYb1TDKHgeQ=; b=W31NJhBiz/b3cW9LaaehqKQfsWfuMI4nI5EUA2MIy8L4ELBJ4yJ1gtVjRagsEGQjXc2gO5 PRHaiWUKHlve91uDnBHBq4sieTJExhDL7JD+AEHk//ERi+zhlwfCWtI8NmGpgl4X3+ez9T XI6TE4ipDk9QIiAEaye6D9wmj/tKajQ= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2052.outbound.protection.outlook.com [104.47.4.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-cKqN6pnFP7-gvU6hADnX5A-1; Tue, 05 Apr 2022 09:53:40 +0200 X-MC-Unique: cKqN6pnFP7-gvU6hADnX5A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LrA8MLfjAmmGqWt4nOqsETfeM2iGi0kvUKB9UgjQJ2SdgEqByxRWJGPGJeBh6u+bYa+j5eEV/QN/mhKEqF3x2Ns4yBzc28HkY2VZMjc2BbWi440RzQHY21Enk2Ffv/PI1azk6RLGES01+Dup6/lfNWwWauKPwBWKe+LrK1uJJgtM2NhFGtQYJY8yIydaxiZ2tnzu4MU2WIq1Yp45sbeKjURhaGIOXS/XUAy3EqxDCG+qfAVgXMP8lwuo0YOab1lEhs+tfhix24DkX5Zc7W/4y9pb9meAk4jKINpjf5OPB2YXhoKdklbhBZ/UCMSdOI9Susi2DLTiJrhWL0BkObUQBA== 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=bdSivCaJQmaNvMDw06m6MCQ6cX2YWB0Zhex6qTtlzfM=; b=F9ixL+ZG7XESH5AGJ5GpkXBD4Tf0UNmbdcvEzQ28XnjpJOnXuituPDFP6XvAEnK/mtE0Ai9Nhuu9ab0e8lqpAqAj3zo5AbMsne1JZWZQSJ/tTMOsizIgdr+18n7LZFfVZTs1aogU/dcJwowzKDxydKeHJBJ96n58piKBoCcfLn+TDf8TQLx8U4ifYUfY7upEbeDzoZbQmUgUhLpbDQhgek11qL4HiF4WMHP4kYjIclL8tzwDC37nggGHVBH0QHjGMjaCZFaMtEowPfeQrYGVXuNyp7i+cvuXR9GFSQ4rhMmHNQlG3Wt+MMmrsgJWqfDQFFwJq6XmSssX3RA4caIjDA== 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 AM6PR04MB4950.eurprd04.prod.outlook.com (2603:10a6:20b:2::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Tue, 5 Apr 2022 07:53:39 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::9974:fd5e:e3c0:14dc%3]) with mapi id 15.20.5123.031; Tue, 5 Apr 2022 07:53:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 3/3] selftests: bpf: add bpf_rr test Date: Tue, 5 Apr 2022 15:53:21 +0800 Message-ID: <68f53df75601b2b3aea71fe12e69e3e065612af2.1649144853.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0100.jpnprd01.prod.outlook.com (2603:1096:404:2a::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1bc90311-ef19-4579-83c8-08da16d96556 X-MS-TrafficTypeDiagnostic: AM6PR04MB4950: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: kb4FaKUFY4oO6hUw8dvuzi8qet5NBmZCaueOz3v/J1JgrZhQc+fvx/yMMw1Rom859MrvlBUdsCxpTWXLVNu4dA0tmAFfbijEDwwvoMXD21XuEkpbRU04kEJ8fhYg+3vyKUgYvHv/r8hmhr/RCpQtJpnWOuEyE0jPLuGSnhI5LVMqvZuIiLYqD+IczRiwb7MXuTJ1bZRuK+srQcKD+Mclg7og+y5DaCsreZrsvY+rrZdoZV+C/Pbifx0aXSfjJkvwiv8zEfTt6hwnM/k90Bpojk7ZlV9Zsz/Db4uLkj80MamdLw29SVvL+dn7fshg2octE1y0H6M5yUejLBnclBAHTT+mOvhJ/V4dph+f3f77Qrc/Hzn03gYrlJUm8GcvlmeTaalmjBDWrSQ7dXBONuksGuv6TGgWB1ol3CZkHRwLBL8Q7k4TjdhqFJE8fLLbhnSUzL+DhKeuCYUHEJaU/8q8COUNOdaAZxkTTWRWDPIRGkZU8VUtbNWDsOkEHx204QK49uFec/ubD0Dp5lSsy8I7ne5XAPNdjMQxDm8wufN7gNfyE9AWutIHEPbMxq3L+Vm87j/dvax3dLZvjOUCPORBxOZv1DahRF+qlqHJhbRApiOLZeQRYHatBeIUQJjoQGm33RnFAr1GscM3oq21Zem3Zcpb6pO/oAqd7dLAC68lkQthbrNCztOss35A/unK80mP 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)(107886003)(6506007)(2616005)(4326008)(66476007)(8936002)(86362001)(66946007)(66556008)(8676002)(2906002)(5660300002)(186003)(6916009)(26005)(6666004)(6486002)(44832011)(83380400001)(508600001)(316002)(38100700002)(36756003)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eaHLnDdI+cTsnbOyaqm9bw0URMn0HKATO+jnIk1hUNPmvbsMVnok5bUh71Af?= =?us-ascii?Q?jzKdY8FUvVBp86QflEK+OCm2roo/y0AV/EzFA5gyVI4rxPwR9bzLRdOx2KOy?= =?us-ascii?Q?Tyan/QTARFUT/bhjZ5CvVzUllODyUhIqMs4jiht7t/wenvVDvG1IW0U733Jy?= =?us-ascii?Q?+3MfydIbbcow0cxjLiS1/LzpZd1irbpk+YceXd1PFdFgDvjtURYWUv/vC67G?= =?us-ascii?Q?5MOPLvLhulFpoC12BXkAfItX2jI5udbHDSXHyx1bZVOoqYvBNkjDuS8GCE7e?= =?us-ascii?Q?k5UzDDMLu5VIu8AXzI+i+ZKJR+ipSygxskc5Fyf20w9KTygBW9gLksHopWQO?= =?us-ascii?Q?57q0N68rjULyW/V3WkvvmbNlQx9mIsCeeVGZjLTr9NDE60QAGz9HPH+JOyfo?= =?us-ascii?Q?hqD/7Zlu8Rzzdp793ekMOmtqRERxHnHGeWJrX7IENK9LMHcho+pFRVq7g3PU?= =?us-ascii?Q?sfOAnGk35hMtb8BFm1V2mOBhDHvwW5SspLZYCHgp8Bx9SBhXOA/DHG8ZujAr?= =?us-ascii?Q?xDJCIk7hUdSNkHdH2UOxZthGBUdxXADAvsRMjvhLMZGAQQA2ixZes8Hf0/GC?= =?us-ascii?Q?51EfoXJ0SUhkHE0jwRMcBn6hPfGMvwh1RfnmuiTK2uIRQhkMPfta8NnTtrhZ?= =?us-ascii?Q?GVGBHBKIc/JtYHK9sZmcbNLHUT9rSX2POrB0JlrxkMH+AAw3qP30atAii73R?= =?us-ascii?Q?V0V20efLKmucyt95SOB6brnBGQ6YV1mPTG4q9F6OeMUE++eEA9gGDxLyQNtg?= =?us-ascii?Q?QG95bMI/1H+v/9zGqbpFcj+RRaxyp3vgPTDrPgESt7LLTy5dzEPN4VnOesOp?= =?us-ascii?Q?kpAbg2DJhc2hRmXnEvd3VOKFPz7OBrjVW+7n52EUvYO5y6Xs9qzP/myt+sI4?= =?us-ascii?Q?fn+87TI3beQJoCz2yHeTfhM2BIBGN60i4dB4hrFDnpiUqmJd5CQDeA5UPdtv?= =?us-ascii?Q?tRkm24GY6gO4zxeGbpTW1CJx7HS9ENVI7ZVQJDaPKJ9E6qbb342MfyXItdcg?= =?us-ascii?Q?gj+1HeHfKVYKxroS3kZA2vJgtopHcm/RjK4kQiXKZzY4Cd/U5YdkRRw+T1rO?= =?us-ascii?Q?njjcL9LZBe0QXkn1/SYt4w1SuvogXijVow1nJBrzbGGTZOU5vUdrR2hakXp3?= =?us-ascii?Q?az7qunw5zvxqpEQNkNxDjKMP+jYHUbUbuNTOUSNRsdE4Sy8nNQ0ECIStNCmA?= =?us-ascii?Q?9XOTFcRHZ0MV6e2yLYiGQVLHa51TpXH9V0voXm7K5/LtQ5fe28k4l/VFClXr?= =?us-ascii?Q?6V4uE1GF8Z1JeoLgavQhNUOSsnxSfQfRoogzU20YrzONiXU/ZTB3+gkeMeql?= =?us-ascii?Q?5q2djiHaUDiIQFnoRIUbVtmqAArrwtHjOsUs6T8x85m7tMtKaOM083oipyD0?= =?us-ascii?Q?0dHWpZGCojvD/qV0rL3acAgBIxb83+ceHZ+KxuaD2Lb0cfo9A7I8/NtXE5zz?= =?us-ascii?Q?S49pPr+Xdd9JS+A+3LUPaf+DoGfS1Qlhf0qdf2aroV6og2W0pER20p4oapjr?= =?us-ascii?Q?IRYAaWud06qj/JJM5bLK1cqx13Wp3fzFOp9ChaUSN4FKCVjNuMIc5Y0Xsg6N?= =?us-ascii?Q?LXkNS8vd4MhTaY5SVuDwHSxiu8kb2cNwYMwoZwPN5XUxA4Hj+ppg+3ur7zii?= =?us-ascii?Q?h+peCRPtYad9YWZxD12zMyp7sI6xkuZuXUf/V9YsFdhc3G6qGVYYIVNEIQ6g?= =?us-ascii?Q?er9fZmUA7Dna+XU0WMsRBkUd3UObmx5wPG8bERtxGCKCf7vvhCNzYXkycGjb?= =?us-ascii?Q?wiPJ6eO/QF3iGcfxDRm3ntAlUH9z0rI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bc90311-ef19-4579-83c8-08da16d96556 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 07:53:39.3510 (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: AUqlBT28nt97r/uR8IHie7sbSEK6RwS548WNReuUAMHYYAE7pQNJ0hmINT9Jqk8dj5dRL/10gq2z0W6qDboHtg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4950 Content-Type: text/plain; charset="utf-8" This patch adds the round-robin BPF MPTCP scheduler test. Use sysctl to set net.mptcp.scheduler to use this sched. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 467769e229f5..12287f086238 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -5,6 +5,7 @@ #include "cgroup_helpers.h" #include "network_helpers.h" #include "mptcp_bpf_first.skel.h" +#include "mptcp_bpf_rr.skel.h" =20 #define min(a, b) ((a) < (b) ? (a) : (b)) =20 @@ -363,10 +364,40 @@ static void test_first(void) mptcp_bpf_first__destroy(first_skel); } =20 +static void test_rr(void) +{ + struct mptcp_bpf_rr *rr_skel; + int server_fd, client_fd; + struct bpf_link *link; + + rr_skel =3D mptcp_bpf_rr__open_and_load(); + if (CHECK(!rr_skel, "bpf_rr__open_and_load", "failed\n")) + return; + + link =3D bpf_map__attach_struct_ops(rr_skel->maps.rr); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_rr__destroy(rr_skel); + return; + } + + system("sysctl -q net.mptcp.scheduler=3Dbpf_rr"); + 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_rr__destroy(rr_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) test_base(); if (test__start_subtest("first")) test_first(); + if (test__start_subtest("rr")) + test_rr(); } --=20 2.34.1