From nobody Fri Dec 19 13:24:04 2025 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 0DA88303A07 for ; Thu, 18 Dec 2025 11:31:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766057483; cv=none; b=U7U56TWdIz+Wl5Tmcz16tUM6Zt9uJ9wYSsToIwtx4nFYDZnpqyV/P13aBNTYo8bdjuGYS1BDHqNbptunyJsgpt0uLRicBog7nkwvMBzn298tVJMrFptrIHBTaZmovgU+1xlyqN9sX6U3yncxFeqrsBJOvUbTsyDJQVoHMYeqTpM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766057483; c=relaxed/simple; bh=5djMaNHVV5H6BwOtjnSRGIWANgTzxyBijzGE08hQiWg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lb/93+JszO6DuyJfR1GLSvIWzViE2z9geQ9LWMAW7P5nMptEsH4iVk9QvxnpieuBg/KUTst04AOTEkk7w62dqLIHfZ9BaEcZ0MNwfI2JZL+BTnonuo22pOGDMzeRpgM9VzNCPQYZtR6ewOqmgOKSAdthmhmkOoTw18RjFHKni7c= 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=KxbVXIsU; arc=none smtp.client-ip=209.85.216.45 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="KxbVXIsU" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-34c30f0f12eso392324a91.1 for ; Thu, 18 Dec 2025 03:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766057481; x=1766662281; 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=RJcl/jCRaGXylPBo/Z8OTR3Isxk2SlLcxWMRbR2qK0s=; b=KxbVXIsUZr7ofE6D82+Mt7YdRY8DX08jdHXzzbFX5jwF+YXjPjs+qhfbBNnrNkN4rw znBBwUq6EKJVeKuL9BRPyc8OpVg6EX64nKXLD/AuA7dy+uq/OVBLumWnKFzT/JV2xL8h tY+op4UZEsv4lIPh85qTj0aDvRbIWII64QLNAZTx4+JuTY8fKaXvqClzLtb8AgDqLTaI wi/cpT+eAvVuoixAyR1YSHlO532RHcwXQfb457z8aYmc1KbWVKenDeUgISZX4XFRRXDm h366qBZYP+C9xY8BtZK5CAZ6ikcO9bhM5jqTGr+hrnc/oid8gdQHwzxiwUJDnsX736Ej a+Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766057481; x=1766662281; 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=RJcl/jCRaGXylPBo/Z8OTR3Isxk2SlLcxWMRbR2qK0s=; b=YtVfw+Cuu2uptnW6D6pEB67WthgAv1+alVdKzzUMYw30kuCgrUunvgXg+J+bFsPiND KOYMgftFrRtBoPK0qHx1yfK6E8tzwYukvF3PeRLbK7kiGpfFNB3nu2WGxK9+XNadl20n 03c/HGJMZSlRRmDH/C5pBwgDFTGayR9t5KhiS7fa0eLHi07A2GR8kGh6w4r2A2MWNxi/ pZEraF8YIAVKRa31nW7fSvWAPVN9HSLd5Z46vX6jvFiak+jRqb+Y1ulcw1gHmY0NDo2l ldozZuyIpA0MR6vvtf7Q79lKRrDDVUGGZ9NyQ2inSqQuWdEzm0HCuXg+obtiU3ElQHWo ZR/Q== X-Forwarded-Encrypted: i=1; AJvYcCWfxrLph/BiJ3yjIbLQoGQQMAkSIqbRPIQ7AR+HDpu7DLdDQfkPkUvq7ZFdwkIZPi0jyi39y7xqjIXzKmE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6Pz//HdVejPQh+m5xDPpT+CA4+jSDexH/HS6naTNWl2D3qdcn ozeY4PA6ejHp/tlnD6N74RlN868g0+nIm0ue+KM+EyMWD4D2nn8zyzuH X-Gm-Gg: AY/fxX5/AuYbbxj2zDi6ksBqxe9QW9GtbcW1iFblgMzppx2lrQnLxedrmL+gwKKMtgE o5aGGPxF9nX30p6WoJpFzAfBKrPQrSMtJKe/ugUzxctHPyX3hcJ1HLqY+AI4/5Wx44mwMGZf2xD tghO6hkjaybinWHfiqCLKVtOx+qiw16z/A19LSpyCFpT0akfrSq/oFKBV0VrK7vx9b4D5nPnwpY YJ86gu1xCUKCZoYr1S5xqVfZy6iWOhTvfwo+Y3EUZfnOjWWnuS4LSalYe7oBW/A6mxLqHwORGcF Sj/wMuvzbf4wznPDdHzvdZaNTNb6nANXkBFHrgNVMiXb7NL4vwrScF6GGNQ9tc6f6rrLLWlwbQ/ LNXvB23aR3ItuHpeUjxqy3zCJl5fmm/vlTOur3OFk5iW9lLC18Ea0XjiOpijOlOe1WctIA4NDxk iILIELO1XNa5yF3A8vSWSG3BKOlbE= X-Google-Smtp-Source: AGHT+IEHum/i2me2oAGVYypygRW5Lr0FdJN1whl+oC0tykabf313G6Z1GvEaaE3TTKvu/tiyDmVWLQ== X-Received: by 2002:a17:90b:2fc8:b0:340:be4d:a718 with SMTP id 98e67ed59e1d1-34abd7e76c9mr20430778a91.7.1766057481332; Thu, 18 Dec 2025 03:31:21 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34e70d4f887sm2328237a91.3.2025.12.18.03.31.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 03:31:20 -0800 (PST) From: Donglin Peng To: ast@kernel.org, andrii.nakryiko@gmail.com, eddyz87@gmail.com Cc: zhangxiaoqin@xiaomi.com, ihor.solodrai@linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, pengdonglin , Alan Maguire Subject: [PATCH bpf-next v10 03/13] tools/resolve_btfids: Support BTF sorting feature Date: Thu, 18 Dec 2025 19:30:41 +0800 Message-Id: <20251218113051.455293-4-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251218113051.455293-1-dolinux.peng@gmail.com> References: <20251218113051.455293-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 Acked-by: Eduard Zingerman --- 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 3e88dc862d87..659de35748ec 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -848,6 +848,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 inline int make_out_path(char *buf, u32 buf_sz, const char *in_path= , const char *suffix) { int len =3D snprintf(buf, buf_sz, "%s%s", in_path, suffix); @@ -906,6 +971,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