Skip to content

Commit f79ce8f

Browse files
ArnaudLcmKernel Patches Daemon
authored andcommitted
bpf: refactor max_depth computation in bpf_get_stack()
A new helper function stack_map_calculate_max_depth() that computes the max depth for a stackmap. Changes in v2: - Removed the checking 'map_size % map_elem_size' from stack_map_calculate_max_depth - Changed stack_map_calculate_max_depth params name to be more generic Changes in v3: - Changed map size param to size in max depth helper Changes in v4: - Fixed indentation in max depth helper for args Changes in v5: - Bound back trace_nr to num_elem in __bpf_get_stack - Make a copy of sysctl_perf_event_max_stack in stack_map_calculate_max_depth Link to v4: https://lore.kernel.org/all/[email protected]/ Signed-off-by: Arnaud Lecomte <[email protected]> Acked-by: Yonghong Song <[email protected]>
1 parent c640618 commit f79ce8f

File tree

1 file changed

+24
-4
lines changed

1 file changed

+24
-4
lines changed

kernel/bpf/stackmap.c

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,28 @@ static inline int stack_map_data_size(struct bpf_map *map)
4242
sizeof(struct bpf_stack_build_id) : sizeof(u64);
4343
}
4444

45+
/**
46+
* stack_map_calculate_max_depth - Calculate maximum allowed stack trace depth
47+
* @size: Size of the buffer/map value in bytes
48+
* @elem_size: Size of each stack trace element
49+
* @flags: BPF stack trace flags (BPF_F_USER_STACK, BPF_F_USER_BUILD_ID, ...)
50+
*
51+
* Return: Maximum number of stack trace entries that can be safely stored
52+
*/
53+
static u32 stack_map_calculate_max_depth(u32 size, u32 elem_size, u64 flags)
54+
{
55+
u32 skip = flags & BPF_F_SKIP_FIELD_MASK;
56+
u32 max_depth;
57+
u32 curr_sysctl_max_stack = READ_ONCE(sysctl_perf_event_max_stack);
58+
59+
max_depth = size / elem_size;
60+
max_depth += skip;
61+
if (max_depth > curr_sysctl_max_stack)
62+
return curr_sysctl_max_stack;
63+
64+
return max_depth;
65+
}
66+
4567
static int prealloc_elems_and_freelist(struct bpf_stack_map *smap)
4668
{
4769
u64 elem_size = sizeof(struct stack_map_bucket) +
@@ -438,10 +460,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task,
438460
goto clear;
439461
}
440462

441-
num_elem = size / elem_size;
442-
max_depth = num_elem + skip;
443-
if (sysctl_perf_event_max_stack < max_depth)
444-
max_depth = sysctl_perf_event_max_stack;
463+
max_depth = stack_map_calculate_max_depth(size, elem_size, flags);
445464

446465
if (may_fault)
447466
rcu_read_lock(); /* need RCU for perf's callchain below */
@@ -460,6 +479,7 @@ static long __bpf_get_stack(struct pt_regs *regs, struct task_struct *task,
460479
goto err_fault;
461480
}
462481

482+
num_elem = size / elem_size;
463483
trace_nr = trace->nr - skip;
464484
trace_nr = (trace_nr <= num_elem) ? trace_nr : num_elem;
465485
copy_len = trace_nr * elem_size;

0 commit comments

Comments
 (0)