diff mbox series

[RFC,bpf-next,04/13] bpf: No need to check if id is 0

Message ID	20230326092208.13613-5-laoar.shao@gmail.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Yafang Shao <laoar.shao@gmail.com> To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao <laoar.shao@gmail.com> Subject: [RFC PATCH bpf-next 04/13] bpf: No need to check if id is 0 Date: Sun, 26 Mar 2023 09:21:59 +0000 Message-Id: <20230326092208.13613-5-laoar.shao@gmail.com> In-Reply-To: <20230326092208.13613-1-laoar.shao@gmail.com> References: <20230326092208.13613-1-laoar.shao@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	bpf: Introduce BPF namespace \| [RFC,bpf-next,00/13] bpf: Introduce BPF namespace [RFC,bpf-next,01/13] fork: New clone3 flag for BPF namespace [RFC,bpf-next,02/13] proc_ns: Extend the field type in struct proc_ns_operations to long [RFC,bpf-next,03/13] bpf: Implement bpf namespace [RFC,bpf-next,04/13] bpf: No need to check if id is 0 [RFC,bpf-next,05/13] bpf: Make bpf objects id have the same alloc and free pattern [RFC,bpf-next,06/13] bpf: Helpers to alloc and free object id in bpf namespace [RFC,bpf-next,07/13] bpf: Add bpf helper to get bpf object id [RFC,bpf-next,08/13] bpf: Alloc and free bpf_map id in bpf namespace [RFC,bpf-next,09/13] bpf: Alloc and free bpf_prog id in bpf namespace [RFC,bpf-next,10/13] bpf: Alloc and free bpf_link id in bpf namespace [RFC,bpf-next,11/13] bpf: Allow iterating bpf objects with CAP_BPF in bpf namespace [RFC,bpf-next,12/13] bpf: Use bpf_idr_lock array instead [RFC,bpf-next,13/13] selftests/bpf: Add selftest for bpf namespace

Commit Message

Yafang Shao March 26, 2023, 9:21 a.m. UTC

  idr_alloc_cyclic() will return -ENOSPC if there's no available IDs, so
don't need to check if the id is less than the start number.

Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
 kernel/bpf/syscall.c | 7 -------
 1 file changed, 7 deletions(-)

diff mbox series

Patch

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index e18ac7f..f3664f2 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -387,9 +387,6 @@  static int bpf_map_alloc_id(struct bpf_map *map)
 	spin_unlock_bh(&map_idr_lock);
 	idr_preload_end();
 
-	if (WARN_ON_ONCE(!id))
-		return -ENOSPC;
-
 	return id > 0 ? 0 : id;
 }
 
@@ -2032,10 +2029,6 @@  static int bpf_prog_alloc_id(struct bpf_prog *prog)
 	spin_unlock_bh(&prog_idr_lock);
 	idr_preload_end();
 
-	/* id is in [1, INT_MAX) */
-	if (WARN_ON_ONCE(!id))
-		return -ENOSPC;
-
 	return id > 0 ? 0 : id;
 }