From patchwork Thu Jun 2 04:53:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867496 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 A1DCA622 for ; Thu, 2 Jun 2022 04:53:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145636; 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=Pe9efgz0md2SMOik3xDANw3zshyzBbTXhnP5SLliMnY=; b=DQZGWZWSwCpWqvLtGJUltqC9ziHqqALrsY+VXGdecYfsqp11gLrvAgJpaHtDxHDRLMaF4Y I4iN5rG9kkLq8darixANjg0xefJN+pSl9tHjnD/OgAUd2UzzZyUPUCLpNKLS1cAmcaEhZ4 idueWA+kaCnMsofzhfcC7ShW9gaUefY= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2057.outbound.protection.outlook.com [104.47.5.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-6-K-FgMyCRP_G2QgyyqOn67g-1; Thu, 02 Jun 2022 06:53:55 +0200 X-MC-Unique: K-FgMyCRP_G2QgyyqOn67g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G/TDE4fxPotZQUfZ/aa9OzF/giRu37s05+EdMy0FCSZWbs0esRZBzjSjyNLfrKQywlv6+aEKefHx0tRPztxajGNZK0W3LoLyvlITtK2F3zN2PKZnnqUM9TNijLjATU2g3+niy4pALSz78LzXniqYMhu112GFYiSrljvLSKlN91h//NvTJaels41TNrEH6hA2mq7NH+RbvYIlcxCra823r9QREP6WaxZYC76+ua2E7Fy5yK3Yrt8k2kBx6Oirsg7UHTG7+VRH3AUow1Psbfi3kHVKIgwix8XYTExy61629/tcZLB51X1HIteR8EputmMZ6uWdmZ4rGu7f9U4KkXwqsw== 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=TVO1QZIbJ1aqP2Fm8WAfDvTva+RE0yf36bTfo5FVpyI=; b=gYC8Lb4Rf27XLR9LslGdZz/rkPZcPxGDM6G/0p+I+9ytM7IzoQZzaqp0ctKyKojYMzPW3eVefdBOq2/4HkMlhnwFxRhBjHpcq7S2UuegHTm+Yv1/q81u3zRvNHOpKtM3V5riLglGJ7UetS6BH80B84BC9s9gwp+JqACMXBf8j1GDh9a3u8rd4qf+eD9W93+qS0Z72GnlbeIw0W74Lu6SoN/AUCwDb57hMv3aRFI/9fsxGuE4rVYy+gBE28e0kHfDalJ/RM+tJgWooYeO87v3iLPlwvD+ABOzE/zsXUlW4ty5SNtDvRVrHnT8zafHEiqTOjQSYtIvCRKLKO3wENLcSw== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:53:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:53:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 01/13] Squash to "mptcp: add struct mptcp_sched_ops" Date: Thu, 2 Jun 2022 12:53:38 +0800 Message-ID: <04259494e69c548ee9fbbbd79048e6f75466b54e.1654143895.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR02CA0199.apcprd02.prod.outlook.com (2603:1096:201:20::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: 0c2983ae-5497-49a1-7f5b-08da4453e544 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: tA9S8UyLRZ+aG1BSuYlUxaAgj8RuiglsEXjSPQSir1HY7DWWmV747cyJI+ykAdYciL7egOHcJal/Fy730EkraXo4HNyIOKUZoLz+x7L0A1R8+m7eOwlz8J/zco2Z7vOYkuUmYX/hkWWIIhoCU53rELqL60I83t6dZS31AszFRupM5LBQ+NjZGpxt0levakIL4hlvMZKqiskgIJkNooTPfZs4QgBgxzoIIkD75FQJQwjRjgVTs7e+jIxjSAkFWOw9z4p6irZG/GWB3C1xSk/DaAIK6Yv9PEmtzOc1G/X9ZSkA/Syn1v4vBPgaNU2Zw+rJpTcrCt5f56JVR9ZA2w/Z1hADJ99L/rQTIE6076I9pU6/VvIj2put7TanzcEXMvK/696rqcF2K4yD+eaPkLqxr3LQPG4tRlJuv00ft6BlCkWtMDdtLqZsKP/PKaIVIaR+Dopbn/+f894xrOIBSJI/sQndkuAgOfd28bEiKhJ/PY2bdd9tkao5IGOm6AWeHobQP+KfkBf3klMcyhy3P3z6gwWNbyVE7SEgKRZgBsqt5hZP50QGVKpOgxiKccZ/oGLRxwzW2/POAlD3vemLXIDHhYcTN9BLIyYAp9ym8PIp0rtpZmeNjSCB/F/NLPWAxalpdF9/0Xc/8JiLCe47cNl9PKFwx2NF0y7ANlo9jOvFgC36gh0D5qpBkfa4MHP0w8Xg6Wp0qWPCvrmlEcdyMn4zDQ== 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)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JCb6n7q+GuJ4MSYTkLWz5ecVkaz0PeaKPG8c+tVmAchLZrW3IL0FS+sl0o3YP07ODVNDox3IHWHjik8ejqDCP87Pq/tLYP2byaWvCU9SgpplXt1BKV+BY/nng1P6Bs5iteaknixjSdmbGo4xLk0jdxJ4APtZQrn4AQpSgr/RqtY2VQweGSf6STl/Vmq7HHVcARcPP4sXhCpAMx6ry/I1DB/dbxwPBAv5KJkPetQrs6SNtDanoR4S+qe8WhSepRqGjqrvz8Xoxlb/3YUokcVwY8ogbUVHo9Q7J7f3MlpHgyyXZ9IZcPRYP4di6CbdmSf2KxqKedGvqG+YGSEr4cRS39lB7+iXvC1iCZGPwumS4GEl/BeQLudITp3ONZ2QwyyBiju1oZ1BHehJO9xzlfHU1Exd0f4LxziwCHlRb9EWk8gL/pYwxI29zzhhrJzhqGq7sOw7MaMyI578FxVCnMzLMJk8tA/p0jVeY56V5jBfxlJoZM6uXD+LepA+oqEcnidq5Te802fXNuZta/kXxjbM/TxS6XypL85t2s2vd986AH4SWtEojsggLn6tMm28VDv/5XurEO/QhvvFknvXoK9IlUf4umvov8MTJG6Z/yhXbUgP/NiNQBmuYB07jjz3VpAWR8WqDshKjNH6naoExjvPM9377CWZ08+2E2N9SgaN+s+hEtDWrf5qnak+R2z1rA/fjphrkt4CE1dXtVA1oY44Ld41E/z4lVYZJx7LKcqvuNXY/MTp2xL0r8g+zInDzW9YGati/dx2tl4RR3zzU+A8GthKQHtAEb6ovGcWT3ADUasoBJh/1rmfyDZGzfJ71OpmyqWEBPymK/k+MaogjnzRESKWXAm5eCPvI4IaDkYjAOXnimNmtS11km1fKUFQpCMmKRORWb2/aRzB6ShiniLFUQQCTJhalh/AT4Behpej29n1QjpiV7aU+6ACfsHgUG9zOJ/+g66WcCRhyNVJDDE4W3IOC3/2NupG6/3b2hu//ziJj+qTP0mNEp2E0ffItweoHDqNRzF2+hJJMiq8uspiF8KYht3P8d9StRKaI94Q0iWo1FO7M9VXQ7dFdlZGQVZ1YNYYPjdIOg2IkTgXVFZGETU2OcOmR+E1qG9bjKjRxK1W06tVY0iqSAdQUPVDhSHnY2tvZermzIzxtd/dwNU+y2PxkX9+7mL68ok9Di4zE9/eEcuL9xQCgvFzsjJUkc5ciy8FniIUC6ypONq1jitbL3Jp/ziXLIoaXTO+bkiKPLQDzYXAYoG2HK1ef1HFgrscBWE/DXeqWnhD5cK/r482+Slenz6MwDIVNuhZ0onw0sqPBIIHmlkIrm62Bgh6X5NN67zLUt71tKyT180ttfTbmT/UICSFGURUT2GvzA8/hK0ezpaJjdgBTRDdXcq4fK60ebNGndV418MtDYN+7ydwzdmrK9ajY2rdqPbsH38XR/HfpC3EQ60MgBDNp2RF/jhzZL9bJhwothc1ExrpJfMRgcRIT2/ZCW0rMQcKiMG6YZ67NvI/ebnzBKuz/70q9hGBPLB7FmDXq1GJy/14PyUFuY4EsJAg6WRZ8ZFVZ9OYjD5WYopN5rY7F3s4wcqXri4pKqrpBUJXdpuLKAaqc0wvCAMZkz1OxI07Pv09JOx+63yjUFdMawFarXasKJep45u4tGwQx75C48Jq/hk8RczmbvShtxPKiBX/lJRvCaOlx3jCkiWytrUcDHaAbRKuSoF+GfsAqtjK6ByECNvA5ssmp4Vg8QKXSnoczQEf75uQLwE= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c2983ae-5497-49a1-7f5b-08da4453e544 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:53:54.8135 (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: K2VxdO2FLTnTZKkQOF+QnQLEQUeelkys1i1XcfMBUHJIAP6bUvF1/ezKOcBSMwQlJLTDLbsuLgJhTZRGTT8SkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 Use new BPF API. Please update the commit log: ''' This patch defines struct mptcp_sched_ops, which has three struct members, name, owner and list, and three function pointers, init(), release() and get_subflow(). The scheduler function get_subflow() has a struct mptcp_sched_data parameter, which contains a reinject flag and a mptcp_subflow_context array. Add the scheduler registering, unregistering and finding functions to add, delete and find a packet scheduler on the global list mptcp_sched_list. ''' Signed-off-by: Geliang Tang --- include/net/mptcp.h | 7 ++++--- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 18 ------------------ 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 6456ea26e4c7..7af7fd48acc7 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -97,14 +97,15 @@ struct mptcp_out_options { }; #define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 struct mptcp_sched_data { - struct sock *sock; - bool call_again; + bool reinject; + struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; }; struct mptcp_sched_ops { - void (*get_subflow)(const struct mptcp_sock *msk, bool reinject, + void (*get_subflow)(const struct mptcp_sock *msk, struct mptcp_sched_data *data); char name[MPTCP_SCHED_NAME_MAX]; diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h index aca4e3c6ac48..65bd2c6ab1d2 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -230,24 +230,6 @@ static __always_inline bool tcp_cc_eq(const char *a, const char *b) extern __u32 tcp_slow_start(struct tcp_sock *tp, __u32 acked) __ksym; extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym; -#define MPTCP_SCHED_NAME_MAX 16 - -struct mptcp_sched_data { - struct sock *sock; - bool call_again; -}; - -struct mptcp_sched_ops { - char name[MPTCP_SCHED_NAME_MAX]; - - void (*init)(const struct mptcp_sock *msk); - void (*release)(const struct mptcp_sock *msk); - - void (*get_subflow)(const struct mptcp_sock *msk, bool reinject, - struct mptcp_sched_data *data); - void *owner; -}; - struct mptcp_sock { struct inet_connection_sock sk; From patchwork Thu Jun 2 04:53:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867497 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 86EA4622 for ; Thu, 2 Jun 2022 04:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145647; 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=ZTDU3pJZuBJPBMD34vhy3je0t96MMoQttyBTfr9h9pM=; b=UIlpZjVJrKt/YOaX6yFxsi5I9i9btFpzo/TpHvJQSOZbKahzkxBidm+twQU63+ThUMukR9 +z0pNRWxmlv2+UAVGSmb2FtL8wUiPexiSiGy6sxxAKhRoMWGYiFDJkuytQRisFfL9apc8B G32Ho6p9j9At480dkWOvbMmoATEp8DY= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2051.outbound.protection.outlook.com [104.47.5.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-OFX5vuLpNqqx7_9vPjdOAA-1; Thu, 02 Jun 2022 06:54:06 +0200 X-MC-Unique: OFX5vuLpNqqx7_9vPjdOAA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CptT1palNcdnb6sOOfdLdkBx7tMPU7ZRk0LdrNYdE/Jb6X2hBJwwOa5GtKnWUybAH+Xz/7Qw3xZ25rwKb3czTeArYxt6JZatYLb4BMrP0h0lhjHjQ+lCDwEh6UfmnszYMnt2JOIA2ME2E4iBpeFrXXKopvQtEVjD3sUbXc3zBXK2NPr9oalDJaFlHZKI5jeuqYxVXukFj5aLzQdlyhxEHZifDkF80cerfxjebH9PlMMTuIcAn6YJ130t5SG4XER+OI6nBOhViOE1CredwLG4GoetjrApb9GeAuHRWVJyakXR+XXgJcdoG89hi3H35d2ieVcaxffvs05RC5PPn+qc8Q== 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=saTEpiYuGlsohQICBKTIJXmaDO6umunA3SFBmrZpKXc=; b=YHHUF/BEkvG7JfsNeNhuu5VVPMhAuD+mngz3CuNnMH9z0zrPeaLLl3dsqdzGz25IYppQ6mbFntqgR85HU2RZPSOUdXF7/L/zqOtfLaVP3AxhuWp53c6zhHRuCxP25yXo3Xsj16MO8isa/RmEwzbGhhlp8LNYDS141Q3GvE2Wcmb+7c3xXErzci8Rq44sKKY6oObc+BzBjNkQQ3oPsyBb69+c2634yyaPwZNilpvnbV5/F4sNG92+kd03N0PsdHANE93T5OQ+OUSvgs/xwSjtF6IaLBk55LBTEZtGV3F6/bLYXWaqTW7fn/Atu1GAnIupkJ+sSoF6oAUSd5lTrvbteQ== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:54:04 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:54:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 02/13] Squash to "mptcp: add sched in mptcp_sock" Date: Thu, 2 Jun 2022 12:53:39 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2P15301CA0012.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::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: 5f814b8c-c5f1-4c27-2f52-08da4453eb27 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: m7UKSZT5eLGJRs7whyNoZKKlCUn0iNTa2njJ85N+J1NDyw3VZYO930EcbCxPMWImeQQujh5lCCxn4xrxVVj//99qs0swKVS5ABD2Cz+f0ITzn6HDlqCWl4/5NwzRleqGtPctO5DTNbAd1byx+mL5x05NtxyIpyH0WBduXeaTizfhy6aiyorsHwHtouzvF6pL5sIUOgeLmwo+X8KR+yv3YrO+v78fBHJHrjtJHcZaKvO2eXC7iqHvPw6derFLmxZgtbdD43QOKoeylkBAKB6j9eaDw6o0dUIrpKE3xF0zahbgIsC1Z4pwV9ZxFBaZkOkyI01PYFtnB2RtLGvBIlyhMK21M78GSvJjPT9Tm9H14MZUj58c14o7Kde2/ihyQqZ1yhI3OVqU/HJAQoWtu3Mq9AV+z4LlsJMrbjQbTfADUkjIksafivlb+inRp3AWA5s+E4AY/0Bf0deW9WzcGoyWkrLf1qmvyCY87O525TckBNwxdDKAIUk7cuJOkznuHcCJ15WDqYG+KBKUP1yTX4Nwdza8jyOO08yc3fwCrdNMHXc5vAURakUXq+1RG9xHTjQ1FSEbikP6MHT3MKLg6R7UQ6c91D6hedE6CbwDxRhB6meSAAtklOSJZIwCEpsZSTIaP+XTmd3RPpJ8tw4nrD6lMFwETymL2hmvuFpOYfqpNPxCmkm38km0zLNoL4o780f0/0jaAOb6mAN+BAY/DPtvFw== 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)(4744005)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KGkR7qVpqfci7NWcI5MfcW2qJd3CxT2DlwMGGoSAfq//TQdDMtvhwo0SFKyAZhstUj9EvMZVPz1/7BXis7zef3jESi54e6jG/By1aUhX3TSOiuN7EqxAFehX3lyxT5YSHnxcobLJ0KJYX4nyhIqe1EGXHTyM+zIskNflYTDA/eF7AYYVlc49QJWLa5RzbhJvnaVQDl1pNkKp9QZ28VK0jIxDYYAeinBA9DihQWb1Z8LxYrgMgBT/PK6ZuXvrw+Mgz1c/oAHjnSWwgvE/EUTafK2t/HEYVRZaoXZ1ce11P7OwkObYtbHllJXonHgpGkjV6xdgTpFh3Uf5NIx6AZdelNL9eWq/SefTh/wfTYxPn+Z6kccB/qg6XIiPRchD3YRdWyMgGhp6wY2nDq9NW2ZffVbGTcwMoEvEIIzbS07QxlecRMLl5/cPoYDOVYLLZcGdjFzOw1IlM/G9bMmyo9xtBKUJFKXJPN3c7HItskdN5AOYQqjkHIzvGRC94kp36SSnTCDu3UdjZo09e471f8PuQWfnBdkxviXK7UmoFL1EIUWHs69r1SIBWZQPZgDG1BmfkVgeeNpzZPwToHdY+rxB9v/RVCOnAAaPMN/+JhyjWbhqvs6E/to3FxNRJ2fhLcNoQDU12Gxy3TQOGRVxVxOq/JYmAy8FnW//6hSTF/2wx51RJ2XngZNU8xzMoJetaDi/7kJimbf7cXHIoQMcfqlorHGHnYf030mAdupc0fjnqV1Zw+V44MP3/uCpRgsQlqgnBskY5yiGURR+mkMnjf33Aq21ktBo0RBDIh1PoxKCFPq+7ZoiAU1SisxLvAAGjE5yYAkZzpSwlx7rzAEZnBu3jObUCBl3OxvxIlVH4QQpX6cf6YOXR4iEEWz9Q6G0g8bVUBHWyK5B8TZqint3neoZcWH7iIfsoGuJaOPwr0IO6M4rrG/+JXfaP4tNZI2n9eXSOtFNvROlGgvC2284JFYa4X4jumBNg8V0EGjsbOfraG65eifIn7/ubQXzHb+rFFfmdFtZczbD28pvFLpAitBhLlgvt6qXwX7nvf4s6tshazOYO3Gi804TLOGBAIhTRCtO+tmyz8iymYMzmwhcEWDWe6nmbmt8Loa+R7zymQzDrT6tB6eVWFg8yEFBjcZIO2blYhwd8CohCfTx0Ddm7pAdX4dyrxJ8e7EOHqwYJ93Z9f5EGncJYQuCiQUU1PVZ3mgJv1caZ4mS7vO20RBtB6xZCOdo74+uLEPiVsgKLr+Yd8ALMpKR93dsxfCHOoO7Ebb5wD7YSk39bVDxNuCQGTylZqkb1gdYDRg+6h5S01kM5bERErtBAp6A5JMCDZVXs5P26AakaoCllvuZtuj1hoqFlyV3Rqgzxv2x4CmTLJGHDjKhHw2HB9pZE09QFrn37iYm15/kqEYWCwUmflTW6V++SifB18AbSzxdxLMzCHd452dgzMUqca+j9J2SNi8ksCnKzN0sWpvZUb+/GEN0zNrU/Es+XoadM2esiLVESQBniqB4PF+/K06PPdmS/l+9c8mLuMfPl2L85D/AN8D7PPAZmYNN3OdqTjlDREcluvQ0AK0XWtoyoP6dzBKgyDIfhxwv5Yxd4yymBZT66UsjHugjAZ4+vIOgxPhfmAcv3UpeHbqoQj8DdePfYAi7HZAFjh+6J/0RhMloK+3dZkfg0PvWg1dfQmokkMQr5sjiPp13Gs0NGmb6hocBSRey4dDBIg1kbO54b2PEOmXQuq8QwRc4yCpk5KDrPiC0qww0wnS4RGk= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f814b8c-c5f1-4c27-2f52-08da4453eb27 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:54:04.8284 (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: PgUQDe49tSrD93wGKDccsjbUOlD4SE4hm9iceC3YiQ+C0UokN1KNqxg/eb1QFhlbsMDNw48AI/nPX4jkVtX2kQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 No need to export sched in bpf_tcp_helpers.h, drop it. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h index 65bd2c6ab1d2..82a7c9de95f9 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -235,7 +235,6 @@ struct mptcp_sock { __u32 token; struct sock *first; - struct mptcp_sched_ops *sched; char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); From patchwork Thu Jun 2 04:53:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867498 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 BEE2C622 for ; Thu, 2 Jun 2022 04:54:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145655; 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=0qAbiJzoDVGXW2pY9Y9mwHd7G0XZLA2nSMbXIG9Dwck=; b=LdHdB2INVyJeMU+dJ6b6EpOubgkrXzbvSbZ82SvnvrwTlouH9m56BaTLBSsrOFYu0z2Hxv OyYamLowJvddX8ay9P2AGb+H5VOsEi2FkJQixLsFaHjEWAXa9sf0HZeYQjrSo++LSN/XuX pm6p+dUY7zMnoE6yjp+FqakXLhmFxUI= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2055.outbound.protection.outlook.com [104.47.5.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-41-EjZz_cmDPMqdZEBqH2ZWfw-1; Thu, 02 Jun 2022 06:54:14 +0200 X-MC-Unique: EjZz_cmDPMqdZEBqH2ZWfw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QxQnBLWEcBFwAdvSAH1WNFdSFHEx2W5PBjrXyfaZo0+GZZBIDmNhp7knJ/Stvi7FmVmnRxSdYyZMFiQUzXYizwL4Jz+P4t8Fxv5gQo3kPTvGjPbVdiRececaOnZqPxe67U2IN758Cc/W4tDiNWo3t0Uk9eKkmjwWUd1qj38jQ739YM1hlvOZ8saOmRFKh/6P8Gi6K/nMMV+JUpzqzSsqGtVRUP9xFGcPKa5sW1QQTbuPhehsFRzYrXLkvgyUgMzxhBOtAEB9KvX14FJTSbIs8Dc1JjzoVhAJsgGjMZTTSiikTvdJlwXZJTdX/4+jeR8NmMenniEP5fkqlZXagEm6Yg== 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=xnG83sEL5c9IwGCfTZodBrwe2P34J8rb6VUWt+A2M8Q=; b=CnNX9uRuDvwV810EGyJA/VRPXKt4ENiO4wpqEpWAH9dCiGjWWUyVSfIcEXABiVStpAEFwjKUaMut2aWH/oxOWFpUuEW1jSYCKq2e86s1P/aUZaMc23d/TpGsw0j4QLtJjH5/dk0PGflULZYxBqnHU8f/TCQmZGkZ0Okk7u2aVYvV+ldHWD2vZVkdP08OiDQ8kgHcml3tO23YNqGjDh6v6slk8wQ5DUNyGfJDe54cYCkpam1hhgcU3lnY1Phh51PvkCCLoOGzf0/+Ewwd4JQ4jl4v1hhwRZjb3As6EQtQse6UupHxSPZdX3ixoMzFezDFYmpdajgHl7vMlujEXKWVlQ== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:54:13 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:54:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 03/13] mptcp: add scheduled in mptcp_subflow_context Date: Thu, 2 Jun 2022 12:53:40 +0800 Message-ID: <1995c630ad493fb5f0f909e68372a3c92af684f9.1654143895.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2P15301CA0009.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::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: 107870f4-4ff2-406e-8f6a-08da4453eff0 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: aP4w5MOw5hyVqWUlIF/mfiN1JnbQWCkMEbd+xbgzYN5xIbuEJv48VrqWrG5c6kS4Ugz8lq0V1ghek3MSdzvF9q+Pz2b4SH2PhkPRwMD6yNZAznJGPJbZZINVFY800yCcdR9WPZ18WTPzRMKcWSG3hVY9XOPyAyqsw5agNXWk1XMzIZnNwq83uKSVXlOnelF3npNhTtYb1x+LvmQ22a9pQ85XE0VPO+e+HGE5782tL3BT1a/0mMawtl2LocvEcQMy9j34bw7c+JBFXVSX0v7xtkAwG1oW6EkMXXzN04mCI6dCu5v3pQ4y+jLXJvDaV3DHCaf41zNwai8nW8sNk1h2zyM6zJAH7FhA4Vy7WFjXpPKl3vYd3znChZJRYHQ4GK68uUe2ffH4riJJqcUdi+CbAxsYXrfirHwpOd7XSy/0/Tw4B2a5Krxe397XN0U/AnLh03j5E56zV+29yOF2YAWZdL+03N1497IRiLLEV8HRN0iJALd6z4tB8AroVwnrIdECEipFziQSFVtzE/lMBkqmCV4foMXZQe3HLLYLAByVSidFDgAffq/DJNJfVMEWAh6qamOWBeGu99yAwcmvR9Qpj+qKN0omJmuOTZ9LFVhhsYm60fZ0OaHJBWIGSuV6/zWOGWr8apMbdY/GLWVj+XRAu5CLjI0XreHs8Mn0I+zAIp1t7gWcF80QLjn7um739zQX 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)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 46qsTWbnbKjQIAjUahH/EhoIrQB4TALkd7m75gpSq5R6tObxc0Hc0hG9HmDOeawx3wYSRNHPBSdixAGqLhVT4jP4hwxSnhD2DD4vsS8OvEz15Np/r0qfChLVziAtWlssrkWujKgEPtXuMc0noIFDyIMDVdoFmgn3y1WE/ZfmuGVO765Z4YSUn1m1uY8ZflsqjLJv4kz5400S9VqA2NkhZp6/93uwYv9AIIAcweN+dkIBATgcLto2G8t1fXKXVBhRBHsG/vSVWmHgrgCNOUQg+T6eaQrybvTjlRNAEqKhtiiBN4VhIfEn+ZZl2/zOGYnD+lS3gdzGMYE0h+EScakALL0RKNVUXV5+tnvvsZ4fjl0c7RiIfQRaz5QLqAdZsMvoZdsbZK7OiOK7qMHT8hwKxMkoUqCDT0y7HBFmz2wxqU6OYhzuZ41KxLbbKxnEzkpC8rCYDCffGBmZUEop8UHSne9f2ifT7KZ2bvj6XGBf90UtYgPvTcmSz2sNMtaOj5uOnXFA1y9NuPDc7NnG5HKPW2iZLW0z5NZdkY3GS69dIh6CsdoLJvb5MsUjg6n5nHHH73+VXRS5W5YKCYcowiP3Xu2g02UDA4R2LumIrcoRFbwV+DeCSkbJu5H/ivx7kYxVZkLmYoBHXTlwd9dORpM0g3RFZ0FjhuiYrDpuuBQEZtjVj4mflNjbx2Q26LtJPWN0JBhompNCG9xoTBIg8GXKcuaeiNAfb8eOa7w2Lde54IwFJ9QCE1EFqrRotti1IuvK7caXr/44m9w63hXWSawLuMKx0zmi8PixrUAUHXrMFlNdbVLbNkO/N349/3+snBNr2zqp56Xngo0dPRxApPQJjuWayz9STheh6ohr1fcx3RPEZa/O6edyvEa8c8wMoctpL15Ejaf9iLE4PSG9M6fqkYiQ6L5ry80CXrlg1BvU4rn9P5HvHJp2yMLMZFsX0nKfbWeqJMEIJU3y/amXIAkL9CXf3YAU6IOx78EjWD4p/AoW+0n1HzKkOpYJbpS8OUPOwW39My2kKVQ+GUOTObvW5O+LR/HeJPqUN4kPNwZa4tv8huXrBV7KKnnpr23vude5gl9tc4fTuKE83ZZdsk0yakeYmb4qUAOIGk8ymZ3EqE4/E0rZoOHg3IHquQ1w9joKC+qDAgNSiSekIxPkW9eK+/kwjJWdtJ2AGaxQtxEYdpJUu7KOXBHQfYYa85PuAzf8pJ3BDLwOdjQRbyrUZ0UV1c4ZB0iv94v76H6a6+PBmCyLnykPdYE3k1hmUmDZIhx1+nHuH3C4k7fao0cQuVcgi0ibDf3MECZ+STsD9j8dj/7YuHfjgOPgSYgTK9L9F2Hrsb2kxD04S0ZKCRVbz1qGSmFGCHcApbW3w+4q/6T1eXfFaugaBdpbEwXObgreXPnkcEmYKHjridWzMhveTAVQghCPSK6qbYxc+s1/As+nmU7pIz369NYqKN0vGyNdFWG1ml/irPbHDMpsEWzXv3o59PJ7INEbEOvXe9k32/8irx3BsvW7Fri5zqcnFmXufgPEttYb/MtHz9pymE5IpoS3SQP/WUNbukQByy+nngfdyuL/GuLUxmV+9Smh32LFTohmPzDXt6bY5IJTiBUnajURwd9qF5NB3mUrG9YQ+HWchmMuZnwJ3vKnaaeStKqSfEOGO/a1tpgRmqYyAIKtF1AY9fDrr5EkHUVHgQ0aiYojfXaGSl24hvXb6YwA7FC8BfNMgzo1NR+rTr7GskIjjRAhyvmhoGNY90nvqDNnoXlPFwE= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 107870f4-4ff2-406e-8f6a-08da4453eff0 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:54:13.1559 (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: KsKKnYerIqbN6Hiaa8sX38j2NljJoRL1GD2olSOzznEPHBznU5UIgfr1PxOfIjJo5dC3MCOR6U9H/FtQzmCGuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 This patch adds a new member scheduled in struct mptcp_subflow_context, which will be set in the MPTCP scheduler context when the scheduler picks this subflow to send data. Add a new helper mptcp_subflow_set_scheduled() to set this flag using WRITE_ONCE(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.h | 3 +++ net/mptcp/sched.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 8739794166d8..d406b5afbee4 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -469,6 +469,7 @@ struct mptcp_subflow_context { valid_csum_seen : 1; /* at least one csum validated */ enum mptcp_data_avail data_avail; bool mp_fail_response_expect; + bool scheduled; u32 remote_nonce; u64 thmac; u32 local_nonce; @@ -628,6 +629,8 @@ void mptcp_unregister_scheduler(struct mptcp_sched_ops *sched); int mptcp_init_sched(struct mptcp_sock *msk, struct mptcp_sched_ops *sched); void mptcp_release_sched(struct mptcp_sock *msk); +void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, + bool scheduled); struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk); struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk); struct sock *mptcp_sched_get_send(struct mptcp_sock *msk); diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 3ceb721e6489..5a6f289ad985 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -88,6 +88,12 @@ void mptcp_release_sched(struct mptcp_sock *msk) bpf_module_put(sched, sched->owner); } +void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, + bool scheduled) +{ + WRITE_ONCE(subflow->scheduled, scheduled); +} + static int mptcp_sched_data_init(struct mptcp_sock *msk, struct mptcp_sched_data *data) { From patchwork Thu Jun 2 04:53:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867499 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 B84AF622 for ; Thu, 2 Jun 2022 04:54:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145663; 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=oWjYRB5OJtckchNXQf57vwh7hT8EeaW840K16MRRwUs=; b=SxMAIZI1gLzq0Qo16UB1RL1KoEhUnRWDJUALOcnMFFBCwMskUz4Nd0cCa/nW0DtS+uTh2S DIBXUHNbSmbxIgXyuBpxv6V6VN+sylSK1QtXosw3gXOWokErPHR3Yk/HWqPiBwF4aUd4BL I3J4PwOib49EUli0y5fzSGR9f45nNfQ= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2052.outbound.protection.outlook.com [104.47.5.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-5-C3yukS4IPU2S4WEU-qOSNQ-1; Thu, 02 Jun 2022 06:54:22 +0200 X-MC-Unique: C3yukS4IPU2S4WEU-qOSNQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gMyk+aok5ztoZwq79Pd8h3ybtNoTqepW1orKkSMYBL0AkWf7Uu0S84mNOa6i5il2FG0NBFnNiuLtJ1KJlka9qxaSqDeKaB8JvmKP9Bz8ooEG/BWP/q+X8jhRekid8X8ph7rHh1ktE/RTSRbvIYMaQOhcOybHhLdO2fGN0VZg0TinO25qorwfpssDa8vybzIJmr++If8sVe1eKmls5thjlrZmAOphVcWB3c3zJEFX8sp5IgQ9TBdiQ8I+FC9owFABioWi8sw2uKuFYuAd71l7EAVcIXYEtOX73Qt1OQQ0q69bgIE221uydD5UsIlaaMld/osU8gasZh9J0iwKBcqstQ== 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=e17qFR9y0DaP9jMZrHWybPkeG9cCDZ6TiPiC4QKjtYQ=; b=B47IKQ/mdRZspIyrDAh9vmlrUJd61pI7g/5GLkH53tPMEpSaiwHw/5Jyoo9tW/nwT5FMZogwEefMELCv7FSTAsS0MW7sYgPO2zO1ypSDR1OcdFx42XW0pG39nvt9RiA9n8KLyXRBkdEVnuKeyQsLsmSDStahhxdPmrKclqlmyylzhsD1BN0Ms4t+9rJyxDIDqMnKsWjDo86DbDiUQK99afvTEqa3CW/Yj21vGkmwBN3WY79IhfI7SeP2QEJMJ6AuPRxd4s0XO58ABMerlRyaDl6PdcXLL8b0JM15lhDX19hNuKPka4FmUKGRLyfu/oADbK5pjg1LR2svVUsv/e6gQA== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:54:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:54:21 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 04/13] Squash to "mptcp: add get_subflow wrappers" Date: Thu, 2 Jun 2022 12:53:41 +0800 Message-ID: <79d1cf14bb4e5619f5dd148fbdc7d89b09c0ac7f.1654143895.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR04CA0084.apcprd04.prod.outlook.com (2603:1096:202:15::28) 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: 1709bbde-8523-4b6d-e745-08da4453f535 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: m0NQBsjEzRWaruRAvjekNsxqOyiQvGKH+E0HObeRv3E0gV5y5xuXDYJ6kHOZMSrdSWWpwn3A8sB/YGBicAcoWp4eMTeYDcziQbw6OiaRXq62ORs1EC5ED4pzI7PH7NE/tqVeEh3oj/Nbnl8TJTbltD8M6mGerPsdBTTOLriL7f3v96HhqT59LjKNqrydQdDFbjEogGcYkLy40Vi34/lxYm7cs5ip+4t3MpI99ucDNFtum47POkMzPhiBvhB7j/zyhVzhlbAHAcoeQHyIqqEPSECXSPV/iKtgJfO2gPzaEeHOCZnTahWV3i3gteUjUHPgFqkfBy6bgtodYiKwo4V3dFM/7/g5qC5JU3hqi1u7RduIfzlZWn56LKjwqhpEOkBYI3gz/cg74Uy8RlDTtvGN1t+FBoebckSESaNcEEk1BCQbCt+64kvC29/7R+rfk6L5RUvx3K7YURwQEbA+VZSjmMyE6FbUQC51SfjWvV50Wh70LJy7Q9SPH35m/5d0A9U3FTWDG02hgTSqtuTMek6V9fbV2RtZmuFipY2O6v0jI3NTXOouj3rT94TsEuq8dFUJp55r6rDFlm8umGiyULLoVqnrM7mZEY1ZHbkdo4MkfQQN6RSCOB/PgAR6JsY4ZLJX7Ac6FO98UmqMlKXPLOrV39m0z7F3XZiQg9JVCbQnIH5eY10C9/M4oETnTPZXGZMzvKhhuJiCygOM1eQGOyshJA== 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)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MvvZIvxVAxBJmqv/Q+Uqp2ErPjBqJOazntsxLEYCvt3ZzrJrAtC/rMqm9zE5mBqnJzszhAKl9YI8/WzFxRXWtaMNWdR2OMGrfBUUdVIZKlPnxF94qDsNlOgrQSbdMUt0YRGf3H2sBURafZqfiyN5fASaioIBd/XdLcG5OBRU03q1dzr/OwZs23JerG37tZlszyEGEcyUmEQTmhzIeN4toqP8dmjSwJOM4Oz9HvbdsD+yIvf5Hnt6uoK/L8QWU2y82PLMNu7y6s6ZKY0lmb4oqj5+kNju3VMvfXqgCM0UC97/ZZqsn8DOTJFObDr5ybdLKTYV3VifKb+OGUtTbTtfZk1uR/xwU/toPr0OFLZR8oBmTkRKnvOgF0p0jf2L5s7i2WD7B16QSsTNca0rlAnc7GTi0YKLuvDa/703KLIccZGQlJly+Cg0CMU/2StsWZITJuiZsMbKxzOwN673V8x5TAyWc0TJwuq6Be608/BF+RomCSRZkdblbQaSu+FjM6gEwmYnThyAnYxOhNFES3RYiRdND8qxVkA6RjCOoTQdHt34SGszLEOPgKyqvgeP7lLilVJXrT1OX0DR2r4bTw5fTSH/QZJxGQRfCs22YViCMyw3SWMJrKBv7w1u8jFkesafPxyQWiSxXWbBSyAHIbRCssRiYpXv9TKQiNF6yB01dGzsOqrmFTWut+1JErPUcoENODWTeTvMkcXiBQMsuxlU2iTt+zTbChQjA9tq2p4FHc5G90TRPdy52QaYOULgAizGt+FQpoH91Qr6qgv8PW1LJVNN8soQVn5u6nFyyOa7qaDwrcfgQoklIPjOld+3CzjB8sI48FNEQK4C5dyXHr5SVypRh2e6Fsc0HVLnUitdvarEn2L0mAAbmUzOq9btvgTVt1MOz8OnyZwhTvLWKSSwzY7impOZItrPnFI1x8OQUR4WIZLN93oWUXi3pvtP1JR9LVc07I+lGlirKp5lrT2B5JNYqUXXSSMUyH44lnKoJR15GuS8XL9FUZWZvoMBebbeTSmzOrtSwszIJ8Cg005VLOhNmgxH8FiT4QpGVBC/CmLIgxJ8hes7FHTa3fBKRtaL9fDKQMTwCtXHLTJVAJIotHZAZ+zA/p9qLKuNHmYqdN0PTOCNovMK+H10SsMFBsHQmmWRV76Gcnw2FA78CX+s5sD7fTjeq018nUjmlcvfhHqkt0PbpXowME6pAjvNtbouqjKd9Ae/WrKksA9c2bmfB6/eOjJTWTkfJB/4+bvV/emzaktHw1hA1dwPOkeUzfzk0ipy23VvA1BWODLuoxfMLv9vapbau9LxEb6ZxJqjU9ZvowJMn71TGaIM9ev+IPjjAEcrMVz61hxqDJgIIwdIvXZ56BJDZEt6wYZM+H5Z/Prm0R2wm4RZ+h2gmazQCko+wTbVNObiDuilNjxm5O5nLkq5ZFAVaeFRHkVwYs4z3r+5haDS81ISrSv2zto/QspCmBbMzDfZHdawG6rXIIYIoa5sTEufe30snVyOusEBkv+CLp7seopintFaZ0YpRzgzXvlmTXsGkCcnHGh1yvz+6HsgUngw6Cy9JUiVyjeZjNi0Wz9VYkrfcW+RlW2WXL76h5pzFDFwnRqAh6siv/StrRHWgpD4AUvgtQlnSyBAv/pLEgu9aZg/FUDcMVlE4XA7fKG6ZSVjh//3VB4xh66R4afMof1gEF28A+u/DMpjZIWgJfu2xlhExAWlK8FQxK5UOj2zPBhANuIG0K5ZZfo6HCty8gXeeTEh2T7kkYRyFyw= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1709bbde-8523-4b6d-e745-08da4453f535 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:54:21.6864 (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: WZ2dmEqt5aae3Cy1owXTYqh6EVzCFKAes3m412Y7Ma93VV9wRYedZv536umqDNTCmXWfLF7UnzfkotIgVHM02A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 Please update the commit log: ''' This patch defines two new wrappers mptcp_sched_get_send() and mptcp_sched_get_retrans(), invoke get_subflow() of msk->sched in them. Use them instead of using mptcp_subflow_get_send() or mptcp_subflow_get_retrans() directly. Set the subflow pointers array in struct mptcp_sched_data before invoking get_subflow(), then it can be used in get_subflow() in the BPF contexts. Check the subflow scheduled flags to test which subflow or subflows are picked by the scheduler. ''' Signed-off-by: Geliang Tang --- net/mptcp/sched.c | 54 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index 5a6f289ad985..8858e1fc8b74 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -94,11 +94,25 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, WRITE_ONCE(subflow->scheduled, scheduled); } -static int mptcp_sched_data_init(struct mptcp_sock *msk, +static int mptcp_sched_data_init(struct mptcp_sock *msk, bool reinject, struct mptcp_sched_data *data) { - data->sock = NULL; - data->call_again = 0; + struct mptcp_subflow_context *subflow; + int i = 0; + + data->reinject = reinject; + + mptcp_for_each_subflow(msk, subflow) { + if (i == MPTCP_SUBFLOWS_MAX) { + pr_warn_once("too many subflows"); + break; + } + mptcp_subflow_set_scheduled(subflow, false); + data->contexts[i++] = subflow; + } + + for (; i < MPTCP_SUBFLOWS_MAX; i++) + data->contexts[i] = NULL; return 0; } @@ -106,6 +120,8 @@ static int mptcp_sched_data_init(struct mptcp_sock *msk, struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) { struct mptcp_sched_data data; + struct sock *ssk = NULL; + int i; sock_owned_by_me((struct sock *)msk); @@ -119,16 +135,25 @@ struct sock *mptcp_sched_get_send(struct mptcp_sock *msk) if (!msk->sched) return mptcp_subflow_get_send(msk); - mptcp_sched_data_init(msk, &data); - msk->sched->get_subflow(msk, false, &data); + mptcp_sched_data_init(msk, false, &data); + msk->sched->get_subflow(msk, &data); + + for (i = 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { + ssk = data.contexts[i]->tcp_sock; + msk->last_snd = ssk; + break; + } + } - msk->last_snd = data.sock; - return data.sock; + return ssk; } struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk) { struct mptcp_sched_data data; + struct sock *ssk = NULL; + int i; sock_owned_by_me((const struct sock *)msk); @@ -139,9 +164,16 @@ struct sock *mptcp_sched_get_retrans(struct mptcp_sock *msk) if (!msk->sched) return mptcp_subflow_get_retrans(msk); - mptcp_sched_data_init(msk, &data); - msk->sched->get_subflow(msk, true, &data); + mptcp_sched_data_init(msk, true, &data); + msk->sched->get_subflow(msk, &data); + + for (i = 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (data.contexts[i] && READ_ONCE(data.contexts[i]->scheduled)) { + ssk = data.contexts[i]->tcp_sock; + msk->last_snd = ssk; + break; + } + } - msk->last_snd = data.sock; - return data.sock; + return ssk; } From patchwork Thu Jun 2 04:53:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867500 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 6B2BC622 for ; Thu, 2 Jun 2022 04:54:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145671; 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=TYVaX0UeBJ1FOaNxs9/R+l5dYJ03UOSS5qXrgVBjLVM=; b=f/XUm5+wk0C3GmJJBDP2puW9SkGNMNezrRT0amY9DVEVM7tkebhp2yG5Cc7x+Et6SFXQwS irU//PX7w5hOt1aZfx8Lu9yiRQJQfp6cBPHmR82v+r4POcAZOsivyiLYJzEnFT7tqttiyy pl8mgAwrfitAQjrCYYs1AaJZYBLlZwU= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2059.outbound.protection.outlook.com [104.47.5.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-19-7aMc2Y0mPdO0mSU-BQUHLw-1; Thu, 02 Jun 2022 06:54:30 +0200 X-MC-Unique: 7aMc2Y0mPdO0mSU-BQUHLw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D1RP5EqKeIR3ezU5GkjRfUzkg2nZSotfRgmG3dTopCsPkJ5y9PkPctyuCViR7Ya4V4Wrc9oFC5cHeX1uisL8KTkFpodIGf10BnjOqU8E/sLWe+JtkMptc8sFXXT2Wvw9JgcdU8JXYNDGu+Wa/6mGSAkOlE6bOD7/Zt296yADIN4g9if9UlK6WzItLPepjkzCswkIUC9CwEx30awnm/dgzXkz2oHM0fOXkOoT9oR0BC45G9gSQEHKdKjKryflr+HNr7/fEj3jqqB+XWSgpJhNBPkzNs/GR1SopyjuQ64h6ykqnWsjTB/3+v0Ll7UE9LTmqc/lZFL+BlaxIENqmjDouQ== 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=83tqI3r+6uK4ojJo+kMv1/xPq/X7jLcLP7+AGlCbxRE=; b=hHdiU8vNRu50AxrnDjjJRFjwK0+guA8wbPdC6fnYo73ggYJY4rhz1zy3D0CedwDGzZazEIIxfU0hHzoWhrJMQdebencmgU5MS5srH0IX3My+reEu77KaFBFrk85004qtLK2o3wKshWrtetXy9rIOqeloMvNgXsnl49pWs6gG1yzbppiyOvf7I+cdID4DX76l/ZtDZz0mq/hmTNFxCAjgaVM0fZYr73I9eerOauRjN1M3kGNLHbFxWQE9n/TH7Wh5Y2+JqUa3ZMQR8BlnBtXi9Cz41XpmsHIjYfYMVtHTJWRAIGtfcO6Mtwicz7ZeE7jlKDOIdBc5zyMvHdTUDcvaQQ== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:54:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:54:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 05/13] Squash to "mptcp: add bpf_mptcp_sched_ops" Date: Thu, 2 Jun 2022 12:53:42 +0800 Message-ID: <77b282be5d838080861e2d4d0b64192f23bb6594.1654143895.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR04CA0081.apcprd04.prod.outlook.com (2603:1096:202:15::25) 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: a96b1b13-16cf-4832-6e55-08da4453fa06 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: 9hGhCZszvwKkj1K8okgoW6SozO3nPNA+chNaEBqtiSMJ8eKIJe1z20QlBD5jLoSzp4FVdeH/ZpxY7E6jXR0wEdcCWpk77Qxl7ehapkfbgQS3fBdVRr4QaAjKayF7DNtuQ0j+Cjm03XiPAFCtqlBML7FSc+GJd6oCxB6Wi7RQvL8/rMi7gV172QsjiKOwp8yh0aW4qCuWRCKrG6C3cvU6C06sCTR7B8kVap2d0fpg7Zk+boWc2qJtrlHIAB0ekRaV97yAFMoAoiKkcc9SpyriV0/6kRTmPYeoXTgDAahqJDrP9ijNexDhq5Z5GVzQnmcCbIsarfu/K9pXrtviSUoH2fRo3Tv+2WwcS8WDaiIHtOn+zePwk+HHm12rItE3d/diWrMy4mztXpDy6298p+VlmgzcX+HH6PZLDaspTuTUtxTOgIxrboWCLYCy9UR354SaanfvxAASwElkP3O1+wiq5LZdQ8FiL2QHTf5eVxFjv0YSxTyASlkTevrTL/NLFxbwz1aNTZejLwgKxxBoQQVy69MFemeSWYfcqZV6WXS5B7lJQEvoS3TDwNisFqKGvpQ+FZVCGXhsLdxukVGbiaar8PNaZ08Gwx2zcxYKLSJgNo04sw/QuGjFGfzIDZBqZYOPOvxXwz+Dj5mokbadOkdBTtcrZDaSOSoxa4Y9MHLvzSnUfxXtLEe10KjIfUuzQTW1 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)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xbURiZqbx2VCPBRQTwB8/ZtIb5HyUCjwBsPAukN2seXzTk18RpIGzg/oKL/AEp9LFvi+tpUYrXleBCPAm7phqy9zvkyImCsl9ZPVv2vcKfWP7oQ+0cbeC1d7ZP89ZnDQTW9FWBQfDbxRr9AqoGJxSaqOioJHrOmlT9gpB/AB9lYkzSySPsdNCiUdgLXd0rssDvht4rmnLdfOnm+nI9+Z6EuUbpimFxGkP4hoHs3uH65Sweq/14nFTFfGqQKBY7cxK0TpOtgjuprSuw6JcKbZjoA7a8Ucjyaam8gfEbFLpmXSEPEZ/iO8zSgRDEWW/0I+wIn2SFtA8ggFaJSwEkZVcS9sj88APsqWZyVCoChlkfYnmIDVDTTdt2Wd6rYxRq4WzF797aAZr8n/bLyrOnpQLThoko1v+LVyITdjIdGegNqa/VRZVYSzionskBTBgNRcigPkQYwD+eouZlSUz3sqxxUREO8SqaZy40pN1iwc4OruOOKEvhNsW/XKcNdbzy+PQxT8JICEB/DJgtdf3G1gZXzWY9DJ1BmHWq+cAGKtGdiQrjDjVTc4b6G9tXbkoIAPulM3uyD6sd981NRb9HHXEwJahw8STbgttwVWMnVLo5rr48UMACVJ2xz9seZLW5WvKZ4Jxdz007tOTeV5Mrz9BwrE3i6DI2pYBKk6lGNoeLVb3d9PLIXzS2LY7uB/qKET7tFgCxf6biQRB+PhfJNK1etGewMWjXX17eFiOsDrA2q1UTC8X+0Z9Bv0OGjYJwLxjjV2i7JsEVWCeP4G0S8e3oMhHclXkNYo4180CFGK5ZPaXkCcYglwQiock04979iA1g7JGY6g+ZLC6YgBTlKj/s4UC9W+nhEAx7DGaphS51lXPF4N8E/2PS2SQTqABOhTzyYEDMQDcCpbNvgy2/CYWwlYr/MVa1ClB7vCX/kb2mSmAeJs3limtI8guiZ8yAv1i2w4S546VpwIIEflvEUz646C1qU4NO2gP6WKVfxbRUdbAUtNtXFFyg2sUT7MQjEvQvnTQ3PaDR0ssHlsen62lMgfu12eCtxU6Nl/sNKuu39Bs68LDmWOCKo+Tk/O+5X6r3DS3QBWzLNKXx7+wBZxLDyf1BTsWJsHTOa03d4cTAD73sIjsZHoGEPL63Yl0yAskEgjkqYsaJgpvUJaJhjhQDfQmyZfKVB8dd0tI184B6JTLTgAWeZHmsRdPDkb1PK571pXfTCOkegBWvSxK0ouwol7fn8PtPS6vwKMsqiRMQ1gx5XEWtdiZbszdCGfY9l3K3kSsOwZOYZgRJtd0fXvxrYu1z2BI4jZzOv47LWqgDFbnR3IWfiH7deCPGO3Xmr9kl8LgEvTFFAbXv6Fn39H06xv7UqUGADVOrKDYEUmwAvolO4bI8/XSBVeyql8vNKDlsi2dPNWrzJOhO3W8SOg4mfvdRMex/BZfGfN4Zl08/jXUtfPj53YN1m6iTrCMWrQ2cmmGnb2ANoyIJtXtltmIFnFZXX09qpNRwpzOp0U3NI8pU7L70zV1zbM8pv6cRqbewKbv804cR7VH4n//MqFfomEvsxpALYbaesUAbD/rw0skUVq9ef1jJmC4CUnZPvFp8pqJ4Ut+M3D5GHOIHtpqBJln+iZ+Rh0vwASU/Ingrxz5Vr333WiUczHW7HPKRoUVLMm3pO+KLbEe7PAAA76HVgwlo/8RFE7H195s4Koi6o0WlXxBFWlfTx298693vqgk5nwg3OdlORxIN1hcfb1zuT7dPJWzVnyiIOV0M/HWRY= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a96b1b13-16cf-4832-6e55-08da4453fa06 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:54:29.7483 (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: qZCIj7w2DhguSR8ia098Q0jWjZISh0naEGBUT6E64KgHvrsjXmjWIWg12fgfH3xwkPkBiDqi0tohhOJTNDUZTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 Please update the subject and commit log: ''' bpf: Add bpf_mptcp_sched_ops This patch implements a new struct bpf_struct_ops, bpf_mptcp_sched_ops. Register and unregister the bpf scheduler in .reg and .unreg. Add write access for the scheduled flag of struct mptcp_subflow_context in .btf_struct_access. This MPTCP BPF scheduler implementation is similar to BPF TCP CC. And net/ipv4/bpf_tcp_ca.c is a frame of reference for this patch. ''' Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 338146d173f4..0529e70d53b1 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -42,29 +42,27 @@ static int bpf_mptcp_sched_btf_struct_access(struct bpf_verifier_log *log, { size_t end; - if (atype == BPF_READ) + if (atype == BPF_READ) { return btf_struct_access(log, btf, t, off, size, atype, next_btf_id, flag); + } if (t != mptcp_sched_type) { - bpf_log(log, "only access to mptcp_sched_data is supported\n"); + bpf_log(log, "only access to mptcp_subflow_context is supported\n"); return -EACCES; } switch (off) { - case offsetof(struct mptcp_sched_data, sock): - end = offsetofend(struct mptcp_sched_data, sock); - break; - case offsetof(struct mptcp_sched_data, call_again): - end = offsetofend(struct mptcp_sched_data, call_again); + case offsetof(struct mptcp_subflow_context, scheduled): + end = offsetofend(struct mptcp_subflow_context, scheduled); break; default: - bpf_log(log, "no write support to mptcp_sched_data at off %d\n", off); + bpf_log(log, "no write support to mptcp_subflow_context at off %d\n", off); return -EACCES; } if (off + size > end) { - bpf_log(log, "access beyond mptcp_sched_data at off %u size %u ended at %zu", + bpf_log(log, "access beyond mptcp_subflow_context at off %u size %u ended at %zu", off, size, end); return -EACCES; } @@ -144,7 +142,7 @@ static int bpf_mptcp_sched_init(struct btf *btf) { s32 type_id; - type_id = btf_find_by_name_kind(btf, "mptcp_sched_data", + type_id = btf_find_by_name_kind(btf, "mptcp_subflow_context", BTF_KIND_STRUCT); if (type_id < 0) return -EINVAL; From patchwork Thu Jun 2 04:53:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867501 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 7CB57622 for ; Thu, 2 Jun 2022 04:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145679; 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=1TNz5XrAYer2wVWiFk4p9JFI2aNd2gsCqBz1hkDNgtk=; b=V6+4LxipA2qbc8iOTDqtd/XrAbm+ZfOz/HL65ngAbMQiF1B89XBn92XEAmgn/RgniI5u0B U3iMx+2P/ZkXWJs7LqZ2Jg35pBBgROZ4Ar5uIg3nhNpBPnTcMM1Hq3TqlWJP6FO4LsFC83 eVsMYaARu9Z0FjupvZtephqCS0JZK4Y= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2052.outbound.protection.outlook.com [104.47.5.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-10-afGkq274OSm7RES9daB_5A-1; Thu, 02 Jun 2022 06:54:38 +0200 X-MC-Unique: afGkq274OSm7RES9daB_5A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=anfhJcdGqZy4P99QrPdCjShmK3rw0rhlphVllvV9lZnPthHNQwODRU86byFbfn/mdVf43cy9qsDx7limggVHBbTUQZiSKL1cDJrNjCkRFDjMJeUdxaeIUA3k8guoQRodn1AVbQ3iaB+yBCyODyoUJy7h8sh515qhBQpPU9jKbkpShKwgaaX6CexSEwmxDUAuIAzd5ho6Aow8hsIa2hvT8RFCzUnJO0hUsjq2vuuNUjoPa1u7DJAeVUURwh7eSe8xADVTswyMxuPgsDJIvQBGIC4z4ye+BpFeXM0sGtHSgPMr7a0yBJYVU93ykmlvfuz3JZYjfQPNAVMputJodWzvgA== 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=3TOnliMdXhZqbAfXt/L3KfXwisRsg3qqsSe4texwxIQ=; b=CwJMgjj8k6IzdfFHJw5XY4nwZnL5teaW/yDV1dVsB/9qWHXwZzJneNtyBf5a/DEmMvwOhFXQ+ogXsbNzmK0JbHP3hjUT7+rK7gmOuXK50Lhx9yJ0FFyaSu/Xy6dCI1FXCepCArzB7wpUURf2xKd1B/bIwgnw3n0iMZ7hAEFc5sDNBISa+o66ABdSePSj7PF0A8X0gIHN7nI5R+mTtI+cVYS4iRGB53XLg9P36EGTGVwRLHJsCZTvd90QfAw3qjra3XuSE/uphmzn+WbqJegGZ88TghLtaz9H+LCwTDN7RxqOivHC8dLYTHRpQxZmc/1cNWJsAm0yNR93ns6Ebf5U+w== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:54:37 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:54:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 06/13] bpf: Add bpf_mptcp_sched_kfunc_set Date: Thu, 2 Jun 2022 12:53:43 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR06CA0003.apcprd06.prod.outlook.com (2603:1096:202:2e::15) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 52d90954-460c-43a1-4539-08da4453fec6 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: ycCI4sTp8iMA9Ysc4VwS9WaUeer9XgljhnAYLrnuqIt2pLVmFSiiHLuB7d9y/zubElhu9qstltXhbCP7vkuPY8FQ3VSPkdxZuSY8iwjSd52bkiJTNxcyNPq31pvEjonFXdqcVyKXySIcR4FD5O/nCNP1ayyN/cPRcuo0EOgzBKad6lixWzp5QkqxY5zEWz1w/NWHsXbLx7r1D0F9ta1cTHZeubvKwbhPnmNoFH34u8ePw88GCTHGOfcbSpaRXzWpDLejAqKoYLIztY6JJGuszJiRKhG8o9Ii9Ymm4qW3wI4cvlMIJr3qZkO3qA3h5ts1DU0ptu/LK895iFHLRGFZbknHwadIbf17sORtIhP2Cdjh6uJhWo7MMIsRNt9w89Dy1z39uIkedSVbwnSwzSgQrX/3qRiASy29KHOuYbHWikyCnlh4q3ZoSXjgUyxQW0JmR1LSZXiJoAt0bDmNNTSnskdRBJAG96M/g7LKvrkZv58xU5oUsKDtKqTJ7heoM8YYxbjKQbxCKePXnAThfBQG29GUpLrnXzixG8a72kbFrLoJfRpRs5FCdKNH5R2dA78qSNMeVC2Dl5mUs3u9ECtvbBwB2LyrtCmZY2N0JHnVov1azG5K9ZwhcLLpGjcjTy3r0ZGPFHoeFWF/QFrFL9xjk2B6XTs+RtxflO9bG0pqGLU/P2bfETL4PGiOZDy2kMsOCo/8++/oSRuMzkwI7ZbNRw== 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)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AoYWxn4RZ3/NccnRtzLFH5mBV7cT76ttqD65WqzvcgnKWFJ7m9/AEv8nfApWV5F8R3wq+Tja9U6B8Yk74Xrnq2xh3qh1HVHp8F5UtlyzRc6+90pg0k0Wt/Jq96rj6rhWNzEIjJf42cNYKHFq1X8qbAWOkYlC1r9xZbFzGKxW7zTiHFvbml6RQfgAKEHupDCpEiwOluSY0WOQcFkIEZzv7oWTp+RkrzUM43CVOsa0/MQvqWNsnWLc+G3echoxPMvzvSddk9D1wwoYTns+0iMO0zWJmkGhJSWUY7S1wCAtIR29sQFHXY52GNRVZ+fHjn+ogxk3uZu525FDa1+KgLHvT+J3mlGe+lGASbyWsWNQXLV+yI1umtldlJPytsNhN4xjGEOtH6m7EL/IPbi8jUiZL7+IwvxG4bqQiENwZ2ZxP0J3vtbenwFCCNs7P7DU6dMhDoSUTWUVPWQpzHviwZXI4plCTB836v7DSCRG8TZEqL95G+ei5qp5a0K/Jx817kbWQ5GhmtwVQZI6brO+BhjoXylSm2CoiMXqxbp/Ly0FPSUXfybv6jb7TsVXa+mxm0NQKk+XI5+CmHZiHNDyRHMkQj9L6Q4LxG9Nwkvgsu+yudfR35lh+aTB8KSWpuKSj2NnzXggNlFWnGW8j40ra5ArCtD8bI9GKLv//wcSLjynbBFY5MtG+J+M/nriaYJl5K1Oy8Lngrim8cU6woSYlI6dvCNPGfJD/6wKBPhi8fmjUA9gcuL1+pb51zh09/57mzFW+OnBt3T/lqF4onX5YmiJHHdkeZEksFn5h/C9rOOli0YHxB/BUOGCdFT4LRvfwJf3ZXpESJl16wXLptIHKpUD8+phoqx6UzwWvVEbCVwxCIrgEfEZpX0m/tQJpp+F6Sw8HBlxZTrBGmGpQTJ6jGM9pYe7ucd+Gp9lOi0w48zd89Ba1M5Wu2oSgf2ju5LSYJH6T+wJrMULgeQlVmmrhvrCw6sFSSk16WElTadmL8op6JiBTHJJvPUvEJIaVADxIi05cgTHY9NEWQgKMtLFzFn4/yuotRXkF18dASwDUzYXiX1SRXyQyt6hSs9LxsfYaINklfJuiwEDWyHnmv2fuvrKANOV31MbQgZz1UxA01YVyrwwPZFz31wgJz2zNvzMymrN5s700kqTftqn0rbYQCdEiK6ahAexRGBf73lqRJEA+O3s5o6IXMJloSFTtoWk7uBF+s8uiEthtBci1d39NFweKXZnvcalLuB/jtDYG84qeO5VTi+rmFZ2lIxGVnqVtBPyt91BenSMdJcgqQTaJeU/VyZPiHyTdf7EQhy6FYTCW663pcoWMe8jr4o4YFzD/hhB/zvfb8OSlyruvUIeNh59UCXIT/CcnmEt1CwaL0IvX1lj8jCZy8sFooDSRb740NQG3ZmCSMs+SwVGatFFHNrK+i2OQtFP1t4cSdvP1j+Lcf/VXBaS8QEmwJpIfKanZ2GgzfinBLM2hUuhmSFxouMUgo1sr2g7pqB7YR9GqV3Sjiag1hPsgc6RQ7Yw0py+GcNnOuU9eGe0pbBiNThIaw2G7N+SFQDXGxIKO5Ntl5afn9HNMRkpqw1kxlqDgUJ1lal88oIfXjawIsO4n2ZHzlpwr4R51EarTZ27vwEbS/8SKoYxSxtsJQyU4nJAFbMWbi4omcLCL7IEcXDudQvRsgtdIqJ9C2BN2aVrTs9uJS27WimqzP+7NN3OaJFplJQkUs6Nf0yygLX2LRMN1wlQnQnmpk/8DwcqQ2QuNwhemVObx0Y= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52d90954-460c-43a1-4539-08da4453fec6 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:54:37.6539 (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: V+uIUSiMTloVrwVlZesMR9x/QKgldKtXYTYg9+ugXVqsF7JKi/XImOPTvx1+IsV+zr6tqkx2qcMrJ7MQWOTa+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 This patch adds a new struct btf_kfunc_id_set for MPTCP scheduler. Add mptcp_subflow_set_scheduled() helper into this id_set, and register it in bpf_mptcp_sched_kfunc_init() to make sure this helper can be accessed from the BPF context. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 0529e70d53b1..e86dff4272d5 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -161,6 +161,22 @@ struct bpf_struct_ops bpf_mptcp_sched_ops = { .init = bpf_mptcp_sched_init, .name = "mptcp_sched_ops", }; + +BTF_SET_START(bpf_mptcp_sched_kfunc_ids) +BTF_ID(func, mptcp_subflow_set_scheduled) +BTF_SET_END(bpf_mptcp_sched_kfunc_ids) + +static const struct btf_kfunc_id_set bpf_mptcp_sched_kfunc_set = { + .owner = THIS_MODULE, + .check_set = &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); #endif /* CONFIG_BPF_JIT */ struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk) From patchwork Thu Jun 2 04:53:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867502 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 00101622 for ; Thu, 2 Jun 2022 04:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145687; 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=bxLL+d8st4OZAGskR2UG2SQOhZWEHSrTlUD2Iofdpjs=; b=a6AKryFylo28CDtHtCfMIkPk+M8OELQ1LT379CijezXDvbAKE0eNxWU+PONDUp22AHP9Bs 7iulMmGt1rKD0S54Ui/HUz0ONl164On+9vwzie0mqJms3Np8LmQX5k6dJ4DZJdTxkfVOoB T7l3ZCKR7KGajn3DLk7nM3j/ocIikF0= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2052.outbound.protection.outlook.com [104.47.5.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-20-8kK-dnw3N2qOoHYoXyqWsA-1; Thu, 02 Jun 2022 06:54:46 +0200 X-MC-Unique: 8kK-dnw3N2qOoHYoXyqWsA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H3ozQZBOnTIqk/FBcETq4yLHDr9vONhm7NwmauFSHGpQaYhrgJsiDmFIHFGnvEyi5G+nKTaBYi3C2IJHy7Lzqjtxubm8wLKXA6VRzIvC6rAOTY/PlcMHOV2kaM91AVHuG7i2WjHC8Igko1q8u+ynTyF1EN0eegMCRZTdHNFucKhrUUmKeyurdPsyHjnphOHU0kackV7DpT84RmdwXL1LtSlB4DUFIoz4g1lIyGam5yQ6FBzHnxlM5KQanv1N5idq99Yn9Au2gb4h3saDR1MBFHyT2iUFUKX6C63KZmRD2JusW4z7Vhc/6I9GgadBR7wrLMnw5Rfq6kDMf0uLdCsu1g== 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=5jdEZp13QRt7lVWaqsQzcz7qfZwiVk7E3QwAcvCxAF4=; b=bJIhB+E6vgR2jQ54J2L4y1YF4kDdmjCqPVbKS92tu+cwt2OtHx2ULDkoNAlGGpftsPnJf4aFPq/yjNyuICpFJRmmOM8RGgEVkoAlcJzCdJEBUc5GEHDTwxrYPNgPaGb57juPocl35q6uiYVn1zOOHSTWKMRj+uZR7ZT0ZqI72EJ+qV+zFGaaMYiYh35QnCTkB16pR4g6/bzeNAo3hYl+fKdnZbkZAjlu1fXToiMhpi2T2gVeaDG2iHRqcUGS7LsnTOJmO0znvVyUhHsUGwy0tnHtrRep7DCeaOZ5T1evchyaZyQNpYE6e+IXkCK87y16Gp+jF/v1tuaqFhYKBVSG4g== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:54:45 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:54:45 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 07/13] selftests/bpf: Add mptcp sched structs Date: Thu, 2 Jun 2022 12:53:44 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR06CA0009.apcprd06.prod.outlook.com (2603:1096:202:2e::21) 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: 7884f4dc-544d-44a0-6dfd-08da44540356 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: iZWhF3C4SGpNM83NTCCT/hGATe0TkRaWFDHEU9YDMvWUwBGw1CktH+gLkkMC3qjuhnF6kEjKsbE7/+spk6+yvj6tsXEoT2PSBWeLHQt66DuVcctviaLADSmJvWSPEmiNPqr8MeqyOwdbWsOjtz2u0WFqvqLwvALOxGj8XlJm6E1SlBiIfd+VOrGWMK89nJ59RTjD1m5koHd1f2lIi3LPauj+SehtwJ885O63E1ez6MQWRxHqGVxzhKBchuWLZ0V9/E8o+atANFgK7Wca7NS3duEpwPfsB954d6kf9aOQ7LGCSXtnwojfCydQItepam8Gg0DGcShThjCbMOo8CrE0IznlFgPuOBOTRjdK6I7YlWV4U/fuddYqDsqj7EMNNOOJ4xd2NVF1kQ5Ks6tUtRkAOK/F0v0PHOwCSj2x+5+2GbOucQ7QeBTRbvGx1WiK1KPsxDiYaTG2PIIcSOzNfK0Asr8SOFWQRBDNIfEyCBz9NyPiWYBL7S8lQDee89/aYvvJGusw8bibmYjxhWZqO1VUqOE1B/uYkaWtOBwW+PFmNXq6qo3Bran5QwHcJwpsGvbbqaRPkk4pzTdK7GfKcXqKN9gOUiCA6KWYHalbSYxGMaK/WT2U+f/5Z8xv+SBn2HJiISKExsRUWdSclEE0jb4LReZKli8uyUKE111mQopYWiNJz9x9/47IbO1NXWqdWwbs/3TfdXdoZSavAPaSVDVpsA== 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)(44832011)(86362001)(83380400001)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lF+gDoaVatqscU+x2TTuaA2YZL4Hxp5+GFuahJfo112ncEx+KrypppTj15LAlWfgQlp81ACMlFuruKPjQVqwuswy+u1DQ9IZq50/V58/bAb97aaXzt8p/1++8uk6fULDElPtPOnA5PeDrXnV7t1M94y/EKtg2LqDZ9MpR33In24Y8P4fcvu2lnO346yJWTQuUySsCrNurRKW3qjP27EwZDc3YUCF/YZg36zmJoau6qMzCkQytemwR+YBRMCaXslyHmhRDLFty0kRvk/hMLN81wAhs+uYRSLDHgx3b2/WQ58Gf10hRiJc2iikxd2H9LwCOh2rMoTGtE6H94++JPttJinhmCW/wZWCY0w69nb4/trtnMx39H1ZUuAoF1KnzNySwVzW6sNVn+emRBeg3naTJH0DvcIyeWkuEaqsGY8AxNnMuheEEMpGPPci1zrN7LiGJf0vpfltKTCKlklMXi0c5/XoqYCuK3a1EtUjdtFJnMtbsxSD8ODbIoKVAU/rC0WRBB5oKcKtskvZZgJ/mW9Y0ynKQO+ZMjdygVfoey7qB78aysVM6Hu9NDeW4isPUjtI4fNwTHD71raEGMvT89so7uWztDAcKyonpUwHSVYJMcrNInR/WmPjBAXmQdjrdExT+fNgwvssZTOtfHOJC9VcpTZlGyHz/Zoqwhh1/pmK4fXNFks2FO53T6OXMSgFf8nzM5I1b/oTwSMoyp822hgf8LFeVWai3G0fsjyR8WjOFE+jASOBbrirQxBFtgIiCF89Z+pfvSXgTpUZlmSrpZ+sGSvwIJ4ChKblMzFlus5x98zw8LjHt3lsufEqifgeU4ZdxGiiBgFT7nSoj+0FrzXmzCE81gBpUUHZRI9jhJYCH3JXskVHVvQHPPCxPlDuUG3iKZnJxolW+MPTrcIwSf736ahznXqy9+I9uwl89KSeGWpCmkwX8E4zAjVr6empTSwnzDSw/uctotQ0Y9eKXyF6V1E6rCmFeAdiOrLulGv0w21belB35h/VeoEeDOpn4F/++tiIddLLAzsuqnBjWehGmguSZqBvgz+iF3h0IhjpzJ4VWHK4KUAQFau5h7KpT2j0T+42XEoXuHcm5cgx1G6g+c0So2QUCg9Dm8isGWtIqymH3FZr4CkkDlbTdrnbenSzXkfZv/XyxZ+yb8jpBiYS9nKaiD5z8Hrehzg5IJ4Xg93pJHJ5ChW1zMltEsMVJB6O422IlCTOQHiA173GCxhGbb+Xf7pjkxqaKjcB0/scODOd//lN+jRzA4fHLAAJdTr36XGQPzXiv33uuPUbM1Gjmf1ojl2lyuDd9Wdg1aExMksNz+j0sZuOB0GVl0MxBtqZ1irpJFNjRJqmXvbAGPZxhVAnusg1EJIMVTB8CgDWcqXkutVcMCNp8G7P3pJtwYRQgEI9RjxU/idK+nisIyeligprMUq+8ADFg+4tEnqAySajDbz3OIfUPpmc4HKuXDr0krfpKyUqomlQZF/MC3Fc2J6GGBNKNeLrhyQ80XW1VHy2eyEqJK1C74WMLKdw/8vwy2Pr29m50eC9RVLUBIzk7LYD0j/8R9vmzbNYnm3tQnLmW3ElAiUH1iMfOmGULa+QK0Ir3dIXiGX/bToRKnZ1PijYAoPk5UKS4GIpbTYE6J1miFTjBgpPdJYgBKDfI0OeIjAVJCTGrsYJFzU2XlDN5xcmZqYdNd7QAWcH72+JqMwE13a4dufqGaoNI/Ypp9A13pPGiuF9vHhaCxanARbn9JefT8f3S3A8875x5kr97Rc= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7884f4dc-544d-44a0-6dfd-08da44540356 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:54:45.1533 (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: zcRnwnt3W47DNQLiQUwCYCwizKTYKH/4Zjg035RpVk3C0KIYaNY0u7UV0e9AXUpX9hUUhRAGwDqD4bq1uAyjsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 This patch adds three MPTCP scheduler structures: struct mptcp_sched_ops, struct mptcp_sched_data and struct mptcp_subflow_context; and exports mptcp_subflow_set_scheduled() helper for bpf selftests. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h index 82a7c9de95f9..c8792e6f125a 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -230,6 +230,30 @@ static __always_inline bool tcp_cc_eq(const char *a, const char *b) extern __u32 tcp_slow_start(struct tcp_sock *tp, __u32 acked) __ksym; extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u32 w, __u32 acked) __ksym; +#define MPTCP_SCHED_NAME_MAX 16 +#define MPTCP_SUBFLOWS_MAX 8 + +struct mptcp_subflow_context { + __u32 backup : 1; + struct sock *tcp_sock; /* tcp sk backpointer */ +} __attribute__((preserve_access_index)); + +struct mptcp_sched_data { + bool reinject; + struct mptcp_subflow_context *contexts[MPTCP_SUBFLOWS_MAX]; +} __attribute__((preserve_access_index)); + +struct mptcp_sched_ops { + char name[MPTCP_SCHED_NAME_MAX]; + + void (*init)(const struct mptcp_sock *msk); + void (*release)(const struct mptcp_sock *msk); + + void (*get_subflow)(const struct mptcp_sock *msk, + struct mptcp_sched_data *data); + void *owner; +}; + struct mptcp_sock { struct inet_connection_sock sk; @@ -238,4 +262,7 @@ struct mptcp_sock { char ca_name[TCP_CA_NAME_MAX]; } __attribute__((preserve_access_index)); +extern void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, + bool scheduled) __ksym; + #endif From patchwork Thu Jun 2 04:53:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867503 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 59BD9622 for ; Thu, 2 Jun 2022 04:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145696; 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=ckyg/JxA2V2VgnC/FwoYQ6C6XJThQi1trDzrhvmxwbc=; b=O/HStHUCUAVTBI1RwYslndua6IWAOL+DwLanQCENvhXSJCXbxQg7+uEe46uX0b78rEPpv6 FPFbX6sD9CcPRhSc1R+HYXmHpJ4838ljExr5peLJEIGNL6olbWU/Usc1Lcy3rGdPkqWnuc XH2yHm6tBNOXqp7hchRFxAM0zXe2yTM= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2057.outbound.protection.outlook.com [104.47.5.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-28-AnZn6TrXMzGPjryLQAWllg-1; Thu, 02 Jun 2022 06:54:55 +0200 X-MC-Unique: AnZn6TrXMzGPjryLQAWllg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bfvw1QHpNnnTdbmBe8EkFdNpD4CWpVlhF++eJy96mZ6Vzb3xTsF83Xytpz1Ky10ZzydgzzYPLXGyR0nqqDlXP/+DvKq55DFnQWXUuyvIoHPrpb5PtdhZeOAnvyfpthW2iyZuzUw/qh5qt/eJVVxVLXxzgi5MKEFEIwZY+90o5chhEwiSWIEs8kcuirIydo9TxQa/AIddaMT90/RkBSEvNE2a2aI2t9d4QKBblnHbly4wmq2vC1h/xaxiAWZ8cIObdj7mWC2AF2UCRWITJZBS9HxJc4bDJ5wDjw1oRWg6wyIlgUoGNrpx9WtwIH4Hs4Em/DxbrOZNjpbJkoses5Yawg== 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=ySVDKnFJcz8WDTHlq6qm+UHt6uDvIGqKOARv/L5RnvE=; b=VbE5SauuzImoUm395wNve56/D76fKGEe2slHAyDvDTgoPMA7NiO/yyc8CXNcb5WBJGcJPQcvGbvgqY2Dvep5M2iuHkh4BNpGXNa5kA1vRC+QaBAX1rwpOePRKQaz87q8CYLocD3okGtRrqrvNk3NBzIzZLbGt2hs0p4k97RspdFTRMFn+7jyzit9C+T6mPvyvoVOUn9yWOxoYxRbZ2+BBfCddNZEpaDkFONqYblEXRQJ7omZ/2WEK7R537sYZWqBMXUvCZ/067vflxfCzJZpnnY04i5Wz/KsjYYHEMrkdXCfrAYhGIWIsoqJ9NUT1+DiJxYuu1DtR3KctT6EtLxpVw== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:54:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:54:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 08/13] Squash to "selftests/bpf: add bpf_first scheduler" Date: Thu, 2 Jun 2022 12:53:45 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2P15301CA0004.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::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: 6a4061e1-0f9a-4ea7-71e5-08da445408ea X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: v2imgX4bClrb7XO8hhVyersFqwzLEdSk1iUV5bklv+v01P3i+KSM0w3n9ZTJfPuGPOdHbzNGAExH7TiFM80PhCA8MJ7TAzfNPfA4M9DsaYecPoMg/ZT+fQdUDnb5gQvY095gIa9BT0EMf3n8FdGCMaebYWKZKPN28VPDG4ROXZK2UJaaFTYBRh2b1Y9aAN8pfdXt3bueCpd/6uO68+jY3E+sSXyHGtNmPwDyLvZ+w1KRomj6tVFoPUJOoJUhRH6e2FHC4z5ELDT2PTPB1Cn7MnPTHC59YXqYGsNAdbZQ7/LJjxEeZ4iKkMrLCmWVoSxdDM2Kyphu7OoYSEjUx8hmIX0Ff6zwcns4YYUt/7z80bJJR2II8DGkkVqWEDe4SNO0/t0DVYjT89adjV8vdHGDxYlkgE5kMTBu8fwKlRJmB6tL378ftCmTQvTPFdEH/UWWoSGpqiq7KKdWiQC/T1EZJNC2NvVoBI+6sjDrL1tq7jspkWxi2z4GcPexmzE/yFhXSIG6eADo/REErkIL1HJdXzj6VeT+4w3e5AMuP8OJRuIS5oSK/dyOPmDMG4DLzoJuMGEN6lKJ7lnp2y5sTpj7GqtB5+1fB7rchD5PgeDXmO0FUURLAQWh9MQ6goAcNqJW1IkwcvR3IA660IkAEH6mPJT3LrEYiHa7+44aKK2mu1gDjGd+hkSv36HG+NWtAvQx0y88TqmEEq8TV5uGGaQbMQ== 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)(4744005)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /XMpDMQ3+4NAZ6lFSv+oJVya/2eiUA0AGHTug9KvIdDCRDGMATZQsnCPCKATGt/FHouCNWR6fKdWQJMF2nSpw+lcQmYov+Zf00XTRu1Vrh2qeTG+LSEDqML99BUdIByJaOYBslgnFjwFXSJ/RCgxJ/gfcGo5e+By3eSsi6RY5wOoCxhLNZHJOfCEjfTGxDHyaGCfzsMo171u2kWWcZSJsKqsI3njNS2ozWSALxLXX689p21Wm7IdhbMQOmdVoNCPXTMxQPcWjDkfnijfBROzRu27noz9qPwcB4HCxjfWJ7hc8jUYSDJN+ITPN4sEYeepJfNfVa9aKVW+wy3AIvWMdcdvbHaeux9/Vvcg4bDEVmTISKE7hrpLdTSSVG8phGA6RxbUpVzVacsbcD3SAhe36NAfwZ2x/40DjQOX9PxQBJ1Rp8dhK7oUjBYluDsMDSBRyKBLhy3Dt8jVi8JWDUL+aP0hPQTdFsCfljdM5zzIEuoCxf7GOs55Rtw6xamsUfZ8lLCZVj40kZdWxN5Q28Ujj6wG3CMawUSTklIvoKJhHqJhP2cAotVFAgml6YLvwzGiDrQoNXDeiuyOvx5nz4C8MqBNVBjIOunRMIraEN7FIdp/k1J3OzdFU7l7w5xDqxWPegVSRntZ1you/V+7yms0wjNvwzDujNopO8L5IzJl0kgPGMyr0O3PNZMPq/OkXRjmoVBrupOG5synqv/pNK6WYtk1mOrTBxYnEcQmh3vTD8ap901Ep1OgDcMYbLksu+i3XezFgvBGkRKupou3X+p7yuWoMvEdhbKqbbOfQuaYd7JZ/oJ4dNO7dmd0httFAEvievo/Kqf6VVOnLK6bJnVsAqwZ1+uBk6M+p+VXykmyMDe0BQ1O8KZ9cys7lxQEpcYQD5da5/LfNasKzxjgJ+0VSqJke8ExPSnwU//+P3KN07xtZvc4FZ0uXE386+GNKtZug2Lmci3RUpikRUdYqgGidomf0vJX+IWausSY91hp5aIV8A63qdCLOuwJVRd51Um5TlCXgFUX0pAzO5QV7sSLRlZw82xu3e+as4c9yjVRHCYN/ALi+mTCk9P2ad/Escmn7nL9GErUVqucwJFqfFd+RiXKPu0T2mypKznQzbnm+1xfZMqdP8j2kBdwlU3PFBJl76AM0NQJs1mx/tuHvt/jOm2kKBuN3Z3s3UoiYwcqOX9l9+3sf+4Kd8krlzXXv/HaUCV1ULGjEREXCZYqT8RdxbxadZKRwrtRNJMxKr+rvFDopAiMB/LQvwP6klEAhyGr+ExDi5ZDHfesriwtSXZc5ORw1iIsRP6noX6swTt+cYblx1iep13/yeRpAlLuFuwo6Eo1zvKrZ9yy4d5v6jm8/uj5sJpmC1SeOgt26IIiFaXC+riuYuCZHwdO88WSIvbKNAHQ3N9t8K9vPuWGziE96dXAnF7lPqI7HGN7pw2H1ICatbZMu3Hsx6vGs4YWshmK3d7NyVoSsiuix2QvzaGSGszOnFFE3IfYFzDa3Qg5rRQ0XM6ZVUbw8z2oGpVy3RuLXJz/0iMbtL95zJ235qTma+jrcrHR7wR1FWuWsyZk/VX6nes6RYnT5HQ0z34YCW15G7HBx5FrQVBDdQVPJ/RQrNxPR9sSEl/ic9C6K0aBIBe6HuQMWmNczgpcULUbg25GMnckJI+GqVoasrYC2HRYVp1t90gC9giM3w2Lqf69DMdcK4/Zbc1bZfxtSLiTYZt+kpUvtMJI/Fi2wDqwXNxZIAqjOn1PQhZJO9s2RMtBiZY= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a4061e1-0f9a-4ea7-71e5-08da445408ea X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:54:54.4807 (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: ngM6uO0T9izNOH9FC9/zw04SxzvHgh7pTPG96ICfLduqg9MfunP14UxMPyNCbrxHISmyBLD6/tymaeU3Wrm1sA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 Use new get_subflow API. Please update the subject: ''' selftests/bpf: Add bpf_first scheduler ''' Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_first.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c index fd67b5f42964..fcd733e88b02 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_first.c @@ -17,10 +17,9 @@ void BPF_PROG(mptcp_sched_first_release, const struct mptcp_sock *msk) } void BPF_STRUCT_OPS(bpf_first_get_subflow, const struct mptcp_sock *msk, - bool reinject, struct mptcp_sched_data *data) + struct mptcp_sched_data *data) { - data->sock = msk->first; - data->call_again = 0; + mptcp_subflow_set_scheduled(data->contexts[0], true); } SEC(".struct_ops") From patchwork Thu Jun 2 04:53:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867504 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 066BD622 for ; Thu, 2 Jun 2022 04:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145704; 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=vPdtDp3MOZDbQfeO7UTr++6PyXAihvoXGBGEmtute5g=; b=KkYiSr9TrCPXMczyhn+R1z4eyn7Zv+Mov2CfLRsMvgi6S4CUADY3UTKJHq15hCLPZLcknK esVAaPnPbbCvRbcGslwnDX2ZSiqnWJIgBx1G6vdEORq62WCv61BirHmBgGt6IBGCNvD+bJ 53weaWZWp6zIgGXWakty43PWDvZhQu0= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2056.outbound.protection.outlook.com [104.47.5.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-5-2ZhQlnqVOw-uMALUebW4WQ-1; Thu, 02 Jun 2022 06:55:03 +0200 X-MC-Unique: 2ZhQlnqVOw-uMALUebW4WQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N2OoLFmFFKWXAPlGKPEYPMLdWhw1txfMV/AYb2U9YsHfyO/hbAG1ae1XpxftA6mXYZAWUhVosDcC0CcSYFzIpCaUIHD6hFPmhwR2n0o/OeAEJkzj8lqUXBhLi4D0NqRTVtVsTB+W6J36RlXKEda4WJqnMy/eh1yKBp0CwWs8kulYIurmy3gehcEk9onmgTRL6PsgvxePDJwmp89u9D6F74OHdl2y9jRvCP23E+uF26iu0qYv/me80+mYmCRa0BkBQ8a7zU1dEJx1XfrWeq2G3yhfQUEu9PrNFzu7wcE/qyxijZ8mQUdBPzxYP6omyNbCed7yo+vlODBqQbnApIAseA== 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=biNxtX9zum/dHL+I5YopRoAtbf9vhMjWLa+Vf5occmY=; b=aSKjh5SEcgQA2V9w2FeB1/VOPrBz4AbHOocewj7X+ahLI5JmTUudQii26pS/2ms9Q2DXKMvL7VTyGspmWTy7y7ChPLhhlzhGvm6wZX68Dee6XF8pkNeoIs6KQ9VRZx90WNvyxlKIJGAygSW2MxS2k0AUxKSGb/uE5VUudqDbFmaU8aI1KhHmBl2i8oTO3cWeQD8X9gDSnuwb0I4CM1x18SsCiCTpROdQPqjWsryij9K9093LEJPQYnRa5bVdAPi3nlWInR54P6rTYeWBhHabJBjcokWcxHUxWWB15OUqOkC8qciQcg/cWhRaACu75qTTcYiBJNRvo/XlMjXSxh2Ktw== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:55:02 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:55:02 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 09/13] Squash to "selftests/bpf: add bpf_first test" Date: Thu, 2 Jun 2022 12:53:46 +0800 Message-ID: <24b6d78128cad40770594d204dd33c5f59ad87a7.1654143895.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR0302CA0016.apcprd03.prod.outlook.com (2603:1096:202::26) 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: 90a2dffb-dcd4-459b-4ced-08da44540d6c X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: 2Jqr3qYoJgbhEYuUluxBvi9C2u51jQzpGnczyjmphOYtRWbPjjWcrwTzjMQf3qh9Dr4doEzMU4FAhu2U1qIft6VexZ4tGbymMSQu4vEcLSA3W4kW8thxC8MU7/73OCAKkVoiZzG2dUb/xfRXYdiNxaqTu6zw6FPWdQO9pcyx9YAZ6kLYwxkB9EQMmxGLalfWjt7qMmbmLpknUldWrAd7XThfeGb+UxIRHbR6mymrBscL3IMoFs7imVno7AEO+dBtoymGHSkSuoS/ZtdzXXpMhGEzmMLPlPD0NHeGXokgNpMPeGX2BqvuQE1n/Sr6poGbWCmy8QnjX/1l4UVh9iysnrdHXBzb3j6UL+PmNsU1Mi5WIkB3oocCDuSYlIMoglldnB5Uqoa24XETUTLK2T39GLoM7n73NOYnjXUhaU+lNk9Uoh16i9rrdBU6tE/yE+oiFP3OO4akPDvKsEalBD3T2WnrfXAb0RrAWmfCMJUl8tAIPbri0E0lf/Y/pHTfg8i3HXpRCXrdmD7lp3ZmRb3WeN0xhUlv/6KtrzObeACrq09pXjGReALb9SoSfLzGqeYoA9G0u9Oi5vB/MMy2xcx6mEdTtYZK17Tblk6kvGGXAlH+IUjqKuYJv7E+XkpKsFrpbQJmN6FEpDCMwduFh4Gz69ZqANFwHhUUntCb/sQ2m2sKy2RTZ5ECwlbfj0hxx/e6 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)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l29DKVefzAIHfBx8uK52JABg9b7zSXuTuOrG/cgfxvxRNw3gb5iWHHYeRfDCP+hBfYnQHSnnjTrlP+ueZOAowswJP87zOyu/NiNEXxYu/zW56hBWb7ALmL29f0joy31qD3b5KKLv+NnvRmHJAMveH37dvtRi9+IHO8unCvvmhUoO5LwsIVL2ZTRmtzAlx1TP/RyPx4PqFR6FvkCA2xH3JYiFjNSiaFAO4qMFiru3prAhlV6OyaNUngqnlT3t3z6Qhzs0g+k+gig3+0lAsfeHaWyB/NA/THv6RiEgxxhYocEE8lkzBWdFF1nuuqepnUma8PCaidhLpPUGS+RHmMxpQk1V1NCGjYE5LzonYGJo3ihlF0qwq8CSDQ0Q0ws9nQKlPhzevSvt98mMYKgPze1hXjn75Btd9g32aRAgdAqomw7JTZgDt6fy70E7wsRdaVlsGJLdgP+1waHvw99RmZVj6/kuK5sorDUNPQ7X2D5R26T+hMC36pKmBdvdMy6r15XosTKLrLPzIo2RylLEu1UijQIngNEXbJ6BJdg4uoXybrs5LTm1fuxo9rMpITf+R3vRyE91htkDnGNnTM6ieMaMDb8HGopxszc2Ut4ZU6jAwbdku0W/j3FBBwBFhhEJ75HLl6nZSeTToTXag730H7bVhkAaNfpKpjFr4aYxsxrYsmQHWxBxHzQuw/poVP7hACtjISBETRhTrrb07gPSYlN2HNnP6RJ7dP7yMQR35VaMJf9wZ5P3Wf7ff6kq3xSkx1bl5M6mmrmn4O44tStWLz53eajOTl6hh5uZ2CKP7iuop7WN05BOLbBzPYkpQyNntq267xHDijM7O6v5GPnqrHp7FHC5+nF7V6Iyy7XlRtFoit8DuJ73ZcYtxIZ3LWGB+6rf42coE0GJhw81sm9uWTiV5KRraCTk1CpBt2CBqTtUDmGM67V+sIB6ksefCCff15bB9XGpKMO7Lfaskn9ltp0uykMJItbwWLyM6fKuRZ2irOCPx2ZCuhVG5D6aGMqKHMUeTdRP25t2BADmAgZHSBKcKyEfu5jUkUgzgHBgALidJ8J0u82TwsBVqrrkdnHdsBt65+jtSlB/QowOQDw3bwtWDuRQAGk0yZfosKYUObLr1QVrZLi+84PLcJfceQcw6y1iNXObOcumAfld7N/rB/uxurNm56Bz1CF7TvTOopgeeOTWAlcvVhtOYpVV4XmrsksWJH63Qk+Dl7qwnIp/0sAYaQvUnGYx4/saXYijSdtsrr/rF5bTRdBwRXH9IIdtLbjkPP5oGStBwBamG51GM+ItRY2GyQ+wYdxHzXWfdFPRhyhorQ58QwZAl8cM4d583q/gOndNXVCA0vDSdiIdRVRmKFANPhAuGIwAKp0FrEuzsyiDfqCoP9FKB6Lo4fTXRpYgSoRBRVehLq8iwARk68gk1fjxDXxNu8VVPBz3PjLdRNnxGMIo/n92PnUisgrwp55M/sGaxAuHmB6dhymwnvq4MLo4ndkMwR2JfuRMX7+lUCW2KWjLudLc/uZjCvd0rRCaETPbuWIrUgKsi0vtETRae6mHREez6ZKW8572UH2l1FE+0WArNvyBmGGQ4uNS5wThl9XJ0/31wo2uUjM2XPkbsvlMXoz+oGuip7574igafb2wfPfk+pairR1xcT/YqqPXvtn3vmaIaRS0HaF+jakM8JbxRfNfDG6SgKG+Pa8DqcW5gBQuZcF76IwMS9N0KlxfJxzLymR/zgoPPGw/Zo8oy8T/h4UBbT4phoWF3wI8Myw= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 90a2dffb-dcd4-459b-4ced-08da44540d6c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:55:02.2301 (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: vCby95X7nBjYPQMSxUJLIlcvrTsi8s72V70VUUa2LnUsIixHhn2mh7fw5/r4EYrd03f8DzNGNUbfkCrVRY6JvA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 Add two helpers, add_veth() and cleanup(). Please update the subject and commit log: ''' selftests/bpf: Add bpf_first test This patch expends the MPTCP test base to support MPTCP packet scheduler tests. Add the bpf_first scheduler test in it. Use sysctl to set net.mptcp.scheduler to use this sched. The new helper add_veth() adds a veth net device to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add this new endpoint to PM netlink. Some code in send_data() is from prog_tests/bpf_tcp_ca.c. Check bytes_sent of 'ss' output after send_data() to make sure no data has been sent on the new veth net device. All data has been sent on the first subflow. Invoke the new helper cleanup() to set back net.mptcp.scheduler to default, flush all mptcp endpoints, and delete the veth net device. ''' Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index 8e9764275b07..eaea4105728d 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -250,6 +250,20 @@ static void send_data(int lfd, int fd) PTR_ERR(thread_ret)); } +static void add_veth(void) +{ + system("ip link add veth1 type veth"); + system("ip addr add 10.0.1.1/24 dev veth1"); + system("ip link set veth1 up"); +} + +static void cleanup(void) +{ + system("sysctl -qw net.mptcp.scheduler=default"); + system("ip mptcp endpoint flush"); + system("ip link del veth1"); +} + static void test_first(void) { struct mptcp_bpf_first *first_skel; @@ -266,15 +280,18 @@ static void test_first(void) return; } + add_veth(); + system("ip mptcp endpoint add 10.0.1.1 subflow"); system("sysctl -qw net.mptcp.scheduler=bpf_first"); server_fd = start_mptcp_server(AF_INET, NULL, 0, 0); client_fd = connect_to_fd(server_fd, 0); send_data(server_fd, client_fd); + ASSERT_GT(system("ss -MOenita | grep '10.0.1.1' | grep 'bytes_sent:'"), 0, "ss"); close(client_fd); close(server_fd); - system("sysctl -qw net.mptcp.scheduler=default"); + cleanup(); bpf_link__destroy(link); mptcp_bpf_first__destroy(first_skel); } From patchwork Thu Jun 2 04:53:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867505 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 E33D2622 for ; Thu, 2 Jun 2022 04:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145713; 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=DOEPPEcFgTIwsSWwuo4JORywH86YzX7fEFk6FKFpZlM=; b=GB7d2+A35Yo2WkuB/Rj5SPZKyLeY2rQOwMJYG5T3r75gMBQpFNhoBwVDEjeWPlXWfUURyJ exemRkxyL1cUDPrZOxEY/VIsk0eV1HZBPNMDZdiU+E3hq9Mynrtp0BUWV4YksiEz9A/dui KGzt58aKKWN98wlZ7wyfkQ2lpwrL1Pc= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2058.outbound.protection.outlook.com [104.47.5.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-15-ZlQdPi30O1agQvMPXKsY7A-1; Thu, 02 Jun 2022 06:55:12 +0200 X-MC-Unique: ZlQdPi30O1agQvMPXKsY7A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZTP30F0EbmEINJzPEvaHaURxF+uypcqxHqMWU0WKQpYfsU88URX+S3iBPloCVm9rwNYQfE1VsngHP8xSh9Xzl9iqzvrfqXhvUqw+YHnDH2twfE/H6LUX1eqiyUoupb6KneNT3BQ7rltpgWgW2GBHaquO6kChf/Um+sjjZVY6JkCfU3vMmB00T0lNM0/05CvQ7tJJizd6F+NQBsad8TadVEEbo3LUgQSZdtsp69ajWk3EgOa7yy1GHDOL+QMWZJn24/CtPP6LV6gI6UvcRIgD7AGGDfBD/5mcY2N1Py5wqI++ly4+mGJOZF1mpq6vnLJlQxdx2Jd89278XAjDcwTk9Q== 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=juzsboByBclRYgIGDgxMMCzLpQVw4fwsSARMfkdMYog=; b=du26dHcoRs0CUPh+NDUObx+hLDsrnxQOBx/a/nuj/OZxrujcmO9XOGncgkM5uXOqLjqIM1oyoe1VLi9QVjpVElHuErVEhNVbOmolu7SwIED0bsqJEor50GtfyoYzszBw9HLXT2Be4aTdwe7ARnBkambb5ElyfwlP4zzp02RXHEkAwtw5zxRNAqiBevtxuR6FKiljB7u61fhphnwMdyn0i4a0eTIynrMMvSiNRTVwiEJjqsUI4vW1Xfc9LIq054KIG84XWZjrbxi85X9P/hmPhT5lTRTPwHApHyKNBN7nqYSyUtEF/xrugp2hzF+XWWUEaYwOTWG4f808/pAX6BsZpg== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:55:11 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:55:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 10/13] selftests/bpf: Add bpf_bkup scheduler Date: Thu, 2 Jun 2022 12:53:47 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR0302CA0015.apcprd03.prod.outlook.com (2603:1096:202::25) 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: 81dc949c-e22c-4dd1-e240-08da4454128d X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: dEXE6vYQyaFZoHR6NaQEIN1AxxXpNf7aqunWOw7oRgW2sOtZycXiq4HUBsssq9ZmtLV2rXtL9Fq8Y5B/KyYtLiMKQ2TU8dp5F/mi9bFJsxWcJE+g93ziJsGElL7MgCTBXBL4SKcJs62y7TSPVj65ExIOBc/tCOR4l4Py5c2gQ+2UkdR1d7OaDQlBiM95zl2ipxOWW52sgQc6FDwOu9S9xMoJsCsLwpgMbBbc7ZuTwDK9NhQFB/vocYeV8Am/+OpWA2jdbY7n1Ihu4OXaZD3xVA+Jm5FLefkMIiEISVCRlRQtqhMbTb9bB/lpZvkWL0ssw5oDtPHFy7l/OdN4+8EPpXLEbxYCd1HBEhy69crJWVW2iFcVv+w0Y6FgLAhH4v8ay716/eW4Ywi0P0e3fqgmK1OF5+PvERKn6P7yzIug4xgk7GBhYK8mYAZEkde7AnYz5QzRhMNDGCvUr8SPkHp/a3sElgq9Rc5nI+KrpFBhggQNM7b2ScB6mSUBQ5LIenTl+RLwSMx6Cy9nfBSnSr2BgqIBrqb/vngIcv7bb15oJI8IDhfHgNaa9PlHqtQfve1+fV26m5967W9IbIsK0r7WJwnADvwcJxamo1igT5afiWLvIotgJnVPATEKk7mpqaIwLsw+AjiBKc34CcQzLocaj4QzwAtEjkJZUxHAXCXFzE0FfWB2u4dkdLNxG0MOZL4cPs31mIFIqltqBFj4DbNHaQ== 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)(44832011)(86362001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NL/3pdIE6uvQ+VuYBhPtw6xHjYuIHHS0igsQmSRK7LpZ0FPI2j7Gco0F0Lcn4pHaoSbXbsi92XiTTbfigsrSRtMMn4iWBWukHmoIl229rabiuoQ9SxsIQkLNcZl6f58V/hHM8zaRo84fJpRLefPIhLO8WIGnMtzLEsnvKmwsFAfPCGibkf+UtwCXJ89gWDoPJ5Ejar22SvQRBD1YnBqQv1tZOVvqGmQbadjJ1hD1M64gfCIsZkETaFFnGMnvGf9/65k3iNsO0bmto2/MI1aUlPHBYubhpntfEm/h247f2NljnGTNy8yDJrSSidWjO9lhYOyX1JhaZRhRWVK7LHKl3QQwE1d791dPt2m8fy0dULSdv0rBPLUZp6bSWTQN5i2T0yoFT000p9mbW2kpyVRo7jl8eCe57+5hhPEv5VUEu+pLKFpv5tLaA/dVX2ze5VUMQfSBdcJdtlD1DjznCrEXkhX92gXv9+4aLtjjg76g4VIt4iEedBYYfEFuSDjxLxMLAsUiG8FkTtz8vAghTIL7PV5SAdyD/RyriK5PElgKblj1aVkmRWwWQQrF+AuNue6kTgW9zjSAi2HFYgyN+SQYI6IV6aqtkTFQeUxVQG9ZfOuiT4oM2km+/maqhg1klnmpfbMOwgNZfaHnbry0gWCp4OR8Z3E8tfny1oIOHAq+H58F1Pp6CFYQYodCqUOdtgmk5PDp9URFrlYwHvb/WG4P/cLipUSJRaO/ZtegQMLsMdSYZtO0VAma+kKdhNiOowBsoaIQ16IDfZL/prI4fDNhHIJAdg2wJXeSVnNPReB4r0+PfzU9R4ESDcRUjnSTK1fqGO9NSvEANn8uh12LZAf0KZ9pTaYRliuaGLyBfsZuaLMurRElHM5wZzUosa31XMN72+hVB55Vt5GyESB1aJCpeKKteR2UqQMeObBxfjwpf2PIXFlL4kb3ciasIS4nUgGwx1lQhkiEvr2oUdSZ+kGkCzC4RiFce1qcz5yocryLR4smqPruVU7HnZZ23qpElaQ8yM6cdaiUJZK1nvLnqF16gI0DTq0gmAw8AYi9R9nvz7IAiRBVWOHNLWR3iJvTAByl8wiw4egNgqwyY1iwwohtDWP0QS84AoRRiqJQwarBGfkEYDgpRGS68lPZqyyG9zNQlkGa1ZEACdSCgXTtpoqlAAiEq2fnFG3lr6w8vtH756jWtybo/FK8lc0nJGBDET9psNw9upBXJS3Zq9vsMy29/BgHVQTEj0bUdxjjXn20okjkz8l2+vkEuq0xEps5JZpk3bnhm6Mp0YkU69JayUqIUWynl7cXm6IiQfVxd3O5gOTikWPQbNnfBWuZ0VDpRoWvUUXnciAkmlgeMBGdLJahtU72op3Tl8T+Ep26iizPXIg7Rlr8Fy14GwH9krbtg777CjhPQcnga+aXAHYkS9n0Vf7X8lwMbPj8N3FxH14apnXDbFO5fRpobT0zR2Z/t73Sguez0aOshNZfIJ/3B/5E6OltzfxOirtXQ9qK1utLJpLgE9+GB4H5DEgihhufcN9ZennYGsRD3zIOyXEtDAAIabO/MBb1QB0O6OGM4NXJ7+p/XAsFoutVwKkZc91HqkHXBqQrJVUzT+zsWtrvtds7BWJyMkP+kh1Wk6L+VdPfpHChZnADry8cMDIMiWHpQw+3J4qn7L9a6sbBgDmKonBpGOOrOjWPbNNLASJHm0yPreHj7ED7+xNxwGQESBiVxO/GVXVY+89V0XUYwicqWesOQ4rG/v5cyxUmEMkjmasTQik= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81dc949c-e22c-4dd1-e240-08da4454128d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:55:10.8701 (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: NTcSanjQMoTJ9j7wxYrqZ+qqS65brrPgA4tS5p6Cq2nL9lm5TzshKYBHA80dFRI4TRrAycEInJ0sKwqHKi56gA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 This patch implements the backup flag test scheduler, named bpf_bkup, which picks the first non-backup subflow to send data. Signed-off-by: Geliang Tang --- .../selftests/bpf/progs/mptcp_bpf_bkup.c | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c new file mode 100644 index 000000000000..949e053e980c --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") = "GPL"; + +SEC("struct_ops/mptcp_sched_bkup_init") +void BPF_PROG(mptcp_sched_bkup_init, const struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_bkup_release") +void BPF_PROG(mptcp_sched_bkup_release, const struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_bkup_get_subflow, const struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + int nr = 0; + + for (int i = 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!data->contexts[i]) + break; + + if (!BPF_CORE_READ_BITFIELD_PROBED(data->contexts[i], backup)) { + nr = i; + break; + } + } + + mptcp_subflow_set_scheduled(data->contexts[nr], true); +} + +SEC(".struct_ops") +struct mptcp_sched_ops bkup = { + .init = (void *)mptcp_sched_bkup_init, + .release = (void *)mptcp_sched_bkup_release, + .get_subflow = (void *)bpf_bkup_get_subflow, + .name = "bpf_bkup", +}; From patchwork Thu Jun 2 04:53:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867506 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 3607B622 for ; Thu, 2 Jun 2022 04:55:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145720; 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=FpG6ENw/8D3PwJ90m30Sg3WYwAOt5cFlzsOTeYTz8Ck=; b=WZcDFJa6suEeXWdbydcj4MKK3xs+xNu4bVPtL6+wvUvhgl4BMnCx8XrA+ry5/GQgpI7WTq nLFswiHqM5TXI5eeU+4R1CAafi0C3S2UaeyZjPxRk/O3PAzfjLZLlrRXTjWNzep3Lssd+h YJhzu09yMPVn40WFriGCju6Ih1pz5fk= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2056.outbound.protection.outlook.com [104.47.5.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-12-Bs14z6YSOWGfJYhz09ebDQ-1; Thu, 02 Jun 2022 06:55:19 +0200 X-MC-Unique: Bs14z6YSOWGfJYhz09ebDQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HxulyOA2aFXDt6YdMzazOVKXIgcCOhONDcgCjcFbylzVqRDEVeVdQvF4GuKtbsYrGKBZQqQt2hSzfYA5FzWn4Leb090nh9O6XZV9NugltASVOaLvHf+fgawyY9RZWPMgLqfxksE5YRsD5vdKnetkhb2t2g61zOIOzs+B21V3EujzpAHpexE34avn8RYK9dd1He3/qNhYTprSFNlSQyaW+mIirAxzGifMPbezggHKdMq14Kwg/+vILkS3W0fUK39cIGmJAqUwijKrc+czOkv0TWdSmQutULc1WFKW1ZHjtfJS5UiIO9Kbe+LkAs4Th2AjyA2D17pq7nAYUtSHohyY/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=3GcfFui1g5oBNt3wRa0fwp161zlANUD9TuVQAshuDjk=; b=mDxR8TylB+INtfyZYztzbF66T83wifvtejXiNahQ8tNs5zYQnQ1qmWQR3xTdOKlBDkBuBDI+cn88NrzZONCui/DgiMLE2ETsTYSEjPjYXr/I308NW5sy2j8p3FiUlhXXrYq8SPZw9LrtRpTugT+m/ntcPuXU09AsSW4uU4Sp340SgAt47hjAhkuseRVpPEmVtjdIAkZv7WBauCSoG35ZqU1n+01mg6K2rqT5StReVhcYRWKwW3lCdY3CPSL7Fr3Em3q3/ZQRmUYhbSmr2xbbj7MEH5z2AUd/VUw2QglAcW9gZSQ4CXcFbNGvw6WLPaBs9N8toPQwDs6+G/emSbH6WA== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:55:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:55:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 11/13] selftests/bpf: Add bpf_bkup test Date: Thu, 2 Jun 2022 12:53:48 +0800 Message-ID: <9d676989dfef5a0197b741c5d50eab75e4967adf.1654143895.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR0401CA0014.apcprd04.prod.outlook.com (2603:1096:202:2::24) 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: 0d53db17-8ddd-43a1-31f4-08da44541725 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: T629Y8cTXjnDOpKgZFvIvDuD6MNBsGaRciOuzU/wEDuv/9jgB4jbWgURxdqbxdMFrNKVLOaFDq2koAiUIoXW0jfL3TTOgAc93Gh9PyXhUMdqpyGfoN7mAylVVJq9cMd4b40NRV5sYi1lJXU1BnTRj2IoPDg4xjIfgubX9PO0Pq5zWBSKMRUY7hFINHaiJF3dGQKz6DiTLeEg5R+NSjFf0dOaMoXkpVDVQA+1VRpenwy5Y/YeM5lFbordYPmEnrBuLxE/nRAm5opByTvSinYDZif5SreB+1O4Bp3cYAgHTLk2QrD38krc7IHfn38XXQcshuW/WxdTCXrNmr+h5Ksu6mekqU8249r1ENlxzMZQ49SMjiRVQkRzWncYyei9QRipUNcCvqbP8Bx6EA5fkmZFCPItgx5hC1uNzm3TXY6eDBF3fTI8xoIvQL7JRV3m9bPSVvCsunNWxoupX4h0NWbI9AKcmFwMJJryV5TlDOJhiToYO93GK/knLO7qtTXSMNU70akHHO91OHaVelfcUM4y8yFRSDe3jCDXkjY1aWb9xqNmb2SbL0MPaoriJT0I9ZPGVh05j4kAjZOC3Je9TZIHFz3zrdrxNg2bgHmRALWPIFoaNDcKeX4sjZmweCpHiodDZp6b0asRiRn63nXSooO9fcwRi6oguqjm4KLmr6+PWcoopXK2wEw6L7lykoxNeiW3 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)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RtrV/rSWzFB+uI07jSNryAmLoXNGhJoJb4G4X5KiN/zCRabjvy5oM9jMhQv7A+LWdzEnJjODX5NSEVhnL7/dMVesw+VSVXwfD9b6A893OkVE0K9EiyS0QphPTnsBMtgIb/bRG7u4Lo/BVVACUuDQcY5oA3/Xn1+rjqn78uBBNW6fftgPZP0btc4RKEFfI2Y2B5VRJJgzIOmmjQ8t6FcB42nv0cMIAnrTES+x8u68VP9UuQEfcHpHTlVDGVrAQ5uJxHVujBThBHy0fkn5pXVcqshYYfn5uB3bfPjBB0rbpQ6sWjE5z+WLPNKxIp9MZI1UHf/d1SKYTxPdScpH72PY+fJOmSiGxxNLJbbV06UCRLF9Zxxy7ObdOQoaQFdHmRZGsVsB+KNrBEWBdB8jBGOwvl1qDNo3YX98Sk+bD720xGMZqwbQdQd27lScAfTp07mKUQi1IeEes3iccI+FYZ+Y4+b7rdy6+72KM0i1tqLDFn0NcgRM6sQ1hNKmAuoAENU+Y58VtmEVfke91lKspEDAWxtUzk7O1Jq+674YjMhXXzbRBRCF8agJwnmqghmvcUrloWWpdMK4rB4HZRg/0OoBGqdC6mIGXP8AbNpXTRrA4L2yfw5FrKcjLwAb7KcriCv2TEDbWnx1KNJ63VYH2oTPsVKcPH/q+HJ4NbXQfoYP+97LQKm9xnN1ZwwOms4l6xO2lj7tzrkwbEBiKjgS4Aivgx2dzOndH01mZHEPvdQEjfHBeuwbvntKNzvOV7IvLSKZfwE2XUBjhDMmJ+df3FHSodjqAUp87oNp2YIHaBE/yOlysytut9wsbD/UoHj5MpSapnder8PF1h6HLkH/oFTQLB2Hs6ndoW11l+LvjfIPV5QS7dPk/6Mo/EwINBulJdqk4ZhQt0EtIlmWj7i4eGA4EnM5Q5MX+xFhF1WDB0v2IwRmQ0nNAbLXrysi50IGpEDezjpfYOBgF6/HDq1pXYjHtClq/VmnT0VcXW9ofGxsapd/QyzE8VkCTq1LWtMDQ/Q+skhDjAU+GIHOyAl4nNRu2r2L7ctmNHdkPZUt2KRArKLBbyRkXqsnbY3x8/dDaZ1m8AxTQX7j5kOiLP+AHHvVlFXpCYbdAD8OiBv82boxaXbth6g3bVCPiuJtWgpT23WDPjrcvCod7JORLcM3bT6qb+fUirS/jNWTa3SYLhIQ+dlLCAZB0WmAoEvKhwdYO/y+Po2PU6ghe3bJincSY+QBTqZoDm7RtxvPXEdv9OkwrwtI64xtkcLmNahgOexHpuUpbOYrNlPSotfYFabsm44f9DgPTHZd9GCiM5vbW244+7RSPnDCbTAp7PalKL3UToeTYsGw+ogvcsTdGG4+9Z4qAtQc2X0dViscrk/OsLFtSbhyq9QIbDlhohViZyeKswvvrNAvYHAlFOIpNHFJ/D4Ht6xbydNjuSiC1EW2U+RdwqwgaaIffsE0kxLJ+KJaGNZ0MgySvgt1rqZW92gCQW53VkKz6CH1efmKkAEquDTiLGdED5v0uPXXD8Jy+Gea9D2S0U8OyEYsIuYdjA8MHwMb1pXVCdpnkN/Q3AytF9dtDX1mkef3w+VzWv5As4ZW0dxBRzTy1zfk8FTTg+WhtKXcotyFNAX2gFKezR/kLmA9UNPAv+Iz9zwVBgnh9Teffd/fJTHZ32LYqonlUde3BNN3hYl5wfOEtgPNQPGFOxeY76JN+aKJjyTDb0thGRTyTggG3+Srsz0w/JWmrYSm5uswFD1YrvlHTj7/STSIt5JSU6U= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d53db17-8ddd-43a1-31f4-08da44541725 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:55:18.5257 (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: 525JrUDeiFixBWbTdsr3DgAZ5zPoULxMgfOWHkUo3bq3CGWEfNvpEcHX3TB6uwni90T/xJybNKWR6568DSouKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 This patch adds the backup 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 with backup flag. Send data, check bytes_sent of 'ss' output, and do some cleanups. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index eaea4105728d..f3c73cd2c786 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -7,6 +7,7 @@ #include "network_helpers.h" #include "mptcp_sock.skel.h" #include "mptcp_bpf_first.skel.h" +#include "mptcp_bpf_bkup.skel.h" #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -296,10 +297,44 @@ static void test_first(void) mptcp_bpf_first__destroy(first_skel); } +static void test_bkup(void) +{ + struct mptcp_bpf_bkup *bkup_skel; + int server_fd, client_fd; + struct bpf_link *link; + + bkup_skel = mptcp_bpf_bkup__open_and_load(); + if (!ASSERT_OK_PTR(bkup_skel, "bpf_bkup__open_and_load")) + return; + + link = bpf_map__attach_struct_ops(bkup_skel->maps.bkup); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_bkup__destroy(bkup_skel); + return; + } + + add_veth(); + system("ip mptcp endpoint add 10.0.1.1 subflow backup"); + system("sysctl -qw net.mptcp.scheduler=bpf_bkup"); + server_fd = start_mptcp_server(AF_INET, NULL, 0, 0); + client_fd = connect_to_fd(server_fd, 0); + + send_data(server_fd, client_fd); + ASSERT_GT(system("ss -MOenita | grep '10.0.1.1' | grep 'bytes_sent:'"), 0, "ss"); + + close(client_fd); + close(server_fd); + cleanup(); + bpf_link__destroy(link); + mptcp_bpf_bkup__destroy(bkup_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) test_base(); if (test__start_subtest("first")) test_first(); + if (test__start_subtest("bkup")) + test_bkup(); } From patchwork Thu Jun 2 04:53:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867507 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 2702C622 for ; Thu, 2 Jun 2022 04:55:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145728; 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=m5kITzgRuokeQUPx+b8grfhOM1DFlPS2VGHl1t/7g4Y=; b=EOyQ/DF1kaRHwnQ/WUKwYNHQqS86Y8oD2j7JWWrHbAffFfJb7xlc5Jd4b/G/XKQ3+RLOxl eOyN3ZxSahqsYE/4RSlTtglJEQrYpBtzEQtIZFojAYAs5vDUTVA1AYDoAe8zTS7UsF4Lkt w6Fq+GuukB+U2HVpuIVpYLST2ysYyP0= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2054.outbound.protection.outlook.com [104.47.5.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-41-lYaTU1PNOCeB90JRxYGYzQ-1; Thu, 02 Jun 2022 06:55:27 +0200 X-MC-Unique: lYaTU1PNOCeB90JRxYGYzQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=il/yHWltdzr03EQ+tdoryEwN5v8CpFRDFDxe65CU65WVFrEYQnuHXFcmLe1LxMleK0uM1vwvUl48CoEg1OsEczwpE4mPw4MCpLnPtsiXe5Gvx6fiHBmjw16bifzfaQWR9XS/Ig1pYKWNbBeiqiM6Hvhev/nzCM7bwcRFU9vlsto8g9ahIuAqhxSGnjV8Dj/2SNbK8J1VPWTahFjrq7ABrzIVlX/9bN21gfRByxokW0Hrf/f78hXL44Vs3OD4ASQv4jvdm+zz6uQNRKZ9igqHsEHh3Edr+dhklX7DPyiB8SVnlA1X8mkeHE6eRyfkUEZERinmWzxjl3mmW8yDM2Ki2A== 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=fkIQB2Sr0rLtDIjViNi80oIzaTXnUrIa7LI8f5QVLbs=; b=DRZlwagm7wd9z/jt4Gmd002BbKS0t+nwdHWy0DrjNfh+kcF0WyTFDq3QjXxSNGRiHEPaEmeMtRtj1AxOZTsIQrjxnA7nRVFnArlXHnX6BY2Zlvg3q5RjTPfZdsWsje1UhKj+awJHdp9QarpgceDnKg2sxbdP/3NpFSItFjz8W9xa7Ub6Jm41xAe850qDccSmwBpNPMUb3BkOTXR5m0qInSRfVZISLQJh4sNCKXycKTFsUu9v26qzpiJcHD8bceg8bJvt5uJ/NNq4PAse48LIt4TfjvAgFT1HMl3+s+Dnr1bieyzOqmdoEMf7kmXS36OYmOafhwtA2Wqji9K+QX3Xuw== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:55:26 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:55:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 12/13] selftests/bpf: Add bpf_rr scheduler Date: Thu, 2 Jun 2022 12:53:49 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR0401CA0015.apcprd04.prod.outlook.com (2603:1096:202:2::25) 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: b2bc2b2d-aadc-4455-0cf0-08da44541ba7 X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: qx84mnq9/I0Jdgp+5X5sMyl/8C2l9DUtGKJejKnACGel06z1rVAnZb8yM9UWLYVBhZ9ezk4zLwKcX1xRMV3CH4zbogj0AsKhVfL+1uE2iqgUdTKSvLn57OOaoqkfOVSGIwnirvrH/sMuAx884s6/5NdimicVC2IWhgeQrLiRbYOOeKEOj428TQ7N3Ymk/1yygzJMLsFpjt5ULX29I7ahn/2vDV+NJPxZlmbpbWiwxnBZe264zJ4KTadz6GdSkOlQi1mRW61+zPDQ8mlV+plRH4c+je7fBYgsDuGi2+6ZAxB51U26lQ1Hz2jXiC1wnLXcEl+wDsJZmwI15EOs+aHWhBdDu+QbVQOkqgSdDH0yef7v+G+5KXNpHah1wK8uGlJCYEdQ15pcUtkvXyNSPt6e3hyKEh9ShS/J7DiPYpFG4ipWiNjlU4HwXD+DiQx9SpCaJjSnZ4z5IhGQBF5P/RRysrAcdTnq0ikpP8GcLNwLmUrnQaXoc0kV/NE9rwP5qfX+7qjj9Qni9zoGKbgCFD6ciDDHPQJsyJy/LvR2qimAOxHIZtklWHvye+x8j7rtruxlty7QFKiFOLD/tk+7rNyU58jJmG9bnEwCt5P/fHsqrra6syJHtt35Cem3YIn0MRjyyswY+Z8Z/Bk4On24XjNSEZs4zoOewc394hcmLDJiMIJfytFDxVlZLDZTWRegzOALjGuG8oUoHrZu4JRr0gEalw== 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)(44832011)(86362001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eeFoLC4zkVc7KjEYvWSFmC4Npn6F1UDcrRBBW8iyGS+yQEN6uSeuRCR8aJstrraE5D2mcR8x4PXG6oiZ7MLKsXqUqT76CLqjht3SOjfjb0ju0bTIIvL2RjkTVI/N5Zz2pOiHPxiqYy3HB2GmC7f3YQgbpUMkLL1S1htF99e0zDESNX0h0u8NqyGfMsPrPvJ/p+JqD0oH51AlKN5nI26W+rrcfJmMF0T5iy31tcVR9CZiPRe/gmjbAfB7rw8vp+RewzlaEyfnnYZZ0bUzZp1UA5k2aACWBEEuZE+PdnUBVMUyD66fEuTM9i+UfGnGLJFzGpGRTcGLDQNfVmnhqXu6hzOusZyzMyTTwOBehqny9Juu4FZxLkrwxIl8PCh6Mo5pbeWR+i3l+W7XT1CI0JOTZHfkCSiccYSv4K8LOHfWTwmOg2e3Gpng4QowzXjmaOoe46hqAXuwEQ9ms+ryP0qe3H+JvukDBJi4QRZTTa9oCjSoIc+Uv7HhpMnyflrDx+GkJ4tP5Za2ZUXanjlSyn8VnBPf2Hpem2O1YWSO9p/puERxz5f/FmvXhoZnjFJV/rrSGvY0f4GafjlA5KhXp1SHK+brDAav7chlC6ej4RblJ0JRoZpwG9R/zg2BGBCg2ccUOrLY2hQudRbjmRhlggm6QXDiRLk+dpwLLYzbnWSsQMHzSdY/zigdL0jQ9kA4vrim8fd924loPksusjlWmD0IDXrVU7hB78hry50F6Aj4L7YBTUvI61RBcGSxWSaaCLgNqa+Kb9WHua/FGgyn1rokHkcZaUBdPDv/GtRH31lV8qOQXt7EItXqzULs5rhkS447WG12UDfEbjHB6g+BtItpLytxF6Pc2FNxeaCsLC2Lh8+TL/TDzEK8LscXoYPNC4QKUziIay0wBNJBjUG/sY5mLoM1rYod9HsXgk7NeBhj64OuD+sWzSTupqIad4WPgKF0sfVs9qLV8G+GnhVxenofFogTFPYFE4IKNj8VsSTsPTWoX/3Uev6tNxvWnMP54KEaECwBE83Wxrw7PxzTjQVe6QGKdWXezJ5fv9pCA9KVJ60iRxyzp+PD9LzXAiYyTy4Zkt5NCU1cjtkMDl0Cx6WKcjMFOZhvPKIcrZy+PZEHdSY9Z8d7CHshqjTvXTTeOXaJ9/HVw2lK+R/k+YUskx2/V/iBQMBQDBTN5Jfx0O9lb5NBZxNHzo6y+zGBuCzrQDd9K51A+Q+Lvg4qGmYQiummw9SPS9+eQFYGf67C8AqncvN17Fynz8G4942sv4K9VwIx/tO4/d013aR14DWeNpDCG28YR+Adh4Qex+i83bqBAE0GFLJky44pgEPuLCqu3tMCcFcNaXncCVS3jUxpcB289m8srAzUy04FwuKi70bSq5oF/3QEEtmf16AGV4HfGnWM4xTpHz2GIkki0Ttr2n8V19tm4H29H+kuoKJZR5wjOHzMgYouKKOq1jlLUqNM6PKzQSfkWKzKQnGeKj9Ong/n9VfE5HLc6Gbwo0O847+fDa9BqWofaG5S63qVhaTVIUFLjRhR/qFAz1gr8YyD2fRsAcK2OScOWiLw6iZtusJ1we7THaHXAfR6iuIgnKjzp2F2RxrqNr3K7A6DeEOdEyorHbhLgzrdy2itcaINQX7RHsUT1CH3n8JqAE6pITwzkNBwky0W406Jwkn2gG/A3Dmuo0h/KgdRn9S7sT4Dk2vCGYNZ3Sbss9CudFO0rftjwPNU3NriR3HZocktSfrTZVTBtnVa7yZaAmTvvPcoF6Z4XJo= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b2bc2b2d-aadc-4455-0cf0-08da44541ba7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:55:26.0876 (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: X5WuT7CVENKEIlTJCKp8onwYQyICIyBw9LrBZwExuQ4xBz2D1/SNJ6/2pcwTSwoKUOTw0fTAkdXuDvyrZMOWjQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 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 --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 + .../selftests/bpf/progs/mptcp_bpf_rr.c | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h index c8792e6f125a..c7d4a9a69cfc 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -257,6 +257,7 @@ struct mptcp_sched_ops { struct mptcp_sock { struct inet_connection_sock sk; + struct sock *last_snd; __u32 token; struct sock *first; char ca_name[TCP_CA_NAME_MAX]; diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c new file mode 100644 index 000000000000..ce4e98f83e43 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2022, SUSE. */ + +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") = "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, + struct mptcp_sched_data *data) +{ + int nr = 0; + + for (int i = 0; i < MPTCP_SUBFLOWS_MAX; i++) { + if (!msk->last_snd || !data->contexts[i]) + break; + + if (data->contexts[i]->tcp_sock == msk->last_snd) { + if (i + 1 == MPTCP_SUBFLOWS_MAX || !data->contexts[i + 1]) + break; + + nr = i + 1; + break; + } + } + + mptcp_subflow_set_scheduled(data->contexts[nr], true); +} + +SEC(".struct_ops") +struct mptcp_sched_ops rr = { + .init = (void *)mptcp_sched_rr_init, + .release = (void *)mptcp_sched_rr_release, + .get_subflow = (void *)bpf_rr_get_subflow, + .name = "bpf_rr", +}; From patchwork Thu Jun 2 04:53:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12867508 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 3DB15622 for ; Thu, 2 Jun 2022 04:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654145735; 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=F/1D37CrJPvZzbxiZMvJq3yVCCtd/NboQN/xO+EiniM=; b=RYtcZ+27rl0eGFrXdYvMRS5mhNxcWv/f7aSnAG7SInrMaX5BY6Dta5jfROgYJD3qyigTkD BbrVthM443JblJMly9B58b9f6Q5SefCm+YlMFSUr0qHojYMxR7BoM5/CJLArwFcg4eL3St 09bcBMyJDZgtYU4MY/blrcwp1lXk1aU= Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp2056.outbound.protection.outlook.com [104.47.5.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-30-gvkmAGr2M4K2jl-BnoKZ7Q-1; Thu, 02 Jun 2022 06:55:34 +0200 X-MC-Unique: gvkmAGr2M4K2jl-BnoKZ7Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JHru77pQnu1TKx4DK8ujQ/m9/SH9SoPgOsGtxfDxnwjOZs2Wdf5K0YDoUc3I6c1PayFByfsfB664SDvn6+tfBxy5Mr7BKxpWTlzZ5f6RqXQ8B1kc9lkjhLWwiQhyT7k24Cwtq52I2nSxwkukLSrZiDTjBfrhPfIVaUBatnkRaVnbBMXXR3c4bnN8OolwXu17wGFnoWrnJzcM6IgJAKi4sVjAP/2l3nqZn2JajTcive7O4fLlDUt2q7ZsnFRG0jToSwKEcOY+At6T6Dq5n1Y07MXQSlm4fG1zsddogfRwz5jzC8zv7z7ay2rO9U7B+MCck4rcbne5hxQaK1f0/nkYhg== 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=QdN0/NTSngD34hg/2mAz8TcUJyKmvrSSKr9bbGv39HE=; b=SZqqk8nZYWypkMA7W+TDRDHneu+Kjml1zjwccj2vR6zJjsKLzFOf0PesOhmsbZbheGxQrE7+xTIoDmBmmo/N8Y5kC7GJLKr9Uyd8fbdzglt1RYY/V3PNqqpO51Ftx77cYmWvXXstJoN94Q3i8Eg+n7/VsGVGcigX2QkLsz0hUypvJeMva7FT7J9QOVQp1wRd63ju/ANb7ZuHK2typElbuBE90EpwBMb7QC77Zwz9qP/aT64/R17fW56HO7Vtn35b4+v6HAxz9ORtN1Dd/7CH/+reYnuVGpqohoK0RnEh0Qy751RjhWPCtWo+MOKVVRyR9YU4/MezLsRxGWD4ozkf3Q== 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 AM6PR0402MB3384.eurprd04.prod.outlook.com (2603:10a6:209:6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12; Thu, 2 Jun 2022 04:55:33 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.013; Thu, 2 Jun 2022 04:55:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v7 13/13] selftests/bpf: Add bpf_rr test Date: Thu, 2 Jun 2022 12:53:50 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-ClientProxiedBy: HK2PR02CA0135.apcprd02.prod.outlook.com (2603:1096:202:16::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: 5d3908c8-1f65-4df7-aca0-08da4454202d X-MS-TrafficTypeDiagnostic: AM6PR0402MB3384: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: XYf4QUxgLSllZgETlb6VPkk8aR7X089UlgDWUpa7XzhsD8Rw5DTZnQThAeMtmGUGhWQINuXbWxtXOb2lakStQWRAYv04y8rFy6i0qhWqgSmMDKpQ0+7c+YIu0WZ4/RU8XNqG/p/fjfc1FyUPfKALAHWa4k7YiBcQZ6ktI9pJWaveb5XHcTrP2uzF7O+HEJy5GFiIfs9khzNxiYZOMHHq9NT/+ojquj1hNPeFI9ISxi7yMR85H2PwfexbstvcrwiMP8Vj/RJDGGAxVYFTwJq65QReVG28t5jZmqE6thdk8isAtRjr1iM+skhPTNFTYyIDnhHN0UV9uahlvaPygupTGZ6LQFVy72gIeNI/ISRt8BzhxyLONQJJCuhGkQMiLSrykB44oODBbasPgC5UWqlwp6T3Iso+EnhCbE0XFwOUpdjIZCGrcOuCA5YbKy70wMJFo8yTjV6ewVJ4vY9bU9Q08E9Xt+OUDreMCsqryG4pX3VfthVEhfXne/wJbKh4MwbxqP/GP8oMtS3V+2+pGARQQ0OY0ATGu2+yZmRQohEeor3a+B92HsecGNX5KrDVgLVfQAD5bQsQbIs2MvOpg5GVGsMNNokmOGW6QlL1m6eu/ripWgaWvNyLX5WPgTlpTOTk5cjgMcH3JpXWB+kHpLHic4Nal9oo5l3Dk7pxnURaxqT2VZzn3fVLjdcBHj/yuloO 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)(44832011)(86362001)(83380400001)(6666004)(8936002)(36756003)(186003)(4326008)(2616005)(5660300002)(2906002)(107886003)(38100700002)(26005)(316002)(66556008)(66476007)(508600001)(66946007)(8676002)(6512007)(6486002)(6916009)(6506007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 038wLK3AFkfoz+E4/UvkvLZUCCYFIrMPcBvHad+xojVlqcW1H6OeHBfNTZwD5aN+zQY7lD/V8ex4b9O3KZcNxd9kVOf5KBn6WPd2hWwn8QlE4Qdb8UnGKvh1gcNsjjpZcS5jCmZJtTfIX7AKCGIbUl3gVbmOJ52aGGsEdVMUdPquhgYt84k+L51/c+uzMyIyY2GUos5Ybdtj1B7K8jelWQn4GgHL+wjNPgd/O4Ng2IkQGUHf+Nmsd07NaCpRo6H72ix3AgPoU23MLZRBT5gBV0LYNmrcNLN3bpQz7ymFjWbIbZXfx+00pRScyJFza1HUHAPfiKyRKCjDt1LdqzvD1kNXbG1QceGjCUE1Pd+CL69urBomq8JND54Yu/a0u63QZE02rwjxVUfnd3CsC8TKbXLI07x9JXx+G/RCiNcnSlDiSLMT3xAHy7k9s3b8CfK+wY25uoqE/cODoiwvO/S/MDy1/pDnmnxenC4+03V4opy8qmGVLdkCDNEnFGt9JPfH28a4Amle8QEL6oYF8xFFv4R2FbC+0TH59E5jXDfBLdMULdKw9avGFe0RMj1oLSJTk23ju73bl8KTHcbF6iT2ohgDzmdcftV+1n8s5F7/wasaLXZmL9FwfBNePzFv0EdgOcFZuM6UuQ7rSJJ2VzcOliyVfSY6u96zpPRJsEwI7KOmYRTnxeR4RAxmRNS+bbZcC4dP/oJK9K1UZuXpTGODNfGdTIBgjyaJa7/8KSxHsAKLhHFix3UD9UPmaJ38hOK0Ce9M4GLKX9kmKo4wfdGjY7X8O7NZD/rh3n15/zVEKvYh0I2naMk0FZIYLkGCpirEoXpWoE+M7UwOKB5rTWxaM44Z8N/9PCwO/basx/iirLROl6BBQZ4p0ULggiKJFIs0FY9woT+L56Z3Uy15hfzZHGoYBbil5iKeDoiU2UDlTUnQi9fg4NG4EEZMogClJotdR/tpHiW9HPrM6OyI0nTAc26wyXihQ5tW+SEr2Q4yayJBQ/gCfLOfqOlYfL3i9Pjvajng5NG+mzz2q/q5hhHoRoSEoVQ5PLEvAu4ad4OsIR4hNDCF7zXt24IIO36tPFIsYDlZkg2ywXKj97AlzxVu7cc6XOPQPFvwlybdEZ9ZYEj4o32ZTqJUAma8TwnhOJq/9LlrnnewibfAcXf7KjGbOf+r/htKZ9ys4oPiqjCLBOFCBr3d23cfNsH2pEyvQSTPRP8l4BAWU9b/vU+C3OK/7VdqT7zmv9P91Q20WlA06IimJ2RKmjsDEgDY667IT7VZyMQXnTZIJLHXaJzkbfSbT5CQ1FSwyY4LI0dXO9Rk+1GjVoioNzk6TpilyYX1p+UiGcyb7ktbU/T+rL/9p2LV0nRDkb6uA3cJlHIO+CVL/Rmk9lsosgHHrCTm9EfB/BsxDDQmbFyh5oCeuMvPu7bwrSZOvXjgZoTUJscS5fZ4siGUyYmH2CgTetd9GJ7/A30bUJiAUAKMAxsOTXnwQq3xwTKbBgfFDXmWJRZvhxNY1pK1Gn++wwbQkmBJRlwZmVeG37VcC4Ejgcp7XEZrrhCKQtWTPqZkKw5zb7K6fsEC2qooEBxlvruGOYvDcf+pDjN1iuatSVj0WxI85F3iUwxeAt903TPPbUGOvn929F2dDhoMri0vH0sRtji7R62U0ttzT7/B67Il0mgy17XaeSLGvJEdCV6ZPWBSfJD7uZL7rvTIIunwzP10LTzKef/A0mTmsZtioPp7Ah3gyUG0dsuHeUTktT5iqA2zrRdTgmYC/5g= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d3908c8-1f65-4df7-aca0-08da4454202d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2022 04:55:33.6808 (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: vSnTZBpAvj/gqJ01bw3xfMVlwbq8mx4e2zw8zSeSd84Ubbu3Dm42XcNsyaaVfpAJzXWT1wu/DNFrlFtKyOdt0Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0402MB3384 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. Send data and check bytes_sent of 'ss' output after it to make sure the data has been sent on the new veth net device. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index f3c73cd2c786..1ecc8a2b76b6 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -8,6 +8,7 @@ #include "mptcp_sock.skel.h" #include "mptcp_bpf_first.skel.h" #include "mptcp_bpf_bkup.skel.h" +#include "mptcp_bpf_rr.skel.h" #ifndef TCP_CA_NAME_MAX #define TCP_CA_NAME_MAX 16 @@ -329,6 +330,38 @@ static void test_bkup(void) mptcp_bpf_bkup__destroy(bkup_skel); } +static void test_rr(void) +{ + struct mptcp_bpf_rr *rr_skel; + int server_fd, client_fd; + struct bpf_link *link; + + rr_skel = mptcp_bpf_rr__open_and_load(); + if (!ASSERT_OK_PTR(rr_skel, "bpf_rr__open_and_load")) + return; + + link = 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; + } + + add_veth(); + system("ip mptcp endpoint add 10.0.1.1 subflow"); + system("sysctl -qw net.mptcp.scheduler=bpf_rr"); + server_fd = start_mptcp_server(AF_INET, NULL, 0, 0); + client_fd = connect_to_fd(server_fd, 0); + + send_data(server_fd, client_fd); + ASSERT_OK(system("ss -MOenita | grep '10.0.1.1' | grep -q 'bytes_sent:'"), "ss"); + + close(client_fd); + close(server_fd); + cleanup(); + bpf_link__destroy(link); + mptcp_bpf_rr__destroy(rr_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -337,4 +370,6 @@ void test_mptcp(void) test_first(); if (test__start_subtest("bkup")) test_bkup(); + if (test__start_subtest("rr")) + test_rr(); }