Skip to contentSkip to conversation

bpf/perf: Fix suspicious RCU usage in get_callchain_entry()

PATCH In review Qing Wang 2 participants 3 messages Jan 28 – Feb 4

Subsystems (2)
lore
Share & tools
lore

Qing Wang

author
#0 lore raw

PATCH 1/1 bpf/perf: Fix suspicious RCU usage in get_callchain_entry()

There is a patch intended to fix suspicious RCU usage in get_callchain_entry(), but it is incorrect. Specifically, rcu_read_lock()/rcu_read_unlock() is not called when may_fault == false.

Previous discussion:
https://lore.kernel.org/all/CAEf4BzaYL9zZN8TZyRHW3_O3vbHc7On+NSunrkDvDQx2=wwyRw@mail.gmail.com/#R

For perf's callchain, rcu_read_lock()/rcu_read_unlock() should be called when trace_in == false.

Fixes d4dd9775ec24 ("bpf: wire up sleepable bpf_get_stack() and bpf_get_task_stack() helpers")
Reported-by [email protected]
---
 kernel/bpf/stackmap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/stackmap.c +3 -3
index da3d328f5c15..f97d4aa9d038 100644
@@ -460,7 +460,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task,
 
 	max_depth = stack_map_calculate_max_depth(size, elem_size, flags);
 
-	if (may_fault)
+	if (!trace_in)
 		rcu_read_lock(); /* need RCU for perf's callchain below */
 
 	if (trace_in) {
@@ -474,7 +474,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task,
 	}
 
 	if (unlikely(!trace) || trace->nr < skip) {
-		if (may_fault)
+		if (!trace_in)
 			rcu_read_unlock();
 		goto err_fault;
 	}
@@ -494,7 +494,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task,
 	}
 
 	/* trace/ips should not be dereferenced after this point */
-	if (may_fault)
+	if (!trace_in)
 		rcu_read_unlock();
 
 	if (user_build_id)
Signature · 1 line
2.34.1
#1 lore raw
Quoted 4 lines · Qing Wang

There is a patch intended to fix suspicious RCU usage in get_callchain_entry(), but it is incorrect. Specifically, rcu_read_lock()/rcu_read_unlock() is not called when may_fault == false.

rcu_read_lock/unlock is not called when may_fault == false because in that case BPF program is already running within rcu_read_lock/unlock region. So I'm not sure this patch fixes anything really. And even with trace_in, if we cann rcu_read_lock/unlock one extra time it shouldn't be a problem, no?

pw-bot: cr

Quoted 50 lines

Previous discussion:
https://lore.kernel.org/all/CAEf4BzaYL9zZN8TZyRHW3_O3vbHc7On+NSunrkDvDQx2=wwyRw@mail.gmail.com/#R

For perf's callchain, rcu_read_lock()/rcu_read_unlock() should be called when trace_in == false.

Fixes d4dd9775ec24 ("bpf: wire up sleepable bpf_get_stack() and bpf_get_task_stack() helpers")
Reported-by [email protected]
---
 kernel/bpf/stackmap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/bpf/stackmap.c +3 -4
index da3d328f5c15..f97d4aa9d038 100644
@@ -460,7 +460,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task,
 
        max_depth = stack_map_calculate_max_depth(size, elem_size, flags);
 
-       if (may_fault)
+       if (!trace_in)
                rcu_read_lock(); /* need RCU for perf's callchain below */
 
        if (trace_in) {
@@ -474,7 +474,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task,
        }
 
        if (unlikely(!trace) || trace->nr < skip) {
-               if (may_fault)
+               if (!trace_in)
                        rcu_read_unlock();
                goto err_fault;
        }
@@ -494,7 +494,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task,
        }
 
        /* trace/ips should not be dereferenced after this point */
-       if (may_fault)
+       if (!trace_in)
                rcu_read_unlock();
 
        if (user_build_id)
--

2.34.1

author
#2 lore raw
Quoted 5 lines · Andrii Nakryiko

rcu_read_lock/unlock is not called when may_fault == false because in that case BPF program is already running within rcu_read_lock/unlock region. So I'm not sure this patch fixes anything really. And even with trace_in, if we cann rcu_read_lock/unlock one extra time it shouldn't be a problem, no?

Thanks for your review, I agree with you. My patch is incorrect and there was a patch series [0] to fix it.

    [0] https://lore.kernel.org/bpf/[email protected]/T/#mc0fc5e0fec2e6456f72f402308fd4e397ba19d09

Let's forget my patch.

Thanks,
Qing.