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 DE565C4829A for ; Wed, 14 Feb 2024 00:48:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EA3A6B009D; Tue, 13 Feb 2024 19:48:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 497A16B009E; Tue, 13 Feb 2024 19:48:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 313986B00A0; Tue, 13 Feb 2024 19:48:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1DF856B009D for ; Tue, 13 Feb 2024 19:48:00 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AD3901205D1 for ; Wed, 14 Feb 2024 00:47:59 +0000 (UTC) X-FDA: 81788572278.11.F512B94 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by imf29.hostedemail.com (Postfix) with ESMTP id D8A81120002 for ; Wed, 14 Feb 2024 00:47:57 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=AJniguJa; spf=pass (imf29.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707871678; a=rsa-sha256; cv=none; b=QZdZ/x/axmD6O9PccJVrfO6yp075im1gVKNDgTqZzAOuHH9pq2g4J3m16nncBxgA9yrPig n5dejdNFd/g/v408G4mKXoZ0Q/e5pRnzG/i0rdmkpcG4Lw7RhETUURQDeITcuLQe4UpRA8 AXNzdU42R6zue55FexR3eYz7SNTL4jQ= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=AJniguJa; spf=pass (imf29.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=alexei.starovoitov@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=1707871678; 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=CRN+LPbXAzEy4D3mDpxii0UBls8jla/cXo3p9LAOOOY=; b=7xSlZ3ptQC1ChioRnMrUsS9uyCtAsj8GNdCqWFg+QUOecQ4IDVVBTwwSrSD9YAgd6yOEHd NL4pKpQ+IDNuefGZ5hOPDw/45hUH1okouMVyxYbj80kaZVuZRClfjxHyTOV/AZHM3dZ8nY gAUlhOR5PudDQzZW2a5kXhz8NBVfpxs= Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-33ce8cbf465so100301f8f.3 for ; Tue, 13 Feb 2024 16:47:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707871676; x=1708476476; 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=CRN+LPbXAzEy4D3mDpxii0UBls8jla/cXo3p9LAOOOY=; b=AJniguJacfKaFWQZXtD0aNyIzgY7c/HrW9jEREAdT+1jq8sjjMadZlCJJ3yl9R5TvO qYKMGICjzBN5pHe79qouLvRXeuo4JJ/2IgQO09uNyCjap++uKxDYBHAnwbNjBGwR/0dF rhypcPyUjjqDm70gy/2Eufm4Hnx+LKU8fXKCZAfPK8t+qaq5gYhM6/wRq+wk5pEbshH2 y4Yki59u5mgLZUDupaiklUUsT9y102pKaRoTLhRNDPgQHzaAw8v3dcIen0OjZBbcQGIV j1grDA2LgP16S6lF5cWEzeOpLUPKKH0aKrAs9BOjIesr9Jfe2OBTpxz65rnlaLBxi9Pl Q+rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707871676; x=1708476476; 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=CRN+LPbXAzEy4D3mDpxii0UBls8jla/cXo3p9LAOOOY=; b=vtgu0yd5SG5l1AN8kBsC05JQwtfjAl6IollJUO1kMXVsa108U2Wf1Sw2p8J+7gNpmo 0u71tSacdIq7I30ehyYHT7Y9Ewq27g6Fxz9NOfo7GNNki/jfW+7uafauH7bc0POwGTLa 09GutimNe9vYkkeclq/RbaLnHjZsX1/piXWeQ+YTkmyrzbcstnoIZzk9hE17WITMYVkQ Ul2q124CK7+mqk/rcFb83Kc/1JqiY9/+CHn0/JPEFW1IiQPKP73g4eP7E16aw0ag8KP/ yCe5DvcIQOwzbXSqRLM7USx8eEWPIj6XJdaMO/5SZA3QZ/Uw6yT67rk8wEtKT9suO/nT k7qw== X-Forwarded-Encrypted: i=1; AJvYcCXSVJzLADI7bkdgBEAWdERswOw1yZuTwlz1MQUKtAUvYJDn6cdMjKalW/cco/j2SnlO8vT0nFM+22PxCGIRlMpDmlc= X-Gm-Message-State: AOJu0YxsRCQCKBmP7ToUr9pm4+z9cGSQniSaGMlZH8U+PCNW/v2UCL9B bswRZVbj7xfonBBC0+WptEuxWLwVRUKJuAcTOQARmwSSB7Et8J5SwfjWBOjgZ7XuDmMlpu5ILq2 03HOWhDbR8dU2dfhc13d3G8+fqN4= X-Google-Smtp-Source: AGHT+IEC3QK2Mfqok8OLcslIOgV1gXeytEhnQ4GyvF5tANXVZ9P685SV60tXbnSrrOY7f+kgrRI78AQJNx1rY4J6/yc= X-Received: by 2002:adf:e6cc:0:b0:33b:10de:59a2 with SMTP id y12-20020adfe6cc000000b0033b10de59a2mr575521wrm.15.1707871676333; Tue, 13 Feb 2024 16:47:56 -0800 (PST) MIME-Version: 1.0 References: <20240209040608.98927-1-alexei.starovoitov@gmail.com> <20240209040608.98927-14-alexei.starovoitov@gmail.com> In-Reply-To: From: Alexei Starovoitov Date: Tue, 13 Feb 2024 16:47:44 -0800 Message-ID: Subject: Re: [PATCH v2 bpf-next 13/20] libbpf: Allow specifying 64-bit integers in map BTF. To: Andrii Nakryiko Cc: bpf , Daniel Borkmann , Andrii Nakryiko , Kumar Kartikeya Dwivedi , Eddy Z , Tejun Heo , Barret Rhoden , Johannes Weiner , Lorenzo Stoakes , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , linux-mm , Kernel Team Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: D8A81120002 X-Stat-Signature: ghp9pxqndh8crkxzt918z9qrrcnruspm X-Rspam-User: X-HE-Tag: 1707871677-890671 X-HE-Meta: U2FsdGVkX18VyJcWGqeoxkqT8pvBNw4up86taYhFM9CSQR1B/17VfMR3tUs/ecUMZ8bFIHDfyPuguL5u+EJWk6Bqic24BKbEDK0FS+iThdqGF9XZT/WVWGbTNfFmnFO4k0E9FXI1137EjkyZyYIxJp+alDznuDfLBpRpgdUJoiTRnFbPG6Vv8r5QkLVar9dvKrh/mSI5DpW85oYuVUSGfUSmwRtzctWdGXJLWZ5EN5GW7C1UeEvWCqUohOdysA2YcQMcuyEONY9yysUXFk0NfUqLArj/dBmTquzOaUmFq8XmjIiAnEoybzJ2cxUgbYWnjzRIQcEq6Jd+xkcDeukXelQhovWUZB4r4L0j4xTPVKD8e1/8PliTSLNZvtYj6gaIT4bELnAZTyxEVqqwvnLZGm9Sq3UsVm/5kmbDVBRF9bS3IZGbSi3d4U80zr81MMnAt69FrIn/ShRao+PsfnKt4jSNY9XccNUXw+x0SlKWHgqGM4Z8HqQzjuUUEfBEkytl3j6hQoY2Tgl36jOZnnutZ3YJQHIn2KrUbh3u1pQeO/2i6IJeOPuc7BzlZnnCzlGfDut0OMnE+rZjDcjjUFyN5RB7GUPNUslCv/Tw9s8WW3FmC6QsYK1O4ZxqUTK/9JcfO2gZmkRNNmwX6pdU8gQnTs03wdzj0IG3a/VJcqm0stP/RqdAYJ1oVsCm1Jx+JL14eafx/EzCJLXk6XfQZjumNkPMJqMP2+3w0+xfRXu4X6TKjSl2n/trC/wCZMb3/tB5Y5ul3WnZiI/rCG0EgMJ7shev66vJ7j43Y+Vnwqnn7WCZ+F8+/FvHJTEfxTkuEuYWe87glvUrK2XU+dz1Hdi3Gmm2EiVyAW6548H66qy4EtFtti1M81dfYuXYipFreoUzLvrf6Xw+f4blKRLCbuAkAU7WEVYsns+1HhrIIjoWgA6ngrLzpu0YUDH2W9tUu0PWZKd0HqCfV6aaGVQI9jF lWwZjoJ5 WWRp6I8JxNobv+PmNJE2H82bkzBc9a77UhK7tmTw+zdFk2QXoSg2k0qU5ZTTkxsJo4rgh0XAC1zr1YFb8mBRWWYvX8IWncxMuje/fPNSdFa+o4G2PvuWVhLVVYDefyBwy7gfqAmxytY/chVCWASvtJ851BVGctDk/EzaIULKAgyF6FJcwLZU/P499/42Xn5VD2i2rNXSJvZOg7vk7HTaI2t0AivcvWiuDbiSqBnjLQPFOORB6hJcA3VGl+MHPiVccV5iXPrXGhZ9mc1YSCFk7yMj+6CuLrIA+tLCWtBsIx7Aj3vfJLhqFd2BnrbnzKQvNo95eCSYcR5NoQB64PrFWsgqCXm4UH25nb8A9Em9X3NTOach6vq+6RMNv1bsXDsYcm2T19CLTBlMfDHevLjljR0SYTD3AGYZdDbdZjKTX7d+QupwbyRHAefuAXt6WgAWXkqRKS+7Np6IY1Gqtrq+rOuXHp6eFSzbbvFvcp2hxqcuZKAqF3lhkTZsyxb0Q0VRKRsb7UpzeI0MTimrqwQWMp+yTyb5KZEJlfJk/ 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 Tue, Feb 13, 2024 at 3:15=E2=80=AFPM Andrii Nakryiko wrote: > > 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"= field. > > > > Introduce __ulong() macro that allows specifying values bigger than 32-= bit. > > 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 Ohh. forgot about this one. will do. > > +#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_na= me, const struct btf *btf, > > return true; > > } > > > > +static bool get_map_field_long(const char *map_name, const struct btf = *btf, > > + const struct btf_member *m, __u64 *res) > > +{ > > + const struct btf_type *t =3D skip_mods_and_typedefs(btf, m->typ= e, 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. What warning ? This specific check makes it fallback to ptr without warning. We have a bloom filter test that uses map_extra. No warnings there. > 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? makes sense. > > + > > + if (!btf_is_enum(t) && !btf_is_enum64(t)) { > > + pr_warn("map '%s': attr '%s': expected enum or enum64, = got %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? done. > > + 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,= const char *name) > > { > > int len; > > @@ -2476,10 +2509,15 @@ int parse_btf_map_def(const char *map_name, str= uct 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_e= xtra)) > > - return -EINVAL; > > + if (!get_map_field_long(map_name, btf, m, &map_= extra)) { > > + __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) so this logic will move into get_map_field_long. makes sense. I thought about making get_map_field_int() to handle enum, but way too many places need refactoring, since it's called like: get_map_field_int(map_name, btf, m, &map_def->map_type) get_map_field_int(map_name, btf, m, &map_def->max_entries)