bpf: simplify cases in bpf_base_func_proto
Subsystems (3)
PATCH 1/1 bpf: simplify cases in bpf_base_func_proto
!perfmon_capable() is checked before the last switch(func_id) in bpf_base_func_proto. Thus, the cases BPF_FUNC_trace_printk and BPF_FUNC_snprintf_btf can be moved to that last switch(func_id) to omit the inline !perfmon_capable() checks.
--- kernel/bpf/helpers.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
kernel/bpf/helpers.c +4 -8
@@ -720,14 +720,6 @@ bpf_base_func_proto(enum bpf_func_id func_id)return &bpf_spin_lock_proto;case BPF_FUNC_spin_unlock:return &bpf_spin_unlock_proto; -case BPF_FUNC_trace_printk: -if (!perfmon_capable ()) -return NULL ; -return bpf_get_trace_printk_proto (); -case BPF_FUNC_snprintf_btf: -if (!perfmon_capable ()) -return NULL ; -return &bpf_snprintf_btf_proto;case BPF_FUNC_jiffies64:return &bpf_jiffies64_proto;case BPF_FUNC_per_cpu_ptr:
@@ -742,6 +734,8 @@ bpf_base_func_proto(enum bpf_func_id func_id)return NULL ;switch (func_id) { +case BPF_FUNC_trace_printk: +return bpf_get_trace_printk_proto ();case BPF_FUNC_get_current_task:return &bpf_get_current_task_proto;case BPF_FUNC_probe_read_user:
@@ -752,6 +746,8 @@ bpf_base_func_proto(enum bpf_func_id func_id)return &bpf_probe_read_user_str_proto;case BPF_FUNC_probe_read_kernel_str:return &bpf_probe_read_kernel_str_proto; +case BPF_FUNC_snprintf_btf: +return &bpf_snprintf_btf_proto;default :return NULL ; }
Signature · 1 line
2.30.0
This patch was applied to bpf/bpf-next.git (refs/heads/master):
Hello:
This patch was applied to bpf/bpf-next.git (refs/heads/master):
Quoted 8 lines · On Wed, 27 Jan 2021 18:46:15 +0100 you wrote:
!perfmon_capable() is checked before the last
switch(func_id)inbpf_base_func_proto. Thus, the casesBPF_FUNC_trace_printkandBPF_FUNC_snprintf_btfcan be moved to that lastswitch(func_id)to omit the inline !perfmon_capable() checks.Signed-off-by Tobias Klauser <[email protected]>[...]
Here is the summary with links:
- [bpf-next] bpf: simplify cases in bpf_base_func_proto
https://git.kernel.org/bpf/bpf-next/c/61ca36c8c4eb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html