Skip to contentSkip to conversation

selftests/bpf: Fix procmap_query()'s params mismatch and compilation warning

PATCH Applied Yuan Chen 2 participants 2 messages Sep 3, 2024 – Sep 4, 2024

Subsystems (3)
lore
Share & tools
lore

Yuan Chen

author
#0 lore raw

PATCH v2 1/1 selftests/bpf: Fix procmap_query()'s params mismatch and compilation warning

From: Yuan Chen <[email protected]>

When the PROCMAP_QUERY is not defined, a compilation error occurs due to the mismatch of the procmap_query()'s params, procmap_query() only be called in the file where the function is defined, modify the params so they can match.

We get a warning when build samples/bpf:
trace_helpers.c:252:5: warning: no previous prototype for ‘procmap_query’ [-Wmissing-prototypes]
252 | int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, size_t *offset, int *flags)
| ^~~~~~~~~~~~~
As this function is only used in the file, mark it as 'static'.

Fixes 4e9e07603ecd ("selftests/bpf: make use of PROCMAP_QUERY ioctl if available")
---
 tools/testing/selftests/bpf/trace_helpers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/trace_helpers.c +2 -2
index 1bfd881c0e07..2d742fdac6b9 100644
@@ -249,7 +249,7 @@ int kallsyms_find(const char *sym, unsigned long long *addr)
 #ifdef PROCMAP_QUERY
 int env_verbosity __weak = 0;
 
-int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, size_t *offset, int *flags)
+static int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, size_t *offset, int *flags)
 {
 	char path_buf[PATH_MAX], build_id_buf[20];
 	struct procmap_query q;
@@ -293,7 +293,7 @@ int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, si
 	return 0;
 }
 #else
-int procmap_query(int fd, const void *addr, size_t *start, size_t *offset, int *flags)
+static int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, size_t *offset, int *flags)
 {
 	return -EOPNOTSUPP;
 }
Signature · 1 line
2.46.0
#1 lore raw
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Quoted 6 lines · On Tue, 3 Sep 2024 09:28:39 +0800 you wrote:

From: Yuan Chen <[email protected]>

When the PROCMAP_QUERY is not defined, a compilation error occurs due to the mismatch of the procmap_query()'s params, procmap_query() only be called in the file where the function is defined, modify the params so they can match.

Quoted 7 lines

We get a warning when build samples/bpf:
trace_helpers.c:252:5: warning: no previous prototype for ‘procmap_query’ [-Wmissing-prototypes]
252 | int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, size_t *offset, int *flags)
| ^~~~~~~~~~~~~
As this function is only used in the file, mark it as 'static'.

[...]

Here is the summary with links:
- [v2,1/1] selftests/bpf: Fix procmap_query()'s params mismatch and compilation warning

    https://git.kernel.org/bpf/bpf-next/c/02baa0a2a677

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html