From nobody Sat Feb 7 05:38:54 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 EED543002D7 for ; Thu, 18 Dec 2025 11:31:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766057506; cv=none; b=Mj3/t03ZisW5+uasLMDm6PkqvxiwkQZ724MiCYpfGNOXbR+p6Ghx3F1lCkpEa/BFkeH2j/dhJ/hcEH1f4CWMkbtxBRUnZWW3/8i83aKsrB+KGBCgMIBHrIV6CcAy12+pIsJ83D96fZrc4M/rIyaI73wtgciiNEg8DYafm5d1OXQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766057506; c=relaxed/simple; bh=kR3XC690eMOuMmS4XzQCFJEtC3/vg9Jkc3VHJRTqe6g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fKiCXAzGJvERViNfxK7Z0oXMjO9yUEIXq1Sn7fcgNPmKOasrW7QYPcdeKKW/wkps19Vy3/mNlY4b2Y35EXkzq9caZz4Av/gmq6nTEvdedrZpTIArXP2ePKVtrBo61b6WgFHdlCN0i7ht07zsF3eARj50dp5028wSObVdDqtjHyI= 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=G60kUXrX; arc=none smtp.client-ip=209.85.216.52 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="G60kUXrX" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-34a4078f669so531081a91.1 for ; Thu, 18 Dec 2025 03:31:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766057504; x=1766662304; 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=4yc18LXj38KHjY/6u3XKUquuVm27qsoM7d9pTeGO7lI=; b=G60kUXrXcmVipswR7w2fdJfda5pJZTc+Clvd/KoaVc+Zj2mVtjpEtKk10T9RHvDg5p JcS0r+OyhcWz567NRcqsbRJRgvJW84ZCLcFG95pMvE6VgxtOp5TwStB10u5w50+gt2j7 h5XXmkGAZ7Losd995OQzeTKCWy6b4I70H9aMFt0jF/EQMlCCkhdvBbMojy8SEY2VJb6e YyWpOenq+2w/8KMBvMr5afWVvMefC1TFsF1J21j4LIE72Ic9vET4re35rfVF1aKXDxKH TCLg/pCFZSDDWExNCh/51t2X9mE6zfQrqx8/n+Zl8ic7AkvtvAI7r3HGKJVCVHD/5Bwe jRMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766057504; x=1766662304; 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=4yc18LXj38KHjY/6u3XKUquuVm27qsoM7d9pTeGO7lI=; b=pbT0jclzfGyj4ul+gZGafJ1zBNP9PWaIPbUgOUHOPoVV+fKCatnCvpMLQnowBHz/++ O7NhNOxT1p4dAHFxOy0K8i3c/nyz3hUz2i2n6tfkHLOqh2K1MKASRMrioN0HlFUHNCrg 6RDMX5BXqBHiODyusLgq6/3cFNJDw1wPX3+s/PgLXEQu8ry0wtbchLov6vvzuwTPwLpf pg3TThnLInfMfXbyWWcj2gvKe63l+DFEnG5Jjj03Xw4bVvIFulTeulcZQeraiM/x0tqZ sFO0ltQC9Qe79IqLVkih3JGaQHXNM4nLDoal2g0m9pGLI3UG38+0UaVkmWh/r3bU+qbN CPBg== X-Forwarded-Encrypted: i=1; AJvYcCXu2UQBjwwG3eW3qSO/Vv90OqsdGk6T1vXMX74KPhTjPsyE1GP80KJvdcE7Zmxi8r/aF2pkjx+gUECD1AE=@vger.kernel.org X-Gm-Message-State: AOJu0YyVjuww/HM+XZUMSZIPoNT4KtqjRB0Zs4y1PohPIafFK9K5Gyep CMTkNST70N8ZcXEyLtmHltCAsU35uDkLNivaCAA7bdqqolDdEouyYOx7 X-Gm-Gg: AY/fxX7atG38zw9zBrHU2Ww7cMlr5ApCK+/9slrk8xLmwwEYNAqI6nDzTXuMmAmRWUQ OEt/OB9SUX5Z+MSDvtZ4dxqh3G0mTkqiSUKA7rJl5VoNBKevARh15QsmwDfXhK/LwBJqvmoxtVP Z2eHrMwoTa63J3S/8gT2TwZQoinmpItrv1MSKLzPvF+RMW43GuxdeNE+ORcsi1u1yGiMo7ZQUyG Pfnf/UiBOAMW7Su5ILCbDcvUpjhdRWyZ2mwJwX387HmPaywx++sBP4BpuJQ74eYFhDbbr/8MOK5 PtpTVAmyMQ09VkNqlkw7CoybKCjug5Vanmj18uV+0gdsp4OANWkfPjoIwGuaFER3sRx/LF+XbJC p5HMcHXCi39M2zpOeObFgFpNaoCm8r4DwXtC6yp9lU/WhfT/ycKZa1FD7F+mQr5ryvEj3Bjnm+e Ln0zhxBR9gghrtcTEkvqcw+hkVTp4= X-Google-Smtp-Source: AGHT+IE+OfV+nTK8EffSxIOlsTNKb3YIEVrp51owobhDCMyYJ7ysroRbW6Lt6cR2ARHL8vPSGTW1CA== X-Received: by 2002:a17:90b:2749:b0:33b:a906:e40 with SMTP id 98e67ed59e1d1-34abd6cc250mr16692648a91.2.1766057504184; Thu, 18 Dec 2025 03:31:44 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34e70d4f887sm2328237a91.3.2025.12.18.03.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 03:31:41 -0800 (PST) From: Donglin Peng To: ast@kernel.org, andrii.nakryiko@gmail.com, eddyz87@gmail.com Cc: zhangxiaoqin@xiaomi.com, ihor.solodrai@linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, pengdonglin , Alan Maguire Subject: [PATCH bpf-next v10 09/13] bpf: Optimize the performance of find_bpffs_btf_enums Date: Thu, 18 Dec 2025 19:30:47 +0800 Message-Id: <20251218113051.455293-10-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251218113051.455293-1-dolinux.peng@gmail.com> References: <20251218113051.455293-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 Currently, vmlinux BTF is unconditionally sorted during the build phase. The function btf_find_by_name_kind executes the binary search branch, so find_bpffs_btf_enums can be optimized by using btf_find_by_name_kind. Cc: Eduard Zingerman Cc: Alexei Starovoitov Cc: Andrii Nakryiko Cc: Alan Maguire Cc: Ihor Solodrai Cc: Xiaoqin Zhang Signed-off-by: pengdonglin Acked-by: Eduard Zingerman --- kernel/bpf/inode.c | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c index 9f866a010dad..050fde1cf211 100644 --- a/kernel/bpf/inode.c +++ b/kernel/bpf/inode.c @@ -600,10 +600,18 @@ struct bpffs_btf_enums { =20 static int find_bpffs_btf_enums(struct bpffs_btf_enums *info) { + struct { + const struct btf_type **type; + const char *name; + } btf_enums[] =3D { + {&info->cmd_t, "bpf_cmd"}, + {&info->map_t, "bpf_map_type"}, + {&info->prog_t, "bpf_prog_type"}, + {&info->attach_t, "bpf_attach_type"}, + }; const struct btf *btf; const struct btf_type *t; - const char *name; - int i, n; + int i, id; =20 memset(info, 0, sizeof(*info)); =20 @@ -615,30 +623,18 @@ static int find_bpffs_btf_enums(struct bpffs_btf_enum= s *info) =20 info->btf =3D btf; =20 - for (i =3D 1, n =3D btf_nr_types(btf); i < n; i++) { - t =3D btf_type_by_id(btf, i); - if (!btf_type_is_enum(t)) - continue; + for (i =3D 0; i < ARRAY_SIZE(btf_enums); i++) { + id =3D btf_find_by_name_kind(btf, btf_enums[i].name, + BTF_KIND_ENUM); + if (id < 0) + goto out; =20 - name =3D btf_name_by_offset(btf, t->name_off); - if (!name) - continue; - - if (strcmp(name, "bpf_cmd") =3D=3D 0) - info->cmd_t =3D t; - else if (strcmp(name, "bpf_map_type") =3D=3D 0) - info->map_t =3D t; - else if (strcmp(name, "bpf_prog_type") =3D=3D 0) - info->prog_t =3D t; - else if (strcmp(name, "bpf_attach_type") =3D=3D 0) - info->attach_t =3D t; - else - continue; - - if (info->cmd_t && info->map_t && info->prog_t && info->attach_t) - return 0; + t =3D btf_type_by_id(btf, id); + *btf_enums[i].type =3D t; } =20 + return 0; +out: return -ESRCH; } =20 --=20 2.34.1