2022-03-17 02:39:24

by Guo Zhengkui

[permalink] [raw]
Subject: [PATCH] selftests: net: fix warning when compiling selftest/net

When I compile tools/testing/selftests/net/ by
`make -C tools/testing/selftests/net` with gcc (Debian 8.3.0-6) 8.3.0,
it reports the following warnings:

txtimestamp.c: In function 'validate_timestamp':
txtimestamp.c:164:29: warning: format '%lu' expects argument of type
'long unsigned int', but argument 3 has type 'int64_t'
{aka 'long long int'} [-Wformat=]
fprintf(stderr, "ERROR: %lu us expected between %d and %d\n",
~~^
%llu
cur64 - start64, min_delay, max_delay);
~~~~~~~~~~~~~~~
txtimestamp.c: In function '__print_ts_delta_formatted':
txtimestamp.c:173:22: warning: format '%lu' expects argument of type
'long unsigned int', but argument 3 has type 'int64_t'
{aka 'long long int'} [-Wformat=]
fprintf(stderr, "%lu ns", ts_delta);
~~^ ~~~~~~~~
%llu
txtimestamp.c:175:22: warning: format '%lu' expects argument of type
'long unsigned int', but argument 3 has type 'int64_t'
{aka 'long long int'} [-Wformat=]
fprintf(stderr, "%lu us", ts_delta / NSEC_PER_USEC);
~~^
%llu

`int64_t` is the alias for `long long int`. '%lld' is more suitable.

Signed-off-by: Guo Zhengkui <[email protected]>
---
tools/testing/selftests/net/txtimestamp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/net/txtimestamp.c b/tools/testing/selftests/net/txtimestamp.c
index fabb1d555ee5..ab8d0181218f 100644
--- a/tools/testing/selftests/net/txtimestamp.c
+++ b/tools/testing/selftests/net/txtimestamp.c
@@ -161,7 +161,7 @@ static void validate_timestamp(struct timespec *cur, int min_delay)
max_delay = min_delay + cfg_delay_tolerance_usec;

