From: Philo Lu <lulie@linux.alibaba.com>
To: bpf@vger.kernel.org
Cc: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com,
andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com,
song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org,
sdf@google.com, haoluo@google.com, jolsa@kernel.org,
mykolal@fb.com, shuah@kernel.org, xuanzhuo@linux.alibaba.com
Subject: [PATCH bpf-next v1 0/3] bpf: allow bpf_for_each_map_elem() helper with different input maps
Date: Fri, 5 Apr 2024 10:55:33 +0800 [thread overview]
Message-ID: <20240405025536.18113-1-lulie@linux.alibaba.com> (raw)
Currently, taking different maps within a single bpf_for_each_map_elem
call is not allowed. For example the following codes cannot pass the
verifier (with error "tail_call abusing map_ptr"):
```
static void test_by_pid(int pid)
{
if (pid <= 100)
bpf_for_each_map_elem(&map1, map_elem_cb, NULL, 0);
else
bpf_for_each_map_elem(&map2, map_elem_cb, NULL, 0);
}
```
This is because during bpf_for_each_map_elem verifying,
bpf_insn_aux_data->map_ptr_state is expected as map_ptr (instead of poison
state), which is then needed by set_map_elem_callback_state. However, as
there are two different map ptr input, map_ptr_state is marked as
BPF_MAP_PTR_POISON, and thus the second map_ptr would be lost.
BPF_MAP_PTR_POISON is also needed by bpf_for_each_map_elem to skip
retpoline optimization in do_misc_fixups(). Therefore, map_ptr_state and
map_ptr are both needed for bpf_for_each_map_elem.
This patchset solves it by transform bpf_insn_aux_data->map_ptr_state as a
new struct, storing poison/unpriv state and map pointer together without
additional memory overhead. Then bpf_for_each_map_elem works well with
different input maps. It also makes map_ptr_state logic clearer.
A test case is added to selftest, which would fail to load without this
patchset.
Changelogs
-> v1:
- PATCH 1/3:
- make the commit log clearer
- change poison and unpriv to bool in struct bpf_map_ptr_state, also the
return value in bpf_map_ptr_poisoned() and bpf_map_ptr_unpriv()
- PATCH 2/3:
- change the comments in set_map_elem_callback_state()
- PATCH 3/3:
- remove the "skipping the last element" logic during map updating
- change if() to ASSERT_OK()
Please review, thanks.
Philo Lu (3):
bpf: store both map ptr and state in bpf_insn_aux_data
bpf: allow invoking bpf_for_each_map_elem with different maps
selftests/bpf: add test for bpf_for_each_map_elem() with different
maps
include/linux/bpf_verifier.h | 9 ++-
kernel/bpf/verifier.c | 42 +++++--------
.../selftests/bpf/prog_tests/for_each.c | 62 +++++++++++++++++++
.../selftests/bpf/progs/for_each_multi_maps.c | 49 +++++++++++++++
4 files changed, 136 insertions(+), 26 deletions(-)
create mode 100644 tools/testing/selftests/bpf/progs/for_each_multi_maps.c
--
2.32.0.3.g01195cf9f
next reply other threads:[~2024-04-05 2:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 2:55 Philo Lu [this message]
2024-04-05 2:55 ` [PATCH bpf-next v1 1/3] bpf: store both map ptr and state in bpf_insn_aux_data Philo Lu
2024-04-05 16:36 ` Yonghong Song
2024-04-05 2:55 ` [PATCH bpf-next v1 2/3] bpf: allow invoking bpf_for_each_map_elem with different maps Philo Lu
2024-04-05 16:37 ` Yonghong Song
2024-04-05 2:55 ` [PATCH bpf-next v1 3/3] selftests/bpf: add test for bpf_for_each_map_elem() " Philo Lu
2024-04-05 16:39 ` Yonghong Song
2024-04-05 17:35 ` Andrii Nakryiko
2024-04-05 17:41 ` Alexei Starovoitov
2024-04-05 17:52 ` Andrii Nakryiko
2024-04-05 17:40 ` [PATCH bpf-next v1 0/3] bpf: allow bpf_for_each_map_elem() helper with different input maps 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=20240405025536.18113-1-lulie@linux.alibaba.com \
--to=lulie@linux.alibaba.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=xuanzhuo@linux.alibaba.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;
as well as URLs for NNTP newsgroup(s).