Commit 61ca36c8 authored by Tobias Klauser's avatar Tobias Klauser Committed by Daniel Borkmann
Browse files

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.

Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210127174615.3038-1-tklauser@distanz.ch
parent 4c3384d7

kernel/bpf/helpers.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

	}