From nobody Mon Feb 9 23:04:34 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 9EAE02DEA83 for ; Thu, 18 Dec 2025 11:31:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766057491; cv=none; b=pLklHOnvNaYQGgI471UIfRMHDqQC0TZPDpH06xYG7942POTS1YxOvu8Fy/D5EhlPaogU+2CqBmQYzXJiw6tqotjOrAMFq8CcuZey7W4FNoprsUKNbsgtXX8PjVgBm4l+hyw/Hqgq8eM3628TmdnLIt7oG17X+pn9pM27Hcs1Zk4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766057491; c=relaxed/simple; bh=MJCWCSf7+gBpXj5+kFXAWTCAHljmZxeXXmtQQ0SlYV0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=F2z9HqRyj7E5ph2WvDw+E48SYyZ8aHgaVC48SupVlEt6tgunOmK4uFluAyFbN/+MONTYus6rkIDzvnuNh7h6U/VhJxhAZmr+h0+59EBRQmlfatBLuXX+GRS2W7Xhz0PNJ2/0lc7Qp4gvICjPf4ndlTCnhKAQobI/i2sycbEWaMY= 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=CjKWi73M; arc=none smtp.client-ip=209.85.216.48 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="CjKWi73M" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-34b75f7a134so430805a91.0 for ; Thu, 18 Dec 2025 03:31:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766057489; x=1766662289; 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=Ks0ORR4UPC8cdozXOqcEU9Y4B28RYyjPhBeqsdEUJ5I=; b=CjKWi73MyCirHZ/TZ35RsBZHeAYeuuJlAYN9ooDeK0Qd0Zsc92agPJpK8fLW0VLPII 3elBw03wbgyAkLWHaZhLP7jijXuNZce2nHlNx+YngnRRqDtgeJsovdvITJsccYMyxC0P zwlCJC8aelUf5+Om8mQGR1sH5PsFVx0a/s7NeyH0U3kpeVJGHXrrhTEMHIXFG/myK9K4 HrvZ1AHCTHPOe1sCYB9o2RZdafVAd/+mOu1zWGiBFL4aDhweK7NhIPE+Ln74/0DeycTC EHUYCBezmhu2Y7g+pMPnqtPtOJiSx+1U5GAUHajG5OVxDPMebMlRc0QC9HcXwBGRtjEM nvhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766057489; x=1766662289; 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=Ks0ORR4UPC8cdozXOqcEU9Y4B28RYyjPhBeqsdEUJ5I=; b=Vp/f3qtL31A6AxK6cba+nBT0wslN+7Cs7AcAaG0uELMT7/+75MvaIgI8Lb2vcGQzpu Y+Xmke6ab1xCjwRSvPdGzF7T9+KV32qy7rtuq+O2maKHNtBWhuvSt9yzz/U6VmyV3r/V fEb45i1Xw9XZmnnBLpzd8xQNZmpXgYBWv6C/joBli0Xd2X2t0JqOZ+6ricMbvRKyfI+E Hrbb+Rc2YSOgrqDdrnj6msmaZ2/zFgH3ZaXJXYlqVFbZVxsJG0gdytrnr5SPhbanWsOC r+GDkq5AUInSB7dv/76Yz36q81rN+mLHdlhXlAVvFnHRmvC/CysOk2KTm/fA38oHAL6g 0GgQ== X-Forwarded-Encrypted: i=1; AJvYcCU7V1BMnVCYXCwJxmltvQsf3opR7UYwuf/r3y0IsQen7TYnyxybd0zDeJJUtFrh86zAxHa74HNTEK0ni+U=@vger.kernel.org X-Gm-Message-State: AOJu0YwMMGjDhlMtX2YSxvVFn5shxGx/7le+tiN2Qcbj+MAXO9KqtNOj YM7f4EcWxFSjksXOA9RkJXPfBFmT2zOmuNxNY8XwYRa8iOYm6ET2AAB7 X-Gm-Gg: AY/fxX5qkO6twZ2ONv75+5eW+75cz2+gM7/bvB3xUliZpakZaIqn/0qRbW42EX95C9q D8zKIVpU+qy4UVVJSLS8xonvPwzhbWktvdrs7Mz8e77i64NyMZ/0sfcqnAsaEw1DyRU/HoZhJxa h1+tKET1Y4ue6O0oLGUboh5M6yNYtlBHEKjZGWmWojFcuIprDk20OtrEIVdz7ifzF3+mZtdufYQ 1l+DMWRu1smMEVFmx21lLEB5lXzEXYc9rtfFpEoawjIqGARFE9Qic66DtclHfOi/7ClTyazc2aJ upz7XeIBuPpQZnZ9ZSJci+hJl/w341vRbaGTjwTzLwxvWP7FQ0nb7GEKVchCdy9gmbaIcfhLL5Q 6R+wY92wmUbNmX3+iRpv6DJ7BViHpBAFoAxnfA9t52uADU3eX72P+DE6igxVGn4dSPeMf4qghDL JyART1NaJs8lnOD6Zo78H+p5xKvhw= X-Google-Smtp-Source: AGHT+IEySBV+KCTgdrjD3x8MpUwLOxfCP11MntDaFD4SAgq/+i2aamQwMQYKJtgPg09lbDTVxxjigw== X-Received: by 2002:a17:90b:3912:b0:343:d70e:bef0 with SMTP id 98e67ed59e1d1-34abd8488c6mr18834187a91.21.1766057488610; Thu, 18 Dec 2025 03:31:28 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 03:31:27 -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 05/13] libbpf: Verify BTF Sorting Date: Thu, 18 Dec 2025 19:30:43 +0800 Message-Id: <20251218113051.455293-6-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 patch checks whether the BTF is sorted by name in ascending order. If sorted, binary search will be used when looking 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/lib/bpf/btf.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 2facb57d7e5f..c63d46b7d74b 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -899,6 +899,46 @@ int btf__resolve_type(const struct btf *btf, __u32 typ= e_id) return type_id; } =20 +/* + * Assuming that types are sorted by name in ascending order. + */ +static int btf_compare_type_names(__u32 *a, __u32 *b, const struct btf *bt= f) +{ + struct btf_type *ta =3D btf_type_by_id(btf, *a); + struct btf_type *tb =3D btf_type_by_id(btf, *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 void btf_check_sorted(struct btf *btf) +{ + const struct btf_type *t; + __u32 i, k, n; + __u32 sorted_start_id; + + if (btf->nr_types < 2) + return; + + sorted_start_id =3D 0; + n =3D btf__type_cnt(btf); + for (i =3D btf->start_id; i < n; i++) { + k =3D i + 1; + if (k < n && btf_compare_type_names(&i, &k, btf) > 0) + return; + if (sorted_start_id =3D=3D 0) { + t =3D btf_type_by_id(btf, i); + if (t->name_off) + sorted_start_id =3D i; + } + } + + if (sorted_start_id) + btf->sorted_start_id =3D sorted_start_id; +} + static __s32 btf_find_by_name_bsearch(const struct btf *btf, const char *n= ame, __s32 start_id, __s32 end_id) { @@ -1147,6 +1187,7 @@ static struct btf *btf_new(const void *data, __u32 si= ze, struct btf *base_btf, b err =3D err ?: btf_sanity_check(btf); if (err) goto done; + btf_check_sorted(btf); =20 done: if (err) { --=20 2.34.1