if (cur64 < start64 + min_delay || cur64 > start64 + max_delay) {
- fprintf(stderr, "ERROR: %lu us expected between %d and %d\n",
+ fprintf(stderr, "ERROR: %lld us expected between %d and %d\n",
cur64 - start64, min_delay, max_delay);
test_failed = true;
}
@@ -170,9 +170,9 @@ static void validate_timestamp(struct timespec *cur, int min_delay)
static void __print_ts_delta_formatted(int64_t ts_delta)
{
if (cfg_print_nsec)
- fprintf(stderr, "%lu ns", ts_delta);
+ fprintf(stderr, "%lld ns", ts_delta);
else
- fprintf(stderr, "%lu us", ts_delta / NSEC_PER_USEC);
+ fprintf(stderr, "%lld us", ts_delta / NSEC_PER_USEC);
}

static void __print_timestamp(const char *name, struct timespec *cur,
--
2.20.1


2022-03-17 06:46:36

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH] selftests: net: fix warning when compiling selftest/net

On Wed, 16 Mar 2022 19:50:40 +0800 Guo Zhengkui wrote:
> When I compile tools/testing/selftests/net/ by
> `make -C tools/testing/selftests/net` with gcc (Debian 8.3.0-6) 8.3.0,
> it reports the following warnings:
>
> txtimestamp.c: In function 'validate_timestamp':
> txtimestamp.c:164:29: warning: format '%lu' expects argument of type
> 'long unsigned int', but argument 3 has type 'int64_t'
> {aka 'long long int'} [-Wformat=]
> fprintf(stderr, "ERROR: %lu us expected between %d and %d\n",
> ~~^
> %llu
> cur64 - start64, min_delay, max_delay);
> ~~~~~~~~~~~~~~~
> txtimestamp.c: In function '__print_ts_delta_formatted':
> txtimestamp.c:173:22: warning: format '%lu' expects argument of type
> 'long unsigned int', but argument 3 has type 'int64_t'
> {aka 'long long int'} [-Wformat=]
> fprintf(stderr, "%lu ns", ts_delta);
> ~~^ ~~~~~~~~
> %llu
> txtimestamp.c:175:22: warning: format '%lu' expects argument of type
> 'long unsigned int', but argument 3 has type 'int64_t'
> {aka 'long long int'} [-Wformat=]
> fprintf(stderr, "%lu us", ts_delta / NSEC_PER_USEC);
> ~~^
> %llu
>
> `int64_t` is the alias for `long long int`. '%lld' is more suitable.

That's on 32bit machines, I think what you need to use is PRId64.
Or just cast the result / change variable types to long long.

2022-03-17 08:24:43

by Guo Zhengkui

[permalink] [raw]
Subject: Re: [PATCH] selftests: net: fix warning when compiling selftest/net

On 2022/3/17 11:22, Jakub Kicinski wrote:
> On Wed, 16 Mar 2022 19:50:40 +0800 Guo Zhengkui wrote:
>> When I compile tools/testing/selftests/net/ by
>> `make -C tools/testing/selftests/net` with gcc (Debian 8.3.0-6) 8.3.0,
>> it reports the following warnings:
>>
>> txtimestamp.c: In function 'validate_timestamp':
>> txtimestamp.c:164:29: warning: format '%lu' expects argument of type
>> 'long unsigned int', but argument 3 has type 'int64_t'
>> {aka 'long long int'} [-Wformat=]
>> fprintf(stderr, "ERROR: %lu us expected between %d and %d\n",
>> ~~^
>> %llu
>> cur64 - start64, min_delay, max_delay);
>> ~~~~~~~~~~~~~~~
>> txtimestamp.c: In function '__print_ts_delta_formatted':
>> txtimestamp.c:173:22: warning: format '%lu' expects argument of type
>> 'long unsigned int', but argument 3 has type 'int64_t'
>> {aka 'long long int'} [-Wformat=]
>> fprintf(stderr, "%lu ns", ts_delta);
>> ~~^ ~~~~~~~~
>> %llu
>> txtimestamp.c:175:22: warning: format '%lu' expects argument of type
>> 'long unsigned int', but argument 3 has type 'int64_t'
>> {aka 'long long int'} [-Wformat=]
>> fprintf(stderr, "%lu us", ts_delta / NSEC_PER_USEC);
>> ~~^
>> %llu
>>
>> `int64_t` is the alias for `long long int`. '%lld' is more suitable.
>
> That's on 32bit machines, I think what you need to use is PRId64.
> Or just cast the result / change variable types to long long.

But it should be '%ld' instead of '%lu', right?

Zhengkui

2022-03-18 10:58:44

by Guo Zhengkui

[permalink] [raw]
Subject: [PATCH linux-next v2] selftests: net: change fprintf format specifiers

`cur64`, `start64` and `ts_delta` are int64_t. Change
format specifiers in fprintf from '%lu' to '%ld'.

It has been tested with gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0
on x86_64.

Signed-off-by: Guo Zhengkui <[email protected]>
---
tools/testing/selftests/net/txtimestamp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/net/txtimestamp.c b/tools/testing/selftests/net/txtimestamp.c
index fabb1d555ee5..b8a52995a635 100644
--- a/tools/testing/selftests/net/txtimestamp.c
+++ b/tools/testing/selftests/net/txtimestamp.c
@@ -161,7 +161,7 @@ static void validate_timestamp(struct timespec *cur, int min_delay)
max_delay = min_delay + cfg_delay_tolerance_usec;

if (cur64 < start64 + min_delay || cur64 > start64 + max_delay) {
- fprintf(stderr, "ERROR: %lu us expected between %d and %d\n",
+ fprintf(stderr, "ERROR: %ld us expected between %d and %d\n",
cur64 - start64, min_delay, max_delay);
test_failed = true;
}
@@ -170,9 +170,9 @@ static void validate_timestamp(struct timespec *cur, int min_delay)
static void __print_ts_delta_formatted(int64_t ts_delta)
{
if (cfg_print_nsec)
- fprintf(stderr, "%lu ns", ts_delta);
+ fprintf(stderr, "%ld ns", ts_delta);
else
- fprintf(stderr, "%lu us", ts_delta / NSEC_PER_USEC);
+ fprintf(stderr, "%ld us", ts_delta / NSEC_PER_USEC);
}

static void __print_timestamp(const char *name, struct timespec *cur,
--
2.17.1

2022-03-19 00:24:39

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH linux-next v2] selftests: net: change fprintf format specifiers

On Fri, 18 Mar 2022 15:50:13 +0800 Guo Zhengkui wrote:
> `cur64`, `start64` and `ts_delta` are int64_t. Change
> format specifiers in fprintf from '%lu' to '%ld'.
>
> It has been tested with gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0
> on x86_64.

No, not like that. Please read up on printing int64_t.

2022-03-19 13:05:28

by Guo Zhengkui

[permalink] [raw]
Subject: Re: [PATCH linux-next v2] selftests: net: change fprintf format specifiers

On 2022/3/19 0:33, Jakub Kicinski wrote:
> On Fri, 18 Mar 2022 15:50:13 +0800 Guo Zhengkui wrote:
>> `cur64`, `start64` and `ts_delta` are int64_t. Change
>> format specifiers in fprintf from '%lu' to '%ld'.
>>
>> It has been tested with gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0
>> on x86_64.
>
> No, not like that. Please read up on printing int64_t.

Sorry for misunderstanding. I wrongly thought that it's just for 64-bit.

So I should use `PRId64`.

Zhengkui

2022-03-21 19:55:26

by Guo Zhengkui

[permalink] [raw]
Subject: [PATCH linux-next v3] selftests: net: change fprintf format specifiers

`cur64`, `start64` and `ts_delta` are int64_t. Change format
specifiers in fprintf from `"%lu"` to `"%" PRId64` to adapt
to 32-bit and 64-bit systems.

Signed-off-by: Guo Zhengkui <[email protected]>
---
tools/testing/selftests/net/txtimestamp.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/net/txtimestamp.c b/tools/testing/selftests/net/txtimestamp.c
index fabb1d555ee5..10f2fde3686b 100644
--- a/tools/testing/selftests/net/txtimestamp.c
+++ b/tools/testing/selftests/net/txtimestamp.c
@@ -161,7 +161,7 @@ static void validate_timestamp(struct timespec *cur, int min_delay)
max_delay = min_delay + cfg_delay_tolerance_usec;

if (cur64 < start64 + min_delay || cur64 > start64 + max_delay) {
- fprintf(stderr, "ERROR: %lu us expected between %d and %d\n",
+ fprintf(stderr, "ERROR: %" PRId64 " us expected between %d and %d\n",
cur64 - start64, min_delay, max_delay);
test_failed = true;
}
@@ -170,9 +170,9 @@ static void validate_timestamp(struct timespec *cur, int min_delay)
static void __print_ts_delta_formatted(int64_t ts_delta)
{
if (cfg_print_nsec)
- fprintf(stderr, "%lu ns", ts_delta);
+ fprintf(stderr, "%" PRId64 " ns", ts_delta);
else
- fprintf(stderr, "%lu us", ts_delta / NSEC_PER_USEC);
+ fprintf(stderr, "%" PRId64 " us", ts_delta / NSEC_PER_USEC);
}

static void __print_timestamp(const char *name, struct timespec *cur,
--
2.20.1

2022-03-22 00:36:18

by patchwork-bot+netdevbpf

[permalink] [raw]
Subject: Re: [PATCH linux-next v3] selftests: net: change fprintf format specifiers

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <[email protected]>:

On Sat, 19 Mar 2022 15:37:30 +0800 you wrote:
> `cur64`, `start64` and `ts_delta` are int64_t. Change format
> specifiers in fprintf from `"%lu"` to `"%" PRId64` to adapt
> to 32-bit and 64-bit systems.
>
> Signed-off-by: Guo Zhengkui <[email protected]>
> ---
> tools/testing/selftests/net/txtimestamp.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)

Here is the summary with links:
- [linux-next,v3] selftests: net: change fprintf format specifiers
https://git.kernel.org/netdev/net-next/c/94f19e1ec38f

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html