Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <8b893118-6687-1d2b-d838-1a0c6ff7d886@meta.com>
Date:   Mon, 24 Apr 2023 18:07:27 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.10.0
Subject: Re: [PATCH bpf-next v2] bpftool: Dump map id instead of value for
 map_of_maps types
To:     Xueming Feng <kuro@kuroa.me>,
        Quentin Monnet <quentin@isovalent.com>
Cc:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
        bpf@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20230424090935.52707-1-kuro@kuroa.me>
Content-Language: en-US
From:   Yonghong Song <yhs@meta.com>
In-Reply-To: <20230424090935.52707-1-kuro@kuroa.me>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b0ZUckk3ekhlZ1VaMjZOSTA0SVBrVlBjRi83WFBnYnU1amhZUGFFVld5ZUF4?=
 =?utf-8?B?NUZOdlEybng3Znd0REdMQ2doc3VyRTFhdUIvNnFlUEQ0NnJVTXFUN1FuZlhH?=
 =?utf-8?B?eFphNDMwUmVqeklzaVJUdEpLOXlBRTRMb244ZjlINHN5Yk0yeDA0SzFGNml5?=
 =?utf-8?B?a0Q5aGV5Tm9wcjVWem1YenMrR1NiUUlvNTlGZmVGTlB2ZmFCbHdUTjN1OFMv?=
 =?utf-8?B?cVk0UGt3bmpHeWJob2FpQlZwMDdRVVN1Ny9Ja3RZL3BWYnA0bllDWldHa3px?=
 =?utf-8?B?SGlrbHM0RWtScEIvaHlFRzdUR0NyU1N2YVFrcVRsdFdieitLNGdPQXVzclkr?=
 =?utf-8?B?a0VIOWczMHBZMGEvNDlYYURzdEtrcndNUkplL0tiNE9aNEdEcUlhdzZWQTdI?=
 =?utf-8?B?R3Zpd1VLbWErajdXMmRxME9ybnhiMlhCbzh2L3UzeEdWaTZOZGVZTGFRSjUr?=
 =?utf-8?B?Uk04Z3Z1SStJQ3JuL2JjTFFlUnFNMUs3QmxqWWZ6WHRST3VNZWVaV3pTblcv?=
 =?utf-8?B?UnBkbVR6M1RiN3A4b0lPcVhOWGxXZThLeUxlTXBRQzNxcmgveERqVW9UR2I3?=
 =?utf-8?B?Q0p4b2NrMjZlSjd2aHBCUWNuQ3dVRkZ2eDhRc0drRFloSUpCUUxqcHFXdmpw?=
 =?utf-8?B?QmgwZU00eEMwdzRENW9FbWZrZnNrcE1VeFBFYkdGTFhnelJKTXkrdWljeTRM?=
 =?utf-8?B?VC8rNUJYc2RCZGxIK21odnp6VG1TUHBJMjNQS1IxcGNIMG1ELzdJYTBLdVM0?=
 =?utf-8?B?UzA3WVk3Z01IanhkTjRvMWM3ZmpQK1FZOVlyV3h0OXVMa2w3ZWJlOXQ5amow?=
 =?utf-8?B?NUZCdzZMa1FZenQzcStzR2t1UnFHMWVLQ25QVXVKcjRWL09oMC9XWkZwQlo4?=
 =?utf-8?B?bDdHNWs1ZXR5c290RkRxMk5PZnFYVlJRMW5BdUVrZk1DU3c1c2R3ZFdhZERm?=
 =?utf-8?B?TEo2WVY4WWVRT0N1N3NQVVhKR1pNU2NjL3ZJTzczN0IyTThPQjhyN21WYWFl?=
 =?utf-8?B?TW1qQkhDbjZSdFo5SUVBM0R4QWVKQ0J4ZTRpMWFNdXhXdUw0dnFHdzc2R0pK?=
 =?utf-8?B?SWFPMStoaWVGWVYranhqczl3dXNqU1MyVzZBczBlOUNqQ1pHaVFhNldnbHlR?=
 =?utf-8?B?TGcvcWJGK1MxbXJ4aG40cmY3VzFkOEFYT3lwMUJRUXdPd01CQnlpKzUvb0c0?=
 =?utf-8?B?K1lrYW9nWVVRWS9zUTlzdGs5VWU0aHZZVk5JdCs0S2RuYjRXM09tZ1gzOTRq?=
 =?utf-8?B?RmZKUnNJVEpFWHJCN2xDL29taHR4U2hvUlBOVE9sckdRb0hDUjl1WSt2K2pS?=
 =?utf-8?B?aEZuRmFWNXdZclBKZUtWODJ3R1F1TEdLQWJYZUFJMERLc213d0ZVNlNNTmtX?=
 =?utf-8?B?M3g1TG5JZHpuUW4yV3UzSXJRVmNsMTc5OVdOM1JHTHk1NzZwdk05TTQ3Skty?=
 =?utf-8?B?RXZyTjhBeUVWanR1SHZ2bXJPWXlObDBxSHpQT0JhM2REdTJTUmwyYk51eDlq?=
 =?utf-8?B?c2szQ2paRG05WGpzVGMyZXhFaXkxakg3Si93RkV6alZRNHVGb3U0WXRNajJZ?=
 =?utf-8?B?WjA3b3NIT21FYmx4SnJwRGtyYnZMdDBtT3ZpVFd6Q0F3b20rNFQ2bE1uRHl2?=
 =?utf-8?B?d2plSy9TSTQ2UnpTTlRhajZZbFI1M0tFOWVlRFo2TDFCNmJhWlRxVE9GOWRy?=
 =?utf-8?B?bjBaSFBYRlUyeDNSWlhNbkpTZGNQeXJLRElQNXVPMEl3YXZ0dHNtaTVtWlRN?=
 =?utf-8?B?OVNaVm1zTEdXd1p2dFZlYkh4N3NacUJZUTFCTjlkWW8yTVJHY2RmOWtWRlI4?=
 =?utf-8?B?MEFVT0dMaklNN25zWHZWYzRqemIraXFiRE5YVHBMeldOenJOWE0zWTE1UEdR?=
 =?utf-8?B?ZkVCdTFsaVJMRzVPRXR6NUptWHl3eHNIOEFlcTNWbE5qeVhyaGw4OUVqbHNs?=
 =?utf-8?B?YVg3a3c3SWlOc0kvZnIrNEcxUlVLNTlJNlM1ZkN6Z01iYU9iY3pySWNBa09F?=
 =?utf-8?B?VmFLcmllcEV4UTFNSE1kWTVLKzU3VGxoWDRGYlBPcDJsYUY1L09ZOG5LTUYz?=
 =?utf-8?B?UGllR2ZRd1VVd1RVZTdxYjNERitUTXVNRS8rK1E5eTJxdEh5MVFwVW95R0hX?=
 =?utf-8?B?dkQ3cVIzS1hlWTBTKytVSFljRlRmNXBDOElyeG0zaE1FRlVFK0hhOWVwK3E3?=
 =?utf-8?B?L0E9PQ==?=
