bpftool: Fix build error with -Werror=type-limits
PATCH 1/1 bpftool: Fix build error with -Werror=type-limits
Quentin reported a build error as follows,
link.c: In function ‘perf_config_hw_cache_str’:
link.c:86:18: warning: comparison of unsigned expression in ‘>= 0’ is always true [-Wtype-limits]
86 | if ((id) >= 0 && (id) < ARRAY_SIZE(array)) \
| ^~
link.c:320:20: note: in expansion of macro ‘perf_event_name’
320 | hw_cache = perf_event_name(evsel__hw_cache, config & 0xff);
| ^~~~~~~~~~~~~~~
[... more of the same for the other calls to perf_event_name ...]
He also pointed out the reason and the solution:
We're always passing unsigned, so it should be safe to drop the check on (id) >= 0.
--- tools/bpf/bpftool/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/link.c +1 -1
@@ -83,7 +83,7 @@ const char *evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX] = {#define perf_event_name (array, id) ({ \ const char *event_str = NULL; \ \ - if ((id) >= 0 && (id) < ARRAY_SIZE(array)) \ + if ((id) < ARRAY_SIZE(array)) \ event_str = array[id]; \ event_str; \ })
Signature · 1 line
2.34.1
Quoted 1 line · Yafang Shao
Quentin reported a build error as follows,
Just a warning :)
Quoted 12 lines
link.c: In function ‘perf_config_hw_cache_str’:
link.c:86:18: warning: comparison of unsigned expression in ‘>= 0’ is always true [-Wtype-limits]
86 | if ((id) >= 0 && (id) <ARRAY_SIZE(array)) \
| ^~
link.c:320:20: note: in expansion of macro ‘perf_event_name’
320 |hw_cache=perf_event_name(evsel__hw_cache, config & 0xff);
| ^~~~~~~~~~~~~~~
[... more of the same for the other calls toperf_event_name...]He also pointed out the reason and the solution:
Quoted 8 lines
We're always passing unsigned, so it should be safe to drop the check on (id) >= 0.
Fixes 62b57e3ddd64 ("bpftool: Add perf event names")Reported-by Quentin Monnet <[email protected]>Suggested-by Quentin Monnet <[email protected]>Signed-off-by Yafang Shao <[email protected]>
Thank you!
Quoted 5 lines · Quentin Monnet
Quoted 1 line · Yafang Shao
Quentin reported a build error as follows,
Just a warning :)
Will reword it in the next version.
Quoted 22 lines
Quoted 13 lines
link.c: In function ‘perf_config_hw_cache_str’:
link.c:86:18: warning: comparison of unsigned expression in ‘>= 0’ is always true [-Wtype-limits]
86 | if ((id) >= 0 && (id) <ARRAY_SIZE(array)) \
| ^~
link.c:320:20: note: in expansion of macro ‘perf_event_name’
320 |hw_cache=perf_event_name(evsel__hw_cache, config & 0xff);
| ^~~~~~~~~~~~~~~
[... more of the same for the other calls toperf_event_name...]He also pointed out the reason and the solution:
Quoted 8 lines
We're always passing unsigned, so it should be safe to drop the check on (id) >= 0.
Fixes 62b57e3ddd64 ("bpftool: Add perf event names")Reported-by Quentin Monnet <[email protected]>Suggested-by Quentin Monnet <[email protected]>Signed-off-by Yafang Shao <[email protected]>
Quoted 4 lines
Thank you!
Acked-by Quentin Monnet <[email protected]>
Thanks for your review.
Signature · 2 lines
Regards Yafang
PATCH v2 1/1 bpftool: Fix build warnings with -Wtype-limits
In reply to Quentin MonnetQuentin reported build warnings when building bpftool :
link.c: In function ‘perf_config_hw_cache_str’:
link.c:86:18: warning: comparison of unsigned expression in ‘>= 0’ is always true [-Wtype-limits]
86 | if ((id) >= 0 && (id) < ARRAY_SIZE(array)) \
| ^~
link.c:320:20: note: in expansion of macro ‘perf_event_name’
320 | hw_cache = perf_event_name(evsel__hw_cache, config & 0xff);
| ^~~~~~~~~~~~~~~
[... more of the same for the other calls to perf_event_name ...]
He also pointed out the reason and the solution:
We're always passing unsigned, so it should be safe to drop the check on (id) >= 0.
--- tools/bpf/bpftool/link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/link.c +1 -1
@@ -83,7 +83,7 @@ const char *evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX] = {#define perf_event_name (array, id) ({ \ const char *event_str = NULL; \ \ - if ((id) >= 0 && (id) < ARRAY_SIZE(array)) \ + if ((id) < ARRAY_SIZE(array)) \ event_str = array[id]; \ event_str; \ })
Signature · 1 line
2.34.1
Re: [PATCH v2 bpf-next] bpftool: Fix build warnings with -Wtype-limits
This patch was applied to bpf/bpf.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <[email protected]>:
Quoted 11 lines · On Wed, 30 Aug 2023 03:03:25 +0000 you wrote:
Quentin reported build warnings when building bpftool :
link.c: In function ‘perf_config_hw_cache_str’:
link.c:86:18: warning: comparison of unsigned expression in ‘>= 0’ is always true [-Wtype-limits]
86 | if ((id) >= 0 && (id) <ARRAY_SIZE(array)) \
| ^~
link.c:320:20: note: in expansion of macro ‘perf_event_name’
320 |hw_cache=perf_event_name(evsel__hw_cache, config & 0xff);
| ^~~~~~~~~~~~~~~
[... more of the same for the other calls toperf_event_name...]
Quoted 1 line
[...]
Here is the summary with links:
- [v2,bpf-next] bpftool: Fix build warnings with -Wtype-limits
https://git.kernel.org/bpf/bpf/c/6a8faf107091
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html