Re: [PATCH bpf-next 07/11] samples: bpf: fix uin64_t format literals

[Song Liu <song@kernel.org>]

On Thu, Apr 14, 2022 at 3:46 PM Alexander Lobakin <alobakin@pm.me> wrote:
>
> There's a couple places where uin64_t is being passed as an %ld
> format argument, which is incorrect (should be %lld). Fix them.

This will cause some warning on some 64-bit compiler, no?

Song

>
> Fixes: 51570a5ab2b7 ("A Sample of using socket cookie and uid for traffic monitoring")
> Fixes: 00f660eaf378 ("Sample program using SO_COOKIE")
> Signed-off-by: Alexander Lobakin <alobakin@pm.me>
> ---
>  samples/bpf/cookie_uid_helper_example.c | 12 ++++++------
>  samples/bpf/lwt_len_hist_user.c         |  4 ++--
>  2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/samples/bpf/cookie_uid_helper_example.c b/samples/bpf/cookie_uid_helper_example.c
> index f0df3dda4b1f..1b98debb6019 100644
> --- a/samples/bpf/cookie_uid_helper_example.c
> +++ b/samples/bpf/cookie_uid_helper_example.c
> @@ -207,9 +207,9 @@ static void print_table(void)
>                         error(1, errno, "fail to get entry value of Key: %u\n",
>                                 curN);
>                 } else {
> -                       printf("cookie: %u, uid: 0x%x, Packet Count: %lu,"
> -                               " Bytes Count: %lu\n", curN, curEntry.uid,
> -                               curEntry.packets, curEntry.bytes);
> +                       printf("cookie: %u, uid: 0x%x, Packet Count: %llu, Bytes Count: %llu\n",
> +                              curN, curEntry.uid, curEntry.packets,
> +                              curEntry.bytes);
>                 }
>         }
>  }
> @@ -265,9 +265,9 @@ static void udp_client(void)
>                 if (res < 0)
>                         error(1, errno, "lookup sk stat failed, cookie: %lu\n",
>                               cookie);
> -               printf("cookie: %lu, uid: 0x%x, Packet Count: %lu,"
> -                       " Bytes Count: %lu\n\n", cookie, dataEntry.uid,
> -                       dataEntry.packets, dataEntry.bytes);
> +               printf("cookie: %llu, uid: 0x%x, Packet Count: %llu, Bytes Count: %llu\n\n",
> +                      cookie, dataEntry.uid, dataEntry.packets,
> +                      dataEntry.bytes);
>         }
>         close(s_send);
>         close(s_rcv);
> diff --git a/samples/bpf/lwt_len_hist_user.c b/samples/bpf/lwt_len_hist_user.c
> index 430a4b7e353e..4ef22571aa67 100644
> --- a/samples/bpf/lwt_len_hist_user.c
> +++ b/samples/bpf/lwt_len_hist_user.c
> @@ -44,7 +44,7 @@ int main(int argc, char **argv)
>
>         while (bpf_map_get_next_key(map_fd, &key, &next_key) == 0) {
>                 if (next_key >= MAX_INDEX) {
> -                       fprintf(stderr, "Key %lu out of bounds\n", next_key);
> +                       fprintf(stderr, "Key %llu out of bounds\n", next_key);
>                         continue;
>                 }
>
> @@ -66,7 +66,7 @@ int main(int argc, char **argv)
>
>         for (i = 1; i <= max_key + 1; i++) {
>                 stars(starstr, data[i - 1], max_value, MAX_STARS);
> -               printf("%8ld -> %-8ld : %-8ld |%-*s|\n",
> +               printf("%8ld -> %-8ld : %-8lld |%-*s|\n",
>                        (1l << i) >> 1, (1l << i) - 1, data[i - 1],
>                        MAX_STARS, starstr);
>         }
> --
> 2.35.2
>
>