From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46F08C61DA4 for ; Thu, 23 Feb 2023 01:15:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231388AbjBWBPw (ORCPT ); Wed, 22 Feb 2023 20:15:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229999AbjBWBPv (ORCPT ); Wed, 22 Feb 2023 20:15:51 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8330E769B for ; Wed, 22 Feb 2023 17:15:50 -0800 (PST) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 31MNCRl2006592 for ; Wed, 22 Feb 2023 17:15:49 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=rL1wm5tWNaKzwi393h9If7vkuXCooYbne/3VwBBzDpE=; b=jzYdS5g4fK+iL3SsminRW7ACxNh5bVKdh/nN6dSGf1n/39XK6zc3mjoto2LJ/n5V7E/4 kXZgM5JgstzTzyfOWIsIPSOq3R1PFS7vylqpAIgDFyUKuQ/VHkKsR2osdc5HtOb5KXLz p1UsXe0zAfp30RYBtwlrP74rb7sPBYA72CxV9s/euw6uMfdVyGkJlChkgxI7ImC7kxVJ 5K8kesVhUwgb45vEmmdjOmj7OWNQ7bLRPl2WqDPjlLJCInfqLEyFQtn3YbkUyRAFk54V KTTKEmVYEbeWKVX25eoJxrnFcHbeDO4EaCl/s4sTdjvu5PqGkTr9w8+D5sgDR9tbKYpN 5Q== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nwdy9xsj6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 22 Feb 2023 17:15:49 -0800 Received: from twshared18553.27.frc3.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Wed, 22 Feb 2023 17:15:48 -0800 Received: by devbig931.frc1.facebook.com (Postfix, from userid 460691) id 3F3DC5BD8D0D; Wed, 22 Feb 2023 17:12:42 -0800 (PST) From: Kui-Feng Lee To: , , , , , , CC: Kui-Feng Lee Subject: [PATCH bpf-next v2 6/6] selftests/bpf: Test switching TCP Congestion Control algorithms. Date: Wed, 22 Feb 2023 17:12:38 -0800 Message-ID: <20230223011238.12313-7-kuifeng@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230223011238.12313-1-kuifeng@meta.com> References: <20230223011238.12313-1-kuifeng@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: x2ZJOiyJSiapwMRumqXmHfX1bLbvoyr2 X-Proofpoint-ORIG-GUID: x2ZJOiyJSiapwMRumqXmHfX1bLbvoyr2 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-22_12,2023-02-22_02,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Create a pair of sockets that utilize the congestion control algorithm under a particular name. Then switch up this congestion control algorithm to another implementation and check whether newly created connections using the same cc name now run the new implementation. Signed-off-by: Kui-Feng Lee --- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 48 ++++++++++++++ .../selftests/bpf/progs/tcp_ca_update.c | 62 +++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_update.c diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c b/tools/= testing/selftests/bpf/prog_tests/bpf_tcp_ca.c index e980188d4124..a93956425bff 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c @@ -8,6 +8,7 @@ #include "bpf_dctcp.skel.h" #include "bpf_cubic.skel.h" #include "bpf_tcp_nogpl.skel.h" +#include "tcp_ca_update.skel.h" #include "bpf_dctcp_release.skel.h" #include "tcp_ca_write_sk_pacing.skel.h" #include "tcp_ca_incompl_cong_ops.skel.h" @@ -381,6 +382,51 @@ static void test_unsupp_cong_op(void) libbpf_set_print(old_print_fn); } =20 +static void test_update_ca(void) +{ + struct tcp_ca_update *skel; + struct bpf_link *link; + int saved_ca1_cnt; + int err; + + skel =3D tcp_ca_update__open(); + if (!ASSERT_OK_PTR(skel, "open")) + return; + + err =3D bpf_map__set_map_flags(skel->maps.ca_update_1, + bpf_map__map_flags(skel->maps.ca_update_1) | BPF_F_LINK); + if (!ASSERT_OK(err, "set_map_flags_1")) + return; + + err =3D bpf_map__set_map_flags(skel->maps.ca_update_2, + bpf_map__map_flags(skel->maps.ca_update_2) | BPF_F_LINK); + if (!ASSERT_OK(err, "set_map_flags_2")) + return; + + err =3D tcp_ca_update__load(skel); + if (!ASSERT_OK(err, "load")) { + tcp_ca_update__destroy(skel); + return; + } + + link =3D bpf_map__attach_struct_ops(skel->maps.ca_update_1); + ASSERT_OK_PTR(link, "attach_struct_ops"); + + do_test("tcp_ca_update", NULL); + saved_ca1_cnt =3D skel->bss->ca1_cnt; + ASSERT_GT(saved_ca1_cnt, 0, "ca1_ca1_cnt"); + + err =3D bpf_link__update_map(link, skel->maps.ca_update_2); + ASSERT_OK(err, "update_struct_ops"); + + do_test("tcp_ca_update", NULL); + ASSERT_EQ(skel->bss->ca1_cnt, saved_ca1_cnt, "ca2_ca1_cnt"); + ASSERT_GT(skel->bss->ca2_cnt, 0, "ca2_ca2_cnt"); + + bpf_link__destroy(link); + tcp_ca_update__destroy(skel); +} + void test_bpf_tcp_ca(void) { if (test__start_subtest("dctcp")) @@ -399,4 +445,6 @@ void test_bpf_tcp_ca(void) test_incompl_cong_ops(); if (test__start_subtest("unsupp_cong_op")) test_unsupp_cong_op(); + if (test__start_subtest("update_ca")) + test_update_ca(); } diff --git a/tools/testing/selftests/bpf/progs/tcp_ca_update.c b/tools/te= sting/selftests/bpf/progs/tcp_ca_update.c new file mode 100644 index 000000000000..7aad4afe895b --- /dev/null +++ b/tools/testing/selftests/bpf/progs/tcp_ca_update.c @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "vmlinux.h" + +#include +#include + +char _license[] SEC("license") =3D "GPL"; + +int ca1_cnt =3D 0; +int ca2_cnt =3D 0; + +#define USEC_PER_SEC 1000000UL + +#define min(a, b) ((a) < (b) ? (a) : (b)) + +static inline struct tcp_sock *tcp_sk(const struct sock *sk) +{ + return (struct tcp_sock *)sk; +} + +SEC("struct_ops/ca_update_1_cong_control") +void BPF_PROG(ca_update_1_cong_control, struct sock *sk, + const struct rate_sample *rs) +{ + ca1_cnt++; +} + +SEC("struct_ops/ca_update_2_cong_control") +void BPF_PROG(ca_update_2_cong_control, struct sock *sk, + const struct rate_sample *rs) +{ + ca2_cnt++; +} + +SEC("struct_ops/ca_update_ssthresh") +__u32 BPF_PROG(ca_update_ssthresh, struct sock *sk) +{ + return tcp_sk(sk)->snd_ssthresh; +} + +SEC("struct_ops/ca_update_undo_cwnd") +__u32 BPF_PROG(ca_update_undo_cwnd, struct sock *sk) +{ + return tcp_sk(sk)->snd_cwnd; +} + +SEC(".struct_ops") +struct tcp_congestion_ops ca_update_1 =3D { + .cong_control =3D (void *)ca_update_1_cong_control, + .ssthresh =3D (void *)ca_update_ssthresh, + .undo_cwnd =3D (void *)ca_update_undo_cwnd, + .name =3D "tcp_ca_update", +}; + +SEC(".struct_ops") +struct tcp_congestion_ops ca_update_2 =3D { + .cong_control =3D (void *)ca_update_2_cong_control, + .ssthresh =3D (void *)ca_update_ssthresh, + .undo_cwnd =3D (void *)ca_update_undo_cwnd, + .name =3D "tcp_ca_update", +}; --=20 2.30.2