Browse Source

perf: Make bp_len type to u64 generic across the arch

Change 'bp_len' type to __u64 to make it work across archs as
the s390 architecture watch point length can be upto 2^64.

reference:
	http://lkml.org/lkml/2010/1/25/212

This is an ABI change that is not backward compatible with
the previous hardware breakpoint info layout integrated in this
development cycle, a rebuilt of perf tools is necessary for
versions based on 2.6.33-rc1 - 2.6.33-rc6 to work with a
kernel based on this patch.

Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: "K. Prasad" <prasad@linux.vnet.ibm.com>
Cc: Maneesh Soni <maneesh@in.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin <schwidefsky@de.ibm.com>
LKML-Reference: <20100130045518.GA20776@in.ibm.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Mahesh Salgaonkar 15 years ago
parent
commit
cd757645fb
4 changed files with 5 additions and 7 deletions
  1. 1 1
      include/linux/hw_breakpoint.h
  2. 2 4
      include/linux/perf_event.h
  3. 1 1
      kernel/hw_breakpoint.c
  4. 1 1
      kernel/perf_event.c

+ 1 - 1
include/linux/hw_breakpoint.h

@@ -44,7 +44,7 @@ static inline int hw_breakpoint_type(struct perf_event *bp)
 	return bp->attr.bp_type;
 	return bp->attr.bp_type;
 }
 }
 
 
-static inline int hw_breakpoint_len(struct perf_event *bp)
+static inline unsigned long hw_breakpoint_len(struct perf_event *bp)
 {
 {
 	return bp->attr.bp_len;
 	return bp->attr.bp_len;
 }
 }

+ 2 - 4
include/linux/perf_event.h

@@ -211,11 +211,9 @@ struct perf_event_attr {
 		__u32		wakeup_watermark; /* bytes before wakeup   */
 		__u32		wakeup_watermark; /* bytes before wakeup   */
 	};
 	};
 
 
-	__u32			__reserved_2;
-
-	__u64			bp_addr;
 	__u32			bp_type;
 	__u32			bp_type;
-	__u32			bp_len;
+	__u64			bp_addr;
+	__u64			bp_len;
 };
 };
 
 
 /*
 /*

+ 1 - 1
kernel/hw_breakpoint.c

@@ -360,8 +360,8 @@ EXPORT_SYMBOL_GPL(register_user_hw_breakpoint);
 int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr)
 int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr)
 {
 {
 	u64 old_addr = bp->attr.bp_addr;
 	u64 old_addr = bp->attr.bp_addr;
+	u64 old_len = bp->attr.bp_len;
 	int old_type = bp->attr.bp_type;
 	int old_type = bp->attr.bp_type;
-	int old_len = bp->attr.bp_len;
 	int err = 0;
 	int err = 0;
 
 
 	perf_event_disable(bp);
 	perf_event_disable(bp);

+ 1 - 1
kernel/perf_event.c

@@ -4580,7 +4580,7 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
 	if (attr->type >= PERF_TYPE_MAX)
 	if (attr->type >= PERF_TYPE_MAX)
 		return -EINVAL;
 		return -EINVAL;
 
 
-	if (attr->__reserved_1 || attr->__reserved_2)
+	if (attr->__reserved_1)
 		return -EINVAL;
 		return -EINVAL;
 
 
 	if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))
 	if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))