From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1D19C4829A for ; Tue, 13 Feb 2024 23:15:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B4EE8D001F; Tue, 13 Feb 2024 18:15:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 565B38D000E; Tue, 13 Feb 2024 18:15:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42DA08D001F; Tue, 13 Feb 2024 18:15:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 313CD8D000E for ; Tue, 13 Feb 2024 18:15:44 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 0CD321C1607 for ; Tue, 13 Feb 2024 23:15:44 +0000 (UTC) X-FDA: 81788339808.24.EDCE869 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by imf29.hostedemail.com (Postfix) with ESMTP id 3BEA2120016 for ; Tue, 13 Feb 2024 23:15:42 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ua8BOjuo; spf=pass (imf29.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.215.172 as permitted sender) smtp.mailfrom=andrii.nakryiko@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707866142; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yvFUmdkBHte2LSBUzwzMYO4QxUxyEN9D5qA1TjtDL5M=; b=xJtvCRtceD15oFEnXRt79pgaoOv2dq2v/TFACSLUqzu8VTJ565NDQZX+F9Tkjce58HmB5e YpErzKlDaFlRLgK6NeZ/OYqmRMVYZgc+HNloWtiySMfz6QOcJskPkGug66piUmattfvIbn d/HZqq9BcB8AG0H05HMWodfy8vl40nM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707866142; a=rsa-sha256; cv=none; b=1hvoVnfRf2+hfl0axYqVFPeoi1QbZqBheklgon6RH6fJnnTO+CjYI0pmiQ768yjcc/9Myi WyEqDaS3RimIEg6lvVYYYTg63vUpP7Aw3oJWvFxBXm9dYNj9waJ46a2D7GT6Vw5LAOU6ml IJj0/mxlwgWt0NBiqzl4W3FIfiUo53U= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ua8BOjuo; spf=pass (imf29.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.215.172 as permitted sender) smtp.mailfrom=andrii.nakryiko@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5d8b519e438so1176085a12.1 for ; Tue, 13 Feb 2024 15:15:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707866141; x=1708470941; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=yvFUmdkBHte2LSBUzwzMYO4QxUxyEN9D5qA1TjtDL5M=; b=Ua8BOjuourChv7CkB5F+pApLfUabE2m9iI3Pmy+KMoX9cNKDa1oGBZczagA+5YNEJq hppgbiaYdLT4hSA2fY+WjYS3or6s4lvLWencqcg/HCWxHRp5fn/WXkKotHNMwYXDEkEK 6zoJAgaXPYFTMGDHBAi6b8q6fGMViwKj+mYndM2KNAlRAR0w8wbc20C7HyVLjxUZiB1B x5jgyX7D7646JkzFLMQB2c4PM9ZndQK8N3vnd7cPlIx0xSaW6SVYuhJd5izzrVdHeQO0 uXydZnbUf7RL+t9aehgdA3OVUtvU7pDTAvPL1z0uQ+UGSFdgDeiVZdhjZOmVIudE9ZFz Z2Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707866141; x=1708470941; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yvFUmdkBHte2LSBUzwzMYO4QxUxyEN9D5qA1TjtDL5M=; b=R5sO8pcMPpXbhjrQ2FJuS3ZSjGzQHLK55ImOL+H3ke+mFkwCX3/zsNF/xstVpyidG7 97zUPvxFYPfRQFhe6oPrw75WvZMXrzYNLzP6g1wXVcpgScCEbBCCfJgCQAAgPCAajBc8 LdaICUEJvFwIQ+WHyKTmccP8s4QAf4IWcXPJ1Z9HfRBfEQGPRCUHAOUDy3dPZv0AB0/i +hNhvp3ULw6ketEklV58hTNKlQJ+qzhl6TtUhNR8ROt+Io+97kPKHY9NBQOi22LS8kx8 mNjsRdPLx7GQJUERALrS7VL4Dy6GZv619O41XPIaL1CKcJItAqYZFlpFCDBD4kXfpFtC 9AWA== X-Forwarded-Encrypted: i=1; AJvYcCW/EyIm7yitg8NTEJCYI0hpdjtoOx/sWwZQgGW+xHUA9PByWmukimTv58A8/Ncr9Ap/sCLO1BJLnwnivySYQtsLssU= X-Gm-Message-State: AOJu0YwcbUyhZFEo3UIF112T5FWJa7TweTrcfTws0RadDpsR0JbT1eah 1kUM36T+AqTSmEaRlu3Unfwr3zpsBYZZ/thSt5pRXAciHzpHlueU3lP3ydpSUwcnNFHGgvgigZ4 hUxsr7JGtYYpxdg0YckY9FKoTRts= X-Google-Smtp-Source: AGHT+IE82g/W0O4o8slL1b+5fn/nVasueAk9kOIlMYm0v8P2wKht6jrkvrIWGRPH/PTXX7ivlUr+PrNbk+fMYcna9Zo= X-Received: by 2002:a17:90a:bc81:b0:298:a701:aacc with SMTP id x1-20020a17090abc8100b00298a701aaccmr738773pjr.47.1707866141100; Tue, 13 Feb 2024 15:15:41 -0800 (PST) MIME-Version: 1.0 References: <20240209040608.98927-1-alexei.starovoitov@gmail.com> <20240209040608.98927-14-alexei.starovoitov@gmail.com> In-Reply-To: <20240209040608.98927-14-alexei.starovoitov@gmail.com> From: Andrii Nakryiko Date: Tue, 13 Feb 2024 15:15:28 -0800 Message-ID: Subject: Re: [PATCH v2 bpf-next 13/20] libbpf: Allow specifying 64-bit integers in map BTF. To: Alexei Starovoitov Cc: bpf@vger.kernel.org, daniel@iogearbox.net, andrii@kernel.org, memxor@gmail.com, eddyz87@gmail.com, tj@kernel.org, brho@google.com, hannes@cmpxchg.org, lstoakes@gmail.com, akpm@linux-foundation.org, urezki@gmail.com, hch@infradead.org, linux-mm@kvack.org, kernel-team@fb.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 3BEA2120016 X-Rspam-User: X-Stat-Signature: crposr4fxrcdrkm6oejxbpbfg7yrmc78 X-Rspamd-Server: rspam03 X-HE-Tag: 1707866142-796991 X-HE-Meta: U2FsdGVkX19tPARK136O/B7zGH9VZkjhE7zDA3JsRKVj5toLHQ5o5qIJkrzeUXSz61lH27BFwzToZTA7nlyEMIS7B/FgFe61hsnri/atpWvvT/dxjdwh6xsMmjlPP3j3eg5zPwIfAgCsB01fLG+1VLc+kRh0oz1wBNUxz8ftn7x5vsAc2dHFkjOOCYG98KuKzd4sJ24si5YJiPq10K7QNgS3ZqyKf65gDaC3/ea4JJXCVn31igFjXCH/ySE/Ts4o+/CzcPLJoVH1KwUnZGbYIUBpCe1jmoA4igz8IDNLmUypVeED4AeMaO/rJeiwj8Gh7Qtdn2fb32j7BkfaoJODByqVW4BulCYzAhLHderFCQdCfiUQwV2HsbdxF9WCxXqVaG4esT8MBinaPZq7nRVjh/sVCZ3rCUThstP60g+L9oTP0gqFuEObaGnShvO/DUVv/TXReSwjVzr1ak+smdIPOMgfVaEQZF/fsDwdtLlVzYQDigsGNARWNAx6P1SyZ+G3LKb0jXMzUo2QoTtckU10WCvNTdRqlAfhSoOZcrh5rZkmZJ6gqkwvM5nX0a3Of66TH5veB1EYjJHY4yxJ++K0LPnqsTrRCRi/grY6MmIE3bJWEcKjlce+AIbyCy5XHOcTFOWF4FJr/S+qn7TL7ArUgKzpOef1JZkr3pJoVPELrNlyG/k+jsFOh83Kl77PN69+Nq+Drx+w4YI1BCnpaR7q55wmh0WSkWAlgqUKBf8UtIr+2BPzxgqqp3jLU+yBfsCa9ZmSpGCZAcM1S8lCF57DhAtPLs/bkdTP4QtXj5hcYFR/9TvK55tq3a7ttkzjUJxvLGWDMl76zvDpxfG+eXmVRiy2vGlcT/9Li4WvOilw66nf2mm9S6QmsOKwS0op+GBnd4D0M630keyqNoXXuyqdYEKrROvKeLbo7WCVDdj9Ecl1g7aKlx8VQrAZWmOGaW9GOmjCKRtmNkPnYZLkvqi uVWn+foF J1E4yjRKHUOQ63BMgoU/5ipprzUfkYzImQyDdInVjxTVUQLXngtAdBa96/C8PlZU3S2Lp7LjzY4e5r5uL0eSIEpSXtfdEzpgj60g/4zB0MWMUOYUacOJe/uwRRGAbGX0/mucusB6i8YH19+ODsZsO9gwfqUjSzKsjy1w5BDfxYtvFqFbw9y5YFaO2+4/67YcXdc4wTYmVSVPwsuv6EkULqkwafAR2n+gZcW8zfCbqJKwkGypEEew55OIu+n6fNGqUEkDoIVBaFtlKDaNWq0dDz9qTSxy1/TnhF2/lYO485dT6/JtQVpuKeIJoAwH3GizeaUSrwE+oUezcf+B33UoyiAuWSu+IRh/W9YevlbV/sb/G5h7IQwl/eUL7F0ixNHZi0cQqeNFwvt5iMSFSkI+hQ+IivQLjuzQEaKXUn/SfEu4ZQW5B1FndRlws2UO+5WhyZALiGospaeV40/C/GqKAZVqvwsn5UiJroBHWHD3/Gq7GPGfcTfBeVApOnqaJMVm12A1SL1MlFEP9evOvD9MKXn4gEbzUTxDFrrdp X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Thu, Feb 8, 2024 at 8:07=E2=80=AFPM Alexei Starovoitov wrote: > > From: Alexei Starovoitov > > __uint() macro that is used to specify map attributes like: > __uint(type, BPF_MAP_TYPE_ARRAY); > __uint(map_flags, BPF_F_MMAPABLE); > is limited to 32-bit, since BTF_KIND_ARRAY has u32 "number of elements" f= ield. > > Introduce __ulong() macro that allows specifying values bigger than 32-bi= t. > In map definition "map_extra" is the only u64 field. > > Signed-off-by: Alexei Starovoitov > --- > tools/lib/bpf/bpf_helpers.h | 5 +++++ > tools/lib/bpf/libbpf.c | 44 ++++++++++++++++++++++++++++++++++--- > 2 files changed, 46 insertions(+), 3 deletions(-) > > diff --git a/tools/lib/bpf/bpf_helpers.h b/tools/lib/bpf/bpf_helpers.h > index 9c777c21da28..0aeac8ea7af2 100644 > --- a/tools/lib/bpf/bpf_helpers.h > +++ b/tools/lib/bpf/bpf_helpers.h > @@ -13,6 +13,11 @@ > #define __uint(name, val) int (*name)[val] > #define __type(name, val) typeof(val) *name > #define __array(name, val) typeof(val) *name[] > +#ifndef __PASTE > +#define ___PASTE(a,b) a##b > +#define __PASTE(a,b) ___PASTE(a,b) > +#endif we already have ___bpf_concat defined further in this file (it's macro so ordering shouldn't matter), let's just use that instead of adding another variant > +#define __ulong(name, val) enum { __PASTE(__unique_value, __COUNTER__) = =3D val } name > > /* > * Helper macro to place programs, maps, license in > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c > index 4880d623098d..f8158e250327 100644 > --- a/tools/lib/bpf/libbpf.c > +++ b/tools/lib/bpf/libbpf.c > @@ -2243,6 +2243,39 @@ static bool get_map_field_int(const char *map_name= , const struct btf *btf, > return true; > } > > +static bool get_map_field_long(const char *map_name, const struct btf *b= tf, > + const struct btf_member *m, __u64 *res) > +{ > + const struct btf_type *t =3D skip_mods_and_typedefs(btf, m->type,= NULL); > + const char *name =3D btf__name_by_offset(btf, m->name_off); > + > + if (btf_is_ptr(t)) > + return false; It's not great that anyone that uses __uint(map_extra, ...) would get warnings now. Let's just teach get_map_field_long to recognize __uint vs __ulong? Let's call into get_map_field_int() here if we have a pointer, and then upcast u32 into u64? > + > + if (!btf_is_enum(t) && !btf_is_enum64(t)) { > + pr_warn("map '%s': attr '%s': expected enum or enum64, go= t %s.\n", seems like get_map_field_int() is using "PTR" and "ARRAY" all caps spelling in warnings, let's use ENUM and ENUM64 for consistency? > + map_name, name, btf_kind_str(t)); > + return false; > + } > + > + if (btf_vlen(t) !=3D 1) { > + pr_warn("map '%s': attr '%s': invalid __ulong\n", > + map_name, name); > + return false; > + } > + > + if (btf_is_enum(t)) { > + const struct btf_enum *e =3D btf_enum(t); > + > + *res =3D e->val; > + } else { > + const struct btf_enum64 *e =3D btf_enum64(t); > + > + *res =3D btf_enum64_value(e); > + } > + return true; > +} > + > static int pathname_concat(char *buf, size_t buf_sz, const char *path, c= onst char *name) > { > int len; > @@ -2476,10 +2509,15 @@ int parse_btf_map_def(const char *map_name, struc= t btf *btf, > map_def->pinning =3D val; > map_def->parts |=3D MAP_DEF_PINNING; > } else if (strcmp(name, "map_extra") =3D=3D 0) { > - __u32 map_extra; > + __u64 map_extra; > > - if (!get_map_field_int(map_name, btf, m, &map_ext= ra)) > - return -EINVAL; > + if (!get_map_field_long(map_name, btf, m, &map_ex= tra)) { > + __u32 map_extra_u32; > + > + if (!get_map_field_int(map_name, btf, m, = &map_extra_u32)) > + return -EINVAL; > + map_extra =3D map_extra_u32; > + } with the above change it would be a simple s/get_map_field_int/get_map_field_long/ (and __u32 -> __u64, of course) > map_def->map_extra =3D map_extra; > map_def->parts |=3D MAP_DEF_MAP_EXTRA; > } else { > -- > 2.34.1 >