[PATCH] perf: fix perf_event.h header usage

[PATCH] perf: fix perf_event.h header usage

[Stephane Eranian]

This patch fixes the usage of the perf_event.h header file
between command modules and the supporting code in util.

It is necessary to ensure that ALL files use the SAME
perf_event.h header from the kernel source tree.

There were a couple of #include <linux/perf_event.h> mixed
with #include "../../perf_event.h".

This caused issues on some distros because of mismatch
in the layout of struct perf_event_attr. That eventually
led perf stat to segfault.

Signed-off-by: Stephane Eranian <eranian@google.com>
---

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 863d78d..a0ccd69 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -3,7 +3,7 @@
 
 #include <linux/list.h>
 #include <stdbool.h>
-#include <linux/perf_event.h>
+#include "../../../include/linux/perf_event.h"
 #include "types.h"
 #include "xyarray.h"
  
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 1c9043c..b82cafb 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -4,7 +4,7 @@
  * Parse symbolic events/counts passed in as options:
  */
 
-#include <linux/perf_event.h>
+#include "../../../include/linux/perf_event.h"
 
 struct list_head;
 struct perf_evsel;

Re: [PATCH] perf: fix perf_event.h header usage

[Arnaldo Carvalho de Melo]

Em Tue, Jan 04, 2011 at 04:30:01PM +0200, Stephane Eranian escreveu:
> This patch fixes the usage of the perf_event.h header file
> between command modules and the supporting code in util.
> 
> It is necessary to ensure that ALL files use the SAME
> perf_event.h header from the kernel source tree.
> 
> There were a couple of #include <linux/perf_event.h> mixed
> with #include "../../perf_event.h".
> 
> This caused issues on some distros because of mismatch
> in the layout of struct perf_event_attr. That eventually
> led perf stat to segfault.
> 
> Signed-off-by: Stephane Eranian <eranian@google.com>

Thanks, applying.

- Arnaldo

Re: [PATCH] perf: fix perf_event.h header usage

[Robert Richter]

On 04.01.11 10:44:39, Arnaldo Carvalho de Melo wrote:
> Em Tue, Jan 04, 2011 at 04:30:01PM +0200, Stephane Eranian escreveu:
> > This patch fixes the usage of the perf_event.h header file
> > between command modules and the supporting code in util.
> > 
> > It is necessary to ensure that ALL files use the SAME
> > perf_event.h header from the kernel source tree.
> > 
> > There were a couple of #include <linux/perf_event.h> mixed
> > with #include "../../perf_event.h".
> > 
> > This caused issues on some distros because of mismatch
> > in the layout of struct perf_event_attr. That eventually
> > led perf stat to segfault.
> > 
> > Signed-off-by: Stephane Eranian <eranian@google.com>
> 
> Thanks, applying.

Isn't this valid for all <linux/*.h> header files?

-Robert

-- 
Advanced Micro Devices, Inc.
Operating System Research Center

[tip:perf/core] perf tools: Fix perf_event.h header usage

[tip-bot for Stephane Eranian]

Commit-ID:  d030260ad33b482a371f999c7e9db79ef7a2111f
Gitweb:     http://git.kernel.org/tip/d030260ad33b482a371f999c7e9db79ef7a2111f
Author:     Stephane Eranian <eranian@google.com>
AuthorDate: Tue, 4 Jan 2011 16:30:01 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 5 Jan 2011 14:52:54 -0200

perf tools: Fix perf_event.h header usage

This patch fixes the usage of the perf_event.h header file
between command modules and the supporting code in util.

It is necessary to ensure that ALL files use the SAME
perf_event.h header from the kernel source tree.

There were a couple of #include <linux/perf_event.h> mixed
with #include "../../perf_event.h".

This caused issues on some distros because of mismatch
in the layout of struct perf_event_attr. That eventually
led perf stat to segfault.

Cc: David S. Miller <davem@davemloft.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Stephane Eranian <eranian@gmail.com>
LKML-Reference: <4d233cf0.2308e30a.7b00.ffffc187@mx.google.com>
Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/evsel.h        |    2 +-
 tools/perf/util/parse-events.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 863d78d..a0ccd69 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -3,7 +3,7 @@
 
 #include <linux/list.h>
 #include <stdbool.h>
-#include <linux/perf_event.h>
+#include "../../../include/linux/perf_event.h"
 #include "types.h"
 #include "xyarray.h"
  
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 1c9043c..b82cafb 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -4,7 +4,7 @@
  * Parse symbolic events/counts passed in as options:
  */
 
-#include <linux/perf_event.h>
+#include "../../../include/linux/perf_event.h"
 
 struct list_head;
 struct perf_evsel;