From nobody Thu Sep 18 06:42:58 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp1193683uab; Mon, 6 Jun 2022 02:38:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCemkVRjF9QjT6+7IPyAyouvPpKOrYI3b2kiYUQl5qbtBiubjWTN605Jj8anNPX1SUCUZy X-Received: by 2002:aa7:82ca:0:b0:51b:cf43:d00a with SMTP id f10-20020aa782ca000000b0051bcf43d00amr20575006pfn.58.1654508285350; Mon, 06 Jun 2022 02:38:05 -0700 (PDT) Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id l7-20020a654487000000b003fbeb81bbe9si20631361pgq.288.2022.06.06.02.38.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2022 02:38:05 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5559-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=nBCGmwas; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5559-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5559-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 53C16280A98 for ; Mon, 6 Jun 2022 09:38:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3A26623C0; Mon, 6 Jun 2022 09:38:03 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E31623BD for ; Mon, 6 Jun 2022 09:38:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654508279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xg5bYFfoMWgJ4Uhr39Efb0QH7UJmjf2Y/6RQtASUfP4=; b=nBCGmwasxdiqsk//h0QrUopgyjmPCggB83TbJ+Je+QxOc/iDEh7eOqat2KLSPf/S6HSgrH asaz+pfrgKsIPv79F+w/aGHg347Nn5CAzUSbQ8lZBJwbAgT84iZ1/fhWK57uzOhApS7FdL UH2IA7OqN+h+vWbaiN0x1DRSUtVgt/s= Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2059.outbound.protection.outlook.com [104.47.1.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-28-aicRdjYzPVKp9cbvjwdybg-1; Mon, 06 Jun 2022 11:37:58 +0200 X-MC-Unique: aicRdjYzPVKp9cbvjwdybg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FYWnCyGy6oVv+INngiC/9ovam4cNNTt3mmVxZIl/D6LEBPjncjlDnH11OIs+QMDR1pkjqSLXDp3tRE4H/FdjHPm9q6rqE4V2Jl7PTIvjfIXIKf3/QTHm3cdV2srZ+Pd8Qk5BpnBIO5fRWSdjh75fqsw/lW52yvR407627RfDEhtFIEyvqmzQJpzA07dRpR1qI15LQxvC/fznnO1DGWbSRj6gqI7EjMQgk9WoROdiZ3+YFa86uk7oJym9Br+asI4aRVBFEaWanPD9y8cpH/iccUOtlBKkDA/d7WLZ3Z+tSEwfQJ2XLs5JNAZrE2JpD/HMXeyBcL5Ozf5qf++XQVmTNA== 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=btYBjrNjwG8DdKdGai1oG1L2GxlOBfErvuIc97hv+fA=; b=g7U8pcBTOf1J6Nw9I+NxnZ5lgu5lRpQiSdVPNoH/KKqDnNoSJmiILYWWmp0ho/1PvhM+6uKCh3x/4sqXIRb3ssFbo8OZHW4SfX4bKqmvvQoII8VBcwgHGvlV3at84Kzr8XgTaAAeND+8AR3QZ/k+kUV5ejX+Ylx8VM04NlKiDFgh6ItxD7KUqE/IJe6aq2oq81/bg1dxLfDCjiL+vUfXi87648DKCGY3Z2F6W7ENyRu5rqbACggNesksntJTW6BN5Zz0HQXRPoMNToEYnxnoDa29kWP/i2Alu+eCWpv4laVV/escsKrtPfq6gRSTgFSW8w4T0y/csUxJPxgmW3/uuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB4751.eurprd04.prod.outlook.com (2603:10a6:803:53::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 09:37:57 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 09:37:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 1/3] Squash to "selftests/bpf: Add bpf_first test" Date: Mon, 6 Jun 2022 17:37:28 +0800 Message-ID: <31119d287afcb67d4ef08e25eeef4805ec70f7df.1654507832.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0186.apcprd01.prod.exchangelabs.com (2603:1096:4:189::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc19d3a4-62f2-419f-5e78-08da47a03d05 X-MS-TrafficTypeDiagnostic: VI1PR04MB4751:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qlvpF1eBbbksx35M8gHU/eaWdppq2XLLeiHfGmD0QG4huh0p5pCkCy7kgtf+XRIoZEXtxlSVKshmrkdS0Jg8ElQl97ISzwVVJoj86DMP2arFVB4FANHQK0lkY0/CFdYjeODXG1Xi0Pu7r2MtGwBrJlElfpzRBLBCxbgOIPjUWE5XYQo5x4xf4Eyq9f3kCs8bnmU1Fqpan9E0Qcp9Y7JZoAMxVH3H8aRlx5TJVt9FN49xLwgJVRPGow8v5agNAFXypdnVR8IP4AW9QnknE89LMikdgHL4UJvB2L1V/Z1FqTLngn6cgzGeRZ6wQc78MtJZTte2WUe8BEYlsJVrJhwPn7HzFv2UZ3P65wrJecqbmrCijyvOHESy3z2ynLBmmfeQysV9m98bWoype4sFVDKWxP/KdM4b7so5mw7HW+8UqFsKjzaV4BnFHm3rw+ufed/0m1DEdYgkEqnE7yb7uia+fWaLmcUiR9u5d6EYXncPAZdDHQOcFXo+DSChqzqfj/BgMl3OO2MMCNbi86eqopHABUVbt3FDZCr2c/uqQMLie2Sz0136AFmuyzOuYchI4q2V0O9eQNAlydEKPpMoI3RGFuBvuH7Ymtw/zh7/NWm55IZGA8gl8n7UCjh1P/yatGd1HjXyt6D4kl7VE4znX/+Y1uss4FsMzUaCDJYPhPHZ2+XWaYHP9FPRNBJDRIbX6KS3 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4326008)(8936002)(8676002)(5660300002)(36756003)(66476007)(66556008)(66946007)(2906002)(44832011)(316002)(6666004)(86362001)(83380400001)(6486002)(508600001)(38100700002)(6512007)(6506007)(26005)(107886003)(186003)(2616005)(6916009)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CxU6yAXtLHNmT75UZ9i9J6zotNI+dTLZxJ9yb4Uj3ncKJ58shPKE6DEhLCwB?= =?us-ascii?Q?Tu3uEZbMiFw33LTVvxzdulTvNrT+XIVMGiJUFMMxmeF+5F1tKtv+U+KM3gvu?= =?us-ascii?Q?lAQFfKb9/IFq6A6RspDHtbGPGy7GZc2qhPnNc+lYNfTn4SFnd9M6LTosWTBE?= =?us-ascii?Q?vVPoUCJkurrirxtrolGwiF6leJgp6M9iwZO1mBHLxWRJwPO0D2BzcgC+D+wP?= =?us-ascii?Q?ti25Ir5RnzCiva3egdCC6aXEOdMmI3BBj7KK8mgiAB5vBEvayP6DbbL4ekCk?= =?us-ascii?Q?8TQQBflUXwLaIFKyah4MssCFdK9qKLM6NBrb1EY7VxWNYay91THHw9pdc5lU?= =?us-ascii?Q?TKRkGN7NBUW5pNM4BFKMumO0ZMMDim7RgtAsA0L/vbdewT0TTJDYKBT9q97W?= =?us-ascii?Q?etbil1qJjIL4YGB/yOndJBeyjDSbUfTpTo6fNP8qtugcNDXaUWkiIW+H/MD8?= =?us-ascii?Q?CI3L0qzZZff0nPkdZCyUbnIJ3DPTabWUnKARY5BW84Y1Ige6UPuM7HziSQHW?= =?us-ascii?Q?hkMgEw8cdJIFwIFIun+7Dyk2fhELl7hF5GR6ueAbsjM5P3+Rw3MydOcjuayB?= =?us-ascii?Q?c15MtfJiGm+Iu8nXpUqk4mMFICUnTMT9Y40dY1Z26He/3UnNHqoBcPnGmlk6?= =?us-ascii?Q?aIxeXYkl/Ziu68dFcceu8vOd+UUYM8gDuaZ/u8nE5n/ko3clH3N7qv9Hmxrh?= =?us-ascii?Q?P7R+TQF5XHv+HVHBUW5ZVYG6ug84pyUuyXXC+N3wfyyW07S+fiqnBDbWrMkR?= =?us-ascii?Q?RKLKP0oGXL8fJ0gSEMRx50cp8S4AYfQ1B2rppbn7pXDu30R5ZMX21Zpn3XfD?= =?us-ascii?Q?O6hIEEbDMYkj3dbVR8Gsz6As1E+Q2lg8OhylIJmJlsmhsKXXCVCT9RJHCdT7?= =?us-ascii?Q?f8dUaRanaFR9kTIpHXVmi6e9QpQ7vJ70nLq41CN6YV7axnsnd4b+IBrz+dNo?= =?us-ascii?Q?kmrJItvehhhFhn+mo5WF+T1oAqr00KqAysL5IoyWIm+VjfZnLWpmO97AJR+I?= =?us-ascii?Q?m3yXElWK31CBa/nea/J3kNr/QkVqYw/yOAAdT0glvEinF/3t/iL0M/d67l9x?= =?us-ascii?Q?YDaybl4MyZK/dlfsitTsWuFGPUNXviZ62fvdJj1E6vPgAEovPzVu7dCDAv0n?= =?us-ascii?Q?fI1LqAq4funWUwloX4T4xvgIG/Gh7QZ5VIbP/V+25NpmSuuLj4YRx0MS8Svc?= =?us-ascii?Q?FdlCx4MaT8D2cV6FDCOjekSjWrKsTJvrivfYUHLkXWlrq0PrBzRwYCPmXUyK?= =?us-ascii?Q?Pk7OFBnrZwGF/l5SbiyuKoc9gtkryWg7dVxMEAsGIS/Cez2oTdSMW+KOEnnR?= =?us-ascii?Q?aHOJ3tQdz/YOHGKdc8NV+rzDAmag3j7Lqo0pw/H7uo9KhPkxESZuQAI+GQgm?= =?us-ascii?Q?udX9zHzSQqqoLgbk1Rv69fxTVBFJiX/TY6yH+T24FtMlcGtzNlhak/Pc1PWC?= =?us-ascii?Q?1beOloOpkZfEKZR52e5WXOMkTHC9WiwWyjiBYUT5hGfh+zNOxjiamwI+r4+D?= =?us-ascii?Q?bVyAjM1oime6iF6L2C2h6TEqgMCxC0MNy42snqyK+/KcWCz/rFqz9CXOVVTk?= =?us-ascii?Q?pr5VD4aUPs81W1mpXpc6YXCJniLUV1h8oasmAzXcc1ubwNtKb7hTkhiMEBmR?= =?us-ascii?Q?Fz1SOHCG7NvPUKlw7LXUsWNBUhOZyjv/SYbiPuDk6lfyPlj9/3nW1T3cM3hc?= =?us-ascii?Q?ASt4KUgwQB9WL0kykiP4NFVSdpG+T1s3ZEwGQ7LiraIlCItUG2cZdFkitDP2?= =?us-ascii?Q?2Aac8oahnv63cOnPtNS+9qEGgNwjUTY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc19d3a4-62f2-419f-5e78-08da47a03d05 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 09:37:57.2166 (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: 8K7xJB5BTGReEY4bJ1reWUTnR3Btb6WOHX/CfQOCeDlh2DEeAT0u9hnj8zbnT56He5DLdWLUX1f8AkvngXgnyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4751 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' This patch expends the MPTCP test base to support MPTCP packet scheduler tests. Add the bpf_first scheduler test in it. In the new helper sched_init(), 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. Use sysctl to set net.mptcp.scheduler to use the given sched. Invoke start_mptcp_server() to start the server on ADDR_1, and invoke connect_to_fd() to connect with the server from the client. Then invoke send_data() to send data. Some code in send_data() is from prog_tests/bpf_tcp_ca.c. Use the new helper has_bytes_sent() to check the bytes_sent filed of 'ss' output after send_data() to make sure no data has been sent on ADDR_2. All data has been sent on the first subflow. Invoke the new helper sched_cleanup() to set back net.mptcp.scheduler to default, flush all mptcp endpoints, and delete the veth net devices. ''' Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 1ecc8a2b76b6..3122279d0b9d 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -14,6 +14,9 @@ #define TCP_CA_NAME_MAX 16 #endif =20 +#define ADDR_1 "10.0.1.1" +#define ADDR_2 "10.0.1.2" + struct mptcp_storage { __u32 invoked; __u32 is_mptcp; @@ -252,20 +255,39 @@ static void send_data(int lfd, int fd) PTR_ERR(thread_ret)); } =20 -static void add_veth(void) +static void sched_init(char *flags, char *sched) { - system("ip link add veth1 type veth"); - system("ip addr add 10.0.1.1/24 dev veth1"); + char cmd[64]; + + system("ip link add veth1 type veth peer name veth2"); + snprintf(cmd, sizeof(cmd), "ip addr add %s/24 dev veth1", ADDR_1); + system(cmd); system("ip link set veth1 up"); + snprintf(cmd, sizeof(cmd), "ip addr add %s/24 dev veth2", ADDR_2); + system(cmd); + system("ip link set veth2 up"); + + snprintf(cmd, sizeof(cmd), "ip mptcp endpoint add %s %s", ADDR_2, flags); + system(cmd); + snprintf(cmd, sizeof(cmd), "sysctl -qw net.mptcp.scheduler=3D%s", sched); + system(cmd); } =20 -static void cleanup(void) +static void sched_cleanup(void) { system("sysctl -qw net.mptcp.scheduler=3Ddefault"); system("ip mptcp endpoint flush"); system("ip link del veth1"); } =20 +static int has_bytes_sent(char *addr) +{ + char cmd[64]; + + snprintf(cmd, sizeof(cmd), "ss -it dst %s | grep -q 'bytes_sent:'", addr); + return system(cmd); +} + static void test_first(void) { struct mptcp_bpf_first *first_skel; @@ -282,18 +304,17 @@ static void test_first(void) return; } =20 - add_veth(); - system("ip mptcp endpoint add 10.0.1.1 subflow"); - system("sysctl -qw net.mptcp.scheduler=3Dbpf_first"); - server_fd =3D start_mptcp_server(AF_INET, NULL, 0, 0); + sched_init("subflow", "bpf_first"); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); client_fd =3D connect_to_fd(server_fd, 0); =20 send_data(server_fd, client_fd); - ASSERT_GT(system("ss -MOenita | grep '10.0.1.1' | grep 'bytes_sent:'"), 0= , "ss"); + 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"); =20 close(client_fd); close(server_fd); - cleanup(); + sched_cleanup(); bpf_link__destroy(link); mptcp_bpf_first__destroy(first_skel); } --=20 2.34.1 From nobody Thu Sep 18 06:42:58 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp1193698uab; Mon, 6 Jun 2022 02:38:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/gckPvWTV7G09kKG2haz8zfUYnylh0xX4n7iUNrcDIGZyM0Cb1f+S5mUOQ1+1HabIwgiw X-Received: by 2002:a05:6870:17a9:b0:fb:4e7d:5b95 with SMTP id r41-20020a05687017a900b000fb4e7d5b95mr2941296oae.286.1654508290393; Mon, 06 Jun 2022 02:38:10 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id g62-20020acab641000000b00326d7fcbb7bsi14945726oif.30.2022.06.06.02.38.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2022 02:38:10 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5560-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=aNuud4uY; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5560-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5560-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 2E64E2E0A06 for ; Mon, 6 Jun 2022 09:38:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E565923C0; Mon, 6 Jun 2022 09:38:08 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 352DF23BD for ; Mon, 6 Jun 2022 09:38:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654508285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XwkqS9PSLhqCLgcCxG/hUYB4/dM8U5lqZKFohpHwfRM=; b=aNuud4uYgZEIbRefBoEQXG8Sqmr2GD+sIWu6pS+1yncpBco3xnRMP9+d7HyQp4RyUeODx7 n/9pLWkUCC5iWn9+j4AjymPxWNOvpi75+4qG6LznXJLck/XpszbxqLAWxD3zzVUGXGaYx1 z9HSzbv60h6AdjJXx+CX2UHMiZqCicU= Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2050.outbound.protection.outlook.com [104.47.1.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-Rmn6qIIBNCqsFjYgg0xjNA-1; Mon, 06 Jun 2022 11:38:04 +0200 X-MC-Unique: Rmn6qIIBNCqsFjYgg0xjNA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AWU7MrmRaxHhteXswyueF31SWm5A8ZhnMKNSG9PLynwnaT3YD7WkdNBOAZL0CY5oEOUPNvG6HlbH/7x5gh6J5xBXAsLYi5+SSyx+ixCSTHnxiaRjexlowg/UTFJCNPGG8KHpcPecnN8PBiVXhz7cyG7y7t7KM4trTS8FGU9EePBwZYXTRDlJNfjIVvskKkrdEqhTxZJaA87zte/cnp5EObUc7Jc/hpJS285c+aO679Ce36Sye6mqRnEOg8hjmLyqMunKOBFZ018EnHTUcI0S6Pio6Zu4EDgzfBJjUpLopLRQAH1hUIA3T9jEh6T7ORoOIlEgM9Rln+bpSO0h05cYEA== 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=sdUZ25v4zFIOIs+cj5BRwYxi67vW3lbmBfPb7D42oIE=; b=CBEOzNp4kbmZZvQG4GqsmFhfDmK4ueuJUlgAC+aOcA0+/vqzG4axXYg1iQbWJUQ9F0QgNw0jC3Dt0IawFt0y/AlwjSmxPyR17LpRuPzfKqrsMWF0/uuzBAv7OQ6aCYBzfQ1aIBeyofSRMo7ngyyCSlKcjacF9KvAE6kaLFdi4EqR/xhJeid+Q84OTGwv63nG6d7SJ/CJCG8zXdUdbuF+KDhBKzwtMY48Cq3E+SVD92pk14v65J+mujLBwGALW88jl8/vGBMWzxIsrcLceowwtUgky1WTUSVXHvPRnpSH0zMUVPIT3XClbgk6X2//YNKusU0PR9a6SzP0nsq8dnJXKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB4751.eurprd04.prod.outlook.com (2603:10a6:803:53::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 09:38:03 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 09:38:03 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 2/3] Squash to "selftests/bpf: Add bpf_bkup test" Date: Mon, 6 Jun 2022 17:37:29 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0194.apcprd01.prod.exchangelabs.com (2603:1096:4:189::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1dd654ba-d7a0-48f9-351f-08da47a0409b X-MS-TrafficTypeDiagnostic: VI1PR04MB4751:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vqItSXcXit7ANLlnR/RnXz6rsZZWWQqYdclBvTgzsJkkavMOGHNgZRyCCMLtQf6F5Ndi+nFieTNC/Vzv323r1K1EbpZgKj9b4DSnxyQpQXJLMpouSiJcoDXqj9BMnb+HoippJcwmy6xe6gS5Nmk8LrOg4GKIOzo9XlHpV5p/jvbV9N5XjRjLysAPWIlDNl5UhekjLc2Gr77fE6AXFM0SqzvGFNOwvASd27Qn6g6c8ffk5ZjJr79DzJuL+5f/EtK61hUqPloBB6Fv3mYNs3gyq79H4VR6blNFhcKf/Nk7yoVnMItTdqi4EIJKgmntUMUsAdsw3xIcBDHYMtLTnhoNal8mYMOlr4hwQFaEM1bmHgBWwmOdZbej5yssHvnKmF2FzwhqSMwjdhnCdnPhxh5MT1fwHvBqknBrBCAs4bX6H05IGzQfPCCE/tV0AkVSfoOshESmExeTNVIzlErmP3diEw6WzZ7/iIEUk9/puRrtc0QupGDuaJaz56Xf0qXc5pCHgMeTwxdn3jKdoZv36eI3OVFcewbOY0OF5J5i/uvmiFkVJa99IEqOX9qOSm2Rvaa64ETIdgjHIB5wmeiTzXkr4l8FNnytax+ymWmo0CA81TFI1Le15X2Rtbh/ET/ngI3IvGnw9PoFZU676KFfZmSCdZRd50/F/WyCD9J+dPR9NpVC5/iFd67MOnTRI2xwhROe2NlSd5Mxzj2s3HDNIY0LAw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4326008)(8936002)(8676002)(5660300002)(36756003)(66476007)(66556008)(66946007)(2906002)(44832011)(316002)(6666004)(86362001)(83380400001)(6486002)(508600001)(38100700002)(6512007)(6506007)(26005)(107886003)(186003)(2616005)(6916009)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IOjLRccmhFo1uiFWkcqz3hGQMHdJwbYewAa7+pMOpshC1GukT0CTay591rNB?= =?us-ascii?Q?p+2rKKEVLqPYK91ZSSpAT2Ou5BYQmQWrgK5Ut7DMbHRVFCHk3CWAMCFtdjYx?= =?us-ascii?Q?haam0oL1yzfRhg2fwJcKrxsJj3nwFKejxliGPoZKj4BWzMGGAW2A4lDS4BMM?= =?us-ascii?Q?ppBfUa1FWSjXiwBTe8VjOumwy6/XHT4rMvHzO3d2ztOo2/WxGRu3DTB1Beyi?= =?us-ascii?Q?ScXaw+KzhkkPC8fUahkqQsqVi7eMZOTY8+DIxLXrxj7vq3IsGnJ0qWSyLpTt?= =?us-ascii?Q?3VjqLVVD0IBEx6EPpaSS3sqVoG/5liTJitvrgkC+YaZRIpMmAa4n9m34aCI5?= =?us-ascii?Q?qAUoNI+Bs8nLi2g1mrbROWjwxxzJxEZev08RW51gsXM3Nc3b+1IE0cVp4Zoc?= =?us-ascii?Q?sUcFcaxIBmPQryU3EqvuwepjLbKzTH02bNZ6LlaZsl3qLDppSTLBxDHrWX0I?= =?us-ascii?Q?8uC6O5Y2xh7NCzV3VAPuLWBChZZb7xPs6ycQfSS2uN/hj1b0WagsH6jr0WHS?= =?us-ascii?Q?boBiUBLRVM3J83ULHl9Fn+uMy1d0Pd1/MY/tmVjId6Mr/Z7i2kJ8skqd9NGh?= =?us-ascii?Q?Byd0HWMnRv5QmbDCNRDuLCXY/dgAs8JBDkH2ABawjJ4sqEvljzyP11YeRjmT?= =?us-ascii?Q?8iASxLSpKnatf+IHxbNh4usBeofCny2WyuDnyXfWqS1DqAavyPi14AubKpBk?= =?us-ascii?Q?jWh4bHmtFc3vY1OnKRYpRNOAcRfN0xUK+uqsKTotvHcd5M2eycXtPnBgzUKj?= =?us-ascii?Q?WsUzm6BfWOBMzAChhTwElXAg8PT+OZOQ8q60puHBSYeR2V+qn6X+eZbb1msv?= =?us-ascii?Q?Wipkyyw95CLl2zgVZLZKHoiwPOElQPLkmp4i8mz/sTf4opc7pDrKnMq5sAOT?= =?us-ascii?Q?Akb49oyG05N0eIaxvIu6AKcLQC+vZmM21rUWDFqrjt0Ew9MvdA2SgX9X2TUg?= =?us-ascii?Q?vxY0dLXukFrX3z6YVW585UMZ71qvYueHsHYl5aEKlBDgNw5OIknVmzEVmcnq?= =?us-ascii?Q?MViL5DjCipYB/10l5qah82raXLGzmKdMw9NO6zyspvWlXOIhpvBWKrjOzZB9?= =?us-ascii?Q?OaqgaA/e4KaS3bxh7MCkrXcmUowlQEM7zW7S+r5+6ZnxRORPuEb2fiaFMDve?= =?us-ascii?Q?4+3tOp2K+KL4skK8OH1aZrEv2+e6tE5OHPAjSs5nKIXyQhtVMROcl2QZEIvp?= =?us-ascii?Q?f3ledvJQvJ8f3+23pLZxa27Zfii5+lpu2l/wGfsVgS4G8pANbyw0xLW2Ljc7?= =?us-ascii?Q?VVvI/FKjo1bpXsYcDl/qeVQDf9UCwcMnaE371OpcZvbO5fqpm0Mlz/ph2HSF?= =?us-ascii?Q?KUP39mJ98U73uiC/VNd8I0HgLkMZ5/2AGlEfsjN7amelKIBJlQwRTqP3LmgS?= =?us-ascii?Q?3/JJx1iLIvCT3msi0ix47yIYVHZ0t7PF5TkgPLP7RTHXVaCTPb0DrDa1dKjf?= =?us-ascii?Q?rhTqk4ZMbuKC9t4YIlxq5IrjLdYRB9gzjVrcy1I2mRlkE3LAP7zDvKZV2Ngr?= =?us-ascii?Q?Gx23e8CCKoARfPdyRLYOT9GhCxU/XxTKW50r8w4V9Sc0kD7i1LQeCEk7Y8fD?= =?us-ascii?Q?bNxeBs92tF1D9qCoVFAueHFvEDKD/s3LzPQVN7LWyGKjfpQLo933mfbTdFaZ?= =?us-ascii?Q?3XsKDG/2zbdNzWbXfv/ivHdJpu6jV+fb1fmbwUNGobHM8zahocYogckrwyTK?= =?us-ascii?Q?Oz8cK7qNYLy/jYYoKGP4b/XHpvC91F554QZpzVwh4SapO66XmQhvzL0XBrEI?= =?us-ascii?Q?fc4nAOU8jfsyDUQuef4evPYVdO1RDkA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1dd654ba-d7a0-48f9-351f-08da47a0409b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 09:38:03.1536 (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: NfCH4GSP5cxHFsJtVVaqdI9aoT4hqkrfvO8Pm4a0Vb+C19aRwTf7lvT/Of5fk3/LXQNZztHPXIUvNS4K/TMPiw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4751 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' This patch adds the backup BPF MPTCP scheduler test: test_bkup(). 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 with backup flag. Send data, check bytes_sent of 'ss' output, and do some cleanups. ''' Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 3122279d0b9d..0fc446c20d72 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -335,18 +335,17 @@ static void test_bkup(void) return; } =20 - add_veth(); - system("ip mptcp endpoint add 10.0.1.1 subflow backup"); - system("sysctl -qw net.mptcp.scheduler=3Dbpf_bkup"); - server_fd =3D start_mptcp_server(AF_INET, NULL, 0, 0); + sched_init("subflow backup", "bpf_bkup"); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); client_fd =3D connect_to_fd(server_fd, 0); =20 send_data(server_fd, client_fd); - ASSERT_GT(system("ss -MOenita | grep '10.0.1.1' | grep 'bytes_sent:'"), 0= , "ss"); + 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"); =20 close(client_fd); close(server_fd); - cleanup(); + sched_cleanup(); bpf_link__destroy(link); mptcp_bpf_bkup__destroy(bkup_skel); } --=20 2.34.1 From nobody Thu Sep 18 06:42:58 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp1193726uab; Mon, 6 Jun 2022 02:38:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdykavCR20qyS2eegY7CdJbpOtyZ9mlRivrLtaXVKUpnP/f/nnIjG/A8TB7N+jfuGkrjwW X-Received: by 2002:a54:438e:0:b0:2ec:ddab:c219 with SMTP id u14-20020a54438e000000b002ecddabc219mr12689388oiv.180.1654508297162; Mon, 06 Jun 2022 02:38:17 -0700 (PDT) Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id s11-20020a056870610b00b000f26a4e2f76si15100184oae.128.2022.06.06.02.38.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2022 02:38:17 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5561-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=QNBydM3a; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-5561-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5561-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id F29582E0A0D for ; Mon, 6 Jun 2022 09:38:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B520223C0; Mon, 6 Jun 2022 09:38:15 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4EE623BD for ; Mon, 6 Jun 2022 09:38:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1654508292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XuvOmWXSWmD0okORzpZRMhcGspdMXihA36GIMe4wZXU=; b=QNBydM3adTDL3S1284p6cpEFtUoJA1PdVdrQLFr7CLH0TAlYhkxBbLgBbwFXVq196ECZyF QRSI5cw8o3F9CY1F4LNi+EfISIqBuCHEfo7uNDd6dBhRIoPZjA/4PBp/OAaE5h96+1upeR OpduHK5izbMysENyV9ysOSP+zDVZ3MM= Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2059.outbound.protection.outlook.com [104.47.1.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-6-oR8hRksGNByy9bl7ezZjew-1; Mon, 06 Jun 2022 11:38:11 +0200 X-MC-Unique: oR8hRksGNByy9bl7ezZjew-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G7EK05O6a336aaIWqzbZqV9jadeboBDQEi9vaG97iCx6EYwzHo1u9yatQVJm5hTdp2peXFGBiVVLy+isvdxqPET5Y5+b8V+Af7BjwwdQkn5yZapfv415F4DGriJix/BtEEJXSnONcCu6vQqx+3vNADwrvaCP8WKI3UaxIsu4Ys0K8UExLgHrOJeqAx6PbgDIT2UTpg3cQvKQYN7ukU2YbOLHIaKE9FIpqmQd9KoVmbbBpxV29rbdmvD6dBUBm4gNZxoGCWmSuV9mi0h7B03dwOhBvCinPswjBhz87h/viZ0lwZdQA57MW1SXexHlpxy1zgP/FFVrfFB93ksGV2b4Gw== 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=pfGcOCS0PNObgQJXcNK/NF/xARDlF7Nw+ndAZ0JNbKw=; b=gD/uz8Mir4+NXkLkB4UC6oUPpGTbwAG/Hfd5TNs2d0h71d2bRkuQf+AP5K9kmeSYtyhTqlP6LVmQitdKD79gdE58VKvcPeNERTwqeTyiqFaMJ9HLTqztrhKjxsaYnp97sg8V/LyHviAfQHLiQP6hAJXvd1yc8uvQS7XBhqDgQIOb29+sLOlAEZrcg++bbl1TU1YzCnOHXvMNUFgs8AmG9jPuqgbkzi9mXhZC4kx32eUljRqrcSIKtcYovx4mmDFKlLG5wT2f324HSUuAj34577Jb9QQs4ZrDuE3YMGOnyXmMN6++tsriwT3eh2rP4g7xvHWERo4D5UiafgxEey35fA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by VI1PR04MB4751.eurprd04.prod.outlook.com (2603:10a6:803:53::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 09:38:10 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 09:38:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 3/3] Squash to "selftests/bpf: Add bpf_rr test" Date: Mon, 6 Jun 2022 17:37:30 +0800 Message-ID: <9c943b559892de4d8c76e38f3fd2622a59cb6f0e.1654507832.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0111.apcprd02.prod.outlook.com (2603:1096:4:92::27) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e14c7e4-7083-418f-8ecf-08da47a04497 X-MS-TrafficTypeDiagnostic: VI1PR04MB4751:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y9ooHkhHJpx2ShkVgUOmaeucoozF2nHLabLci6I45KSnsJGM2FTZ0xMvL9KoPbCQ8AL6xzc2Cj+dup/tXD/cqK1ulD3smfyP9Kfnz+QH+hHbvQGCXyQC8LKZqH//Smhg/y/gQM4a2WmzIcFFHaTnsm1dbYMs+zRrFnO2hCQR4HXtHDQIgY0okcZs+U/A3wRtNgHGBT29Vm03an1/ixJ8K7ylW/EY4i3Gt0Bb4YI/xIXeKutqIRMbUGnnK7J6vl1QiYmPXsZ9k2Zk25hPwDKJhVj13AhlWNCQkB8jaamDK9AWL61BvnIcdhg6mgOuhANReTUrwaG9qxQLXn2ObpQoFAMem0wyJ+/0iL8fEzUCMcZ+VlWVuwrjWZkdu+RxJsGXnxsKJM1XHn//ySYW54aNlMqZIQ5vhnNKPWFrLwEIX3dqZ583MuPTylXPetINH5ZF3zB2WKLEpYZ7SPSP0kouTkVsf25waZaQZNpXqLtNdDAlLbmrYieaqUHacAMFN6n3QtId0+M/ryA3LZ2P+uuJ0KrztvCfTZu42+jrvWQZoZfHpjOhu6TbuMcDlaJ+47MjazZrjcjTgmerrnuPqlZcjiMewyQSy77R3S3TU+FXHe3L/STsCg8fuRgxBz18F8wQv0AborJEdviBgO9hpjDYePAEmFM2IzqOlAS07prgZcPzvm+tP1TOp7P3rvBTOD1jybqTFVbN1Jl0q+vIy51q6g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(4326008)(8936002)(8676002)(5660300002)(36756003)(66476007)(66556008)(66946007)(2906002)(44832011)(316002)(6666004)(86362001)(83380400001)(6486002)(508600001)(38100700002)(6512007)(6506007)(26005)(107886003)(186003)(2616005)(6916009)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+RbcLwd244LtZvAKBp+nPFd2s4MAhX9kiLSmfCPFCXvNLJ/7rZnzOufCIPw7?= =?us-ascii?Q?c4UIRt3QPH6BtMUXUJ/yb/VL1DWJFrCQk11PVQF73KpshAffocBQmTfx5hKO?= =?us-ascii?Q?2x3cat+8lJrrtiO6BnNO7F9TrNUjuV4Pv3rLUDmlma9s7Cdk1ihtRja++h7f?= =?us-ascii?Q?OcaAkaq5ifS1bXHKbsvlmirHd/wwS/shPVYdwGsnwjVSP6GJiL8TyRhVvNW6?= =?us-ascii?Q?uoVtmoAJxDFJy10t+scEe6rncpwWByTDeTSHeEvjSAaLEAjZKxe2Qwc/mFV5?= =?us-ascii?Q?6RIMAKsB1vJY75hQR+uMnqp9/kKS6dMQFaxtGSECrR4hEtaI4QXP4fU+E4zG?= =?us-ascii?Q?2/oIoyyb04h6tSJYU9dsVNMSjabxGoXixg935I7/Bj3HrT9aaeeJ8Zb/Ygbk?= =?us-ascii?Q?6bT7QgzPM4l++YvPKeoXCItULG4KpcE4t3ApqG6H3d3qw6mnDVU/8WcK9SeV?= =?us-ascii?Q?eOIAyH4OvnaevLAoDlXwjhR0LV5pTcNmd+H59ge53PKIBeJg7sjEdi/CMgNS?= =?us-ascii?Q?ErJfX8WkYjbS3xpbTci4kYBLhzGY80JjRaFMmMkhEybT/XF0I/nBGxMGQIeH?= =?us-ascii?Q?9pv8lYmpHfv9/3k5h7+wlpB3yuEqWDlfW03aD9TyZb5n0UkwuAuAqiCh8yMB?= =?us-ascii?Q?CisWEXAQALP0vTfLyOZT68BUBjafmK6SJqrtVbV070IJ9Hs+9tM48FWWNJLB?= =?us-ascii?Q?fY6BXcyTfAU1yZdTlHgRL80OxvG0UgjQgiIl3i58pzB9eQcIe+zf8ZVWbd9/?= =?us-ascii?Q?uJd5CmmuVEdbIB6W/GXxF+4XCxUGCRakYeD/9/GPWRHycWVXSBiwPs2c/vjv?= =?us-ascii?Q?dMkgf1S4Hl0XRp/QdqhAZqb9E3CFwVILITlJyDPl2W1RdKfcoYBuOZk74q1g?= =?us-ascii?Q?JIDJMQIyVleg59gpcd+97+i7BDkUO3WQ5E3rTnMAQIt85dG0HfHtQvjsvEv3?= =?us-ascii?Q?jv2TVw85CwCDfCMDx48SZnmvgGR1EN0c3DovuWq9WAoHF+GlhKEfx043d+Mc?= =?us-ascii?Q?LdGCVG/zJ0+gG7J2DLDVqjF12MzKXmDdKRm2vLznaSqbLGn10P4+Q8e3I7Tc?= =?us-ascii?Q?TH0bPWm1K7+lvtjMZRVHgTcfwaOpuT5pgB9rLCLqGGSHO0RQyORvWm6MJqpS?= =?us-ascii?Q?Bp+UAm7DVJWnIfc3sEj92GlsQLfFlL1mlKhYbst0rWiYq6I8DAs4/3F1dHtn?= =?us-ascii?Q?WsYsGMIiq9cOMY9IDUJyb8RFMbuSVnimwwZpglkcN9dJ8KC2UMwEsDgoL/ps?= =?us-ascii?Q?HYlO3cEqKJdVwepCDuzxNF2nvXBYQQ75rggTnPWeUy3SBbYAhGFua5tSPygL?= =?us-ascii?Q?RUVXXmycVl1UB/F3DLjLjjdeQNP2c/Wes9kTp+Z5f8jvCKSBuOHbRtLf/UBB?= =?us-ascii?Q?HN4zegmMf65Aftktkwfm7HpJaLjmBSVI5zEHeZhNTAAkS3r9fxs2e2eFcUVl?= =?us-ascii?Q?d4RHNZ3JjRpMJSPTt+DqLdPIfeJ/9Cn6ekPMvRcAkWaeDjs4mWLDkfmyTkNV?= =?us-ascii?Q?7N2ycSD7s5ZkUgXA5u45A9iIrWnmVCYUvUdDaEJ7TeeXILWo3Wpu5YeAt8yW?= =?us-ascii?Q?7SX3tM6KpeiVgtWW3eYxtNJTG0PMi7W/Gbai8FUroj+oxcoZGFu6+mPQ8z5X?= =?us-ascii?Q?Y07hbp+0eTpo0SolzZfOfSpzNLILsp52d8zbrKpVdIf5GeeasS4T1ZlAAIdR?= =?us-ascii?Q?ruPWjAM4CcP2DYtIOrxhhYZ2DUVmO3dCRBEqyR/bnh73qSFJdOZL+Vsyw0rz?= =?us-ascii?Q?XqDfGdHvoOshcihJtbQavZhn8i+20/k=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e14c7e4-7083-418f-8ecf-08da47a04497 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 09:38:10.0281 (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: txTpohMtNO428z6YLM69nsHx0JoLoGyw2q7xse8Du15n6qj1aB09i0HOuhONa9xtgyoDQHEtROqzTh3vvBRbJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4751 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' This patch adds the round-robin BPF MPTCP scheduler test: test_rr(). 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 --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 0fc446c20d72..8b2fe1004323 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -366,18 +366,17 @@ static void test_rr(void) return; } =20 - add_veth(); - system("ip mptcp endpoint add 10.0.1.1 subflow"); - system("sysctl -qw net.mptcp.scheduler=3Dbpf_rr"); - server_fd =3D start_mptcp_server(AF_INET, NULL, 0, 0); + sched_init("subflow", "bpf_rr"); + server_fd =3D start_mptcp_server(AF_INET, ADDR_1, 0, 0); client_fd =3D connect_to_fd(server_fd, 0); =20 send_data(server_fd, client_fd); - ASSERT_OK(system("ss -MOenita | grep '10.0.1.1' | grep -q 'bytes_sent:'")= , "ss"); + ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr 1"); + ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr 2"); =20 close(client_fd); close(server_fd); - cleanup(); + sched_cleanup(); bpf_link__destroy(link); mptcp_bpf_rr__destroy(rr_skel); } --=20 2.34.1