diff options
| author | Hou Tao <houtao1@huawei.com> | 2022-11-16 15:23:48 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-12-19 12:27:31 +0100 |
| commit | 5cb4abb0caa586859e56c71a6c44882e451a980a (patch) | |
| tree | 131756bfa92ec3a887f8f3a4c691d59b54a57128 | |
| parent | 50b5f6d4d9d2d69a7498c44fd8b26e13d73d3d98 (diff) | |
| download | linux-stable-5cb4abb0caa586859e56c71a6c44882e451a980a.tar.gz linux-stable-5cb4abb0caa586859e56c71a6c44882e451a980a.tar.bz2 linux-stable-5cb4abb0caa586859e56c71a6c44882e451a980a.zip | |
libbpf: Use page size as max_entries when probing ring buffer map
[ Upstream commit 689eb2f1ba46b4b02195ac2a71c55b96d619ebf8 ]
Using page size as max_entries when probing ring buffer map, else the
probe may fail on host with 64KB page size (e.g., an ARM64 host).
After the fix, the output of "bpftool feature" on above host will be
correct.
Before :
eBPF map_type ringbuf is NOT available
eBPF map_type user_ringbuf is NOT available
After :
eBPF map_type ringbuf is available
eBPF map_type user_ringbuf is available
Signed-off-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20221116072351.1168938-2-houtao@huaweicloud.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | tools/lib/bpf/libbpf_probes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/lib/bpf/libbpf_probes.c b/tools/lib/bpf/libbpf_probes.c index d38284a3aaf0..13393f0eab25 100644 --- a/tools/lib/bpf/libbpf_probes.c +++ b/tools/lib/bpf/libbpf_probes.c @@ -244,7 +244,7 @@ bool bpf_probe_map_type(enum bpf_map_type map_type, __u32 ifindex) case BPF_MAP_TYPE_RINGBUF: key_size = 0; value_size = 0; - max_entries = 4096; + max_entries = sysconf(_SC_PAGE_SIZE); break; case BPF_MAP_TYPE_UNSPEC: case BPF_MAP_TYPE_HASH: |