From nobody Tue Dec 2 00:01:06 2025 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 E096B31ED81 for ; Wed, 26 Nov 2025 08:50:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764147054; cv=none; b=ONvG/offIcpXFcWJFFwyEVkyWqxRUZkQ+NQw0YM27f5yFpxhlYl7rSlnY9RiHQBDGFVLt42m4KCu/lk+pWbZ4otgWwaGqEgwkP6P0Gv0jyT3SPrFIN9WZ12EKgwYwFerD70Lrjo3LLK4Y9NyJnX49M09A128uxDLunyQWGeaEYI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764147054; c=relaxed/simple; bh=0kgEQtgvPa55pKXFrtj7srWoStjEyAoMQzDyIdaQ2pI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JbVs2Kmpvlb0td6a5iuxAuCzl4z/0f/9z31Rha52G1vYtHEYtR+3sJJyyRdjg6Sz7An0SM7u/yGV9nMaa0JjVwGYDQHqXJ4UlOUJhJjdv5PIpAXziRQe1rpgqknyx5iD4DrM4IvHLvx8pvxgtSqwTQDWbeQG8BPrOKC2h23OAQ8= 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=DyW+p2ev; arc=none smtp.client-ip=209.85.210.179 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="DyW+p2ev" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7bb710d1d1dso9810205b3a.1 for ; Wed, 26 Nov 2025 00:50:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764147052; x=1764751852; 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=mgDV1ROzgzpe5gCmmSbOnsLIyQpLC/h36ENHoKlfvVE=; b=DyW+p2evw6yBS3tsjQXxaAzDW1Y1+Lnmth8Lk2r6jrfyEkemBv33aCKMDu/xkR1vQ+ Xd6aAlZZDD3f+wHiykwxpjzSpfdAQ0IrSctL/B0ehyvK8qYXsLV1l7kt2KboW8pihr1i 5VMAfdBjxBteYHqnFLbd0WTapseNl2+0/D94EXTq08hKJx0wlnzS/a6SmXDoa4JEsCh0 fdoXYYflgWW8kdm6yJsOl4+NwKP2Ih50qLpkejl+gnjnLAC4sVtvR5URyluu20cEGM0w Dl6El4aeJ0PLcmOMKAUTAwOo/ZORychQLV4isyLP32wfTQprmY63/l24neoNNXsqcSVb lNgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764147052; x=1764751852; 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=mgDV1ROzgzpe5gCmmSbOnsLIyQpLC/h36ENHoKlfvVE=; b=BYEntPcyAyjTyzBTzGLxDi74AVmrYm3cMMli8rBAWIKiNneTUaeYPNka/uacrc/fVJ yRcRydKM956WiPnxxqy+4PDBg2wHBZleMg1zA1pLwXovjAbYQalxl++1kM0gONoXXquX 7rCC5aa3skG72FhAyFBS/B6yRuzr51fPiOniTHH1o0pwMuSOnZTLAF3AqnVC/EdvmN8X re0Ke1xngtFdgos6fmmRvRENd7crS2qvnsjIvDwonJ/7w0Z6XYdxIVXMQhMtS4uulfuF QFaXPgHL4xf8mKBphYHvTziaC4X7f4Tz7zm/X4Ixw++vg3DHWEaBBSbcW8Fr9cqKBPp/ k5pg== X-Forwarded-Encrypted: i=1; AJvYcCVFs4G4QfdnqDtDXLkDFqltl6vHMDoboLU5HEn74NCdMpWED3D0Y7L7IyrNk3+645U32UZgXQy6it7d5yc=@vger.kernel.org X-Gm-Message-State: AOJu0YyQlhcHiqbDnY/J/cc3lF2POuMnXvnymulBVX6c3j+gyb8OlMQz ucEJn8yJwovOMJHtLkm5cBqV/M3R5dVW+IDqn6XssEpLR12fJwJ6kYZr X-Gm-Gg: ASbGncsr8sbuCgDYDIk63drBM7bEYMAvZXTeDt3pt+g7wd/RXMiSbGvbhNGVz+m6G/C uQHDA4sGeefZn/wVWty78XbMUmo1UaMBdlI7uayQIczmobtDmTpTbEwlKdFOpVLN8ji7q6eZ8+w HUJyVgqA0/Mgf2oV8MOLHel9NMSPBSfg2lEGMtKjlBwT0Sd+U+u3Esk80fWDa8g3C5tPlk7coF1 t2GKYT8WoBPMCeYpUTARcWG7TWmnT7+kPk5aIyFktZCOY13MC/17updXuvP5X7hyzGZZ5aQpUwI Cu4GUj9UIFokzR6lKYtagZB6DrNMPj8hwNLBBwZlk8ZYk8ftKjdhkcrhARkEUJW6/tcM2eBv/PT DTbbARiHsLqfgO7pYMrybVl6U3tMwG11DzCEpSNI7YEy2aqVdiWM2tNbtSpedZ+OMc/Zm5prIYH IwB+4RJxl0ErD0LeHzkoloepWVvSE= X-Google-Smtp-Source: AGHT+IFs6pLfGprWWWpfV4uPUwFHD5qyL94NbyLWxHqsqV9ucC0hIrcGzqA9thasWaM1KDvECSl8tQ== X-Received: by 2002:a05:6a20:430b:b0:341:c4e5:f626 with SMTP id adf61e73a8af0-3637db254efmr6304165637.7.1764147052098; Wed, 26 Nov 2025 00:50:52 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 00:50:51 -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 6/9] btf: Optimize type lookup with binary search Date: Wed, 26 Nov 2025 16:50:22 +0800 Message-Id: <20251126085025.784288-7-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 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: Ihor Solodrai Cc: Xiaoqin Zhang Signed-off-by: pengdonglin --- kernel/bpf/btf.c | 85 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 9 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 0de8fc8a0e0b..842f9c0200e4 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 sorted_start_id; 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,21 +550,79 @@ u32 btf_nr_types(const struct btf *btf) return total; } =20 +static s32 btf_find_by_name_bsearch(const struct btf *btf, const char *nam= e, + s32 start_id, s32 end_id) +{ + const struct btf_type *t; + const char *tname; + s32 l, r, m, lmost =3D -ENOENT; + int ret; + + 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); + ret =3D strcmp(tname, name); + if (ret < 0) { + l =3D m + 1; + } else { + if (ret =3D=3D 0) + lmost =3D m; + r =3D m - 1; + } + } + + return lmost; +} + 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; + s32 idx; =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) { + idx =3D btf_find_by_name_kind(base_btf, name, kind); + if (idx > 0) + return idx; + } =20 - tname =3D btf_name_by_offset(btf, t->name_off); - if (!strcmp(tname, name)) - return i; + if (btf->sorted_start_id > 0) { + /* skip anonymous types */ + s32 start_id =3D btf->sorted_start_id; + s32 end_id =3D btf_nr_types(btf) - 1; + + idx =3D btf_find_by_name_bsearch(btf, name, start_id, end_id); + if (idx < 0) + return -ENOENT; + + t =3D btf_type_by_id(btf, idx); + if (BTF_INFO_KIND(t->info) =3D=3D kind) + return idx; + + for (idx++; 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) !=3D 0) + return -ENOENT; + if (BTF_INFO_KIND(t->info) =3D=3D kind) + return idx; + } + } else { + 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) =3D=3D 0) + return i; + } } =20 return -ENOENT; @@ -5791,6 +5855,7 @@ static struct btf *btf_parse(const union bpf_attr *at= tr, bpfptr_t uattr, u32 uat goto errout; } env->btf =3D btf; + btf->sorted_start_id =3D 0; =20 data =3D kvmalloc(attr->btf_size, GFP_KERNEL | __GFP_NOWARN); if (!data) { @@ -6210,6 +6275,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->sorted_start_id =3D 0; snprintf(btf->name, sizeof(btf->name), "%s", name); =20 err =3D btf_parse_hdr(env); @@ -6327,6 +6393,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->sorted_start_id =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