utils: Fix BIT() to support up to 64 bits on all architectures
Subsystems (2)
PATCH 1/2 utils: Fix BIT() to support up to 64 bits on all architectures
devlink and vdpa use BIT() together with 64-bit flag fields. devlink is already using bit numbers greater than 31 and so does not work correctly on 32-bit architectures.
Fix this by making BIT() use uint64_t instead of unsigned long.
--- include/utils.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/utils.h +2 -1
@@ -8,6 +8,7 @@#include <stdlib.h> #include <stdbool.h> #include <time.h> +#include <stdint.h> #ifdef HAVE_LIBBSD #include <bsd/string.h>
@@ -264,7 +265,7 @@ void print_nlmsg_timestamp(FILE *fp, const struct nlmsghdr *n);unsigned int print_name_and_link (const char *fmt,const char *name,struct rtattr *tb[]); -#define BIT (nr) (1UL << (nr)) +#define BIT (nr) (UINT64_C(1) << (nr))#define ARRAY_SIZE (x) (sizeof(x) / sizeof((x)[0]))
Signature · 1 line
2.20.1
PATCH 2/2 devlink: Fix printf() type mismatches on 32-bit architectures
devlink currently uses "%lu" to format values of type uint64_t, but on 32-bit architectures uint64_t is defined as unsigned long long and this does not work correctly.
Fix this by using the standard macro PRIu64 instead.
--- devlink/devlink.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
devlink/devlink.c +4 -4
@@ -3546,7 +3546,7 @@ static int cmd_dev_flash_status_cb(const struct nlmsghdr *nlh, void *data) } }if (total) { -pr_out_tty (" %3lu%%" , (done *100 ) / total); +pr_out_tty (" %3" PRIu64"%%" , (done *100 ) / total); ctx->last_pc =1 ; }else { ctx->last_pc =0 ;
@@ -3601,7 +3601,7 @@ static void cmd_dev_flash_time_elapsed(struct cmd_dev_flash_status_ctx *ctx)*/ if (!ctx->status_msg_timeout) { len =snprintf (msg,sizeof (msg), -" ( %lum %lus )" , elapsed_m, elapsed_s); +" ( %" PRIu64"m %" PRIu64"s )" , elapsed_m, elapsed_s); }else if (res.tv_sec <= ctx->status_msg_timeout) {uint64_t timeout_m, timeout_s;
@@ -3609,11 +3609,11 @@ static void cmd_dev_flash_time_elapsed(struct cmd_dev_flash_status_ctx *ctx) timeout_s = ctx->status_msg_timeout %60 ; len =snprintf (msg,sizeof (msg), -" ( %lum %lus : %lum %lus )" , +" ( %" PRIu64"m %" PRIu64"s : %" PRIu64"m %" PRIu64"s )" , elapsed_m, elapsed_s, timeout_m, timeout_s); }else { len =snprintf (msg,sizeof (msg), -" ( %lum %lus : timeout reached )" , elapsed_m, elapsed_s); +" ( %" PRIu64"m %" PRIu64"s : timeout reached )" , elapsed_m, elapsed_s); } ctx->elapsed_time_msg_len = len;
Signature · 1 line
2.20.1
This series was applied to iproute2/iproute2.git (refs/heads/main):
Hello:
This series was applied to iproute2/iproute2.git (refs/heads/main):
Quoted 9 lines · On Tue, 29 Jun 2021 01:24:46 +0200 you wrote:
devlink and vdpa use
BIT()together with 64-bit flag fields. devlink is already using bit numbers greater than 31 and so does not work correctly on 32-bit architectures.Fix this by making
BIT()useuint64_tinstead of unsigned long.Signed-off-by Ben Hutchings <[email protected]>[...]
Here is the summary with links:
- [iproute2,1/2] utils: Fix BIT() to support up to 64 bits on all architectures
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=4ac0383a598d - [iproute2,2/2] devlink: Fix printf() type mismatches on 32-bit architectures https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=33cf9306c824
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html