perf/bpf: Fix duplicate type check

[PATCH bpf-next] perf/bpf: Fix duplicate type check

Posted by Florian Lehner 1 year, 10 months ago

Remove the duplicate check on type and unify result.

Signed-off-by: Florian Lehner <dev@der-flo.net>
---
 kernel/events/core.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index f0f0f71213a1..5ecfa57e3b97 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -9302,10 +9302,6 @@ void perf_event_bpf_event(struct bpf_prog *prog,
 {
 	struct perf_bpf_event bpf_event;
 
-	if (type <= PERF_BPF_EVENT_UNKNOWN ||
-	    type >= PERF_BPF_EVENT_MAX)
-		return;
-
 	switch (type) {
 	case PERF_BPF_EVENT_PROG_LOAD:
 	case PERF_BPF_EVENT_PROG_UNLOAD:
@@ -9313,7 +9309,7 @@ void perf_event_bpf_event(struct bpf_prog *prog,
 			perf_event_bpf_emit_ksymbols(prog, type);
 		break;
 	default:
-		break;
+		return;
 	}
 
 	if (!atomic_read(&nr_bpf_events))
-- 
2.39.2

Re: [PATCH bpf-next] perf/bpf: Fix duplicate type check

Posted by Daniel Borkmann 1 year, 10 months ago

On 1/20/24 4:09 PM, Florian Lehner wrote:
> Remove the duplicate check on type and unify result.
> 
> Signed-off-by: Florian Lehner <dev@der-flo.net>

Acked-by: Daniel Borkmann <daniel@iogearbox.net>

Re: [PATCH bpf-next] perf/bpf: Fix duplicate type check

Posted by Song Liu 1 year, 10 months ago

On Fri, Jan 26, 2024 at 9:20 AM Daniel Borkmann <daniel@iogearbox.net> wrote:
>
> On 1/20/24 4:09 PM, Florian Lehner wrote:
> > Remove the duplicate check on type and unify result.
> >
> > Signed-off-by: Florian Lehner <dev@der-flo.net>
>
> Acked-by: Daniel Borkmann <daniel@iogearbox.net>

Acked-by: Song Liu <song@kernel.org>