2024-01-20 15:18:54

by Florian Lehner

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

Remove the duplicate check on type and unify result.

Signed-off-by: Florian Lehner <[email protected]>
---
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



2024-01-26 17:21:27

by Daniel Borkmann

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

On 1/20/24 4:09 PM, Florian Lehner wrote:
> Remove the duplicate check on type and unify result.
>
> Signed-off-by: Florian Lehner <[email protected]>

Acked-by: Daniel Borkmann <[email protected]>

2024-01-29 17:30:39

by Song Liu

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

On Fri, Jan 26, 2024 at 9:20 AM Daniel Borkmann <[email protected]> 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 <[email protected]>
>
> Acked-by: Daniel Borkmann <[email protected]>

Acked-by: Song Liu <[email protected]>

2024-01-29 21:50:38

by patchwork-bot+netdevbpf

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

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <[email protected]>:

On Sat, 20 Jan 2024 16:09:20 +0100 you wrote:
> Remove the duplicate check on type and unify result.
>
> Signed-off-by: Florian Lehner <[email protected]>
> ---
> kernel/events/core.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)

Here is the summary with links:
- [bpf-next] perf/bpf: Fix duplicate type check
https://git.kernel.org/bpf/bpf-next/c/aecaa3ed48c3

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html