X-OriginatorOrg: meta.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7bbc5526-775a-45ca-d99d-08db4529720e
X-MS-Exchange-CrossTenant-AuthSource: SN6PR1501MB2064.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 01:07:31.4002
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: HiDIj6ABf9qHC4bM/37geC6MXdAJA35VzbqcrrQY778FQuHNAJUpFDXailO9RPj/
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR15MB5902
X-Proofpoint-GUID: yo5uIrlis9T_GVRCxefvGO1KT_x7jIYl
X-Proofpoint-ORIG-GUID: yo5uIrlis9T_GVRCxefvGO1KT_x7jIYl
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-24_12,2023-04-21_01,2023-02-09_01
X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 4/24/23 2:09 AM, Xueming Feng wrote:
> When using `bpftool map dump` in plain format, it is usually
> more convenient to show the inner map id instead of raw value.
> Changing this behavior would help with quick debugging with
> `bpftool`, without disrupting scripted behavior. Since user
> could dump the inner map with id, and need to convert value.
> 
> Signed-off-by: Xueming Feng <kuro@kuroa.me>
> ---
> Changes in v2:
>    - Fix commit message grammar.
> 	- Change `print_uint` to only print to stdout, make `arg` const, and rename
> 	  `n` to `arg_size`.
>    - Make `print_uint` able to take any size of argument up to `unsigned long`,
> 		and print it as unsigned decimal.
> 
> Thanks for the review and suggestions! I have changed my patch accordingly.
> There is a possibility that `arg_size` is larger than `unsigned long`,
> but previous review suggested that it should be up to the caller function to
> set `arg_size` correctly. So I didn't add check for that, should I?
> 
>   tools/bpf/bpftool/main.c | 15 +++++++++++++++
>   tools/bpf/bpftool/main.h |  1 +
>   tools/bpf/bpftool/map.c  |  9 +++++++--
>   3 files changed, 23 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
> index 08d0ac543c67..810c0dc10ecb 100644
> --- a/tools/bpf/bpftool/main.c
> +++ b/tools/bpf/bpftool/main.c
> @@ -251,6 +251,21 @@ int detect_common_prefix(const char *arg, ...)
>   	return 0;
>   }
>   
> +void print_uint(const void *arg, unsigned int arg_size)
> +{
> +	const unsigned char *data = arg;
> +	unsigned long val = 0ul;
> +
> +	#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
> +		memcpy(&val, data, arg_size);
> +	#else
> +		memcpy((unsigned char *)&val + sizeof(val) - arg_size,
> +		       data, arg_size);
> +	#endif
> +
> +	fprintf(stdout, "%lu", val);
> +}
> +
>   void fprint_hex(FILE *f, void *arg, unsigned int n, const char *sep)
>   {
>   	unsigned char *data = arg;
> diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h
> index 0ef373cef4c7..0de671423431 100644
> --- a/tools/bpf/bpftool/main.h
> +++ b/tools/bpf/bpftool/main.h
> @@ -90,6 +90,7 @@ void __printf(1, 2) p_info(const char *fmt, ...);
>   
>   bool is_prefix(const char *pfx, const char *str);
>   int detect_common_prefix(const char *arg, ...);
> +void print_uint(const void *arg, unsigned int arg_size);
>   void fprint_hex(FILE *f, void *arg, unsigned int n, const char *sep);
>   void usage(void) __noreturn;
>   
> diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
> index aaeb8939e137..f5be4c0564cf 100644
> --- a/tools/bpf/bpftool/map.c
> +++ b/tools/bpf/bpftool/map.c
> @@ -259,8 +259,13 @@ static void print_entry_plain(struct bpf_map_info *info, unsigned char *key,
>   		}
>   
>   		if (info->value_size) {
> -			printf("value:%c", break_names ? '\n' : ' ');
> -			fprint_hex(stdout, value, info->value_size, " ");
> +			if (map_is_map_of_maps(info->type)) {
> +				printf("id:%c", break_names ? '\n' : ' ');
> +				print_uint(value, info->value_size);

For all map_in_map types, the inner map value size is 32bit int which 
represents a fd (for map creation) and a id (for map info), e.g., in
show_prog_maps() in prog.c. So maybe we can simplify the code as below:
	printf("id: %u", *(unsigned int *)value);


> +			} else {
> +				printf("value:%c", break_names ? '\n' : ' ');
> +				fprint_hex(stdout, value, info->value_size, " ");
> +			}
>   		}
>   
>   		printf("\n");