From nobody Mon May 6 00:01:44 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp4270668pis; Mon, 2 May 2022 19:07:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyauV13tSM1O+hUXcQwfZqtVLNRd843L0R4U/UXBWj9rFh67fTXlTRPqfK7ZZpD+Wpn9Lf X-Received: by 2002:a9d:20a1:0:b0:5e8:d2b6:f63f with SMTP id x30-20020a9d20a1000000b005e8d2b6f63fmr5024479ota.159.1651543675079; Mon, 02 May 2022 19:07:55 -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 cy5-20020a056870b68500b000e5c7d73db0si9136524oab.300.2022.05.02.19.07.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 May 2022 19:07:55 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5051-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=bvkxTJ+E; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5051-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5051-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 D46B72E09D7 for ; Tue, 3 May 2022 02:07:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6EFB619E; Tue, 3 May 2022 02:07:53 +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 B73237F for ; Tue, 3 May 2022 02:07:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651543670; 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=bvkxTJ+EjblLuG+xS60MwUyUwUwHhzEEBOBm5XzZAsKkzmu9F1mkfYDkLo5tqGtc6qex8J sI8Xg3KO8robWAunuyjCjoV+JnohmPWGSC9eoZt1yzUetb/1LsJX560yqjutyi11VY5Jtg 0RJ9WC/tNnqZZtf8BD3R6ZiCwaNzSrI= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2051.outbound.protection.outlook.com [104.47.13.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-KjVcEim6NNq3zePWVYlVPw-1; Tue, 03 May 2022 04:07:49 +0200 X-MC-Unique: KjVcEim6NNq3zePWVYlVPw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YWuQrPWoWW3Uroh4NtuNvA0nwA826u1Hb6HUl6DvgJhFfm9kXn6A0uTs9BLCsv1j5DTwiWGKHIOAmkWxzYkD/CWaY6vCvtFg7Q++F50of8/QJudi2iCvRnWJf72F44gb+y5WCLsAU6S0PRXMixdxgA9ojF3Ymfi/M/6ejuELNOBsybrCTPVhe9wVK9EymmW+m/WzlLh+2ueQhkgqdOxmzqnCdi4Rq6FFhBfnMv1NhbTt11400pN0H1/1zTtfma2QH8/nNqRrIfuBdyVf9xGZWkJP9VdtUDvmGK+3oOJgZ+r57ATeV2UyX3gdePuDnmV4SXUULxFCIdJ+iaXqfoARtA== 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=RKzApPgoK2j9N6AVP6t8eIdUF0BOEavN7lG89dd/szsJQBTpkEogpYUDphm+188TvO2F99oPsAHIU41LWj936nAGhpG3k9xRJQbBEs2LcDO7FEW7JcVNG5zMi+7/M6WAhux+1E7OYT8ySU8RID+WI/gpo30WOAATLfBzVWHQ/outXemzcR1RCvkxRJVnrtafkg6EKRULEhQOmLKOfafrynp94D73rnqtjrLxhJqK8jocRcuqa8T4Ru172vw1qexEt10QKWyiXch49CWFMHhpkrpm1T8lwx2HSvqoFL5GnL9cwLH4eakrB6o1fCheGkCIQj4uP90syeD/nsVDBNui9Q== 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 DB8PR04MB6364.eurprd04.prod.outlook.com (2603:10a6:10:10c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 3 May 2022 02:07:48 +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.024; Tue, 3 May 2022 02:07:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v11 1/3] mptcp: add subflows array in sched data Date: Tue, 3 May 2022 10:07:25 +0800 Message-ID: <43d0c99ab50fc0edce0de7d410ee40f93c194d17.1651543362.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0175.apcprd02.prod.outlook.com (2603:1096:201:21::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: 920dd500-344f-4af7-6efa-08da2ca9b825 X-MS-TrafficTypeDiagnostic: DB8PR04MB6364: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: Hy4/DbLVH/F5VmkwCsmmiMvGCq8Rd/kAF8eCQ1UJFduEHqUJaymCqIQ7NcmVP7/zfi2XTfPcP6wFTLz4urH8Lgll1toWiJ3SUvqUbx4NR+hPwsGdn6zPlFF9TNaK5WyzcncnTZeR9N0fuNce5+M3AWTHYf0Y05uArVIQS7E2w9Ub7kpy7cSJdO0Qy9ORxluYSC5As0rMhXf5EeOhtvRucr4YonWW5uT/EWxy72IgTOpAgV3f7DdYAOnq3Fqs1TVO0cK0WtMVfsOmw803P9pa8Rtr+2wFDJE5yZPKyV+eu4NuYwlZKmuLp94arzuVL8d2OTyn3SSAscpqS0niiw1htqBiUzPTGc7fezwfRSUtqX+fXEO879ESW3RcJVZxrBy9bj9LycByLnGhX4E47/ZMOVgbkBpkHdCn2xVUQD+VwX1zW8IL0GZlg3KoW2MiamgJ5ZCAObZs4C2XztguVH7Vt1VxGCj7V1hkrj0nM31Y1AquTpFYD3zrgXoDnyBxFKyP4jplPWGAWTFJw1LzpJOAozoDW80SXzDNR5RRVXty60EknZS7zzkNS9P1G/9jsvHg51ssWPxvpYkzBKXgpBAINLgxgjWAvRpFdwcMotPjJT8cd6uLcLaLAlIwOS6hjXBwVqIt2jJLpgdEbrDf9NgS08w3o993K4ENE+JHtTj9R5KQbisuCPIHP3DcGYlNpU6W 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)(316002)(508600001)(86362001)(2906002)(6486002)(38100700002)(66476007)(8676002)(4326008)(66556008)(66946007)(44832011)(6916009)(5660300002)(8936002)(186003)(107886003)(6666004)(36756003)(2616005)(6512007)(26005)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?S3amUYMZ5ALdEr0H+wx2VhH8mAm1fPImN/BByMxgRCz2pnaEfV5OBwtYyuzr?= =?us-ascii?Q?Hr+IetW5SDUJIA/yoO3GpxdoyZJak68Glh8IWIxO3SyXcyuizkna65xqOctv?= =?us-ascii?Q?++gFo+V3A10RPqKd0zD1a+ZhqPl+YNZvza1PRzEmefxCDyXsI4e39+hkbUHQ?= =?us-ascii?Q?FfECfe5OofKHi3VokdPCMgg+zad3jWv4zWHTwasjHupz8SYVXPsPKTVxZPLC?= =?us-ascii?Q?4WdMaFTAE6yF5f2Yw/dFDT4nrLFYFwq5DLv9agwxvpwn5M9Af5EDvtzmHPHw?= =?us-ascii?Q?aNa1qJ3EQigfCWAiD42SCiJf507PP3AYyKF1xzX7ey1JKh+at3KWRir+TtyE?= =?us-ascii?Q?atm6yOivKsN7hxwmtWROljdcQnlUrxDTWGlFNXSFzhgZ62vLGl2RrK65kKEY?= =?us-ascii?Q?iA8Kwu7p80vBeSVsz4cBn+xgsLbEohDIcbsmUiyGAMt9rnNu/1Qghz/ElvSV?= =?us-ascii?Q?3GmFXQYNvBIcu7QhYOJp6XxoMnAtm2ZkY7Idw/rbR+sYrPAu0K6iiJsfGzKq?= =?us-ascii?Q?vk7fgyv32iRf5rdpJdu6KS2rBPG5/+qJQyRIlsco2v3PuDAGkla7vjZQOF/j?= =?us-ascii?Q?U0QlY31FAJmj2ZLOFZfN5574JOHMIakJ3BN/6Q83FLaLuo41ekjOXB0Am1hS?= =?us-ascii?Q?csXnwYUAmRgoexJkkVIlDRrZRcMOH0HP+xdtJeN7zNRJ+lzEKG0Wekl+JJrD?= =?us-ascii?Q?gIIbUBrbXSnwMrIBu5PDP6mKKIOi+7x0jF5bVLoAzuWSgn5qEcyUNi/g9kab?= =?us-ascii?Q?kQGJ68O21m16qbmrsf06nINMn4q2OEi6X/npjPcHBiuxbhBbpYlFFK6PKHOa?= =?us-ascii?Q?MI98feLfSUKmgkjZsLvPWDrCI9saHyVT9YA/OhE66AwIfk0Li6NWrkvWpnN7?= =?us-ascii?Q?9DhIEUHX/5SCP5EchEwfyTna/DxYPK6VQzdtKydgW9ULPE1OVMFcISonDFPY?= =?us-ascii?Q?GKNTfP9LCQokQsnUsIwJVDxH04PtAUWk+tsfGnxu5SGbdIvfF8Em9dalsHs0?= =?us-ascii?Q?NrnJ3Z6Q2SK3Oiug31scKnPDh7WshXDU2euCKDkWMPAoOV5lNayX7YlxxPGJ?= =?us-ascii?Q?q3tZMhQnwsFdDBP7VhPzWkzh3XXuFiHpcB5CDXv7C01a2gT2JpOg5PD986tu?= =?us-ascii?Q?nZmtgcCMx4oTmikEtn0gSXdy3+mxLGoz6+4Ec7qbECNUm/CO+Zz+G9JFhfaj?= =?us-ascii?Q?mnMtlYzmfxRvlgrV/McT25mWtooDn63SqOiiEU58DPoN6TJXM88nTD9J/Ddw?= =?us-ascii?Q?B+GPTJUGbY2dN6s/EBtb0BPoCTqU42hATpdrXXcaASMKjAg9FVIQJmelTbKV?= =?us-ascii?Q?9HrhIyAUELkUtViiU5q8sJsufjY2bhj02N7iOyEKaU507YrWVbMLnwaVrqNR?= =?us-ascii?Q?otxwEW+Va7B/ZodrS49fFICh8T/yi4JFbTYMXFqIevbYvcmv/st6VayN0Wea?= =?us-ascii?Q?imeEwlaLvrFM3Pjoh4aGOrD57OphF+raLsPraJR5ZUvK1IaQUVjZuwMt3LJt?= =?us-ascii?Q?LdC5DEIRIEz4SzDuf7SMzG/cksX18fw6wZRjpaCElaZ3k0S4sGGeO9mW7Qcs?= =?us-ascii?Q?hKHyyqvVgqs0lm+JXynSZgYW7t78oRnJabojcXbR4/SnyF0PoX/Fy/Eqelhu?= =?us-ascii?Q?Mgmv5KpeKJu2MAogs9F4AXZKyvLylci5627FywpJDN6cqSxWIOmCbmJWkIe6?= =?us-ascii?Q?ApW4zz8QyP6h2i/YRg553s0eaPbqExBJ84bFKj1COyVHgZtfHBaE6waYrkkO?= =?us-ascii?Q?f8Oh/NZcWbSCzt7GYPlKpLzk9CfwkcA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 920dd500-344f-4af7-6efa-08da2ca9b825 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 02:07:47.9714 (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: Ucy5ME1saqmz8JUbHIdp06yUQRg0AjJd5pkyz6g6NUwp4dVV7goRnOLtZ++9dw13IKE6Buo6dtbxq2SOW4u5XQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6364 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 Mon May 6 00:01:44 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp4270722pis; Mon, 2 May 2022 19:08:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtyeG4T7q0WAjkim48FweKjrrJMbDjOoYazAzAfc0MDEhFme1+m7q1b6oqVL5xoZstpGtf X-Received: by 2002:a05:6a00:1352:b0:50d:ecff:f06c with SMTP id k18-20020a056a00135200b0050decfff06cmr7404521pfu.6.1651543683016; Mon, 02 May 2022 19:08:03 -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 z10-20020a170903018a00b00153f4884347si16066144plg.563.2022.05.02.19.08.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 May 2022 19:08:03 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5052-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=CqEcGjFb; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5052-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5052-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 81E2A280A7E for ; Tue, 3 May 2022 02:08:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 98BC019E; Tue, 3 May 2022 02:08:01 +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 D9E537F for ; Tue, 3 May 2022 02:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651543678; 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=yOPj+h7rPYscf62V/FGMkheIekiMZnjTNxdp9YdNmnI=; b=CqEcGjFblDjmsJQmBX4Lt5HOX+m4gPkPz9FpnHBsAqK9UFfebauQRl9lbpdTmRidv52fnC XcYoFmCJ45tWpJqk10EEyV+9//7HTHqzO8muzO5AcOYuo1vXZSxOhzyw9R+TejuX2xg+0l g2u9lExdqTD4ZGfrUa/DXKpok14mClg= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2051.outbound.protection.outlook.com [104.47.13.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-38-Lq-ALXykMNeHijDZkY_8LQ-1; Tue, 03 May 2022 04:07:56 +0200 X-MC-Unique: Lq-ALXykMNeHijDZkY_8LQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YbW/HrWmydo0VE/WJE6V1mpu+rQN9tVy0PTYnxHy5SW+YdF7XEMdAso9rgook2HMygViNCej1zJzEx/kQzCxMw2E0FGArMAAlIWWVVDRKJD1tFisoQcsQt7leZIP90FzBksME3lR7ORqAjM5ldA5Alrs4DfAeq6mKUlpyepytsemsksFGgOumZ4lD5lwF3PzF9H7GFivgKIPlHAqifb2ZuBQLfJZe7ntJEQUSvLMaZwnRDn9qr37FlH4c1j03cTc+2m2jI7pUaIO2tBZes9THohCgqAWrLmknC2WYSo2Ll17JJnXIGpPQ/vTstXvYTtA7QwGshHepnxaZCfQEnaMIA== 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=cfUEx3wbVYGGv1YUAtK1mv0Yp9On/yNmhVxlpKNwTXI=; b=RJx1ntUg6VnMguY+UqorlYAEpE/vzEnxFoOdO0StFZmk0I36L/XQKDInGmlnTkZ9gYufNw4eygNa2Yhqt3dgCt4m4MX6CFfZUXeaKX9FEkyE78SnE7yE9r10l3qWb1SMVLP7jj3R61eK1UEx6alDhav5wmD9SaIfZOvCXy1KWmH9U8wjJtUlNJ1eY2Ko643742SRzpkebM9ZjRunBi+VT6tUQnQJh3WjUwWaWM7OzQk069vD2wb43+9y7jNydRuBxdFUIwJ02zhf6vXCxv2yUCm5yrKEAQhAiruxBWgGgCAWUIPS3tHASaFUiWuuevLV+561GK6qJ8qc750JAIEhhQ== 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 DB8PR04MB6364.eurprd04.prod.outlook.com (2603:10a6:10:10c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 3 May 2022 02:07:55 +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.024; Tue, 3 May 2022 02:07:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v11 2/3] selftests: bpf: add bpf_rr scheduler Date: Tue, 3 May 2022 10:07:26 +0800 Message-ID: <763b63514d2829f434e89521fe9a61cf38e0bf38.1651543362.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0194.apcprd02.prod.outlook.com (2603:1096:201:21::30) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26b52ee8-a5b9-4384-ac41-08da2ca9bca9 X-MS-TrafficTypeDiagnostic: DB8PR04MB6364: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: m43dwsPro7Gy2PW504mgrM8zuWwFzgsTPzBfwzsg2YYVsNAXP01aCC4OOWhIeGTtAbLK2BtW+na0NI/IUvogtBCgCCvO3i59mIdeMReCjUEZO6o9BZJdb3Iu9Pe5iB4gsRcr0xv0qUAPGt9FOb3QIxp+jFaJPhQSq3UgMxcNRAP6gbXE7w2mDmT7c6pu9j6gdb8qRUvzQ409cXvl27OVnHh5Xu9gOXXnf8MVeIZzPYqzCL9ASULmBp71Kb6V57BJRuchNDqiky0iU0k938UC4eoQtb7kJ5VdpDnc3YLbR36LnqUdl4HpBA9h2ifwzwfFO2/riH5RgySOFY8PHXj1HbqIeie+KfWA2506BtmS9yvpRSVX3KkR0M7CXJesoepAAhDLDVw52Bu5QgWZZuLLYJQykKFcorQ1EAjeEoRLJDSJ2LR34QKgmITjNVZs1UpJBLZMI2cJvLPkzPNTlOd5MbHtBhfrMkLR/CKVR9Uv1S+f+aEzBz883j4y3aK/gCuBZ96LfLN0tM+uvEJBzMj6uoh4CzDBKbRknlL7JrHzX8710N/Z1znkrb+hMVAXaobuvhR6HT0L8U2YCTsY9deTk4uQCa2SZdfpyOQuGWexHTY4tcz2GIGfbT/+Tsla941F5huudnSW7JxVNddGFqvp/f4Yv38XKWKNd3A2adUjbqOy7RkIPQxq0TDuBGwr0JSGkgYuUdPKJB6xLK3H+qKtmg== 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)(316002)(508600001)(86362001)(2906002)(6486002)(38100700002)(66476007)(8676002)(4326008)(66556008)(66946007)(44832011)(6916009)(5660300002)(8936002)(186003)(107886003)(6666004)(36756003)(2616005)(6512007)(26005)(6506007)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JGvqn+YJauUAeLh2hfT7OsarESBfKdIyqXlnWaLnSXKScaLxSOy3rSMgV/HI?= =?us-ascii?Q?1vVbqOT+zxuSY882GAFvVaTsiVryay2o79dR3tfs6E07ES3Ogs1CHFVsaVih?= =?us-ascii?Q?2TbmyJYqcqpaGp+ei10dbh2s4a5WRqj23nUwtAuIyJfYSjs4r37rAy9AZaXA?= =?us-ascii?Q?ivM9QXpEJOYQlAehOZ+d6MR3U1sxGrROnqjPVit7uz7v6CBOQsYh2FSHpKM5?= =?us-ascii?Q?Ez4cJXdo7zYy17voL6fEm4WLljkBiQHU73yIhGsjN5lTSY2s56JMIPRtX5+z?= =?us-ascii?Q?USy8Udh6TPkVIAXQS+ALsPoqFI9qgu5Q+rN0m+AiVUYU+uMI7/DrnNXIE50H?= =?us-ascii?Q?SmPwhOnQKLLN3L2lRTGPztGmstJfgVS52CsOzVu4KPCUuv+hxSfr2McKqBH/?= =?us-ascii?Q?a6JrGL4RvSO/aovPPniFMYYrbwfPKMPLFpPuEeXE6vS+6+Xl3JlsGKm7uBjY?= =?us-ascii?Q?EtkXaImcLKY0wTCk0m9+h9huflp6vcj8S8mCiCBplQIRp4j+sa49AmDlKtP6?= =?us-ascii?Q?Mw1tEeQ5NeRgXRA0kHyVMi91hhEvcfvIpyKqjkdiNNDbOJkKDie2+8haMdIR?= =?us-ascii?Q?J4SkZ10pHnjRXFqH5D38X/UmuDhTXg9N7KWLpPk8Fu9NhxHepkl+j7bDKrbQ?= =?us-ascii?Q?jW3TqHCUoHgtw/sT4eJrXGwjRkZUSJluUpgcHKFi0U2exCWlFjDdy0HDR+3y?= =?us-ascii?Q?9d1enqGFDaH98qBFBjKZGbA5sfL65lmalRMck5brp8guNzuYMmVSrZrG1q/x?= =?us-ascii?Q?ySZLOQCSrUq4ThT7KIqiempgTP+CGfgzXR5aOI8ZrN3PFqPHYFeSZ2+58W87?= =?us-ascii?Q?CbeyMktEsdap95lN0z0eEZkwhTXV/nGIMuAPDF1jC3rXE8Fgqa84vt0gFBxs?= =?us-ascii?Q?p0wKlYGkEiJ/wuplOz5KN05gof7mjqZULC0eSbe+68R/76VgmGO1L9Ra36OO?= =?us-ascii?Q?e9MNI1dlbQFKU3YK5tmTww2GUrzGkM4HIijt0+fIV33YGuOXQXEE4YqTJFEz?= =?us-ascii?Q?sll6WC+Cl0n0XllK3EnF3RuyzxiM4Gk5engB9DPa2P9s2rANu6ESheY28I9O?= =?us-ascii?Q?JxE4B+mLuJukHWOEdRzoN1uh2NJ5IiBI/rtCOY25zODNIm5eKRHiWbfhfEz/?= =?us-ascii?Q?b4TgmCSTpZfZiBAORy46ABUJo30kH6G0AzHR0PZmcSXcGPKimeA63sN+n7po?= =?us-ascii?Q?Zdypkb4RAKRoXlF7tCJ2dFIImEqSv+SgbD8At/hMmNcXosKcgy3Iy7SNGEnL?= =?us-ascii?Q?FYnhJ/SzZnENXVE4s4hVt8xCvIhPrvtQ6nqB6JPjo2st/qfXVhA/AgGipdGz?= =?us-ascii?Q?xqRBQyopfC/x2QvLRcJQmpwhspSIAp5Luc/WkUAneQprO9MLZ2DuqySvSpCc?= =?us-ascii?Q?23yksVBy0S/JcXbKhNfGDCA0KoyhpKhgrq9mgz1D/2XoieqeWTfKjswNbpby?= =?us-ascii?Q?JXQ/oL7kB2VKGuUzgn1RNAinm0MTYGsM+IzWGsdtOgSJv3awhEafryBQCnAO?= =?us-ascii?Q?JFrJsIKQwoSOLNQiTZKB5a795X+laL1BTxjkMbPC/GS+K+YFD4W3cJa9PVZp?= =?us-ascii?Q?pMHqKkJ6VA6Pco1td1BNyQup/Cxuni10dCbwxo+8bxG9Y0lXXH439C8zAZ8F?= =?us-ascii?Q?kqjA1xz6fhdOPDcmi0GwUM5V25zgsK+OtrML11GAFJJu1pjfrHeBNS+0oh0t?= =?us-ascii?Q?Re3b8HspIVgf0mCxNSeZ4PkTVdRtH6wfjXKjLsuU0PbeYYaek10KlCVKoJhr?= =?us-ascii?Q?C0pHZ+c0I5/gRwhpZLjag30ZymAFKpI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26b52ee8-a5b9-4384-ac41-08da2ca9bca9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 02:07:55.5333 (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: rdjq2XbhqRin9Fd6KIq0eUDZG+HUfVdnwDBO/2fMRVB2a54BkUH/q700NkcK2yIG18TBCdOQMjO/rzD7HvYxGg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6364 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 | 48 +++++++++++++++++++ 2 files changed, 54 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..ab0bb2a38891 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include +#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 mptcp_subflow_context *subflow; + struct sock *ssk =3D msk->first; + + for (int i =3D 0; i < MPTCP_SUBFLOWS_MAX; i++) { + subflow =3D data->contexts[i]; + if (!subflow) + break; + + if (subflow->tcp_sock !=3D msk->last_snd) { + ssk =3D subflow->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 Mon May 6 00:01:44 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp4270772pis; Mon, 2 May 2022 19:08:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweWVgXtPSgSf/mEJoawiuRAHE/UIWGgx1gEaghQ4hULi/O8+4SMNpK4YaWf4L7jE3EXsHa X-Received: by 2002:a63:5041:0:b0:3c2:1938:3925 with SMTP id q1-20020a635041000000b003c219383925mr6195166pgl.555.1651543691581; Mon, 02 May 2022 19:08:11 -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 f1-20020a6547c1000000b003abaac46d91si15482401pgs.722.2022.05.02.19.08.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 May 2022 19:08:11 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5053-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=OjfOdj8o; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5053-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5053-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 1F68F280A8B for ; Tue, 3 May 2022 02:08:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 171AC19E; Tue, 3 May 2022 02:08:10 +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 46A487F for ; Tue, 3 May 2022 02:08:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1651543686; 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=QP/HhjyqP5e+YvH8PJ+d5E86H72GakFzEBOOq5Hu6Yg=; b=OjfOdj8oV64+SnRSVQ11qlpexRHa+hIidVLYs2+0s3KZEaqfByhpFJ6xhz/YkEIveUSP4E nylPJNArtpTFnrq/imM2oVhIN3/hSHQSS/R3B3QslutVfX6r4EA5LSou8P3ZO1oQpkkI4T iIFJ18r4h9es5nzLoSrV4ZQ5PfkyRi4= Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2058.outbound.protection.outlook.com [104.47.12.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-4-aLEDbq-INjqkaSPBkzyUxQ-2; Tue, 03 May 2022 04:08:05 +0200 X-MC-Unique: aLEDbq-INjqkaSPBkzyUxQ-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mNPzkUdcy1G84B4DTPMMJ8n1dpM+IOuf1EF1DPBxLmsDGH025vx+ej6hC7qwOas5RyfV9zTx8XvQksKMqFxydTgecH6ZYKj/xwNn82PosTBbp1lnKLkAOEqobBImk61hIirl5yCuL1x1h04+ZIkawE+Lg2jCIaplbAuCEeA/mCimzSVf4wwse6Zc4cVBrmqHcJlphnQKH9gH2GxKwX7xLBc33DYyMKc1/M15FlJftwmetbo9zl3BhRlghLDQqpkBm0/0aqZzrzLVnBSUXKBjCM8RetY1ZYOUwtqAkpiQa4MVp6c6dNCsEaM5bf9ljbqW5Z22+XquOk3q9liWt3Abxw== 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=ioI8YHiHz+f7fGNENfwLQdD9qu5mu22h56pvCDu9Sqg=; b=hovB0AW3c7IjBjtUewoPZjEoiwsmbGrSYmLReqTnHXTFleejjQ8XnulJnjwmR5NRlvuWlgtIXMWemAxb7Nh+3m8FPX+x968R39Grp1/NegY7uMBnVZFGr+F0u+kDasHk3Lsa+OkYfUk/0qmC5/x434rU9zqmDfeCWtQEvU9Aqp0NpvMO1JTVkq2KGKD44Xt7tPwfBbqpDrDLAd55bCSLqtItJ3ZtnqpRPFiDqXKYejEHtalepUR94COs6FNbFZvypTv8yw3cXwReASalM+1UlnhukQyP4XphoqTZK8AymWlzrikgLtughSHRxsh7sABVcSbHuyyUkfx0NTv3KJV7og== 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 DB8PR04MB6364.eurprd04.prod.outlook.com (2603:10a6:10:10c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 3 May 2022 02:08:03 +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.024; Tue, 3 May 2022 02:08:03 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v11 3/3] selftests: bpf: add bpf_rr test Date: Tue, 3 May 2022 10:07:27 +0800 Message-ID: <349a28151d13448d44fa062f57ce2f6f24cfe9bb.1651543362.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0012.apcprd04.prod.outlook.com (2603:1096:203:d0::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 904c6689-7250-4403-9384-08da2ca9c19b X-MS-TrafficTypeDiagnostic: DB8PR04MB6364: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: Jr1/rLYwh+xfnp+Q3IUhl8L1BxTo4ESSvZqQXbLj3cCa2bEp6a8RNxxFeDX9l0KCJixHvnFOqF2YKt4pcWKzC+pVnKqI/qPqa6AOUhud8Epg+095eACSpEyQkHHaLMe1KNqVgHzauMP8/JAYYeJRrl9dQdk/WAZ/vhiL4AQ8aUglFlKqbcVO89NCARYXTK7k3leOA019yXS4VqNuvGZuSxaWR5/rsrxCZo3eJEfujCuc98fRNmPunKMXrMBeAvkyQyhrIR3GON4pvNUwmP5hYOizHrDnNDG2Sg9F9DL/ZdWJC0RnjNIeu3I5O58HwB3BRCTFfNlrpMuE0NHv31zeDu+9GRLs/l3/wpdB4UlCqI2Gg+BHGWjYsXoUuJG6NZ3PCqBeCYwliJHT6VnSbMNI1goHIHtBRJ2NEXQbJXplOcz4NRHATN4GRE5e95D4VKVC0cRe3Z8UU5IbSG1S6ZH2adQVIYjziokSWj1KakXCRvEKyMbMVsskCiXRp5wFDUZ30wJ0vuHH4odkYu/kmc7MeB12EmJWlllEIIcNK//wy6OtcftjDfwEjXtpLhutAte/rf5zuk+LjlwUlyBtorAYfbUVMNCzt1zfHU9OCK7EtqJ97Suv8tCq/bApcjsusnYROTPhgv1SxHu+fE53Np/LxXqplasj3qXvrhZyJvLWoDNUn6eZPTEJZuCnr4K27dAD 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)(316002)(508600001)(86362001)(2906002)(6486002)(38100700002)(66476007)(8676002)(4326008)(66556008)(66946007)(44832011)(6916009)(5660300002)(8936002)(186003)(107886003)(6666004)(36756003)(2616005)(6512007)(26005)(6506007)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6m99AgvBsOt4F492ihSrT6g/mtXn4f0vu44zsojJGWZPvbuWZxO1Vq+yQfT/?= =?us-ascii?Q?GvpdRiCnd8WcVgeBXUP0CgKsN75/cYK6AOuXx347I3fIx2hpEGJtk97R8gCb?= =?us-ascii?Q?DO0va/8ska9D3BUr5p44/GE4naclaGKZlHJ1PqCyH6WkX8UbYKF57DNrqcTW?= =?us-ascii?Q?nV4ClzETEqwDdxCPVdMV1Cvznb9xecA/Hf0hK4LRLVWj72hyPk/6kovvoVtS?= =?us-ascii?Q?lR7yEoZe+goQ5+B22CX5qk3P8Jf9vwuxmq3EYjmNSc6Yzfpg62PamlEgz0xq?= =?us-ascii?Q?1pxyFsvT92mZfWooFZ5K9zqR97LqMs0UgzQ8U+ZaznxyI+Wwxl07kOegBsUQ?= =?us-ascii?Q?s2kGgZTjHslU6nHWZIMy9U2RD+Z2FYlL53ir9kglr1FED8Cy5ikKyGQTOE42?= =?us-ascii?Q?QX5OfAXkzvNamDhrsHAbs9V3bYsHEbC0kdQSRwbxQErA3moo6f9cwDRTe1uQ?= =?us-ascii?Q?k7G6Ziv6BunBNrYVrptHsAsNRh+SNbie+lBvH+3k1aDdi4LNNHxrwusVToOM?= =?us-ascii?Q?7wDmQyfLMoNx+GsREjC3OzMZ6pAzGCcg5A9hr73ao4r92jo0SbPlreDMp/2U?= =?us-ascii?Q?Ioogr0VEqEtOX9szzWuRGeWdknlyOYzZ9ofEklvK70t/Br0bfVrUA3OCYNn8?= =?us-ascii?Q?7ciMVskdsLwdhgZbONaklbkWIi96wYOYJnIV4bI49+YqxP2pG+nuldsmho+8?= =?us-ascii?Q?nQ+7V2/0wJhCFgdgyktSVYi0yC8NdIialhfucDoWU61awk7wuEvN8rULiSfE?= =?us-ascii?Q?+Krq9P4uwcCOO3qoPzHH2zynHOZftg/jmtOu3tS20i6eyC/bkNdIevRb9fua?= =?us-ascii?Q?u0amiv2lYzBHri5TN//IpT0M7P23zdcxNQ23t6FgrR02T+7oqJBtCSdSlmkh?= =?us-ascii?Q?aUenTQO+VBDCEehTJgzc6/FdOgwxR8eC5CkGCt35xZvOSOMYTtqLb7wxe9Gd?= =?us-ascii?Q?+wApqzbQuUq4wcTEo6/FPBw9z7l8+pUjYXyeJcEzuZ8SOUs5x2yavQK7knCZ?= =?us-ascii?Q?2FNn6CWlckbC8NKqoaS2Jo3DQQ96q+3HfoF0DNyyk6JMycZQ66mcfFEYE6dx?= =?us-ascii?Q?wfRN6X22ADzcLrH2MmkzYLMxuwYKgtcasi7LHQNTmKe4ITJ60O4hP8NELXCe?= =?us-ascii?Q?OYQkkgP9FYITVNhnl3HCkRnHzpFN9m5uHaWXgmCTbi0NhxWDqtTcXlmdEOtv?= =?us-ascii?Q?cf/yRQiuCEB1/Etj7fqMzji2wIxb+E/VRKWyoVOK/aQJEwvLGihuf0EtcY7B?= =?us-ascii?Q?iW54xxft3P1EoZ0aeP42AsVNhsbrpbS8303G9ze0wVqOg5Z6DZGk7n3J4HRA?= =?us-ascii?Q?OaElHif82ZGYYXbHfZ4HkgPebcz4W03EZ2wrdOJPHpPtrrLtJw9mf9J5w0LR?= =?us-ascii?Q?dPNYQp5XISi71OJ4MOypDKLkArXj5fDfGLNt+J78fNXwiE95jSW1S+pjv79q?= =?us-ascii?Q?eMEgruLhks3kCUKDJs59B+7pq73HFMik+lzfMVPbn2xc2IiOdOrD8pbIq5g4?= =?us-ascii?Q?fvup5jbV7LRh+eEvHzF1HaCFPDMONUw7XVF5WkyKpovAndqYYWWfQCpOetMv?= =?us-ascii?Q?l76IvRZ1FIPO36SANJ7+5gSXYkhqSeVQDDeQf+yKahzzjGGyctqYIM4eWR7E?= =?us-ascii?Q?G3QRUmHsCngvrj8jp7U8HSg9VY3LxfhBLC6bh7h/lNNgyJ5I0KBQIGFGvN64?= =?us-ascii?Q?EJau8QwDIHk022s4Y6u40f4fvDVNkixhRdSzau/0j27PKAMVfXleVM0NOsFb?= =?us-ascii?Q?YtI299XiTQB0Dr7MqssYwaTTeUp7l38=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 904c6689-7250-4403-9384-08da2ca9c19b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 02:08:03.8140 (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: nUo1avQqcA5PZJauuUQaE/2KXWbw1CWkrvGRHv2EDMaGTTwNEf/2wAvNGBQiiHRZRBkTocvVGkj/GJwh/GNwkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6364 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 21462c29683c..c400be612f72 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 @@ -375,10 +376,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