From nobody Tue Dec 2 03:00:26 2025 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 7E2A633557D for ; Mon, 17 Nov 2025 13:26:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763386016; cv=none; b=p/Qk1D+H12jLnlsVyNSGtRlHSUld8tyJMKgjPqmxLchUxruSSgaQd1mllYskgwW8Q4Ax7/v4jvDIwDjzD2slnNsnrm2nPChSZ3M1swRAghl8l+ReiI+UeuF7J/uFq6CO0jiXVnk/RQy0fmnpiVtET5IQUFHTdzDw2pXw5dtuUao= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763386016; c=relaxed/simple; bh=ZUKwweoi/8nzVzk7XZ/MU1Z+niGdx/B7murw68s/Bp4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kqVy6u6tCbJu7amTBAh36Kr6Fxjvfnck83e1mXU2wAhkjb8zlvlXt91MEiadwQonQO8AXyakIJBgm1bAzD1CLIROEnwNgdZQV8MOxjLXM/36NozCbkHlp1B0Vy3KnL4BLgidx/dZbxZfg4/wo0Eg4Vn4CzkdGsuAJfdgzuAGZcA= 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=OWaGHIDX; arc=none smtp.client-ip=209.85.210.175 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="OWaGHIDX" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7aa2170adf9so3615745b3a.0 for ; Mon, 17 Nov 2025 05:26:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763386014; x=1763990814; 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=kUmHdLag/Zwi31gDv/2YF21TbKhBrlOl+Tx3LANhSGo=; b=OWaGHIDXAP7OGBMnmHhGk1TqhZNjmHjYNuPNG0QIJshfjw+bU0Zqif9IUUJYE5lQwE 9iuW0MnbiiPcc8UZ/yClPlE9FbvxWulDNeB1T5dc0yzsq7YIs37VW28afkIxV84QiblA yLsoQhzpXzjvkyrcPXQSH6MRtjZzCrXrcSdZzIVX8rPRY8d1so3PQClHd9wo5HJZkA4e Ke00994j/pWIp8j9v9t/aaeEb3befwYT9DFi9ltCbjvaUQXGSgqBTT7PixKPRy0uRJWn u2/fxAqq0pxFbt82dOWYU0bBLR9hh15fxgnut+sVRy3A9tn5RS3lHFDIkfFp0v4WHFKz ihYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763386014; x=1763990814; 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=kUmHdLag/Zwi31gDv/2YF21TbKhBrlOl+Tx3LANhSGo=; b=nnmcbFP3nx6zS9JNk39WmRwbWOVeN43SjIMuS3nsD9cASlkd2oUSsojDpLult2LgDi XzLPQOAsOj0pz54lhwUTmdd/e/f94stXPxPqXOlvtm4NIofOgUKDB35QgYWMZlg7+nCU TdGZyzsvkobIW2lQNM6kPfG3fiVK4EGD8MfaOU9jvC0QQzAVWRlG7wg/kJOYnlDnOQzM nyDvDfz9R5ab/mQmj9UWGQBM3oeEOrlAbEvmjWkbw+w5bPswSFt0cSbLX+oi/Y1MpiPL r9EEUq9+27npCyHN2h2DNLWeHsU12UoxuAvrpx3SsGYjBy3499ypWpfAgS10AjqM+TNk wafg== X-Forwarded-Encrypted: i=1; AJvYcCWsZbmv0FVn037AiZZUwfayHWugcH4j6wAbkunQSGCLRs8/At/bcv9NeyJqFiMUyj+g/IF7U+QlVr4gBdM=@vger.kernel.org X-Gm-Message-State: AOJu0YxD3MhAN+8CtociXlaSFly9rKmZ8EsXy1E2J22OtmZrgMP0G5Zb eyaw4xXWG8nwxf3fXA+x9tEi8ddTL4LB1qqKEppn20Ra6hvgZB79YwNE X-Gm-Gg: ASbGncuQouh4cn0zBbQMjJJdRaYR7cWPP/xohOrRwgMPFBqFmA6ee5c8AB4I1C40qvU qJp/tUqSqCS+8/azVlMUFq5nN0usY5uLx73p9zfRJzHhTOaSXfecRUKSLEw+1hptUnFw/NCwW5E vtF8jeUw1tdEaGEtUsHfoNkZlNApr9ZJe00W2SqfZKv+eFJqdbsMA3VFj24o1kw/dpZ38/eDPA4 ttW/5SORCtfKdxDY8pVrUVn83vNwJxsTnVhn8ocuv07AmB4ldbTBFIRXzHBY5LuBIc/wR2eT+iS YZTWyZYwSTAakMnRvx8LgHNLvCLhvg2t41Ktm+6Z1wP5BcgvRdtJicLwJ4Hgt8uLruVDlMSDjG6 Z2jQmA1mMa8BHjJ4rIBfS+4kS+/dznxPxeXgGtrT7hW6UvHPBHVQHEJsg5Eudy6DwBoxLBNZbIf DY1RqNvmd65GA2Xfe/g7Q3IBjvEEM= X-Google-Smtp-Source: AGHT+IH7nNeUVTI5MtzgwWkfmohW7BLPU8Ki2zP/T6SA+lyofQHTyXWYuBQSpmsX91Ot+Ie2xHqq2g== X-Received: by 2002:a05:6a20:9389:b0:35d:6b4e:91f1 with SMTP id adf61e73a8af0-35d6b4eb84amr8682137637.34.1763386013790; Mon, 17 Nov 2025 05:26:53 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 05:26:52 -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 7/7] btf: Add sorting validation for binary search Date: Mon, 17 Nov 2025 21:26:23 +0800 Message-Id: <20251117132623.3807094-8-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 Implement validation of BTF type ordering to enable efficient binary search for sorted BTF. Cc: Eduard Zingerman Cc: Alexei Starovoitov Cc: Andrii Nakryiko Cc: Alan Maguire Cc: Song Liu Cc: Xiaoqin Zhang Signed-off-by: Donglin Peng --- kernel/bpf/btf.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 5dd2c40d4874..e9d102360292 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -550,6 +550,66 @@ u32 btf_nr_types(const struct btf *btf) return total; } =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; + 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; + + if (!ta->name_off && tb->name_off) + return 1; + if (ta->name_off && !tb->name_off) + return -1; + if (!ta->name_off && !tb->name_off) + return 0; + + na =3D btf_name_by_offset(btf, ta->name_off); + nb =3D btf_name_by_offset(btf, tb->name_off); + 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. Note that vmlinux and kernel module BTFs are sor= ted + * during the building phase, so the validation logic only needs to count = the + * named types. + */ +static void btf_check_sorted(struct btf *btf) +{ + const struct btf_type *t; + int i, n, k =3D 0, nr_sorted_types; + bool skip_cmp =3D btf_is_kernel(btf); + + if (btf->nr_types < 2) + return; + + nr_sorted_types =3D 0; + n =3D btf_nr_types(btf) - 1; + for (i =3D btf_start_id(btf); i < n; i++) { + k =3D i + 1; + if (!skip_cmp && btf_compare_type_names(&i, &k, btf) > 0) + return; + + t =3D btf_type_by_id(btf, i); + if (t->name_off) + nr_sorted_types++; + else if (skip_cmp) + break; + } + + t =3D btf_type_by_id(btf, k); + if (t->name_off) + nr_sorted_types++; + if (nr_sorted_types) + btf->nr_sorted_types =3D nr_sorted_types; +} + static s32 btf_find_by_name_kind_bsearch(const struct btf *btf, const char= *name, s32 start_id, s32 end_id) { @@ -5885,6 +5945,8 @@ static struct btf *btf_parse(const union bpf_attr *at= tr, bpfptr_t uattr, u32 uat if (err) goto errout; =20 + btf_check_sorted(btf); + struct_meta_tab =3D btf_parse_struct_metas(&env->log, btf); if (IS_ERR(struct_meta_tab)) { err =3D PTR_ERR(struct_meta_tab); @@ -6292,6 +6354,7 @@ static struct btf *btf_parse_base(struct btf_verifier= _env *env, const char *name if (err) goto errout; =20 + btf_check_sorted(btf); refcount_set(&btf->refcnt, 1); =20 return btf; @@ -6426,6 +6489,7 @@ static struct btf *btf_parse_module(const char *modul= e_name, const void *data, } =20 btf_verifier_env_free(env); + btf_check_sorted(btf); refcount_set(&btf->refcnt, 1); return btf; =20 --=20 2.34.1