mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Kyle Huey" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>, Kyle Huey <khuey@kylehuey.com>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: perf/core] perf/bpf: Remove #ifdef CONFIG_BPF_SYSCALL from struct perf_event members
Date: Fri, 12 Apr 2024 10:03:25 -0000	[thread overview]
Message-ID: <171291620574.10875.5995937196604251484.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240412015019.7060-4-khuey@kylehuey.com>

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     14e40a9578b70cc5323e55f61292a7e021f6037c
Gitweb:        https://git.kernel.org/tip/14e40a9578b70cc5323e55f61292a7e021f6037c
Author:        Kyle Huey <me@kylehuey.com>
AuthorDate:    Thu, 11 Apr 2024 18:50:15 -07:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 12 Apr 2024 11:49:49 +02:00

perf/bpf: Remove #ifdef CONFIG_BPF_SYSCALL from struct perf_event members

This will allow __perf_event_overflow() (which is independent of
CONFIG_BPF_SYSCALL) to use struct perf_event's prog to decide whether to
call bpf_overflow_handler().

Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Kyle Huey <khuey@kylehuey.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240412015019.7060-4-khuey@kylehuey.com
---
 include/linux/perf_event.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 3e33b36..50e01db 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -809,11 +809,9 @@ struct perf_event {
 	u64				(*clock)(void);
 	perf_overflow_handler_t		overflow_handler;
 	void				*overflow_handler_context;
-#ifdef CONFIG_BPF_SYSCALL
 	perf_overflow_handler_t		orig_overflow_handler;
 	struct bpf_prog			*prog;
 	u64				bpf_cookie;
-#endif
 
 #ifdef CONFIG_EVENT_TRACING
 	struct trace_event_call		*tp_event;

  reply	other threads:[~2024-04-12 10:03 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-12  1:50 [PATCH v6 0/7] Combine perf and bpf for fast eval of hw breakpoint conditions Kyle Huey
2024-04-12  1:50 ` [PATCH v6 1/7] perf/bpf: Reorder bpf_overflow_handler() ahead of __perf_event_overflow() Kyle Huey
2024-04-12 10:03   ` [tip: perf/core] " tip-bot2 for Kyle Huey
2024-04-12  1:50 ` [PATCH v6 2/7] perf/bpf: Create bpf_overflow_handler() stub for !CONFIG_BPF_SYSCALL Kyle Huey
2024-04-12 10:03   ` [tip: perf/core] " tip-bot2 for Kyle Huey
2024-04-12  1:50 ` [PATCH v6 3/7] perf/bpf: Remove #ifdef CONFIG_BPF_SYSCALL from struct perf_event members Kyle Huey
2024-04-12 10:03   ` tip-bot2 for Kyle Huey [this message]
2024-04-12  1:50 ` [PATCH v6 4/7] perf/bpf: Call bpf handler directly, not through overflow machinery Kyle Huey
2024-04-12 10:03   ` [tip: perf/core] perf/bpf: Call BPF " tip-bot2 for Kyle Huey
2024-04-12  1:50 ` [PATCH v6 5/7] perf/bpf: Remove unneeded uses_default_overflow_handler() Kyle Huey
2024-04-12 10:03   ` [tip: perf/core] " tip-bot2 for Kyle Huey
2024-04-12  1:50 ` [PATCH v6 6/7] perf/bpf: Allow a bpf program to suppress all sample side effects Kyle Huey
2024-04-12 10:03   ` [tip: perf/core] perf/bpf: Allow a BPF " tip-bot2 for Kyle Huey
2024-04-12  1:50 ` [PATCH v6 7/7] selftest/bpf: Test a perf bpf program that suppresses " Kyle Huey
2024-04-12 10:03   ` [tip: perf/core] selftest/bpf: Test a perf BPF " tip-bot2 for Kyle Huey
2024-04-12  9:55 ` [PATCH 8/7] perf/bpf: Change the !CONFIG_BPF_SYSCALL stubs to static inlines Ingo Molnar
2024-04-12 10:03   ` [tip: perf/core] " tip-bot2 for Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=171291620574.10875.5995937196604251484.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=khuey@kylehuey.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®