From nobody Thu Sep 18 08:11:42 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp235831pid; Fri, 22 Apr 2022 00:47:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjucDpq36Vav7ffJ/F+VXPmrX9cqS4JUN6E5fr5PUgYNO8AbF/jEgWj3sSr5k/bIpesRNu X-Received: by 2002:a05:6870:d20d:b0:e2:62c9:c7d with SMTP id g13-20020a056870d20d00b000e262c90c7dmr5473420oac.158.1650613634947; Fri, 22 Apr 2022 00:47:14 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id y7-20020a0568301d8700b005ce04571159si4198697oti.292.2022.04.22.00.47.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2022 00:47:14 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4855-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=MltWkRvF; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4855-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4855-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id B46612E0ACB for ; Fri, 22 Apr 2022 07:47:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7CA6E23D3; Fri, 22 Apr 2022 07:47:13 +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 0E90723CD for ; Fri, 22 Apr 2022 07:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1650613630; 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=LbzSGA+iH1UTMPfO0gY5qXAAu2a7WWuKCXhIIo2bPgs=; b=MltWkRvFyo4csQjlV+vKX7PQ7sXYBz/MMFAzw+J11jrGaLQ0JmjBr/4VF9CjRDcDOpbaBv ab03i6c2AIL45GYi1RddmyUbWeO4r6UjXbkteWWrlnKB0aRAp29y1hp9WFnas5a6zClO/o ELXhnLPcX5NPnaJBzlQ3lPAuYPf8qn4= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2170.outbound.protection.outlook.com [104.47.17.170]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-3-swJjB3DDOSuS6XViVogrLg-1; Fri, 22 Apr 2022 09:47:09 +0200 X-MC-Unique: swJjB3DDOSuS6XViVogrLg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rr8VCW1FMT8935+t/SQS8VXgYiuKBDsZeP21MedlEWEO+AKVwoPehyg4C1X8PjvtZP644wrvoW7EaVrHPIHAhPekz1ehNdW1AuiCvN7rB5HJe/V9k0pss1zLmXE8mvlvmMxrbokTVXox9qWNt82SZaYjp+Uwyq8MtexWkFr6Lmnw8sLDyzUeQ/p3XK6gNhbp1mL7HG4EHfWrOd/HsWH0nJ4rg8FQgG8N/yc6sWeyX0ID9ap8qCfpXt2ATPxnfDzLvCQDdSaWBJtYjMETZlvWBD9gRy0uQGRN3FJTnvNviQJsSONX+Vtgx+sxN+T9rBw9RtRXp1/mhjDFwKKxPKLROQ== 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=s2EnaME/1QYATp4zZm7138WhkgYnDSGzpytFi0Hm5SA=; b=CAFcAWI7/fpRtvkjMYIPRP5FVhT+/FBoSD6vT+9QXv0SNdYFDBpkxHM2zIhEWz95i9jm2IQ9xj4APytOiNQAWo20HmDtn/pVBvD0gie0e+GnUf6BmQE1cQaIWYCvBtXptkNAK+Ii4HTR2Ti9pIj3GCGZNJBXuF4rYQAiAn0QAF5cpkxhyQ184FC57IG+6NlKs6GgnljZ/y/RyrGJzGgY89/ScbOhA5dTGw1bParRcWr37kYdxW43p6OyTYRGu3J8SIC9My+b12RpnkRgrH4w+SgWMi18UuXAW85uU0nIxRScGtNnrtG1hjPNtvNDxm33oz/DEsQ3seIh/rzqctFmWQ== 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 AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr 2022 07:47:07 +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.5186.015; Fri, 22 Apr 2022 07:47:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v8 1/3] mptcp: add bpf get_subflows helper Date: Fri, 22 Apr 2022 15:47:14 +0800 Message-ID: <95f8ee4b211b3cfd0d372080ca81fac1eb50e415.1650613515.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR06CA0027.apcprd06.prod.outlook.com (2603:1096:404:2e::15) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3c01734b-94f8-433e-7f10-08da24344ce2 X-MS-TrafficTypeDiagnostic: AM0PR04MB4899: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: BTBt4UbC/XilMqHbYotBRUbIpbm5tQu4ZfHOAJ6VHnLSJUcfHVRCsP6AwPfElRlZELas/PGKQJvmd+cw/fRbjZQ3uL0sjxoqjN93yN2twDwMvpX/yYvZRjxkFtiposiQM5kpRDBxK91ZFQbpsmXzYexO/eXo6ZG/6gCPq6qE1oRHscDMaKXLY4Uf9q3QEA0nPjanPfkuMSlkCfP+0/zpErGOTAjbZhDCyTF97ihvURU6hi8OsPWuXpOaPSG8Gb3AV2xDU7atr/n7JySJPIfCgpxB3ErvTglkOFsz02FD3JK1f220LogWz6WRA1Z3VWyYZjI/bGdCM/sCqjzErTXLysM1W+T8wzG+NSNJ4wtnP36J0gpcUPvPLTdQB82G6GA9skG01qeYConHfHxNdiK95IiBTjys9Rpl8SMa0maLO9qhKtrEOp4A6qlZg13oUlkEYJPUEGPGK2ZW3AzATWXgghMmE+Ng+5IOZedHNYgDiPiptgc0XQlUAJT5qzEg4n5AlXGpU8QC36Gq5Ssub2dFacz6iVczDHtxZJnzOBM8Sc633iu6GaPwPl7XnGIfsVV0ATwJ+eeprrncHV28A34oCrZ9ToCYMHPoU54OyeKa2oU04QsCBaPfv896cJjnqI76HvfVod0WyaBJE7acTm0MlJj/30lM5+TTRpl+b4YRbufxuJS+2JHQxjfjXHvf4ku+JRxmwklA8kRWQJ/1639wVg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(2616005)(186003)(508600001)(44832011)(107886003)(86362001)(66476007)(6916009)(4326008)(8676002)(66556008)(36756003)(66946007)(316002)(6506007)(5660300002)(38100700002)(8936002)(6512007)(26005)(6486002)(83380400001)(6666004)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MEWcI6jgMwXzqP4UMNoAeXJUAW4fGws32Lxsl+vFlattNHrUWWdFC1+wP1Uu?= =?us-ascii?Q?z2rVr11IvVFoX9OkOcU6s7lHPbxrGPwNv9jm9HKwdTZ36ts0EhiXEyD4E0tV?= =?us-ascii?Q?rj0gJZ9XfglRkf8pn1B6jbWXZBjViJXmNFXkRPWpkd2ZPVg5DWc6iMOjZdaM?= =?us-ascii?Q?UU007jlvLpoJYUQZOgnbLVnco6g4SUTtL4/bb3sHvfcaHLQNtJgnGy2y6uW9?= =?us-ascii?Q?oFZ4Z23VXI7m5QYQGuFZgJWahoD/h9jWLlGXw5g1UJyyoqhYVDEl9KRZPMGC?= =?us-ascii?Q?wX4qEzzUX8fK+jhXNtFtTglWodIgBqb/8GYME8NE5CHLXtZGEVJtEW2GoH+C?= =?us-ascii?Q?SSi/54VEf9/6tCR/M573aW532XcQfFZDFT+yRZY1sPETw93HhKhMzn7Ojpsv?= =?us-ascii?Q?i+UKZ7VWCvUA0SkfF02O2Zy1DoCW7TQoVRPkjuALpgqXULmBmAM54myPd9sn?= =?us-ascii?Q?zWHwLDKzQYslhScp15fEzEW5np37zmhYrSVAXmR0CsVyfLV/cvJuVfwZ/c9U?= =?us-ascii?Q?SCTkdimue6YlLLQ6ZBU91MIso6ijkaPvAaEjUeN2oJJnp1FQOq+Dybhx2v2+?= =?us-ascii?Q?nKPvHR5UGVVtUX+pIiyC7sSo06OKtJG9LDHj9BgSs/xY3SClErh7bL1bJ0pr?= =?us-ascii?Q?VTOzrDS2SZ8OFaC5fCDHwpzphmz4NUbbLSWLXmGD3mB+9RWN5oMPZ8sXwGjk?= =?us-ascii?Q?EmkOnbsXPdwEh8RMhCLW5p4CNQEP4+MSRBoGhpHF9z3cJWMXwLOJYuMEm6jR?= =?us-ascii?Q?3+TZBC084l58nDxn4+qPl/dTi7ZgQv7ejKpiPxZdYb38P5ileCsYB0r8cifZ?= =?us-ascii?Q?vUavf8Q313Z5qbYY3JbL9GDmNH81Yajs50OavfP0XiqQuSBDGSXxuSSLQK5j?= =?us-ascii?Q?fSmxZHePv6jIJABBhwpU5l/an7C1KZURRAxHXXBjZb5Lu7qSM145ICFm23r3?= =?us-ascii?Q?n3zJp4oXdPoFbrBRxV5aUBsENCVm4S3/himB3FIU8DJFs/K5TsLDWzlFUj1m?= =?us-ascii?Q?9y9/VszhiiqbYO64u6+kXLighMIaPYqc9dA+sBWY8RhX1YjaYeS3uhnNp/Sz?= =?us-ascii?Q?+uGdnI9ZcL82ww3iEb4LqHf6nZtiQ56R4Xpnz2D4PZ7+JXXGPAYfPX+YgMMT?= =?us-ascii?Q?2YnaRezqLJ4jvRTJ7q6dym6NDHgvAthhh/T5tlZ1QFs5jv6Kz8W/RoHxC6D1?= =?us-ascii?Q?WWzFeKQmrmbCH8hZxWUFRRGeBt/URs+VT7JdcxOyqPpr1p0QvMl5l7LN1z7P?= =?us-ascii?Q?3M1DvpyGV6C71QMuK2dqmue7UskOL4s6UPhzG+Wd4eZHml3fxzKk6hs7Rq9P?= =?us-ascii?Q?1+eUf6zAZ4VFotQvWISxd5gvLdzu+HaP9mPLR5cGzQwiwfT6A/7uMiwiu8R6?= =?us-ascii?Q?tbMsQVmgBeDG+03tah5gdCc4SJJ+B+0ykXvAoR0elxjeMypgRC8+pLu/xulL?= =?us-ascii?Q?6ksS7KsHN/uLKjiQfhbSuhWi5JEzqOQheVoYFAuVyBQi0UIsU54AIyM8PZM6?= =?us-ascii?Q?IbpvF0A6iAR1bg2N6GfxUfMAXnCPbvZpKheu27JSIm7Ieg2eBQ6wai+5fH6q?= =?us-ascii?Q?DGqdTQ3sCFEqCaZYZgn9FsOkV7H0BcKBQA/prX8G6mSqT5nssNiFIKgiFYrw?= =?us-ascii?Q?NrOiQL1MNz/pY+9xYzInvqb4xhKR6utgn9CSn8PdPULcHP5tXeREAWeCHMcd?= =?us-ascii?Q?pKQc5IVaQ8JI9gE1Sb+iLlytyKhEihccR1J9wVBL3dUnOErTdvyO1el2zVCq?= =?us-ascii?Q?KqVPy1IVj4HP7uL0o9QKIuHDwix9rv8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c01734b-94f8-433e-7f10-08da24344ce2 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 07:47:07.6282 (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: B6GudHQ6ScF4tNXl1V2924o2IHQKHyeN183ghNI5+UdRqrPiMVKotpmxvf36025L1XloTqVfTqu6Ot05ZCqxhQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4899 Content-Type: text/plain; charset="utf-8" This patch implements a new helper bpf_mptcp_get_subflows() to get all the subflows of the given mptcp_sock, it returns the number of suflows. Add a new member subflows in struct mptcp_sock as a pointers array of all the subflows. Register this helper in bpf_mptcp_sched_kfunc_init() to make sure it can be accessed from the BPF context. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 7 +++++++ 2 files changed, 54 insertions(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 6c01f6b959a3..3367541b353c 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -160,6 +160,23 @@ 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_subflows_array) +BTF_ID(func, bpf_mptcp_put_subflows_array) +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)) @@ -168,3 +185,33 @@ struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct = sock *sk) return NULL; } EXPORT_SYMBOL(bpf_mptcp_sock_from_subflow); + +struct mptcp_subflows_array *bpf_mptcp_get_subflows_array(struct mptcp_soc= k *msk) +{ + struct mptcp_subflow_context *subflow; + struct mptcp_subflows_array *array; + + array =3D kzalloc(sizeof(*array), GFP_KERNEL); + if (!array) + return array; + + mptcp_for_each_subflow(msk, subflow) + array->subflows[array->nr++] =3D subflow; + + return array; +} +EXPORT_SYMBOL(bpf_mptcp_get_subflows_array); + +void bpf_mptcp_put_subflows_array(struct mptcp_subflows_array *array) +{ + int i; + + if (!array) + return; + + for (i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) + array->subflows[i] =3D NULL; + array->nr =3D 0; + kfree(array); +} +EXPORT_SYMBOL(bpf_mptcp_put_subflows_array); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 006914cb78de..c42fb54298ef 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -500,6 +500,13 @@ struct mptcp_subflow_context { struct rcu_head rcu; }; =20 +#define MPTCP_SUBFLOWS_MAX 8 + +struct mptcp_subflows_array { + u8 nr; + struct mptcp_subflow_context *subflows[MPTCP_SUBFLOWS_MAX]; +}; + static inline struct mptcp_subflow_context * mptcp_subflow_ctx(const struct sock *sk) { --=20 2.34.1 From nobody Thu Sep 18 08:11:42 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp235872pid; Fri, 22 Apr 2022 00:47:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgyvsySi3GWSnnwfX8k57Mu6UA7W7jNVDXszumnrgmC8Dk50ie3HtbG47dMi9Bqq77T46A X-Received: by 2002:a2e:9d46:0:b0:24c:7f1d:73cc with SMTP id y6-20020a2e9d46000000b0024c7f1d73ccmr2062108ljj.358.1650613645286; Fri, 22 Apr 2022 00:47:25 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id w17-20020a05651c103100b0024da069e6cesi7078322ljm.568.2022.04.22.00.47.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2022 00:47:25 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4856-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=MSMGftbM; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4856-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-4856-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id BF5B52E0CDD for ; Fri, 22 Apr 2022 07:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5972F23D3; Fri, 22 Apr 2022 07:47:22 +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 C72C923CD for ; Fri, 22 Apr 2022 07:47:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1650613639; 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=ZzEHHHPY6a3ZkwKqcOteI6WqGZbRSpRM6WEo32JhAIU=; b=MSMGftbMELoP2OTZ60yxGSOCY/Y8ICOcAjVJYX3tCOcJ3KyvbnQv1UNCaWNffGgQD8+1cb 4JyXi9mHp4HQ0b5HkzsYgYpTiYPf7BtICzKgHhA2kNsg7unQM+YwKEjuySoh0am0qbaIVv IoBz+dsjtXjNmfu6RrtEIJ3oU0zbr2A= 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-4-RcVITpnQNzyy49wruWj6wg-1; Fri, 22 Apr 2022 09:47:17 +0200 X-MC-Unique: RcVITpnQNzyy49wruWj6wg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KmCRYnRMUOIGl9Z+LruIbL3s8I5t79m3GvaUkJ/jHhJNQJ2Tqhw0hptp7qWpNMdeRQiIGQgO/+NoTB7a//rGyGv07vJnCi4sev5O2Tdh0L4Wx1uXritw2Uz30x+BbSHbezRyEnnHch5QfoPBFKxuKJVT6Du4LjJfUHsNjOcCFZi+kT8Mj+yFk8vKR1mjNHO71Ci5aPih1vBmOWLnp2ibho7xAt/b2LMAdIGJEDyiR2WVwIQtpYF6WbsB96ylqdx6UWNLWesTVaYNs4QcAvbO87GYFjEECQhZXLHdXv0hEM0/eGrDlk2a8CpIsmgtD9W0Ilgm3xlmE7xh3PRLy22QlQ== 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=OqEaaqnZAQmdF/p9sK715eR313hQ4/ucIYY7cdHcR1I=; b=WX97WbkzsE53+65fj7qdj6Vor16HRSg33VEIdbjMJJMf+ohoq1W1nwOsmq9Msuiv+C6cnuAH/ea4UBXDlnQI4OwNcxG3xHsOJGMw0SYCAmEzoJbOziok7x5CzpCl2fxopjuqjokUVe0xyFSi36uxC5Frwyjaz5EbCwq02ALr2QDWULZjEUe9rC7eTtDvDzqzjYgzzNEhpaLx6/TIRyfIV8lRI1k9OI/kju0QTPVmW3kg1KCRJAmgE6LyBc71X9LuX3bh2hYW/KJRR1U3FEIcZ9DIDGPBtQOOS7E4Vn/e/xJFsswGx0asEgruFecLQumLxP22itwAHbKnuGRGHaNLEA== 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 AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr 2022 07:47:16 +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.5186.015; Fri, 22 Apr 2022 07:47:16 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v8 2/3] selftests: bpf: add bpf_rr scheduler Date: Fri, 22 Apr 2022 15:47:15 +0800 Message-ID: <415971f575d0e2064797c831efe4e462690b0afb.1650613515.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TY2PR0101CA0025.apcprd01.prod.exchangelabs.com (2603:1096:404:8000::11) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0f4d062a-e0bb-407c-4b1d-08da2434523d X-MS-TrafficTypeDiagnostic: AM0PR04MB4899: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: mEkIjjX2WJ8+X6FonYimdwf8iSQ0jmkh+G4TactrFjuhhsy76bTYNLF0P/scOsPEKYp/ilKP59F9j6XfsXapf+kODsIHnuDNwBI2D4XGCM+ft0jmOl8T4Ci1SIjZLURE1700TUiKCCGXsQlCX2woeDphmGoGo+cXrr7dTB2GhKtJ1FoHX5Ixm/Mf8G/XTtCPMN04Mh6vpLp9BK7LMkq4t4t1/iOuh/pZxrW04+/zWVJbuZguAIlFqU9jp3zghTrv2Vgrt02uDd5HS1yRGUNId6EimwlPfge/UAHT4CAx4CDyc9MmQMIwnqa1PU2OQSxpBBCQXx/AnaEO0cODVecnn5XxuVScJnsObEe5m0cz/WE4zzeQEnEU3KqNbqX1JDpKuC9MFaoik4KqKY5NphZvK3xXVeorCFedQ/l4246n+91hKJOAoArHla64gKaioZl+WIGpJ8haVpRu0IkbjXIzt3/rJYcAfnq3OTqznLltsOVkEDYM8Ji5GvjfnzrFszADG7xk1VlzTrNt3wossgAirWdCRRbwv8wErJWQ4xQUnPmTuegbHU0XXooLGPnwEbdRKuzYAgYG6PHAlFhNIW0A3DIJS353GL0KXdUMKPsY4CFdYu40TDA1cTTyn3Vcj2CR4c6hx5OpHEfWzc8Vdawk1ck9MUt43HMEXgbrbh8PLNSx7IQKFiGWFoGLZI98UgFWPHEGUWur9hFJUX21WAv41g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(2616005)(186003)(508600001)(44832011)(107886003)(86362001)(66476007)(6916009)(4326008)(8676002)(66556008)(36756003)(66946007)(316002)(6506007)(5660300002)(38100700002)(8936002)(6512007)(26005)(6486002)(83380400001)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9ug6nPYVrIBR9bGJE49KaEhn5ENnTSBYT8T0zYPhO+Nxp6seUyt2BTdtjXeo?= =?us-ascii?Q?Db8m7NEyO0X8mwXmLvc75WyN01oXeqmEKq24KdZFrz8R7U+EqaT+to8pM2wR?= =?us-ascii?Q?4ZbBqzIFscsZjjfhjOg7oQdL5YvEBCiDXB9kn+kp3S9nbz52isVsX1FlpiaO?= =?us-ascii?Q?a7TFEkBwwO3ns77VMKMpKqs68nocP0zlnnsyNOCk3BSlD3MighykOdlIWa8d?= =?us-ascii?Q?Xa4PRpdhkm/1sBCvzZGf7W+dRXBYmwtKUgcZ9vgBfVahKz2UKcLUyTE2oUmO?= =?us-ascii?Q?2AM7FSCT56jjxbTOVXxsCK3F+tDS6iED687RK6LOkgwfyL3rkN5sujBnp2yJ?= =?us-ascii?Q?XwiI/td7MMq6v4NzBPe6nyFmZltD34niPwBJiq0a/KI/ct02LhXORrEE2+6v?= =?us-ascii?Q?ZJAr/4PySKzcDOV8gzvPrAsgBm4d96WwyDhhWlOTT52z1R4cS2JzyDfl2YS+?= =?us-ascii?Q?FPiV/dfdk0lYn9ot29TcOFk6rA+l79jxeZraVDU6zJneQSkmmizuiaQAKl27?= =?us-ascii?Q?PiB7Sg7n/DjylwLhFh0k4dZbyGxxgBtAwfSBDJLZdpmJVKId6MJMlS+fvDP3?= =?us-ascii?Q?k11uJtYCwcK7jP7abXv/aACxl9e3vwBagGqemPGeTKN/xsHiNnKtYwr5j/Zq?= =?us-ascii?Q?HZJQQXA0tB3fqaGIlBYp+cb5kfUKJQm6sNGg4DQPd8gP2eZDr1rHmsVtZVec?= =?us-ascii?Q?jDpD2qUX/+Q5yU5J+/g0awEveEkZfAT35HzNeHlB8kJdfceQJizvk3AuQPp4?= =?us-ascii?Q?sQdGz+mzsJtIMGaxcfydkOB5xdj4iVjeUN+a+ljk5ocV4Lh4HsfBKLh5xSOW?= =?us-ascii?Q?ysrKMUIpy/9J0v4QzQwU3UXzBx+japfWk5Gdnn+LbkttpCn+Hk1fC3SfO2F9?= =?us-ascii?Q?ZQfzAbcY/FvUFCb0oui6tJ9ZcKSuOY3fOb5v5EOAZwuLluZaF/5tXhK8EtZH?= =?us-ascii?Q?zEFTzTVi7yFsyD1wXPsiiMDpSYxoYTDp7vrsJspxxuV5nKJM1rQIiJWmNPw/?= =?us-ascii?Q?83nCGFvXdmtf0TJwSD/baX3j3HIuvFW2jIlMLqdvJ9349vnoqGByK1Pbk1KK?= =?us-ascii?Q?gVUPKCRFVzXH6cPdwCzUafT+74pyTe8BoreDlmH2/Pbz8OqIGyiPzBRuXTl6?= =?us-ascii?Q?N9lpSwVWRrEugjV5VmTywqgpN2mWLgSwlg0y8zr+cBkd6RGvITb/zLUNW+hR?= =?us-ascii?Q?FKdMcCztSiUMCCYIhU7eB6HTRWUWPYuuCGpPku3bbaYTVxUGEXT+F1lGnHMq?= =?us-ascii?Q?3sj0TC0GlkaZ/yoHB/FXHW5uHmM6rFMMPFt5n2hckaijvUSE0l9ZfTQ5XLlV?= =?us-ascii?Q?+i227a3smhh21OLcvFsXoXo2VaLxW91Ppz6UitZlS+Yi2MmCaeIpCMfbrLKW?= =?us-ascii?Q?oZH/DITguKCn6gpCrYK3hne13tAeVR/j43Ly26see5/Xqrt87789d7fsqvws?= =?us-ascii?Q?GH8MG33WUktS3ZtIRr1pScYwbdW/oZYNDv7B5gLrrBPCPfOzJnKJFiGj0Z/A?= =?us-ascii?Q?atjT7PI+0lUfWmVA9MZdSyhYvOuEovRHPbqhBWQCRj7G5varuMn7gSATK8Rg?= =?us-ascii?Q?IXn9oGnhqQ1/L+BiSDTqj2y99EQ/e1sz/G1zUGx+tXE0Nmg6tdRux1ooa7Uj?= =?us-ascii?Q?9vWpm9AZBjF2QxQYfb75UwZV9gOpOF5pLgyyGhCAFHKgEGQDolWXVMCNTh6v?= =?us-ascii?Q?oWQj3V0Kp9dA/4AQLU/lVM5hXqW5Ms9rt9UiSjXSk5gZ4vzj00Y0dAy5boQM?= =?us-ascii?Q?ZG6tBh/oCuaCvr4X6w+OJqZt+jM70v4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f4d062a-e0bb-407c-4b1d-08da2434523d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 07:47:16.6119 (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: YbpgHtbfpeV4Wxz3N01dCGhz6jF4Hif93Vd4RYfvI01XZwFSh2wqhy4IZjQ2GF3ks+q1ZJfwgohjgm03W40bag== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4899 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. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/bpf_mptcp_helpers.h | 13 +++++ .../selftests/bpf/progs/mptcp_bpf_rr.c | 55 +++++++++++++++++++ 2 files changed, 68 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 a0b83fbe8133..f0e120dfe48d 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -27,10 +27,23 @@ struct mptcp_sched_ops { struct mptcp_sock { struct inet_connection_sock sk; =20 + struct sock *last_snd; __u32 token; struct sock *first; struct mptcp_sched_ops *sched; char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); =20 +struct mptcp_subflow_context { + __u32 token; + struct sock *tcp_sock; /* tcp sk backpointer */ +} __attribute__((preserve_access_index)); + +#define MPTCP_SUBFLOWS_MAX 8 + +struct mptcp_subflows_array { + __u8 nr; + struct mptcp_subflow_context *subflows[MPTCP_SUBFLOWS_MAX]; +}; + #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..e68e3753fb4a --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include +#include +#include "bpf_mptcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +extern struct mptcp_subflows_array * +bpf_mptcp_get_subflows_array(struct mptcp_sock *msk) __ksym; +extern void bpf_mptcp_put_subflows_array(struct mptcp_subflows_array *arra= y) __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) +{ +} + +void BPF_STRUCT_OPS(bpf_rr_get_subflow, struct mptcp_sock *msk, + bool reinject, struct mptcp_sched_data *data) +{ + struct mptcp_subflow_context *subflow; + struct mptcp_subflows_array *array; + struct sock *ssk =3D msk->first; + + array =3D bpf_mptcp_get_subflows_array(msk); + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (i >=3D array->nr) + break; + + subflow =3D array->subflows[i]; + if (subflow->tcp_sock !=3D msk->last_snd) { + ssk =3D subflow->tcp_sock; + break; + } + } + bpf_mptcp_put_subflows_array(array); + + data->sock =3D ssk; + data->call_again =3D 0; +} + +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 Thu Sep 18 08:11:42 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp235897pid; Fri, 22 Apr 2022 00:47:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeeTrTQ+4RwVw2O2m+URu1j3A50egjEtc8fFjvNN+fx1Duk0I42FunhP9ubJ3SY5+SqfRY X-Received: by 2002:a17:90a:d584:b0:1b8:7864:1735 with SMTP id v4-20020a17090ad58400b001b878641735mr3970367pju.126.1650613653299; Fri, 22 Apr 2022 00:47:33 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id x26-20020a656aba000000b0039d6ac4b3fcsi8294180pgu.739.2022.04.22.00.47.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Apr 2022 00:47:33 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4857-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=RX0T8OF5; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4857-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4857-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id C0BBF280C20 for ; Fri, 22 Apr 2022 07:47:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D87C823D3; Fri, 22 Apr 2022 07:47:31 +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 719B023CD for ; Fri, 22 Apr 2022 07:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1650613648; 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=x9PjuXmxx//rp3Sg1bxMtKi7svQtMfnWGsRK9tVAIhg=; b=RX0T8OF5g+JQ8GZs6YwQ64aogV8yt01/sYzzkzF/ggqqlq5BT4Z1VBwOXW7WdIMRlNcus7 EtVuiCMCr4VdshUuWz4ahT8dfpGod4/TVPfydyNvvEnSHsbRxYm6YWI/C7tYxoyDPBfptL U2j2MXp1IuVH47CVtbE5R2LRecLdM0E= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2171.outbound.protection.outlook.com [104.47.17.171]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-17-mzvyITz3M5OMaMZ2vpPZ_A-1; Fri, 22 Apr 2022 09:47:27 +0200 X-MC-Unique: mzvyITz3M5OMaMZ2vpPZ_A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DNFHkrvgBbGJfZxScRgWE6MSQZp4VF1vgh3Zb4Tt9xkBMxyPcQe6GDrvZWsuBfFZhjTwRQvR7rqrQ8rCsHpxlzy2W/kOg8VqBNs8VI4UPrkX2VrwNFFKO/VSaAy7xhfmC6UwBEPXlGUb2dnKZTtwTCXueDMDhHuW1pBzDSPckGpeXQCsnIv2yhlQ2UkxAQQT+jAXU2O8daNNtreaweW8MBobYaVoDZa7NlmFK3V+em5eo6ufnq6aGBAA4SizSt2MxoFJ6ImVOvMPSLBshySM3xFDyASLLlmNRtdxDX9vGbSINSTHxTGqdyX23ad1YgGvlybBylxa8s2WNhqv2T3xtA== 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=UDnccN4Ej6cG02KY5kELgZn3ENNVMtxOEg3GeS2yTrk=; b=gq3nAssnkNo0yMZvljyjv2g/idbA2iDYk784UbsCFwi31B/5fBVQRyhrYHQ0AueuXiOlL8hiBgvySOUmfqnFQUrQJOLIhMoIsTVkpiXVA29+j+FOJ0CGaAJW1ptb4Zp3HZhgo3WeD5YJkgCE69mXKg5aSqbjDixn0/srjnNioOFKjwEyZyB/c3YVNtvJNOVQEgldo8j0/9gYS7YIdmKGXgDQgGv1mbS3MBFX1pyibL54yIZzBlc1GBvoRKirESHHfu3SrUnIewfVlhkH35yd3nJ5/4lOdM8tV8nk3Zo4bh2aO+5vInXv8wWLso7UYgQ1KVN+JXFxg+n2cmhg/75l5A== 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 AM0PR04MB4899.eurprd04.prod.outlook.com (2603:10a6:208:c5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr 2022 07:47:26 +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.5186.015; Fri, 22 Apr 2022 07:47:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v8 3/3] selftests: bpf: add bpf_rr test Date: Fri, 22 Apr 2022 15:47:16 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR04CA0023.apcprd04.prod.outlook.com (2603:1096:404:15::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: 56a216e1-3d33-40d2-4636-08da2434584d X-MS-TrafficTypeDiagnostic: AM0PR04MB4899: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: zKFAhkDynfWk0onXGr6LjQk9Zt4Ovx639whqiORyyklm3nq8w9oeeLuIBJ5+ta9rRqLw/5bUbDzAxXFDeAxGWNDzsBVDiTmKlhlcg9WKE+NMvnKxQOWI/qk0RGVqNe7uqD8Lo+SHhdzZxwU08CnwD8ovhz6zQ//QHm/sOTh2bkeTfy6vCBFg0xhuAVfcGb991m8gguFumOTl6nZuzYgXJDA4RHp/04EhOL2zZ8YJeH9N7n9U9z+a/zfj/LWop3xCxyMfIqbP2X3jxqTDJLmaAwnLe7KMME2GkdoyLlMalKVMS1khFQjVW8nXrUHV//TQDuS9niT/N312jnCEiO67HG8N4pk/uRGgX+UWW4Utn/PvGk5Eqf5KnT/uUvzvoy4A+N5eFfFD+J1kxK0Dy4zWgzu4RnnlXHnVYNXB+qZ6EujhGu+8UxDosUqFU6GGBa2ml/PzlyT/nAkyhTELJ8bJ8S3+ePd2RnvEwGqcAW1l1UEzsjrcVwDJ643Eesu/84+/ZmSMyYHDPEjGECx67oDnMM0nhI1Og3eLfPM2OvkWI6Gp2akiMKbLw1cahNAMP2oT8wXWrkzu9j8nGaNz0mUt7WBYs0/fEQ+yPr9Tzf5nqmbVGMgmbMFI/xmBVuqF8+39pzLrYtoD/UDAE/FSG/d/bw1Hh6/DeZi3NiliU3GNG4CNGz0VNrqmlsAJcF+dIAC1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(2616005)(186003)(508600001)(44832011)(107886003)(86362001)(66476007)(6916009)(4326008)(8676002)(66556008)(36756003)(66946007)(316002)(6506007)(5660300002)(38100700002)(8936002)(6512007)(26005)(6486002)(83380400001)(6666004)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xe3SnZWpo4feJzX5S4H80nntCfSaXxLHLaFY+W2kaZ8lH3JbDDyHM7vQ//Rd?= =?us-ascii?Q?FoOiwLDvDIrQQYczX7acH4075JLV8g1lezW8sLnWOdw2lLFtocnfI13AU7Fn?= =?us-ascii?Q?Fkd9YRVosZRhcapSb3hReRoAg3PO30m9+bp2RinlIfJnckfDP5BIr9RjkDLA?= =?us-ascii?Q?P44nZA71hhR2AISu0YxDDTCYT0F9qqzhqZUFcsy324p0pUYIMapZTyy8piLr?= =?us-ascii?Q?XEPfDe81bnqKF/acZ4Oq+Ut3kzi69m1N2WL1jfg0Jef9gapJaXjMVYFPGLB8?= =?us-ascii?Q?s/Rv4GCILxtkZ6zl2mBJMmIkYfGV21puaPs/r6HQewk/9lzxezaCuOXz9znL?= =?us-ascii?Q?mqd0xWThzVjE+OgdvDNzSL6uS4WyUdEbZMJBHEoEw7d8LJHd62y/twwIO071?= =?us-ascii?Q?3wdl9UjIpEjZDKASm+h2k4ONrkaNZ8Nb4OLC3P1JsEaUEFhEAp+wS9a85YO7?= =?us-ascii?Q?dM5EcMSrH99qyedgGd+lb+laBwz0CUE4CtF5ZRbm/uIhSYJIvi2Ya+FCpH89?= =?us-ascii?Q?2od66Xmwml76s+/cF5o9ImTUhiNwXdIMuOJyZa6fkeQMhy6vxLVRCQqJQKoB?= =?us-ascii?Q?Mm6gtZuOuVR5uSk4OPkBo+vLTmj942BwHt4ZNcI67Mh6QIlKrSTjdm4AgNp/?= =?us-ascii?Q?wC4KU+E1TWMOwxAr0VcGbrZmlFdrRnSpV69WoC1331190Xk1ATmvAl/p9hR7?= =?us-ascii?Q?Uag4w4K8v1g3/V8YFOPXsA4TnaL/B1sYeQ9dCPfS4KIWt4kzEp6fl3vD0nw+?= =?us-ascii?Q?bryRuNKB65soFdF/e+AAohQAllANj2yvgqc9j9VbWa+I67CaM40nAp/n38Cm?= =?us-ascii?Q?5YZvNzMgWwJrMExI9U5GchJ9W20l9wa5hKb+oNFrnRkDJpExtMJctHIQ3ota?= =?us-ascii?Q?5MUCp5+9MsVnG+molRJ7DFTftc4vBPNYB3XMG5R3wft3iMTX8vQmq5pnBYyg?= =?us-ascii?Q?VyFVGxlA/T214bZf1zxQuHkqeisYH1LcA75W0Q4cBq/3gyRSHzMCXTioh5XG?= =?us-ascii?Q?s1JggTowops6V8OupHnQ98aIYLKi2lO4Zh/+pANfDNRBG7l8q4ZWjSyr3EIY?= =?us-ascii?Q?S1ej73RxifkcANvhEsGNUivhr1UUNeRqIzJ02KK8ZK3i6g0KkWGK4eIGnAkF?= =?us-ascii?Q?MLV02leBNU+MKA/WydP3Pub9IRegpmajVCZEZimHLQywSSXwyC1y1Iov2XZy?= =?us-ascii?Q?k8TnOjHvaIniYamcFIA/tO+K3kAuMhgzVqDYxRDv4FvN+KZwFVirC6TAyO+w?= =?us-ascii?Q?RCUel1J3SffN0MkGZrXWOFNsYsok5oOO6uXsORE42NN/lE+8VORfcut+Yz9F?= =?us-ascii?Q?loDZR5rxXTzHFSKfzXkHPjBuwZG6MG9QC8pK2huzZqJU5qZp2soOtR8rML9G?= =?us-ascii?Q?gUMaEhugoJ7UKihIuaT3bhDv6QZIm5Xsc9aIiAsxria0kREVbeC1Hz6YIS+t?= =?us-ascii?Q?Z/vaL2vwAbIHvJtL5GFsWM/+au4OhZ5eSGz8GXNIqImh2K9NKi1eJjFk9n7L?= =?us-ascii?Q?ZWtD++sDcUffC7qQ/DUFjuCSFTx0Y00HC+x3bxzR8mnsyyPrDsvxzxEZlG1B?= =?us-ascii?Q?W0yAWyKTSzcJ1FXPqRYhBvzpfqEhxQFrmgRVqgmwUZqdHJqAwMrQ7FGwTBWD?= =?us-ascii?Q?E/IwsGQOIEs5CFmK0cBY2rXQze0Sdbo/4L2ZOgX29qFAy4DysE0dY1aIVbZo?= =?us-ascii?Q?n0xDauFQcdcPPY4qkvceP6Mcab2HajDVvV2++t2Y1vbtKQpTzdpdFmjOV64B?= =?us-ascii?Q?PZPF0C50ecjfdj+eZmvIQb2la8xfrTc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56a216e1-3d33-40d2-4636-08da2434584d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2022 07:47:26.7829 (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: gA39X3EO1at0h+Ok7+hqLi10rEkKIZoTeHrCpllFpeOpp8GKHhgafWdDFin7NI9Z5WKmn5/tkV+JUoTuY8k4kA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4899 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. Add a veth net device to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add this new endpoint to PM netlink. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 377ebc0fbcbe..7052c520c0f7 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -6,6 +6,7 @@ #include "cgroup_helpers.h" #include "network_helpers.h" #include "mptcp_bpf_first.skel.h" +#include "mptcp_bpf_rr.skel.h" =20 #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -362,10 +363,46 @@ 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("ip link add veth1 type veth; \ + ip addr add 10.0.1.1/24 dev veth1; \ + ip link set veth1 up"); + system("ip mptcp endpoint add 10.0.1.1 subflow"); + 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); + system("ip mptcp endpoint flush"); + system("ip link del veth1"); + 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