Skip to content

Commit

Permalink
Revert "perf tools: Fix jump label always changing during tracing"
Browse files Browse the repository at this point in the history
This reverts commit deaff8b.

This commit makes CLOEXEC feature undetected for normal users,
because per-cpu events are priviledged.

Reported-by: Peter 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.net
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
  • Loading branch information
Jiri Olsa committed Jul 28, 2014
1 parent 78a1b50 commit 8578b89
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions tools/perf/util/cloexec.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#include <sched.h>
#include "util.h"
#include "../perf.h"
#include "cloexec.h"
Expand All @@ -15,13 +14,9 @@ static int perf_flag_probe(void)
};
int fd;
int err;
int cpu = sched_getcpu();

if (cpu < 0)
cpu = 0;

/* 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);
err = errno;

Expand All @@ -35,7 +30,7 @@ static int perf_flag_probe(void)
err, strerror(err));

/* 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;

if (WARN_ONCE(fd < 0,
Expand Down

0 comments on commit 8578b89

Please sign in to comment.