From nobody Tue Dec 2 03:01:58 2025 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 D12C7333434 for ; Mon, 17 Nov 2025 13:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763386009; cv=none; b=NzV0m6eKy6mXIjGMPKwxeFxFyn2J6ocQ4/W270ee37zwOb/gR+bm7/2c8Kp5sZRK5VBZw6OsznpPrCEB6FI1R8vbwE2GQfDTTSFFaC2/a2fcSxn6nfWnqBeBkDnuWSeod43H9QOaGs4R4pqWss5LPQsxQ5XRkC1jjVI/M+dhZpo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763386009; c=relaxed/simple; bh=TlQb3BbQR+c28ZRJL32xlMCjA7W2OgjyhhJH/DnySmY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PENvg1Et9DO7e8sLiOaBOg58rL6WP3cupKbMXrLYpXij8Tsdj5K/Rtesqco8UXEpcZq7A02oe4r+l4FrDlajWUAlMKsMcg/XDD55NHPeO7qMi6kFva7BRABvQpsMEe2hdap64D8AnBDBRHl6k4TGBHrn/KqYsTA3eYTwH3+6KW8= 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=PC/QqyE5; arc=none smtp.client-ip=209.85.210.174 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="PC/QqyE5" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-7aa2170adf9so3615639b3a.0 for ; Mon, 17 Nov 2025 05:26:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763386007; x=1763990807; 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=yJ9pJtF62LZXJAT0luPwqHz3BLuxpObXSz+phDq9x5Q=; b=PC/QqyE5zN22D8dOTrnhkoppHyu+e3svsKIjw1gY+npQ8G89b9K+BLmackOVu/tF0A xE9r9vxpoGSCHqHiJVQRG2mEpj5nvTb7bsXQsFcQrSWvADfIUdpe8AapF340axIwZuBE 07Cl0fkZMI099Mdc0VyFfepUdILa0nNHO5ma7mYg6nFXkAbVYzuOoy+sqJOgRYedHdzq mJdKiuuYeAWX+8J+/kU2NV6/vnF1yOtmCRc81iumW3AfALe0W0BguWi4HGaOdSfiUC6f y3iYO5nFMmwAusx24joYg4GcjeqqCSvezyadETGwlZrbfM7DZhtCIFoev0Fz0rzjoYUM /FdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763386007; x=1763990807; 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=yJ9pJtF62LZXJAT0luPwqHz3BLuxpObXSz+phDq9x5Q=; b=WmyWHvfoHP6StRuK9hDAFBda9yZisSUifqgjkBPM9B0BNqWlGEw+uS6FyVzwdvhYU1 7vTokGvq1rPz00q3JIjarW2xWnlyJeP1vFGJAwuJ9oY8OBD6JNDDkgmYY3fl34vI+WYX Cywc6AXRzruGMuUPOUm8EEjc/FMiUoAfQOdogNjPg3k6U77rfAV2m9caVSJ3zDYQVNXU kwAcyuZ7g5cW557mLq0hb7pyR+3UBfdrg+3xZZZ8FfRKZuZh2Ci9GL5roQm9EAQRf+25 QAMRE54SgjA2u/W+vxRfiIXsQOxP9heH93lVzq4z8bIQ7V02N1zSo/XOoGXN6Li6mOj3 yR6A== X-Forwarded-Encrypted: i=1; AJvYcCU897tVTUQ0YsvV7/xYbz/kvBkl1jWqL4ECQgVK0h70jP+ZEhg/mpe4btniU9wxWlq4WzS7nmr/cBFUJyA=@vger.kernel.org X-Gm-Message-State: AOJu0YyPcpjHE/Ejl5gnK05IzUUzf60lO+KxLFRy0s6IpqdwlXMWCWE5 pNH9ARhR/IFMNeyE7ONM7oATzLfyaliD2yY7hhYZe2fydqCdiIJbU1Lk X-Gm-Gg: ASbGncuYrtML4Dy830ZtKbQpwC7+j2fREIv1g0W8+no25lT46D8br27gsocxUp/ACpx +DlSgqCREampQXb1kc5cMdh3sup9ek7YeaoikGMFIXGYCEGbv572tcHiQMilctvTXpTRHg4l4Wm a/46yna3n9rVw0ViW3KdY8s6YWmPIgPh+v/eE4GMMAkvhkdC/+opP4FfubsAznugKLwL74cHjn9 m9pu+Ns2jxFSQfyHIV+caig2iald7fq0BO2IXB61s/pjYUTPgLkh8NS8qqHFf0O7dMvTDWN8C3D l1nUp4278VQzMMUdTdI9NsfR5DAdU8MorilZ59Gd/onuwaH7EImuew5t0WUSv1y+tGQwfToJPbh Pa8xRPLD96evdJ98cNjb4I3BM5O78Qu/8YNDiS1tkd/P4toiTHuSjTXDmdzfLWXMPhrwHS2UJI6 U1vveNBAOOr2umlLFhLcR9VUq16tc= X-Google-Smtp-Source: AGHT+IHA5iK4wG/HkFcfe0rJP4GZNcbweMfRLzaI9ghvyze6nCPnMhT+DU1blJmo3HvsWVSmn7L5KQ== X-Received: by 2002:a05:6a00:991:b0:7aa:5053:f42d with SMTP id d2e1a72fcca58-7ba3c665a52mr12595036b3a.22.1763386007052; Mon, 17 Nov 2025 05:26:47 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7b924cd89bcsm13220953b3a.15.2025.11.17.05.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 05:26:46 -0800 (PST) From: Donglin Peng To: ast@kernel.org Cc: eddyz87@gmail.com, andrii.nakryiko@gmail.com, zhangxiaoqin@xiaomi.com, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Donglin Peng , Alan Maguire , Song Liu Subject: [RFC PATCH v6 5/7] libbpf: Implement BTF type sorting validation for binary search optimization Date: Mon, 17 Nov 2025 21:26:21 +0800 Message-Id: <20251117132623.3807094-6-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251117132623.3807094-1-dolinux.peng@gmail.com> References: <20251117132623.3807094-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 patch adds validation to verify BTF type name sorting, enabling binary search optimization for lookups. Cc: Eduard Zingerman Cc: Alexei Starovoitov Cc: Andrii Nakryiko Cc: Alan Maguire Cc: Song Liu Cc: Xiaoqin Zhang Signed-off-by: Donglin Peng --- tools/lib/bpf/btf.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index bb77e6c762cc..b29f5859c10b 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -903,6 +903,64 @@ int btf__resolve_type(const struct btf *btf, __u32 typ= e_id) return type_id; } =20 +/* Anonymous types (with empty names) are considered greater than named ty= pes + * and are sorted after them. Two anonymous types are considered equal. Na= med + * types are compared lexicographically. + */ +static int btf_compare_type_names(const void *a, const void *b, void *priv) +{ + struct btf *btf =3D (struct btf *)priv; + struct btf_type *ta =3D btf_type_by_id(btf, *(__u32 *)a); + struct btf_type *tb =3D btf_type_by_id(btf, *(__u32 *)b); + const char *na, *nb; + bool anon_a, anon_b; + + na =3D btf__str_by_offset(btf, ta->name_off); + nb =3D btf__str_by_offset(btf, tb->name_off); + anon_a =3D str_is_empty(na); + anon_b =3D str_is_empty(nb); + + if (anon_a && !anon_b) + return 1; + if (!anon_a && anon_b) + return -1; + if (anon_a && anon_b) + return 0; + + return strcmp(na, nb); +} + +/* Verifies that BTF types are sorted in ascending order according to their + * names, with named types appearing before anonymous types. If the orderi= ng + * is correct, counts the number of named types and updates the BTF object= 's + * nr_sorted_types field. + */ +static void btf_check_sorted(struct btf *btf) +{ + const struct btf_type *t; + int i, k =3D 0, n, nr_sorted_types; + + if (btf->nr_types < 2) + return; + + nr_sorted_types =3D 0; + n =3D btf__type_cnt(btf) - 1; + for (i =3D btf->start_id; i < n; i++) { + k =3D i + 1; + if (btf_compare_type_names(&i, &k, btf) > 0) + return; + t =3D btf_type_by_id(btf, i); + if (!str_is_empty(btf__str_by_offset(btf, t->name_off))) + nr_sorted_types++; + } + + t =3D btf_type_by_id(btf, k); + if (!str_is_empty(btf__str_by_offset(btf, t->name_off))) + nr_sorted_types++; + if (nr_sorted_types) + btf->nr_sorted_types =3D nr_sorted_types; +} + static __s32 btf_find_type_by_name_bsearch(const struct btf *btf, const ch= ar *name, __s32 start_id, __s32 end_id) { @@ -1148,6 +1206,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) { @@ -1332,6 +1391,7 @@ static struct btf *btf_parse_elf(const char *path, st= ruct btf *base_btf, } else if (btf_ext) { *btf_ext =3D NULL; } + done: if (elf) elf_end(elf); --=20 2.34.1