From nobody Wed Dec 17 05:07:46 2025 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 ABF3A2D781B for ; Mon, 8 Dec 2025 06:24:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765175073; cv=none; b=kpGv8/zzU30gQDUAg2AZVJNej82D9C2O+NQXDWi9erh5zzGBng+C3vvXqQp7BKqI50+8RvsWbSTa7pj9/CNgh2Uup8FWWJm/n1Nb8NjSecKtnm8JYTNgA3bNuqH0p50QtKW9qwfpljp3WhkjmFfTRHeeBzLaZK/0hW36oQeCpwg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765175073; c=relaxed/simple; bh=n+zH9plFFMUYGIEcY3wzYO3Lyz+b74AkBCCdAEyYNdU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rO37sezWgquHQ2JPKNGIKl1cbTmh5JeaUO5RYwlJaYjP4zWq/2oZSXzxELc0kp10Wivwcmi+AB6HQ6Zs0qHNk3+1uC30pZmOT8TUAvqTkht6qOPP9UJwEMYTmNwk5Ykpn2w+mIN7jOZavHFpRwjeoUdWvmTtE0iFqm4yNwS+jh8= 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=FRq2ZUIy; arc=none smtp.client-ip=209.85.214.180 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="FRq2ZUIy" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-29d7b019e0eso45920355ad.2 for ; Sun, 07 Dec 2025 22:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765175071; x=1765779871; 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=FhW1CqQDAMm+jon2EpWEcUDvYwGJtYovETBfwMR4CKg=; b=FRq2ZUIytvXvDl26mA7isN6ZU5/nswqMrx0c+aN/gElKSswZop6qpecrd32cwrL+Rr s5vcItJdZpbNzPPujX2nV6pbhRKNO0Sap+s+DfeUjb0PBEYLUlEzFhJfyhu4/dEgNGQU L6JHt2TA7rMjdHgw2aMCPDcCVrXEE7llRwMjXu11NeZeR/Fb7HUok4P/KvOFhLlirruC H3hor+9zJF8Oxi5NyVucW220Y4CN3+DxTYenBOdttrKCFCMYU03MmwXXbXfauIsPW8JS pzruoIMdN2pzCmnwnsj14OtDAMN9eFoqVTS7IRCbK1yEiSiplI8vcGGzKBPQjGxVphp6 88yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765175071; x=1765779871; 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=FhW1CqQDAMm+jon2EpWEcUDvYwGJtYovETBfwMR4CKg=; b=Qko+TlJ0UdFozWdGOUP+dXcfJROvYoVakCaCYl0kDxXtkQUsErJe/ajc/jl7hKjsLh OX/3jEOK/y43pUKTxLk7VNZuF86rg2Q6yIYeVXs6GuhFpznBzlOpEb1pAaPqXVZzqaxf 2GBd0IRs2Ca8YPj35kuywY1GG0/sy7NsjdU6PScSitWpa+yoXZCuO/z7FU3YKGsVIGs+ Ay3cJ6Hj7NH28kWjAnOPbye8csrdMya+no4k4Ymzwhvbwc9A79desMCj3kUc6fN32vS8 r4WJyKs9TvuJUbghIv8qzHVSCV22T1H9HQVK7jqjqmYFzTrGqEkHe2vo5eag6o6GToli fMYg== X-Forwarded-Encrypted: i=1; AJvYcCUqv74H4DW3D656iYUQFsGk4cwFJzbaw6i42+o+1+Fx5jeIUkPPk9IMTEJ4aX4idV7eCBQI4MfwIyqnsVY=@vger.kernel.org X-Gm-Message-State: AOJu0YxHYIA2oDvU1AJfgiRD8uN3BEqxgq9YPWxlbS0KDgfJ6UR2Cemy csSdkILhxcT5LQ1sQrszoAFsY5/GTmnl8RGZX2D27SOqJD6YE8YSoklf X-Gm-Gg: ASbGnctiRwxc8zgifzNXIoV7+btBuYvlUn9HL/jMi+dWAJAuq4sJ9goAO8ZNRd4u9YZ gXVtEhoBnYyWbzpnyuAZQaN2xkh2cocSwD3oTq6voIPVpSl9uhA0oUeq32k/YOpGuhCl7xWPkpG YUhLwxRx01/1MJPPEio5jmFw5veKzGUbshSJD0imv5QJTCEJ//iZho0taAQF1wsk+gdCvQ1CJbH eHhimFydXF4xc/7WZ8dZ+wXRCyONkYG+xY/zq4ajqtMJtXGdsxkwobEIAzY5ooad1dP2xHNB8Uy XGUC1YBAHwKI2oItjCYVrvcZZ9EHL+yZN6Uj4x85RJe5+niAS0aj8GqzEVtfcEMvuDJ1dl8CpjT ayjegmH5qe4mrt9Apd0mM+s7Ep1ttfqlmkUaNfQrC3z171NpOpax8sb34vy/HEzskzQoVyrcdaH GP7WLUmAzV8I9FNaxf3AufiucLL6jTiuqRjqP4PQ== X-Google-Smtp-Source: AGHT+IFsht3tx4iyxceDrOoGzxGYBI5zLO8cdj3CemmPxNI1cuQpObayIm/IsNw4CmeT4+GU/dZGgA== X-Received: by 2002:a17:902:da8a:b0:295:2cb6:f4a8 with SMTP id d9443c01a7336-29df5e0f345mr46986745ad.51.1765175070919; Sun, 07 Dec 2025 22:24:30 -0800 (PST) Received: from pengdl-pc.mioffice.cn ([43.224.245.249]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29dae49ca1esm112555855ad.2.2025.12.07.22.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Dec 2025 22:24:29 -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: [PATCH bpf-next v9 09/10] bpf: Optimize the performance of find_bpffs_btf_enums Date: Mon, 8 Dec 2025 14:23:52 +0800 Message-Id: <20251208062353.1702672-10-dolinux.peng@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251208062353.1702672-1-dolinux.peng@gmail.com> References: <20251208062353.1702672-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 --- 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 81780bcf8d25..781c2c3181a4 100644 --- a/kernel/bpf/inode.c +++ b/kernel/bpf/inode.c @@ -605,10 +605,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 @@ -620,30 +628,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