From nobody Sun Feb 8 23:35:17 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 3FC0D35BDB3 for ; Fri, 9 Jan 2026 13:00:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767963620; cv=none; b=bCBQXX85GLm7mSRC21ojE7yGZgDuUL/o0Wcmr1XLZ+pcMw9ljSnlCUbt2pnOPhKttBDmEMhIWwV8UFkoOA/M6/g6Cg8RUf0FohasTfkFTsid8fJwP133Heev5+NT/wsoNzsEmypm2qzBO6XuvO9gkCu72qZ23FDy1IocFLI/j4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767963620; c=relaxed/simple; bh=V2vGk2Zy5fJHvJb6bZZNfPor1jIBJ/nlZMkVKHTwBMQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gdJ1dRMfZuCghdXowJEQ+mLWa+0m7NPetyuwFu5ow5Xat0IyDpnITzdvxQ1LEly2B3/MsFXGFvO5KAuQhlJI9gE7OFwGK42gguqXpaGTwesrgWR5dciydHCSZaGhpKm44FPUCnUDHb+jsypW9SZv/gpvNG5GQRpEQoUVvSKaWXI= 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=VsCaxs+C; arc=none smtp.client-ip=209.85.214.177 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="VsCaxs+C" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2a0a33d0585so29074145ad.1 for ; Fri, 09 Jan 2026 05:00:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767963618; x=1768568418; 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=Bty2Mx4T9JTfidtdE5tI1SEQacGBSMSmT3cGtlsXrrQ=; b=VsCaxs+CfVbmGdcKD/KsIsSHsIHhEbdPJ2xBz/wcAu3q9M9ZzCzedQsXkprzF+au/u bLFD/pmIPJ+ADs45oYzVMP87NmDd/n5+nAPRspAX4nLiq2TwNBaeUgMVwcLWcOSa7buo +bdhrEeqKijbV55MzgTq/y2UQaxBmL+9a1FymHZFXkbVfUTuWcovilk8bs5bMoWq0qvz CQt2pLXeFFBpJZkEUPs8eifhxF7uqTL9RXu2qhpGaWFxwSM7ndkQLR69VUSZwxR0aYVP m3C13bSNXydgNXbS2ZSkPDbvLHM75IPRAgqAmYtXSZnT9o4toHKqCRq5hxm+bpdmp//m CWZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767963618; x=1768568418; 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=Bty2Mx4T9JTfidtdE5tI1SEQacGBSMSmT3cGtlsXrrQ=; b=ne/4NCog2i3Xg4gdnQ+MiXRBJbUb+srqdG2PmlvqzW3hGMpd2OHjnIoceCzXeGQ05j ptVKH5KtxG9PSpnjw5KrXTOG29JYd+QoosXOcv9fj0WfgCvpg6eM5YriVkWhi3pzx/qO +RoqdGJx2HVn/y+xSEPd7vtghO6KLqKSwprS9DnAxMQHsJHSqud+9TpLXN2Mt8Vtkqxd 7i5KgDuOFXb8mxhQGXcVJKqqsqIE82TzEoXCFM72f/IJ71OxaseiUsnxFwx6l27EBXY6 jlNx403wVLensoeWS/g+CfLLaZQD0L+R6WtuYITjKfsEAJPakm9gNkb7PwQQuWOchsQZ J2ag== X-Forwarded-Encrypted: i=1; AJvYcCVAwN2eg3YLofIAyK25CIAIcU8JkrJCn9YfhnXDSGcrJqjV7bukY4UX53kIA427YcB9rzAke2aP9eBZgoI=@vger.kernel.org X-Gm-Message-State: AOJu0YwTMYh1tiGnXhlAhyCMINUEQLMTK/47KTZFRFk2E5HwC+kQ8pYh 5RFO6cl78V47g4H1157fk5RN120jehUInNNR3bwKn0Zz/rO8UW4YCAVB X-Gm-Gg: AY/fxX7f/6OFaAjdN/+Pa3haiaHQbXa9DLECcuOhrO0BXfNzdI+6zW12xIZ6WFVtgs0 SFuB1BF5a1Y86Oq0/6jR087HRFMu06EJGtn0DC6E79VzHzK3DqkS0kGFiXbC5V7KGqHEGltD0J5 tWAwJVNYYU50IvGsRdnV7tlM06Rnkdyt9EMsBoOFEJHyPp0RGIjzSxw9a1A9nCdcFmwuowGM8Ac 0JNBBqhRbKtN/NKmGyiYQ7w1IK3Pkj6UdOiHWxS9Iuvg026rI7wyY5Zkvw21jQEU6q58PrEma8a T7Goy9pQcMAmR/lAc15+H7Nat3//9dkgB7o7dcvwUR8urer9miBv30T/FeJopW35iv6CPqGg3zL 28LqO8Ztp0Wy/4L4aHYhNRZ6885DAvTQAeEDxvWlQzNmXNF9bka4BVrU3rphO2ug82REDYxIE04 4Kn//+s+FeSexqUZ/5CVXw6RKurXr70lewAl5Ghg== X-Google-Smtp-Source: AGHT+IECF92w8fh+lHt+04+liud+q7g2I2MsZIwzGHh6/4mZ0MC6VCsv+IyzdIp0hp/XC8DnU71DOA== X-Received: by 2002:a17:902:fb04:b0:2a1:325d:8219 with SMTP id d9443c01a7336-2a3ee49010amr62629655ad.38.1767963618237; Fri, 09 Jan 2026 05:00:18 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3c3a328sm104927325ad.4.2026.01.09.05.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jan 2026 05:00:17 -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, Donglin Peng , Alan Maguire Subject: [PATCH bpf-next v12 03/11] tools/resolve_btfids: Support BTF sorting feature Date: Fri, 9 Jan 2026 20:59:55 +0800 Message-Id: <20260109130003.3313716-4-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260109130003.3313716-1-dolinux.peng@gmail.com> References: <20260109130003.3313716-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: Donglin Peng 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: Donglin Peng Acked-by: Eduard Zingerman --- tools/bpf/resolve_btfids/main.c | 64 +++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/mai= n.c index df39982f51df..343d08050116 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -850,6 +850,67 @@ 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 0, start_offs =3D 1, id; + + if (btf__base_btf(btf)) { + start_id =3D btf__type_cnt(btf__base_btf(btf)); + start_offs =3D 0; + } + nr_types =3D btf__type_cnt(btf) - start_id; + + 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 + start_offs, nr_types - start_offs, + 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 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); @@ -1025,6 +1086,9 @@ int main(int argc, const char **argv) if (load_btf(&obj)) goto out; =20 + if (sort_btf_by_name(obj.btf)) + goto out; + if (elf_collect(&obj)) goto out; =20 --=20 2.34.1