From nobody Mon Dec 1 23:59:46 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 9BDBA3164A9 for ; Wed, 26 Nov 2025 08:50:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764147051; cv=none; b=ldEfMdzIKZyqoqnwNugxoIl41O0mKjr4sCwoYzv6oH38akM1gshzQVIEsBCpjsJ373AmiigF6Y5FQbUjsLJOAnSd3E8e99oIFXj+af6h/o5oSotbJd25iSoMUD1qX3VyF7QLINC4lc52kBDVqLeMPhkFUaSg66e6KD5ZerEX3Zg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764147051; c=relaxed/simple; bh=8hsjVTc4iHNm8LdtJrSwh8RnQyLo12TybfR54C1ppls=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BAkvGs5V8UWhrQQTGr0kh/URsJ8JMIYcwTouFEJe2Bb8vneH0WxwkAcND04ORiLcjTR7mO7VPDT7Li272jpbDs7ieas3KRno7oMrZf7e6F1mC0+Af6E410mFypCf7s8vJ+UIoHOJlu4B89ZvO283SzSMnLaIahox2oYC7YIKdLI= 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=Q95TwzBI; arc=none smtp.client-ip=209.85.210.178 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="Q95TwzBI" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7bb710d1d1dso9810153b3a.1 for ; Wed, 26 Nov 2025 00:50:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764147049; x=1764751849; 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=xAB27SW8ze5pe2PA9+A7ZhKextxDBm6v0Soq1ZoL2Ng=; b=Q95TwzBIWLoIWY7yGyjEa+OiZMKCMGMTCqr+Xo09xos5bty7k+aaFtgOY1KTaE/Uc0 2EjysvwZIaV4MVwRQ6onn9pTtu+sOVmMWJfiFOf90mPP1Sw/2NlJw7qQbyuJqQJPkGZu O/YPGWHyzQifVhml2fS6GP8OaHkEeSF630FpCX0GZpQle2Wxcb5RQhL2hFnG/uygpKLZ r1SKSx/rWu+SkEt38J3yK7EKs6Y3aQ7Dd5dQLHT7fZIuZy+maDE2Se0RKlcgEIIK5v2Y d3H2RmzItsQLSlww+3tcwJCboizjvhrRjfOuuGVUZcUpG9FaKDfA0o0YEq/CplATngkO tjdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764147049; x=1764751849; 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=xAB27SW8ze5pe2PA9+A7ZhKextxDBm6v0Soq1ZoL2Ng=; b=fxVqtT9dj3eGKlvM6i7+9H/lpC6lymsI4X35qYR3POrFaeBRD8kqIq2jDOZ3PPFdYr rn2oP6CncIXz9QFkTlabfyHhVgbmmPZKS6OT1xOefmgBw+6Pa8Ds7yt26xciHRV1UYK9 SVdMehKMgshQ5CVU+E3k3w+vb62g8wL7+VtnG+ToyhqBIDPMXlqzaow55VE16vFHUv++ oUp2I6+S1uMV7aKK9ktlIXQMROhfvqrwswptIX72iWSUf0F+9TchFKN5BmT/ZFXT149P P4sUZG7ZpGop6d2jroaS8KI1hIgtpB1v5a170AtOAhWUqHrYIh5557vv9uHqe/UM5uaG pjdg== X-Forwarded-Encrypted: i=1; AJvYcCWhBak8AkIp37gr63Om1EYszNo/F3h5UiE2Nvbc5FCmc8XDhM347hJZm8QGQ7jvXvPK1cjesHvK9IbdfmI=@vger.kernel.org X-Gm-Message-State: AOJu0YwkO0fVvhdwSIG4BM1uCOwuGM5Nt1MuPeJQPHO4m5upujkiIoE7 MwmkiuZJDu5xXesU3fP7aryJtFe3cC0IdHaNVNKwcFuBHNMdnQUbX12b X-Gm-Gg: ASbGncsKztbC3Nd7IYbkiM1M/lEurbIBqjMsK5dOk7uOOrRWb/Z/O+iJ5rEsHSyGbDs tDAV+C42NNaK34E7OGb4d8RJvb8B8K6fhR3rx0e8GHM+LzG0yF6KGw4Gu+XqTLOjeIueLcYUEDi bxqoB+gkRvwunA7G7sK4aoZf3XJFNKU4W6ouUjqDsH1qlLqeDLiQAeVYK7KEAYnFaGOOfqKl0ja +bbb2J0AeVFGg8Nbu3kc7ATqZ/dJK4gsJbWbqKvYqeYXKHHDqRBqTQmlyWB/otZPlmlIkbo/2s3 Hz+pdUT/b3afr/D9eo/1kMmqxOHOYum7gPk70w+ZG0PF+fFeDNVPPQa/rrfMImo/kQm3LCmPg/+ eUErJAoaAelXCAbsKK9dq8frvctCClIWvvQPedipRf+RqbjGINbCv8b/GzjRcwkKhH+BfTFYiiS bpP5FeXkcKvRQVvKScncd2MGC7nZA= X-Google-Smtp-Source: AGHT+IGq8Oo2JKr1dmJgr6hMlqWRYmEBgM0iCXG7gLktRGpc3fCfrvlGdc+e2qanX74xdGTGMMUy8w== X-Received: by 2002:a05:6a00:21c1:b0:7ab:653a:ca0e with SMTP id d2e1a72fcca58-7ca89a6c262mr5965607b3a.23.1764147048836; Wed, 26 Nov 2025 00:50:48 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7c3f023fd82sm20885721b3a.42.2025.11.26.00.50.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 00:50:47 -0800 (PST) From: Donglin Peng To: ast@kernel.org, andrii.nakryiko@gmail.com Cc: eddyz87@gmail.com, zhangxiaoqin@xiaomi.com, ihor.solodrai@linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, pengdonglin , Alan Maguire Subject: [RFC bpf-next v8 5/9] libbpf: Verify BTF Sorting Date: Wed, 26 Nov 2025 16:50:21 +0800 Message-Id: <20251126085025.784288-6-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251126085025.784288-1-dolinux.peng@gmail.com> References: <20251126085025.784288-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 --- tools/lib/bpf/btf.c | 46 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 7f150c869bf6..a53d24704857 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -899,6 +899,49 @@ 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(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; + + 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; + int i, k =3D 0, n; + __u32 sorted_start_id =3D 0; + + if (btf->nr_types < 2) + return; + + 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 (sorted_start_id =3D=3D 0 && + !str_is_empty(btf__str_by_offset(btf, t->name_off))) + sorted_start_id =3D i; + } + + t =3D btf_type_by_id(btf, k); + if (sorted_start_id =3D=3D 0 && + !str_is_empty(btf__str_by_offset(btf, t->name_off))) + sorted_start_id =3D k; + 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) { @@ -935,7 +978,7 @@ static __s32 btf_find_by_name_kind(const struct btf *bt= f, int start_id, =20 if (start_id < btf->start_id) { idx =3D btf_find_by_name_kind(btf->base_btf, start_id, - type_name, kind); + type_name, kind); if (idx >=3D 0) return idx; start_id =3D btf->start_id; @@ -1147,6 +1190,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