Skip to contentSkip to conversation

perf: fix perf_event_attr layout

PATCH New Peter Zijlstra 1 participant 3 messages Dec 15, 2009 perf events

lore
Share & tools
lore

Peter Zijlstra

author maintainer
#0 lore raw

PATCH 1/1 perf: fix perf_event_attr layout

[now with lkml added too]

The miss-alignment of bp_addr created a 32bit hole, causing different structure packings on 32 and 64 bit machines.

Fix that by moving __reserve_2 into that hole.

Further, remove the useless struct and redundant __bp_reserve muck.

---
 include/linux/perf_event.h |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
include/linux/perf_event.h +3 -9
Index: linux-2.6/include/linux/perf_event.h
===================================================================
@@ -211,17 +211,11 @@ struct perf_event_attr {
 		__u32		wakeup_watermark; /* bytes before wakeup   */
 	};
 
-	struct { /* Hardware breakpoint info */
-		__u64		bp_addr;
-		__u32		bp_type;
-		__u32		bp_len;
-		__u64		__bp_reserved_1;
-		__u64		__bp_reserved_2;
-	};
-
 	__u32			__reserved_2;
 
-	__u64			__reserved_3;
+	__u64			bp_addr;
+	__u32			bp_type;
+	__u32			bp_len;
 };
 
 /*
author maintainer
#1 lore raw

PATCH 1/1 perf: fix perf_event_attr layout -v2

Quoted 1 line · Peter Zijlstra

[now with lkml added too]

compile tested...

Quoted 9 lines

The miss-alignment of bp_addr created a 32bit hole, causing different structure packings on 32 and 64 bit machines.

Fix that by moving __reserve_2 into that hole.

Further, remove the useless struct and redundant __bp_reserve muck.

---
 include/linux/perf_event.h |   12 +++---------
 kernel/perf_event.c        |    2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)
include/linux/perf_event.h +3 -9
Index: linux-2.6/include/linux/perf_event.h
===================================================================
@@ -211,17 +211,11 @@ struct perf_event_attr {
 		__u32		wakeup_watermark; /* bytes before wakeup   */
 	};
 
-	struct { /* Hardware breakpoint info */
-		__u64		bp_addr;
-		__u32		bp_type;
-		__u32		bp_len;
-		__u64		__bp_reserved_1;
-		__u64		__bp_reserved_2;
-	};
-
 	__u32			__reserved_2;
 
-	__u64			__reserved_3;
+	__u64			bp_addr;
+	__u32			bp_type;
+	__u32			bp_len;
 };
 
 /*
kernel/perf_event.c +1 -1
Index: linux-2.6/kernel/perf_event.c
===================================================================
@@ -4564,7 +4564,7 @@ static int perf_copy_attr(struct perf_ev
 	if (attr->type >= PERF_TYPE_MAX)
 		return -EINVAL;
 
-	if (attr->__reserved_1 || attr->__reserved_2 || attr->__reserved_3)
+	if (attr->__reserved_1 || attr->__reserved_2)
 		return -EINVAL;
 
 	if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))
author maintainer
#2 lore raw

[tip:perf/urgent] perf_events: Fix perf_event_attr layout

Commit-ID:  f13c12c634e124d5d31f912b969d542a016d6105
Gitweb:     http://git.kernel.org/tip/f13c12c634e124d5d31f912b969d542a016d6105
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Tue, 15 Dec 2009 19:43:11 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 15 Dec 2009 20:12:20 +0100

perf_events: Fix perf_event_attr layout

The miss-alignment of bp_addr created a 32bit hole, causing different structure packings on 32 and 64 bit machines.

Fix that by moving __reserve_2 into that hole.

Further, remove the useless struct and redundant __bp_reserve muck.

Cc Frederic Weisbecker <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>

LKML-Reference: <1260902591.8023.781.camel@laptop>

---
 include/linux/perf_event.h |   12 +++---------
 kernel/perf_event.c        |    2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)
include/linux/perf_event.h +3 -9
index 64a53f7..5fcbf7d 100644
@@ -211,17 +211,11 @@ struct perf_event_attr {
 		__u32		wakeup_watermark; /* bytes before wakeup   */
 	};
 
-	struct { /* Hardware breakpoint info */
-		__u64		bp_addr;
-		__u32		bp_type;
-		__u32		bp_len;
-		__u64		__bp_reserved_1;
-		__u64		__bp_reserved_2;
-	};
-
 	__u32			__reserved_2;
 
-	__u64			__reserved_3;
+	__u64			bp_addr;
+	__u32			bp_type;
+	__u32			bp_len;
 };
 
 /*
kernel/perf_event.c +1 -1
index 8823b08..0dd8e5d 100644
@@ -4564,7 +4564,7 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
 	if (attr->type >= PERF_TYPE_MAX)
 		return -EINVAL;
 
-	if (attr->__reserved_1 || attr->__reserved_2 || attr->__reserved_3)
+	if (attr->__reserved_1 || attr->__reserved_2)
 		return -EINVAL;
 
 	if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))