From nobody Tue Dec 2 00:01:07 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C8F13164A9 for ; Wed, 26 Nov 2025 08:50:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764147045; cv=none; b=SjhG8gTkOmLVH5DvkCTwrr5Bil6NBgrfCrUYJUBJqXqEJsvZ67cvFxi9w7dAbhM/XcPg9WSp/6TV1JZV9RgCPCzCULXBuSdvdkBiX5CEGK9sWcha6QRhrgvq4onB6hOgWwBqJsVAcaGMxUsyjr9yOSHhAVr/AuhXnkPcAj1JOUg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764147045; c=relaxed/simple; bh=M/VgPIqfRWvPIYxFG70p0tBc3APY/ResOI4iwLeo1GA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U1RIubeRf9DW8O/1N3tys+fd7S+emg9nkgPHuS30j9SpqLvCBhIcq6fXLUMJ6jprfgBXZwNwQZ1xvb4AeaXQl5yV/4iYgKZJKnl+8a95DBkW3p0yKE6Ccm/1w9e9AjpxwgJrOSuLUxUgs4wwlRbAzgymggRnb2rOluiWhelpDdA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Q6KvvDyn; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q6KvvDyn" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-29558061c68so86218095ad.0 for ; Wed, 26 Nov 2025 00:50:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764147042; x=1764751842; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PIDDUYkGHJz7WnHdi/CS+AAzIaF6rwKCgn01mtFAMbA=; b=Q6KvvDynZ3Ig/iK9bEbb3g8Nd4jO+eedRGYggeG6oHDbnnUDMqFBZOlpaZkctxJKKx 1Ybnw9TH5LBZEnBcd1zyGwJl1180DM+IhqEmiIGDvALgzefYRcWOV7kBjkeZJoU0Ztm9 AYFBgD2AZVnCZfPQl3zKqOYXfGxyNaMKiDwGJC2A+MEOfqimMTyjI6Dt4sJNdaenzF99 Jx2feDmgVrNVRq2PKXtbVV383p2a+atdS8xWKTQmzSznOPju/JgPQIn9jjz5cUW1Oqnp NxTPateei+EOEZ5X+CRAM6jtWXnvhDRQ6+ZjLOy+MWBgiFvGw9f3UC2M09zCyR7eZ212 hI4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764147042; x=1764751842; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PIDDUYkGHJz7WnHdi/CS+AAzIaF6rwKCgn01mtFAMbA=; b=AwhMtnTYyqNsrjg5mR+vQSqJIiXDw4S6eNOMrSPduqn7VhQlO8f8mSugJYF///OXCv xZXY0jNszRHBrlUP+vnmK3KiKm38FHMPKSVBuQFkEIRWNchd+3IIrCjG1/9gthBY96WE vGn2RXRshqB5l6TzBcxHPeldUUjXfqwmEihdv2/UliMCLy+6A6PDo4yVskiwQpX5q5Xu 9R86XGbLIj1/O3dwhLOzN6vlOZHjn1F/+Xl/lq+ITrqCkuO+IyCC5N+Gb7ziUUxF7khh hd/NmZh52iVPDqpPb8iNtqAonTVoT+ImbkGzaQ6UlYrzjS+UlHhmiMxeOtzy7pL6gHIS smlQ== X-Forwarded-Encrypted: i=1; AJvYcCVq3LPER2+4U88O+Q5Ne4zjErSg4hmMBlu7iDzrwpCJ2YpIB1mdUyekeZQ7RtoGC4EZMMfWED7CkQE3S1A=@vger.kernel.org X-Gm-Message-State: AOJu0Ywbx4q+gHGePvNwIQCSP+JjAUT5r7rS2aaBoYPWQSDFOmyeDdLA YrVs2hE1MdP+bOBcpFVGpiz4P+d8PWQOp2RmmyDJ1yVrT/4FAaFBxdND X-Gm-Gg: ASbGnctCVs3Fep8qMFg/a4oljoz5UfYxuI0awKz+/1Mm0jUEN4uooGYk+i07H9NI4Zg zIrZO7YHljOW7pfnvrRrMpiLHP7zpOPsxcgvfcOQgTu4Zz1nO7ais0rMd9StdK3InO7/Y3/aUAT bI3gwRRPrudd6NeA4BEmOisbnpQgn5v4fB6iZ2V857w1VkihHTnX1Nhvqo8QDGIE5Zns9XZij51 BDVm8fqM+UXkJkgz9ypH/n6+bCR9u1OFRyOqxoJ7Hp85LoDOcQfVV0YAPs7N5LiMKV41yW9VHLB TxmeBeVAL4gaWwiw2Bq1zWjkyfP0zop0TAT6mjlo2BKPSu8PzxAfLyrCQeL9hSOb2lLDu+eNnl7 AVyreHZhkkylzikeiZ20E6QQZGsgEXrLd4agVw6DneLLz1KgH1VLlc8iwBouSC/XYzoCLfxJwCP lWNyv2eEVxtj1krCaPsmqs9bpotoc= X-Google-Smtp-Source: AGHT+IHvlil1iO59w6L02UVKaswg4buo1LY0f0OcMcJNxORcAcKjg5GLGp3oWtBsyoFormU2mRxlpw== X-Received: by 2002:a17:903:11cd:b0:298:68e:4057 with SMTP id d9443c01a7336-29b6bfadca0mr207376675ad.59.1764147042164; Wed, 26 Nov 2025 00:50:42 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7c3f023fd82sm20885721b3a.42.2025.11.26.00.50.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 00:50:41 -0800 (PST) From: Donglin Peng To: ast@kernel.org, andrii.nakryiko@gmail.com Cc: eddyz87@gmail.com, zhangxiaoqin@xiaomi.com, ihor.solodrai@linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, pengdonglin , Alan Maguire Subject: [RFC bpf-next v8 3/9] tools/resolve_btfids: Support BTF sorting feature Date: Wed, 26 Nov 2025 16:50:19 +0800 Message-Id: <20251126085025.784288-4-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251126085025.784288-1-dolinux.peng@gmail.com> References: <20251126085025.784288-1-dolinux.peng@gmail.com> 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 Content-Type: text/plain; charset="utf-8" From: pengdonglin This introduces a new BTF sorting phase that specifically sorts BTF types by name in ascending order, so that the binary search can be used to look up types. Cc: Eduard Zingerman Cc: Alexei Starovoitov Cc: Andrii Nakryiko Cc: Alan Maguire Cc: Ihor Solodrai Cc: Xiaoqin Zhang Signed-off-by: pengdonglin --- tools/bpf/resolve_btfids/main.c | 68 +++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/mai= n.c index 4faf16b1ba6b..1d2b08bbd8c2 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -857,6 +857,71 @@ static int dump_raw_btf(struct btf *btf, const char *o= ut_path) return 0; } =20 +/* + * Sort types by name in ascending order resulting in all + * anonymous types being placed before named types. + */ +static int cmp_type_names(const void *a, const void *b, void *priv) +{ + struct btf *btf =3D (struct btf *)priv; + const struct btf_type *ta =3D btf__type_by_id(btf, *(__u32 *)a); + const struct btf_type *tb =3D btf__type_by_id(btf, *(__u32 *)b); + const char *na, *nb; + + na =3D btf__str_by_offset(btf, ta->name_off); + nb =3D btf__str_by_offset(btf, tb->name_off); + return strcmp(na, nb); +} + +static int sort_btf_by_name(struct btf *btf) +{ + __u32 *permute_ids =3D NULL, *id_map =3D NULL; + int nr_types, i, err =3D 0; + __u32 start_id =3D 1, id; + + if (btf__base_btf(btf)) + start_id =3D btf__type_cnt(btf__base_btf(btf)); + nr_types =3D btf__type_cnt(btf) - start_id; + if (nr_types < 2) + goto out; + + permute_ids =3D calloc(nr_types, sizeof(*permute_ids)); + if (!permute_ids) { + err =3D -ENOMEM; + goto out; + } + + id_map =3D calloc(nr_types, sizeof(*id_map)); + if (!id_map) { + err =3D -ENOMEM; + goto out; + } + + for (i =3D 0, id =3D start_id; i < nr_types; i++, id++) + permute_ids[i] =3D id; + + qsort_r(permute_ids, nr_types, sizeof(*permute_ids), cmp_type_names, btf); + + for (i =3D 0; i < nr_types; i++) { + id =3D permute_ids[i] - start_id; + id_map[id] =3D i + start_id; + } + + err =3D btf__permute(btf, id_map, nr_types, NULL); + if (err) + pr_err("FAILED: btf permute: %s\n", strerror(-err)); + +out: + free(permute_ids); + free(id_map); + return err; +} + +static int btf2btf(struct object *obj) +{ + return sort_btf_by_name(obj->btf); +} + static const char * const resolve_btfids_usage[] =3D { "resolve_btfids [] ", NULL @@ -900,6 +965,9 @@ int main(int argc, const char **argv) if (load_btf(&obj)) goto out; =20 + if (btf2btf(&obj)) + goto out; + if (elf_collect(&obj)) goto out; =20 --=20 2.34.1