From nobody Tue May 21 14:37:01 2024 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2073.outbound.protection.outlook.com [40.107.13.73]) (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 094D417CE for ; Tue, 18 Jul 2023 03:37:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JZEKISJou9ahKwPRO5veeaMlnz6/R+jN+rR0iU32dnGeQpcagMmt6HSBu1wT1GwDe9vboxQZ/ZH1oonh5KLDlxOJKuVxZsLVAL9wd4SpSOlZpxv5Hdl85ZRhn0PUuNfOT8qGymkhmY0tcoRiB/bGqPl9HwZJ3JKDm62+PvcLo0yGh5sOna2y5v7g+gfcDXNbGCQQ0YeMDxmhFqBPC9PDXwH8tYg6rPl3clm+CFCY+46HPepEgoiUdKpoh2xXK7sEzYluqSwbULqGWhxJvC0mg4w1Z6W0qzeol2Udp9hDEzCBdqI2UPMHFlvJ2R87yIZao4j0+OlE689Ga165Tu11Ng== 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=/Kb1GlOsbJCkCAv+4ThXKLC+JJR1SAyNlT39D//a3vY=; b=jty/pffRg3o+Y2Q5pz54xkVGwjS5/w//4mlX3teUYjYFCiYzHU+gTN1+ZxVtpSvGzd3d0Y8CIm7PpJVF5YdZBNyUPw/ps/ZT1yb5oCTfX+V9xLcYETBpCkA7q9sLY00pNpMw23fq4eQyoEF/KDHKmXmOn6Qv/abBxBmKmWG7Q0ZtbhvzrjBM92DsReP+YmAl6IMffawFWcB3Qa7weULjI3Vy0RfXzrBz30yI6mZgZ0ftfiCesg4K86HZUt2zPrSEILx4L7/mzoILIUNK2X161EXc8AcJFZTCCGpJJDVcBA5+MDcnKWlXcKms/BfctpO8ek6Bm+gUPQbqLZhZ/Ji2OA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/Kb1GlOsbJCkCAv+4ThXKLC+JJR1SAyNlT39D//a3vY=; b=V94hAfFc1+1zksDyQMmHZGqIHpZqr02SJ7I2yYX39MY1qQt9Vb1w8LbHHr6Ru/YgTjsgfRRe7WSWNuv1GWacNibXEdgiYQca8gIqvUsLe3FKciQocv6kiNosHgG1xTXJb5oIQ+13l41HTP8WB15Qa4oHzvoi39TxMYIXnWiT6g/qA/LobcRHabqo+UmqUDRc4UqRiLcU3U3i3kD5SL1pApoYEPY3tohLibnKsyC/x1pMhI4Fpk7mDYI3ALw8BerDYp7gvmVJ7gfv9qSWchetPK9KlsJ27JoIsGLL89oSVejPqf/nVDZ2PGnz6mjnT/K1pnKeDzP8EtMWERLPs18msg== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:37:14 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:37:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 01/13] Squash to "bpf: Add bpf_mptcp_sched_ops" Date: Tue, 18 Jul 2023 11:36:38 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0146.jpnprd01.prod.outlook.com (2603:1096:404:7e::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ecb8dcc-b13b-4d30-6d3f-08db874046ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1YM6PDo1iG0J1Pmq6JaCCYD1sd5lpZb5gHbScv786bHZNjjDo05UYBUqq+ZccR38oXOHRdfk1wqg8jMFpcMUox30cucP/hH9i/jMpicLy9Kre+3nzvpzSmYmf2BeIKQIhZHUrjOa32BCeeTtWowj1dlO33eazM2ZBoCshycimHadG4o+tydwo8a8PNG3sPyBnnCQwns1waRRMqH6ptRtY8CTvrWBMrqrtlcKjkvz5oB9Ad9SXq9ilrHPJIxoJs8FZSzlR7qXnYNWQF67BUNsn86c1wiUHy+uxzJ/hAyKxL8j0RLd6yOwexcxsz2hTAa2Mee5IWvi3eTcKHZHMzq6U+VyyXxm7s3aVO54W8dSJtprYugNXBbgIVkzM+IT2Au4tMzi2lPlFLxv68yGB5XX5o/TStU1G6VmxVbDx23rabhmk4hV/riNfXNTu0BDxD3zN4LKOSc1tt97Y+CfxX8wmYDp8J9OkpC2c9v0YDh8UL6b+FWjddw1tZ4Beq+xmlNAsAnqu/yYXvVQxmKk12PbGPvwLj5dhagjnd2gl7UP2+nWbuq0xjGEvd4HfQNYqIYPgRLwKGt9oBT6zxk8OioivtKBmkAM8zL7evKoAitaL9s= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wQ8Tb6viepQIBfFNwTNGAmWneZCHHUntsLTSIGg6BnCziT1wlpzBz5Etan0e?= =?us-ascii?Q?5n1FW7Zvf0KaQbN742v39MEGTZRYaQQtmXFv57vffABMdm3r+PXWDsIzGACP?= =?us-ascii?Q?mv6npvBWBUPiJkZAisbWuR/df8JpUBCl1u+8ZFUhpAYK05viYxpMVQSw4OxF?= =?us-ascii?Q?di7VsmFGhF5EWi+RZZXGkEUe/bDq4Q+XQL/EuTjvDeFYWfKtio9Mi4Sl596h?= =?us-ascii?Q?JsfUypSFRPhsbkSB6xa42r5H+jcNNrSGuEoITQO033jEHP0f+riWmVj0pJtS?= =?us-ascii?Q?TeVa1Q2kpnGLmoBpb7NP1f5zkI5VD5iTCs75IvAELxdqueMZyPU3h8FaktJO?= =?us-ascii?Q?pZVaTE92baI9O+LBBkCf8xjueTevaUCXvB4rVNCCISarn47vTrEJ1O9UU0Q9?= =?us-ascii?Q?smHESJgilLzm8GWfgt7m9fXE+5TyHIasQC0QPSaWmaN9TL6GbxingL28h0hZ?= =?us-ascii?Q?TZzqvWucVl1+TBGzzU/tLP9imdCzj+RZAZfbKijS7k9ubAOXaUSZ1Q8Dd69u?= =?us-ascii?Q?GECo+hAKhqNyw16DPdbOFiwp6/XFYM3EJcrI11o6ZYGomMQepmtyFBKTYhn6?= =?us-ascii?Q?VXNFHM/9CjttltJASYUO7WeuIFSCQZDDgh9Cw9cUUVnAUm5yOGlzzfKDnTh1?= =?us-ascii?Q?u07LUArH/CASZduXKVy72ADqgQNoq5wi9Ufh7HRCenfGZ/s3C2f3i/1s8Q2p?= =?us-ascii?Q?dcvq0/5H5oONo8pegOH/pFwBrv+HN90PzcN21mezbl4ZD6c+DzPJnB/+oS1y?= =?us-ascii?Q?0wg5UJo+Clo3LngoG4mha/AdfaNebLLzBiJSY/XciW0StiGcUdGm6p8FIF+J?= =?us-ascii?Q?nigiBDMrCQbacYHcX2HqrcqKTUwTXiPiOUhz7pL+QjFGlQFB1/u4e1UJsL1o?= =?us-ascii?Q?sarGMm9viYAhDg77a0OCxpsAW08WQnQAz9bZhIVYugMXnK7+i2y1UwC8SWDy?= =?us-ascii?Q?zB+TkxuSrWZ/dLBauAv9FfKHk26FXgOvDe1g2uRj0W5hEolNM5/eApPnbFDY?= =?us-ascii?Q?2fm1AZhljNSdJrzpD7fkAmUhjnjQpAb5gIyLLqDfzubWqYsZTuotXkcjQdEa?= =?us-ascii?Q?Pqmw+SqpUztpTothjy4XfWj4TqBNj0I37CnRN1Tf6TUCTAjsoqoIVYh/xt/q?= =?us-ascii?Q?mEPgo09t2m847sIcRPWG9Nlr7KsLMkJ+9pCvx4+cazXWzShgeSoqotNtvdDx?= =?us-ascii?Q?1dXx4EKR9fJYM4S+C3C/GAbcBk4vBjwtA57QkjHeWXlBujmzUx7Uohj937Lb?= =?us-ascii?Q?hu0//QfKY8BGoUvRMaaJLbrNmObmlGXKC0SFl02YqdRQT7o6RKDUuOqDaXCR?= =?us-ascii?Q?4CZ8uShKJoYrQQX1r+kcbSQthzhQg5f3DDDieo7oLddyJmXFqjtUUIlrzDVE?= =?us-ascii?Q?Nl9Qulb3JstIZzqCTdxHb2vp2tof6XC2GPDBeC4O3HNQ6ePOFTqmowBzgqEO?= =?us-ascii?Q?IZWlKtJzFQF5ySflj+MBmr7yGJCItKINu4D1ExToasT/+FKwwyCFFO7EVfbU?= =?us-ascii?Q?8lMcOsBdZQD/W+3w4fu2CjEBFcgZ1VXn/rfqVG4ae04AAwKaG2pqlPr6TRXb?= =?us-ascii?Q?A6V+UlnVl9RM2OefxYeOY6eGfbnKQGFOxHeCS7j4?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ecb8dcc-b13b-4d30-6d3f-08db874046ec X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:37:14.4066 (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: 4aJFBYfwgvLTp1xUVIMYT5u8au3qQ8FB/xDFygvSNMYIV5vigoJAswgcjQm+UfW4tUeLh8aET8w8Cmj+e2NL/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" Some code in net/ipv4/bpf_tcp_ca.c is removed by the commit 9f0265e921de ("bpf: Require only one of cong_avoid() and cong_control() from a TCP CC"), sync this into net/mptcp/bpf.c. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index c580add9c7f1..f388baf08d49 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -18,15 +18,9 @@ =20 #ifdef CONFIG_BPF_JIT extern struct bpf_struct_ops bpf_mptcp_sched_ops; -extern struct btf *btf_vmlinux; static const struct btf_type *mptcp_sched_type __read_mostly; static u32 mptcp_sched_id; =20 -static u32 optional_sched_ops[] =3D { - offsetof(struct mptcp_sched_ops, init), - offsetof(struct mptcp_sched_ops, release), -}; - static const struct bpf_func_proto * bpf_mptcp_sched_get_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) @@ -101,25 +95,12 @@ static int bpf_mptcp_sched_check_member(const struct b= tf_type *t, return 0; } =20 -static bool is_optional_sched(u32 member_offset) -{ - unsigned int i; - - for (i =3D 0; i < ARRAY_SIZE(optional_sched_ops); i++) { - if (member_offset =3D=3D optional_sched_ops[i]) - return true; - } - - return false; -} - static int bpf_mptcp_sched_init_member(const struct btf_type *t, const struct btf_member *member, void *kdata, const void *udata) { const struct mptcp_sched_ops *usched; struct mptcp_sched_ops *sched; - int prog_fd; u32 moff; =20 usched =3D (const struct mptcp_sched_ops *)udata; @@ -136,14 +117,6 @@ static int bpf_mptcp_sched_init_member(const struct bt= f_type *t, return 1; } =20 - if (!btf_type_resolve_func_ptr(btf_vmlinux, member->type, NULL)) - return 0; - - /* Ensure bpf_prog is provided for compulsory func ptr */ - prog_fd =3D (int)(*(unsigned long *)(udata + moff)); - if (!prog_fd && !is_optional_sched(moff)) - return -EINVAL; - return 0; } =20 --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2050.outbound.protection.outlook.com [40.107.13.50]) (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 5025917CE for ; Tue, 18 Jul 2023 03:37:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gfgj12ZgAm72u8MnHLi8CmyCLQkw+/XGIxJ19r3mg36UOM0PZ1tuQgmH1MeYpoIzBIJZs327XzcP+h21fjf0hTit0VZ5SFVv1v82F1GidhdMHDV5rVPHHGHxd+PhvQ1TTBTxQA3ia0TrUD3ZnQiM8dRW3Ew0F6wQVT6wvRxdsxUONXxM8Qd0PX6BNP0k0IAQWMjQs455qIqCyKgvAct3jVNzKmw2mjF/6ErUscB7zzp3nIVki3Np2D/Dh3tb79mRa0c+VmI8/89GE9bbVHOZLgS32eO3Obcue9oIshebP+Wk0NzhGPQX1XtuaA9HxAvsTCsnVx+TI8jACqjNJCzcjA== 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=BGdAS7TLnoFBaQuysKdehFsXvbDD0HRDI6niCWMV4oA=; b=csWMFCULCYc+UP24UpgLPFYDZEft+wKeqJkAf0YO0CMtGZGrYthTx2huMat85fDWda1OCgdMLXVwb5mXMGsBrRauvtUb66dY+JE+1RlkXPnVZVoTr1MLvJaa50/gZBvQW2W6NE3FlFangLSGCxtKWUGD/0Iu/ud64CpFYWVKoaD4mYj8IgZUzpopdQTUzBLvj0kz6Vym9AmIiYqV194Cxw1BGhTpzNRWa2zE25N6pYSb3GvcMJSHiTarZaWPzU8Yc2R5FPm+8gGsPL+hfMPyHZ3k3TImJZunWj9YcLRfDPqUeajVlc/Vij+O+oRgnUnRkAOQEyFVEf9Jr9dv1LyQiA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BGdAS7TLnoFBaQuysKdehFsXvbDD0HRDI6niCWMV4oA=; b=kl+c7uEWibqEgVuN+vnyXVEAlEvNsB67h9FVLDoNN0vRAUyqRqNMetvAsMbRTeVZr+1wX4BcDfGb6Ldk+Vx3dNOIkbZlbTn8uESJN25iOt4JBVFbPrfGu9SXs3c2kMZ0zal7lx7kC9gRLlnFNuEc4mxH7psDLUZmLJApUPtsd9Wuc1Xhd+h+1IyerzALHB3hMmIbM7SFFAQ3tGhHSM2DTDInwCo7NunzBvB1OH+dYyWDPfdlAAE/ttUzPSf5wdA31HhIb64D4wJUxy8jCbm5hIzevpvmr6x5NCstJfsnmBRY312wlrD0N2ks/8DZZFA6gqJz8riNP9CTUVXRRcoTLQ== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:37:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:37:21 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 02/13] Squash to "selftests/bpf: Add bpf scheduler test" Date: Tue, 18 Jul 2023 11:36:39 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:194::9) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: 3cf3d147-d24f-4460-0ec2-08db87404b54 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yivzr4PPyo2phOq5icljS9jf/3CTkjXogYXLwoYtXjj1wcDQqYPCrmmOVOgHeRXc8IDA+ciwlLxSJtogN+bUFQPq69k2nhcM/eDxrgGObSQYtNMPjfL/Y0vlalnLWpdaVOLXODgqjEa2jRDZjlZudnYLCetRnjTvzyoWLYJdzgmNSAXPwshv7JKheMTGZDlNw7agOsfGE+ho6ufosIrX4Gf9ZwVT25w9E0pnTV4DXZPLgr5WPIqL4NLX3TnHHt3DSalk1PGPVWi8/H4PGscUaYkRBm3JER8C5HW7EbCNOVIj62K//w8kgC6YvSLLBorKcm8/Qxp1cQjpJ3vSkGI5XHvoUEg6BvnYn2LMy51l80ra7Wp5+2Cyb91s4K4YtlowA8dGXaKy4nHDjudgcMgwxuAJbH/60yVpk1ltopavoEcdPO4bYDdkckd9iEt1935oFFoyGY22eB3tfEhBT5qi5LOO1uS8O6ZO9SQcZSMCoVfCF1wWQ3fJVi1kmXqFJpJJ84wpespLx+ACv+86Loiivs++cR4llhefvpCXJ3+wORZ1R9z01hzyIYAXAGYWTKWa1EiAjpyaVG47p6ZZm1IDu+vBIuxoyhAV1gWbZSXUonE= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?J99I+kQiti2fTWHptAObyUJF8LC4eqyu9ys/0kjkrt48SOoWr/TbS/KxpG5e?= =?us-ascii?Q?Hbn+IWiF8u5221WmNe/qY0/QL6yFfBmb/x4x4hoTRmqVxXNH+PajdERvxEeU?= =?us-ascii?Q?ffOnFCI2e8WNl9hf35idge46UxNb66SrX9RJfewiFFTgcw/9cT3wa+bpe8IU?= =?us-ascii?Q?padoOMVpxZkcrKI+wW5oaCQiVyAorf9FWsv+XqsqXjDxXSJEi5j1N5s2PmMw?= =?us-ascii?Q?wJDiMTCBSKHVW/fZIOWyoHBd+QeoLVOnfMMseYKH9giDJU5rYrDF+4dJ8tv8?= =?us-ascii?Q?1f/cNNutGXIBtBZmMctUSk1XdlwvooNOjL0wT/BchvDVKvZH1ujYqPq1QW68?= =?us-ascii?Q?DwgPylDCXrV03i1sgWNcjHgw+3RB4zqLM5d/PAKVdy3nGN2c0U79MnHLRU3m?= =?us-ascii?Q?Ojtv1rTM2ISEdrYzhN4d0/8akyso3qXHcJobCaeoXBRK9evQ0edL/uby5ns3?= =?us-ascii?Q?fPXsGRAbOPU/HZTcyuYdFxFH3KwFNECmaJxgg+40cuvFXWZ6wuZ3jlLRPglm?= =?us-ascii?Q?kfAIoL4t+f1xO0xI/KK2SrtqYfGPrLW+m7qq+2dmGkb9xTrjSq2oJTPoHkyH?= =?us-ascii?Q?3hpc/0Ym2qh6SaCBH0uOdMwsHIQ93if6iaaFgcCybg14bJItwrEsFnC2JvRH?= =?us-ascii?Q?iJBswdpyvdag/sQlpBTNON5rsWz2+W9kOjsTE15Tf1LFVqPV6FUJ8Cm1lgjw?= =?us-ascii?Q?oIz8HVegl6olkxJdvq9ylAjC+OgdcHC6uyXnusFdeFo7+us0SbajAqzPsJbA?= =?us-ascii?Q?xLF4N5DzwnLE+lL4sovXo8oRAIeZjekAKUHNYhNB/+pCKLq2zWyO3O8b3j1h?= =?us-ascii?Q?K+xN887pCpJmq321VMkLcuMebPGNPzKC9aAcU/PfWaYQj3j9HS8Af42HPmn/?= =?us-ascii?Q?HN8HALrDpMOB+7mkAEcjnC8/1w9K6JQGaOlBJSom2DH5bJz2utOtD59rUTCf?= =?us-ascii?Q?X83NrAwGr040NBMJv/Hfxbiqefz7F5KF4hByVFpE7x2JvEQyZDFERm02EyZu?= =?us-ascii?Q?PYXWw6F6AH6bjIxdijiu5PxFs0dUB5ZTgPKV2FLt2JGtbUSL1yzuJcCcRBDA?= =?us-ascii?Q?psfSdS5H5VRa685FpOHpC1DauebRpTxJ8G12VGG15+2A84V6tvRr04xuvySe?= =?us-ascii?Q?ZdlXz3EXqREDjSMFDt21fDnBFX7zoDKuydDqFSbgtE1tAg5aq3Pb4eFu9UPt?= =?us-ascii?Q?6TnIpCopfa3lVce4ARlPWd34mcXBcYTPx+AShMaE1ow4RlnJUOMkxQPW++67?= =?us-ascii?Q?4Rloa0hCazTXtWXIInkcP6h3hIUGnUBU2giWDQSxKTjlmzCc5GfBMQjmZLR6?= =?us-ascii?Q?mQ/htayD5k+P+FwmxPI4a7JpkmX3PLU82oDQ75em+iptPQkMR6qcqlNi6bfK?= =?us-ascii?Q?jY2hWP0Ms3DXolIBFPN6W0LgJPMw143oytiOz57kRJYvccD+Eb3eca0qT8OL?= =?us-ascii?Q?Vq1z9u/yK8KakNB/hrsEppLEaC5ZuUsZbFZHD5b8QYOlKbKzg5IVtdT1zX44?= =?us-ascii?Q?oTChj4XmI1tONwV1PtKy+zv5JEMoPegFgK7rYxeWTZc/u2PAg2GYGvU3TG97?= =?us-ascii?Q?wFul9XSI9P/igg7TFRKEPwrEv5WNOnieCexJ6dzT?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cf3d147-d24f-4460-0ec2-08db87404b54 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:37:21.5639 (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: 9JAnj0pWtT8/0BAofbi7Wg5ufnJwggWw4nbTVkQ3ZyCRp+tpTIX/TGNrxPsekJFca1a/pbJSEHO1iPWjzYLNeg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" Start server with PORT_1 and update has_bytes_sent. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 3279ff50ff69..f648e5d49f12 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -296,6 +296,7 @@ static void send_data(int lfd, int fd, char *msg) =20 #define ADDR_1 "10.0.1.1" #define ADDR_2 "10.0.1.2" +#define PORT_1 10001 =20 static struct nstoken *sched_init(char *flags, char *sched) { @@ -322,8 +323,8 @@ static int has_bytes_sent(char *addr) { char cmd[128]; =20 - snprintf(cmd, sizeof(cmd), "ip netns exec %s ss -it dst %s | grep -q byte= s_sent:", - NS_TEST, addr); + snprintf(cmd, sizeof(cmd), "ip netns exec %s ss -it src %s sport %d dst %= s | %s", + NS_TEST, ADDR_1, PORT_1, addr, "grep -q bytes_sent:"); return system(cmd); } =20 @@ -335,7 +336,7 @@ static void test_default(void) nstoken =3D sched_init("subflow", "default"); if (!ASSERT_OK_PTR(nstoken, "sched_init:default")) goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); client_fd =3D connect_to_fd(server_fd, 0); =20 send_data(server_fd, client_fd, "default"); --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2043.outbound.protection.outlook.com [40.107.13.43]) (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 2BA3417CE for ; Tue, 18 Jul 2023 03:37:31 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j6CSINB/kMhEbZxeMstoFXCbNxOV8j49fa3ycElxhxik1wdCFz5Hh0/STKVDBEGEW3QQKiw4302/9m/ayiNYXsN+9G7cv9MF5nCvQik6B0pmuMFqvOUi78OLarxBvj9bcm+fFBXew8oEKSpxd39BKv+SLv8PGTaA6u2JK8AUGThpfxpxHaBFtY6nw5wcjxpta9RXzulVwTUuTzhXDeTej/BOQJu4aH6FiPvsr0j6yGaNXBj131CRRR1qn36+EUH4+NnJfUnAgnwrvWj77OtRBXYXyy6oapBFGBa4QtO5CKjAdoLr9XHCg65aAJUFcTqLYr/y3RqwzKX+xhrd7IMUCw== 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=WaGKEe7sI4owPvk8ZcIQh0/+0JZiUjydSD3BqofAcXE=; b=PuiUPjgzbLEPvobFtQ/h1adbP2gLCxXi+aoS4lFNva2Q6/mX9QHZ9/2ujpj8zwEJGBd1rX/yjvJmRnNrMaVG16DkuSFyK9utrWAnvUT8r431fhUsdTqVnv8m99JX/hFCcn1ENDNBA4E+ZkUWYGFgRPNFTVGvy4VCa+qSrmmTqPbtYEnjEFB5QMVrTDlBnSo1b4znCHExIcSq+QCcho8obfO3ozzvGu0StXQExU0npRABsO2vwtQi7lRWI7dxJRUDqmwf23Ht1Z0VH98rsJWfCqLkkhxfhVOXaI5CFiE8DDpwos9ezsIIgu3pdlOIQH1Y46aYDI+coGb4Jz22zEw6uA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WaGKEe7sI4owPvk8ZcIQh0/+0JZiUjydSD3BqofAcXE=; b=gp6xB5oMm+oy21FXAoBMlllpdAgqTtrk3vn+ycl68SHJGW5CSLG6aZJYzkW0XFSKp/XZkn7TckS/HjKguGH9sNjuGKT/AU2+PTaaF/9RskuL5/1mxcgWs7BnCpPAAwNPW5q2WPIEoPZaldrCp7Bfwr6DTb8bV9NEDadruuu9gXQtAvCGdkOPN61F5lOL7lRAk5N8Hj9/aVbOTJhW7lfVmEOtppXptJad0dC/7267FCVURmiuL1DpzARtTDv2IuL4b+HRAsxjtcsMao5dxKWlpoKWa203HmpjhUZ3NYpyxtnbD5UrNrSI/fmG+r90VDBLVl7VEHOna8zvnzrzkXs+BQ== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:37:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:37:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 03/13] Squash to "selftests/bpf: Add bpf_first test" Date: Tue, 18 Jul 2023 11:36:40 +0800 Message-Id: <9008280de471fb3dac1db9d8260b955b25d9e28c.1689650435.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:4:194::8) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: fd6bea5a-a39c-4102-70bd-08db87404ffe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JSpFqc4WVh0+pLDQ3LCygUwsm1+Q7OoppB6ZFjIFW/e4T0VND0GHXt+6dQBSiG293oThgY6lRc6a2DLe3olY5O3YqGiNk5TGFNrfeczy4hCmOLDzgkr54ZZCJqlWWD28G6f761+IVkFxVO/9sYuGAWufoQhZ8Yeg4yQHLeX0jhllkahIGs7jjsTr3Ujun+t9RnP1KouLaQMEgVa190oCbCcNTeOYyfTtzCW0FH3C0ihhGZshSFMvg05pYnkJ8e1vnDCUQArrMXVBSFid/9BIASqqGUUkyJyfGgl7jf1qt6SdcGMmIJTX2YdCB7cgFShrcQ6UFyiaQFNUuXSEaBos+YtyJ95SMKll1+tfCzW1PLVY5VYDWW9sxUMFQ35JH2X1OpO/BIMDfujw+l7xxuEeWAH2S0MDc+s/2Hi3zAlTL+mDKeuocg08xkkmtMd/X9byOorr1tadxklWnmyZBqSB0bdLgzvo35btCRYEO1CTpVR4kCXlpVD49XRhn8Pir2b71mjZ8vhFPDsH9OzLDtbiKPl66JR7nTl1ufMp68hh44VGmEr4CMNzlQ9Oa8KDywj0u+qYGMbj/XxdnmuehmaWhKy0XH23Vbp1hkgv07Sudfw= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(4744005)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AMvj5fj6YrOoZK6RmTmzth6aReaLqW3Lvpj7jz26hVNz55MXfCLWfrnZZOHb?= =?us-ascii?Q?yXE8K6+dog0PNchyjcHqdZAndTU04lkXTHA/lRidhPsVUn4mIgVGkFJwYv2Q?= =?us-ascii?Q?PA3DBz+OJyiexqZypLRsBbsjP6VzL7vsjJ6xMuzdN6LF0Q62xd95PsBFvucU?= =?us-ascii?Q?krSxNosTx0bL8vtcTPlXnzqGevKy2RSKt3tm56d8chkyuHomyzEE0xZuuVox?= =?us-ascii?Q?2F8oIf+G7PeqXmUFZDNvSobEPAQlaFxsOUjJxdPIqdSVzmElyA/8roEUGdfC?= =?us-ascii?Q?Pqalxs9oaBvisV65Jseej0Q92DYT8u2JhdgR4elw3GWTBlFqi+PgHDvcD0UU?= =?us-ascii?Q?lHx0BFZcI7flmtldDydrBl3aB/2Sm+N7syy37RkZx3K9n0cxglhSQrcvGSaG?= =?us-ascii?Q?yyxgfW0IM/WCXVUVPEzJn/mJuTveKLq2yXo3ah5QzuQ5VY/ojY8+4qfUHd/4?= =?us-ascii?Q?qooFOv2CZNh4Eb2Ux5+0sgglMx7iS3Fz/eV89+5kx30E/UWXum2eljJ53Dka?= =?us-ascii?Q?mC0YNcsJMO3J2GeO0JHZKTZVDf1fuN2hT1mNrF1439Vw83Hb4GLJQcjHsOeQ?= =?us-ascii?Q?5FUD36nYqsdPu90ozTD4AnPzyio0NyUgbUT9JQWOBwrxh0FLVEjX1X3rBepY?= =?us-ascii?Q?A6ZGXO6j7qM/WVrjY2FE8XhKYdTIhqVn0Pn4v0DOEJ0zRogQVqtpXliU+NGA?= =?us-ascii?Q?lE/HhIUF8bNCKLgp4MZ0BMo44CamFqY6FIKeUwKe7Du/YVnkLd6FK+lLGqTo?= =?us-ascii?Q?MGkWQNxechlqQ8OwWlU/L8xMd/tQh6zneSmoGCDU0gNf8l6LbIAmRm9tT0vC?= =?us-ascii?Q?xhhfzXin1RP1HfzqGvUY7u1qbU3HEA9umquLsWNY9Ui4MpMUaM313ZGGyYr6?= =?us-ascii?Q?kdwWj8fGoGwdmpLKVPLson/07Bbdol0V9HXjeQVoDHws7owxWlWFrzMFEM3b?= =?us-ascii?Q?I9S037s5jaQXoPy4JE3435SRezrknkyhbxNklleupveOUEA72gaxV3N0klKM?= =?us-ascii?Q?yPuFmQ5F9G+6XhtDaE0NMDA1bL0DsITx8GJsSLvwevzTqACaYpGJ3UEaFTG3?= =?us-ascii?Q?sBFsE5wXZBEk+XA/4Hy1xRQrnUQk2FSf5p0yU1GNCDCu0GRnO/mBjrFQh+QK?= =?us-ascii?Q?CaX9BbwH5+MJxeAA07dsw4GqMlGygsnM7IGfDMuqcjGYYfXCT4SK6pm/02yk?= =?us-ascii?Q?+rai/n9+WRBdLG6fDHu576zdrmTjoFbbrlGiqaw1FYpNzbHYzwUjzParJTu9?= =?us-ascii?Q?Gwq9kHoIa6GXg2zBjLFGSmjYtMNgZjGlBJO44o1FWN5lRQk+XKSXJ5CzKc1c?= =?us-ascii?Q?swVlovpCED3wuRI8oAUldlzml5PXr1agZGuUQxzhK1wGuIZL2pJISj4jYFdG?= =?us-ascii?Q?FaopaJ+H46OOndNMZzknA9UYT9Q3VZ1INkmBuHtBgUt/1fHNqmoSABXwo94N?= =?us-ascii?Q?Ux+zMHiUl6dp81yPUW/XG6lfDWrj++t5JdXOps8bqBbQRNTgwv0KnK+vbsQi?= =?us-ascii?Q?1T+uwLDr4++ZorsZcwxcR29S0zY7+hRHqYKlNBPmUawhD2FOtxvBlIMoksUQ?= =?us-ascii?Q?+yDb8BM4dclYJQNCjRZQKCRnMTK7JlTSkEB/dRVe?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd6bea5a-a39c-4102-70bd-08db87404ffe X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:37:29.3810 (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: dobKdpeQN0NlpHgXnZ6GOAFAl6JVxvA9Q4sg8RiJ8C5lLmPtAPpny4AC+7zNaHF8pIlxos1llwj8ShCegK5dQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" Start server with PORT_1. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index f648e5d49f12..f09aafdff43c 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -369,7 +369,7 @@ static void test_first(void) nstoken =3D sched_init("subflow", "bpf_first"); if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_first")) goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); client_fd =3D connect_to_fd(server_fd, 0); =20 send_data(server_fd, client_fd, "bpf_first"); --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2049.outbound.protection.outlook.com [40.107.13.49]) (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 10AA517CE for ; Tue, 18 Jul 2023 03:37:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aeXKSnUvIF45PgkmaMN3+BTg0t73FMdPl1pIEa97WNnlyZ6Oje/n0IVKSSH2tL4569z6p3Cs5vEURR3KH1WACodL4EuEVj8JWVWc4Dizc3iZMumLj4ZoCGHT6Ryv3+tIMJOg6l/nvALwkWYpm9j7BOnbVc3+SUE1OS7d+ObXaGUQoU4XCPBQMj6S72tL8uoCIti2HVjErRnxhd8m1Z1XGGLoVNcdWrokIYhcDXBTpv9AtMbHbd1+nefniAXT8wkiSrbjgpHksBNls5PyV1znphB4fZ1KCJsDvvz63/l/Dnz3923fMqxuU9ARxrLdINYpePv5VXLei+UOhsKie0Sxeg== 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=xGbExEe4raeUz7hcKVR/DxUzitw8k3t71W1ldyNI8ko=; b=gmY78WVEuQHlV19+Ksd8J8bfatfDmhQ9TJ+Xgx3ShzhYvNFUZ/lKQGte3Ew8H6JpNZFocJC0EJnRODR5lNromyjV7y8ZcSQA5EBJ66N4A9/ICAYLcjt2vJI3tp70nEEnKI9xlkCJq66xCCJi2PZTpXx/Ua2dphLYn9qSGiSLiGxREbwChAm5t9qjDXhSJ9RINXAvgfwXL66YGpog7w0NI/IMhjlvr1mws0qOSLxUDvvRQewmauqB3BYGDueSbWtn3I9BBf93m6wuIV3EsVnIO638C1rkELb1so40xXj2R1I4JN35fbk1cbqDZflMOA7ONQJ7bpx9wr79hOJc9HHB8A== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xGbExEe4raeUz7hcKVR/DxUzitw8k3t71W1ldyNI8ko=; b=msCBNVZyDMyiZOOd80kSDpKYNmEptIcgFaPGEcQpz/cm70shyGlhTx7POJ2XjEaZI2orPeyjlSkp2u2p8VjDMZHJDSOf3W87Pchb2ivfpnX7EIQVAiw+2KwK6467AAwOkqyIZmaG7Z2+dS0nKG8VUSyoZkT+H6PGAZrJMEeJTY7qwolIvMSOfD6/8f7MxHhAvHhGPq30dYsq33eiO6WGRSAJFnTXLC4fbkwZO8jq62QGMpXkr2aghKxiR+U0kfZmWO+frJI8Q0HP8Ah1J98iYldYtW57uTvqXckMtWHVStaEdng72ihBRCnjDeXXjLE7Pc5SyO/b1n+OdABKbbdWYg== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:37:37 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:37:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 04/13] Squash to "selftests/bpf: Add bpf_bkup scheduler" Date: Tue, 18 Jul 2023 11:36:41 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0006.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: 1bc69000-7db6-434c-32f1-08db874054ca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zrP/UluBDnANbCV6AhiyEuKpLs58/kwLCWCgNzhoAUkNgBz9mIu3MISw5OD3y6qCzBt6cpfE4zDenOVMTYqjbfQkVuvAc6Pk0W0Ha1a5hbCpfcF8N10o0Wv+EFPxuXIN7b+he1+89e2dL8V0o1nlhUkaThw0GX9MiB4U9weXD5g5I7EL6QOTme70b7QQaM/7p/0d4FdFeSajTIyYJ6r738Lfjpj6ie0zMZ9ouu64s2u5p6ap1E+L1NTqTNEtyfXttgznxPN5eNm+i1dfWl5zktHN3fUVjhUgZ/SPI0xh7QGv9ptp2VeUcljqVV/naXjP8p5f9kLnukZrwhwGm4Zl1Rm6XtT2bhrefcnuudtTwoRnQZ0BfXOKSux+40r79EO6VFaqnf4iYR9UkcB89jq31h3JmRt0Gv9I/SMQNVjKCAdT0ku2F93DW1ji+5JYJCB0ptNMtjqTkbwMUBcr2NP882uUjZkfq2FlKBY7i60oD+NuHg/wgl91C6K6xULwCYL/d+K07CtfBNY6e3UuocwcdIIyFkBm+r6Xl3IEDmO1GLeNmGpvSUi7GrfNdnv7kvnkDjnGfh0F+HtbD6ejhwWYmKRDrl2b+NDvOyIDzPLQBRU= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9RGJ4SGVCXFEy7TsUAr6hu57r0CzjwcafmSCBIkUxxAXot7x3EKq1zf/0GGh?= =?us-ascii?Q?dFpGdFFwgrl83rz0irgTC2BbllDpMZy8MMXsOs6q7qOqGK5xjCYkppXU/R04?= =?us-ascii?Q?f5c/OCcLwg1PE/Zh1p/0pUAX+oIYzLnWdSgbcr3kQZ3OaEvHX0z2JNEiqQmC?= =?us-ascii?Q?WFECCV5UYOeG5t/BAUNpqFLVQLO6cVGWdlRsd7zDDy8Z4McGrWVKwDV+A6LE?= =?us-ascii?Q?0MCNcd0WAAV1cvjO/MAIGjn7+nMS52eEDI6c2eGqty+lfTYsV/R/Mffn25/Y?= =?us-ascii?Q?OlPgz69KHs0vFd5iP+CCM9e5HLXpSgac+l44isL2DBqNKyzFOwFpzEHHh4h7?= =?us-ascii?Q?xCsKNAsL5CnOP1otaUohVHhjfAfSgFN/LCKXgWUIF6XkTbUQYE0r2VJnnq+9?= =?us-ascii?Q?6LQoF5Zn+9gDNos8n7ssmPH8UXW5fE7y26wLaJYG00b5UetnFSfKWUzYJ0nQ?= =?us-ascii?Q?+EqJUgJ89Z5perRELaxrhFnTL307MSgVBUIMr5+mLgFCDIDRUGjFyrCI3KgE?= =?us-ascii?Q?ozupIxkxRTycOdYCdKTDJdjj1v7tXwf0BWu5T5Jfu1/flzAVqsqvx+e9FqiX?= =?us-ascii?Q?CnxakdQR25yRN6TWY99Ui+ZSESev3WeNfmv10onTO4dKtmLzzcEnU4/aUQ7v?= =?us-ascii?Q?nxMDm/oanH4PkjhiqRa0LHPeDHRkMvddYXUdJGOZIq5guix6Ud6pMObH7p0f?= =?us-ascii?Q?SvWyxCOba6Plxgi53FJUxQNCrVUm+fjL3JohnNX/rsAKuTd1mI14nOb6g8/i?= =?us-ascii?Q?dyNOPJIQU4Tz8efRe2neY7/t20uIfTt0t1BQSRMiNdHF8um2YUqYGn+ycq0X?= =?us-ascii?Q?r4KwEhV+h37LbsQGY2jLIVIkVJQWZ3/A1HCmOH3NfdiBXZ2fxKVT27J5z+4+?= =?us-ascii?Q?xakYEYaKFUZx5LiwfYXj9FnPXQAh9f8MEzhyBOWlFBe1Xz8voUcQBxMBAfz5?= =?us-ascii?Q?dpoe1r7SKjszfudlUceHzpeD+1cOw1rrTKR9HoOEaDWUsQxhmnWmGvkMF2Pa?= =?us-ascii?Q?OQOATj5kgZEJ1KLPTGXUwBobNEXV9Q+3Jvis8+WzZ9fiCp5oU3eadQIP6fnB?= =?us-ascii?Q?D4dzaFiod+TfiXmyhy/oxGHzfLcpf7Q8epKnBth9NfBScugdETAXaUnShlaH?= =?us-ascii?Q?Akxg3rLoc8F8EnbY8lCUW16/dY/b49HNLjYKU9SLutLuXnoFh2Xpt3GVUogs?= =?us-ascii?Q?ZEujgZzwgBxDSonff2cGCBaEN39juKAKpZ62LwFr3Dvk4OpBQQVL7hegjKMD?= =?us-ascii?Q?SRs9QgP0scDOcmBbTuYsa2Jqe0yb57kPLQWHz3NnBQrZ5EjiPadrNAC+7fgO?= =?us-ascii?Q?Xbkf9BfImoGazJGA5O78OqP81ZwVQjqOFTR2IxPGeyAWuqc2JqL8xFBCGRdh?= =?us-ascii?Q?bsJT3by7YyeUgvLFqOpSqbS2CE3bieeZ0bcjwx7RuXm8SGMhvU/Cc/KudTcn?= =?us-ascii?Q?vQL7zsl9aeNrWVvjUBjaViD017YElBN5G6PZVUOTcUSAVF2Bm01FJm78fLTh?= =?us-ascii?Q?PY2TyeZPy4BbPZp/EgTBlGLWKTdUcA7LQUq3/sDMgEiF1RXPmWBcUNg2Kv21?= =?us-ascii?Q?Lou8Y5dIMUklQCEJRaNksFiugnt2/G2pNGnoJhKT?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bc69000-7db6-434c-32f1-08db874054ca X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:37:37.4329 (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: NHb0PXFifsveh306jbkzK9HDWZK8lAOcF0ydztI7S+pQ+5JVhYLp5Vp4mBTAxRltOHiR6PPhPIbbR7X477Rl8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" Init nr to -1. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c b/tools/tes= ting/selftests/bpf/progs/mptcp_bpf_bkup.c index e5ba97390e17..21493a3affdb 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_bkup.c @@ -25,7 +25,7 @@ void BPF_STRUCT_OPS(bpf_bkup_data_init, struct mptcp_sock= *msk, int BPF_STRUCT_OPS(bpf_bkup_get_subflow, struct mptcp_sock *msk, const struct mptcp_sched_data *data) { - int nr =3D 0; + int nr =3D -1; =20 for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { struct mptcp_subflow_context *subflow; @@ -40,7 +40,8 @@ int BPF_STRUCT_OPS(bpf_bkup_get_subflow, struct mptcp_soc= k *msk, } } =20 - mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, nr), true); + if (nr !=3D -1) + mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, nr), true); return 0; } =20 --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2043.outbound.protection.outlook.com [40.107.13.43]) (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 2E4FA17CE for ; Tue, 18 Jul 2023 03:37:46 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QnhO7eHcrGFzujiaXJeNkEQbyNehpMej+MDLodXkLuyeQdOncXraFpvP6iI3kDbCJxxIqhAgqUZwPYZDnZ1y8920xEdg8U/p0/NvEfj5Spcjjkv8cVHKCa/0jizUsURrRMJjxTf/Dj7pdJCwe6iPFnLSNxRD7zZMOST8I1arpm5KZhcKbU64pmPas5fkLGXoja8Dn2PL+06MO5ZipwFWxO7ngE7nnr1K08MBybDNwWuXD/xLtNTGbBSjUPuq8ffEUCECgCkwZ0yOvxxnFtDeksqsNApLOmPKLRrpzi91Kqlv69q8E2rkDO8F1Cwh2dWAGcmRe2JhXx4vD3UEDS6nrg== 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=KwBVvnCGaQ8kTQXWiLQn3aPQmKNgAgWn0EtekHKXaFA=; b=nrq9yREWaTAWlC5KL+3WY9aLzfhh7WAsCsE+iSS/0g33i+vStF/9VdqmaDrg5jcV+lQzHFSoTCEq/rlBUDmxpFNy49OFQ7VPNdJDYGr4uydrt3KCNvs5kdLVeDrXbAszNehWxXi3M/HTTjuAJDiCP6oyMcy7eYvKFAwBlbi25N7BNrAo5OAgyxzCYtuwjDnx9mHhxQwDj7RVw93psm7kKNuIL77uh02h9aU1d+CAPHtvWg42LxASGVATHX+cj3XGbRbFIgq2Gtv0XWrvezOJe9qUOuuLxbHNeU2/8vnqZWuOEkK/RiYYvY2bBCt7UUzaZLWHfUkGkbX8tUOPsdVt1A== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KwBVvnCGaQ8kTQXWiLQn3aPQmKNgAgWn0EtekHKXaFA=; b=HLRX5E8KHOX23f2g/x8rCy+iE+zzndA42EXOtx5HDf3RiKCdFTt4TXfVSK6uy6ZwOl1m3XPQwvLTAtXTxwFvqN636Em9jZBX95hBruJCZLQvtc7LKCgg9nvCoIFuNdE6RKUW8OeFz9XmVYOfsP9CuZFm2VF5hMFBpTa+gKqstTbRRbBUCrOM7VO8VhXeOh4GL6UVmoIm4TDapxckHb+lacNksfsF6JyQCnXAJumVekoDLR0CwBsllX/T79CqlyvuhCEWUal5brnK24DPtFn5ZD/W4RFrxWdkWcz4A8oVZuqZDWlC25Djf2n/McCZA/AeTxBGv5ykgrih/DZ7V25eeQ== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:37:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:37:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 05/13] Squash to "selftests/bpf: Add bpf_bkup test" Date: Tue, 18 Jul 2023 11:36:42 +0800 Message-Id: <860ce049383d29483314c55b4fd098420fa93055.1689650435.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0006.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: ae410763-c086-4704-f32e-08db8740588a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yOw2M56Wy/0CnpbEAJbp5AY9R5mWB6lWiHm2/AxNJVRv6IOjFtfMBsgg43gRAfcH9m5SCCS+7QlJ/hkhCZJb3Bi4Abegjk6R/rURP/CR/hwthso6Lqi7/SLRuIMXL5W0KRW7Yr6jZyHuVzM7sy8fYMCR6ffHCcq2CCmhWcFWNUXaOjZVuuTtnxOGDxbMyhF4Q+gPnvqSBReHM43Yn42Nje1v2yYBwXo8sT7WNE8w1Q12uHFyWfVEsm19iN0Ph9DzzUjmp0NUks0Dj3KRGYVlUZMiX9kmjgvnd0otLmcYk//+YeqYpAyVznKq1hUp5hhhw7v1r5o7G93KMR0R6lvIYRkvbN8UTY8UhZFEAB4Bg0U/hz8ytiK2SwvEgO5H+uAWIyHY8yMX+sKBJ9T0J3LuxDPEb1T1mizI9SArZCKeOi2H15gezbAMzx/oWdVbXI5lVA/02BopDHE3DcbQziXNFanR0mphHJriXIo7a5hsjJDrgoGB/g9ZvSIwUlIayMwbNUqug9uRb6xvmzwUm3QRQenxi0Vazm0Zw0SEH9Lh9cw4VKzVk87K6rRmgRBB1GIL4AdXZEsD+lJbifrrIJXIdZsF5HfmaiGTJqf2tvBXeYE= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(4744005)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?s21Y+/0xWARBvQBuRjqJz4VgCGEUDfQPR67z6qcy7QsamN3Knx0ZCktxfo6i?= =?us-ascii?Q?0S5c+d3CCx0X9QU5zXWsj4WW23oY2ls/TNOObK0npka+8WiYMR9bZ9wicVCz?= =?us-ascii?Q?pnjYwQ1FHh6EEvYyBvb01cJ4dKhS+/t+GEryz5Q7X09GMg/QGcHyDrHVHTkp?= =?us-ascii?Q?0VuprSyRYk4qj5qyPYLuQAn9TK+HTtzLWGxklhxWDiuxWXrHb4k3yRoqNGEN?= =?us-ascii?Q?yDSYl4vdN0NnviH39uKcXtt4T6iu0lDxciWSdL0zNxPQRhb6CRrSOC61X8xy?= =?us-ascii?Q?7yQcHS/yFNUT7SxLnxzWIlNO6PFCDgntWqBTk06L5oNPsdqQyLcYrB96q1bU?= =?us-ascii?Q?OFxAKZM2eydTSfclG+OCQ6Ok9io+V5/YJ5u8PcbuyK6OFbiFeX6f2+QaPg/6?= =?us-ascii?Q?QJnQlGAgVBjrsXGYn0WJPRPy4jmtfKm5Dw0UgKSvPuBgO3MkH9+QsAIlhK5w?= =?us-ascii?Q?UTfVghI7GtuaDYCpW8RzoyxJKjcXNMUvBC8FZxuZ72RkNakG8ER2qgY4XLE+?= =?us-ascii?Q?CwbBI9aE3o+WD5lWr/yKogl1oSoZpAtteD3IrQn0ZD2QmD9BfsnlBJG4bBrw?= =?us-ascii?Q?sRbs+ilqJ0A0S/5aBXlZE5Z+efmb//OVYTqaSyfQK/uV0iRy7F+AFkJvIA10?= =?us-ascii?Q?6JujEulOcNNZhhe67HwS8CSxCX4ooUaPdws5e/pOiWCeRGwIyRuUmwg7Dlyu?= =?us-ascii?Q?+u/3X0LnGu7Ite9pN1glDr3fHWVrQodrxASXc4EH7dMVLAnPkghrK9B5+6j3?= =?us-ascii?Q?zhBm1hkM8JFbzQddGpNLXr8SRtoWCod0sHHjn0NnqoLgwhdYvBsqk+oPF7PJ?= =?us-ascii?Q?A+rSEJcNMkvlO7OgzukaUTByOwtxQc88tWw/VukEfOyayt3pCBntkukz1nl8?= =?us-ascii?Q?j3E8B7JEA63nEGd8Zi7uPPU+AUH35nPDd9ItmymDz7UVDwuhb3FTHh0cSc3R?= =?us-ascii?Q?1Kf5PXdBH1mv8hcFeRaKgfYoby7Aw71JLCvy4QdlTqj8xsOFqMWuBTKVM0+H?= =?us-ascii?Q?KqUJ9xnUHgAYXgF7n3mSri5mwXuC6NpYO+cTSqpJ2UIppQaun/bjQPVfotIl?= =?us-ascii?Q?L/5KJbElDXNO9uitBeferktOl8jMVqkfDrBHPbRwHOBd8C8KeW21kaRy+gVc?= =?us-ascii?Q?4MJrwY1nrgvh95SUu/kyBl/NAz75a69DjYUd9DJhPxsHyyfcKsqJoCCvg5tJ?= =?us-ascii?Q?dmnj4OdFklvaxnjinOOCvaeIJGDTB6s9qvU4cFRtQxZh63tiBEwU65VOlNHZ?= =?us-ascii?Q?glMAFslN8ZnLjLMx8F9F2L4EzjgCpf9wdcbjd+BTPyOh73nFl5QdKEdbxlVv?= =?us-ascii?Q?YIxnxp+eotBdpwBBEnLxmyBW/i9ERjCc5bWsG0zcInftWm0ZnBYm7JjGYGPh?= =?us-ascii?Q?gsyG+MUEOIeFV60BrLBikIOsV3VAo8x3vaBXuElEasSXlMbveSLxcg+GhE6K?= =?us-ascii?Q?dsztI7qkM/4P6/YsbmNzD7ZStBAtb3eyMQ86dwhctQzU+NMTH2SFHFK2faFo?= =?us-ascii?Q?2cD6QE7ugBIeqlk9Vu8tmSXn0rVXYpz+l58VP659N6x2KYlEjSbRdxfSkFN3?= =?us-ascii?Q?Q4+wQhXYPnRvI0LmmkQNFf+dRR2WWvVpQCyJj5Ve?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae410763-c086-4704-f32e-08db8740588a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:37:43.7494 (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: vmZ8kqQRYJGs6GupoW1io7Zp5mXjvfyERAUklS4rkBh7y696QPvxIORYnHZOVpmHMkvxon71BeZfUfLvHDT/mA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" Start server with PORT_1. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index f09aafdff43c..f5443c3d2d97 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -404,7 +404,7 @@ static void test_bkup(void) nstoken =3D sched_init("subflow backup", "bpf_bkup"); if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_bkup")) goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); client_fd =3D connect_to_fd(server_fd, 0); =20 send_data(server_fd, client_fd, "bpf_bkup"); --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2080.outbound.protection.outlook.com [40.107.7.80]) (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 C263F1FB8 for ; Tue, 18 Jul 2023 03:37:54 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G6zUWuEEADhS7c9Lt3/Cu5Sigy9laeIxlWxMaKcGHnJU4vmnUtlT/SJS4bba+o1mhyL1/nLltAoutddC/NnP/0BjIKcCnUp5evkh8FY8GvE7aFjI3Xp5YZIJOKge3VPDzpzoiH7NPAez41IK75dQW5O9UumDf2Y1kkAPQIFQhC1q9AAOVP4YQhHNpDJIX4MkmMwxleB+2nE83DjetK8UDZoi63B7oKBGmXzLiKxxEAHq2X+TQKvSDYkYPeup8bi118zy9nsc+/eFm95YHZqcq1+Uqn9gs3siXk4STx2Z+Pwnlnur/092bvcNjpoa83G+u+ygewGrGcA8JCktglb3Tg== 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=WtbJIdgofgFRa7x+XPjJbBPL6IUvmEL62Hg+8W4g8po=; b=bmLtXjWMSKMPXLnOO3F7utGL5ZocnZwL0X4mFvJ8GnyRr727vFHt7iia9nsncJcVZvUZS9xlJSVzheRe5F4UZIHKSuRvgh7E4uFFYhg+Qk2sw+gJh4d+A8lFwJe3/PRqvx3/tp85LH9j5CokNMpby1QTJg6ErDzqJmWsmSUUr4R91c8P5Kl9RKTdZKKg4z38NJXCzkxMZt8+0vgJo48ZdQiBMRnxcSFZJQz1Zo2R14gqT46n+3v539pZPHtuXudeiIUBj7HoZffoszmYCGsgjcJELfx2bHzz2PTN66MGYyCPZ7YeKPTPjaGhcVFzHnVl8m1aSWojN+Hi8eQaWozNzQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WtbJIdgofgFRa7x+XPjJbBPL6IUvmEL62Hg+8W4g8po=; b=0uD6L7CmC2PdR/A6GJWDC8PV8FcZ29GX6rv4LtEw0D9VEF/qHei3PF9/Cu3TxY1i447B6cJ1/72p7pFOVvwJIj8T9MZLKNquaLqyVOBDMnMtgtAYxcwTYIe69VPw6wmXkH5Xv6eTrcK9ZFKEK3pa3o9zCxTB0hbKCBDhp+ESOGqfv+fUcwboO3SBlIsDd87iUJPganbMkcgUQYs/QBV2sKkpu6rhvlmjQg6tojCj436OSwHjVdmWzg855MjkNiw0wIFIVKlHfCQ+W2wA5y490/xT88raq6/U6viUVWG8XrbMFEYKiEcOgcjMpf4lX8jE471T2EW64ogobO3pm/IYLg== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:37:51 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:37:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 06/13] Squash to "selftests/bpf: Add bpf_rr test" Date: Tue, 18 Jul 2023 11:36:43 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0245.apcprd06.prod.outlook.com (2603:1096:4:ac::29) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: 894296d0-18b3-42b2-7a09-08db87405d5b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NT0ukI5GKGp1GYu7i9oufYGYzPdRCI1LfPgaCvj5Q4O6VTebVANTQSQqZEUw8DA/ttysVenxs+0Zuz6xMOPPh4inFjAqzwYwcGoTMq69EnfnLnwxUVDeLQ2tQfeCCgxisvbCELDMareoQfcoI7UmofrjjbrwSnFqsevmEAF6T6Fa9k4vLvhgaUT/d/Xou9qvBl1ZZqX+VUzxv2DXneyVUsrMFaJwRpEul6cyX6Thnbtl+BaNc35SmI4EPafWQvo1GWb4hnkh/SP1EQiNpET0pujTUq1ROUnJaZCWwtON5Q7xzsa1xN4Tsgx0yIexZ6NedzV3RlinsrSwfO387FiJTucquFh/cYW5FWkw4CEvKS825aUJp786FDlktVxyQ11DuNQunsyx+HYEtkCQN3Wwa7xj2OcM6pOteCwNbJzgPHHbDY7cimCb/go1Eh8aHGXiFkfnRPGrK2zRSTHbVgLMw1dAHi4KFxC1wmmvgxiUZ1T3t9WV5CfO7OhdN6hK/TK6dRdPFnp9z4YCTuArDB+XLls+mi0UnUbQ4drbxtk8Hi/5wlNLm19ScFFhJsPXmG40iej0Bu/ojt/Ka77wvlL3RGlP59pCFArQaahW7dPgFQk= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(4744005)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?L7O4UXr+5sAqAzvNrEd+52qLGYlEifycvSPOCd8hmUAqGluvGJnvXCeORCna?= =?us-ascii?Q?65bQk3E4Fn4FQCOP8C+ZevwXlnpyhrlhs2/wrndMi/mHVfAjUylKCYS2hl3p?= =?us-ascii?Q?UaK7ashn16/rpvGIm5nnCXRBR8KYvU93O9p+pNANlk8V+rzEHxiLKWTdep4P?= =?us-ascii?Q?TNDEMosHINUptc6m8Sk/adiClWYJ48t4+FeJe3nPByLP3ggP7Jna6C6sgHih?= =?us-ascii?Q?l8SQVotzP0s4iQ13zAYQXUedW/q8ahxbJAD5rIdZnD7m54uuH8RhZDjIMxzs?= =?us-ascii?Q?+ywqiYgV0cvi55rSW9EKmnKhb1iTJteWbP0L/RxfXQlNZHQsWARcssbdLX/r?= =?us-ascii?Q?iPQg4MreICgYxBOhkIJIxHBCSHGINa4Y2ilkRyREADRDlSw5iBSnJE1C0EaQ?= =?us-ascii?Q?uJFOTpLHOXmRm/NUV1jWR28paX16WpnkkYkfvCS4L+hDpneGuIdsbRk1wQBj?= =?us-ascii?Q?aNbuX+OarVoV+qrffvyDn/H84H9ePPBJYhHzYnoHsb5PDI/Ze5Zo9Kp0qdoR?= =?us-ascii?Q?K1d2w1H8soKaMdGl/ghNZbD6DFgWUIAkZFv30jmy3YrArH1TT2kugsNyECRu?= =?us-ascii?Q?Z1NZDpZCXsrBoIGsGXn58Ag1CeayfbSsNwgOoG2nMvyYghjCLwlb9FDyMv6X?= =?us-ascii?Q?wSwcNHSrGLc5j79CdvTx18a8fjHrGMQRVAdnHawsU96awfz1VnkHNI16973g?= =?us-ascii?Q?AHJSMuz5d4bsdEQMdpOO98cOQiKibrfC4fyuYEL2ygmkSDh+loBN5Kx7pJbO?= =?us-ascii?Q?R+OyZmfScFItL5fUm9jJRjzkPvww0tWEg71acYX9VEzp9AzcdfTfbb1bZ78x?= =?us-ascii?Q?pOryTdO/nNdfTsGbUAciCSWrhjIV9qmFHIsHMI3ZRyF/fnSORfVwu+N2+M9p?= =?us-ascii?Q?FhNuHGpLfz0cL4rFXodL2LM4rI1AFooipDa5oAlukFpH9LoZ4/7OFalLH9C6?= =?us-ascii?Q?gS1xBasK8stiI9Vz9G4WiPJddc1U2uZpWZX31LFKj/KlF6Qy/k72kc8FOYTF?= =?us-ascii?Q?c4YDrXaq50X0DVMclCAnCYF8iavcYZZ4gJVE1yU/mlmcY4Rmbtd1UYTFlqdE?= =?us-ascii?Q?r7W9ErcyzzXJJI3aqSIIt2Oqypfqvubhtju27VxmnjF96Z+FiTt7ODrNB4nQ?= =?us-ascii?Q?WpfpPMv8IZny6UHjF/+VI16YwSIm96rGA66CVk6hdX3oezXL/9v6+I4/dZcN?= =?us-ascii?Q?QEPFo5qJahZ3mBYV6+oXXKgp2HT9Z2FoJyzASYiAmUP3903DsaOhr9DaQVmH?= =?us-ascii?Q?nSSwz+pQsB8OgGnE4d7+ar82zsnXUFeUUD/2aXoEvInnsuftzPj2o3O9SJw9?= =?us-ascii?Q?j02Ngbq8jZIL6Woo2ipvGyngRZ6dsGz4K+ZHTPmNxBDybArf702P48fkOYR/?= =?us-ascii?Q?8Ek0a5JEpZ9Qw6rs0dHKwfRhrX4Q8xeY4Gjh3c3gm6hdRskIoYVfx7dwQK0h?= =?us-ascii?Q?ButTnwz2nl9upUODA6TwkaGQ5kgfHG9zQNgEUVQKkEGACJNpjhDZThm6oS7H?= =?us-ascii?Q?IYzvQczZKzyBCKr0sWSOJx+LDof2ZItGfDX1s4oGY0df9g3xKk99sieJTeTc?= =?us-ascii?Q?P5nJadnwurKI4aQAQILi+7N7+CSzTvA0erdN4Llx?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 894296d0-18b3-42b2-7a09-08db87405d5b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:37:51.8322 (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: jyuF+ECaqNl9oS3Mtf0TUQQMYQAnZ/bIYmVTlw17fzvbZiYfzvVvB780amzac/OTcQT2GCtBgegnPxttapHPLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" Start server with PORT_1. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index f5443c3d2d97..5e2f6504cc68 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -439,7 +439,7 @@ static void test_rr(void) nstoken =3D sched_init("subflow", "bpf_rr"); if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_rr")) goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); client_fd =3D connect_to_fd(server_fd, 0); =20 send_data(server_fd, client_fd, "bpf_rr"); --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2081.outbound.protection.outlook.com [40.107.7.81]) (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 7A82D1842 for ; Tue, 18 Jul 2023 03:38:02 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OkkLd7ajwUPsAwrovz7U0H3NoWdLOkqApZN5gcONwSc056xrffwj4AhVLa5NMyf5Je6JVQjFVc1KncZKpUXkdh7axMQhCfJna1tP7jp853lhQ3AFEtKS10pjeBF/Vm4yyYOfh76/KpABqbDsl+iFHjj18aTW+0owMTGrltrQKvp1YoGrppeJTg5Pwp3IB8KWiERv0/Oai3lmBi0i3e7LNnjFFBpSxiry5LJOzONtWERzjqTaaVOJGPvRcP15oSfadVkTpE4FAulPO3Ifr1UggNFOaJVpBk/SIlXgNAMA59JUz6L5r5khsG3MomnXACVpHqSbO2mIIkgBNtPa8aaihw== 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=JDCt7s4mb3eS7UkmqwoFCVSrxyEjbiqSn8Fqr6DPDmY=; b=V/MzS9Ji/0rybzcZ5yekUKcN/CGsnuXS0Bcje6Mc2h3KetTm+EN6720qoVUN6hujrkrbfeUUSDBzjKQ65yHfq/yFzZ2X4fIlXROUoRPUApWTCXD+Cn9bY3YTSQYv6+gPXHE8q/aQEp6ljuJGDAo5pS20fRgyr21CMSC6P2SK5jTMCwdLpJ1gmw4in8N+3ty2ZF9X8dbbL71eoqegHQ89nZ7KyqnlTPM5qN5Zpv5r6Ajzor6A6jMcOf/CC45Ks9sc7A/4UVDAZXzKMRhambGlDNghH2RNNELV2QR/FBVTlo1nSIc94wH95MfILmn2fpxkaVArTTiAOzJDxRpHj5Aqig== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JDCt7s4mb3eS7UkmqwoFCVSrxyEjbiqSn8Fqr6DPDmY=; b=3RYfTIQBkaLTrEs3hggQZEv4aN7TXHskS0MKKJ+TJfVGlH41uBBhiOdqp/E6eVk405T92zAvzmr7YzKb+68BicdEDEz03jlmtomFhzEeQ1x0QRhglNQotGVsglB4n+DPIfNZlIwS0NK1HzS+skaWga/QjPXlWyFN/MQqlJs35qj5iK7DLnSqi328ve1qII0SVrs2ARgQgFmOOzqGdO5aRn7ckFkE686i7IWec9YpIXj0KA07QbHhluWP+lFYydMEwjTl8ddDiNBEc7XOrOEHWHHL0AlIgO47Fb9lnHjCfY5ANz0CC+6QZL5a06EyfLecmRtKYXZnnVVSFu6RM3zU4w== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:37:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:37:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 07/13] Squash to "selftests/bpf: Add bpf_red test" Date: Tue, 18 Jul 2023 11:36:44 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0242.apcprd06.prod.outlook.com (2603:1096:4:ac::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: 517f42d1-5b0b-4b8f-6534-08db8740620f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1y6bGBsXL6yMuD/j25cFB1xo9tOKhmuPUxtJLtOCXWFoMqZSSnn3bjRtUtTvqbK4jprQsmQje3S6UTMm6WIRXqOmNyEjxEeYuQBEtVOex7r5xCKPz53KsK8Cdk1C3pLHz7+lG1lqLANAsdyD2vF8JfgJgSOxcXdmxiOJxjf3ysx3EOhJKpF9WeZFlzoVqLNfSAfN7Kd0pCKPqGdOkyNvrb9ghB0oUambZ9E9xlsV2xVe3ZUOKxxn0nSUoTgMEg1qz/QpuSd/nMTvquKIvh3mxT2GtQNSowTfZ/bAwDFeC71VhHbJXmw+iij13FCI4DszNb3TfwdaNSssap4YGOz8BLIkTK6mgxXu2YgCI4mXeExjaWetDpcP4OYZRrT3u+VnqzoI2BKSyWCjGhcfrzByuSDG5HyAaUfH6ThGJ3rhEhveoAyGlOxZSk0jZVKigZb6QtaYEnQP/rQ92H2KpWH/aF43gGOd1C3jhkCnQBecclOj6hrfd5K0hPxVcF1WjPWSvGM2U/Hv4/gmhjjTp8S7UTNwy7OzQJ7m5N/mKNf6GwG4XYERWhiKCIiWNApv0CWL5k9Bo3zDh8ZJecNp/SWLI1zUQAZF/fPy5bpiX3swyfo= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(4744005)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mBEF7IoytkJYIc8h/x6K0Jz9mQZvqFlSDMBzdI9ZBDdkJYw7nrTvWMdQe8qp?= =?us-ascii?Q?aj4zP2BLr8fghtyYo7rCKzYwXYB0ImfDOYSgsC/qg34QhYMw+qX1ePQeIAHe?= =?us-ascii?Q?d8uI+J7OZHSak09X/1gIl5SG5DckUqdLAVORcZv00tBLD8vLKmbIKTDH6x+Z?= =?us-ascii?Q?9Vxgy8isBGuJjV4VYrSu/XSsMtC06Y3RTkULmVdcP/3eInOmgrfFh6T1/+bC?= =?us-ascii?Q?UPbcofXDQOWmCPXSKBLVfbVyAza0cO6dZuGYEPF31Zzkpz2nOkasuBkDMSyU?= =?us-ascii?Q?80uG39CxT5UjkmvyiI+6/TDbjsksU81S+zBSDgU6klnJo5IE8J4i43/mHMKV?= =?us-ascii?Q?MNwMfKeBI4+ayymyb+2rv+a0WmpPEDtnmmdQ3oJs64os4MiCW1/CruotZa/Z?= =?us-ascii?Q?ZYb/iCkHaYqGyV6JV+Q3yAwtqYckQCuA/ujEDU20MAj0G37gXQBFx+FLgluf?= =?us-ascii?Q?81e44gZe8iiPangvDeHY5WZ+jgGscPhEDAsBrN5Pr3WoWDdOJb7WUjBi5UrY?= =?us-ascii?Q?y5h5qAp8cdqyki8aB+6j8H7CKwBhOGC/uT3Q7aAoB9YFa+5/QZ1MQb1pSKwB?= =?us-ascii?Q?tescONjNaSw6OrELxHcWHxuESqSaSSAYrpj5j0qDgfXYIfVFPuBdxOUXn141?= =?us-ascii?Q?X/FNpleKDv2gAdmmBnM5XhIbTJEQdnjeior6KgDGzQqy6NcSgreeALTatSaD?= =?us-ascii?Q?0cRjUaZpCLaHzltdUQ8Opaoo3u7HoRoVdTHUPMYB0AQJx1QfeV3q0rRtRatB?= =?us-ascii?Q?Lmkh1zwxDobICOEZjAKzXouFB3u3BP63JwXGRp3WSOM6j+ht7Y3frhuc7wCM?= =?us-ascii?Q?iq3sfDVd7Bm7aToDmWaVOxTib0us0iAowhjiF79dSwKjnB5BBEEOKNl1QRyw?= =?us-ascii?Q?yea4e5KtPGB7YAYYcdWgsOu6F4Kgn6xmAzrq/RlX0iA6zDv3T7P05ojCg27t?= =?us-ascii?Q?K2UReJCU+FIyE0t6rt775kNX45xC09YT0VFnF8V2an6+4wdpkymb1YKn/sJk?= =?us-ascii?Q?aWqGazCNq1Q9MxlqeXk4LqJR8aNWXR3eWJTMsjpDjO/OxKGgmmOLejUkELQW?= =?us-ascii?Q?Er9wLQT4fXEzmGEhMZxui7Zol18illvWzTdNx34D8rbJG6A08ioG5tRT+FPc?= =?us-ascii?Q?kvBOC8M6w0kByoO3X7kOKC7n0CIrESgcARf+1LJ3bM/DuMkjr+mLwY5EE7cR?= =?us-ascii?Q?nIj0CnvX6WQUdqOdI9ztezy6mRrWcZjAZ8CpjmDYUorXcwb8XvMQgZjIRTCI?= =?us-ascii?Q?9CLKAjqtCcwY7cA/GMN9NZVb6TPqdLZa0rdNVj8ZR7yV7qumuBwu1OIODAjz?= =?us-ascii?Q?+qjLaiEKw175RlzeCT5Qazv4LbBKirvkQxuemIqRqRqEp2c3frwsOdxmXUOE?= =?us-ascii?Q?xdpTMJAAVWwkvSoXxVLM/4q4P+MQCKkrRAJi2XUc/f2a32p+XI2wJlljfDzJ?= =?us-ascii?Q?mCne7Fkh+FPwkqZ25ey99rhxd0pnkd3nMO8NK65W4aq0QnbjVqfzQog1y++9?= =?us-ascii?Q?Xa/LYhkZrlKSHBWs1qtXeZ8OOI5+OSbx3EBmMbiHBdsOjvpEWGj0iuCZSXZl?= =?us-ascii?Q?D+lxR4HyWZVEsRTuoLTElJNO5zWQuIIzPGFCQuQb?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 517f42d1-5b0b-4b8f-6534-08db8740620f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:37:59.6947 (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: +JIjMwN6HEt5FuA+C8xA/LpajlRA+SYVg65obo4jRbBy8rDKI8pS37kQqk8194bYQ7aUIbirO7PYVYnezuHR1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" Start server with PORT_1. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 5e2f6504cc68..30fcc82b10ed 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -474,7 +474,7 @@ static void test_red(void) nstoken =3D sched_init("subflow", "bpf_red"); if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_red")) goto fail; - server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); client_fd =3D connect_to_fd(server_fd, 0); =20 send_data(server_fd, client_fd, "bpf_red"); --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2077.outbound.protection.outlook.com [40.107.7.77]) (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 82FE31842 for ; Tue, 18 Jul 2023 03:38:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=frH9tnwU3ebkpRd6664AzUr2boghzq6/GRHPizzMj5g7WOdCSrlnaWkVpe+/aPIFslpal8oNR4slAvZjxD8/zhbGuPmsSLQjrSBhP9A45hesXync0GLpynU3Loi8j+eexJLJS0RhJv5xCwL3pbe0CVWAyXtQ0zSh0/PcCUIVVSsTPsQpcB9Por3IN9mGHa9dBr4zPo71n+ZILdiFUZIWQURbW+A1md8laK2ASs3OYwJBt7ln0eMPUZ3JB3ZQKU2zwhpAQU1wKQpSB4LXANWKuiSQZ4FagP+gVe32d7p7HisdZOkXw5HDlMEn2g/kGmR5zinj+aMNqrscvV299c0PQA== 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=YE687BerWCqwdvVxpsNy/9sVNdigDjrnVXigbPIT/74=; b=AkkwsP5m1ioIi6EIprRV+vxSxDI/NMdbzK6Nnn7cLILPKf8tjkw7DzGg0fwouZbyDJzbnnfve/yXba91BCLgl9kec9+PLZ0CnzechGaxfEYxKeNUj+cuPAO1KCZUao5U6q+HLnj3jF+OpCqYND1Cf5l2B3DPG4M0TP9Hwmi/dRJ/FFtTuOzU1AtgRz4VQ/Kf2uxcSdC6odXJOVSuw9fUMcwQjpgYnu5DYUpdAYaNFvtE/ar8KcO+YS4Mw8FgZeo443EKdHYo6aAY5OilpFvv9yqaUsFBjNk7namyEwbB4LOt3cuOfnwa1CHd0gD6OGbu0KX2GLdhz+PCmpOOKj9/yg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YE687BerWCqwdvVxpsNy/9sVNdigDjrnVXigbPIT/74=; b=1w7SS3Lh5sCm3fTbMjf6/Jjeh/HNkX6dIeI+Yumho/4T1rvYxw+enzhVDxeGONZE8SXHUqua1bUcKBiF6WDxFaatL3TmTuKTpLmFgpVpELcWhPTa+OGeO6cIbHFIokG57Lhq0/BAHYd2Lj+PZlVwTBykhb8wfm3Q3ChuLtboMEA0MXCzFubd9jLCIAxOtyypAFYQaamNsgpiLt57CTXym3TOCMDBRBV6jffg/OtkTfjwYEy/5XAfyyHg24v06GS4tJvmRR+aAqkS9zmOT109oAyz7FtwF/8gSrjsCi85Oie78eHDLIBY5xjGTHLxvRiSjXwmA9QhWBW84HnIPZJgUA== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:38:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:38:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 08/13] mptcp: add subflow_set_stale helper Date: Tue, 18 Jul 2023 11:36:45 +0800 Message-Id: <94b445b3225d4f91e2d05cab0338c4367ecbabb4.1689650435.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0019.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::31) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: d09f9890-13e6-46ba-cf70-08db8740663d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vAavYEnB+/6h/ToDCXI1I6T5m3dFscCBuCs7n5kac4iBBUdy69/4g/O1JAAs84FszAqHZtuMKtHaoL0Jx/USybZ9+6++x/c6a9L0to+c89iKl7vw5RL2i22n/5cpP2hGi4A/5lVlF6EmKMy9s4EEdC83Xw5csd5GSm9fY/4qrl/Cu2PwSyt86W2wpghrOcE/bwZR+hW58isj8cTdMxW3jnqHSKJ6a54EZbvj+GqKGxJiivT9tbD8zZCfxB0ej5CippcDPec/LIDC5dlbDasP8AMx8ngWKWICuV3kwoXmDQyfIZ1xaNpuzVZBYh+ereQXCLbNlDjqpLGaP8LdC1DuLRtyHCI2dy6Pd1HdBGGF/bPwHuUQu7u+frg2hZbQGJrCxXbnUniNIafLY9J4k+Bm/yJSx3Qz5Hd1jZK9Gbb/V/LRrCGMvRh0nLs8G5+s47arCIr3anNZkp26/RatiMrCLeBQ5cUWLyt+NjA7iJoUscePqafk8yCw1uQiftOdE/7E0J2HKXEvX68ZWj/MjAxXPVcOWA8Nuh8wYU8eU9CD+YM/XOC5dArUl6nhO2r85abmh8qgXdIimxLWmM0/DFDjLk/dco0n713XBuJ0uCa7SgI= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VPqeDu0bzbhTLHL9bS7EgmfglGnG2w4fnEZUUzdCYhomfgb9GIj2mUJummSl?= =?us-ascii?Q?mcWPfWSAbgwNiG8dCVDrIIhEpBU/XEtgRYe056YtYaGm/yvChpoVwx3DWJa8?= =?us-ascii?Q?Lc3pQug5A76jYOcimvvulvuJqTbBvFbfZztGY19zMGDqwLZrA8yesdmSN6nO?= =?us-ascii?Q?g1i6W3vQ8JtxD8dz9E93x+M1j/U6j8yQfBsngcXhhuIRl6H3OWDpkbqaqHSP?= =?us-ascii?Q?5r8dQpp2MFoDEWbeH58Enukmm/YNESHWaLrQBLCLXn/9Fl1XesLS+kJhRqav?= =?us-ascii?Q?ENI1lk5xg/38k/2ctO5Xa9aZRiyas7A5yXbG5cw17fk5fqNyJpW/zreCIb47?= =?us-ascii?Q?+Z572rGOd5Qovk7Fug7ydCyCzTaGZ8taZehWWgQPtKu3vzlR7V5SaYUFmkw+?= =?us-ascii?Q?1EqdlNx0qVno2b1OLph65WKsIgt0zhw1luWQ+BKEw95vxr2wIyUhWFecxb8i?= =?us-ascii?Q?Nc3Blb/ehNAajGxmaO+sAlYgJmw74MDduyBbHnjzbL74Wo6acwnNk9x4/6HP?= =?us-ascii?Q?lpES4qxP+rTvDkSAk6B/Xd2pR3qSKEbtoJFDcwRRgAB4z+GXeTtPkY+I8Ive?= =?us-ascii?Q?nvq5paP4uK2AjYt3Xu1DtN0w81F/My/YeL3YXRxxbDnMph9BK44xyD06cuSI?= =?us-ascii?Q?9FQpjCxEdFeG3LPRDvgYwi+WW2esUyD5knjQMrCOlAz4WP87gKIQAOepNi25?= =?us-ascii?Q?5/HIWbr2IpyaNzuiYVmnA9U+qN3REIu4FaaTJWzTI7sw+JSq6L+p3NB61rlN?= =?us-ascii?Q?Jea3YwZHxh2pvixoNVkYZ/pVD6Wiw/Et+u3qcvBE9GEvwiIFNbgyGT44GsIW?= =?us-ascii?Q?KXL7zUpuAAEXAXjPQNJxqlnpkXT/NCf+8vgVN414OqNKV3WcRKXB1103Wk/V?= =?us-ascii?Q?naEgPCeKa+C0Wy0A3t4pifYn+PQccHZWjfwz3RiGN9yvMmc98haN9HeYw9ZL?= =?us-ascii?Q?ZZPOGBDOabc227TK5mJjBsj9VUXmfWnCAfBIheL6xB8z5wnxNV5SSDUCF/NN?= =?us-ascii?Q?hmUxdmpMy5qyGWPHQgvHxtnOkfTjfgmwJWaN31ISgTeAVYkX64BemNr/7MYq?= =?us-ascii?Q?8orAu4/VQN4XTkLW1FElS8kA17iflmXegb/n65lfjUVTNDzwTZbMAmOgvMiJ?= =?us-ascii?Q?mL4eJ7MctReE5y5MxGGbO8BAVwTTIUxWdx2zNkIxPsF7NPixmrSgleOgN7R0?= =?us-ascii?Q?LFSkrqg9JwEHcs66yd/rchlTQPsOmg6O15spRbkWUxzUWG2Nmkzk02lAojT9?= =?us-ascii?Q?i4hov6WcivHrKRJiTZbmrFC978vylEbxloFPIDfODu8CgdTG2v9fwDi0m4eV?= =?us-ascii?Q?WJRh1gVu/ZY0wi7IqB995/FCCOg8akUlA7up2nEC/wvljlT5g1t8wGgLwsGY?= =?us-ascii?Q?MHo9e2brWsjH7hBF3+L5VVLa1Yg5Gbg9LzntqE5fDlXRCuaaIALRSPrKzKH9?= =?us-ascii?Q?+rLlN1AFWYFc50falc0oKRd07VgmYo8bXrlMt00v/+0u+2a8zNypougIKPjt?= =?us-ascii?Q?noYETdStev4DoXnExIfKvkTEQEFkEFe2AE9AvbvUqGOXo1bjLsCOcuMkUB0M?= =?us-ascii?Q?+/YW/FpYzWKuM3LWq4xyszm407n+yE0VvPweOtuU?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d09f9890-13e6-46ba-cf70-08db8740663d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:38:06.7159 (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: baJljy8IHyojDWTOl75i9QYg6qg/NagRZfBP7ogLR7TOQKvJmc+Yu12NmGwTI9+IzsauZX2lrrYzFwIGgLBkLw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" Add mptcp_subflow_set_stale() helper. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 1 + net/mptcp/protocol.h | 2 ++ net/mptcp/sched.c | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index f388baf08d49..e6f94d5e22fb 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -146,6 +146,7 @@ struct bpf_struct_ops bpf_mptcp_sched_ops =3D { =20 BTF_SET8_START(bpf_mptcp_sched_kfunc_ids) BTF_ID_FLAGS(func, mptcp_subflow_set_scheduled) +BTF_ID_FLAGS(func, mptcp_subflow_set_stale) BTF_ID_FLAGS(func, mptcp_sched_data_set_contexts) BTF_ID_FLAGS(func, mptcp_subflow_ctx_by_pos) BTF_SET8_END(bpf_mptcp_sched_kfunc_ids) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 1b4457c44fe8..78b3beeb7d7a 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -662,6 +662,8 @@ int mptcp_init_sched(struct mptcp_sock *msk, void mptcp_release_sched(struct mptcp_sock *msk); void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow, bool scheduled); +void mptcp_subflow_set_stale(struct mptcp_subflow_context *subflow, + int stale); void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, struct mptcp_sched_data *data); struct mptcp_subflow_context * diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c index a80cf0481edf..3f361e75e38c 100644 --- a/net/mptcp/sched.c +++ b/net/mptcp/sched.c @@ -127,6 +127,12 @@ void mptcp_subflow_set_scheduled(struct mptcp_subflow_= context *subflow, WRITE_ONCE(subflow->scheduled, scheduled); } =20 +void mptcp_subflow_set_stale(struct mptcp_subflow_context *subflow, + int stale) +{ + subflow->stale =3D stale; +} + void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk, struct mptcp_sched_data *data) { --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2050.outbound.protection.outlook.com [40.107.7.50]) (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 8DE491842 for ; Tue, 18 Jul 2023 03:38:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WUpy6KDLYBQifAkkhLHjcH9/wXejZiiqAUmakYkomwWI2iVcUQRKd5UOqV6lFtfDIcohe/EMBvXQl0cUCULT73l+UXvc5sImiN39FudoGTpYViSNcLMvnaz46iXlTasaXyPIRpJO2fdPQ61OGQRhmcv4jNEoLClkcSef1sJBvppadoddfodiyWrNusgRkjkxhCyiqjqj+oz3xLKoSqWZ3buKjpkx9QZ1+iARpWnDwjpLjPjtab6/eDGIXy91TP/JWONrzL9tc++TgRLljXmgzo7XrAeWtKbOCzS9ZkgCsxFNhvbgawo1i2Fwo1xinvdwJXX4n10oiGrjiSgDdVWEDQ== 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=yb23Lm8/TR+/gk22kbMKw3rkwiX66kCLtJucq7TMiaA=; b=lmkvQoj6cdqqPNzvDRmEMailCqTcZZDb+YUTAPhuXp2F6BoG/x4IePpX01J4OMPwNorADuMiEyql2SJsDPv5oOMjLLm1SbYnDg+t0tjZ8IlA8KH6RIIyd0uX33emNuV7C+R3SqgEMc/qbxYFnoXUiYyEsDu72dOp9pfL0QEY7UHKj1uBURJWwD5Pvl8140KwX+KByiO0OjSOFYAqVJqqA+Z6Z7scIL89JhInDHiCP/hiVXhe0TgOE9cWrS6PWTptxT7bM1YTH+kaPqIPyeZ6rNg7dBIKDn3qGwXsDusOEbBzFwameLUeBjUq4ICdmTC69v9gRXC7A24MTAgZyirVWA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yb23Lm8/TR+/gk22kbMKw3rkwiX66kCLtJucq7TMiaA=; b=2onGL1pv0muDPxqEynAUaU1yZgNWA8HMOzTgw+sBAytMXNCX9c2noPr4+F1lRf/Q2AE+l4oQK9E7fHOl1wGBoQZ/5HimpGqlR6N4NBVrodSJ6IIT7LweBXYoLrjVK2VwvPHWeSJZlXWQ3ZCFB2MvLEl28G+hKx1XYn7sqycFzyhE6ReydFR2df3pmHo7wGI/c3E2+IE9zLF0+/zFUWcsZFqWzyhPCtnKdCSQVRD2FCpN1gmCR8G83VkFykkPIi1dqdbDbM9AbWWJEqPT3eYhjDstPCalA5f4QETGfhtuuZS/yeWa/O8QeAy+eK8oZQG0zjd31hJZd/rPPktNCfSeDQ== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:38:14 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:38:14 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 09/13] selftests/bpf: Add bpf_stale scheduler Date: Tue, 18 Jul 2023 11:36:46 +0800 Message-Id: <28c69f6bfb68d978ba15c9ceeee2600e21f6b3f6.1689650435.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0017.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::29) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: 0716eae5-7780-43ba-d54a-08db87406a88 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yREnQwesjYEc5CUfCByQz6+3Qnwz/Lc7KivNIkCqlEaVcEKdRZGgb6s0fzVuU5EHSYwnNsMqwsa0MBl8SKXT9Hkxvr/mzjJGw52E+k882DW9hVUDQci270wdsZZ1nlSzDepjkrngVySONKlYRZ7cUwwl8pYAI0BZ3NnTT3DU2ajKsUbPoARSGiwN+7nlsZBichDIq3HNIP64teEJfHudcG5s1N+HhhMT5n5ZHmxPeDQCSGr+O1E5i5OjDo4tDM5feHklZpAmWDQ9tjOkDo0BBd7UN74lshHlepmdsFYqi1nb5MzjKA/KAeVA3ch5DmFl971fpUC9KJo+E411J2Fmlll7h3laAWZk9+T5hTtiWhuBGleJdlDo9kqXjKYiM6rMS1wKNGYJBRXuGSDki82MR6pk3vuqRV8STPI2uuu9JUDpItwkpGNXITdLnkwLHydrwStqcR5vfyem7Nmirx9RzuVWUU/rDN0SLC2QmCnLosnoPWA0K5D0Syp/0b5Hjuj4QkqE/obdgPbqAk3F4l5EAfU2HtBMdza7zC2curXS9ku4HLtKcDYHjuTwpJeKSSSaVXIZbOJoI+xegQzZtFa55VkeR5Muk34D3KMTDeDJ66U= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KkMpCVj+e3z1FB+MYLUygGr8VlbdyD7DHmFH0RIvnJZgwc/9p7AzP9nnMTHI?= =?us-ascii?Q?NcZLhlos/jUBwQk+ncKFPl7VU3oDpAk/PAatO8rtyupRz7OD/1BqObvR7Cai?= =?us-ascii?Q?aKg0YEVMkcbb30Gqwo88TDBI05jljDzLnOxv8l8IFY/xpQwXT4NrfZqwFFjv?= =?us-ascii?Q?PhzIQSNUzRgZl9lUMp+Ve9ZERGplUqbxP26c5R0sj/kj0zkt65WkjFCADuDO?= =?us-ascii?Q?jZVGf3w3I11amaCV3f3GylZFemadypuL8A3fmTlzUeSwXMxrlKTg4CQ8z+7o?= =?us-ascii?Q?6vfiuMDjlHzvor9KIuTNWPbTGAtevpgkqCp3Fvbd1DrpIRuBaqsWtKtYsCes?= =?us-ascii?Q?59SnJwVh3L7vSbWbCVYBc566oAVJjk/KkOGDf76LJBoEb7P3XnCc1dCKB/iA?= =?us-ascii?Q?JsoNkMYeGZcJvkm91WExd2k8fTrt4p9iSfwIQI1uhTG0eiwHH4suoJbEzqhq?= =?us-ascii?Q?+uJXa3hCflHeRAbIS7g/qrNY7V4kazNUKQtjo6vIubawQdaJ8MKtYBmEejDk?= =?us-ascii?Q?8qqD50B8wAPz2iGwrthPRrvQ12fotRQSyBU7RNjaPiKXLhBNQNaETdUvnr+g?= =?us-ascii?Q?k/6fOBmxT16khyLzIU33jJH46advKCLEuyzadMqFiqGf6h3NK07RyUF+U2iE?= =?us-ascii?Q?aliGcI6RVg4a5VjDv8uGFP3YvC0fLv6k5tkr8ENCsbB+eN70SX0PLQJsWECB?= =?us-ascii?Q?HET/Os0dfJPPPyRI19vuPFI+29P45VVCdqbKaHtQLHXL+x7Z98rM3RDgxGNw?= =?us-ascii?Q?5kxluviHkdf4z9/spzxaQmrwc+Q1HdUqdyNP7tcofV4eUU7fwtv7I8x1Byt5?= =?us-ascii?Q?Jd9zXs0IRTwRjBJNMaSQuxr4FqdKPH+kMtf1RAJmJPUSqJUC2KsX9DjDgTpQ?= =?us-ascii?Q?j2ShlklUnoRlWHd85EegrJqgjECEGzkUUIRIA17cTYXpyjGbsxqcP1H24UXv?= =?us-ascii?Q?Uw2g/jyHAmY2nQIlPhjMrih9m9YTo9y/8RoFSUQCxRoRMCewbsdfTOifAiNS?= =?us-ascii?Q?ZoRRfyB4m0ChbSy3LwdCXmQJnkR/LowDhTbgYvxnOPAiPxQJiMSyYC/U7asf?= =?us-ascii?Q?Lce5mV7do4zB8ofPuPtoV5j89JGlPdFWm08cneZut/1F93HmMrqAalHKQ2eO?= =?us-ascii?Q?QLBYYfS2lp1xByAKrzTQanFVa+r1e+LoTdiU8WMf0WctKsqMPiHOFE8EDE9H?= =?us-ascii?Q?uWq/MDlVKehqitHqz0T6hlP6NB+EDEMwlQ1RSINMyP+M59Bkpnp35iFdXrVg?= =?us-ascii?Q?aqOo8mhJHDMJqzdXFJRMlVvE69NSYP8N6q4fxN4+74C6XvjfQ++xicMbH2lz?= =?us-ascii?Q?KGLHXecXvyjR2A5N7GUBk9yLODC3fHhbRbrqF1TOz/CiXzHiD6uK5Uyv7B8K?= =?us-ascii?Q?W+khvT3YNU3wJwr55BliwPxIUK/rN4On/lOvsokKc5TMIAF5vw2WV1qaQqub?= =?us-ascii?Q?QrpwfaxK8LGbbF1nlC+o6pXUtTtxrBcJC6ZO96pku6WofL2R8q/HrqQMJhP5?= =?us-ascii?Q?YmdS5SCJSNafkDXSjCOK+ExmHsy9evZwaFI/Vf3E0yPGvstcUSxJVfNaaZck?= =?us-ascii?Q?qh6cNPGnxehe8kGjQrcvrqyOuZmeeWAl/NxhFFUHliEuCyJw0U0gEhq/Rb88?= =?us-ascii?Q?1A=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0716eae5-7780-43ba-d54a-08db87406a88 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:38:14.0710 (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: yJT1i9uq5EWZUtCgPwKieZVav0hZ2ycEwBT7pM5JkxOxrBF+tdKU8J2MTo37IzbnmGL9oDNSftNYNAJU8wOKsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" This patch implements the setting of stale flag in BPF MPTCP scheduler, named bpf_stale. The stale flag will be set in bpf_stale_data_init() and will be checked in bpf_stale_get_subflow(). Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 3 +- .../selftests/bpf/progs/mptcp_bpf_stale.c | 63 +++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_stale.c diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index 945dd46c98c0..c749940c9103 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -234,7 +234,8 @@ extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u3= 2 w, __u32 acked) __ksym; #define MPTCP_SUBFLOWS_MAX 8 =20 struct mptcp_subflow_context { - __u32 backup : 1; + __u32 backup : 1, + stale : 1; struct sock *tcp_sock; /* tcp sk backpointer */ } __attribute__((preserve_access_index)); =20 diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_stale.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_stale.c new file mode 100644 index 000000000000..e8cc2e0c24b9 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_stale.c @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2023, SUSE. */ + +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +extern void mptcp_subflow_set_stale(struct mptcp_subflow_context *subflow, + int stale) __ksym; + +SEC("struct_ops/mptcp_sched_stale_init") +void BPF_PROG(mptcp_sched_stale_init, struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_stale_release") +void BPF_PROG(mptcp_sched_stale_release, struct mptcp_sock *msk) +{ +} + +void BPF_STRUCT_OPS(bpf_stale_data_init, struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + struct mptcp_subflow_context *subflow; + + mptcp_sched_data_set_contexts(msk, data); + subflow =3D mptcp_subflow_ctx_by_pos(data, 1); + if (subflow) + mptcp_subflow_set_stale(subflow, 1); +} + +int BPF_STRUCT_OPS(bpf_stale_get_subflow, struct mptcp_sock *msk, + const struct mptcp_sched_data *data) +{ + int nr =3D -1; + + for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { + struct mptcp_subflow_context *subflow; + + subflow =3D mptcp_subflow_ctx_by_pos(data, i); + if (!subflow) + break; + + if (BPF_CORE_READ_BITFIELD_PROBED(subflow, stale)) + continue; + + nr =3D i; + } + + if (nr !=3D -1) + mptcp_subflow_set_scheduled(mptcp_subflow_ctx_by_pos(data, nr), true); + return 0; +} + +SEC(".struct_ops") +struct mptcp_sched_ops stale =3D { + .init =3D (void *)mptcp_sched_stale_init, + .release =3D (void *)mptcp_sched_stale_release, + .data_init =3D (void *)bpf_stale_data_init, + .get_subflow =3D (void *)bpf_stale_get_subflow, + .name =3D "bpf_stale", +}; --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2089.outbound.protection.outlook.com [40.107.7.89]) (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 612A317CE for ; Tue, 18 Jul 2023 03:38:24 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CgNbBKlMHCRprPSWmsChK6yqnGZwHnisDVfq3SObrpxsRsf0VBFATNvj/GgczE3qDJdNPixUqCV4OkH6kavf+gQpH7n1JXi//zerkZaQd7gM508Dwlz5FcNa+l8/2JYOVIMa2jt/XfTi9E6H/Bt07pR3xplUE/wEVRgzj9uR6pIqoy3mRNpRXTr/OFi5KXECzqv+zrtW1kEA5emNZIytU0HmumMWFuFwrvAOP2jQB83CAPMKD56ZLtyOuciJTXVLHgudmU0uMe12V8UAtDNNESV8e2/+I0EaBtYGQzibw+O0SX/f4iRQdW69qUw85Dn4NzoD4N1KvCYiNppFS8x4Bg== 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=UsE+Oxtj6e8rWWNHJZytg8QhUswiBWKdTffnS4C5ER0=; b=JHFGfxuJI7y1oO3V2AYibU+6t3VyTE6qlt8elJyxITW9OR0CpUFQuamgKt5+JKW/zxsAT9QAdhol6AD9wUJO86RTVSIrHMi1ZIDyM2Nce90IyFmXZKP3Pw4gkfjeBkJtMYisTYzbIJc7r77ahgtHoPuSmoZZfmM4kAAw2Q43dPlG7PRZhDbNtrKCFn27wAXmvM9jCL9HvZER3Wo1Z7ZCANfPziftBE7t58vz+CnKGFiFsZhgDSnq6O2noRWxzXhUDVCFnMrmKdHCfopXlcAR5stktPWQZ6RbpTG4qkryr9Xm8FPUN/f8+XTZupLkMJiXXVpLNimm7fpboBhAKJYztg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UsE+Oxtj6e8rWWNHJZytg8QhUswiBWKdTffnS4C5ER0=; b=JjXDrFQEBd6zp6hs9Pu+3+kbk/jqTj6i1/R4fH+E5SNTQauP0+NJkiHaiLJwucwSwhBLd2BqM70vn5sopxPXvzhQBzUuKf3zIDVPqrwDFY/DtEhdC+N4xIcScfWMpbrGGNk+57WrJ9a1b5gazsOuVCLZLcXG/F3p5NqK8QtlGro4Qlm78MoW2kyQuu6KT7G686Ef4xNEyTHP5nQo6LK+iM/adHewVt8Om75FoLhC33dxhbo2NSRkB9tO5B42hYyDFP3PGJX12EYApbbNfeawlIR1Q0LKsQZtYYj1VbRdUOOArB4QsjlLXYMyTU14/V5Lya2pRfJuwSdSLGYbGL1n7A== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:38:21 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:38:21 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 10/13] selftests/bpf: Add bpf_stale test Date: Tue, 18 Jul 2023 11:36:47 +0800 Message-Id: <690119e110637a386056ced8848355521610ffcd.1689650435.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0014.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: 39db83b5-dff7-48c5-4bb0-08db87406f27 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1lWF+k5MsriaxGAktbgtSnCNXiPnj/Bi8W8kg2fE2sbMzea8Qh1692h70+cA+x9clQHpLnXGMK/XRKm5ZNcO4gcFtUJ15ebv2Ca7HCbOEojZUPL/HlcVBm9R6H7dH91YtaIt0RqVtTmiIukU4TsDUfvujJBHTrAGzOq/Pg+m0MMAoQgxfJdlTt+JD0IRV8zUkZZotOd0+ITLtrnCowKcnF4BMrzp2OSr1R23/mpDMsJYlfWr6pgK1P+QGBrvXfVX8EZR4IjYoD5L9hCjVJjFNsV372L3uaNWdc+HcQ/cUw2mfpvT1OYa7l1EvhQijWxoYwuzDS7Tr2uD3lSJhsPzWtPtSh7k6qJqXANBUJL0P6rPm7aBR1jTjuNX1M0rk4KYMMU+0BHGxhwgKGeL3I5UhG0x8X2PyjBa+7fsVlhdVLQiWz/KG2HwtAbsYDm08wO1qGkpZciUYKhejeBAnGBgRift6iNHe8KQ7t1XhMnYFrcK/IMFV2P+DZwKicuQevDmj4nApP6v7671Z8AWuA3dsXBXE9xqE3JHh7eLV7yxFX6lmSNp+XEtQdYTP8Q3xHVZVCBYz0vL8CZiw+0LifK+Q3C/Y0yYBUPLMqctOSc+pmE= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HicpgKnhAJidFYSjiezOFcxR2jmgXuiXyv/TJT7dbSSFvKPjABtzruOs0LGq?= =?us-ascii?Q?K1xBLWCZORqB4ABm81d5RbDHLX+OA9YLLaquckLDywtQHuYYvxnT6gAOn4Wi?= =?us-ascii?Q?D90IL7eThHcUxOwC3NTsaCEPHaV3wdr4cGbYHIdser73URL01PT359KHGkX8?= =?us-ascii?Q?VMll5SVbE5Y4ypKuvqkKPU1SwG1s/yaqQSkKfwF8Tu0x+FglM8PZOsabdtPe?= =?us-ascii?Q?KuaQEQ2c4xDNpg2XMMus8u3YdHp146zHfi662OAZVXXyTNXDds7cX/EiU3ma?= =?us-ascii?Q?cGExQAgRb8rkogFBt7rxWPHzJ8y4WM2XpnlV7TDO5DONv1aUir7EbCjlNFdB?= =?us-ascii?Q?29/K6pPi1oQA7vuDwuIFrTbUJAfUFQLoBqJ3l+v1MPycHUe5DjAIxq3lBFor?= =?us-ascii?Q?UTLOltXS1SJgD62iztIEYlbYAeZyWuSVZEAwTLjjof59Xs86V3Cb8UxNKOCh?= =?us-ascii?Q?exaKT46xW2eCd9taYICOHIb+9Z8yu3oZkrtOnvHt7W7F/qIQXUh++mZvEZ/m?= =?us-ascii?Q?IanFFyp6Z4aPuL8t+r7lU/FC+P9wzU9qNE4j9VD78LO72gYlSJNSOBMH2ffw?= =?us-ascii?Q?Kkc9/Jxce1ZsLjWYjW+2WkIg64CzxGK/mTty2hEPgoVZMuuvqGDmpZKgw741?= =?us-ascii?Q?wG+TlAAqkx3rMLfKiByubIEyC8Sg9ShvN2ljRLI8yern+uPNAUYmkQVKibMY?= =?us-ascii?Q?cQWQMlERBtsKPM9hRlgKhmK2DjUYpkaOcRbvqwMQYFx3lwvQK+ythvT+jNmO?= =?us-ascii?Q?o3wGiK5sCV/UemoM7RT26eFks14TwNLD/4Pf8BLCTaGI0yQCaKzK5bmtfMsO?= =?us-ascii?Q?FvTH0gTWqQtFC/JXtyTOSgrC28AVqJOZMfzElbD+gwo+pAfeiVmA6ok/0xxx?= =?us-ascii?Q?nm8HBrYwKjM89CxS6R7Ein/R/xqnoGwI+XFXyioMVUcZs0EpwBs49yyaSC6c?= =?us-ascii?Q?Z+U9IzGMwijPXzO6qjyu70wrSZeNE+L310KlncAYksSXvheC+I/hkfDp6F70?= =?us-ascii?Q?a0rnYVDjfuzveZt8gcn0m0rF7ubKLi+rckFyjnVkZWhJ5hNADo0C/wLS46v4?= =?us-ascii?Q?hu+G4oeTTo5hnQ7HUj3zfZ9whOgvxI+P4UEOIDZxfmpuTDzdJrrTbXBZHZW4?= =?us-ascii?Q?/WAKTERwNSTaFGfsR/9tzAt9ZBTVu1DbAwRtg1NeoCZqdRMlkQvOlWveweVq?= =?us-ascii?Q?NNxJqY3TNPHL7kX4THpQCZhLO53l1vZcvnI8pef6An7bweTybkwcJhSexD2I?= =?us-ascii?Q?Wrkg9zWSYATGfHXF3jilzo8NHzdMjHu5XCuUgRXSDUIcCFjSlwbha7sM9vf6?= =?us-ascii?Q?RElymPqOft5ouKf+r2NN906RAw4zElSkkTU+6ndbJVVOnaGBIgtpXM1MiT/B?= =?us-ascii?Q?l4M5M0Up8jxgQiHgBDOnmlsE8OyybouTrXjQiMdmPvIwprnPayRIY8Kxb6nw?= =?us-ascii?Q?UyMOLysR85D7nI6M5NsbhEJ9oFzJntHbdC01aGC0MsRFXk07zn+OoFy+3WGD?= =?us-ascii?Q?VGsVWrTteO6u44B26aWTg3vkZ7nPJflopGr6RWX8FzlolFLBmezJzPGnaZHs?= =?us-ascii?Q?T8ESOKdLGljGX4NNfwIVgpeqw0eyk19XSijnT1iG?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39db83b5-dff7-48c5-4bb0-08db87406f27 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:38:21.7366 (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: 7Ykftp0YxgoopZ3QhtaxyFN9BxbVrgTcjuvCfN7FtWk2/jD9iz/0xmw5g4QNfAt+WI7+XH1FIQ2CXwLphcQWuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" This patch adds the bpf_stale scheduler test: test_stale(). Use sysctl to set net.mptcp.scheduler to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR_2 to PM netlink. Send data and check bytes_sent of 'ss' output after it to make sure the data has been only sent on ADDR_1 since ADDR_2 is set as stale. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 30fcc82b10ed..c6aa34f3a0d7 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -11,6 +11,7 @@ #include "mptcp_bpf_bkup.skel.h" #include "mptcp_bpf_rr.skel.h" #include "mptcp_bpf_red.skel.h" +#include "mptcp_bpf_stale.skel.h" =20 char NS_TEST[32]; =20 @@ -489,6 +490,41 @@ static void test_red(void) mptcp_bpf_red__destroy(red_skel); } =20 +static void test_stale(void) +{ + struct mptcp_bpf_stale *stale_skel; + int server_fd, client_fd; + struct nstoken *nstoken; + struct bpf_link *link; + + stale_skel =3D mptcp_bpf_stale__open_and_load(); + if (!ASSERT_OK_PTR(stale_skel, "bpf_stale__open_and_load")) + return; + + link =3D bpf_map__attach_struct_ops(stale_skel->maps.stale); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_stale__destroy(stale_skel); + return; + } + + nstoken =3D sched_init("subflow", "bpf_stale"); + if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_stale")) + goto fail; + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); + client_fd =3D connect_to_fd(server_fd, 0); + + send_data(server_fd, client_fd, "bpf_stale"); + ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr_1"); + ASSERT_GT(has_bytes_sent(ADDR_2), 0, "has_bytes_sent addr_2"); + + close(client_fd); + close(server_fd); +fail: + cleanup_netns(nstoken); + bpf_link__destroy(link); + mptcp_bpf_stale__destroy(stale_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -503,4 +539,6 @@ void test_mptcp(void) test_rr(); if (test__start_subtest("red")) test_red(); + if (test__start_subtest("stale")) + test_stale(); } --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2049.outbound.protection.outlook.com [40.107.13.49]) (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 7DE4517CE for ; Tue, 18 Jul 2023 03:38:31 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FuvcOtLKkHVkTx6xOhMYh2WKLCjzQuFQnO3yWQbqeHTO7HuN4o4qQFbtZQwiYI06JnKDxBI4oWiLr6J/rZV0+L7FpIwoim1fa5a4gsPhD5sdo1GvhDkHZlKOUVf7ZdZPiUyxNVTq1dF59RTZUZmf23LUbc1DqCi828nD6We5jqbCv3gqy4AfYmdPrgrVxHae6RczCxFRrn7pqX0VeaYN1QgYebwl6XuPtJw+AkbO60T0vo4rGa7H1iA1Cz8zooTX9UbqvJK9U6H64DXKjFQhHRhtkm+lP5tei7HjsYP4HcQf2UKH4S0jXTQIyu4B0w0FeVlniHGRZJahgfGent7FQg== 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=YuRvueZ8sKpYCu7a7padwGFLfSXFOwn3fywTLimydMc=; b=TCUagZmg4h41VAU3rEjcOWQfNBB4M+AEyLHaIjpoDW2TK3lrDR3ECITvRLoJorVC63UDpPugrJ0fW/RE17qj4TDgq55pbxGFMFoYpdgxkCrIPKYshkbZpSjfTVpn5jIq6jFIloA5G+FRN8EWrKySJ+wd8A3PskeQFSMHP6piFQGYv3eyTdueCRmqOUHCqL75cfC96Yzs4cOKExSMQuBGCjjEtqFXCQXGoZKqBuN2AegZWihdXvm2o3qyVuxOFatj87Z26k2oBe6z5oYClwImt04IsDyikHKyI4+HcWmLP1gCOYvctmZkJ151U7juJVBIzagYq7x4+reklYn9eeg+CA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YuRvueZ8sKpYCu7a7padwGFLfSXFOwn3fywTLimydMc=; b=mKmZ1FWX9xIPr4bqriJeMvPId8yAqGP/SkTPnPn4wOS1Cta158St1HI8x+NfLJ8uuXcsEUDa4RsuBhQ2elpLrRCA8AXlsaLgsh3i4d4pKsNTpHG6v/IPwO7FwF0zncFG5G/55DuCcKH3M5jM6xCCIIqBRX1kJF+3S+AJhqjxPertxNzXOgu1WH61SYbQ1hu+JfoIenSHSuSm54ryqBt4VQK6l07zeg5miMwLZKmbBbuuoUx7szFmTM5K+NYx2W2zO9hmKJMc0ihg0NB+Ahe/x6QX6kMZ7/VpnI56E/zIuWIzkBr+K9ZfNg+ykunSRRtqfVNPm/qdZMWv/1mmjWf/7w== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:38:28 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:38:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 11/13] bpf: Export more bpf_burst related functions Date: Tue, 18 Jul 2023 11:36:48 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0005.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::17) 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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c77deed-195b-4f4b-a380-08db87407342 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HVp9y5SJw1ynYdpNyvL4M/peGBeL/3MR3nQbTetG1V0VLpEzLL21aJOMxYQ770b+VHeNySP8niRpkuQsm60U0nZQBCgslXQ43DkC6p1ykA+5oKjW9Nb1GLH8f180jX7Z2Pv2g6IUeUiyP9Keeyt3DEHwDrlwTb3YocmRM04mqY/nONNeAgbMosHDJnF4MjK1pSRzbcyIVU04LtKyi1IKUvym9gwlcPR4AjGNny0CyjmzRZWOvQ+ieoFrZfuPZ3eia69U3GQoBvLkLVuMuz2kMhCzZAqo1ukpAgF/6KBJn5xA9RhRgJul2sAyGWPhyXs5TyZy+j4Gn8VxlLPbfylytSD/yDHswke0l6YaNAVINaQQFGzJGrBL+b1u7y9moIQKorvr1eDY1CTgFWwcWipZh88HYqqMpTKjDQvStLwv+SMsZe89O3MNbJDrjLr6Vaw6i4HOTAIpqCce4XaNlf7yfRdcAxtGkCHf9aWo5vVlJapcmLkl/PxXBTWybGePdpZ+QbcIMK7pXAAdmLDs1yP92ipAdwRQwWnaaL7ihSMG2s0B3DMQygGNq3wpS3NGRsaDsLdDVr0tU79zmXYy7FnVQDFx5BPqCW6n+5GAPuwh7SU= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ivm5wJHnDHbP+/Yf9SgS2GrTgyGQn+Q2YgwC/+0jE8bZOx/XAXd9TxTNOXlU?= =?us-ascii?Q?MVY/y9l9qMh7WRckuYbzVNhMLd1GT9YxOBNDD4TJA7XJzZKjWCs7JyzBA06F?= =?us-ascii?Q?k/+lva1WhlQPhuHkuRjit7RH6R2wrZnCWrWfo6LNiymXobbCw0+IGc5IGMS0?= =?us-ascii?Q?8rFKw7gKkk/nh6bS2cpfB/lwHdgV5lfnVSw7qd+bOKV6F/jUtG7sCUwJQNeJ?= =?us-ascii?Q?a5FC/ylmBmxqf7La3Sil4/ZhsNbnYI6bLwwghAmHsQdCCdAp6/gOoUEIp49K?= =?us-ascii?Q?A5nwT/3+59HuFy9CEzkeLNY/MxZuSB2RHgJsEfI+z/I4Bi8jKZw1INqRu5Bq?= =?us-ascii?Q?3jnlTjhIoVesKK0LrAUI/ZpPk84Yyxo75OCZKt1RK5Ha9fii5oupyh0NGKiv?= =?us-ascii?Q?BGjttE6VWgWi4n3JJXtoqyTTjFhxFZOTjrXFU2c3LCxf8A0Tb1AxFwadYc6j?= =?us-ascii?Q?0+2srf2EOwppJ61l35Y3Trhu5RZKe09aDlsq6j5aNSJKI6qzGSc4rOWGNKFC?= =?us-ascii?Q?fh5Ket6NdON2F9vdQsJZrZrzND56iLa4IhsadNYaz0XVqQpAi3k33ARvrbu6?= =?us-ascii?Q?4PdkmuMGx2wVrVOM3LBkzxRaLQEoACQZZTTW7XDhvsKblzWtbMnLjah5xTnc?= =?us-ascii?Q?apM/XJbAVFZFmU3yiCIq1IrqgZhsEbmDvPln0ete3FwjXf56B8aqz07tuALI?= =?us-ascii?Q?eiEz3SeZHPWH4AvX78SACMNEdsC1EXQLg3YcUAmd84jNEyzDUkKa7KbcqEBR?= =?us-ascii?Q?BLYVRonDHJJ6amPjY7l6xkpzrgD3rphhFqkC76JZ0nQ32qKieIH9iXAMqHit?= =?us-ascii?Q?1zy3B2RA+K6RjS9CctlrS7Uuw+AHhagqZkuQupm8xTMWAlE+bFvxBolZax/O?= =?us-ascii?Q?fSiL6cS6ElT/+fiM/H5uoaWUcwwRCp2ziuVoQ+Kh+A7iCoUnr4qMXtyPTOtS?= =?us-ascii?Q?nO/qksL+Cpq6zx9phoZt0KVUR+VyyBEcJIyKexyoHXon9QEAd6T6anYpVvKG?= =?us-ascii?Q?8CQx/z0J/9QjK8EI8+x0RtCqlmjt140qGTiTDd/hUmGrWEbdNLYzaMYLavJD?= =?us-ascii?Q?GPadAGpRqU9gz0pW+Dpeb9Sz1hB8YJmpu6Kw9FYtbeyo6Xe5o0TM0fcU6Pzz?= =?us-ascii?Q?uU94nfDiWB5sjie7NnYW5Z3aK1kUwBR9+ShyIUBZ3uiO4/9mk7hf4V1Sqdbd?= =?us-ascii?Q?yHWzOhXZjR2GIEHCjCxHXaaQQkAWuMHn7up2czod6XTCkSqs6e6VPNh1Kjes?= =?us-ascii?Q?b3ORNZHYskTlPuvsjkt7ZkEDhbsEKHHxCkL71rykNZYN0mhg1ye5DgNUFPZL?= =?us-ascii?Q?l5hNj2IaFoabrzI/nlp/fWBC+7mTxrvy28xD6CfgazXGabxSfPHf+a6eswfj?= =?us-ascii?Q?httqx2OKL83vN1yCGFumNnFUQp5LeOMMtLYmilJBfcOAX2TegQDVnlBGbX0l?= =?us-ascii?Q?3118j0sN8LF9e69NDgjoaJYTfTSuWEqn1l89AsbeQsNgzebpPF9UAN+RRTdc?= =?us-ascii?Q?qlZA+115p6JnTSODuZ11WazaQO7OnhIDSsvC0I3c1RwrWDOHTaSjz4DZhAcv?= =?us-ascii?Q?dNnZq9YOc+sqavXc4RY4CLNm3k0zJnZWt9p/iedw?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c77deed-195b-4f4b-a380-08db87407342 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:38:28.7527 (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: DXMe+SYGe6CMO812DMZ5lpYqig/rMxAy19qo2KAlRSyWM7YLZTeQfzsJzzcZikXDZPr6pa1dki7nuws3jk6ilQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" sk_stream_memory_free() and tcp_rtx_and_write_queues_empty() are needed to export into the BPF context for bpf_burst scheduler. But these two functions are inline ones. So this patch added two wrappers for them, and export the wrappers in the BPF context. Add more bpf_burst related functions into bpf_mptcp_sched_kfunc_set to make sure these helpers can be accessed from the BPF context. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/bpf.c | 16 ++++++++++++++++ net/mptcp/protocol.c | 4 ++-- net/mptcp/protocol.h | 4 ++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index e6f94d5e22fb..12b747813dee 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -144,11 +144,27 @@ struct bpf_struct_ops bpf_mptcp_sched_ops =3D { .name =3D "mptcp_sched_ops", }; =20 +bool bpf_mptcp_subflow_memory_free(const struct sock *sk) +{ + return sk_stream_memory_free(sk); +} + +bool bpf_mptcp_subflow_queues_empty(const struct sock *sk) +{ + return tcp_rtx_and_write_queues_empty(sk); +} + BTF_SET8_START(bpf_mptcp_sched_kfunc_ids) BTF_ID_FLAGS(func, mptcp_subflow_set_scheduled) BTF_ID_FLAGS(func, mptcp_subflow_set_stale) BTF_ID_FLAGS(func, mptcp_sched_data_set_contexts) BTF_ID_FLAGS(func, mptcp_subflow_ctx_by_pos) +BTF_ID_FLAGS(func, mptcp_subflow_active) +BTF_ID_FLAGS(func, mptcp_set_timeout) +BTF_ID_FLAGS(func, mptcp_wnd_end) +BTF_ID_FLAGS(func, bpf_mptcp_subflow_memory_free) +BTF_ID_FLAGS(func, bpf_mptcp_subflow_queues_empty) +BTF_ID_FLAGS(func, mptcp_pm_subflow_chk_stale) BTF_SET8_END(bpf_mptcp_sched_kfunc_ids) =20 static const struct btf_kfunc_id_set bpf_mptcp_sched_kfunc_set =3D { diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9f00a0288a0a..b4218108f17f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -50,7 +50,7 @@ DEFINE_PER_CPU(struct mptcp_delegated_action, mptcp_deleg= ated_actions); static struct net_device mptcp_napi_dev; =20 /* Returns end sequence number of the receiver's advertised window */ -static u64 mptcp_wnd_end(const struct mptcp_sock *msk) +u64 mptcp_wnd_end(const struct mptcp_sock *msk) { return READ_ONCE(msk->wnd_end); } @@ -494,7 +494,7 @@ static long mptcp_timeout_from_subflow(const struct mpt= cp_subflow_context *subfl inet_csk(ssk)->icsk_timeout - jiffies : 0; } =20 -static void mptcp_set_timeout(struct sock *sk) +void mptcp_set_timeout(struct sock *sk) { struct mptcp_subflow_context *subflow; long tout =3D 0; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 78b3beeb7d7a..cabda60f5f76 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -635,6 +635,10 @@ void __mptcp_subflow_send_ack(struct sock *ssk); void mptcp_subflow_reset(struct sock *ssk); void mptcp_subflow_queue_clean(struct sock *sk, struct sock *ssk); void mptcp_sock_graft(struct sock *sk, struct socket *parent); +u64 mptcp_wnd_end(const struct mptcp_sock *msk); +void mptcp_set_timeout(struct sock *sk); +bool bpf_mptcp_subflow_memory_free(const struct sock *sk); +bool bpf_mptcp_subflow_queues_empty(const struct sock *sk); struct sock *__mptcp_nmpc_sk(struct mptcp_sock *msk); bool __mptcp_close(struct sock *sk, long timeout); void mptcp_cancel_work(struct sock *sk); --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2079.outbound.protection.outlook.com [40.107.13.79]) (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 2330417CE for ; Tue, 18 Jul 2023 03:38:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hcZF5sq891LjU1Xpj3K2pDP0JjNkwf8/NsGCKbX7eVVKtxvi/OfOLt6XCrHm5vgXNqf2tQ0KRElR+B4W5vH6QovVi8vCdtOaD0sy7vtchbMR7yHUB5fFVGooEyrpPMSzn3p079ONJnB4RBesChgXmY5IdxzqkEfOp2Oh4r7zbRl4Zn05YUNjI67iO272qXuj3aPLNxi0VPtDYLNAxLn+j01XSmS9Fw1638Ik1ZKg5j2YcfVqZI8J42aAqJ6bSsLlvqFcT56zM2SOWPgF3cw3QhdX3EWsJGzuouuf0U5WYmFpkdUwlHNyDG87htS7nsLBKAHropnyio+IpA43aI1GLg== 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=pE7ZxTGsDMpJ+Xq2HU6y7lVTLwPGepeh82t1mev76DQ=; b=mzbHk9kMbAs8uNx+qi0fb2jevsKHkMX7D4cnpLd7ejYQYdKCJcfbS7+6v5zTAXgBc1ZupFUvdFzK1ZCuZ/RT9QaBlRyS5+hh1h3HfECowoVZO7CaeltLELv/7sKrC+QUt5Juz7A1CG/zRQ6NYOlqnO/n8oZ7BKSDYGb2675HyNRKvfgqF4eeN9+vAc91nMowD53oYY1th//a/tIJsn4ZDhs7zm95pe1TR3Sxz+TN7kOGDDfR63gxqSO0V3PbMondvcOKzadZUrlgavGqJgr2eo5kF+l0ZHFBbyIrEk8L05BVsxJX0gDULnLZHiZAUIkE56EfgacJG+snKoPC3/fP0w== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pE7ZxTGsDMpJ+Xq2HU6y7lVTLwPGepeh82t1mev76DQ=; b=CH8qeoe8t94/iqj/a5w71tdYuONE/YEDWO7G9wfq9lscRqho1JCcAVtbppKBuSILsk76zh8Q9tFtu/CET2WFrs8b4qvq1AGxG//HOHPIcW6DIRG8HqD1w5T/ggvlgCTLbZQs3yhGJDLcYLS/xxzdW70+JzHxdeMV0xGXIzqRdHpHN1MCoa6QA8MxUdwnEsNI7HWTC9Tq0UU/jXbZLiRpIuF+LtYv52tQKrLVWJPoZGEKEM6PPgp48wbP5GtiRSSQwg8jb8NhvQn+7WXuUa01ZQ6qIp1gOmBytSToG/DkwU9a8pKdwN6+OeTjsSFo/BwSAUczgo/FpjIcvPds3XGH0w== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:38:35 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:38:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 12/13] selftests/bpf: Add bpf_burst scheduler Date: Tue, 18 Jul 2023 11:36:49 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGAP274CA0014.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: e901a960-4f24-4995-3cd3-08db874076fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DwsEcsaa/qRR56EGy+zyRavfR7KStNC5WARU2ASEBbyB5uCVLlholcgx6i1ARWKz4KMNeooQzlKFgneh6yNwh7ZGUu6YnHPheyyeWnQoaci0cRUieHWQLUa0+TDABG90SyV5Z/ZyMPu4bCLMQw/WqUOSlUubqd/w3ETNqKhqeRs8P0J3CU3pzJUufpM0X6yNLnH5iL9xJFVWdgk/6IYfkLSBwXl1pM4lc0A5zkd6NYLIMuvqrLbT/3bwmmTj/ZpcprXMziSbpkCGeRpimP5UeG3EuZ/jXI0ViB9B/sa3LUwJiprHdNiL263/ChTHVV/k6WRbyT68FcZ+NNB9F7TXptpmhc0H21AXVHA78Qw/Ybe9J26jr2QQEAPK0vDI6RBX8LWP3d0dcLArSjmPi6bw2qFxLoe/2iTiVH7sfa8dtZZkwADrw+ySGwc4g8L/8Y75WOoedygozTZaLI0jo9idJzQLyI4KmKsIfxU3gqj49grYvikc6NHb5kcXShMyjxyfg01tE6eZltavFtasJc+s4TWzRNwqhX6wfyNljzGUVEaWq7hOJ7QMq6Z3uNW2YQ8G5LOpu2Ld2U1FEejEzmqHh+x+jjGUv2ywtrFPX0fKQb0= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?49NnGE6y5Hd36TqzmrOc1xvKpOOMPDVl2j07zMtu9sbINHKGQle1k9zPXUsg?= =?us-ascii?Q?TxmphRSDf2eQ5IWz+5C3YHfFtgsNCZbATrxcc8iHxcb3lfHRgTIDufqg1sfM?= =?us-ascii?Q?Uo1/CAYuepgYkkJPn9rEk/c6SlKC4B1Fn2kW1Y/Fp+BiUuJHHIsA6H8KATIC?= =?us-ascii?Q?0eSQoySIlBalYvfln3oSvjyLYMiD1MCdCTTAZjCb0nf7B8Xdy+VkFULOfUiz?= =?us-ascii?Q?bGzsCx9f0maKnMm+z/abWi419PHWPoWOfTdWnDhdWsiPLS9V9e8AfIMSTkO4?= =?us-ascii?Q?z0nbl3rzU0SEXUiIRN6dY/LMznLe7HCJ0C6Oor37E+QrIje0sTbWnnHmUUD/?= =?us-ascii?Q?diLD/ontZzaRnlYXyd2dhjgVJJxrQB2SZiOqXp7Sw0fRz0Gfmc+3MtkI6waO?= =?us-ascii?Q?5QsvIoqvHoAWcPYzL7Juf17LT18BLRINe5f2HKNEGCrbvjuTDEP2X3G/yDhR?= =?us-ascii?Q?JMn0668o/mKSB9b4xouSf8D2WmEFWZoNGkKrk6+BpNVYQVknHchUoW064Mpp?= =?us-ascii?Q?RJ1PDcpjTlANG2sVq7mwprB/XEnsiq+/a8Ka7hS/2guv5Nub5lKNvfMUCotT?= =?us-ascii?Q?VlrNlcoztdjHhFtJPjT3aKdDEirYZijIQG8W9N9q9WfKmjfr/ZUoIpnXdCM0?= =?us-ascii?Q?LQGVFuOp1ImL8FBQnezYJHdRaAC1MVQ3yOzjVcUUpchR5tr3HvfTT29Qer8d?= =?us-ascii?Q?47qaL0Dzmbt5Zvj99p+CwZpsLFps5QhZ+ebLShERdUz2WrH/GU+EUPLAEdSq?= =?us-ascii?Q?FTptRPVZ276LLknaO4YT3ZLrgal71djQrhaD3MxQ32/CpQa7wnjOuT/IoJNA?= =?us-ascii?Q?tBXeqvbKvk5D4CgUeyu3wSnEFEN+hBCGh5T7BU8JC0b2YYVEj+qpD2VuiRqs?= =?us-ascii?Q?hEKMofHMP3FFY+cWbP5uOvfiKEpUwqzMLiuHJ73kg7GDkzlTzLjsAoyy1mMW?= =?us-ascii?Q?xvv2Tjdxelh5VUIzOmADwKfcAljggw+OoSx4uBn2GSUTyE240F6rXMNWpjhK?= =?us-ascii?Q?wqsrxZaj7fnauQbzxE5Q0ag1zdkqv9N+CVNEKWo86qrzWkCJd3JeBFKTtT1+?= =?us-ascii?Q?zdikm1BTZ/RY5HxXyE8j7BRQd45u8aTfi6dzMtDF2kcV8ic6cotDHEQ8UVlt?= =?us-ascii?Q?71wzv59BvCsdOSm+37UeqjVmkHWWwc/Qgf29rcycY8VehONxAy9xCEf27ngn?= =?us-ascii?Q?bWOCr9L7r80754xqEIMeKv8FgPMc+97hE+WxHxEnuPc2MOdWoay3cSgaRhQ4?= =?us-ascii?Q?gf7++bHNOQbOv0ta1/uaMLRSIbyvzIZfSRtjkE5cjz2NY+40nZg92OPeLNtX?= =?us-ascii?Q?LfQHOWI/46fGeZKbhAHg3LEV7BtH2b+bJX0JBgLcLgwJLEiNmZSPDGVSI5C9?= =?us-ascii?Q?TJLRsGaL1H6Jdpx2eCWvPxY8OSftPRSMJkAn3D6kEd669VXV2EdWy7aHPUax?= =?us-ascii?Q?2yuZR66f49iTP6wc8SrrTHibGbs+/JVVdGNlLaEe2CjFMHfdhymM+zp5CXbn?= =?us-ascii?Q?t8eYQyURs2wHQM2treoZQI3K1Ky4OK9PDdsnK2TrFsud+rzNKWCTr1W8RlVY?= =?us-ascii?Q?LtMBV93dmHcSQo7stvgk4IYYpA2Gcwp15PyPySIF?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e901a960-4f24-4995-3cd3-08db874076fc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:38:34.9660 (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: SXIO5BwJyVFr77VVBUbsXM4c5EmrAiXCU79AcmpYsyDo+iXjIK+YNCkar37wEWB/9IKBZY1UZPN2zgGdoIhS6Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" This patch implements the burst BPF MPTCP scheduler, named bpf_burst, which is the default scheduler in protocol.c. bpf_burst_get_send() uses the same logic as mptcp_subflow_get_send() and bpf_burst_get_retrans uses the same logic as mptcp_subflow_get_retrans(). Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/bpf_tcp_helpers.h | 4 + .../selftests/bpf/progs/mptcp_bpf_burst.c | 197 ++++++++++++++++++ 2 files changed, 201 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/= selftests/bpf/bpf_tcp_helpers.h index c749940c9103..c1d7963c3bc8 100644 --- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h +++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h @@ -36,6 +36,7 @@ enum sk_pacing { struct sock { struct sock_common __sk_common; #define sk_state __sk_common.skc_state + int sk_wmem_queued; unsigned long sk_pacing_rate; __u32 sk_pacing_status; /* see enum sk_pacing */ } __attribute__((preserve_access_index)); @@ -234,8 +235,10 @@ extern void tcp_cong_avoid_ai(struct tcp_sock *tp, __u= 32 w, __u32 acked) __ksym; #define MPTCP_SUBFLOWS_MAX 8 =20 struct mptcp_subflow_context { + unsigned long avg_pacing_rate; __u32 backup : 1, stale : 1; + __u8 stale_count; struct sock *tcp_sock; /* tcp sk backpointer */ } __attribute__((preserve_access_index)); =20 @@ -260,6 +263,7 @@ struct mptcp_sched_ops { struct mptcp_sock { struct inet_connection_sock sk; =20 + __u64 snd_nxt; __u32 token; struct sock *first; char ca_name[TCP_CA_NAME_MAX]; diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c b/tools/te= sting/selftests/bpf/progs/mptcp_bpf_burst.c new file mode 100644 index 000000000000..7af21d03277d --- /dev/null +++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c @@ -0,0 +1,197 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2023, SUSE. */ + +#include +#include +#include "bpf_tcp_helpers.h" + +char _license[] SEC("license") =3D "GPL"; + +struct mptcp_burst_storage { + int snd_burst; +}; + +struct { + __uint(type, BPF_MAP_TYPE_SK_STORAGE); + __uint(map_flags, BPF_F_NO_PREALLOC); + __type(key, int); + __type(value, struct mptcp_burst_storage); +} mptcp_burst_map SEC(".maps"); + +#define MPTCP_SEND_BURST_SIZE 65428 + +struct subflow_send_info { + __u8 subflow_id; + __u64 linger_time; +}; + +static inline __u64 div_u64(__u64 dividend, __u32 divisor) +{ + return dividend / divisor; +} + +extern bool mptcp_subflow_active(struct mptcp_subflow_context *subflow) __= ksym; +extern void mptcp_set_timeout(struct sock *sk) __ksym; +extern __u64 mptcp_wnd_end(const struct mptcp_sock *msk) __ksym; +extern bool bpf_mptcp_subflow_memory_free(const struct sock *sk) __ksym; +extern bool bpf_mptcp_subflow_queues_empty(const struct sock *sk) __ksym; +extern void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struc= t sock *ssk) __ksym; + +#define SSK_MODE_ACTIVE 0 +#define SSK_MODE_BACKUP 1 +#define SSK_MODE_MAX 2 + +SEC("struct_ops/mptcp_sched_burst_init") +void BPF_PROG(mptcp_sched_burst_init, struct mptcp_sock *msk) +{ +} + +SEC("struct_ops/mptcp_sched_burst_release") +void BPF_PROG(mptcp_sched_burst_release, struct mptcp_sock *msk) +{ + bpf_sk_storage_delete(&mptcp_burst_map, msk); +} + +void BPF_STRUCT_OPS(bpf_burst_data_init, struct mptcp_sock *msk, + struct mptcp_sched_data *data) +{ + mptcp_sched_data_set_contexts(msk, data); +} + +static int bpf_burst_get_send(struct mptcp_sock *msk, + const struct mptcp_sched_data *data) +{ + struct subflow_send_info send_info[SSK_MODE_MAX]; + struct mptcp_subflow_context *subflow; + struct sock *sk =3D (struct sock *)msk; + struct mptcp_burst_storage *ptr; + __u32 pace, burst, wmem; + __u64 linger_time; + struct sock *ssk; + int i; + + /* pick the subflow with the lower wmem/wspace ratio */ + for (i =3D 0; i < SSK_MODE_MAX; ++i) { + send_info[i].subflow_id =3D MPTCP_SUBFLOWS_MAX; + send_info[i].linger_time =3D -1; + } + + for (i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { + subflow =3D mptcp_subflow_ctx_by_pos(data, i); + if (!subflow) + break; + + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!mptcp_subflow_active(subflow)) + continue; + + pace =3D subflow->avg_pacing_rate; + if (!pace) { + /* init pacing rate from socket */ + subflow->avg_pacing_rate =3D ssk->sk_pacing_rate; + pace =3D subflow->avg_pacing_rate; + if (!pace) + continue; + } + + linger_time =3D div_u64((__u64)ssk->sk_wmem_queued << 32, pace); + if (linger_time < send_info[subflow->backup].linger_time) { + send_info[subflow->backup].subflow_id =3D i; + send_info[subflow->backup].linger_time =3D linger_time; + } + } + mptcp_set_timeout(sk); + + /* pick the best backup if no other subflow is active */ + if (send_info[SSK_MODE_ACTIVE].subflow_id =3D=3D MPTCP_SUBFLOWS_MAX) + send_info[SSK_MODE_ACTIVE].subflow_id =3D send_info[SSK_MODE_BACKUP].sub= flow_id; + + subflow =3D mptcp_subflow_ctx_by_pos(data, send_info[SSK_MODE_ACTIVE].sub= flow_id); + if (!subflow) + return -1; + ssk =3D mptcp_subflow_tcp_sock(subflow); + if (!ssk || !bpf_mptcp_subflow_memory_free(ssk)) + return -1; + + burst =3D min(MPTCP_SEND_BURST_SIZE, mptcp_wnd_end(msk) - msk->snd_nxt); + wmem =3D ssk->sk_wmem_queued; + if (!burst) + goto out; + + subflow->avg_pacing_rate =3D div_u64((__u64)subflow->avg_pacing_rate * wm= em + + ssk->sk_pacing_rate * burst, + burst + wmem); + ptr =3D bpf_sk_storage_get(&mptcp_burst_map, msk, 0, + BPF_LOCAL_STORAGE_GET_F_CREATE); + if (ptr) + ptr->snd_burst =3D burst; + +out: + mptcp_subflow_set_scheduled(subflow, true); + return 0; +} + +static int bpf_burst_get_retrans(struct mptcp_sock *msk, + const struct mptcp_sched_data *data) +{ + int backup =3D MPTCP_SUBFLOWS_MAX, pick =3D MPTCP_SUBFLOWS_MAX, subflow_i= d; + struct mptcp_subflow_context *subflow; + int min_stale_count =3D INT_MAX; + struct sock *ssk; + + for (int i =3D 0; i < data->subflows && i < MPTCP_SUBFLOWS_MAX; i++) { + subflow =3D mptcp_subflow_ctx_by_pos(data, i); + if (!subflow) + break; + + if (!mptcp_subflow_active(subflow)) + continue; + + ssk =3D mptcp_subflow_tcp_sock(subflow); + /* still data outstanding at TCP level? skip this */ + if (!bpf_mptcp_subflow_queues_empty(ssk)) { + mptcp_pm_subflow_chk_stale(msk, ssk); + min_stale_count =3D min(min_stale_count, subflow->stale_count); + continue; + } + + if (subflow->backup) { + if (backup =3D=3D MPTCP_SUBFLOWS_MAX) + backup =3D i; + continue; + } + + if (pick =3D=3D MPTCP_SUBFLOWS_MAX) + pick =3D i; + } + + if (pick < MPTCP_SUBFLOWS_MAX) { + subflow_id =3D pick; + goto out; + } + subflow_id =3D min_stale_count > 1 ? backup : MPTCP_SUBFLOWS_MAX; + +out: + subflow =3D mptcp_subflow_ctx_by_pos(data, subflow_id); + if (!subflow) + return -1; + mptcp_subflow_set_scheduled(subflow, true); + return 0; +} + +int BPF_STRUCT_OPS(bpf_burst_get_subflow, struct mptcp_sock *msk, + const struct mptcp_sched_data *data) +{ + if (data->reinject) + return bpf_burst_get_retrans(msk, data); + return bpf_burst_get_send(msk, data); +} + +SEC(".struct_ops") +struct mptcp_sched_ops burst =3D { + .init =3D (void *)mptcp_sched_burst_init, + .release =3D (void *)mptcp_sched_burst_release, + .data_init =3D (void *)bpf_burst_data_init, + .get_subflow =3D (void *)bpf_burst_get_subflow, + .name =3D "bpf_burst", +}; --=20 2.35.3 From nobody Tue May 21 14:37:01 2024 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2073.outbound.protection.outlook.com [40.107.13.73]) (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 D7C7717CE for ; Tue, 18 Jul 2023 03:38:45 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LWyMT2fJbwr6l9ukpRshb0YaaSZirrUf4hpOUhRKfTsdREEqM1KB7eL/l6HCkMvd/GVsYfNJ0xUJSBYoyNP/7bhTNFlgJt2d8Y9MNCOFLlHckDqEBewPklKnLGQI2vZsetcafS9KxfXlslvpMGe1VYNF1ESIYzCGm68k57a0/BspeV9mwG9JvrSqJkuDlkOvmMwdHAZ63xQt4DNBUV2KmKTUGMEdFeB5pRIgY4Wig2VkjWeZ13u8BjoZg4yMEuX2d2lddDUfnGLfjeAo58kjegtiB9GKcE1h/Hrpc29HEB18S3KWGPQe0JrHQ7BlyymSR9FkpCREsAjrdVVxmMkvrg== 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=XGKd1kVdg4aE5fn0bPrPl6vP4iE+ZEF7I5FpCxMAsvQ=; b=P9UoiYL/LEhO2EGN1aUW54iwiOAnlL1R/2DNgE1/Ju2Qekhnjd4A0iq94ZKJteg2KNEla6RLvRyPLySDaTrLGKnHutQPkrwAnl60OXGFgU9lUrRNEra6bMTWscMq+g2Uw1lK1hdK6kfOyHgtv/4Irfo3m33vZAwMvElgDPp47ORkRSsGFkMTkElZd8RqbbgGB+u4LzKq+uVM5dYuoz2pOsmZnYI1/iJxjGjvMn8C33Hc9CmowAK7EFXkRAjYnPJnKk2NVPA+cCQEpTtHFRflx896NoSTvyY3q6NyKB7aLzdoUeuStybuvKAh1d3ZZCeSQNaki/CHzHH3o32P+6XFkg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XGKd1kVdg4aE5fn0bPrPl6vP4iE+ZEF7I5FpCxMAsvQ=; b=jqlJtZbwAQXuZ603Xf3gGA9jmJHYDmE+ajT6mZ5wj00R2aHxs3nDCbh3P/EgGBmKGKCWyGmBq6ZqSKCpsbH5oAqzW/UuIMSt1YPdM5p+nv+T7Ti8OobEW+oSPChHvyigkrmFDAwBpGgWZJ1qnp2VgbPA+D9XGDs2uKUzwjWOEB0xl27vY6hMB9pmeXIN1yynkNSKO2lAV8RzWYbXfrd0bzb92X5/63OBLknF5EKzP/FGyNnPGqahf4eNgEkfHVlnsdT6DWaBNHJLole8LzeegsIf/Ou3Biu/1MEwt1xD9kFRTYmEstQXJ6eiT5sOZESKTghPiDdbYRNFdTc7KxTFLA== 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 PAXPR04MB9105.eurprd04.prod.outlook.com (2603:10a6:102:225::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.33; Tue, 18 Jul 2023 03:38:43 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f397:e53b:9707:1266%4]) with mapi id 15.20.6588.028; Tue, 18 Jul 2023 03:38:43 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 13/13] selftests/bpf: Add bpf_burst test Date: Tue, 18 Jul 2023 11:36:50 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0206.apcprd06.prod.outlook.com (2603:1096:4:68::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB9105:EE_ X-MS-Office365-Filtering-Correlation-Id: fa7b7c5b-2731-4560-5f5c-08db87407be9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wZSd4m+U0vfcr0XVwEVHL+F296jkQFBcshvJ0HkSvX6CLSKTx7Lkqr0SRn8qzUejVruW8ZnV3yWmdS4vYt/CTJXvIQBLRvUOChyiq6TZ2QHCFlY7L7WLLUy8vb7amNJBCTm2Q3CvfHjrNc98fa6GR+FTxtjj8O5y2/EDMJO0WAnuMYmIG8Jpig47hMnNXQVCI+puK9OE9RBapAHUtSESFRcBhEB09ql80d/S0yULbOUto8mlcmTNDnrW4nZJTiw3yq49IZC0uFaMjIp1tEeMap0IuOiqVbf/3nsV33zJKQewZRwdbAl7de2mGRtz9+USdyYJKGcfJ8HjZpGetmEUfhB5HC9aao8UF2K0C1eog7mVDe9A4ZRoOUWQx33Id8BEZY10+L9rZOTqMJ7VPWTFUqPer3iXm0ER78pd63PTenhR7Ws4wtI32mjmHUeKtCVv4gU2K2ixLN2U8tnq3OwRiBupIXdioFQZrHRcp0C4UBIx80OmtK+2xr7OwiNa3buokC0b/c4WdUZMvnXllW/AwSanGxiDhDzpDf3bFUM6ESqBAAzp5rCnJ9aFVpek99XWiTPrdcn6MGJIUY2j6WIxnZWyk1Gow9QDKxq7o44gjLc= 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:(13230028)(346002)(136003)(39860400002)(376002)(396003)(366004)(451199021)(107886003)(38100700002)(8936002)(8676002)(83380400001)(36756003)(2616005)(2906002)(6506007)(26005)(5660300002)(186003)(86362001)(44832011)(316002)(6486002)(6666004)(4326008)(6916009)(66946007)(66556008)(66476007)(478600001)(6512007)(41300700001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?adKM80YRBznf7MUD46D14cDwHVD2eSI41kywji7r90ErdKERm4qI8v+gQkHE?= =?us-ascii?Q?y49nTfU7f+l/h1LUREo/oxEM1P20KQbBTyfXYa0hrKQNxlHRovx0wLQvnAl8?= =?us-ascii?Q?bhipco1Brq4cZTbwZR2PxG4zWzdMtXXYIqhhT8viiLMyY86nPtLGdnC6hmi6?= =?us-ascii?Q?g2V022HyfaOhqVMIN/3zgIG2ZUr1OCWcJrDbCLuh+7fBmp1argi6U/LgzrTf?= =?us-ascii?Q?lfwLrNXT4r0Fzasm+6NPJyrlcEO3PN4IbLL2FfpDNEIDpK2TNaMYavtDYDD9?= =?us-ascii?Q?v1f0RWRIIeAD+qHvf7yrAw8YdUdVcELKVETcGzBhciTwYl7C1H/gkAh6tXIE?= =?us-ascii?Q?tolc/ucGd2ahakUHoYr7YoApbTd80vvnRqjwCnPvQWPcS55SRMVP1CfusHUM?= =?us-ascii?Q?X+JVTQCMnwQCnJfkpf4OU935JKQ3ssXnx1d6DDq5rrxbOPmoY4RRWvWsQp3B?= =?us-ascii?Q?IhGuHXtNRRbvArYq0LJfKtKRqxZ1GaM+eGMc2L5s0t+sDF+wOcPc9GE76YcG?= =?us-ascii?Q?q3rdIW6x1dZKadaayLXeR/4tqJr5b0Ab3E/Ftz4t+M4F4vWUGAywijF+8U27?= =?us-ascii?Q?4FixlFKkfe3LCdpJqQvp8a3QoXhmw/y6giw85evYF5vFUPi5RW3qLuYnijNM?= =?us-ascii?Q?Ov55JJIjvSl8KKSjIMUei4Mvwa+5oe6/UskKrxrKhY8uC8KKdDISmBlLHd4r?= =?us-ascii?Q?6/8ZSjo7/3+Cn1NSyqYgPmANJ+mLLnW8i244ccJRv4USPDRaeyobkS1+uJ6n?= =?us-ascii?Q?+kvtKxd+BmfhTTkApxPA0p0nHTht4v9O5YM86LxuNwyF7xBklCQgBwXjn7mu?= =?us-ascii?Q?4WZ84X618SIUpOwK2RN6ifM5aiNdaMp0k49W4VmEl6DumURaxo6fjFa1Kbh8?= =?us-ascii?Q?kVnFYEhcsZC5rmecBVV/iQVM9T9m8uTX3JIcvKLwQT01AAo9GcmTJFN4Pxzi?= =?us-ascii?Q?TtKu3NDX9DKYteFbDpDmtJF/2viyVQOsJ0qC35tfLbLRM0Jf9HAs+csmOJ9o?= =?us-ascii?Q?yDnSS4Y7lvPHanrFuoLoGk/rKMNEVEz4UGT+6oKDA6vQ5vzExBaRemPaQdY0?= =?us-ascii?Q?b1nugQWBgRcp12+TN52JrIb3RS8NZXHtG8FFX6zb0q6JpaUOphpi6ZgQq9wV?= =?us-ascii?Q?4oOeQXdfk/MubqVhj6MyT9cjDre57i4yRldAANcHIHORHSz4cj72E3dneEJZ?= =?us-ascii?Q?+CvnsqYvg2SKsiELdXjaFpQU3s9dzQlTobGQeqGM8Pe3mLzOn+fF7M90m2Mr?= =?us-ascii?Q?3pWsi8MlkN5WTKK7gkZ12g1f9BVd1RCsm5awU1snSl10GtdByznSR29ultQ0?= =?us-ascii?Q?tkTiFaE0ljqXxmeSXxReOSISAltOX0Iga1CVcKPkSY/ffgwHTd1k1ZypPXcL?= =?us-ascii?Q?fLyXy7aHIcAQaJTqwnPpSER1C/rZ5acT7/VaIm30Lv6FD7/SXumA/zY0OwvX?= =?us-ascii?Q?e6EeL3q6YvpvzSVhsGXaLJ1rkp9hAQObUjY/R8KdppvVua5zgdSOXX6/X+un?= =?us-ascii?Q?Q4oadCTwNp/e2KoQg2TykW7cHoc+MD8NouYGxse+bAXeWrkJFcWAl0WeArH5?= =?us-ascii?Q?mBwYN3XxEk3iZojZaIn4iDaewSoAOiTfGqxrXQmm?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa7b7c5b-2731-4560-5f5c-08db87407be9 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2023 03:38:43.0727 (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: mtQspL0mOF8XiGuMfEljvyHDfxKDrAujTwhr510dF2WlLOEkLYVUx+PYOkqGZIC/9aRkEs//8XufGinG/+kjPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9105 Content-Type: text/plain; charset="utf-8" This patch adds the burst BPF MPTCP scheduler test: test_burst(). Use sysctl to set net.mptcp.scheduler to use this sched. Add two veth net devices to simulate the multiple addresses case. Use 'ip mptcp endpoint' command to add the new endpoint ADDR_2 to PM netlink. Send data and check bytes_sent of 'ss' output after it to make sure the data has been sent on both net devices. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index c6aa34f3a0d7..1be15973880e 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -12,6 +12,7 @@ #include "mptcp_bpf_rr.skel.h" #include "mptcp_bpf_red.skel.h" #include "mptcp_bpf_stale.skel.h" +#include "mptcp_bpf_burst.skel.h" =20 char NS_TEST[32]; =20 @@ -525,6 +526,41 @@ static void test_stale(void) mptcp_bpf_stale__destroy(stale_skel); } =20 +static void test_burst(void) +{ + struct mptcp_bpf_burst *burst_skel; + int server_fd, client_fd; + struct nstoken *nstoken; + struct bpf_link *link; + + burst_skel =3D mptcp_bpf_burst__open_and_load(); + if (!ASSERT_OK_PTR(burst_skel, "bpf_burst__open_and_load")) + return; + + link =3D bpf_map__attach_struct_ops(burst_skel->maps.burst); + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { + mptcp_bpf_burst__destroy(burst_skel); + return; + } + + nstoken =3D sched_init("subflow", "bpf_burst"); + if (!ASSERT_OK_PTR(nstoken, "sched_init:bpf_burst")) + goto fail; + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0); + client_fd =3D connect_to_fd(server_fd, 0); + + send_data(server_fd, client_fd, "bpf_burst"); + ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1"); + ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2"); + + close(client_fd); + close(server_fd); +fail: + cleanup_netns(nstoken); + bpf_link__destroy(link); + mptcp_bpf_burst__destroy(burst_skel); +} + void test_mptcp(void) { if (test__start_subtest("base")) @@ -541,4 +577,6 @@ void test_mptcp(void) test_red(); if (test__start_subtest("stale")) test_stale(); + if (test__start_subtest("burst")) + test_burst(); } --=20 2.35.3