From nobody Tue Dec 2 03:00:27 2025 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 25708335099 for ; Mon, 17 Nov 2025 13:26:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763386012; cv=none; b=sFnePnqzZKyS4KlZpXjLnJV3bRuVE0sV1bBIz75jXJ3S4uzFRyJkdFI/iII8b2LGhbeRr1g3+5BMOrrA7NL7u3GFUIC0DTPO/rOGGwpAL5TVSacyes2leWdfbvRxWyeoP9CoP3WNAG50f84BnYdGpa7JuTyIvJXQSjT4xMmfHtQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763386012; c=relaxed/simple; bh=1JCm2gAw7szR6coFfKCMu4oP2N4ZVTGa8uyyO11FaJ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HIHlAtXfPoYxo4m7XHdYlHxyTrh2fLa0mCOvw/Ps/FRChWMWAXuiIpBz6jb4aMm/aC0dT3ZvQpNtXUGRG0CHv2lNQrFSPH9X6lzjOiKDjPl2GJpIoCSe/0OTAFSNDKrfif6XUmAeS2uXu/CUxuPxPju1+kX1VDihk+XAtuD8qkI= 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=PHsqQuDl; arc=none smtp.client-ip=209.85.210.170 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="PHsqQuDl" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7aa9be9f03aso3643632b3a.2 for ; Mon, 17 Nov 2025 05:26:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763386010; x=1763990810; 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=Rljz3QHqavQzM2+LGEfUj2V9NIFH9chI7oYU2DEYmt8=; b=PHsqQuDlNwAY1elomuaDEy31MbeeCCU1SuzOYsSJQJffwr+CpisCQCp7+g2XWq+UZH laLnj9Rr0BZ0pkt2XUJHJfeAr1ewJyqdpGwydJx4SbEH9FPB2Y0YOrxUG3V4hYQg133o iAaqLwuDwJESm3nvzWg8UdvYarnBxN6JTxW4t1Qs/OodcnVwF386H67tWnKnBGfsLqOo AMrjsLpKqc6Dz78yx5a36y1/gqbzvtL4uidDTsvGUHP4/27fF7vOnCkihQzNIzb3P3T6 t2sVKR83Dy+dtB0NyjU0YeU4lFjrEk7jTQf6ipF87S1WBglEOsksz+F7CjHtifQUiGhT eKBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763386010; x=1763990810; 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=Rljz3QHqavQzM2+LGEfUj2V9NIFH9chI7oYU2DEYmt8=; b=BBIKf/ulNbvxO0/iramF1UFc0+SVl13TwBRj6/KKN+g+Ch1UgSQCbr2j7zjpRQRvaw MzBTIaLwk/3K/tBKcQOQuBAl7Mcu1/U9myNXemwT9+DTgfh81JS4CGbwJmt6LJxj6iCs wREYPSduOwmOLQH6ambLnXXRMJenpxLxbxxfm0fneUVPM2+qDTuMPV8khOE/MH/lH1MU 6JCn9J+ozNrCxU3FYZovhnDCIknxDdc007RDltgJAQTNfeMQIEQ+E1kRfqvqRYXacIkt gJnnTraArQrJ7sqv/K4ZBTWvBkwihgCcbaShdS34LXlR1JEbT4MMKox/AaCDOkon1LZR n54Q== X-Forwarded-Encrypted: i=1; AJvYcCVlCRuzUe2pO12IrZa0xEVwHkt9Gh3aJxulvjkT/btR3L92K130buxw2yo+dSvmnvwhnjKMsBA/I1t9zRE=@vger.kernel.org X-Gm-Message-State: AOJu0YxD473bW/PrEivZAy9ZrePt9V09qJa8MBJ6f2qgH9AKer1nx46J ZaXMpHWygPs0bmKv1n1OWQVKuQQioPT97Fo8DcTxV5FysC9ZksH8SZ0K X-Gm-Gg: ASbGncuQQ1UtX8G8FT17OOdDY4hsI4N31RadCW1mJVKWJViez5uXXx/sn/9qaBlvdfB QfojtQEqyOunJPajrEPN+UjJMmQ/gTzg75yIe71PAR1qVOSyF8JS6xJFaXeTzcZicTg/88P2tzW taEWTN/SpUug1ep5PZs9zzaSmBkx/Ys7BKdut7Y2Lrfh3NfUvILdGNrdY35lCsis966FO4wjn9z KNo45HflrFDwkQ4rfhqt3U5IyxCXdcsD96IUZtNcBn0EzU3vs/RgzOcBS9sAAdp/cQ8/D1k6d2A K3RrPsuYmyadrOU0ecp8ecNA3xckQSWmWhuXDwUFaYAQq/iA1BcI4GdhXJnspIEdVDTByXdcxXr X4jptkVLsLtxNFhPtZnQpgtUNU12qU65YNnwiLFy+0ft39Yoa1CnsQjZiSzN0OeRuIVQXN55yMc cDUgu/oI1lno6CrM96lnU5KvW/k8fbFu7PAydVcA== X-Google-Smtp-Source: AGHT+IGP4GB/9/Y0zdSNgB4qCkHmeHyFO+LhNquHKW9wAN7N3l8vdfqdun9eXlCf+F53CHCFa5G+Xw== X-Received: by 2002:a05:6a20:6a05:b0:344:bf35:2bfa with SMTP id adf61e73a8af0-35ba22a50b8mr13339782637.33.1763386010418; Mon, 17 Nov 2025 05:26:50 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 05:26:49 -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 6/7] btf: Optimize type lookup with binary search Date: Mon, 17 Nov 2025 21:26:22 +0800 Message-Id: <20251117132623.3807094-7-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 Improve btf_find_by_name_kind() performance by adding binary search support for sorted types. Falls back to linear search for compatibility. 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 | 83 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 10 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 0de8fc8a0e0b..5dd2c40d4874 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -259,6 +259,7 @@ struct btf { void *nohdr_data; struct btf_header hdr; u32 nr_types; /* includes VOID for base BTF */ + u32 nr_sorted_types; /* exclude VOID for base BTF */ u32 types_size; u32 data_size; refcount_t refcnt; @@ -494,6 +495,11 @@ static bool btf_type_is_modifier(const struct btf_type= *t) return false; } =20 +static int btf_start_id(const struct btf *btf) +{ + return btf->start_id + (btf->base_btf ? 0 : 1); +} + bool btf_type_is_void(const struct btf_type *t) { return t =3D=3D &btf_void; @@ -544,24 +550,78 @@ u32 btf_nr_types(const struct btf *btf) return total; } =20 +static s32 btf_find_by_name_kind_bsearch(const struct btf *btf, const char= *name, + s32 start_id, s32 end_id) +{ + const struct btf_type *t; + const char *tname; + s32 l, r, m; + + l =3D start_id; + r =3D end_id; + while (l <=3D r) { + m =3D l + (r - l) / 2; + t =3D btf_type_by_id(btf, m); + tname =3D btf_name_by_offset(btf, t->name_off); + if (strcmp(tname, name) >=3D 0) { + if (l =3D=3D r) + return r; + r =3D m; + } else { + l =3D m + 1; + } + } + + return btf_nr_types(btf); +} + s32 btf_find_by_name_kind(const struct btf *btf, const char *name, u8 kind) { + const struct btf *base_btf =3D btf_base_btf(btf); const struct btf_type *t; const char *tname; - u32 i, total; + int err =3D -ENOENT; =20 - total =3D btf_nr_types(btf); - for (i =3D 1; i < total; i++) { - t =3D btf_type_by_id(btf, i); - if (BTF_INFO_KIND(t->info) !=3D kind) - continue; + if (base_btf) { + err =3D btf_find_by_name_kind(base_btf, name, kind); + if (err > 0) + goto out; + } =20 - tname =3D btf_name_by_offset(btf, t->name_off); - if (!strcmp(tname, name)) - return i; + if (btf->nr_sorted_types > 0) { + /* binary search */ + s32 start_id, end_id; + u32 idx; + + start_id =3D btf_start_id(btf); + end_id =3D start_id + btf->nr_sorted_types - 1; + idx =3D btf_find_by_name_kind_bsearch(btf, name, start_id, end_id); + for (; idx <=3D end_id; idx++) { + t =3D btf_type_by_id(btf, idx); + tname =3D btf_name_by_offset(btf, t->name_off); + if (strcmp(tname, name)) + goto out; + if (BTF_INFO_KIND(t->info) =3D=3D kind) + return idx; + } + } else { + /* linear search */ + u32 i, total; + + total =3D btf_nr_types(btf); + for (i =3D btf_start_id(btf); i < total; i++) { + t =3D btf_type_by_id(btf, i); + if (BTF_INFO_KIND(t->info) !=3D kind) + continue; + + tname =3D btf_name_by_offset(btf, t->name_off); + if (!strcmp(tname, name)) + return i; + } } =20 - return -ENOENT; +out: + return err; } =20 s32 bpf_find_btf_id(const char *name, u32 kind, struct btf **btf_p) @@ -5791,6 +5851,7 @@ static struct btf *btf_parse(const union bpf_attr *at= tr, bpfptr_t uattr, u32 uat goto errout; } env->btf =3D btf; + btf->nr_sorted_types =3D 0; =20 data =3D kvmalloc(attr->btf_size, GFP_KERNEL | __GFP_NOWARN); if (!data) { @@ -6210,6 +6271,7 @@ static struct btf *btf_parse_base(struct btf_verifier= _env *env, const char *name btf->data =3D data; btf->data_size =3D data_size; btf->kernel_btf =3D true; + btf->nr_sorted_types =3D 0; snprintf(btf->name, sizeof(btf->name), "%s", name); =20 err =3D btf_parse_hdr(env); @@ -6327,6 +6389,7 @@ static struct btf *btf_parse_module(const char *modul= e_name, const void *data, btf->start_id =3D base_btf->nr_types; btf->start_str_off =3D base_btf->hdr.str_len; btf->kernel_btf =3D true; + btf->nr_sorted_types =3D 0; snprintf(btf->name, sizeof(btf->name), "%s", module_name); =20 btf->data =3D kvmemdup(data, data_size, GFP_KERNEL | __GFP_NOWARN); --=20 2.34.1