| Message ID | 20240902093248.23473-1-chenyuan_fl@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 02baa0a2a677cf543899bc3eb43ed92caf4aba7a |
| Headers | show |
| Series | selftests/bpf: Fix procmap_query()'s params mismatch and compilation warning | expand |
On Mon, Sep 02, 2024 at 05:32:48PM +0800, Yuan Chen wrote: > From: Yuan Chen <chenyuan@kylinos.cn> > > 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'. > > Signed-off-by: Yuan Chen <chenyuan@kylinos.cn> perhaps also Fixes: 4e9e07603ecd ("selftests/bpf: make use of PROCMAP_QUERY ioctl if available") Acked-by: Jiri Olsa <jolsa@kernel.org> jirka > --- > tools/testing/selftests/bpf/trace_helpers.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c > index 1bfd881c0e07..2d742fdac6b9 100644 > --- a/tools/testing/selftests/bpf/trace_helpers.c > +++ b/tools/testing/selftests/bpf/trace_helpers.c > @@ -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; > } > -- > 2.46.0 > >
diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c index 1bfd881c0e07..2d742fdac6b9 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -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; }