From: Jiayuan Chen <jiayuan.chen@linux.dev>
To: Michal Luczaj <mhal@rbox.co>, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>,
Eduard Zingerman <eddyz87@gmail.com>,
Kumar Kartikeya Dwivedi <memxor@gmail.com>,
Martin KaFai Lau <martin.lau@linux.dev>,
Song Liu <song@kernel.org>,
Yonghong Song <yonghong.song@linux.dev>,
Jiri Olsa <jolsa@kernel.org>,
Emil Tsalapatis <emil@etsalapatis.com>,
Ihor Solodrai <ihor.solodrai@linux.dev>,
Shuah Khan <shuah@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Eric Dumazet <edumazet@kernel.org>,
Kuniyuki Iwashima <kuniyu@google.com>,
Paolo Abeni <pabeni@redhat.com>,
Willem de Bruijn <willemb@google.com>,
Jakub Sitnicki <jakub@cloudflare.com>,
Jiayuan Chen <jiayuan.chen@linux.dev>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Simon Horman <horms@kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
Shuah Khan <skhan@linuxfoundation.org>,
Randy Dunlap <rdunlap@infradead.org>,
Stanislav Fomichev <sdf@fomichev.me>
Cc: bpf@vger.kernel.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-doc@vger.kernel.org
Subject: Re: [PATCH bpf-next v3 1/8] selftests/bpf: Remove sockmap update from bpf_iter_unix
Date: Mon, 9 Nov 2026 10:14:57 +0800 [thread overview]
Message-ID: <65d109ab-3dca-4521-bc1d-bb1f8810bb14@linux.dev> (raw)
In-Reply-To: <20261107-sockmap-update-limit-iter-v3-1-7c0bad1ad036@rbox.co>
On 11/8/26 1:58 AM, Michal Luczaj wrote:
> BPF iterator programs that can update sockmaps will be limited to
> iter/sockmap. Remove the update from the unix selftest.
>
> This reverts commit 997b8483d44c ("selftests/bpf: Extend bpf_iter_unix to
> attempt deadlocking").
>
> Signed-off-by: Michal Luczaj <mhal@rbox.co>
Reviewed-by: Jiayuan Chen <jiayuan.chen@linux.dev>
> ---
> tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_unix.c b/tools/testing/selftests/bpf/progs/bpf_iter_unix.c
> index 3061b148f338..90beada0386d 100644
> --- a/tools/testing/selftests/bpf/progs/bpf_iter_unix.c
> +++ b/tools/testing/selftests/bpf/progs/bpf_iter_unix.c
> @@ -7,13 +7,6 @@
>
> char _license[] SEC("license") = "GPL";
>
> -SEC(".maps") struct {
> - __uint(type, BPF_MAP_TYPE_SOCKMAP);
> - __uint(max_entries, 1);
> - __type(key, __u32);
> - __type(value, __u64);
> -} sockmap;
> -
> static long sock_i_ino(const struct sock *sk)
> {
> const struct socket *sk_socket = sk->sk_socket;
> @@ -82,8 +75,5 @@ int dump_unix(struct bpf_iter__unix *ctx)
>
> BPF_SEQ_PRINTF(seq, "\n");
>
> - /* Test for deadlock. */
> - bpf_map_update_elem(&sockmap, &(int){0}, sk, 0);
> -
> return 0;
> }
>
next prev parent reply other threads:[~2026-11-09 2:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-07 17:58 [PATCH bpf-next v3 0/8] bpf, sockmap: Restrict iter-context sockmap updates to sockmap iterators Michal Luczaj
2026-11-07 17:58 ` [PATCH bpf-next v3 1/8] selftests/bpf: Remove sockmap update from bpf_iter_unix Michal Luczaj
2026-11-09 2:14 ` Jiayuan Chen [this message]
2026-11-07 17:58 ` [PATCH bpf-next v3 2/8] bpf, sockmap: Restrict iter-context sockmap updates to iter/sockmap Michal Luczaj
2026-11-09 2:15 ` Jiayuan Chen
2026-11-07 17:58 ` [PATCH bpf-next v3 3/8] selftests/bpf: Add negative test for sockmap update from non-sockmap iter Michal Luczaj
2026-11-07 17:58 ` [PATCH bpf-next v3 4/8] bpf, docs: Document BPF_ITER_NOSLEEP Michal Luczaj
2026-11-07 17:58 ` [PATCH bpf-next v3 5/8] bpf: Restrict bpf_sock_destroy() to iter/{tcp,udp} Michal Luczaj
2026-11-07 17:58 ` [PATCH bpf-next v3 6/8] bpf: Mark bpf_iter__sockmap::sk as PTR_TRUSTED Michal Luczaj
2026-11-07 17:58 ` [PATCH bpf-next v3 7/8] selftests/bpf: Add iter/sockmap bpf_sock_destroy() negative test Michal Luczaj
2026-11-07 17:58 ` [PATCH bpf-next v3 8/8] bpf: Fix "unresolved symbol tcp_request_sock" build error Michal Luczaj
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=65d109ab-3dca-4521-bc1d-bb1f8810bb14@linux.dev \
--to=jiayuan.chen@linux.dev \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=corbet@lwn.net \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=eddyz87@gmail.com \
--cc=edumazet@kernel.org \
--cc=emil@etsalapatis.com \
--cc=horms@kernel.org \
--cc=ihor.solodrai@linux.dev \
--cc=jakub@cloudflare.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kuba@kernel.org \
--cc=kuniyu@google.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=memxor@gmail.com \
--cc=mhal@rbox.co \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rdunlap@infradead.org \
--cc=sdf@fomichev.me \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=song@kernel.org \
--cc=willemb@google.com \
--cc=yonghong.song@linux.dev \
/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
all inboxes | Powered by JetHome®