lkml.org 
[lkml]   [2014]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:perf/core] Revert "perf tools: Fix jump label always changing during tracing"
Commit-ID:  8578b891ec38c39abd5d6376afd05fce78e2628c
Gitweb: http://git.kernel.org/tip/8578b891ec38c39abd5d6376afd05fce78e2628c
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Mon, 28 Jul 2014 15:58:47 +0200
Committer: Jiri Olsa <jolsa@kernel.org>
CommitDate: Mon, 28 Jul 2014 16:39:18 +0200

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

This reverts commit deaff8b659cf4d34181c087b8cdf74f1eb17b02b.

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>
---
tools/perf/util/cloexec.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tools/perf/util/cloexec.c b/tools/perf/util/cloexec.c
index 6a37be5..c5d05ec 100644
--- a/tools/perf/util/cloexec.c
+++ b/tools/perf/util/cloexec.c
@@ -1,4 +1,3 @@
-#include <sched.h>
#include "util.h"
#include "../perf.h"
#include "cloexec.h"
@@ -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;

@@ -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,

\
 
 \ /
  Last update: 2014-07-30 16:01    [W:1.272 / U:0.780 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site