Skip to content

bpf: Disable preemption in stack map code

Jiri Olsa bpf stable 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest12 patches 3 repliesIn review 9 of 12 applied
  2. v312 patches 3 repliesSuperseded
  3. v211 patches 18 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v19 patches9 repliesSuperseded

Changes in v4 from the cover letter

- fixed changelogs [sashiko]
- nr_trace variable rename [sashiko]
- fixed Daniel's email

Patches in v4 9 of 12 applied

#Subject and filesSizeRepliesApplied
1/12bpf: Factor stackid_init function from __bpf_get_stackidkernel/bpf/stackmap.c+59 -360 repliesApplied
2/12bpf: Factor stackid_fastpath function from __bpf_get_stackidkernel/bpf/stackmap.c+28 -150 repliesApplied
3/12bpf: Factor stackid_new_bucket from __bpf_get_stackidkernel/bpf/stackmap.c+30 -180 repliesApplied
4/12bpf: Use stack id functions instead of __bpf_get_stackidkernel/bpf/stackmap.c+27 -160 repliesApplied
5/12bpf: Disable preemption in bpf_get_stackidkernel/bpf/stackmap.c+13 -110 repliesApplied
6/12bpf: Factor callchain_store function from __bpf_get_stackkernel/bpf/stackmap.c+25 -140 repliesApplied
7/12bpf: Factor callchain_finalize function from __bpf_get_stackkernel/bpf/stackmap.c+17 -80 repliesApplied
8/12bpf: Remove trace_in argument from __bpf_get_stackkernel/bpf/stackmap.c+35 -150 replies
9/12bpf: Clear buf on error in __bpf_get_task_stackkernel/bpf/stackmap.c+5 -20 repliesApplied
10/12bpf: Disable preemption in __bpf_get_stackkernel/bpf/stackmap.c+3 -02 replies
11/12bpf: Avoid changing callchain in bpf_get_stack_pekernel/bpf/stackmap.c+16 -220 replies
12/12bpf: Avoid changing callchain in bpf_get_stackid_pekernel/bpf/stackmap.c+17 -220 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCHv4 bpf-next 00/12] bpf: Disable preemption in stack map code

hi,
we need to disable preemption for get_perf_callchain and keep it disabled as long as we are accessing its returned trace entries buffer.

This patchset refactors both bpf_get_stack and bpf_get_stackid helpers as suggested by Andrii [1] before applying the actual preemption fix.

Note the initial fix was sent by Tao Chen [2], but there was no follow up on this since February, hence this post.

thanks,
jirka

v1: https://lore.kernel.org/bpf/[email protected]/
v2: https://lore.kernel.org/bpf/[email protected]/
v3: https://lore.kernel.org/bpf/[email protected]/

v4 changes:
- fixed changelogs [sashiko]
- nr_trace variable rename [sashiko]
- fixed Daniel's email

v3 changes:
- pass flags rgument to callchain_finalize [sashiko]
- renamed err label to out in bpf_get_stackid_pe [sashiko]
- used scoped_guard in bpf_get_stackid [Leon]
- replaced trace->nr modification from *_pe helpers with length argument (new patches 11,12) [Andrii]

v2 changes:
- removed several unused functions arguments [sashiko]
- restore trace-nr value fix in bpf_get_stack_pe [sashiko]
- kept rcu locking together with preemption disable in __bpf_get_stack [sashiko]
- clear buf on error paths in __bpf_get_task_stack [sashiko]

[1] https://lore.kernel.org/bpf/CAEf4BzZwvAUgLwz-M0Y_NJLTmedyY9U6s7LrSmn751hQdTP4Uw@mail.gmail.com/
[2] https://lore.kernel.org/bpf/[email protected]/
---
Daniel Borkmann (1):
bpf: Disable preemption in __bpf_get_stack

Jiri Olsa (11):
bpf: Factor stackid_init function from __bpf_get_stackid
bpf: Factor stackid_fastpath function from __bpf_get_stackid
bpf: Factor stackid_new_bucket from __bpf_get_stackid
bpf: Use stack id functions instead of __bpf_get_stackid
bpf: Disable preemption in bpf_get_stackid
bpf: Factor callchain_store function from __bpf_get_stack
bpf: Factor callchain_finalize function from __bpf_get_stack
bpf: Remove trace_in argument from __bpf_get_stack
bpf: Clear buf on error in __bpf_get_task_stack
bpf: Avoid changing callchain in bpf_get_stack_pe
bpf: Avoid changing callchain in bpf_get_stackid_pe

 kernel/bpf/stackmap.c | 314 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------
 1 file changed, 205 insertions(+), 109 deletions(-)