From nobody Mon Feb 9 03:33:14 2026 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 5FFBE31D730 for ; Thu, 18 Dec 2025 11:31:53 +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=1766057516; cv=none; b=pR3+4/C/guQBsyqB0W9JDckMkpSchvd68JL97ItL+729Q0DKB6XWapNfy61Zk3uOTdGI9wyssZBx7mkAvf6rVhsMl4Zzk8RBRJRc4Ip+34eBiIpWVoipZe3sHDDciqI1Dzb1x747cqLFtQiwvDpbbWvOx+HdKKs8EHuCKMxJ4TE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766057516; c=relaxed/simple; bh=J4/QGROYYa7Djiw/eaQ3GNdqZT48kiErWfvGDV8/Tys=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Nf1nKyniuwHXxtcxwGh3vCmEyv0WXXyyxsSKW6QSOrVNljbvxrsrfLQKr3k5RgXJpHydwOJPrPq0D428eX1R3QIq+R737icwxqKfqp+Tvc069T3iFA6L+vwyk3hqTtKnLdd2DatVe4aJus1TE7/yhQK/XZw0bbFyITX8SI+hYOU= 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=em2YnYJ8; 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="em2YnYJ8" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-29f2676bb21so6452085ad.0 for ; Thu, 18 Dec 2025 03:31:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766057513; x=1766662313; 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=pRe1/jA95O9SPOHNbjC7U56aVV5DEJyjPqrggmgz7zU=; b=em2YnYJ8V3pZmmGPkkl4NzltyZJll8nv55OtLzfW1m/jKEAnr1p46GfnmvJsXOiQG7 GGUSsHTGGq3uL8lDLUAmtHmiZUsQNYGKp0ljKyJpKrvUb0BdV3IcvM/IonAodzAey39h YEiArb2tTDWu0VIgKLaN4QC4WlgY7tcn9yz15b/AEQvuWt7kNSF3Z76CSedsZWRKGopt sKPtYXJQUU3KE3B/Yn8+uSf1X0xEscjR0+tTNSykFiARlgyT/bM5iz6K23z9yM7azCYB EUrePjjsRF1UG7QeLItalvSNScqpZ6uPjAJvgP/lzxm48L33jYFesqpnxZsGDpulAngR 5i2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766057513; x=1766662313; 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=pRe1/jA95O9SPOHNbjC7U56aVV5DEJyjPqrggmgz7zU=; b=ZLd5BEVt48YOTjrF9Ieergwan8gq4pfKN7nlZLy90a41ZhPgAcdA2FUECNB+bbyJgA Oxgl9k9FxBbhgnmdwMQEMvhfJUbjNAhFwYdoYXA6h1/zAnLOTxGB7Vy3vUM1ZKgwCzpc PJBbwbzfR3u0Ql+bEMGS358WVSTThEE8jB/NZQodMDVFv8jXDLtuQJhptweAptrzv2SH lRWyii1Vm0lahK49/xo4w5ORGNtQgK3xXMs+Rhle+uAmoAgQaQ03rjZA4xg0OAmhm0j7 fbIUPTTGH/LNf1cww2fxyhxB3k6/qy7xVRtzrIcq3U76pnRuF9ik6mdRzE5fsmUkb8J5 QAFA== X-Forwarded-Encrypted: i=1; AJvYcCUvP03BLpU1SOrrFsWuVangLRhJtAy8Y9n6OToOTS6nu7ag3y4xqzjUsOCpy5C7jFpXXcPwI+IWAAIvvHk=@vger.kernel.org X-Gm-Message-State: AOJu0YxypaId9rtyTC8q191n5BWWzTGmgNn/NJ04H0XaNiF46Dl0crkQ uwovbE/c5YOVtJToPr5Fwcs/McrydDcJRHtcoNr+pejAYzRUGiL4fI3l X-Gm-Gg: AY/fxX7p80cP0Rb63uC6Ct+DSiC4tTbSomGBdaPHgZOx62cCKqOge2+H9RkTTxZTHbv Q4VsO+SLGeZtPulhSu1YKi7JKQVs7MTP3zsBOF+CAXC/Y9M3lvN68poi9LNHfhluIWQ7OY3nyEv 8tW7h+/EIZbYpu8R3yoq0fuS2xoTW0jFY+S/jv+M42om3lQm8d3X2oeHF5Hd4O0XRqSg+qFsC7f xIY9qSE75ORUIPXnFVE1ljTiznzFF9qo+PNCDsHRxmaVJ2YHj1d7kEI42ghpnFjxoJlyggPdbUS VyC5wOSP+hnbZe43C4OZ6oir92WJ6KhT9AdSOEeQ/x8WIQwG4FxnP/b6qe2vBgBEkG12Pn6PwfR HreQ0/P8+TJnJOdoaYVt9yEN1f1Z+YNiE5VOofc7bya88BbJIxPco3a5bM9KzcA7oECmj18QuCT ggrFh35saJiMv2lameYf6XN1rbLLs= X-Google-Smtp-Source: AGHT+IGkvlwioTi7DAg22F7nuqKXStAbmWJyhw8eWuCQ/KK9iLrazpre9epMzNPRQ+MW4qWMbDul4g== X-Received: by 2002:a17:902:dac2:b0:2a0:be59:10cc with SMTP id d9443c01a7336-2a0be5919e2mr145918815ad.32.1766057512655; Thu, 18 Dec 2025 03:31:52 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 03:31:50 -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 11/13] libbpf: Add btf_is_sorted and btf_sorted_start_id helpers to refactor the code Date: Thu, 18 Dec 2025 19:30:49 +0800 Message-Id: <20251218113051.455293-12-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 Introduce two new helper functions to clarify the code and no functional changes are introduced. Cc: Eduard Zingerman Cc: Alexei Starovoitov Cc: Andrii Nakryiko Cc: Alan Maguire Cc: Ihor Solodrai Cc: Xiaoqin Zhang Signed-off-by: pengdonglin --- tools/lib/bpf/btf.c | 14 ++++++++++++-- tools/lib/bpf/libbpf_internal.h | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index b5b0898d033d..571b72bd90b5 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -626,6 +626,16 @@ const struct btf *btf__base_btf(const struct btf *btf) return btf->base_btf; } =20 +int btf_sorted_start_id(const struct btf *btf) +{ + return btf->sorted_start_id; +} + +bool btf_is_sorted(const struct btf *btf) +{ + return btf->sorted_start_id > 0; +} + /* internal helper returning non-const pointer to a type */ struct btf_type *btf_type_by_id(const struct btf *btf, __u32 type_id) { @@ -976,11 +986,11 @@ static __s32 btf_find_by_name_kind(const struct btf *= btf, int start_id, if (kind =3D=3D BTF_KIND_UNKN || strcmp(type_name, "void") =3D=3D 0) return 0; =20 - if (btf->sorted_start_id > 0 && type_name[0]) { + if (btf_is_sorted(btf) && type_name[0]) { __s32 end_id =3D btf__type_cnt(btf) - 1; =20 /* skip anonymous types */ - start_id =3D max(start_id, btf->sorted_start_id); + start_id =3D max(start_id, btf_sorted_start_id(btf)); idx =3D btf_find_by_name_bsearch(btf, type_name, start_id, end_id); if (unlikely(idx < 0)) return libbpf_err(-ENOENT); diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_interna= l.h index fc59b21b51b5..95e6848396b4 100644 --- a/tools/lib/bpf/libbpf_internal.h +++ b/tools/lib/bpf/libbpf_internal.h @@ -250,6 +250,8 @@ const struct btf_type *skip_mods_and_typedefs(const str= uct btf *btf, __u32 id, _ const struct btf_header *btf_header(const struct btf *btf); void btf_set_base_btf(struct btf *btf, const struct btf *base_btf); int btf_relocate(struct btf *btf, const struct btf *base_btf, __u32 **id_m= ap); +int btf_sorted_start_id(const struct btf *btf); +bool btf_is_sorted(const struct btf *btf); =20 static inline enum btf_func_linkage btf_func_linkage(const struct btf_type= *t) { --=20 2.34.1