libbpf: clean up ringbuf size adjustment implementation
Andrii Nakryiko
maintainerPATCH 1/1 libbpf: clean up ringbuf size adjustment implementation
Drop unused iteration variable, move overflow prevention check into the for loop.
Fixes 0087a681fa8c ("libbpf: Automatically fix up BPF_MAP_TYPE_RINGBUF size, if necessary")
Reported-by Nathan Chancellor <[email protected]>
Signed-off-by Andrii Nakryiko <[email protected]>
--- tools/lib/bpf/libbpf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +2 -4
@@ -4951,7 +4951,7 @@ static bool is_pow_of_2(size_t x)static size_t adjust_ringbuf_sz (size_t sz) {__u32 page_sz =sysconf (_SC_PAGE_SIZE); -__u32 i, mul; +__u32 mul;/* if user forgot to set any size, make sure they see error */ if (sz ==0 )
@@ -4967,9 +4967,7 @@ static size_t adjust_ringbuf_sz(size_t sz)* user-set size to satisfy both user size request and kernel * requirements and substitute correct max_entries for map creation. */ -for (i =0 , mul =1 ; ; i++, mul <<=1 ) { -if (mul >UINT_MAX / page_sz)/* prevent __u32 overflow */ -break ; +for (mul =1 ; mul <=UINT_MAX / page_sz; mul <<=1 ) {if (mul * page_sz > sz)return mul * page_sz; }
Signature · 1 line
2.30.2
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 8 lines · On Tue, 10 May 2022 11:51:59 -0700 you wrote:
Drop unused iteration variable, move overflow prevention check into the for loop.
Fixes 0087a681fa8c ("libbpf: Automatically fix up BPF_MAP_TYPE_RINGBUF size, if necessary")Reported-by Nathan Chancellor <[email protected]>Signed-off-by Andrii Nakryiko <[email protected]>[...]
Here is the summary with links:
- [bpf-next] libbpf: clean up ringbuf size adjustment implementation
https://git.kernel.org/bpf/bpf-next/c/5eefe17c7ae4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html