bpf: Nested rcu critical sections
Subsystems (4)
v2 cover bpf: Nested rcu critical sections
v1: https://lore.kernel.org/bpf/[email protected]/
Changes in v1->v2:
- Move the addition of new tests to a separate patch (Alexei)
- Avoid incrementing active_rcu_locks at two places (Eduard)
Support nested rcu critical sections by making the boolean flag active_rcu_lock a counter and use it to manage rcu critical section state. bpf_rcu_read_lock() increments this counter and bpf_rcu_read_unlock() decrements it, MEM_RCU -> PTR_UNTRUSTED transition happens when active_rcu_locks drops to 0.
Puranjay Mohan (2):
bpf: support nested rcu critical sections
selftests: bpf: Add tests for unbalanced rcu_read_lock
include/linux/bpf_verifier.h | 2 +- kernel/bpf/verifier.c | 47 +++++++++---------- .../selftests/bpf/prog_tests/rcu_read_lock.c | 4 +- .../selftests/bpf/progs/rcu_read_lock.c | 40 ++++++++++++++++ 4 files changed, 66 insertions(+), 27 deletions(-)
Signature · 1 line
2.47.1
PATCH v2 1/2 bpf: support nested rcu critical sections
Currently, nested rcu critical sections are rejected by the verifier and rcu_lock state is managed by a boolean variable. Add support for nested rcu critical sections by make active_rcu_locks a counter similar to active_preempt_locks. bpf_rcu_read_lock() increments this counter and bpf_rcu_read_unlock() decrements it, MEM_RCU -> PTR_UNTRUSTED transition happens when active_rcu_locks drops to 0.
--- include/linux/bpf_verifier.h | 2 +- kernel/bpf/verifier.c | 47 +++++++++---------- .../selftests/bpf/prog_tests/rcu_read_lock.c | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-)
include/linux/bpf_verifier.h +1 -1
@@ -416,7 +416,7 @@ struct bpf_verifier_state {u32 active_irq_id;u32 active_lock_id;void *active_lock_ptr; -bool active_rcu_lock; +u32 active_rcu_locks;bool speculative;bool in_sleepable;
kernel/bpf/verifier.c +22 -25
107 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c +1 -1
@@ -28,6 +28,7 @@ static void test_success(void)bpf_program__set_autoload (skel->progs.two_regions, true);bpf_program__set_autoload (skel->progs.non_sleepable_1, true);bpf_program__set_autoload (skel->progs.non_sleepable_2, true); +bpf_program__set_autoload (skel->progs.nested_rcu_region, true);bpf_program__set_autoload (skel->progs.task_trusted_non_rcuptr, true);bpf_program__set_autoload (skel->progs.rcu_read_lock_subprog, true);bpf_program__set_autoload (skel->progs.rcu_read_lock_global_subprog, true);
@@ -78,7 +79,6 @@ static const char * const inproper_region_tests[] = {"non_sleepable_rcu_mismatch" ,"inproper_sleepable_helper" ,"inproper_sleepable_kfunc" , -"nested_rcu_region" ,"rcu_read_lock_global_subprog_lock" ,"rcu_read_lock_global_subprog_unlock" , "rcu_read_lock_sleepable_helper_global_subprog",
Signature · 1 line
2.47.1
Re: [PATCH bpf-next v2 1/2] bpf: support nested rcu critical sections
Quoted 9 lines · Puranjay Mohan
Currently, nested rcu critical sections are rejected by the verifier and
rcu_lockstate is managed by a boolean variable. Add support for nested rcu critical sections by makeactive_rcu_locksa counter similar toactive_preempt_locks.bpf_rcu_read_lock()increments this counter andbpf_rcu_read_unlock()decrements it,MEM_RCU->PTR_UNTRUSTEDtransition happens whenactive_rcu_locksdrops to 0.Signed-off-by Puranjay Mohan <[email protected]>---
[...]
PATCH v2 2/2 selftests: bpf: Add tests for unbalanced rcu_read_lock
In reply to Puranjay MohanAs verifier now supports nested rcu critical sections, add new test cases to make sure unbalanced usage of rcu_read_lock()/unlock() is rejected.
--- .../selftests/bpf/prog_tests/rcu_read_lock.c | 2 + .../selftests/bpf/progs/rcu_read_lock.c | 40 +++++++++++++++++++ 2 files changed, 42 insertions(+)
tools/testing/selftests/bpf/prog_tests/rcu_read_lock.c +2 -0
@@ -79,6 +79,8 @@ static const char * const inproper_region_tests[] = {"non_sleepable_rcu_mismatch" ,"inproper_sleepable_helper" ,"inproper_sleepable_kfunc" , +"nested_rcu_region_unbalanced_1" , +"nested_rcu_region_unbalanced_2" ,"rcu_read_lock_global_subprog_lock" ,"rcu_read_lock_global_subprog_unlock" , "rcu_read_lock_sleepable_helper_global_subprog",
tools/testing/selftests/bpf/progs/rcu_read_lock.c +40 -0
@@ -278,6 +278,46 @@ int nested_rcu_region(void *ctx)return 0 ; } +SEC("?fentry.s/" SYS_PREFIX "sys_nanosleep") +int nested_rcu_region_unbalanced_1 (void *ctx) +{ +struct task_struct *task, *real_parent; + +/* nested rcu read lock regions */ + task =bpf_get_current_task_btf (); +bpf_rcu_read_lock (); +bpf_rcu_read_lock (); + real_parent = task->real_parent; +if (!real_parent) + goto out; + (void )bpf_task_storage_get (&map_a, real_parent,0 ,0 ); +out: +bpf_rcu_read_unlock (); +bpf_rcu_read_unlock (); +bpf_rcu_read_unlock (); +return 0 ; +} + +SEC("?fentry.s/" SYS_PREFIX "sys_nanosleep") +int nested_rcu_region_unbalanced_2 (void *ctx) +{ +struct task_struct *task, *real_parent; + +/* nested rcu read lock regions */ + task =bpf_get_current_task_btf (); +bpf_rcu_read_lock (); +bpf_rcu_read_lock (); +bpf_rcu_read_lock (); + real_parent = task->real_parent; +if (!real_parent) + goto out; + (void )bpf_task_storage_get (&map_a, real_parent,0 ,0 ); +out: +bpf_rcu_read_unlock (); +bpf_rcu_read_unlock (); +return 0 ; +} + SEC("?fentry.s/" SYS_PREFIX "sys_getpgid")int task_trusted_non_rcuptr (void *ctx) {
Signature · 1 line
2.47.1
Re: [PATCH bpf-next v2 2/2] selftests: bpf: Add tests for unbalanced rcu_read_lock
Quoted 6 lines · Puranjay Mohan
As verifier now supports nested rcu critical sections, add new test cases to make sure unbalanced usage of rcu_read_lock()/unlock() is rejected.
Signed-off-by Puranjay Mohan <[email protected]>---
(Although, it would be great to move these tests to RUN_TESTS
infrastructure, at-least partially).
[...]
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 5 lines · On Mon, 17 Nov 2025 20:04:08 +0000 you wrote:
v1: https://lore.kernel.org/bpf/[email protected]/
Changes inv1->v2:
- Move the addition of new tests to a separate patch (Alexei)
- Avoid incrementingactive_rcu_locksat two places (Eduard)
Quoted 7 lines
Support nested rcu critical sections by making the boolean flag
active_rcu_locka counter and use it to manage rcu critical section state.bpf_rcu_read_lock()increments this counter andbpf_rcu_read_unlock()decrements it,MEM_RCU->PTR_UNTRUSTEDtransition happens whenactive_rcu_locksdrops to 0.[...]
Here is the summary with links:
- [bpf-next,v2,1/2] bpf: support nested rcu critical sections
https://git.kernel.org/bpf/bpf-next/c/4167096cb964 - [bpf-next,v2,2/2] selftests: bpf: Add tests for unbalanced rcu_read_lock https://git.kernel.org/bpf/bpf-next/c/cf49ec5705a6
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html