From nobody Tue Jun 23 03:55:09 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 527F3C433FE for ; Thu, 10 Mar 2022 22:28:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245521AbiCJW3T (ORCPT ); Thu, 10 Mar 2022 17:29:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235627AbiCJW3R (ORCPT ); Thu, 10 Mar 2022 17:29:17 -0500 Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C8F9D77 for ; Thu, 10 Mar 2022 14:28:15 -0800 (PST) Received: by mail-oi1-x236.google.com with SMTP id z8so7499686oix.3 for ; Thu, 10 Mar 2022 14:28:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=message-id:date:mime-version:user-agent:content-language:to:cc:from :subject:content-transfer-encoding; bh=L50gyqenwrlhooMlFljcH3M9Bm8aHoxCPPqfCu4Q2BI=; b=lURtiOIQm1Fzr/7eATPUeCmC6bh/GUI2W8hKvwkH9I5Hgz6q2OQzhef9p6ImjTcXHe h9faC3slkGhKUbotxd9MX4b/AQgERTCnrg8AAYxcGdc17lw9MrZ0WXSHvTmMSg0bp/3f FBjQvky5iTLBZTvxN8ZfaDt5N4ytq6+LxzfDc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:cc:from:subject:content-transfer-encoding; bh=L50gyqenwrlhooMlFljcH3M9Bm8aHoxCPPqfCu4Q2BI=; b=5wSBeouu/7k7YyP7TSQ22Yq6BOQHTv2o7WpA9aF7v/hyt4QdwzsSNS56B/yqLQtxPP 1kNKFQZqoVEq++4K2XpgiL7E4fpod6JhM8MSd6dGeX5Khjg4u5JCzuVQD5WxS8WWX+3p fwWvkzzMz8bH4zG4MYjULRpwCDnh/R+tS6MxI/F5p1KZtWMfiOuq32o9U5qpXDkZuha1 uNVGA2MF8BQX0n3k5VCjemAHSlFt3z3pB6MhNgPw9c5dKxzWoWx9uXfU9mV+kre2yPw3 LQTNLc6TeI+qzrmG9Mb7jkUYf9yZoKXafR+/CCmXfz/va4NaFZNPldEgSYcWFE0znu+W fFaQ== X-Gm-Message-State: AOAM532dYZJq9dELIOQqh14IOWYIJe8xcam1Pr7jtMLdn6eLw2o1GHg7 SpdWuBIt+yAZz2pki7naM3i71jw65gAVvw== X-Google-Smtp-Source: ABdhPJz5k0vitjPY00OS9QKIXyOGTge4rA2yWMVhe8B/IrOBfOa8Lh5TCXso/P4dVRUtlc4pa6N4VA== X-Received: by 2002:a05:6808:179c:b0:2d9:c4bd:cbe with SMTP id bg28-20020a056808179c00b002d9c4bd0cbemr10850938oib.163.1646951294923; Thu, 10 Mar 2022 14:28:14 -0800 (PST) Received: from [192.168.1.230] (cpe-68-203-7-69.austin.res.rr.com. [68.203.7.69]) by smtp.gmail.com with ESMTPSA id d2-20020a05683025c200b005b248ae4d4asm3152258otu.59.2022.03.10.14.28.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 10 Mar 2022 14:28:14 -0800 (PST) Message-ID: Date: Thu, 10 Mar 2022 16:28:13 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org Cc: quentin@isovalent.com, ast@kernel.org, andrii@kernel.org From: Chris Arges Subject: [PATCH] bpftool: ensure bytes_memlock json output is correct Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From 40107402b805c4eaca5ce7a0db66d10e9219f2bf Mon Sep 17 00:00:00 2001 From: Chris J Arges 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 --- 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_i= nfo *info) jsonw_uint_field(json_wtr, "max_entries", info->max_entries); =20 if (memlock) - jsonw_int_field(json_wtr, "bytes_memlock", atoi(memlock)); + jsonw_int_field(json_wtr, "bytes_memlock", atoll(memlock)); free(memlock); =20 if (info->type =3D=3D 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) =20 memlock =3D 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); =20 if (info->nr_map_ids) --=20 2.25.1