libbpf: Add a check to ensure that page_cnt is non-zero
Subsystems (4)
PATCH 1/1 libbpf: Add a check to ensure that page_cnt is non-zero
The page_cnt parameter is used to specify the number of memory pages allocated for each per-CPU buffer, it must be non-zero and a power of 2.
Currently, the __perf_buffer__new() function attempts to validate that the page_cnt is a power of 2 but forgets checking for the case where page_cnt is zero, we can fix it by replacing 'page_cnt & (page_cnt - 1)' with '!is_power_of_2(page_cnt)'.
Thus we also don't need to add a check in perf_buffer__new_v0_6_0() to make sure that page_cnt is non-zero and the check for zero in perf_buffer__new_raw_v0_6_0() can also be removed.
The code is cleaner and more readable.
--- tools/lib/bpf/libbpf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/lib/bpf/libbpf.c +3 -2
@@ -33,6 +33,7 @@#include <linux/filter.h> #include <linux/list.h> #include <linux/limits.h> +#include <linux/log2.h> #include <linux/perf_event.h> #include <linux/ring_buffer.h> #include <linux/version.h>
@@ -10951,7 +10952,7 @@ struct perf_buffer *perf_buffer__new_raw_v0_6_0(int map_fd, size_t page_cnt, {struct perf_buffer_params p = {}; -if (page_cnt ==0 || !attr) +if (!attr)return libbpf_err_ptr (-EINVAL );if (!OPTS_VALID (opts, perf_buffer_raw_opts))
@@ -10992,7 +10993,7 @@ static struct perf_buffer *__perf_buffer__new(int map_fd, size_t page_cnt,__u32 map_info_len;int err, i, j, n; -if (page_cnt & (page_cnt -1 )) { +if (!is_power_of_2 (page_cnt)) {pr_warn ("page count should be power of two, but is %zu\n" , page_cnt);return ERR_PTR (-EINVAL );
Signature · 1 line
2.35.1
Quoted 25 lines · Yuntao Wang
The
page_cntparameter is used to specify the number of memory pages allocated for each per-CPU buffer, it must be non-zero and a power of 2.Currently, the
__perf_buffer__new()function attempts to validate that thepage_cntis a power of 2 but forgets checking for the case wherepage_cntis zero, we can fix it by replacing 'page_cnt& (page_cnt- 1)' with '!is_power_of_2(page_cnt)'.Thus we also don't need to add a check in
perf_buffer__new_v0_6_0()to make sure thatpage_cntis non-zero and the check for zero inperf_buffer__new_raw_v0_6_0()can also be removed.The code is cleaner and more readable.
Signed-off-by Yuntao Wang <[email protected]>--- tools/lib/bpf/libbpf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)tools/lib/bpf/libbpf.c +0
-0
tools/lib/bpf/libbpf.c line 36
Quoted 4 lines
tools/lib/bpf/libbpf.c +1
-0@@ -33,6 +33,7 @@#include <linux/filter.h> #include <linux/list.h> #include <linux/limits.h> +#include <linux/log2.h>
we don't have this header implemented in Github repo, so this will be unnecessary painful
Quoted 13 lines
tools/lib/bpf/libbpf.c +1
-1#include <linux/perf_event.h> #include <linux/ring_buffer.h> #include <linux/version.h> @@ -10951,7 +10952,7 @@ struct perf_buffer *perf_buffer__new_raw_v0_6_0(int map_fd, size_t page_cnt, {struct perf_buffer_params p = {}; -if (page_cnt ==0 || !attr) +if (!attr)return libbpf_err_ptr (-EINVAL );if (!OPTS_VALID (opts, perf_buffer_raw_opts))
tools/lib/bpf/libbpf.c static struct perf_buffer *__perf_buffer__new(int map_fd, size_t page_cnt, · line 10996
Quoted 5 lines
tools/lib/bpf/libbpf.c +1
-1@@ -10992,7 +10993,7 @@ static struct perf_buffer *__perf_buffer__new(int map_fd, size_t page_cnt,__u32 map_info_len;int err, i, j, n; -if (page_cnt & (page_cnt -1 )) { +if (!is_power_of_2 (page_cnt)) {
so let's instead just use page_cnt == 0 || (page_cnt & (page_cnt - 1)) here explicitly
Quoted 6 lines
tools/lib/bpf/libbpf.c +0
-1pr_warn ("page count should be power of two, but is %zu\n" , page_cnt);return ERR_PTR (-EINVAL ); --2.35.1
PATCH v2 1/1 libbpf: Add a check to ensure that page_cnt is non-zero
The page_cnt parameter is used to specify the number of memory pages allocated for each per-CPU buffer, it must be non-zero and a power of 2.
Currently, the __perf_buffer__new() function attempts to validate that the page_cnt is a power of 2 but forgets checking for the case where page_cnt is zero, we can fix it by replacing 'page_cnt & (page_cnt - 1)' with 'page_cnt == 0 || (page_cnt & (page_cnt - 1))'.
If so, we also don't need to add a check in perf_buffer__new_v0_6_0() to make sure that page_cnt is non-zero and the check for zero in perf_buffer__new_raw_v0_6_0() can also be removed.
The code will be cleaner and more readable.
---
v1 -> v2: remove dependency on linux/log2.h header
tools/lib/bpf/libbpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/bpf/libbpf.c +2 -2
@@ -10951,7 +10951,7 @@ struct perf_buffer *perf_buffer__new_raw_v0_6_0(int map_fd, size_t page_cnt, {struct perf_buffer_params p = {}; -if (page_cnt ==0 || !attr) +if (!attr)return libbpf_err_ptr (-EINVAL );if (!OPTS_VALID (opts, perf_buffer_raw_opts))
@@ -10992,7 +10992,7 @@ static struct perf_buffer *__perf_buffer__new(int map_fd, size_t page_cnt,__u32 map_info_len;int err, i, j, n; -if (page_cnt & (page_cnt -1 )) { +if (page_cnt ==0 || (page_cnt & (page_cnt -1 ))) {pr_warn ("page count should be power of two, but is %zu\n" , page_cnt);return ERR_PTR (-EINVAL );
Signature · 1 line
2.35.1
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 9 lines · On Thu, 3 Mar 2022 08:59:21 +0800 you wrote:
The
page_cntparameter is used to specify the number of memory pages allocated for each per-CPU buffer, it must be non-zero and a power of 2.Currently, the
__perf_buffer__new()function attempts to validate that thepage_cntis a power of 2 but forgets checking for the case wherepage_cntis zero, we can fix it by replacing 'page_cnt& (page_cnt- 1)' with 'page_cnt== 0 || (page_cnt& (page_cnt- 1))'.[...]
Here is the summary with links:
- [bpf-next,v2] libbpf: Add a check to ensure that page_cnt is non-zero
https://git.kernel.org/bpf/bpf-next/c/41332d6e3a43
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html