From nobody Fri Mar 29 11:53:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp911402pis; Wed, 4 May 2022 21:27:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNUVdyrm9IV9u1DjeUD/e9VWH7SLXgqGg4VSoj/VJ2m+9O7RYZNPm82IX9fzvwtFCS6nDQ X-Received: by 2002:a05:6402:50d2:b0:427:f49e:71a0 with SMTP id h18-20020a05640250d200b00427f49e71a0mr10281892edb.211.1651724842188; Wed, 04 May 2022 21:27:22 -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 h1-20020a50cdc1000000b00427cc9da151si633729edj.267.2022.05.04.21.27.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2022 21:27:22 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5126-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=Jx79dXMr; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5126-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5126-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 A64FE2E09C8 for ; Thu, 5 May 2022 04:27:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4A62E387; Thu, 5 May 2022 04:27:18 +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 8F46436D for ; Thu, 5 May 2022 04:27:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651724834; 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=SAOcRHBZSD3mIP8jzONRIcRhQktjxIa6D2q6pe75Fu4=; b=Jx79dXMrxa4Y1rA1QiHuy/0xKplUNkTrUrIuN64SGaCF142cHBSZ+rShDIvpmz8Qvz0hR1 FGgkAV6RFnWl+dvZBvbQNh7ysqNzdTvnNFXuEHZM9MYPFmmWof5TZb7850V7H4K2gDTF9C 9wAUXrJnDNY/BZTIlIvq3CF6XcZD3lM= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2176.outbound.protection.outlook.com [104.47.17.176]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-4-UEv_cawQOkeNR48B5doJ_A-1; Thu, 05 May 2022 06:27:13 +0200 X-MC-Unique: UEv_cawQOkeNR48B5doJ_A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZS0JbN89KbfaJS1tj5eift7thF4IpuBLEy0bbKJf6vQnQ4Oi7705VIHicxTMQ639ieMaEf1gR5HCMbuyjbwXlY++JVrZ96FsGv7wVg7d/hLCDp7YDc2R3g4hVXq6VAiE+vt9ROIDfUndsdHbdVl2BoMSJQ2v80x7Tgdj6ivGKaIKR/Cmcv+Qn3ARt9DcKa0+VurrS4P2aVGVB23CneCu/M+xSonDKqNX7ANe9CvmcpMOJu4gBPOhxGGWpK3nllxLYU4k/cDNxamAKyN3OxZNxIcsoGv110c9pz0RfZZleTHLw0OLewKsVHOO+GUJvKlrMoLAdRfZRDcGgXza4zNtJQ== 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=wPjGpUakFCHz9R6BAcFh42FQD/PR+k4t3tmFfXHrJG4=; b=deQKxquWCA83ur2ftcVxVHErtskFcervN/uRA5Zeytg11BMTbx+LtVT+uaL/OA3+qaBFC7f8328UA9sDTb1/1aPa0j3ZMwdlgiz63Rwy13oa6INty916V5kt5LkcrKpD3GRxSSyJsBIFsgY6oKV+we6BTagsqg3l+urd4lBfSx/kDguxUBekOiws6uI/kVQUUXnuZtC8z5MHv7V4AAks3Q+ARh5zVlymZHFL5rVB0YCUf9KjffhndONv9sDDL7hYn/qFOAekNCQh8PRT/oGJQFYQOqZ8pV1YvHaRy7VYEbC1MG0ZjgflqxSjfFjq0CpfzArjpi12d+SgfpNQxUEjHw== 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 AS8PR04MB7861.eurprd04.prod.outlook.com (2603:10a6:20b:2a9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Thu, 5 May 2022 04:27:11 +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.5206.027; Thu, 5 May 2022 04:27:11 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v12 1/3] mptcp: add subflows array in sched data Date: Thu, 5 May 2022 12:26:57 +0800 Message-ID: <8fcc28cd2913c480e9181780ebc6a4b53ac93fca.1651724418.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0062.apcprd03.prod.outlook.com (2603:1096:202:17::32) 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: 6c7d6797-c43f-4d55-5139-08da2e4f862f X-MS-TrafficTypeDiagnostic: AS8PR04MB7861: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: rgs0Lxz+YBtn7ywHfL2iIPGpPuVKDI8SPJ/KbkSqujjGT0bioO1mJVVyWmZbmdaiBOf9V6Uzz9vn6J8otOPOaqHrg5wbt3qCPPS+9NSlF6BWbPSRl3XsgVC/HMXZ673utjidTOJBicu1ui/O3F0A7PqaaXaBK/2OWAGx8+V+MNkQtKgGYFeAhbjuQxV/7OM57plGNE3MmRk32j4rw1rG3aQhKo5R+AFmxSzNEDUZsWRFvKk6tXnrOyMiB1stenqxfxFsVz61ZBPyXrmObV995Y2+GWBQ8717FJOxZlKedrF2Fz/+AZxrSDpHWjgiNQy9cS52wx4WD/9dNs5qvtk0MIK3R6oH2fCuO/+2Q4uvf9FSzHyNoUxrGZFStvlm59U+pJ5accrvUT1OLXqeXN8svaI74r9lZGext4mm6wY9S0evXAQFK/STJufyOaAREIgMyIFIIokw/zZnkzxeKWEC4PG3KQrRMnKaPOSjL1+cnwUaM0n57SA/9vnnS4d7rNxLVEzrp7BO2QUn4mT7KfDtdra8aM6yJXJnU+Lz7t40nPDYP3+HRjRUnP/Fh2xb0DyuZ3kMKo9PSNWtVD5xL4NbRLz2rTDeeWKE+S58nkeKvOIrTiT6D4erPB62CojMuIj/dc9CDcS0GqESv2hA5gwmLhHx/y9pYbbNDisftswxYCQXDEUv4UsvzDYZ8fWoMUTP 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)(2906002)(6512007)(6506007)(26005)(86362001)(508600001)(38100700002)(8936002)(6486002)(36756003)(6666004)(44832011)(5660300002)(4326008)(66946007)(66556008)(66476007)(107886003)(8676002)(316002)(186003)(6916009)(2616005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nH9QnU6iNeYtvu1v6HO/rjTXA+nqch9qrs9cc0ENejGCEYHvRn3jUJrUmJ/H?= =?us-ascii?Q?WGLi3BdGAgzaYwiL537pZYngWXE6NeYKQpMQY3iLFZVRqQttrZF2XVoA5ViF?= =?us-ascii?Q?tQMHKLsykCfkKlEinzRYoivnrzRMJkyRAeFaqyH7WK5m4QCyn6LOigqtE7K0?= =?us-ascii?Q?yBdQu9XVwueEGrWnnEQpDaF+HOeNuUuOqgRiSGyCa+dexw7yKezAHPMaYvE3?= =?us-ascii?Q?G41zVaZBuGzLdHU2Lo30QCEYXTO1DTrQbE2N7Sntj3nWv0NKRRFE2QYFNBAg?= =?us-ascii?Q?BotOTrFpKnFjgpZxrwcek5THQGmtb1zhPiDGnMeMr2O/8G0WjZ6Gv4xKU1Va?= =?us-ascii?Q?/6eL5GeyL4jB46tbceqra3eenCSDXmhacEbbu08SjN/o+TcI7Sb6CddbJuAk?= =?us-ascii?Q?Z33Q7cCmU/dnqJ92FB69es/GUYKNXJ09+VU/fb+Hq11+7GHNLV6Ki1uYt8ao?= =?us-ascii?Q?4Fb0GjpjzjnbwXT6z8DzvFGiEUZuXElWp4lnjdNgckqjzQ9pLILXNEdpzQfB?= =?us-ascii?Q?DjUf+zd6mu9433/VIfPPOXDHfRkl2KnTVxwzYkfBBgxxVTCta6ejnxLFwZTI?= =?us-ascii?Q?S9XQ3fmTNj/UasO/0qnYJ4ZCs5LMjAhYRO1IO72h/YZ68kfJj2KOj4fR/u7T?= =?us-ascii?Q?dNfEU+CpgnR4UsUpPoZXk4UWyOFI99iqJqBkTdEBxFuKvgTpfy8WcsDRAxcL?= =?us-ascii?Q?lXZ1BNHHwpkO8AGpzcfelnJSGT+Yw3KZNk53m3REKjGM+tSy4ji7QBK0h16j?= =?us-ascii?Q?hmLajI7Sn0gODOaQmXgwcz5pWal5YLEbdEUhtTit3cZTjmr5ZVrQWa+7zpKL?= =?us-ascii?Q?pZrIzHifLBz/6k8skuBfT8dUSS27lgXNKLzc9vYXNF2mZ97SeKpSuvU7TOPr?= =?us-ascii?Q?e0bzOvh51eyNoRNfo0DX5rLDjIJIx0VCCJ9KsSLW8hYWX7kjQpvviWMS6JbO?= =?us-ascii?Q?sSIeTS0cvGqOYv6FUfuzs2Z+MyNFqeBcofUbMdFueqAChxYbfib5TRHfilE8?= =?us-ascii?Q?i0ky5rKtC+UFNGKgXaTjdNM7isKKTVEab8Vsy7ScVbCW/2y9bCtf3kKsIBqk?= =?us-ascii?Q?QC0IZ7Q3b4XVCaugUT1X5AOZvl7XN5q7QKVdnfqUM8SC+xy5Tt0M1rCEiqjO?= =?us-ascii?Q?+drK8hHZXklhYXVJsxmJsGof1WJP5+InS7AT/3FRBlgwJuQlnDCYpgBF9zhi?= =?us-ascii?Q?mWq1e3HR1cJYqAg8yxfvDHC80DmAmtxXMOlLqOGwxDGXLaentPwz5n7Q+N4O?= =?us-ascii?Q?2DGUUZV24WPAoIEgNgdCI861H+xY6zQJlqsvrx0kod7noWIh8qlYKGxyiDcR?= =?us-ascii?Q?re7sooRYF+BmAYxoCAeZJ4/uubuQifAoUY1FA07t30FQeTlV9BOYbSr0GVn6?= =?us-ascii?Q?Sz/6WOosL0+9DE8XJ/GZdGuOboI/YIu4l+OA0n/MqciP05S8E5+91c3SD63i?= =?us-ascii?Q?zVwPW0zJbqQkVsb5L3wh8SHzylFRZY556FBUbLmmcxevlXXvOVhB8Be/bXi1?= =?us-ascii?Q?qtmLmfAz0R4InXGCvNZfiRm98gINd8Sr6Jay3ca4dXiN/WY/jFaLKiybqLCX?= =?us-ascii?Q?o4uAu9/8N981wHTuYvEGhy7Ls5n7JwVzONx7kF7RJtARbTQ7JpnyeVKue/eH?= =?us-ascii?Q?rptaF7Kt8uuTHs2PzbS2Ql3BEBjeAh2FC/xJwcigrMxCLbfFVpbSNXwI3Fek?= =?us-ascii?Q?VsyEVJy/MLZ/1+J/BuDEslm7oOL/Mwtc7qA0XwF70Tp/tfPHD6L85KCPu/BE?= =?us-ascii?Q?hZe/HufkUDHcspYUGIcZY7GArP/jwks=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c7d6797-c43f-4d55-5139-08da2e4f862f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 04:27:11.7857 (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: wS92LRbaG2fN9P/nvfHoUe7j5ATsf5fbcsd0U1ScNzy+qd0d3ZVMStkxbnJL4uovHBEiIcHie9l9HgydmZ4vqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7861 Content-Type: text/plain; charset="utf-8" This patch adds a subflow pointers array in struct mptcp_sched_data. Set the array before invoking get_subflow(), then get it in get_subflow() in the BPF contexts. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 2 ++ net/mptcp/sched.c | 14 ++++++++++++++ tools/testing/selftests/bpf/bpf_mptcp_helpers.h | 2 ++ 3 files changed, 18 insertions(+) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index b596ba7a8494..345f27a68eaa 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -96,10 +96,12 @@ struct mptcp_out_options { }; =20 #define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 =20 struct mptcp_sched_data { struct sock *sock; bool call_again; + struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 3ceb721e6489..9ee2d30a6f19 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -91,9 +91,23 @@ void mptcp_release_sched(struct mptcp_sock *msk) static int mptcp_sched_data_init(struct mptcp_sock *msk, struct mptcp_sched_data *data) { + struct mptcp_subflow_context *subflow; + int i =3D 0; + data->sock =3D NULL; data->call_again =3D 0; =20 + mptcp_for_each_subflow(msk, subflow) { + if (i =3D=3D MPTCP_SUBFLOWS_MAX) { + pr_warn_once("too many subflows"); + break; + } + data->contexts[i++] =3D subflow; + } + + for (; i < MPTCP_SUBFLOWS_MAX; i++) + data->contexts[i++] =3D NULL; + return 0; } =20 diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testin= g/selftests/bpf/bpf_mptcp_helpers.h index 4b7812c335fc..7ecd0b14666a 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -7,10 +7,12 @@ #include "bpf_tcp_helpers.h" =20 #define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 =20 struct mptcp_sched_data { struct sock *sock; bool call_again; + struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; =20 struct mptcp_sched_ops { --=20 2.34.1 From nobody Fri Mar 29 11:53:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp911441pis; Wed, 4 May 2022 21:27:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJl0bgDxJ4ikf02BfRd2yTbIcT+WcrisoUum+HlrFqhh9t9i96YGeWdsmFRCOwCcdbqtJv X-Received: by 2002:a50:ed16:0:b0:425:f420:e51a with SMTP id j22-20020a50ed16000000b00425f420e51amr27331683eds.23.1651724848051; Wed, 04 May 2022 21:27:28 -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 y26-20020aa7ca1a000000b00425df4b9895si629266eds.313.2022.05.04.21.27.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2022 21:27:28 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5127-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=h2HyUYfZ; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5127-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5127-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 148B22E09BE for ; Thu, 5 May 2022 04:27:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A923A387; Thu, 5 May 2022 04:27: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 303C436D for ; Thu, 5 May 2022 04:27:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651724841; 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=FFOTQsjpEaARblar7w8MBlNFxCJjVEQp+HjRVM660cU=; b=h2HyUYfZxP0VX4+XD2QcKJV47mAOVfF7neXQ8nV/1GtAaevmelp0O5CMwK0jh8vfsET7+z JirS2HF2eAULBdZkZrGh7ODKbUYOybGGwwREhr2D3PdkzlRqMLP8vsGcWt7XsEiOWVLvcF AOQKRAVcJAkGoHUzLVOV6Fc2gPMp3SQ= 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-29-llvtbayoMEalvyqLV6Hspw-1; Thu, 05 May 2022 06:27:20 +0200 X-MC-Unique: llvtbayoMEalvyqLV6Hspw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KsRBrisj8C1AP2RmfpiGRXF/Ki9A/BMMHUndAnXugTEsbcUTGGowybCBcA1fIlXrd0lR2ExkKOzMag5BJrX9Hh0ZNuBJmPHCrnI8abjixGONfoJ2gVjBM91nTI7fElgy/6ZfDb6MvsHF4s4dqAIkmlEF1DWKHWZbfCgYYY1f17gw3+iHBb0HzO3jFf0CRgWDPk555JWL6FXxcHLmZ0Svc8S4uLQ39KB/k7uyuiNRstJljERLcJu5hWaELJEqwByHm3Rhm4JQGoEaXmhDtpwvH5R1EoAed7zKq0WMvdbVvxSyOLHDRyU+hy//le5HYyYHJYAij/x4mVqNNRQr9fum/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GFVQ5UXfLBnvoUc2MFhdtO2NkYy1Kz3sHqzTnSlq8yA=; b=lwJTURkHar/sQYiTPcWx9SmkfO9zoB7s4E170E9qbgmht/MCXTfCJHvenB+9PgtL60aVnWmpdzZ7jiNbNLrw9Uzc4I2kxMfCJdkA+nUEnl+4+7lloGFJrslEAjPK9FnoLDy+D5ltNgapvBTyZ5GHRxxmRfIcKOtEigwy44Q+4dH+NhM4Kt2PI2CyjTkK/mPI2+ZJmeE+XIV45HaJ4mgTWgLQbQDm+6qyl0njhY/yZwNcEr6Np1XgpolcEKI0LyDSFFY5xJsceGSHWhdBU3cSDRQW4Q+dtKRu/EEI3KdzsC1wooEly/QIy8oGQehPFxC9RNy0r05VT+ek18jy9SuDug== 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 AS8PR04MB7861.eurprd04.prod.outlook.com (2603:10a6:20b:2a9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Thu, 5 May 2022 04:27: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.5206.027; Thu, 5 May 2022 04:27:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v12 2/3] selftests: bpf: add bpf_rr scheduler Date: Thu, 5 May 2022 12:26:58 +0800 Message-ID: <25be2b1db834c7b6b05c1d77ef154fce88abde81.1651724418.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0048.apcprd03.prod.outlook.com (2603:1096:202:17::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: 3405d821-5b99-494b-d9d6-08da2e4f8ae0 X-MS-TrafficTypeDiagnostic: AS8PR04MB7861: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: cPC1k9daSLbIFXGSOnYnlJdbJwDptI1qOLeUgJy5zGVnxMS212yxeWwX8Nnou/WmDpjbZfiQGGqryuRzraKIhSbVuWgf/7rUriZzxCsPPLM3EVFSOUqYXuMMCnGjgpIWqSVuhJQKOE1Lae0Fm+8t2eDtPW7y9H4iqQgCAppvUROFTFNEDBRGl/kv9oKk/a6JEUNTQm5XvLSOXA2Atgb4K3jXnTWGnRp5yHsuzMCeTYPwIdQvNMmHI7h2ZZVrnSV7WIyJ3ZIQz2ZvfMztiFUkP2K311moNiTjD1UYPZu0tDeoyKjbB4JdkrxOXQtg7Jw2BiaJa7j6lqJXX0QbkRpy9yzvTtDOPraQvGWtM+go0wPfMZSCC5T+lYkqMaudXYq0s4QxaxXKAg2q3oVioxJ57Vi6sE4DLbE9mmyaPhuZDbqeiwOw7u1dg0vaUcV8EUfqUGGvJ3gAAPwhBFxDaR0tEi+xMPM5Iqyy+39FMkRQM1VHXvKrmyWhtH41k1rcUAR8LP7o8H/uY4Cr3zwazy2hZ67knUvVfIDaHHqSD9qwwyCpVWwECIuMgT2IBPjkwKeYxOkrxJkuvh8yfbHB/peJlZcVXBjEUF6NWxnWMZxJGGolcSzV3Bj3AYCe1u7VqeznQiQEfLxzmyC0p2buvagBlSBgStNyYQ7LV268fg0RSGBDQA42a/NE0l0ZcSzFUCNY8i1L9UgU+aNRJmei/3naVA== 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)(2906002)(6512007)(6506007)(26005)(86362001)(508600001)(38100700002)(8936002)(6486002)(36756003)(6666004)(44832011)(5660300002)(4326008)(83380400001)(66946007)(66556008)(66476007)(107886003)(8676002)(316002)(186003)(6916009)(2616005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3DSJEVhMfcGhJRResWcJvTtx7p3CeSbT7VcIfVLz4HnTbwJ4v0vq+/tEzwmR?= =?us-ascii?Q?gQz1TZkMGGwSfr+RpJ2BxUW/g9L/vvbMeZEPuBQ2IIiiNboDoDCnzes54qlB?= =?us-ascii?Q?7d3N7ULWFTydItb6aQNH87DGTZJ6Pja8EfqTwNGZQLoOLrG/RCvQfsatge5P?= =?us-ascii?Q?a92CX6JIyZwYzBt0BCnexsh2bRoKc2R2nIig06anunIZ9Hghbg2yqtE5e/ef?= =?us-ascii?Q?YZOAykvZgcI5QS+OXKteWNDA2y9ufsK4A55vzTVTsNslPv70MnEDnk6dMOKU?= =?us-ascii?Q?/vw8x5DjHW3EopuAau5FTA68HozTN8Fdf0FRVBlmKR1VbQMIhl8GIeRVJH+R?= =?us-ascii?Q?SILvujwS8vHJpauuX33RmV6i+qUBE/wwmjx9dCom0w9iHJbrb0L/P6PRz4Dg?= =?us-ascii?Q?V1zehx3FNY68bVI2pRtqnnyP5Fk9yPOrEZdAlC5Fcn7Ezq9Gtj93BRKDYyRp?= =?us-ascii?Q?H2VbqUamwwy3+gqtPUW3MZWSNlOqCXsEufa9QwjNmnseOwHF41LHB1/jWlY0?= =?us-ascii?Q?MHiT8zOXiem71ZCZAtj+tfCz4kB4y0FFr+8DXWsdZe40ZGiq6NY9T/7CpMTU?= =?us-ascii?Q?wnOTzdNCXXQP6Y2XFKe7V/tudc4KyGwJu/kh+ofLybvlCZ9OiE9finfU2RtS?= =?us-ascii?Q?zZ4F82YuQkdV+tSeRaCzPbe2FfrMX3uJIC2+I0ohwxIDRu9R8tefuZU9eGqw?= =?us-ascii?Q?DFWvv7iPdzO5xAKhQDwKi4FpWYyUapppJ5UzYOKR05ZkVaiykQQVAUhrJzz9?= =?us-ascii?Q?7GtVUK3D3g8AJszuNuXAbYHwo5rOEuSsyGuxh/gJxOl7RYBBv9mfYOrfJUfu?= =?us-ascii?Q?ckX6wwIwB3+yUCcKKDvoRttlJWXLpMZ6lb8Qjve0SOtGR/hjjs+cBtralVuZ?= =?us-ascii?Q?D3lW8PVqPmTsqbwl2QlvubSIBsA16LPLAo/+UNknhJrz1PXGYMpsdzHHLo2j?= =?us-ascii?Q?JxXqYIhnpsvw8NxKR/fwYgHc7lAlKbbR5sj+InGvPGJjAx895liUyswIE8kR?= =?us-ascii?Q?aptnQ+sZuyGmb3SgZPMEZLG1f69TEDtkP/ZDKklnJ69FfQ83XjSyE6VvRz8g?= =?us-ascii?Q?LSN/3aaahLuIxwduOAc+cvbxzmp/6iMtI+rrVQVxfrhhdC8lSjvyMFBRFxRi?= =?us-ascii?Q?sh9a1ROl/wF7EQfnPms8yuWXLhKZdbxWVZGx6hsdmVKKwNA86kXh5sfmEUCr?= =?us-ascii?Q?Jc9YaWr3CkzVBjVrXcnqL4xFifc0k06ev6aZepqPk0UZBIwsu+5Vw6rTYbU3?= =?us-ascii?Q?3kI/TpoL1Q3uzEj/HSfpOy8h7DylUOtLR8LCi2Tgn4QGaAaN3T7Y4gNlVkfQ?= =?us-ascii?Q?q8N+YUqn3Z2aGlfPSQLYZNDdt0g8Q4f/8+/kLBlh6PF+kyc7hX1BmD2VTBhH?= =?us-ascii?Q?d9VV60wQ3XNKsV4hIW5s03Xi1FfFV+4OxCSqX1A6/Eyg+f2sDCwTNjU0FAQL?= =?us-ascii?Q?9Lm6kQK6Og9sYsCTmu+SgumXw97KxdQu8bGCYSO7VBbypmMnrIhe261Qw2rt?= =?us-ascii?Q?M/0CRznvu073L1vqELWodQumAtYnrNBljHOn0axRdOc87pwtB27FEHJQahPa?= =?us-ascii?Q?2GCr0+UpqoZSc7gphcsUMfRXkDT7KemlRwdHJhCTVOehL+VHRv+zNLhRAXzf?= =?us-ascii?Q?xmr5fG06M3z46HOrXMJk8i06RDbAyeyRkBbuKbP7w2rlXN39b4uy2XM7Rerq?= =?us-ascii?Q?/ZHIQUc7E8f9unzU+GQ9v6bE5iSE7DGfOST/cEFIGMtt3ZPBGPe0sVvXPgAN?= =?us-ascii?Q?uM+zcS6v7GTSEtDfAVQZhBK3m36HJNc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3405d821-5b99-494b-d9d6-08da2e4f8ae0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 04:27:19.6756 (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: cSCaqVjsz1jZ8Ka/H41U2Tkcox0IDt87lZG/zFykxX4nqlx4SRRoOsFJMjCsCJunXAWnNWTUeWOeX2KpZ53LgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7861 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 | 6 +++ .../selftests/bpf/progs/mptcp_bpf_rr.c | 47 +++++++++++++++++++ 2 files changed, 53 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 7ecd0b14666a..2d5109f459b4 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -29,10 +29,16 @@ 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)); + #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..b2e1bd876f0e --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_mptcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +SEC("struct_ops/mptcp_sched_rr_init") +void BPF_PROG(mptcp_sched_rr_init, const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_rr_release") +void BPF_PROG(mptcp_sched_rr_release, const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mptcp_sock *msk, + bool reinject, struct mptcp_sched_data *data) +{ + struct sock *ssk =3D data->contexts[0]->tcp_sock; + + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!data->contexts[i]) + break; + + if (data->contexts[i]->tcp_sock =3D=3D msk->last_snd) { + if (i + 1 =3D=3D MPTCP_SUBFLOWS_MAX || !data->contexts[i + 1]) + break; + + ssk =3D data->contexts[i + 1]->tcp_sock; + break; + } + } + + 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 Fri Mar 29 11:53:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp911482pis; Wed, 4 May 2022 21:27:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0h3afO7e3J4l9tXrmewUJ7oOHAPltmNlkOj1LUWRZXQ3qtXZ9Kzp/sW7CG/QTAcfHumfm X-Received: by 2002:a17:90b:4f49:b0:1dc:1762:4e00 with SMTP id pj9-20020a17090b4f4900b001dc17624e00mr3708983pjb.87.1651724854133; Wed, 04 May 2022 21:27:34 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id p18-20020a635b12000000b003c253889c13si560704pgb.40.2022.05.04.21.27.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2022 21:27:34 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5128-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=kciipyj6; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5128-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5128-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 D59D12809A5 for ; Thu, 5 May 2022 04:27:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 95928387; Thu, 5 May 2022 04:27:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE7C936D for ; Thu, 5 May 2022 04:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651724849; 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=w1a8T5yipnbnlwToWpoyBHWjN2RYY+E9OHoflZ37M8c=; b=kciipyj6m2vNodWhY6wV0lf2lcvUDh3RyFManU4bUa1IMIzTdqyRjJMdAu+jD8cFiuSkLK LqbOhz8rnPM9jXzTf45VpwJkBVxsts6O6u9gfS8cmEFQY91RYVfW9S033BARwjxmbegffV UqWywPNHRgbkaAFFnOhor4+toFUvUC0= 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-35-i6EWWlVcPySbFxeHyA-fOQ-2; Thu, 05 May 2022 06:27:28 +0200 X-MC-Unique: i6EWWlVcPySbFxeHyA-fOQ-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PnYZ/VyFDTeg1gFE+3o9dqG68MhoPKebmogcGUr/7xjtU+eEJvcytcmOjW7y85/fbpTs1Gq1XYuucwmn/Hm8s3UlIwSMqDZVbGpM1LQWHTWYUL5CEC2byIRBb55N+4pdOfis5WTGOFRAEGVUSLhIMC0vsf4oF9MGRb+llnHGjObWfxr0DuywRzmAB1nNHq/B/hSLaUY1SKZpk4OlMc73THWBitG5Fvsn4Ea7AsWGxzXI12qzC6uFJsclg21UI5WWgRZxDTmDewD0QgxGU5Q6uyqkHVpLDRR0TxbbgcLZfJ8ziBFuQJ+xZ+uLO3c4SVeD3hlvj/iqFMgDasHE9L6FIA== 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=s96QDLX7cy+vmpFvcCA1TxEbfDGF8m2PZDmJ+Or4Kzs=; b=OvNhkhH5YXWHtGL0HvPCu1mBqajToh6PiQmx4SkesW41RPOcoUtchx7kFv/7tS4eIf6VdPJgtVB4xQawkintXgR3pM2gn0P9qJzqX4xyzS58F/CQ4vxBY1lge3sLFf6VW4VLLHi6TUAvuIg86QxSDBPikXBwasLRqlkmhbOEoPY65RIc21UlJSHjll66VT5dx0fhrs+dWter8SknEEZgTEe2QNR0i1YL9xJsL4m1fdzCJ0UAwrUFIcMIY/d8W2K2a2HxR6Fm5wJvsu3qiz8jTFzWVtVB/Dtun13+FZjOjH2N4yeCA3KVv8KM5Z03fHszxI23LjHF1McJfztiimpx+A== 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 AS8PR04MB7861.eurprd04.prod.outlook.com (2603:10a6:20b:2a9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Thu, 5 May 2022 04:27:27 +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.5206.027; Thu, 5 May 2022 04:27:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v12 3/3] selftests: bpf: add bpf_rr test Date: Thu, 5 May 2022 12:26:59 +0800 Message-ID: <89c1a1cb213959a3a59fb7ddffab8b043ab5f3ca.1651724418.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0178.apcprd02.prod.outlook.com (2603:1096:201:21::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: 3a6ab871-0b56-4b83-b45a-08da2e4f8f62 X-MS-TrafficTypeDiagnostic: AS8PR04MB7861: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: XqobN+iqcskjEz4G1Wt7MhjjVyZu+zMEG+aT6rfnRvXwzuumru5EmGSI5cC788QL4vr88bwidAjopDdrtIvfZq42olGg2TqoeIEGqLH550Imy8UPgMFrT5ypvFczeJZjjOMIdYmm7Omk1hSOQD2PZj4DsTouXMDPzSTmY/n5/4/15MYZee+JNMTWYe+PUyPUzCe2RDSYPBBcdXvEIGslQlspPLoofDzgae+c6zR3HdInOChskgoCS4wwoddx+Z/uEvEE5jCSfMd7FUA5aaqimcnG0AYqLjzU77PHfhdBQ6KkJM4KA2Dx4CML2JSwLzcHuD75RFDh0ixeuUMP46K3TbRvsh7PybTYD/uqdwPY6u69uILP4wBMBv44pl9kxemGG+PsUbYVKvvFfLGeP7Loc09lcKO9kAgTJNika5kaPRyF3tTI5sibvCEJV/dNOcv+tUENVlfi+nDuIDJ+78OQ0n9uzpD/Ylj4OqFY0iY9uoH+tEiYWnqgqVlqBhSdRiX6uT4hbBpHVyxN6O8KxV1RPcASAjnkgWm+kGhAPuqpRw7Vd/im47HbtlN9Q5D+KbkT2Ehq5Zf/mVjOmaLYvp4lwevi7z+n/1MiaMvkOntVhNbXL8srCN2WzgrhUPasDyZB19icTj7d3rijEg3yhrpPhA9pvAdSEvIB4mzGgj9Z3q3QGXeVk04AQsV8B2S/vS/3 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)(2906002)(6512007)(6506007)(26005)(86362001)(508600001)(38100700002)(8936002)(6486002)(36756003)(6666004)(44832011)(5660300002)(4326008)(83380400001)(66946007)(66556008)(66476007)(107886003)(8676002)(316002)(186003)(6916009)(2616005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IY97kOso+6ACWOIP14swz7PfxUyMZ4quA1xG4Tc9aG1YhBBS4SU/7COvnx06?= =?us-ascii?Q?8wTAQhwSlV0cfoV86wD0CtXksaqyYIToSOPF47PIt7ht42AlpYSY4RPo1+0i?= =?us-ascii?Q?am4HyS7pXAzCyAe2WR1xhpNtlGQmohLLKtdNAOH02eb9LYY8tsTxSLRocrp3?= =?us-ascii?Q?u0rFE0poMRZg5X7wfTD/2ZVhfkU+awGpPZ3mhuTCLrnYuR/YVgoMamJb8mdS?= =?us-ascii?Q?fO3RTcppg6ugPNHXz+vK1mwyoBHeezjWFC5HW+W4SXKANHaD7mIEo/XURbEQ?= =?us-ascii?Q?6ek+X0cocnkfYM/yrSoIbV2VxyXvsdEQ4kpAJiyNxvNx45HxJq4r8Y3m97QR?= =?us-ascii?Q?R6DUs+6psemL/9wwoFLRZ0A2Ggq8pCH8e/YMjSCcmS7AmOxXLq9RyeZw87Js?= =?us-ascii?Q?9CY7w8OSlNt0Xj0BuczxJk6qyAhrvxFedVeH6/y6dNST4N9W6bKyQ1U/A847?= =?us-ascii?Q?+JTgwzbYbg8fbKKj8I8XA/0xkT1ADBEqyBG0SMkkFy0T534V/F1oyBsREixS?= =?us-ascii?Q?CIVUK3IVRIY3VfRzJoxrREMdrNLMKYkVcFgRN6u4ByKwSVZuPfwIU8s4seBC?= =?us-ascii?Q?5xpYhL7W2FbqLqTpHjXoyl+UfUplkM+KdSqBTn+ER4yT5Zmw0gcbp0f0iNtK?= =?us-ascii?Q?CJ9c9B6vabXKo8CEJWbqHyFNAb3Dm7e4yGdKc7PbBjvrEPtzMW20jcWyHv2e?= =?us-ascii?Q?dENQswd3P/xG3dGFlXsuGQu/EtYq+qDAtxyh+k/Pqu8kUbS6GDVMlV4NMwUb?= =?us-ascii?Q?tyBdoaeGiNAfk3KEp9ySkyp7XVbYilIRkclrdVm3MEPg8h45GhKZEUZmVK3s?= =?us-ascii?Q?mhLe6GoYj+7KJsV0p67VHVkctm9KMJlcUm1vhSFQj14bBJvra3xHenG/xdY5?= =?us-ascii?Q?ph5ShqbBLlzyw8gQNYQGhS3ZcqcYB+PQlQGF31Cosgs2+CRRdRXVtDm+BJXg?= =?us-ascii?Q?KGHrLdc9H2eXbb9sEy2dlFxcFCYdcNHgNJURE8CSRoWG+VOWFPHW2z3RJ8c3?= =?us-ascii?Q?mfUiK+UyUGkXoS1+c8dPp0aZwHeFu2U0OX6Li7/kkBa7I8AIQobnX0J0J4PE?= =?us-ascii?Q?ITtseMSkkyVRuVIpzLigi01acdBwwn63Q/qoX35u34THuDoa4t5fQdu69RsJ?= =?us-ascii?Q?fErcU1BT22spWEME0sRMkYRXrMnmPcCMMDPBoV0hCai4l0K/F6nki8bz9CF2?= =?us-ascii?Q?E8oETTXbJw1EtK0zyI9jCN/S/j67JiqOpxrPIaXiYjunveRe1tKKbwVUuSN9?= =?us-ascii?Q?zyVXjKuMg9y6JSoxMSwfizpm/EJY4Q8aE4qJym+P+0q+40NFWwGTWwr3GfgB?= =?us-ascii?Q?wL7aPj9D/0nEXk7Xz8afmYMK6sbli1U5NzLS+N5LLYf9Y7ABUjtoun19sm+S?= =?us-ascii?Q?C7FaOXr/OvPVsGwzo0YEebktIHUMqZvHG+Pr9C0vB5M3VVXlj5LMxMFrhGrm?= =?us-ascii?Q?FnLXImLvSZKroZUyslAKT0Vab1Ws4ndK1ojT7+4xVANEJDVPNS+9947w2RSO?= =?us-ascii?Q?xX4NGIO2a6/KzUd2iFua+6I4mTR+sxFky479PrR/oXEu/6/WEdIt0A0UAboZ?= =?us-ascii?Q?d1ovQR7eTseLTayPeyfAYbRN7vLI33SreVg2XmvPd5QErckQ+Jn14y2UQimT?= =?us-ascii?Q?rpXe7M2sfbKEra4PfQDzH5ALUwsNVY5iXJGmE72zWt8CCxfIPlM/OjNunkr3?= =?us-ascii?Q?V4VzFS/SMXWlD4pjFfi5lb/Y6tjKL5wT6D/FtQ48czL6Nat5N2mJtzJ5P0FA?= =?us-ascii?Q?MgzIFBFl6FwLf4M927YwLcBF4EA/uko=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a6ab871-0b56-4b83-b45a-08da2e4f8f62 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 04:27:27.2375 (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: KwLYjCsBrRURpTqG6dxQj6tWsJ5ltnOMnW/J+xgXMfx6f4vZDZvJ09n5LNNheUoY/91jYsZqqZzEk1zeqwKemQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7861 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 | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 3106e013b9ca..cc65e9afb796 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 #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -376,10 +377,47 @@ 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"); + system("ip addr add 10.0.1.1/24 dev veth1"); + system("ip link set veth1 up"); + system("ip mptcp endpoint add 10.0.1.1 subflow"); + system("sysctl -qw 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("sysctl -qw net.mptcp.scheduler=3Ddefault"); + 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