diff mbox series

[v2,bpf-next,2/3] libbpf: fix compilation errors on ppc64le for btf dump typed data

Message ID 1626475617-25984-3-git-send-email-alan.maguire@oracle.com
State New
Headers show
Series libbpf: BTF typed dump cleanups | expand

Commit Message

Alan Maguire July 16, 2021, 10:46 p.m. UTC
Andrii reports:

"ppc64le arch doesn't like the %lld:

 In file included from btf_dump.c:22:
btf_dump.c: In function 'btf_dump_type_data_check_overflow':
libbpf_internal.h:111:22: error: format '%lld' expects argument of
type 'long long int', but argument 3 has type '__s64' {aka 'long int'}
[-Werror=format=]
  111 |  libbpf_print(level, "libbpf: " fmt, ##__VA_ARGS__); \
      |                      ^~~~~~~~~~
libbpf_internal.h:114:27: note: in expansion of macro '__pr'
  114 | #define pr_warn(fmt, ...) __pr(LIBBPF_WARN, fmt, ##__VA_ARGS__)
      |                           ^~~~
btf_dump.c:1992:3: note: in expansion of macro 'pr_warn'
 1992 |   pr_warn("unexpected size [%lld] for id [%u]\n",
      |   ^~~~~~~
btf_dump.c:1992:32: note: format string is defined here
 1992 |   pr_warn("unexpected size [%lld] for id [%u]\n",
      |                             ~~~^
      |                                |
      |                                long long int
      |                             %ld

Cast to size_t and use %zu."

Reported-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
---
 tools/lib/bpf/btf_dump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Andrii Nakryiko July 17, 2021, 12:32 a.m. UTC | #1
On Fri, Jul 16, 2021 at 3:47 PM Alan Maguire <alan.maguire@oracle.com> wrote:
>
> Andrii reports:
>
> "ppc64le arch doesn't like the %lld:
>
>  In file included from btf_dump.c:22:
> btf_dump.c: In function 'btf_dump_type_data_check_overflow':
> libbpf_internal.h:111:22: error: format '%lld' expects argument of
> type 'long long int', but argument 3 has type '__s64' {aka 'long int'}
> [-Werror=format=]
>   111 |  libbpf_print(level, "libbpf: " fmt, ##__VA_ARGS__); \
>       |                      ^~~~~~~~~~
> libbpf_internal.h:114:27: note: in expansion of macro '__pr'
>   114 | #define pr_warn(fmt, ...) __pr(LIBBPF_WARN, fmt, ##__VA_ARGS__)
>       |                           ^~~~
> btf_dump.c:1992:3: note: in expansion of macro 'pr_warn'
>  1992 |   pr_warn("unexpected size [%lld] for id [%u]\n",
>       |   ^~~~~~~
> btf_dump.c:1992:32: note: format string is defined here
>  1992 |   pr_warn("unexpected size [%lld] for id [%u]\n",
>       |                             ~~~^
>       |                                |
>       |                                long long int
>       |                             %ld
>
> Cast to size_t and use %zu."
>

Quoting me isn't a great commit message by itself, tbh. Reworded.



> Reported-by: Andrii Nakryiko <andrii@kernel.org>
> Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
> ---
>  tools/lib/bpf/btf_dump.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c
> index 814a538..e5fbfb8 100644
> --- a/tools/lib/bpf/btf_dump.c
> +++ b/tools/lib/bpf/btf_dump.c
> @@ -2011,8 +2011,8 @@ static int btf_dump_type_data_check_overflow(struct btf_dump *d,
>         __s64 size = btf__resolve_size(d->btf, id);
>
>         if (size < 0 || size >= INT_MAX) {
> -               pr_warn("unexpected size [%lld] for id [%u]\n",
> -                       size, id);
> +               pr_warn("unexpected size [%zu] for id [%u]\n",
> +                       (size_t)size, id);
>                 return -EINVAL;
>         }
>
> --
> 1.8.3.1
>
diff mbox series

Patch

diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c
index 814a538..e5fbfb8 100644
--- a/tools/lib/bpf/btf_dump.c
+++ b/tools/lib/bpf/btf_dump.c
@@ -2011,8 +2011,8 @@  static int btf_dump_type_data_check_overflow(struct btf_dump *d,
 	__s64 size = btf__resolve_size(d->btf, id);
 
 	if (size < 0 || size >= INT_MAX) {
-		pr_warn("unexpected size [%lld] for id [%u]\n",
-			size, id);
+		pr_warn("unexpected size [%zu] for id [%u]\n",
+			(size_t)size, id);
 		return -EINVAL;
 	}