From nobody Thu May 2 11:33:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1624:b0:4ae:a3e3:8373 with SMTP id t4csp191344pip; Wed, 13 Apr 2022 07:30:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyb8K7E3XvH//kSSL7KMXdUV3al2fwsKuee2/x3xwQ+R3ggoJTuJO2txwbuFSEyGi08t/k7 X-Received: by 2002:a05:6e02:1566:b0:2ca:a34a:a673 with SMTP id k6-20020a056e02156600b002caa34aa673mr8230541ilu.1.1649860235140; Wed, 13 Apr 2022 07:30:35 -0700 (PDT) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id s14-20020a056e021a0e00b002ca3cb4d066si85221ild.58.2022.04.13.07.30.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Apr 2022 07:30:35 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4724-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=VJSCtMm4; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4724-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-4724-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 79D881C0B41 for ; Wed, 13 Apr 2022 14:30:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7814723BD; Wed, 13 Apr 2022 14:30:33 +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 B966E23AE for ; Wed, 13 Apr 2022 14:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1649860230; 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=Gp6B6YSAl1fY8zJ2qbVz1zeF5plUKW3Flc0vrP2LCjY=; b=VJSCtMm4EfJwNGGFx+Ftx4EvZaEv8VzUlir86fnyrQQPtwmix4DT0O0gYc3gnbFuVdcaq3 L1dkXn5dO7B1GINF1XPJFuu+af502VOKREo3ZXzMWOsMJso+ltzXd+RN9fg+mjBePQUC1G YwdyvYUbZsqu5nTyUOOuXa1O0tgKFdI= Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2051.outbound.protection.outlook.com [104.47.12.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-n68c_DToOX24lmMdLRjz1g-1; Wed, 13 Apr 2022 16:30:29 +0200 X-MC-Unique: n68c_DToOX24lmMdLRjz1g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZKCQPeYMziyCati5D8Trhzi06u21tdSLJMmfvg/Z9GVShIiEKfIKVg0Y7F1fRjjiG36YB9QqF7XW4d7XWzXa2cNuxEAC6NtaovlMAjtcQzM2tpDTevRboRbcne6w26HuAFDCSwa/9GrwmjhYaw/AvHDQlJg4wMfLGrBqD8P8sHD8w+Yqx45eejxyCW1j8YC5rIxZiudOpMrXxxVgIbmT66xLlXcXUOzXcD+KSXUlveisO+uNrSxkYgQ/0/818XiOBXMG7GpOm7i0N6B4i80Kml6Y3NC/1IDEqzFu0DdaulTvWEDbjTH4ukbn18mo47qTQn6nF9JHJ6zHocTWPJgd3A== 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=UdbazcLTvK4bieYrW2A3PG8NmlvEz85lq+QoEiEX3sg=; b=FuqLjBmTh7mQkGGx55bmCmJdUx8zkm+m9ZGgm7Z7WXjtCE5Id0aJ/14OKCHO69PezjHkuP/fZUHg2l52RMk1hJauWU4KGmLXC8/RUjCHp73K6g+rotb1JKANsnfMApTAVFiDvESSw+wmOuzsN0CpYmT165Mdge6pKhHZ6e79FjuCmhCZn8hPKFCnhSS3wcWsfBKO+PqVjOlFGOdaShJUbh9oI7j+QjRkPgOYK6Tv9ZN47UJKuU92AuMkc9BfVty6NLytb952BTfTkQoT8VUO/U/e9dbs8Ml5dAkq0bbwM/+2MM10b2uxRTkSsbSuNVgAMR7g6CpdVE2JtkWaBGGVoQ== 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 PAXPR04MB9351.eurprd04.prod.outlook.com (2603:10a6:102:2b6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.28; Wed, 13 Apr 2022 14:30: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.5164.018; Wed, 13 Apr 2022 14:30:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 1/4] mptcp: add last_snd write access Date: Wed, 13 Apr 2022 22:30:20 +0800 Message-ID: <90c8f9049d9353785ae4a3974a01d9b8c9ae3392.1649860043.git.geliang.tang@suse.com> 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: 91019f79-6149-42f1-2c97-08da1d5a2741 X-MS-TrafficTypeDiagnostic: PAXPR04MB9351: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: J6yCc7hsploMHTGyHecaGwlSIoP7VNXrCb/vKVJ2wZ/k/bPyrGlyQmyZ7O2rwkHFSIDakdzijgdXwo+S3XaEX5S0e1AwCmDgyl9DpveT8YIIPh8DN+8EAyvqxaTJG/NJ6Bh+UCe9M0/BzMLTUT4ReygF6KgCnMMVbrW5i4WL4MRbkjIMGFlMN7OS0WbrFKcbICCwM95M4Guq23ruKPqZSWV7NMn9E7pMo/BcjW6iRihNmRrCpJRkdzZqpMMt5wh4daTuU40DZQPlUIAbyS0BejWeXVrABYzQktZxXv6F8hsMJsjE3ZnuEBq82iCvSq0MNH4UaqUHu9AEYPp9uvxqq3/RlZSkM/ukgObKV5jHrsGvmjUnNYrdjEvV+yM7b8X3icc3IxbK4qmNB1pZzX2UcpxmOAwXqftKCdLBBSj0BdJYWG9pvReLAtT1d8Z1++RRhC2aFbmrcnJw6zfzIu5Cc4BIqNeVKTrjptUkZzDUchgosINh2gFmmjvqk8MDW3lfmCXh56+x9EGPo3yE4PQRErerfuaW5XYr2xQwyP2K+nOVDsWNz9G68j7bT4K82oRRvLfzILEtSZ1FPOYMQx0+Aw8JKiUUWNjh3tkgJgPs9rN/Vtg0US1cJjMqjIfO5sfLgCU6nYo6k974zZVryuTLnYgcaMmNx8CIiNNx57qinR4z+6Tq2Dl44mpfWylOSPk6GgoMZXTMaVclGwzv0mkHCQ== 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)(36756003)(83380400001)(6486002)(2906002)(6512007)(8676002)(186003)(66476007)(6916009)(66556008)(44832011)(4326008)(107886003)(86362001)(508600001)(38100700002)(26005)(66946007)(5660300002)(2616005)(8936002)(6506007)(316002)(6666004)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qxOYliBEBpcEtbr2hC4qzoRwFYb381mn+zywe1jWXbdFURSpeFF1OqPJOAAg?= =?us-ascii?Q?MVrrri9jUBn4sPruIDojfr4EMliHWnM2QiqyYJjv+CgPGaRHQe19I5ID4F9N?= =?us-ascii?Q?mtARNLuploTlHJLwlHcUsdQrZn5jhD4TCLnBQmIVSepqcco28PfvXhxtEK2V?= =?us-ascii?Q?MJ6bmAJShCbgabNfAd2H/JKkCuTJfS94mWUaR6AAeYaCcHkto/O3oIqPsK38?= =?us-ascii?Q?brBb5CLuZM1eLWUkQlGd2LHZbP3mkh9dcBgAf1I8xquEwtRNV30lk/1uroNP?= =?us-ascii?Q?9yAAbRZkreF8bPRn9nkGhoCcEJ+4A5NTRH0YS7X1Qy5e6pTZy8feWEbf8wBO?= =?us-ascii?Q?P9zrDAglGaUpV4kt76/bQ6KARV0AqRjYZzrTJtKXGHwaAtfDrFHEW4Vos52r?= =?us-ascii?Q?ButkdSfMbB3cBtCejPqRAuPtNqwtApwQa35nY1eUwKTQQYkrUidWVXu++KRR?= =?us-ascii?Q?Hx7vSA78sw2WoZWk2CzZl3PUIAFJ5brOE058tnJGb+mbafO2MSvj3q6ydT1u?= =?us-ascii?Q?KFPd//wdIBBDs6WylL3ly3aTGWr7CqJwAd2HIV6RPx992yL7ILzcALiDVSvk?= =?us-ascii?Q?cP2Wqmhr2cDqDAD+vY+Qw+skXUziQfQQLTpsZxiH0ivrdi3bmuPi/Tma/8So?= =?us-ascii?Q?btr/DbvSttGgUO1eKIh4ufmuXkm6WVP7JEKUpvqlkioxL2agXbEnFFtC8Gvu?= =?us-ascii?Q?1+XOPzcmjPjd5EZYeTmeAYPmUGGSk8MuuD7oPeotIFN+vtiBsVoIutNPSNDq?= =?us-ascii?Q?ZhTX7CejMfspQHGjlZU+ItyiN6kcVKhxpt45OqE1edA6vnE5+FkxYSMvuRh9?= =?us-ascii?Q?Mc/N7cX8tORnZkHSSU8FF4q9FBFhZ0Wt/m1j0TgjMz6B4I4E+Twp8fTkqZVx?= =?us-ascii?Q?u+XZlcd0UDpqXKLilw3Pgc9BZ3H0p+pMyQrxlkC53Oyn4tohfH0w2EOnynzq?= =?us-ascii?Q?tspGkz5lwT59fo7BMmWlQBSDoOw5XciBghRpEDENEM5AhUqkdrS255rWMmsg?= =?us-ascii?Q?OUd9qQVMFSZn2TnewX1twC0LG0t4zs18ikqeJWbK0B1fTB5Mm1pazeu5jdnO?= =?us-ascii?Q?60r7lnq4aKjkSZ+NB5nDxSwr7W19XPWZha11QXR3XYjwYAiwhdzLDLYSFcqT?= =?us-ascii?Q?cyfXYTNkjdKCF5iDsgTZyGCprcFwbzswtDYum9csoc+aNoereaRHtCaIln4O?= =?us-ascii?Q?jpB51erFrgaa+QSCEmnb78vPxpjCT0mgSWx69WY6NT9bO2AlfMp+nNaIRx0V?= =?us-ascii?Q?FMzFiBexfSGCvizC0tyAywsJZSF3gkAOg5jljUF53KcoBowslbCci8SQPcbo?= =?us-ascii?Q?+fG+xQL6+wph4XZU+JEb2E/wc2Kqe0+RMij8waP2L+jY8AS7XMcJfXPg6rG3?= =?us-ascii?Q?aimHtupc0ycDKEVBZOuW/xNWw78m481SkAFGK7aHnCDtdy9jNdeCllVq0Ziv?= =?us-ascii?Q?llAq3XmxUTBD/l5eh5w/vRYmcvWhFKdo82ja2Xmm2YXSLcPWTRgR7464QQRl?= =?us-ascii?Q?VgZycjxaqK1QzgPaAmQYEnirrnxPb3yEAlZqarUI+axiWXtKf6/U4dNBiRCR?= =?us-ascii?Q?R9d2Mf7M4U7JG6+R5DKuDgD37mUB7/8VMthpAYTrTEXAHRvC3LlQoPiFaGLm?= =?us-ascii?Q?52tyLndLmDYgWNExCzNUm3WYKUvwSCkm7NpC3IZG9KLTfRrYQPoXEhHavipk?= =?us-ascii?Q?ebuHw5RjlZg4aR6/k5+OmLIydY0V1DyQmbtbWz+bSqfPfudEnKFjgN7hMD8P?= =?us-ascii?Q?nviPjtS8uzss0huuvXanM6UDsArBsDw=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 91019f79-6149-42f1-2c97-08da1d5a2741 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 14:30:27.2941 (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: 2oKeKtAPksUxicE0DxysVw6KsFLDWBNpQNmch1LhUVutkxMxQKeeDMRR8r0NX4jvevUwujjbe8854oZbaanj6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9351 Content-Type: text/plain; charset="utf-8" This patch exports the member last_snd of struct mptcp_sock in bpf_mptcp_helpers.h, and adds BPF write access to it. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 16 ++++++++++++++++ tools/testing/selftests/bpf/bpf_mptcp_helpers.h | 1 + 2 files changed, 17 insertions(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index e849fc3fb6c5..bd3c50b07ab2 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -40,6 +40,7 @@ static int bpf_mptcp_sched_btf_struct_access(struct bpf_v= erifier_log *log, { const struct btf_type *state; u32 type_id; + size_t end; =20 if (atype =3D=3D BPF_READ) return btf_struct_access(log, btf, t, off, size, atype, @@ -55,6 +56,21 @@ static int bpf_mptcp_sched_btf_struct_access(struct bpf_= verifier_log *log, return -EACCES; } =20 + switch (off) { + case offsetof(struct mptcp_sock, last_snd): + end =3D offsetofend(struct mptcp_sock, last_snd); + break; + default: + bpf_log(log, "no write support to mptcp_sock at off %d\n", off); + return -EACCES; + } + + if (off + size > end) { + bpf_log(log, "access beyond mptcp_sock at off %u size %u ended at %lu", + off, size, end); + return -EACCES; + } + return NOT_INIT; } =20 diff --git a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h b/tools/testin= g/selftests/bpf/bpf_mptcp_helpers.h index 9a0e3e7766b0..4f82baee998c 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -9,6 +9,7 @@ struct mptcp_sock { struct inet_connection_sock sk; =20 + struct sock *last_snd; __u32 token; struct sock *first; char ca_name[TCP_CA_NAME_MAX]; --=20 2.34.1 From nobody Thu May 2 11:33:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1624:b0:4ae:a3e3:8373 with SMTP id t4csp191462pip; Wed, 13 Apr 2022 07:30:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzR+L22fAnycHT+co1QnneZW8TgytmEcAiyeKQl3mpSFcQKikqSbWYu4P1SrdLBuoMbcLoh X-Received: by 2002:a17:90b:4acc:b0:1cd:37de:3baf with SMTP id mh12-20020a17090b4acc00b001cd37de3bafmr7811601pjb.194.1649860244935; Wed, 13 Apr 2022 07:30:44 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id b15-20020a170902d50f00b00158618de96fsi9947073plg.115.2022.04.13.07.30.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Apr 2022 07:30:44 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4725-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=Xl8zDGIk; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4725-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4725-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 4454E3E0FA8 for ; Wed, 13 Apr 2022 14:30:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5F12123BD; Wed, 13 Apr 2022 14:30:43 +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 4E5EF23AE for ; Wed, 13 Apr 2022 14:30:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1649860239; 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=NSFgPcvdO72r2EepbAh+rQT2nwtXDgugNBcmBUAn7uE=; b=Xl8zDGIktv2/HJdIHxi9oqsuXmLRShpuDLRGfnJSRjyz995A5dHDRxJHCCfCEx/A2Nncjl bg7KNIdwgJ83fURDiop17TjbKpbphprTXToRmDCUJzJEygNYsrGqtuk6glcosiiMZGyprW Y/FHn1GBHjUM5qXdYmPLI1mJAXSST7s= Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2055.outbound.protection.outlook.com [104.47.12.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-NFuwq0XWPdGN_uvxYbnLYg-1; Wed, 13 Apr 2022 16:30:38 +0200 X-MC-Unique: NFuwq0XWPdGN_uvxYbnLYg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YkwFPbyc4Ot16StDQt0jA2Tibxq19CVHYsEXH0pPh7dJH72H06O90Iwj1QXb6x8TZlBxuqGrlnjS/QMZKL51jNogm/LHK3RDg4rbpLEJ2MREaxeOJsKvi7k6g5H1VlcBwBKlF4KcuZIJ4pJWZQAxDnv7/7wFbLK4DRvGRp0NQzALIUjXvKXkGfMPfyXDjvoh32Qinv1i0guHM7MwBp8ZLktpLjLKsqVI5wfs94dPH0dPX7IudgFCMxq3Om5sToNqjzFp1GoZ86J7DPRl4KWwzhlAaM5K09W17D36uSRqDZCJcSHM6y/MLC/kscsKtQTla/ugElXR+a8ci80SdezhgA== 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=Wfmtsoc+aWoVMOsiIYJYT6lGswSkJwXXCdvYaWGmzxM=; b=Jd1j4xnblpqo+7eEWDPV/ne0glX2FguIy50ZvZjuvOCqNXxkOh5PAxXx6JFR+T3t9UAHW6CiaU5HF4iSG3hSc328RVq8dSHublSoHWuz14UVSLiUdJJ0QSImFuw/npLvR4YqHWJHECUDVgRyfjLqn+JASri8QuRA7iurLObL390oKEO+QhedVJKFCWARaUhWK5JWbuDnN5Azga0rnTb9oFXzjNEoOvkLvkJE/kPsmAZnHCOX8GQgAitd0cyT89xPnJQxLnt3Q9uATrTsYS0myKTW13jwrRd6xQ31aE0HbKr5jVkzeCVM1nAm+LtLoOyoxuFqcO0JCFKWY0x/LIlM+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 PAXPR04MB9351.eurprd04.prod.outlook.com (2603:10a6:102:2b6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.28; Wed, 13 Apr 2022 14:30:37 +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.5164.018; Wed, 13 Apr 2022 14:30:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 2/4] mptcp: add bpf get_subflows helper Date: Wed, 13 Apr 2022 22:30:21 +0800 Message-ID: <0431f68984e7857155a6ab2a5835f6747b4ff0ef.1649860043.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR04CA0015.apcprd04.prod.outlook.com (2603:1096:404:15::27) 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: 45bbb9fe-4a70-4484-b0e9-08da1d5a2d5a X-MS-TrafficTypeDiagnostic: PAXPR04MB9351: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: K8Hc6jXiRxyataSmjR9ooDPGVnyv7Gu5X5hvy4Ejq+lhkQvQPAzeuO8zg6aKOawLbCa4qOwQoPMOvnD3840HFMOlhyHLuSclZGQIICaKeg1raFx2K0YTkNkNVuT7OCa/CM8rB9nF/k33pb2x7q7yqHP+EXeG0WSOdHbWNRvvBgwrCdoGsOEgpUwOFv44BLmPszHE2kxInnV4vafXkgqWd++lwSF/a1WFk1FmoLDGq2S6+336GNBW5pZdJun0wXuYfO+3QCJ9qx8Fxi1AU0ItToOSMAJSZmUBoH+4HGHsr5nMegznxvUvHKQaDHaY2a+lgA/tYeIo6+3BXpj6Pt1BBwuN3Ev8egqP/DU/84RkKHIE//c1GYPVEMH7GItTtjX79s7rDrflBRJvUyivJQWxDnUKWKib3Jrh5Ua7+HlKa+FR11bSV4WTniFx1jPaEjBkZjQO1ti7ta9Bq3UxgpXj7dixx18zWNsIuPs6MhPGeixccnR6CUoAzdJToSvSHSpf2hE5fKu73KuljbkJdgQ2KtCjCwxd4ewi61lJAQBNshM0jEftt6PXlj1WmKaEMeEPk9H4w1wqYmu91ddneH7wBgH8g7IArIU9fMV/rltqCAW8KussI9GZwvTwGycR2qFHnjUA6h3sK5s/tbgEIYGRXByOwaZ0SKMCjWlwrPRagN4DfQDfurFtskbnkbCuzI+HjqQ9BU3bgoq+FIyPqY+CXQ== 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)(36756003)(83380400001)(6486002)(2906002)(6512007)(8676002)(186003)(66476007)(6916009)(66556008)(44832011)(4326008)(107886003)(86362001)(508600001)(38100700002)(26005)(66946007)(5660300002)(2616005)(8936002)(6506007)(316002)(6666004)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3bjbpuKBb57nAvxnaHF0733E2ljPl+ZgHrf9D9MHE+Je1prDJSw6AWbSYz4I?= =?us-ascii?Q?fWtKds3AZdZxCDtAD04Edk6Wgb1iAdF+o16C9j/ANG4rZUormRd2K0GFRI1a?= =?us-ascii?Q?6EnnKbFYur7XMlWb+uxTcdlaaXm+K5cN4xjAh92HQifXZ0QFqNrLUvbnYQ6p?= =?us-ascii?Q?xTtkG4S+72KLWKlAHoppFeUNrHoIdWx0N8WIMrcaBWMPzO99mmLJA6+2tTNz?= =?us-ascii?Q?4hdBud0GCiuh22DwijW2K6u9oGSgZ2cKVSBvvMnNS3yF9ahyOwidrXUFGCdo?= =?us-ascii?Q?vaJcidisu0Ki/CD+09Nd+VGX5pWEHzDh97Rr38CS/w42we3ptiK9tNiCowkU?= =?us-ascii?Q?izrmHeqdCY94Vs7tqVSnDgq07l74tyjG3sa9Cb3DbaIZ+HxKOH44YihmuQn0?= =?us-ascii?Q?wyYKbF0G9tP4JEBnheduSY6QbFiVTwiGRRVHcH8I7kCgwtK/C57PXlpb4B0F?= =?us-ascii?Q?Vdi0M9A4uE8Kx4FEX23KJh1Ubdn9tyhsOU1HLrUnPW7RjnWJRdREZBCOx116?= =?us-ascii?Q?d4I1leDTQlyT4y37hcq8y2z+/3uCyVWUc15v0DpUKmqZf6QIYKPJa9w0u1T5?= =?us-ascii?Q?8A90DBb87vB5ep+QKCgwh7yukqPYdOx06Plp1inD76NZ74pfmPfSKmlt0sNc?= =?us-ascii?Q?02OcMu3gKdyi1xhGmLJOKicUu3xDT88l6puQVt5bDlKtceZDFfSNYz2zHWbd?= =?us-ascii?Q?2Pwqln64fMnTO5RP0/ebyWE3cAlC3eXR6Hr2eje8vwFMbE1Pdewc8B4b2Q6F?= =?us-ascii?Q?6HNIMnfvN5OiH4tcTJx1n7Qf9mimY5e22qOTxS/xbbdS6kUToISg26oW7hBj?= =?us-ascii?Q?8UfLmIM5pZqMCbvWgEpjx3tuIv7IN+rcBlAMKP2n/1SWWMrvJUiHzN0HKu94?= =?us-ascii?Q?n3VB4OMFMLOruOU+1ZwM+WV+Ms4opTkib6/qT1sMucbubr6TOKRUSj73iDBt?= =?us-ascii?Q?RrSAbSDLsBNJz+QpI8U0ULjYvjffTa+VpFKa08MnXvAtx0RuIICDJv95O/ky?= =?us-ascii?Q?gpSL5KCqjv20y/wCXuYCgAG52Pp0la3m6leSeuYP4Fnh8/02BShfPGw8o9B/?= =?us-ascii?Q?vJV8kvofH0E3ADY4sHPDgsr4z9wNZXOMTyXX1grazaQsYJQKzB8r41q9Z+fH?= =?us-ascii?Q?8QvltWTd/A6l5/+Da1Ybvu1vg0I4/BGXnLSD4WfBq5X8XSTGrGBbdCf/5M1F?= =?us-ascii?Q?BjefvoHcWoUrZouu8ab3CFOLO69hMlJxiOzoxtpN8poynm+3M+4n48tiFena?= =?us-ascii?Q?/aURC5jfKmUs68bo9CU2J3NWBalq8a0akObtATjW62UUcdR1nm95IxAPSTA6?= =?us-ascii?Q?EHYlw7dQahtt5/TxdGC7abekaBzCxrDCKKjPeEA0PbKSZTI9aiEvdmg3bn3w?= =?us-ascii?Q?oRJjxZ97iAIOJtRGbRMZWKzY+oDEtt1zsax6BJke4g1B8P9tJ3xWkIx1G8hH?= =?us-ascii?Q?/sYOaLa7lfKphsi3FgBzSziE0rdeWxoSXeInbbxHvEsAFLRZ3CDg2AHf6Xz9?= =?us-ascii?Q?EXitlTOtsMLU9bZxAtRvoGIkIzs52LATXmlKHYkD5lX6hi9H1Tbf295z17jP?= =?us-ascii?Q?LSZ2fMbLi1ibBvwqWh/zoKbmQE51rN1vqumiG17wotZKxDoZTJ4jKx/X4vLA?= =?us-ascii?Q?C/1jie/pZPR959Pa6HfrEe1ET/boDdh4sN5ntqzCgA2iLWeT0iXTG9/ACp1Z?= =?us-ascii?Q?ZKH144wXWW9kjea0leeh8ZpJsytBintbchjvfXVs4IMDza9QzI3Top78n1kj?= =?us-ascii?Q?0Z1/7gRYwfiz0JMZXI3kbCzvFOA48Zk=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45bbb9fe-4a70-4484-b0e9-08da1d5a2d5a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 14:30:37.3245 (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: aFz4ujtyC9lshw2nza7q45UV5WbGLWXjVDVekvsPKkpkPHWsDEFKFHw5/YNZ5TA8jV/JMifS3NHoKa4we5D5oQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9351 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 | 44 ++++++++++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 7 +++++++ 2 files changed, 51 insertions(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index bd3c50b07ab2..823e5af1a2f4 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -157,6 +157,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)) @@ -165,3 +182,30 @@ 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; + + 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 a58c5c84e72b..5581b37028ee 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -490,6 +490,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 May 2 11:33:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1624:b0:4ae:a3e3:8373 with SMTP id t4csp191585pip; Wed, 13 Apr 2022 07:30:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyv8KOp67FKAq1IOxcdmz3RCe4U6nQ8AUJ8Sx/OMBh+hZLRJ2Cup73hBt1kYzh4N6wLYxGQ X-Received: by 2002:a17:902:bb94:b0:157:2ce:fac1 with SMTP id m20-20020a170902bb9400b0015702cefac1mr32667914pls.25.1649860255049; Wed, 13 Apr 2022 07:30:55 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id kk2-20020a17090b4a0200b001cba3ac93acsi8045209pjb.6.2022.04.13.07.30.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Apr 2022 07:30:55 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4726-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=clCmmVz3; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4726-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4726-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 8A3233E0F62 for ; Wed, 13 Apr 2022 14:30:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A369B23BD; Wed, 13 Apr 2022 14:30: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 98EEE23AE for ; Wed, 13 Apr 2022 14:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1649860249; 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=88xXsfWKltYVYgaO2dObpHZmAMB/KMKgRuXu8j/L6AI=; b=clCmmVz3+RCkGBNZOGcZo7hgTrNbRggGrNsqYfGa+oGCwy8Xn4IhKt2OrbFmRz/DhI3H8E +hDhnmhoV2UYAOuAUNFkq5UvJmeXLjpxKvJ9LjBcF+D9QPUezZZx/RYKFuyf/jYH3wjo/S GCfqbezf+EnQyQwTkjCGTIg03jXDEzU= Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2059.outbound.protection.outlook.com [104.47.12.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-mSaUFeDXMfW_8I-c3SqV4Q-1; Wed, 13 Apr 2022 16:30:48 +0200 X-MC-Unique: mSaUFeDXMfW_8I-c3SqV4Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HPmCD5IyeCtIIDO1Dt901zmgHzjT75qBLlwjAbFJEYpWACgGMMp1TvKCuOTiXyp65QcZPv8vh+g4pyOu+/SJeBsfKWVhaMtaVxTxcyUEIhUs2hqoTdFtXVUkMpcP+O/yMDglFa/IXlFKApTCzH7+4q38VQ6FMLhWgNt+EmoUvsdjB/mlpmlK4CGKT0iJnzLLVQb4KvP6DvY8chEuPPf1drW7bzkG/fX+VX1fpCjQl5Q83sVafOUxsrN9G8f8AQGo2I1/9VvzH8+tswaPAgEpzAZslOP9Curb8g2287qrtgOplj3qtrGc01curAq8lsil/zrhbej3ik9KRewkuwjmzw== 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=mvDIX/6AmD6vX7TSqlJnqiJCyI4T2tjHKxDCh+iU+eU=; b=ampAx96KO+G/mTfW0bOvNNbnLl+NyAlRRDVHkf7KACaVpOmKM4HsbQHMgeFSueCzNxZlfKdLjFaWo4dCs31BM7J6IRGf+nX9YtqTFdozXVXOYFMpbHyZTH86zkO92KPWIi2JBZPbUWAtY+3bAQtx8pKVX0jrC9ReKwrDj4LBfV484QiwqJMhMviJ770I3k3RdSrDcy1/26SLG73uG9oNKdkvMJ7UGdpMNwKB56lhGIEgsKv8XBkPrdBSwOBtEC9c2D5Ubm8GkRUl96kG4a5xGKkqyZnKqfcO3Fhvd8Nxj5E3Op1ZsLGxw4TojtRUe4MkRe/U/tNCbHJsh0lDju0STg== 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 PAXPR04MB9351.eurprd04.prod.outlook.com (2603:10a6:102:2b6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.28; Wed, 13 Apr 2022 14:30:47 +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.5164.018; Wed, 13 Apr 2022 14:30:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 3/4] selftests: bpf: add bpf_rr scheduler Date: Wed, 13 Apr 2022 22:30:22 +0800 Message-ID: <949236c0076153b4a0b0f6baefba10a197496c29.1649860043.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR04CA0002.apcprd04.prod.outlook.com (2603:1096:404:15::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: 3a7e4f51-4f3f-4cda-9762-08da1d5a3376 X-MS-TrafficTypeDiagnostic: PAXPR04MB9351: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: 8QARZ0V6MiG/nfj1obKpV71tmF0PB4PGiyFOGqecIF9fORJiLaI0+ssKn49GWb1NjJWqj3y1BCVYPQbpgSn+y5L5lgpFiT5e+R/K10e22ef80OKXJ2xErgEkzwsbhnGEt2TV5Xfb6LJHFJZzFibzxWg78udQ6VXpVNXd3TsePm749K7USfVayCFgGQZqEgGBR1idyX4pNgjkODTCzx6IBPu2NzvY33RkO2Ndjob6b1uQO9iu0u4sCgiVkI/w8Hm/LokxPFvgYGSiq2QiJg8g+9Prj1ALD903kC5X3fTLP6WfAqtad7GT9XQneB6Qmobvd29TUzs/ONNy/i4UnTRRBZ7574jhyWCAjtNf1Be+tfiaKGn05ELQi5KfvRl/pWT+1DgUYp9AH6Mjeu55rUjiBxljr+KKg11UVrsFabsK01Y6bGM1KiwkVjZLrUepX2NFWOjkwv/anke+fVr3ziijKysayMtzVOwkGX+9spbNJP1mGKcKt15cx7yCwKR1BG5fjHxbTKooC2W9p38enl78Y9WDK6VVpx2qW2Ur3OS/LqD73VhyY/PGSiZucmGBb0aTorij7x+W+1kDmzqvGWpCCrzjlvbHhwWfcNyOPNqQzIZeLw7bAcdcFZeM9x2fgTbGthzWJemCvUNLQ4HuM7CDPw5LX+01xbOVpmakjPDyccJ5DCr7IlfZWEUvqBHr4GrOBfy1Sz7W/wwZI9iFyakM5g== 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)(36756003)(83380400001)(6486002)(2906002)(6512007)(8676002)(186003)(66476007)(6916009)(66556008)(44832011)(4326008)(107886003)(86362001)(508600001)(38100700002)(26005)(66946007)(5660300002)(2616005)(8936002)(6506007)(316002)(6666004)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EE9zEzvZjtDWEqGk7xPvYPkGELG+gQopaVqBTWFf/4BcUCIodSA4Wg/7NmOE?= =?us-ascii?Q?07YX/Wp4b59hVZHp8ilLAL2BSW5bc1H0rIX3wFfcmR+52pZzU9RoyeZIGWYG?= =?us-ascii?Q?rRWk9yKvXwkKHiHNl2duSu1J/mgUKNV0FyLRvSd58X2Dbr+BUaYqv+DLVCQb?= =?us-ascii?Q?S2lFnk4gcVBwMLIKPuMu5SEcAe7RXSgQzobfj1RKu7Pk55acC5DNDyc87b8O?= =?us-ascii?Q?WbotzMwCGau21CYw/Sx56uK3UwiJ4u4tLf6HV8ymVV/hQitHDTXDab+adCYt?= =?us-ascii?Q?n4KhbGJ7baSKO+xef9S8GJB674MfbkkYckt8N0mSrBbhCVcoPpledTapJF0W?= =?us-ascii?Q?V0AJXRQugGihdrEmdXMRKqrXNZ6SNpnhL0zDhrtGwVQMKsc1cMQDz0yrYYxp?= =?us-ascii?Q?9IOGSC/nuD70hAVRYhqXNV4zA5ziUDMa3Ypofm8ctVS0WerkjJVfljBsDiX1?= =?us-ascii?Q?UnPqcf5W31ec7QjEciwaNStEJ8VVA8SVzoUPR68MgmpxKDGuI5jD2hIlJavE?= =?us-ascii?Q?WLS2Ep4JXjmMcIgfZBcA0PPYnWMhTf611fEToUxCHtv124at619WBy7zBc8K?= =?us-ascii?Q?5bjmD6UOq3CQ8u5V6xB8vnH6GGC3rTO575N+yBEslpMeEkpXUBazTlzArPpZ?= =?us-ascii?Q?f62dkPNUqVc2GXrWdOD5lLrH+/kiTA+qliq4OmvrRPQsL7FlKDBdflWcYBS0?= =?us-ascii?Q?cr5GYTm8Vq49oM7ZYtj4lgQf8T0D7GuJUJFBPLLRcKYOh4S7IV9mC7RFh4jc?= =?us-ascii?Q?ucsYNrrcvOlB7qbD2SV4dqsLepNaC3Ys7hSJv9Nr6e24wxqZrr/hvfbEB7C6?= =?us-ascii?Q?uVow3tZjfpXh00i9jUi2YIag7n/UjMPVGL+fVKNie6qsjfWT4y5OUFLNOkT8?= =?us-ascii?Q?az8sVb+NPJM/35vIWRaSc8XZFlxFHNwuW1wBAHwYg8LqsdpAUc07ULH42qCu?= =?us-ascii?Q?XMfJ3QkqEO8MXHNMz/XPrFjTwqN3jXh7A3+cxERHTuxlk9l4hXTZjpkif4fn?= =?us-ascii?Q?8FNwNNBD+o68v/oLmbQd1Q62VNJnvwh8QNx0j6/TT+ws+n7wGmaQzJstD5Lk?= =?us-ascii?Q?9sviwwyFFuEvg1h7+HkXgTPWt7D+qS8mdxf6oQ60bHMLNwf+woc8VhMN/szr?= =?us-ascii?Q?Q+ZCtD/29np4UJHrvhpPN8H6gn2oY98l0vGsiKj/BD42bYPDEJm2iq1qzaqk?= =?us-ascii?Q?g2UNQUwkD3+HLb4IoN3hIB0wVoB9ev97TafCT4Q+IJHpXJ2zc4s78sJPSLaw?= =?us-ascii?Q?k3qrfVaSro+a6XbotPXK+3JdoeYnnx2hRJRKjt73ctvLF0MUoIy7c2hQl3EG?= =?us-ascii?Q?4BkglU5np5WCCzcmMIf83wsBPUVDFhLufOe9XbJkjKcMchuEWLWuqjj/NHAB?= =?us-ascii?Q?fDEorDY5liAoax/G2MN0tzvP6V7lej91eXXKEX0U9H62e4dsBYoKuaLTvKum?= =?us-ascii?Q?O2BOOauvLU/xjixEPl/EeuDTzQHt21CofanrdJusRPX+7pyuV9MFPah3p+F0?= =?us-ascii?Q?94FYdvO6AbKTZRcgofjyWhgRbNyqZ7WM/nhrpM5NetbMkSmitur3xZ/bBPZd?= =?us-ascii?Q?WB+oLwtITgLTXgv9h6LIBv5SnYLIZLrGQDFqmdLW1n6TueBLxI/laI5ZI83x?= =?us-ascii?Q?rqLKnU5wpYQjf9yvGIFn0hZ3WBsDu2OPbXg1WrnTCmnlRn99ue4OAxAccHIf?= =?us-ascii?Q?2g3Zt6PekogDdD4R/eYPc8neQjN+NrHwLhxr0dP9CwO8iFR1P+h3IboypJNv?= =?us-ascii?Q?DtZqi8o1BfToixysuvtUrLJ6ScAqfGI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a7e4f51-4f3f-4cda-9762-08da1d5a3376 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 14:30:47.7612 (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: gsgYuV3qiCeXxEYxL+1lAeyH5XXvZADP4fYLE+dctr86tAX+j02WNu40PHY1JLqdxNPpH8arQ2sbJGQC5+Fj2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9351 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 | 12 +++++ .../selftests/bpf/progs/mptcp_bpf_rr.c | 54 +++++++++++++++++++ 2 files changed, 66 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 4f82baee998c..140ead91e2c6 100644 --- a/tools/testing/selftests/bpf/bpf_mptcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_mptcp_helpers.h @@ -27,4 +27,16 @@ struct mptcp_sched_ops { void *owner; }; =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..531ab12a93b1 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -0,0 +1,54 @@ +// 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) +{ +} + +struct sock *BPF_STRUCT_OPS(bpf_rr_get_subflow, struct mptcp_sock *msk, bo= ol retrans) +{ + 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=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); + + msk->last_snd =3D ssk; + return ssk; +} + +SEC(".struct_ops") +struct mptcp_sched_ops rr =3D { + .init =3D (void *)mptcp_sched_rr_init, + .release =3D (void *)mptcp_sched_rr_release, + .get_subflow =3D (void *)bpf_rr_get_subflow, + .name =3D "bpf_rr", +}; --=20 2.34.1 From nobody Thu May 2 11:33:21 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1624:b0:4ae:a3e3:8373 with SMTP id t4csp191673pip; Wed, 13 Apr 2022 07:31:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlzqEBYiAuWubrnIXDV3jvvzTusndXFXPxdGaQ6XWzVpKGiqJJcxFfg9A0yV9wSA9GPE4v X-Received: by 2002:a05:6a00:995:b0:4fb:607d:444c with SMTP id u21-20020a056a00099500b004fb607d444cmr43340753pfg.69.1649860265956; Wed, 13 Apr 2022 07:31:05 -0700 (PDT) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id 186-20020a6214c3000000b00505b770f007si2944991pfu.249.2022.04.13.07.31.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Apr 2022 07:31:05 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4727-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=dKZHPXdv; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-4727-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4727-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 45CF53E0FFF for ; Wed, 13 Apr 2022 14:31:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5647623BD; Wed, 13 Apr 2022 14:31:04 +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 5B64623AE for ; Wed, 13 Apr 2022 14:31:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1649860260; 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=8wez0+3CPjJOxxz7GBxzDLeS9+2Vn6taghNySVWF3do=; b=dKZHPXdv+d2jqrRZ9zrEvE5WVO7eiNDSoKEpQh0uWl+W4wbpEEerP5rZ/cF/V3laP8V5RR eV5DFx1PqwnnyjJ9TljSZrQH1K7GL9wQiTJlGEGT/DAph0qZUIzQhmQJkeW0yuL3BSpMv8 v8IbJEjVGRVQMo7Vpad6H2EFl6dT460= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2052.outbound.protection.outlook.com [104.47.2.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-37-3Y67AvApMviTOoq63rhwIA-1; Wed, 13 Apr 2022 16:30:59 +0200 X-MC-Unique: 3Y67AvApMviTOoq63rhwIA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MUb/gZXyhQXOib2UEIejEedN7j3rJS0Y1pt1CybJs1h42kLKZSH8UTy8XZlyurBJErqSjNtDa+ecy9DGxnhj5ZfpOFpTHh7QZtFBRdsOHCP4pXuqnJ5GenWZbqWNkAc4m3eSBjfTrJUJAA8AM+/bwBPPJaEVtWUI7e5vavjB4UDWjOKSu4DX77BAKMgQEYVgv7hr3xmVIhGWAa7cE5Ehv+kkUOfRSFc0cWQG99csvsfY7g3JKOb1wItd82QVtkMZtK5aqBoZivKGoTwO93szwwYtLA2j601t4ouqEAC7M+ot10gZXk7rmEg0qgPLCYLjpyr3UXoIMgElEQbOxW7jXg== 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=hn6Nuq2Qf3qcvDzwF6dbcAk4KEj3jHOBKBmSNDXuajY=; b=QBlH5qrIxi1CmcyfBOYhLxGNyMuzWTdSNShfSsXZyM0Ap3fI1SWn9eJGI31WPzrhloa6iU9DGxRFjnbYWdSCeG828F/I1uH1T1a1RmowwfibQOHnUgvPq8ylYRvwOrlUFN1Lj/FBZjxtZzOjCw4AZuehu+5gwbCyDi9RIigDz4bc7KoILWeZV/bEuHt7r9V8ECMPeGds63oTh5pf5z35l1d8uuCsDQzoajzg3x9uJRBEQahLQApil7Vjti6JwFOmej/XwNqURzT0rqITkHdqHKSKJTsHR03tgsa/T8/hOM1yxeZMxxiz3AeQLMpmfvK/8URaJWngv5sOgHoSm8knYA== 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 PAXPR04MB9351.eurprd04.prod.outlook.com (2603:10a6:102:2b6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.28; Wed, 13 Apr 2022 14:30:58 +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.5164.018; Wed, 13 Apr 2022 14:30:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v5 4/4] selftests: bpf: add bpf_rr test Date: Wed, 13 Apr 2022 22:30:23 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR04CA0007.apcprd04.prod.outlook.com (2603:1096:404:15::19) 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: 3c41229e-ea47-49b1-a2de-08da1d5a39b8 X-MS-TrafficTypeDiagnostic: PAXPR04MB9351: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: gjIJbZT2MlNf1kagPKkssXG7a3pTxGPeJG8GC/K1wbQFCComlK9eDP+n9eM8ccU8uqEWylvj+P2AYSLuKm+nRJ0W6iA/wsHjdjty7KpWWyxc1qHOX+9N2sMemVUY1OYAF8Fe4T4xTHJN4XCBIZ4c+UvfEnXTjxcBj5l6iTF/+o1JmhTpuP7JQBsaxnmvEuccRr8PGXsKCBZIDlXu2i6tVBI8ZVDfZrpUKPvOaW9NFgxVNaz/PivwU0AWdr1Vf9z6YcZXyEIIdV7U3xf7cEx02iTYr/nTpBNfCtRZPv1To5ZNmu7Z6+jl0XIjWTuH9wBEL6gNAqTkj2C/BzBGIl2pqwFU5Q1hL0hDS2SSQ43JfCvldDnViKZ9wULkKu22dFYSu7HJVHuPDlAzVXxcYYs6QO78W7cDKbL6uSb76k6Dyr0+P0AgfeNjFzgxpHa72qLT3uU2HanCTV9rspFCKRjuNCqyIqknOSp1yvz43nM7ICxm/9TJthix26SyMpeeO9W+aRNIDR+F1ZJT/wP8XHGjVNioI5DY8DdnQ5IW7A32ZdEDSxq0qvErGOLnY6yhoMH4f4qoECRb3fVPKcBnQ1iCLAfMuGybaqapDmsF+DSjtNNxGaFn06YVfDITeEMduI+37v+NTo+lvlTTbHTNKxvLjGDNFMMzP+nvdl/RYI0DsagIfWRYmup8URkuvdSufzxY 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)(36756003)(83380400001)(6486002)(2906002)(6512007)(8676002)(186003)(66476007)(6916009)(66556008)(44832011)(4326008)(107886003)(86362001)(508600001)(38100700002)(26005)(66946007)(5660300002)(2616005)(8936002)(6506007)(316002)(6666004)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9inUiLgORtzAFK5hjU/eEKkQk/wOUfKSv75KhxvYlazucxSn9UqUzm5llQ70?= =?us-ascii?Q?Uy+9bsIJgMcQlT8ISQy1Z86eh9/yJxcNn8IAIrCF6rd1VjxnvcBYJb0ZHrDu?= =?us-ascii?Q?+obHfOnfXq+PzaCoYDM8CNVFsxhwBNaItmSdkWWCfWsKupt4DsZMULiwQ6hi?= =?us-ascii?Q?AKhT75si4l/xKNN8BSWUTBvlSfdK6AcAunZqcyVEddwzUi9Wn7HnHYyOHF+L?= =?us-ascii?Q?TlCRNU0Ou9nyAEn/8TpGKSBFpAn7zHIQYXSsIjJqRQCVcbPpUV/j8hGfPGk8?= =?us-ascii?Q?K5JjNslxiFfTs4qssTS6Tz0UIpMx6KbQCGgYIkNZmjjMSl4107zGzHEPe6XM?= =?us-ascii?Q?LWQ7ualfTInX8UD/T9fIWrDONm7STQgEsEx/wrbZ0KKVOXqsvFlrMBhrmhDm?= =?us-ascii?Q?6nbPrUk7P+Ct/fyW/+5UYkKKv0n8TKJfUN+FO/l6Izx3+nTK1FbTn4J4XKsU?= =?us-ascii?Q?Nj9y8nkVffNW8MqoyAyinyTBFhAHlHMdW4RUk6q6se40Jbe1w+oiWwilU9Uo?= =?us-ascii?Q?szb+znIP+pITVKB7EuJiAa32jXGm84qwYz0H3BKmCCa3xkuEIVNK7cKc7ljd?= =?us-ascii?Q?JfELECSbkPHOuFM7T3eDBd2r8yKhog9UWEJZtPEOmAEcx1+U6wr4td5ZlVUz?= =?us-ascii?Q?vhjoWNTdY14EjuzMOBgyYePmC44UVMIDBBil4VLUhZU+02z1WeYGFmVMOqw7?= =?us-ascii?Q?mJla1ncnayrwU86YIxgPx+JArzaytm+WylaSbECUbPddndHGs15sK/dYzNk6?= =?us-ascii?Q?iWwAwr6t+2hqzTMsHYwEQnrnL111sJrsgEBvMzpoJkvauOjWgBdcLkxpAQPM?= =?us-ascii?Q?uRqIfy063uCQigrFyG1CWSTO9BMwwEBCVrKA1OmFp43RUDd9GpcJ6HjKM9pC?= =?us-ascii?Q?ybflts9ts4XKfbGPBvMqws2iJ/fRJff8GWZk2xUpW5Qowd/BkOcttozN1iIH?= =?us-ascii?Q?GKl+1qV4CXqycuDtAnpXX1Ib2zEhA0OgE/vWML09P8OlH1eFUTCvhXxjprJE?= =?us-ascii?Q?tctFsSGIMUOAtknnImuWJsqr+tEWGwBPDrFiSkEGIGgDSwUQvDB+YY6Htj32?= =?us-ascii?Q?s3GpfzMhWO9LrzrlYDUi+C2U9T6a7ZdhB6vGa3uoN9KQYO3y23Iv/kxhlshe?= =?us-ascii?Q?T+aXnVdfAmyaKHvT8QUfZW7Ihf/H/i+3RI2JkYu5mZeQkrAWL9DSWdu1o7DG?= =?us-ascii?Q?YxekjnFk3lMXw3cnlHOP0X2MC3Ru5e78D9Q91u4xSfrWFd/Z6FNaW44TzmY8?= =?us-ascii?Q?MgxoN0Y8wxLnlDNXHPYkixCmm+L9MMYvBRukWZmr4yAq5jjMwaIEPkgDJ9az?= =?us-ascii?Q?y9SGIWW9uicRNRDpCEM8u3R8NG18f0a4Ip16tPcAzlvjZ4BIIYjMv86piJEc?= =?us-ascii?Q?p+juUdd4b74wLuqM/6rSU8wbSYhcI9GZ6rjFyfZqQSAvlkFB1XyeTpmouXkr?= =?us-ascii?Q?YhxwRnu+YN/mwNUDgdHNB+k3iexM5I4kDOuFh65svmR6gqmcLJgiSLKG6mn6?= =?us-ascii?Q?jFDT6g/eQ9lynG0a1hWt8RDtJIFGRyhg8+xBr24CEin57QkvnvclA7WJvrrO?= =?us-ascii?Q?E7EVMslFNqbrLGU0bfILbx8vaVQKSDtP+y0t2cLzpC6n0erb7mOm4dTQxWQt?= =?us-ascii?Q?oX94IZKPKtkJ87TDGqPsxfu2ZnkSSkQUxGA97mx3YhD7jqgu11f8XsvNeA8m?= =?us-ascii?Q?71o0KJ6TLJoHY55mTHLev2TYY9ofmU2WUMGJ15JqcHtbTwdJQSiZDHgnVV6g?= =?us-ascii?Q?7cUp41chI7GrqSYXf46VONBcHt2h3nM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c41229e-ea47-49b1-a2de-08da1d5a39b8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 14:30:58.2759 (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: GdUo+PP86B+ctzw5vP3hRe40rqEOLsTjQO5weQnSL2auvd486KsGS0WBRwuKPhsPGXgj8Fap13vV/cfpm0g/7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9351 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 01679077521d..20f382da6812 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