Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Thu, 21 Apr 2022 00:39:32 +0000
To:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>
From:   Alexander Lobakin <alobakin@pm.me>
Cc:     Alexander Lobakin <alobakin@pm.me>,
        Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
        Song Liu <songliubraving@fb.com>,
        Kumar Kartikeya Dwivedi <memxor@gmail.com>,
        bpf@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Reply-To: Alexander Lobakin <alobakin@pm.me>
Subject: [PATCH v2 bpf 07/11] samples/bpf: fix uin64_t format literals
Message-ID: <20220421003152.339542-8-alobakin@pm.me>
In-Reply-To: <20220421003152.339542-1-alobakin@pm.me>
References: <20220421003152.339542-1-alobakin@pm.me>
Feedback-ID: 22809121:user:proton
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

There's a couple places where uin64_t is being passed as an %lu
format argument. That type is defined as unsigned long on 64-bit
systems and as unsigned long long on 32-bit, so neither %lu nor
%llu are not universal.
One of the options is %PRIu64, but since it's always 8-byte long,
just cast it to the _proper_ __u64 and print as %llu.

Fixes: 51570a5ab2b7 ("A Sample of using socket cookie and uid for traffic m=
onitoring")
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         |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/samples/bpf/cookie_uid_helper_example.c b/samples/bpf/cookie_u=
id_helper_example.c
index f0df3dda4b1f..269fac58fd5c 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)
 =09=09=09error(1, errno, "fail to get entry value of Key: %u\n",
 =09=09=09=09curN);
 =09=09} else {
-=09=09=09printf("cookie: %u, uid: 0x%x, Packet Count: %lu,"
-=09=09=09=09" Bytes Count: %lu\n", curN, curEntry.uid,
-=09=09=09=09curEntry.packets, curEntry.bytes);
+=09=09=09printf("cookie: %u, uid: 0x%x, Packet Count: %llu, Bytes Count: %=
llu\n",
+=09=09=09       curN, curEntry.uid, (__u64)curEntry.packets,
+=09=09=09       (__u64)curEntry.bytes);
 =09=09}
 =09}
 }
@@ -265,9 +265,9 @@ static void udp_client(void)
 =09=09if (res < 0)
 =09=09=09error(1, errno, "lookup sk stat failed, cookie: %lu\n",
 =09=09=09      cookie);
-=09=09printf("cookie: %lu, uid: 0x%x, Packet Count: %lu,"
-=09=09=09" Bytes Count: %lu\n\n", cookie, dataEntry.uid,
-=09=09=09dataEntry.packets, dataEntry.bytes);
+=09=09printf("cookie: %llu, uid: 0x%x, Packet Count: %llu, Bytes Count: %l=
lu\n\n",
+=09=09       (__u64)cookie, dataEntry.uid, (__u64)dataEntry.packets,
+=09=09       (__u64)dataEntry.bytes);
 =09}
 =09close(s_send);
 =09close(s_rcv);
diff --git a/samples/bpf/lwt_len_hist_user.c b/samples/bpf/lwt_len_hist_use=
r.c
index 430a4b7e353e..c682faa75a2b 100644
--- a/samples/bpf/lwt_len_hist_user.c
+++ b/samples/bpf/lwt_len_hist_user.c
@@ -44,7 +44,8 @@ int main(int argc, char **argv)

 =09while (bpf_map_get_next_key(map_fd, &key, &next_key) =3D=3D 0) {
 =09=09if (next_key >=3D MAX_INDEX) {
-=09=09=09fprintf(stderr, "Key %lu out of bounds\n", next_key);
+=09=09=09fprintf(stderr, "Key %llu out of bounds\n",
+=09=09=09=09(__u64)next_key);
 =09=09=09continue;
 =09=09}

@@ -66,8 +67,8 @@ int main(int argc, char **argv)

 =09for (i =3D 1; i <=3D max_key + 1; i++) {
 =09=09stars(starstr, data[i - 1], max_value, MAX_STARS);
-=09=09printf("%8ld -> %-8ld : %-8ld |%-*s|\n",
-=09=09       (1l << i) >> 1, (1l << i) - 1, data[i - 1],
+=09=09printf("%8ld -> %-8ld : %-8lld |%-*s|\n",
+=09=09       (1l << i) >> 1, (1l << i) - 1, (__u64)data[i - 1],
 =09=09       MAX_STARS, starstr);
 =09}

--
2.36.0