]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
bpf: Consolidate sleepable checks in check_kfunc_call()
authorPuranjay Mohan <puranjay@kernel.org>
Wed, 18 Mar 2026 17:43:25 +0000 (10:43 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 21 Mar 2026 20:09:35 +0000 (13:09 -0700)
commitcd9840c413e3280d1c944e2e7e67380bc9a862d1
tree6407107652910fecd1af09a16d9683b3363ad571
parenta0d06cf102e4f088781b7df6f20ce8ef694e1deb
bpf: Consolidate sleepable checks in check_kfunc_call()

check_kfunc_call() has multiple scattered checks that reject sleepable
kfuncs in various non-sleepable contexts (RCU, preempt-disabled, IRQ-
disabled). These are the same conditions already checked by
in_sleepable_context(), so replace them with a single consolidated
check.

This also simplifies the preempt lock tracking by flattening the nested
if/else structure into a linear chain: preempt_disable increments,
preempt_enable checks for underflow and decrements. The sleepable check
is kept as a separate block since it is logically distinct from the lock
accounting.

No functional change since in_sleepable_context() checks all the same
state (active_rcu_locks, active_preempt_locks, active_locks,
active_irq_id, in_sleepable).

Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Acked-by: Mykyta Yatsenko <yatsenko@meta.com>
Signed-off-by: Puranjay Mohan <puranjay@kernel.org>
Acked-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20260318174327.3151925-3-puranjay@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/verifier.c