* [PATCH 1/2] perf tools: Fix perf usage string leftover
2014-07-28 15:01 [GIT PULL 0/2] perf/core improvements and fixes Jiri Olsa
@ 2014-07-28 15:01 ` Jiri Olsa
2014-07-28 15:01 ` [PATCH 2/2] Revert "perf tools: Fix jump label always changing during tracing" Jiri Olsa
2014-07-30 12:51 ` [GIT PULL 0/2] perf/core improvements and fixes Ingo Molnar
2 siblings, 0 replies; 6+ messages in thread
From: Jiri Olsa @ 2014-07-28 15:01 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Jiri Olsa, Corey Ashford,
David Ahern, Frederic Weisbecker, Namhyung Kim, Paul Mackerras,
Peter Zijlstra
Fixing perf usage string leftover pointed out by Namhyung.
Reported-by: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-vkcf53oultknsh3ue9fhin94@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/perf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index eed3fb2a3af0..2282d41879a2 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -18,7 +18,7 @@
#include <pthread.h>
const char perf_usage_string[] =
- "perf [--version] [--debug variable[=VALUE]] [--help] COMMAND [ARGS]";
+ "perf [--version] [--help] [OPTIONS] COMMAND [ARGS]";
const char perf_more_info_string[] =
"See 'perf help COMMAND' for more information on a specific command.";
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] Revert "perf tools: Fix jump label always changing during tracing"
2014-07-28 15:01 [GIT PULL 0/2] perf/core improvements and fixes Jiri Olsa
2014-07-28 15:01 ` [PATCH 1/2] perf tools: Fix perf usage string leftover Jiri Olsa
@ 2014-07-28 15:01 ` Jiri Olsa
2014-07-28 15:04 ` Peter Zijlstra
2014-07-30 12:51 ` [GIT PULL 0/2] perf/core improvements and fixes Ingo Molnar
2 siblings, 1 reply; 6+ messages in thread
From: Jiri Olsa @ 2014-07-28 15:01 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Jiri Olsa, Adrian Hunter,
David Ahern, Frederic Weisbecker, Namhyung Kim, Paul Mackerras,
Peter Zijlstra, Stephane Eranian
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 6a37be53a5d2..c5d05ec17220 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,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [GIT PULL 0/2] perf/core improvements and fixes
2014-07-28 15:01 [GIT PULL 0/2] perf/core improvements and fixes Jiri Olsa
2014-07-28 15:01 ` [PATCH 1/2] perf tools: Fix perf usage string leftover Jiri Olsa
2014-07-28 15:01 ` [PATCH 2/2] Revert "perf tools: Fix jump label always changing during tracing" Jiri Olsa
@ 2014-07-30 12:51 ` Ingo Molnar
2 siblings, 0 replies; 6+ messages in thread
From: Ingo Molnar @ 2014-07-30 12:51 UTC (permalink / raw)
To: Jiri Olsa
Cc: linux-kernel, Arnaldo Carvalho de Melo, Adrian Hunter,
Corey Ashford, David Ahern, Frederic Weisbecker, Namhyung Kim,
Paul Mackerras, Peter Zijlstra
* Jiri Olsa <jolsa@kernel.org> wrote:
> hi Ingo,
> please consider pulling
>
> thanks,
> jirka
>
>
> The following changes since commit 068f1d3f45546f4bb24e9be67231db1be296f0c8:
>
> Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2014-07-28 10:09:03 +0200)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git tags/perf-core-for-mingo
>
> for you to fetch changes up to 8578b891ec38c39abd5d6376afd05fce78e2628c:
>
> Revert "perf tools: Fix jump label always changing during tracing" (2014-07-28 16:39:18 +0200)
>
> ----------------------------------------------------------------
> perf/core improvements and fixes:
>
> . Fix perf usage string leftover (Jiri Olsa)
>
> . Revert "perf tools: Fix jump label always changing during tracing" (Jiri Olsa)
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
>
> ----------------------------------------------------------------
> Jiri Olsa (2):
> perf tools: Fix perf usage string leftover
> Revert "perf tools: Fix jump label always changing during tracing"
>
> tools/perf/perf.c | 2 +-
> tools/perf/util/cloexec.c | 9 ++-------
> 2 files changed, 3 insertions(+), 8 deletions(-)
Pulled, thanks a lot Jiri!
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread