From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>, Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>,
linux-kernel@vger.kernel.org, jolsa@redhat.com,
Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [PATCH v1 5/6] perf: Drop PERF_FLAG_FD_OUTPUT
Date: Tue, 12 Jun 2018 10:51:16 +0300 [thread overview]
Message-ID: <20180612075117.65420-6-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <20180612075117.65420-1-alexander.shishkin@linux.intel.com>
Since commit:
ac9721f3f54b ("perf_events: Fix races and clean up perf_event and perf_mmap_data interaction")
... PERF_FLAG_FD_OUTPUT has been always returning -EINVAL. This can be
either fixed by supplying enough context information to the set_output
path to validate the request, or it can simply be dropped. The fact that
in 8 years since it last worked, nobody (except Vince [1]) seems to
notice, this patch drops it.
[1] https://lkml.org/lkml/2015/1/9/479
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
kernel/events/core.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 70918ed33143..9bf5c7abb621 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -344,7 +344,6 @@ static void event_function_local(struct perf_event *event, event_f func, void *d
}
#define PERF_FLAG_ALL (PERF_FLAG_FD_NO_GROUP |\
- PERF_FLAG_FD_OUTPUT |\
PERF_FLAG_PID_CGROUP |\
PERF_FLAG_FD_CLOEXEC |\
PERF_FLAG_FD_SAMPLE)
@@ -9997,7 +9996,7 @@ SYSCALL_DEFINE5(perf_event_open,
struct perf_event_attr __user *, attr_uptr,
pid_t, pid, int, cpu, int, group_fd, unsigned long, flags)
{
- struct perf_event *group_leader = NULL, *output_event = NULL;
+ struct perf_event *group_leader = NULL;
struct perf_event *sample_event = NULL;
struct perf_event *event, *sibling;
struct perf_event_attr attr;
@@ -10067,8 +10066,6 @@ SYSCALL_DEFINE5(perf_event_open,
if (err)
goto err_fd;
group_leader = group.file->private_data;
- if (flags & PERF_FLAG_FD_OUTPUT)
- output_event = group_leader;
if (flags & PERF_FLAG_FD_SAMPLE)
sample_event = group_leader;
if (flags & PERF_FLAG_FD_NO_GROUP)
@@ -10223,12 +10220,6 @@ SYSCALL_DEFINE5(perf_event_open,
goto err_context;
}
- if (output_event) {
- err = perf_event_set_output(event, output_event);
- if (err)
- goto err_context;
- }
-
event_file = anon_inode_getfile("[perf_event]", &perf_fops, event,
f_flags);
if (IS_ERR(event_file)) {
--
2.17.1
next prev parent reply other threads:[~2018-06-12 7:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-12 7:51 [PATCH v1 0/6] perf: Add AUX data sampling Alexander Shishkin
2018-06-12 7:51 ` [PATCH v1 1/6] perf: Disable PMU around address filter adjustment Alexander Shishkin
2018-06-12 20:11 ` Peter Zijlstra
2018-06-12 7:51 ` [PATCH v1 2/6] perf: Disable IRQs in address filter sync path Alexander Shishkin
2018-06-12 7:51 ` [PATCH v1 3/6] perf: Add an iterator for AUX data Alexander Shishkin
2018-06-12 7:51 ` [PATCH v1 4/6] perf: Allow using AUX data in perf samples Alexander Shishkin
2018-06-14 19:25 ` Peter Zijlstra
2018-06-14 19:39 ` Peter Zijlstra
2018-06-19 10:51 ` Alexander Shishkin
2018-06-14 19:30 ` Peter Zijlstra
2018-06-14 19:47 ` Peter Zijlstra
2018-06-19 11:00 ` Alexander Shishkin
2018-06-14 20:03 ` Peter Zijlstra
2018-06-14 20:20 ` Peter Zijlstra
2018-06-19 10:47 ` Alexander Shishkin
2018-06-21 20:16 ` Peter Zijlstra
2018-10-02 14:00 ` Alexander Shishkin
2019-08-09 12:32 ` Alexander Shishkin
2019-09-26 12:04 ` Alexander Shishkin
2019-09-26 14:44 ` Peter Zijlstra
2019-09-30 11:50 ` Alexander Shishkin
2018-06-12 7:51 ` Alexander Shishkin [this message]
2018-06-12 7:51 ` [PATCH v1 6/6] perf: Allow set-output for task contexts of different types Alexander Shishkin
2018-06-14 19:36 ` Peter Zijlstra
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=20180612075117.65420-6-alexander.shishkin@linux.intel.com \
--to=alexander.shishkin@linux.intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
/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®