[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <88e9291e-cd67-4fa2-8a91-d475e29ab832@linux.dev>
Date: Thu, 9 Jan 2025 16:05:20 -0800
From: Martin KaFai Lau <martin.lau@...ux.dev>
To: Amery Hung <ameryhung@...il.com>
Cc: bpf@...r.kernel.org, netdev@...r.kernel.org, daniel@...earbox.net,
andrii@...nel.org, alexei.starovoitov@...il.com, martin.lau@...nel.org,
sinquersw@...il.com, toke@...hat.com, jhs@...atatu.com, jiri@...nulli.us,
stfomichev@...il.com, ekarani.silvestre@....ufcg.edu.br,
yangpeihao@...u.edu.cn, xiyou.wangcong@...il.com, yepeilin.cs@...il.com
Subject: Re: [PATCH bpf-next v2 13/14] selftests: Add a basic fifo qdisc test
On 12/20/24 11:55 AM, Amery Hung wrote:
> +static void do_test(char *qdisc)
> +{
> + DECLARE_LIBBPF_OPTS(bpf_tc_hook, hook, .ifindex = LO_IFINDEX,
> + .attach_point = BPF_TC_QDISC,
> + .parent = TC_H_ROOT,
> + .handle = 0x8000000,
> + .qdisc = qdisc);
> + struct sockaddr_in6 sa6 = {};
> + ssize_t nr_recv = 0, bytes = 0;
> + int lfd = -1, fd = -1;
> + pthread_t srv_thread;
> + socklen_t addrlen = sizeof(sa6);
> + void *thread_ret;
> + char batch[1500];
> + int err;
> +
> + WRITE_ONCE(stop, 0);
> +
> + err = bpf_tc_hook_create(&hook);
> + if (!ASSERT_OK(err, "attach qdisc"))
> + return;
> +
> + lfd = start_server(AF_INET6, SOCK_STREAM, NULL, 0, 0);
> + if (!ASSERT_NEQ(lfd, -1, "socket")) {
nit. ASSERT_OK_FD.
> + bpf_tc_hook_destroy(&hook);
> + return;
> + }
> +
> + fd = socket(AF_INET6, SOCK_STREAM, 0);
> + if (!ASSERT_NEQ(fd, -1, "socket")) {
> + bpf_tc_hook_destroy(&hook);
> + close(lfd);
> + return;
> + }
> +
> + if (settimeo(lfd, 0) || settimeo(fd, 0))
> + goto done;
> +
> + err = getsockname(lfd, (struct sockaddr *)&sa6, &addrlen);
> + if (!ASSERT_NEQ(err, -1, "getsockname"))
> + goto done;
> +
> + /* connect to server */
> + err = connect(fd, (struct sockaddr *)&sa6, addrlen);
Instead of socket/getsockname/connect, "fd = connect_to_fd(lfd);" from the
network_helpers.c should do.
The above settimeo({lfd,fd}) is not needed also. The helpers from
network_helpers.c should have already set the default timeout.
> + if (!ASSERT_NEQ(err, -1, "connect"))
> + goto done;
> +
> + err = pthread_create(&srv_thread, NULL, server, (void *)(long)lfd);
> + if (!ASSERT_OK(err, "pthread_create"))
> + goto done;
> +
> + /* recv total_bytes */
> + while (bytes < total_bytes && !READ_ONCE(stop)) {
> + nr_recv = recv(fd, &batch,
> + MIN(total_bytes - bytes, sizeof(batch)), 0);
> + if (nr_recv == -1 && errno == EINTR)
> + continue;
> + if (nr_recv == -1)
> + break;
> + bytes += nr_recv;
> + }
> +
> + ASSERT_EQ(bytes, total_bytes, "recv");
> +
> + WRITE_ONCE(stop, 1);
> + pthread_join(srv_thread, &thread_ret);
> + ASSERT_OK(IS_ERR(thread_ret), "thread_ret");
> +
> +done:
> + close(lfd);
> + close(fd);
> +
> + bpf_tc_hook_destroy(&hook);
> + return;
> +}
> +
> +static void test_fifo(void)
> +{
> + struct bpf_qdisc_fifo *fifo_skel;
> + struct bpf_link *link;
> +
> + fifo_skel = bpf_qdisc_fifo__open_and_load();
> + if (!ASSERT_OK_PTR(fifo_skel, "bpf_qdisc_fifo__open_and_load"))
> + return;
> +
> + link = bpf_map__attach_struct_ops(fifo_skel->maps.fifo);
> + if (!ASSERT_OK_PTR(link, "bpf_map__attach_struct_ops")) {
> + bpf_qdisc_fifo__destroy(fifo_skel);
> + return;
> + }
> +
> + do_test("bpf_fifo");
> +
> + bpf_link__destroy(link);
> + bpf_qdisc_fifo__destroy(fifo_skel);
> +}
> +
> +void test_bpf_qdisc(void)
> +{
Run the whole test under its own netns. Use netns_new("bpf_qdisc_ns", true) from
the test_progs.c should do.
> + if (test__start_subtest("fifo"))
> + test_fifo();
> +}
Powered by blists - more mailing lists