From: Martin KaFai Lau <martin.lau@linux.dev>
To: Kuniyuki Iwashima <kuniyu@google.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
John Fastabend <john.fastabend@gmail.com>,
Stanislav Fomichev <sdf@fomichev.me>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Neal Cardwell <ncardwell@google.com>,
Willem de Bruijn <willemb@google.com>,
Mina Almasry <almasrymina@google.com>,
Roman Gushchin <roman.gushchin@linux.dev>,
Shakeel Butt <shakeel.butt@linux.dev>,
Kuniyuki Iwashima <kuni1840@gmail.com>,
bpf@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH v2 bpf-next/net 6/6] selftest: bpf: Add test for sk->sk_bypass_prot_mem.
Date: Wed, 15 Oct 2025 12:07:38 -0700 [thread overview]
Message-ID: <fa80d5a7-790d-4f10-bef3-f5c708218f83@linux.dev> (raw)
In-Reply-To: <20251014235604.3057003-7-kuniyu@google.com>
On 10/14/25 4:54 PM, Kuniyuki Iwashima wrote:
> +static int tcp_create_sockets(struct test_case *test_case, int sk[], int len)
> +{
> + int server, i, err = 0;
> +
> + server = start_server(test_case->family, test_case->type, NULL, 0, 0);
> + if (!ASSERT_GE(server, 0, "start_server_str"))
> + return server;
> +
> + /* Keep for-loop so we can change NR_SOCKETS easily. */
> + for (i = 0; i < len; i += 2) {
> + sk[i] = connect_to_fd(server, 0);
> + if (sk[i] < 0) {
> + ASSERT_GE(sk[i], 0, "connect_to_fd");
> + err = sk[i];
> + break;
> + }
> +
> + sk[i + 1] = accept(server, NULL, NULL);
> + if (sk[i + 1] < 0) {
> + ASSERT_GE(sk[i + 1], 0, "accept");
> + err = sk[i + 1];
> + break;
> + }
> + }
> +
> + close(server);
> +
> + return err;
> +}
> +
> +static int check_bypass(struct test_case *test_case,
> + struct sk_bypass_prot_mem *skel, bool bypass)
> +{
> + char buf[BUF_SINGLE] = {};
> + long memory_allocated[2];
> + int sk[NR_SOCKETS] = {};
> + int err, i, j;
> +
> + err = test_case->create_sockets(test_case, sk, ARRAY_SIZE(sk));
> + if (err)
> + goto close;
> +
> + memory_allocated[0] = test_case->get_memory_allocated(test_case, skel);
> +
> + /* allocate pages >= NR_PAGES */
> + for (i = 0; i < ARRAY_SIZE(sk); i++) {
> + for (j = 0; j < NR_SEND; j++) {
> + int bytes = send(sk[i], buf, sizeof(buf), 0);
> +
> + /* Avoid too noisy logs when something failed. */
> + if (bytes != sizeof(buf)) {
> + ASSERT_EQ(bytes, sizeof(buf), "send");
> + if (bytes < 0) {
> + err = bytes;
> + goto drain;
> + }
> + }
> + }
> + }
> +
> + memory_allocated[1] = test_case->get_memory_allocated(test_case, skel);
> +
> + if (bypass)
> + ASSERT_LE(memory_allocated[1], memory_allocated[0] + 10, "bypass");
> + else
> + ASSERT_GT(memory_allocated[1], memory_allocated[0] + NR_PAGES, "no bypass");
> +
> +drain:
> + if (test_case->type == SOCK_DGRAM) {
> + /* UDP starts purging sk->sk_receive_queue after one RCU
> + * grace period, then udp_memory_allocated goes down,
> + * so drain the queue before close().
> + */
> + for (i = 0; i < ARRAY_SIZE(sk); i++) {
> + for (j = 0; j < NR_SEND; j++) {
> + int bytes = recv(sk[i], buf, 1, MSG_DONTWAIT | MSG_TRUNC);
> +
> + if (bytes == sizeof(buf))
> + continue;
> + if (bytes != -1 || errno != EAGAIN)
> + PRINT_FAIL("bytes: %d, errno: %s\n", bytes, strerror(errno));
> + break;
> + }
> + }
> + }
> +
> +close:
> + for (i = 0; i < ARRAY_SIZE(sk); i++) {
> + if (sk[i] <= 0)
Theoretically, 0 is a legit fd. The tcp_create_sockets above is also testing
ASSERT_GE(sk[i], 0, ...). I changed to test "< 0" here and initialize all sk[]
to -1 at the beginning of this function.
> + break;
> +
> + close(sk[i]);
> + }
> +
> + return err;
> +}
> +
> +struct test_case test_cases[] = {
Added static.
Applied. Thanks.
next prev parent reply other threads:[~2025-10-15 19:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-14 23:54 [PATCH v2 bpf-next/net 0/6] bpf: Allow opt-out from sk->sk_prot->memory_allocated Kuniyuki Iwashima
2025-10-14 23:54 ` [PATCH v2 bpf-next/net 1/6] tcp: Save lock_sock() for memcg in inet_csk_accept() Kuniyuki Iwashima
2025-10-14 23:54 ` [PATCH v2 bpf-next/net 2/6] net: Allow opt-out from global protocol memory accounting Kuniyuki Iwashima
2025-10-14 23:54 ` [PATCH v2 bpf-next/net 3/6] net: Introduce net.core.bypass_prot_mem sysctl Kuniyuki Iwashima
2025-10-14 23:54 ` [PATCH v2 bpf-next/net 4/6] bpf: Support bpf_setsockopt() for BPF_CGROUP_INET_SOCK_CREATE Kuniyuki Iwashima
2025-10-14 23:54 ` [PATCH v2 bpf-next/net 5/6] bpf: Introduce SK_BPF_BYPASS_PROT_MEM Kuniyuki Iwashima
2025-10-15 19:00 ` Martin KaFai Lau
2025-10-14 23:54 ` [PATCH v2 bpf-next/net 6/6] selftest: bpf: Add test for sk->sk_bypass_prot_mem Kuniyuki Iwashima
2025-10-15 19:07 ` Martin KaFai Lau [this message]
2025-10-15 20:41 ` Kuniyuki Iwashima
2025-10-16 6:50 ` [PATCH v2 bpf-next/net 0/6] bpf: Allow opt-out from sk->sk_prot->memory_allocated patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fa80d5a7-790d-4f10-bef3-f5c708218f83@linux.dev \
--to=martin.lau@linux.dev \
--cc=almasrymina@google.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=kuni1840@gmail.com \
--cc=kuniyu@google.com \
--cc=ncardwell@google.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=roman.gushchin@linux.dev \
--cc=sdf@fomichev.me \
--cc=shakeel.butt@linux.dev \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).