Commit 8578b891 authored by Jiri Olsa's avatar Jiri Olsa

Revert "perf tools: Fix jump label always changing during tracing"

This reverts commit deaff8b6.

This commit makes CLOEXEC feature undetected for normal users,
because per-cpu events are priviledged.
Reported-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/20140728065844.GK6758@twins.programming.kicks-ass.netSigned-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent 78a1b503
#include <sched.h>
#include "util.h" #include "util.h"
#include "../perf.h" #include "../perf.h"
#include "cloexec.h" #include "cloexec.h"
...@@ -15,13 +14,9 @@ static int perf_flag_probe(void) ...@@ -15,13 +14,9 @@ static int perf_flag_probe(void)
}; };
int fd; int fd;
int err; int err;
int cpu = sched_getcpu();
if (cpu < 0)
cpu = 0;
/* check cloexec flag */ /* check cloexec flag */
fd = sys_perf_event_open(&attr, -1, cpu, -1, fd = sys_perf_event_open(&attr, 0, -1, -1,
PERF_FLAG_FD_CLOEXEC); PERF_FLAG_FD_CLOEXEC);
err = errno; err = errno;
...@@ -35,7 +30,7 @@ static int perf_flag_probe(void) ...@@ -35,7 +30,7 @@ static int perf_flag_probe(void)
err, strerror(err)); err, strerror(err));
/* not supported, confirm error related to PERF_FLAG_FD_CLOEXEC */ /* not supported, confirm error related to PERF_FLAG_FD_CLOEXEC */
fd = sys_perf_event_open(&attr, -1, cpu, -1, 0); fd = sys_perf_event_open(&attr, 0, -1, -1, 0);
err = errno; err = errno;
if (WARN_ONCE(fd < 0, if (WARN_ONCE(fd < 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment