From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 AD5A55FBA7 for ; Thu, 28 Mar 2024 09:50:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619415; cv=none; b=neCBQbFz3UIhXLRKnz7Peg99pz0s3yZgJ0VJxWwq9hXFNO0LvSIRdzWkFW3qHiEdd3oJbVusCmgfnSCrlxuDgv479AR5CbfFqU/pmQV6+9xMfdIxd0J+t10WjaBnk2othsbSQhcplaSglqhp1fHGXEdUNydO+DFrFNbT6GmtCz8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619415; c=relaxed/simple; bh=nYOWAU7sfzIVHuhCPmcHon1XQI6uRYZDP32k3/YsPdQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GmvIC8t66/A92PFvknBBm5Qrx81Uc0TepX/OS1PprENZa5KiMLka+GvMrKwUnySgJsxV7X6s6D69DqCZZzGccmK23+7OkOjKFCy/hGAuFVCN2LPfFrumMowypesNERX0MLit9eAyQ3z1nKA/pnu2Fh2bdEhLLXauq0KvSpllkw8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N9wHa5PP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="N9wHa5PP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 843FDC433C7; Thu, 28 Mar 2024 09:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619415; bh=nYOWAU7sfzIVHuhCPmcHon1XQI6uRYZDP32k3/YsPdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N9wHa5PPmnKSRlvLm1N6kssz6qvNT0Qu/V/7w+LK0C0rZFwKgya7qHAx1B9J7gFwY K6kdSa/1EjInQkACSdQ8b2aX+0zSP7LJ+cZJV9cktJqFeQ1WViDu9f1T4KWySDxkFL umSsYXrKqE+SltwBV+FZyTD5QSNUUEErcO2FTBjbI8rG+rERvZrV+JY0OgnklnMvYM GAmoy159o/8Ogk7lWsI4JHGtbX+U6f5oEdMwWofsuEsOJXrtrpFXFDm1mqGf8BeSQy u2M0anP66ub5VQhR3Ta4nCTMoE5Z1wwFxpBYCodvBY3KhEwDNXyvWu5ygXWWlMLXpk LJGmXSOn4wfrA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 01/11] Squash to "selftests/bpf: Add bpf scheduler test" - fix Date: Thu, 28 Mar 2024 17:49:58 +0800 Message-Id: <0e49cdf987fe33ca8e6f1531da34874c3a750851.1711619108.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang BPF tests fail sometimes with "bytes !=3D total_bytes" errors: # test_default:PASS:sched_init:default 0 nsec # send_data:PASS:pthread_create 0 nsec # send_data:FAIL:recv 936000 !=3D 10485760 nr_recv:-1 errno:11 # default: 3041 ms # server:FAIL:send 7579500 !=3D 10485760 nr_sent:-1 errno:11 # send_data:FAIL:pthread_join thread_ret:-11 \ test_default:PASS:has_bytes_sent addr_1 0 nsec # test_default:PASS:has_bytes_sent addr_2 0 nsec # close_netns:PASS:setns 0 nsec Here errno 11 is EAGAIN, sending should continue in this case, not break. This patch makes BPF tests stable. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 6e28215d7404..7fec91ab19cf 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -353,7 +353,7 @@ static void *server(void *arg) while (bytes < total_bytes && !READ_ONCE(stop)) { nr_sent =3D send(fd, &batch, MIN(total_bytes - bytes, sizeof(batch)), 0); - if (nr_sent =3D=3D -1 && errno =3D=3D EINTR) + if (nr_sent =3D=3D -1 && (errno =3D=3D EINTR || errno =3D=3D EAGAIN)) continue; if (nr_sent =3D=3D -1) { err =3D -errno; @@ -397,7 +397,7 @@ static void send_data(int lfd, int fd, char *msg) while (bytes < total_bytes && !READ_ONCE(stop)) { nr_recv =3D recv(fd, &batch, MIN(total_bytes - bytes, sizeof(batch)), 0); - if (nr_recv =3D=3D -1 && errno =3D=3D EINTR) + if (nr_recv =3D=3D -1 && (errno =3D=3D EINTR || errno =3D=3D EAGAIN)) continue; if (nr_recv =3D=3D -1) break; --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0CF4F5FBA7 for ; Thu, 28 Mar 2024 09:50:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619417; cv=none; b=Bl0ynCFT3T7gADmDxsWyEOcEFF105/OrxvSTkpOr1acBlz4P4oBRIZNUIV40gQuIu13WW2t9F/AdMklVxU6b1/Xsv48WtKgJZA+gHzBx2m9vykIU5JoYhvqXHjyRJbRdChUGtKT65kAkmHixW/4uKoL1MU15bXGUvIpVvlhp3qs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619417; c=relaxed/simple; bh=Ldx8b7uioUsnpz0/+V32TDj4PFd4BVShxlyRkW85jW8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BQ4gybXR6kMvTyR9mTrdYdPmv5V9YhykO/ttNb2boUc1cr7BtGrq++Wc+V1UjNYJqvOwPSkwIb0svAcMSHGcgRCs8NOC+odRtUuOoKPMFS2hlWSQEuFWPoI3gzZqtUegvQBzGEtotYgk8U49VaDhIBUtQvEwFg49WWzCFKbnavQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZbFwpG0M; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZbFwpG0M" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D02DAC433F1; Thu, 28 Mar 2024 09:50:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619416; bh=Ldx8b7uioUsnpz0/+V32TDj4PFd4BVShxlyRkW85jW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZbFwpG0M0k/ii4QvIC1B/2MHb3Yh8Q52GEedpQ/7thaiFE3dfocBos1RyK0rOgVlC W4NTINFRfIH9nGGWMKYbUcPBS6vAE0SCz1S1hiae1BVV567tMKyVGmLKldK7zr+G5Q ym3BDZXrdAnjx/EXbhrDtXpCKlOvVW9QvlkKJar002431woXDIkolqYnfaFzUA3NaE yWh2Eotb6efTYMmyWYWR5wc0TouvUv6Oe6oR2i4DXG+fbl57pbfyYS4dhjSOnBlAWA kaPwzL3b42uw9Qt6uYgDDvksr228H0o7ZGnN/My8C3ilXAPOWu9YSxaWBXkLm6EI9k Hoz16lMqOuu3A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 02/11] selftests/bpf: Refactor mptcp_sock test Date: Thu, 28 Mar 2024 17:49:59 +0800 Message-Id: <52ce31b9d8db385f6629a18532132ae8a2535ead.1711619108.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch refactors mptcp_sock test, renames "base" to "mptcp_sock", extracts a new helper run_mptcp_sock() to start servers and run tests, moves all test skeleton operations, __open_and_load, __attach and __destroy from run_test() into test_mptcp_sock(). This prepares for the later unification of all MPTCP tests using a macro. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 63 +++++++++++-------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 7fec91ab19cf..4f0bcaf39886 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -159,18 +159,10 @@ static int verify_msk(int map_fd, int client_fd, __u3= 2 token) return err; } =20 -static int run_test(int cgroup_fd, int server_fd, bool is_mptcp) +static int run_test(int cgroup_fd, int server_fd, + struct mptcp_sock *sock_skel, bool is_mptcp) { int client_fd, prog_fd, map_fd, err; - struct mptcp_sock *sock_skel; - - sock_skel =3D mptcp_sock__open_and_load(); - if (!ASSERT_OK_PTR(sock_skel, "skel_open_load")) - return libbpf_get_error(sock_skel); - - err =3D mptcp_sock__attach(sock_skel); - if (!ASSERT_OK(err, "skel_attach")) - goto out; =20 prog_fd =3D bpf_program__fd(sock_skel->progs._sockops); map_fd =3D bpf_map__fd(sock_skel->maps.socket_storage_map); @@ -190,29 +182,19 @@ static int run_test(int cgroup_fd, int server_fd, boo= l is_mptcp) close(client_fd); =20 out: - mptcp_sock__destroy(sock_skel); return err; } =20 -static void test_base(void) +static void run_mptcp_sock(int cgroup_fd, struct mptcp_sock *skel) { - struct nstoken *nstoken =3D NULL; - int server_fd, cgroup_fd; - - cgroup_fd =3D test__join_cgroup("/mptcp"); - if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) - return; - - nstoken =3D create_netns(); - if (!ASSERT_OK_PTR(nstoken, "create_netns")) - goto fail; + int server_fd; =20 /* without MPTCP */ server_fd =3D start_server(AF_INET, SOCK_STREAM, NULL, 0, 0); if (!ASSERT_GE(server_fd, 0, "start_server")) goto with_mptcp; =20 - ASSERT_OK(run_test(cgroup_fd, server_fd, false), "run_test tcp"); + ASSERT_OK(run_test(cgroup_fd, server_fd, skel, false), "run_test tcp"); =20 close(server_fd); =20 @@ -220,14 +202,41 @@ static void test_base(void) /* with MPTCP */ server_fd =3D start_mptcp_server(AF_INET, NULL, 0, 0); if (!ASSERT_GE(server_fd, 0, "start_mptcp_server")) - goto fail; + return; =20 - ASSERT_OK(run_test(cgroup_fd, server_fd, true), "run_test mptcp"); + ASSERT_OK(run_test(cgroup_fd, server_fd, skel, true), "run_test mptcp"); =20 close(server_fd); +} + +static void test_mptcp_sock(void) +{ + struct nstoken *nstoken =3D NULL; + struct mptcp_sock *sock_skel; + int cgroup_fd, err; + + cgroup_fd =3D test__join_cgroup("/mptcp"); + if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) + return; + + sock_skel =3D mptcp_sock__open_and_load(); + if (!ASSERT_OK_PTR(sock_skel, "skel_open_load")) + goto out; + + err =3D mptcp_sock__attach(sock_skel); + if (!ASSERT_OK(err, "skel_attach")) + goto out; + + nstoken =3D create_netns(); + if (!ASSERT_OK_PTR(nstoken, "create_netns")) + goto fail; + + run_mptcp_sock(cgroup_fd, sock_skel); =20 fail: cleanup_netns(nstoken); + mptcp_sock__destroy(sock_skel); +out: close(cgroup_fd); } =20 @@ -653,8 +662,8 @@ static void test_burst(void) =20 void test_mptcp(void) { - if (test__start_subtest("base")) - test_base(); + if (test__start_subtest("mptcp_sock")) + test_mptcp_sock(); if (test__start_subtest("mptcpify")) test_mptcpify(); if (test__start_subtest("default")) --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1690241C62 for ; Thu, 28 Mar 2024 09:50:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619418; cv=none; b=i8V2D2q1A5PMHpNa420cqI273l89A2HYlNUYZh5xWWRwoKPkA+uro71BBNRexPfKeXmIqRc5eCmrImh/yXGOdZhCfvnxiWPYvQC2+zB80uoXX5fkA58xf2hpqJhwUVRbBRPDlNegDhPxwBCrRZoHO7aj7dLJpRdKu2z4eI/eM7M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619418; c=relaxed/simple; bh=D2/dUDwilVlONZOzEIq3iHFXfvbYTJY6JtkMNKB6g/s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TP1auJT6sjiYPv0ve56gBcpPuGsNfuvYq9hlJWq6ybNIVcn0uDLMhL4MEuuiGaj/tbd1hrhJjXNamP+/WjCbQMemTUqMrABSZM4b4ouNqJwlmzQ5QDIr4dyr7DgiGmbUjTqqQ88JoThmnSLc+nFtq9MnSqgdEUgz64sfzYWNq+Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ULS5xkeQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ULS5xkeQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27E3BC433C7; Thu, 28 Mar 2024 09:50:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619418; bh=D2/dUDwilVlONZOzEIq3iHFXfvbYTJY6JtkMNKB6g/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ULS5xkeQZYpZUSi87vTEuTboEeC33DAxCH1PQC8IGX8EgbEBsd8T3f249IvKJNK12 qj84Vg1mBy+qCHCYO1iKvj4Dn31Ng4sKiQSLFELVvGcp/J+WUSW38WAe30EwBbCtU0 5Zk7x1N3Y9dIprsrHIqM/MRRp4UNo5pNzbso9pvbKuAZDZgDv3Jw9LNGcKe1pD/HC4 hPhHBcyvrmEn/GonLcYd5H0chry+i2Go2vB/rYBSdK1DtuUpEczvS4XPa6ZxTlOgr9 qumAk9JTiIKmpZJ28h75zipEY7AB45qXdF+5pv9AYzyqNxVT9VgLMB1FgpBbMsHNxT tZm2qIM1Eg6VQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 03/11] selftests/bpf: Refactor mptcpify test Date: Thu, 28 Mar 2024 17:50:00 +0800 Message-Id: <6a192440f81845f7f8a42914a260e8df0c6b45b7.1711619108.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch refactors mptcpify test, moves all test skeleton operations, __open_and_load, __attach and __destroy from run_mptcpify() into test_mptcpify(). This prepares for the later unification of all MPTCP tests using a macro. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 4f0bcaf39886..cc91acfa3e52 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -279,61 +279,58 @@ static int verify_mptcpify(int server_fd, int client_= fd) return err; } =20 -static int run_mptcpify(int cgroup_fd) +static void run_mptcpify(int cgroup_fd, struct mptcpify *skel) { int server_fd, client_fd, err =3D 0; - struct mptcpify *mptcpify_skel; - - mptcpify_skel =3D mptcpify__open_and_load(); - if (!ASSERT_OK_PTR(mptcpify_skel, "skel_open_load")) - return libbpf_get_error(mptcpify_skel); - - err =3D mptcpify__attach(mptcpify_skel); - if (!ASSERT_OK(err, "skel_attach")) - goto out; =20 /* without MPTCP */ server_fd =3D start_server(AF_INET, SOCK_STREAM, NULL, 0, 0); - if (!ASSERT_GE(server_fd, 0, "start_server")) { - err =3D -EIO; - goto out; - } + if (!ASSERT_GE(server_fd, 0, "start_server")) + return; =20 client_fd =3D connect_to_fd(server_fd, 0); - if (!ASSERT_GE(client_fd, 0, "connect to fd")) { - err =3D -EIO; + if (!ASSERT_GE(client_fd, 0, "connect to fd")) goto close_server; - } =20 send_byte(client_fd); =20 err =3D verify_mptcpify(server_fd, client_fd); + ASSERT_OK(err, "verify_mptcpify"); =20 close(client_fd); close_server: close(server_fd); -out: - mptcpify__destroy(mptcpify_skel); - return err; } =20 static void test_mptcpify(void) { struct nstoken *nstoken =3D NULL; + struct mptcpify *mptcpify_skel; int cgroup_fd; + int err; =20 cgroup_fd =3D test__join_cgroup("/mptcpify"); if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) return; =20 + mptcpify_skel =3D mptcpify__open_and_load(); + if (!ASSERT_OK_PTR(mptcpify_skel, "skel_open_load")) + goto out; + + err =3D mptcpify__attach(mptcpify_skel); + if (!ASSERT_OK(err, "skel_attach")) + goto out; + nstoken =3D create_netns(); if (!ASSERT_OK_PTR(nstoken, "create_netns")) goto fail; =20 - ASSERT_OK(run_mptcpify(cgroup_fd), "run_mptcpify"); + run_mptcpify(cgroup_fd, mptcpify_skel); =20 fail: cleanup_netns(nstoken); + mptcpify__destroy(mptcpify_skel); +out: close(cgroup_fd); } =20 --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9F58A651B6 for ; Thu, 28 Mar 2024 09:50:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619419; cv=none; b=BQLbJ6e2EQ5Nuzi4bxglRhxtJwc8MBWiX+TO7j0tWQSFbvOcXFs9YT4y/ucP7uslfDkyDtAsHAYJiIOqxQMo2SbzyUXEboG+di6NksVhAbhPcLEoyZpKQhajZ+hilsq5LYEH047DI7okkl0XXjIHBmAfoItKfZyRrgsSAHodWM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619419; c=relaxed/simple; bh=mMydanxeS5cvc1mWabkhJdwudCcA5dQTfN9DAPHrNRE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gCMrXDHW9acLogaAqWb6rTXZYvAScAIyC6Xzf+yKyi1O2XNw641M5E4taCYm5MHNT1xJdZu6ms/JEbGpSg/ZpOtlmcwTR2BsNCHX29dy84eyNJDODbGfUi4qOSonO3JW8aQvTLSMde6OZ5CIVH7Q05qpKzzQgQLI1Xo6ABeV8bU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZSYvddOp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZSYvddOp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 750BCC43394; Thu, 28 Mar 2024 09:50:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619419; bh=mMydanxeS5cvc1mWabkhJdwudCcA5dQTfN9DAPHrNRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZSYvddOppRVnSN2TAxcywh7QbxFXu5PAkQUgwsFkGxY6TCdG12VL00Qp8Fr5VHWGr PmOqJwKd3ovxauz7CdBTxlbCBXxiLPRTbaCyeuxPSLdj3ufOEmmlf3a7ryLeJdV0R8 EY/Dl958RN/vyHn7JjAUZl3iAtqpPQ0m5TjCrgKbWOFgvsDiadZ0j3W+S9i108zfns jn8gBKMGGSeBKTatsesFquHpRLXhhFZiZldjs8OqCd18XWjIe2QlAj1qI45lJJu0Ye sl5gj0zMMM2eSi0/PrOwBEomMORhdoXR8els0LozY3keqrbSG2JYTzoR4g8Q2vEac8 80MYrS77D/6pg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 04/11] selftests/bpf: Add MPTCP_BASE_TEST macro Date: Thu, 28 Mar 2024 17:50:01 +0800 Message-Id: <0826f58a9667fa2a317345eaf7f60fd8fc8fa733.1711619108.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch adds a macro MPTCP_BASE_TEST to unify all MPTCP tests. test_mptcp_sock() can be replaced by MPTCP_BASE_TEST(mptcp_sock), and test_mptcpify() can be replaced by MPTCP_BASE_TEST(mptcpify). Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 93 +++++++------------ 1 file changed, 33 insertions(+), 60 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index cc91acfa3e52..ac3886983ce1 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -209,37 +209,40 @@ static void run_mptcp_sock(int cgroup_fd, struct mptc= p_sock *skel) close(server_fd); } =20 -static void test_mptcp_sock(void) -{ - struct nstoken *nstoken =3D NULL; - struct mptcp_sock *sock_skel; - int cgroup_fd, err; - - cgroup_fd =3D test__join_cgroup("/mptcp"); - if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) - return; - - sock_skel =3D mptcp_sock__open_and_load(); - if (!ASSERT_OK_PTR(sock_skel, "skel_open_load")) - goto out; - - err =3D mptcp_sock__attach(sock_skel); - if (!ASSERT_OK(err, "skel_attach")) - goto out; - - nstoken =3D create_netns(); - if (!ASSERT_OK_PTR(nstoken, "create_netns")) - goto fail; - - run_mptcp_sock(cgroup_fd, sock_skel); - -fail: - cleanup_netns(nstoken); - mptcp_sock__destroy(sock_skel); -out: - close(cgroup_fd); +#define MPTCP_BASE_TEST(name) \ +static void test_##name(void) \ +{ \ + struct nstoken *nstoken; \ + struct name *skel; \ + int cgroup_fd, err; \ + \ + cgroup_fd =3D test__join_cgroup("/" #name); \ + if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) \ + return; \ + \ + skel =3D name##__open_and_load(); \ + if (!ASSERT_OK_PTR(skel, "skel_open_load")) \ + goto out; \ + \ + err =3D name##__attach(skel); \ + if (!ASSERT_OK(err, "skel_attach")) \ + goto out; \ + \ + nstoken =3D create_netns(); \ + if (!ASSERT_OK_PTR(nstoken, "create_netns")) \ + goto fail; \ + \ + run_##name(cgroup_fd, skel); \ + \ +fail: \ + cleanup_netns(nstoken); \ + name##__destroy(skel); \ +out: \ + close(cgroup_fd); \ } =20 +MPTCP_BASE_TEST(mptcp_sock); + static void send_byte(int fd) { char b =3D 0x55; @@ -302,37 +305,7 @@ static void run_mptcpify(int cgroup_fd, struct mptcpif= y *skel) close(server_fd); } =20 -static void test_mptcpify(void) -{ - struct nstoken *nstoken =3D NULL; - struct mptcpify *mptcpify_skel; - int cgroup_fd; - int err; - - cgroup_fd =3D test__join_cgroup("/mptcpify"); - if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup")) - return; - - mptcpify_skel =3D mptcpify__open_and_load(); - if (!ASSERT_OK_PTR(mptcpify_skel, "skel_open_load")) - goto out; - - err =3D mptcpify__attach(mptcpify_skel); - if (!ASSERT_OK(err, "skel_attach")) - goto out; - - nstoken =3D create_netns(); - if (!ASSERT_OK_PTR(nstoken, "create_netns")) - goto fail; - - run_mptcpify(cgroup_fd, mptcpify_skel); - -fail: - cleanup_netns(nstoken); - mptcpify__destroy(mptcpify_skel); -out: - close(cgroup_fd); -} +MPTCP_BASE_TEST(mptcpify); =20 static const unsigned int total_bytes =3D 10 * 1024 * 1024; static int stop, duration; --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 09161657B9 for ; Thu, 28 Mar 2024 09:50:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619421; cv=none; b=nB5vhZOoYnrzw/1kwIauQWWuU604An9TSkAmrSIwAVEz7p77bbPyp1Wvm06LBqBmIfuT+0tgU4a0BbBNw7cTT15JKUJ1UWkuLTyl1chuGLCo3e0IfeeQOM2A7B+is4CT/VHyqUDArwndDWKlyp/m4yNahJ33txK1bhFxkb/umRA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619421; c=relaxed/simple; bh=lO5T7jQBf77tRMLk10kImWMMAYko8dY+8VN+xCxnawQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=H8L2KFhjf51bQeokOda9SXs7UrmkIkUUfDKg0BXebOhEToQCoiRbrpyC/2vGC5k1lf5gyZGV/R6tItXCImNOiHdyA/nGFmlizCu4PUXAvmYjbh7MhF8HQBCE1O36A9gJaTb2n358MPPEUTaD0ZBXixkzOE0m9Rs29qS6bhuT+gU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=omfiIQ19; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="omfiIQ19" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1FB0C433C7; Thu, 28 Mar 2024 09:50:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619420; bh=lO5T7jQBf77tRMLk10kImWMMAYko8dY+8VN+xCxnawQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=omfiIQ19YMwjAepYK2c9E42j0UyB+DCrfwZ6XKlYdqJl7uQG1/Nb7xo+St8S1d1yR SSmYuL6s1XHxvVC3Wxphv1B62AGE7hKHa1AFVV++59wku++zQFJFeokCo2njbCGg6A D7BV6wDcnbAOy5vlFRk+dh2nmDmv/YT8r0BuvTVNguwcLYXG66PlTzqOjEtF7NNwIb B9ia7V+cYsRROwvPb2tgiAjrKhrnntsfaQ8K+NMAMOl+m2xc4mDi51rbkYMQreVZJp T0ZmAppeTT0eBF1MaLune+5GFtm4y8rqn7N34SNW8DfTbb8xOjbI/Wm41wwhvYvZs2 EOM71ibuN68Eg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 05/11] selftests/bpf: Add RUN_MPTCP_TEST macro Date: Thu, 28 Mar 2024 17:50:02 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Each MPTCP subtest tests test__start_subtest(suffix), then invokes test_suffix(). It makes sense to add a new macro RUN_MPTCP_TEST to simpolify the code. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index ac3886983ce1..b8ec11552e2c 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -630,12 +630,16 @@ static void test_burst(void) mptcp_bpf_burst__destroy(burst_skel); } =20 +#define RUN_MPTCP_TEST(suffix) \ +do { \ + if (test__start_subtest(#suffix)) \ + test_##suffix(); \ +} while (0) + void test_mptcp(void) { - if (test__start_subtest("mptcp_sock")) - test_mptcp_sock(); - if (test__start_subtest("mptcpify")) - test_mptcpify(); + RUN_MPTCP_TEST(mptcp_sock); + RUN_MPTCP_TEST(mptcpify); if (test__start_subtest("default")) test_default(); if (test__start_subtest("first")) --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5B540651B3 for ; Thu, 28 Mar 2024 09:50:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619422; cv=none; b=TwPE5JPaqTBKUPHUcI2PP9f8yS+ZiXWCITsroYXH6u/GRieuScKG34oJPKvV6ImrE04haXqNGyH4YGATDhcmPQnIJADmzXr4iR6hdAUW5SSjsrz0A/DpKPKqJYopc60kfTaz9EJm2mGJYWQIDwe5t0DYtsV9NfzjU4TTfK068Z8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619422; c=relaxed/simple; bh=nL3qLXvdwR7DIDvPS0okmAQ89oB/hm8t/VruSlgHWAE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bs9btHixZe/Po913YZSg8qxcu/uAM9yh5+Y2HAdw1wN1fIIGe7KocSIgCVW90b4KPNFk0YIPz2S76hoOBAP+w36U0nLX1OZG0BFT5toohauSjAN5TdUdS36dOTvBVp2VMTK6bczPq+ZHnNJ/OB+zQWY2I6jlGsMwJ5O84DEScrQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LjOZKHBo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LjOZKHBo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A029C433F1; Thu, 28 Mar 2024 09:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619421; bh=nL3qLXvdwR7DIDvPS0okmAQ89oB/hm8t/VruSlgHWAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LjOZKHBogNv+hIY4EF+lJBfXWv8wIXWmNu+7ARt9oJFm75/N3FEzzzQILjqt4fGNL /fBuJJ8wnobvZRLWuI0tdJ+Jh7Y/Vj/MWCRsYn2eErJp1djSY9qDjQQXwiznxHLg+N 5SKwMzmMFCX+yt6Yuu2pAoMZOIPMt823HuqF9G2RLGtV9SPAqkKcCAOPbknkLxMac6 DqsoxdCPY8dPYMTP6xSZccHI6m/cdApAMVlVPNqdokvI26tWuMX5F6/NS9R/isgI01 CeRcTEgax0MbLFR0gM4QgU/+qQlIgHC0uNwOKYr4n/w2C3Fxi4yS2dTfQpUofjvmDH /zezNDnANQAQw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 06/11] Squash to "selftests/bpf: Add bpf scheduler test" Date: Thu, 28 Mar 2024 17:50:03 +0800 Message-Id: <019954800390c88a5cbcefe4ce2b438b75419763.1711619108.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Some cleanups. Use ASSERT_EQ and ASSERT_OK like below commit: selftests/bpf: Replaces the usage of CHECK calls for ASSERTs in bpf_tcp_ca Use newly added endpoint_init and _ss_search helpers. Add send_data_and_verify helper. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 63 ++++++++++++------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index b8ec11552e2c..c400dbaccc10 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -5,7 +5,6 @@ #include #include #include -#include #include "cgroup_helpers.h" #include "network_helpers.h" #include "mptcp_sock.skel.h" @@ -308,7 +307,7 @@ static void run_mptcpify(int cgroup_fd, struct mptcpify= *skel) MPTCP_BASE_TEST(mptcpify); =20 static const unsigned int total_bytes =3D 10 * 1024 * 1024; -static int stop, duration; +static int stop; =20 static void *server(void *arg) { @@ -341,8 +340,7 @@ static void *server(void *arg) bytes +=3D nr_sent; } =20 - CHECK(bytes !=3D total_bytes, "send", "%zd !=3D %u nr_sent:%zd errno:%d\n= ", - bytes, total_bytes, nr_sent, errno); + ASSERT_EQ(bytes, total_bytes, "send"); =20 done: if (fd >=3D 0) @@ -365,11 +363,12 @@ static void send_data(int lfd, int fd, char *msg) int err; =20 WRITE_ONCE(stop, 0); + if (clock_gettime(CLOCK_MONOTONIC, &start) < 0) return; =20 err =3D pthread_create(&srv_thread, NULL, server, (void *)(long)lfd); - if (CHECK(err !=3D 0, "pthread_create", "err:%d errno:%d\n", err, errno)) + if (!ASSERT_OK(err, "pthread_create")) return; =20 /* recv total_bytes */ @@ -387,17 +386,13 @@ static void send_data(int lfd, int fd, char *msg) return; =20 delta_ms =3D (end.tv_sec - start.tv_sec) * 1000 + (end.tv_nsec - start.tv= _nsec) / 1000000; - - CHECK(bytes !=3D total_bytes, "recv", "%zd !=3D %u nr_recv:%zd errno:%d\n= ", - bytes, total_bytes, nr_recv, errno); - printf("%s: %u ms\n", msg, delta_ms); =20 - WRITE_ONCE(stop, 1); + ASSERT_EQ(bytes, total_bytes, "recv"); =20 + WRITE_ONCE(stop, 1); pthread_join(srv_thread, &thread_ret); - CHECK(IS_ERR(thread_ret), "pthread_join", "thread_ret:%ld", - PTR_ERR(thread_ret)); + ASSERT_OK(IS_ERR(thread_ret), "thread_ret"); } =20 #define ADDR_1 "10.0.1.1" @@ -425,32 +420,53 @@ static struct nstoken *sched_init(char *flags, char *= sched) return NULL; } =20 -static int has_bytes_sent(char *addr) +static int has_bytes_sent(char *dst) { char cmd[128]; =20 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:"); + NS_TEST, ADDR_1, PORT_1, dst, "grep -q bytes_sent:"); return system(cmd); } =20 -static void test_default(void) +static void send_data_and_verify(char *msg, int addr1, int addr2) { int server_fd, client_fd; - struct nstoken *nstoken; =20 - 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, PORT_1, 0); + if (!ASSERT_NEQ(server_fd, -1, "start_mptcp_server")) + return; + client_fd =3D connect_to_fd(server_fd, 0); + if (!ASSERT_NEQ(client_fd, -1, "connect_to_fd")) { + close(server_fd); + return; + } =20 - send_data(server_fd, client_fd, "default"); - ASSERT_OK(has_bytes_sent(ADDR_1), "has_bytes_sent addr_1"); - ASSERT_OK(has_bytes_sent(ADDR_2), "has_bytes_sent addr_2"); + send_data(server_fd, client_fd, msg); + if (addr1) + ASSERT_OK(has_bytes_sent(ADDR_1), "Should have bytes_sent on addr1"); + else + ASSERT_GT(has_bytes_sent(ADDR_1), 0, "Shouldn't have bytes_sent on addr1= "); + if (addr2) + ASSERT_OK(has_bytes_sent(ADDR_2), "Should have bytes_sent on addr2"); + else + ASSERT_GT(has_bytes_sent(ADDR_2), 0, "Shouldn't have bytes_sent on addr2= "); =20 close(client_fd); close(server_fd); +} + +static void test_default(void) +{ + struct nstoken *nstoken; + + nstoken =3D sched_init("subflow", "default"); + if (!ASSERT_OK_PTR(nstoken, "sched_init:default")) + goto fail; + + send_data_and_verify("default", 1, 1); + fail: cleanup_netns(nstoken); } @@ -640,8 +656,7 @@ void test_mptcp(void) { RUN_MPTCP_TEST(mptcp_sock); RUN_MPTCP_TEST(mptcpify); - if (test__start_subtest("default")) - test_default(); + RUN_MPTCP_TEST(default); if (test__start_subtest("first")) test_first(); if (test__start_subtest("bkup")) --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5900D657BD for ; Thu, 28 Mar 2024 09:50:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619423; cv=none; b=GytgdNuVIJYU9J9h52zndGdAMsjCY4SUCW3SZ0wynJmV+8VMUNLbUtjbES8yxsWSaWc5aQWL9bU6E51UvMd0L9usJoT6kM5ww3eBwKYdGn82JXNPJPIwdbf6udxvdHAIBdRJ39dJYzg1/Xhcswmply6wgYVY3zPtE2QDVeA/+2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619423; c=relaxed/simple; bh=rE3kLMSKytQcbT7iemT9EZmlOzw+mj9XNAepAF9xPG4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gvOD8SwCTsvD/Kddv6tnyic+BOrQqL5O0tb3q6EQ1x64USiD0bwjxVZPnQlhxx7CTg7cM0SrVX2Yxkj/Tvo9rm+L2waxX8nK7NUvtZ/vOET+TKpIsH9+eZbFjl0nsH9UCJa4dQy6pU4T/XFYZNFtS2J+Ctlqrt6/IZNtOw+Dsh4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hd21y+YW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hd21y+YW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67AC4C43390; Thu, 28 Mar 2024 09:50:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619423; bh=rE3kLMSKytQcbT7iemT9EZmlOzw+mj9XNAepAF9xPG4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hd21y+YW+VWNQYB6TwiJAFV+Jmr9VNYVVQc0m6bvDYI4MZkRb+O2ThcBDNLiJ3Uh4 tJ6tBlOFVQl3zVhcFIrLUZOC8eZv2cm4t1xdvfvI2hlrF/XJDZKoHqq7WGcCuUfIXp JUFDL54ekMFR+Ml4sE3pOJpTBEeFj7/9knxmUVbJw+w+cDHvYZjKdJvZwDjs2QrHkE edAh+V2RrsWx1LDvLCfRdhR6F6p4vGSEeTXsfQrYaLkeFRlmrReE03qLhO1j6TtjSI aWfBYy9Vljei4uDd82gLXDeDt0aOVC8ySjDDkzAVfE81rOWVkqV4Dbe8+aDtZM4WTr fRJjBFoucPtvA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 07/11] Squash to "selftests/bpf: Add bpf_first test" Date: Thu, 28 Mar 2024 17:50:04 +0800 Message-Id: <8b620cda8ab8415806f96196c4dde1712367bd47.1711619108.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add MPTCP_SCHED_TEST macro. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 66 +++++++++---------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index c400dbaccc10..8d67e1715485 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -471,41 +471,38 @@ static void test_default(void) cleanup_netns(nstoken); } =20 -static void test_first(void) -{ - struct mptcp_bpf_first *first_skel; - int server_fd, client_fd; - struct nstoken *nstoken; - struct bpf_link *link; - - first_skel =3D mptcp_bpf_first__open_and_load(); - if (!ASSERT_OK_PTR(first_skel, "bpf_first__open_and_load")) - return; - - link =3D bpf_map__attach_struct_ops(first_skel->maps.first); - if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { - mptcp_bpf_first__destroy(first_skel); - return; - } - - 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, PORT_1, 0); - client_fd =3D connect_to_fd(server_fd, 0); - - send_data(server_fd, client_fd, "bpf_first"); - 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_first__destroy(first_skel); +#define MPTCP_SCHED_TEST(name, addr1, addr2) \ +static void test_##name(void) \ +{ \ + struct mptcp_bpf_##name *skel; \ + struct nstoken *nstoken; \ + struct bpf_link *link; \ + struct bpf_map *map; \ + \ + skel =3D mptcp_bpf_##name##__open_and_load(); \ + if (!ASSERT_OK_PTR(skel, "open_and_load:" #name)) \ + return; \ + \ + map =3D bpf_object__find_map_by_name(skel->obj, #name); \ + link =3D bpf_map__attach_struct_ops(map); \ + if (!ASSERT_OK_PTR(link, "attach_struct_ops:" #name)) \ + goto fail; \ + \ + nstoken =3D sched_init("subflow", "bpf_" #name); \ + if (!ASSERT_OK_PTR(nstoken, "sched_init:" #name)) \ + goto out; \ + \ + send_data_and_verify(#name, atoi(#addr1), atoi(#addr2));\ + \ + cleanup_netns(nstoken); \ +out: \ + bpf_link__destroy(link); \ +fail: \ + mptcp_bpf_##name##__destroy(skel); \ } =20 +MPTCP_SCHED_TEST(first, 1, 0); + static void test_bkup(void) { struct mptcp_bpf_bkup *bkup_skel; @@ -657,8 +654,7 @@ void test_mptcp(void) RUN_MPTCP_TEST(mptcp_sock); RUN_MPTCP_TEST(mptcpify); RUN_MPTCP_TEST(default); - if (test__start_subtest("first")) - test_first(); + RUN_MPTCP_TEST(first); if (test__start_subtest("bkup")) test_bkup(); if (test__start_subtest("rr")) --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 ECBB0657CE for ; Thu, 28 Mar 2024 09:50:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619425; cv=none; b=jtBBm0B89xsmWJMZb5Cp6D1tjAsqXhwMsFUDmCTiz71dgXiuWjh52hiOOnVzO8ekt4DIn+5L38GJZcnNNSiwXnELTFlc5EC4v8L72JPRASvjU2nbM/NlHHDPTLmOG1sqc1qQJRZ3hgqbqYLQ+PXtx0s3D3vQzmkPoVUD9TJ+Dow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619425; c=relaxed/simple; bh=ChLPkmMT/RA3qpfvdtHj+mTNEPv4SMoi/OiPz7ScXdU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ekdR6gR4MecpnQwkqwfnDLUw503LUTp/59NS5bBFyD/zp8MRtkMXuCqEPID/sqOQUO0Ytr+KxHFuEBjjrRJojy9BpTexSbQ0+/eXPjmAr1XCIP+85CnajyZ/faEtiLekzs2gaaeH1st6PIEnZGzuOXHUqHPGHRO9XvtAuxrGnLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZFX7mxiL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZFX7mxiL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5653C433C7; Thu, 28 Mar 2024 09:50:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619424; bh=ChLPkmMT/RA3qpfvdtHj+mTNEPv4SMoi/OiPz7ScXdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZFX7mxiL3etRNEeKKD0XrHTzmItP1rGNAP9mcfSRt8OEcqI5zp1kyxNc0bYHeK4Gg J/v68Zr7q1l9c6ks1DY3SXSJ4CYj2+HtCgjUMqkuNm5FIMPpPOXudZwmQ43QnIk3Xj ubrqoZfVJ7Xdd8w+jhGyImq2bV2Cn4GisW8Y0VZM68EW7ApQ8APTd6CXWaprG6GS/V mVvKJYYuFhqZSrH4sMWxoovHmh3/EoXZNHJKz4qO4toI2j1qlAvRqOWThchOhzftnC hZLzCa5tYMNBva5vRG3zhmBrQ5dH8/KDEgBF/4EPLlV5+dKL79YEHo+OAX/YgrBo25 t8VXtN+98/jSw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 08/11] Squash to "selftests/bpf: Add bpf_bkup test" Date: Thu, 28 Mar 2024 17:50:05 +0800 Message-Id: <0105a9fff593b468e0f6676009df527511fd1f03.1711619108.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Use MPTCP_SCHED_TEST and RUN_MPTCP_TEST. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 8d67e1715485..3c547f38badf 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -502,41 +502,7 @@ fail: \ } =20 MPTCP_SCHED_TEST(first, 1, 0); - -static void test_bkup(void) -{ - struct mptcp_bpf_bkup *bkup_skel; - int server_fd, client_fd; - struct nstoken *nstoken; - struct bpf_link *link; - - bkup_skel =3D mptcp_bpf_bkup__open_and_load(); - if (!ASSERT_OK_PTR(bkup_skel, "bpf_bkup__open_and_load")) - return; - - link =3D bpf_map__attach_struct_ops(bkup_skel->maps.bkup); - if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { - mptcp_bpf_bkup__destroy(bkup_skel); - return; - } - - 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, PORT_1, 0); - client_fd =3D connect_to_fd(server_fd, 0); - - send_data(server_fd, client_fd, "bpf_bkup"); - 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_bkup__destroy(bkup_skel); -} +MPTCP_SCHED_TEST(bkup, 1, 0); =20 static void test_rr(void) { @@ -655,8 +621,7 @@ void test_mptcp(void) RUN_MPTCP_TEST(mptcpify); RUN_MPTCP_TEST(default); RUN_MPTCP_TEST(first); - if (test__start_subtest("bkup")) - test_bkup(); + RUN_MPTCP_TEST(bkup); if (test__start_subtest("rr")) test_rr(); if (test__start_subtest("red")) --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F0C037BAE5 for ; Thu, 28 Mar 2024 09:50:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619426; cv=none; b=LV0UUiyciKrwjaEFhPd0Asdb+JpunIOvJ9BxW12iNE9335uMnnoJR7Tfi32PreKL65SazMRJIGNr9h7ZW6iwVzPQy3y4Or1tyTuHkdZXNiiRJBgpvJmk51O5FD1uja7akp6IEWCb+/U3NAMG2Ri7BR4KfNA2x7fH7s08cZThtNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619426; c=relaxed/simple; bh=BHBYwXS9lNWoRdAsMvuSbxlhme8r34GUIWouANpUUjw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JnLolzfIdZJU7/8H9IGAg7UGfTPyfDCckIz57+2a1LABq11APQQMK2znptSHEXvf/bzy+/z6Sm19e1dGj4RCgRU3JhBdRilEk4vY6W5im8fP52Fb6Px3OoyQeUuZMalciImr/BRzxvYEcfCBomCwoGW5bVrTNxpyl0ftEM+qUxc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hqlUZ/Yt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hqlUZ/Yt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D096C43394; Thu, 28 Mar 2024 09:50:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619425; bh=BHBYwXS9lNWoRdAsMvuSbxlhme8r34GUIWouANpUUjw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hqlUZ/YtkGCEn51Ilj2zbrYB9AaHrWF0jc3jOtqUPtzyKK2LkoX9PStMk84DbNneo 6FyDVjIDejPuigzJxi39DfJrdS93vhHha5Uv46CfhHv0yDd6bXOictVa6b2Bv5enl/ kU9cSogVYMTJwkViibUT+n5sYNL4csJ0RoztcFYYZjzJHIASAJGztax+EMrp0EsXYq pnQIHlbndwfkhCnGhaxbPULvIdcdDPNDDSTQXAR7xIKjYG5ZYBB9I1RG+zOrVoidYE BQhJx6UAaRA98wPUp+5WFSxMiUZHBPF1seTTx6ZAQ0TfLFa9XcDlydC/3gHZJf0pRm c/oEOZwP+GNqQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 09/11] Squash to "selftests/bpf: Add bpf_rr test" Date: Thu, 28 Mar 2024 17:50:06 +0800 Message-Id: <1a3f26c3df4dcd3abb74ee056bcfa6ba91a04c81.1711619108.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Use MPTCP_SCHED_TEST and RUN_MPTCP_TEST. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 3c547f38badf..8f41007fc3b4 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -503,41 +503,7 @@ fail: \ =20 MPTCP_SCHED_TEST(first, 1, 0); MPTCP_SCHED_TEST(bkup, 1, 0); - -static void test_rr(void) -{ - struct mptcp_bpf_rr *rr_skel; - int server_fd, client_fd; - struct nstoken *nstoken; - struct bpf_link *link; - - rr_skel =3D mptcp_bpf_rr__open_and_load(); - if (!ASSERT_OK_PTR(rr_skel, "bpf_rr__open_and_load")) - return; - - link =3D bpf_map__attach_struct_ops(rr_skel->maps.rr); - if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { - mptcp_bpf_rr__destroy(rr_skel); - return; - } - - 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, PORT_1, 0); - client_fd =3D connect_to_fd(server_fd, 0); - - send_data(server_fd, client_fd, "bpf_rr"); - 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_rr__destroy(rr_skel); -} +MPTCP_SCHED_TEST(rr, 1, 1); =20 static void test_red(void) { @@ -622,8 +588,7 @@ void test_mptcp(void) RUN_MPTCP_TEST(default); RUN_MPTCP_TEST(first); RUN_MPTCP_TEST(bkup); - if (test__start_subtest("rr")) - test_rr(); + RUN_MPTCP_TEST(rr); if (test__start_subtest("red")) test_red(); if (test__start_subtest("burst")) --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8AD91657BC for ; Thu, 28 Mar 2024 09:50:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619427; cv=none; b=t8fl6tt/hrl1pQqLrL2dP+B7WazjRfLzskytV43Xn6JRDJbFOP6ywHLqGySIbU0EtEyLSZZJibibKftgr/+Jr2asw+tGUtzCE2LXkEMuwvdFNUwkrra1vSxMzzZukFxosU3JnWgrj8MSe48OJEUZozkiFbXrWfZBjRz60qnjIlA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619427; c=relaxed/simple; bh=efrqjSuBs11nT2TILMg9ki/9CYwtC4+o7iVcPvfLKdo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jxRuAVCP92NTl9KZy30xbQn37O3WKJc8WzGt8feLKK2VS+3lBIRQXrZIZZ+JbiSsTpEqPYV0B3F5VzIgK+KgZkTt1dfuUVOJYY4Dj1gdCiLr8Z7PA9OyiiwNjPS323khlmqNKfnGtUa3OaUn4GJrA/JFg02GCYRJuTazPuDSKlg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i/rQIvWo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="i/rQIvWo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59F99C433A6; Thu, 28 Mar 2024 09:50:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619427; bh=efrqjSuBs11nT2TILMg9ki/9CYwtC4+o7iVcPvfLKdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i/rQIvWoTDXUhIc3nW6xskbRfIUK1iN9ZASJ9RcmZvAEB6KJ2xBXMywI4A236vYHU y1/GXes5uEOrKw1vMIaw3MrCqIjDJuTeIdA2zPlKY1JsiqGqSXYNgl0s27CJp8YpCj WNkXM/3T/T8y6AbeoZXG1B3VDBM9i1V/hyPd0KXcAYM+ILUZg2oCMr2/CJpDOfqIz3 ce8zmn0y6p4HhyEHGUnICG/H3sB3OtWRJv9uIu93MHHhN1E41u8iVJ6C3IKd7SpklS frbIyEaTrSRcM5N0ve9blzEwW53erLGezWbR5h3GUeiW0tQNgRKDNmm2s+CnarA2H8 SSq3abUedQh5g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 10/11] Squash to "selftests/bpf: Add bpf_red test" Date: Thu, 28 Mar 2024 17:50:07 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Use MPTCP_SCHED_TEST and RUN_MPTCP_TEST. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 8f41007fc3b4..572b6e5caa32 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -504,41 +504,7 @@ fail: \ MPTCP_SCHED_TEST(first, 1, 0); MPTCP_SCHED_TEST(bkup, 1, 0); MPTCP_SCHED_TEST(rr, 1, 1); - -static void test_red(void) -{ - struct mptcp_bpf_red *red_skel; - int server_fd, client_fd; - struct nstoken *nstoken; - struct bpf_link *link; - - red_skel =3D mptcp_bpf_red__open_and_load(); - if (!ASSERT_OK_PTR(red_skel, "bpf_red__open_and_load")) - return; - - link =3D bpf_map__attach_struct_ops(red_skel->maps.red); - if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) { - mptcp_bpf_red__destroy(red_skel); - return; - } - - 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, PORT_1, 0); - client_fd =3D connect_to_fd(server_fd, 0); - - send_data(server_fd, client_fd, "bpf_red"); - 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_red__destroy(red_skel); -} +MPTCP_SCHED_TEST(red, 1, 1); =20 static void test_burst(void) { @@ -589,8 +555,7 @@ void test_mptcp(void) RUN_MPTCP_TEST(first); RUN_MPTCP_TEST(bkup); RUN_MPTCP_TEST(rr); - if (test__start_subtest("red")) - test_red(); + RUN_MPTCP_TEST(red); if (test__start_subtest("burst")) test_burst(); } --=20 2.40.1 From nobody Wed May 15 10:24:19 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A5D147C081 for ; Thu, 28 Mar 2024 09:50:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619428; cv=none; b=clw/ISgbxG3Xmafhw+qf7XqgP4N4qano0BE6j45hTIEsFj9dHUWwlggTt0YseP5iSK1y1Ez/IkI3+E8e0+hb9it0eihqajUpEZGzwHZHn+4gD9/BxDRrwuG2d95XsJ/hVQBjDwHzjh6i5KK2GaiTMcNqSHib8/deWZt4SzVVikU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711619428; c=relaxed/simple; bh=2xjzF+NqHe+6SFNSqaJ+vjg9oeUGx0dsoUBiUn701CE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mnHzXmwvqTnqETU8dmCSHhWltaSZKoczDup+1jxM9Krop0x7yf//Fg4pkUnr1kCOU4Ai2RtofXXqb2ikkpy+sGf8uKHgPdmOwLRGUcJ1wxPSc19NO823XysDrJbqugqqLwtuSJhXfiqvh6ofq40ZwGhMZufqOSAcESBW1KBAaWA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LGeI+8as; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LGeI+8as" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A598CC433C7; Thu, 28 Mar 2024 09:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711619428; bh=2xjzF+NqHe+6SFNSqaJ+vjg9oeUGx0dsoUBiUn701CE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LGeI+8asuPsbz8U6ZbxYt83Ts2DUadRzkAKQtTCPyZDxiBqFe9+A7iUL0e/4vcpJ7 vz5S2l5MHvJqZ0pCfBe5mjW5RF7UClpsNregqy4S6EKsr+zX+xONexlIWro8w5Udkw FMYhRFfhdoslw7PV/B4uMhmytIq8guEdU3w4pTtiF1ejRaiBOA6c96Ha9M40bSb0bJ inKs058GktrQ1JhnIjXluMB+iQIbyj5KiR6gi3uVBqHmmoW3D/sFJjBOD0Kgfp1bXw w/3+2bJqMo5ZPUAdaGMbXnOAZaUDA2jd5GHZsbYn4uKX/mB1JEwIXFp5Yo9J9xqc2+ I9c6Cu3UrP2Xg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 11/11] Squash to "selftests/bpf: Add bpf_burst test" Date: Thu, 28 Mar 2024 17:50:08 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Use MPTCP_SCHED_TEST and RUN_MPTCP_TEST. Signed-off-by: Geliang Tang --- .../testing/selftests/bpf/prog_tests/mptcp.c | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 572b6e5caa32..ffdcfd094350 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -505,41 +505,7 @@ MPTCP_SCHED_TEST(first, 1, 0); MPTCP_SCHED_TEST(bkup, 1, 0); MPTCP_SCHED_TEST(rr, 1, 1); MPTCP_SCHED_TEST(red, 1, 1); - -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); -} +MPTCP_SCHED_TEST(burst, 1, 1); =20 #define RUN_MPTCP_TEST(suffix) \ do { \ @@ -556,6 +522,5 @@ void test_mptcp(void) RUN_MPTCP_TEST(bkup); RUN_MPTCP_TEST(rr); RUN_MPTCP_TEST(red); - if (test__start_subtest("burst")) - test_burst(); + RUN_MPTCP_TEST(burst); } --=20 2.40.1