[PATCH] bpftool: ensure bytes_memlock json output is correct

[PATCH] bpftool: ensure bytes_memlock json output is correct

[Chris Arges]

From 40107402b805c4eaca5ce7a0db66d10e9219f2bf Mon Sep 17 00:00:00 2001
From: Chris J Arges <carges@cloudflare.com>
Date: Wed, 9 Mar 2022 15:41:58 -0600
Subject: [PATCH] bpftool: ensure bytes_memlock json output is correct

If a bpf map is created over 2^32 the memlock value as displayed in JSON
format will be incorrect. Use atoll instead of atoi so that the correct
number is displayed.

```
$ bpftool map create /sys/fs/bpf/test_bpfmap type hash key 4 \
  value 1024 entries 4194304 name test_bpfmap
$ bpftool map list
1: hash  name test_bpfmap  flags 0x0
        key 4B  value 1024B  max_entries 4194304  memlock 4328521728B
$ sudo bpftool map list -j | jq .[].bytes_memlock
33554432
```

Signed-off-by: Chris J Arges <carges@cloudflare.com>
---
 tools/bpf/bpftool/map.c  | 2 +-
 tools/bpf/bpftool/prog.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
index cc530a229812..7002f815b7ed 100644
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c
@@ -504,7 +504,7 @@ static int show_map_close_json(int fd, struct bpf_map_info *info)
 	jsonw_uint_field(json_wtr, "max_entries", info->max_entries);
 
 	if (memlock)
-		jsonw_int_field(json_wtr, "bytes_memlock", atoi(memlock));
+		jsonw_int_field(json_wtr, "bytes_memlock", atoll(memlock));
 	free(memlock);
 
 	if (info->type == BPF_MAP_TYPE_PROG_ARRAY) {
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 2a21d50516bc..edd8a9619341 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -480,7 +480,7 @@ static void print_prog_json(struct bpf_prog_info *info, int fd)
 
 	memlock = get_fdinfo(fd, "memlock");
 	if (memlock)
-		jsonw_int_field(json_wtr, "bytes_memlock", atoi(memlock));
+		jsonw_int_field(json_wtr, "bytes_memlock", atoll(memlock));
 	free(memlock);
 
 	if (info->nr_map_ids)
-- 
2.25.1

Re: [PATCH] bpftool: ensure bytes_memlock json output is correct

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:

On Thu, 10 Mar 2022 16:28:13 -0600 you wrote:
> >From 40107402b805c4eaca5ce7a0db66d10e9219f2bf Mon Sep 17 00:00:00 2001
> From: Chris J Arges <carges@cloudflare.com>
> Date: Wed, 9 Mar 2022 15:41:58 -0600
> Subject: [PATCH] bpftool: ensure bytes_memlock json output is correct
> 
> If a bpf map is created over 2^32 the memlock value as displayed in JSON
> format will be incorrect. Use atoll instead of atoi so that the correct
> number is displayed.
> 
> [...]

Here is the summary with links:
  - bpftool: ensure bytes_memlock json output is correct
    https://git.kernel.org/bpf/bpf-next/c/357b3cc3c046

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