From nobody Fri Dec 19 14:59:06 2025 Received: from out-183.mta0.migadu.com (out-183.mta0.migadu.com [91.218.175.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B80CB23A984 for ; Fri, 19 Dec 2025 02:00:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766109659; cv=none; b=Z3hYHdUD931cTIIULkRDJp+R2pIUP1MttamVfATXuVdMLWXZGV0pGlqdRRZMLtMq00mU7RWhMDXeY6n9yNjG1BjjoCmCVrIqjaQk7rGh9Vz9d6knbj3q8hMABG6zNL12pzHs9LMNPh8RiNQxynIesNHqK4jJ3d9vvZ88tx7BHBY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766109659; c=relaxed/simple; bh=3FEIiRUylmj0GITPIIkPwx+DdvKez+ddqxbv/x6D4l0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WrCfLhb2aQA6ZYfEtQvBPpjV5gRnucDShXlCLts8jtaeUxbf4xoPjw3LqeY7+DqnSMo43qL454HA6sjluwF99LPFTh+EBta24PshxND6EI+JUKsOGHgOpv7fSB/EB1XClsBUNNQf0wRrbRk27r88Gvz1WP32D71uFbDzzYPTKj8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=ITYaVzMl; arc=none smtp.client-ip=91.218.175.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="ITYaVzMl" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1766109653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sF5NRKZEGl/G+udktejbKoJb2K4tJj9XzuRyl23IiwY=; b=ITYaVzMldxMC67QL1N+DuRvm7Tups3VodTT8+eawC+XURqAU/13IDKQ3yOZ1hIxkBoF4fj /D1rbaOc5LLbmx7f9Jl/FtNOvcAx6jHn21cng24NliS1fGS/J/71DnEecsoB5HTvc7IXao dctxpeBEH3aQPSm8o0cUR8BPmJHKrpg= From: Ihor Solodrai To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Andrew Morton , Nathan Chancellor , Nicolas Schier , Jonathan Corbet , Tejun Heo , David Vernet , Andrea Righi , Changwoo Min , Shuah Khan , Nick Desaulniers , Bill Wendling , Justin Stitt , Alan Maguire , Donglin Peng Cc: bpf@vger.kernel.org, dwarves@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, sched-ext@lists.linux.dev Subject: [PATCH bpf-next v6 3/8] resolve_btfids: Introduce enum btf_id_kind Date: Thu, 18 Dec 2025 18:00:01 -0800 Message-ID: <20251219020006.785065-4-ihor.solodrai@linux.dev> In-Reply-To: <20251219020006.785065-1-ihor.solodrai@linux.dev> References: <20251219020006.785065-1-ihor.solodrai@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Instead of using multiple flags, make struct btf_id tagged with an enum value indicating its kind in the context of resolve_btfids. Acked-by: Eduard Zingerman Signed-off-by: Ihor Solodrai --- tools/bpf/resolve_btfids/main.c | 83 ++++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 23 deletions(-) diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/mai= n.c index b4caae1170dd..e721e20a2bbd 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -98,6 +98,13 @@ # error "Unknown machine endianness!" #endif =20 +enum btf_id_kind { + BTF_ID_KIND_NONE, + BTF_ID_KIND_SYM, + BTF_ID_KIND_SET, + BTF_ID_KIND_SET8 +}; + struct btf_id { struct rb_node rb_node; char *name; @@ -105,9 +112,8 @@ struct btf_id { int id; int cnt; }; + enum btf_id_kind kind; int addr_cnt; - bool is_set; - bool is_set8; Elf64_Addr addr[ADDR_CNT]; }; =20 @@ -197,8 +203,10 @@ static struct btf_id *btf_id__find(struct rb_root *roo= t, const char *name) return NULL; } =20 -static struct btf_id * -btf_id__add(struct rb_root *root, char *name, bool unique) +static struct btf_id *__btf_id__add(struct rb_root *root, + char *name, + enum btf_id_kind kind, + bool unique) { struct rb_node **p =3D &root->rb_node; struct rb_node *parent =3D NULL; @@ -221,12 +229,23 @@ btf_id__add(struct rb_root *root, char *name, bool un= ique) if (id) { pr_debug("adding symbol %s\n", name); id->name =3D name; + id->kind =3D kind; rb_link_node(&id->rb_node, parent, p); rb_insert_color(&id->rb_node, root); } return id; } =20 +static inline struct btf_id *btf_id__add(struct rb_root *root, char *name,= enum btf_id_kind kind) +{ + return __btf_id__add(root, name, kind, false); +} + +static inline struct btf_id *btf_id__add_unique(struct rb_root *root, char= *name, enum btf_id_kind kind) +{ + return __btf_id__add(root, name, kind, true); +} + static char *get_id(const char *prefix_end) { /* @@ -260,22 +279,36 @@ static char *get_id(const char *prefix_end) return id; } =20 -static struct btf_id *add_set(struct object *obj, char *name, bool is_set8) +static struct btf_id *add_set(struct object *obj, char *name, enum btf_id_= kind kind) { + int len =3D strlen(name); + int prefixlen; + char *id; + /* * __BTF_ID__set__name * name =3D ^ * id =3D ^ */ - char *id =3D name + (is_set8 ? sizeof(BTF_SET8 "__") : sizeof(BTF_SET "__= ")) - 1; - int len =3D strlen(name); + switch (kind) { + case BTF_ID_KIND_SET: + prefixlen =3D sizeof(BTF_SET "__") - 1; + break; + case BTF_ID_KIND_SET8: + prefixlen =3D sizeof(BTF_SET8 "__") - 1; + break; + default: + pr_err("Unexpected kind %d passed to %s() for symbol %s\n", kind, __func= __, name); + return NULL; + } =20 + id =3D name + prefixlen; if (id >=3D name + len) { pr_err("FAILED to parse set name: %s\n", name); return NULL; } =20 - return btf_id__add(&obj->sets, id, true); + return btf_id__add_unique(&obj->sets, id, kind); } =20 static struct btf_id *add_symbol(struct rb_root *root, char *name, size_t = size) @@ -288,7 +321,7 @@ static struct btf_id *add_symbol(struct rb_root *root, = char *name, size_t size) return NULL; } =20 - return btf_id__add(root, id, false); + return btf_id__add(root, id, BTF_ID_KIND_SYM); } =20 /* Older libelf.h and glibc elf.h might not yet define the ELF compression= types. */ @@ -491,35 +524,31 @@ static int symbols_collect(struct object *obj) id =3D add_symbol(&obj->funcs, prefix, sizeof(BTF_FUNC) - 1); /* set8 */ } else if (!strncmp(prefix, BTF_SET8, sizeof(BTF_SET8) - 1)) { - id =3D add_set(obj, prefix, true); + id =3D add_set(obj, prefix, BTF_ID_KIND_SET8); /* * SET8 objects store list's count, which is encoded * in symbol's size, together with 'cnt' field hence * that - 1. */ - if (id) { + if (id) id->cnt =3D sym.st_size / sizeof(uint64_t) - 1; - id->is_set8 =3D true; - } /* set */ } else if (!strncmp(prefix, BTF_SET, sizeof(BTF_SET) - 1)) { - id =3D add_set(obj, prefix, false); + id =3D add_set(obj, prefix, BTF_ID_KIND_SET); /* * SET objects store list's count, which is encoded * in symbol's size, together with 'cnt' field hence * that - 1. */ - if (id) { + if (id) id->cnt =3D sym.st_size / sizeof(int) - 1; - id->is_set =3D true; - } } else { pr_err("FAILED unsupported prefix %s\n", prefix); return -1; } =20 if (!id) - return -ENOMEM; + return -EINVAL; =20 if (id->addr_cnt >=3D ADDR_CNT) { pr_err("FAILED symbol %s crossed the number of allowed lists\n", @@ -643,7 +672,7 @@ static int id_patch(struct object *obj, struct btf_id *= id) int i; =20 /* For set, set8, id->id may be 0 */ - if (!id->id && !id->is_set && !id->is_set8) { + if (!id->id && id->kind !=3D BTF_ID_KIND_SET && id->kind !=3D BTF_ID_KIND= _SET8) { pr_err("WARN: resolve_btfids: unresolved symbol %s\n", id->name); warnings++; } @@ -696,6 +725,7 @@ static int sets_patch(struct object *obj) { Elf_Data *data =3D obj->efile.idlist; struct rb_node *next; + int cnt; =20 next =3D rb_first(&obj->sets); while (next) { @@ -715,11 +745,15 @@ static int sets_patch(struct object *obj) return -1; } =20 - if (id->is_set) { + switch (id->kind) { + case BTF_ID_KIND_SET: set =3D data->d_buf + off; + cnt =3D set->cnt; qsort(set->ids, set->cnt, sizeof(set->ids[0]), cmp_id); - } else { + break; + case BTF_ID_KIND_SET8: set8 =3D data->d_buf + off; + cnt =3D set8->cnt; /* * Make sure id is at the beginning of the pairs * struct, otherwise the below qsort would not work. @@ -744,10 +778,13 @@ static int sets_patch(struct object *obj) bswap_32(set8->pairs[i].flags); } } + break; + default: + pr_err("Unexpected btf_id_kind %d for set '%s'\n", id->kind, id->name); + return -1; } =20 - pr_debug("sorting addr %5lu: cnt %6d [%s]\n", - off, id->is_set ? set->cnt : set8->cnt, id->name); + pr_debug("sorting addr %5lu: cnt %6d [%s]\n", off, cnt, id->name); =20 next =3D rb_next(next); } --=20 2.52.0