From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, eranian@google.com,
paulus@samba.org, hpa@zytor.com, mingo@kernel.org,
jolsa@kernel.org, peterz@infradead.org, namhyung@gmail.com,
fweisbec@gmail.com, adrian.hunter@intel.com, dsahern@gmail.com,
tglx@linutronix.de
Subject: [tip:perf/core] Revert "perf tools: Fix jump label always changing during tracing"
Date: Wed, 30 Jul 2014 05:55:27 -0700 [thread overview]
Message-ID: <tip-8578b891ec38c39abd5d6376afd05fce78e2628c@git.kernel.org> (raw)
In-Reply-To: <20140728065844.GK6758@twins.programming.kicks-ass.net>
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,
next prev parent reply other threads:[~2014-07-30 12:56 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 15:36 [GIT PULL 00/27] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 01/27] perf tools: Fix incorrect fd error comparison Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 02/27] perf tools: Fix jump label always changing during tracing Arnaldo Carvalho de Melo
2014-07-28 6:58 ` Peter Zijlstra
2014-07-28 8:19 ` Jiri Olsa
2014-07-28 10:49 ` Ingo Molnar
2014-07-30 12:55 ` tip-bot for Jiri Olsa [this message]
2014-07-25 15:36 ` [PATCH 03/27] perf script: Improve srcline display for BTS Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 04/27] perf script: Do not print dangling '=>' " Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 05/27] perf tools: Record whether a dso has data Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 06/27] perf tools: Add dso__data_status_seen() Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 07/27] perf tools: Add dsos__hit_all() Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 08/27] perf tools: Add cpu to struct thread Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 09/27] perf machine: Add ability to record the current tid for each cpu Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 10/27] perf tools: Move rdtsc() function Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 11/27] perf tools: Add dso__data_size() Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 12/27] perf tools: Pass machine to vdso__dso_findnew() Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 13/27] perf session: Add ability to 'skip' a non-piped event stream Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 14/27] perf session: Add ability to skip 4GiB or more Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 15/27] perf tools: Group VDSO global variables into a structure Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 16/27] perf machine: Fix the lifetime of the VDSO temporary file Arnaldo Carvalho de Melo
2014-07-25 15:36 ` [PATCH 17/27] perf tools: Add vdso__new() Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 18/27] perf tools: Separate the VDSO map name from the VDSO dso name Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 19/27] perf tools: Add dso__type() Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 20/27] perf tools: Add thread parameter to vdso__dso_findnew() Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 21/27] perf tools: Fix build on gcc 4.4.7 Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 22/27] perf powerpc: Include util/util.h and remove stringify macros Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 23/27] perf session: Fix accounting of ordered samples queue Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 24/27] perf tools: Expose 'addr' functions so they can be reused Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 25/27] perf inject: Add --kallsyms parameter Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 26/27] perf record: Always force PERF_RECORD_FINISHED_ROUND event Arnaldo Carvalho de Melo
2014-07-25 15:37 ` [PATCH 27/27] perf record: Store PERF_RECORD_FINISHED_ROUND only for nonempty rounds Arnaldo Carvalho de Melo
2014-07-28 8:10 ` [GIT PULL 00/27] perf/core improvements and fixes 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=tip-8578b891ec38c39abd5d6376afd05fce78e2628c@git.kernel.org \
--to=tipbot@zytor.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@gmail.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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
Powered by JetHome