[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100816110253.GD5805@lenovo>
Date: Mon, 16 Aug 2010 15:02:53 +0400
From: Cyrill Gorcunov <gorcunov@...il.com>
To: Ingo Molnar <mingo@...e.hu>, Stephane Eranian <eranian@...gle.com>,
Lin Ming <ming.m.lin@...el.com>
Cc: Frédéric Weisbecker <fweisbec@...il.com>,
Arnaldo Carvalho de Melo <acme@...hat.com>,
LKML <linux-kernel@...r.kernel.org>,
Peter Zijlstra <peterz@...radead.org>
Subject: [RFC -tip]
Hi,
please review the approach, I can't test it due to lack
of hw (btw Ming, if you have some spare minutes -- mind to
pass some event as RAW and see how it goes?).
It just unifdef perf_event_p4.h and export it to user space.
Any complains are welcome. I've considered a separate header
file without #ifdef which would consists of definitions user
space may need but in result it become more messy then a few
#ifdefs in shared header.
-- Cyrill
---
perf, x86: Export RAW events specification to user space
P4 RAW events are tricky and need special bits passed from
userspace, we export RAW events specification so the user
space libraries may use it.
Signed-off-by: Cyrill Gorcunov <gorcunov@...nvz.org>
CC: Lin Ming <ming.m.lin@...el.com>
CC: Stephane Eranian <eranian@...gle.com>
CC: Ingo Molnar <mingo@...e.hu>
CC: Frédéric Weisbecker <fweisbec@...il.com>
CC: Arnaldo Carvalho de Melo <acme@...hat.com>
CC: Peter Zijlstra <peterz@...radead.org>
---
arch/x86/include/asm/Kbuild | 1 +
arch/x86/include/asm/perf_event_p4.h | 35 +++++++++++++++++++++++++++++++----
2 files changed, 32 insertions(+), 4 deletions(-)
Index: linux-2.6.git/arch/x86/include/asm/Kbuild
=====================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/Kbuild
+++ linux-2.6.git/arch/x86/include/asm/Kbuild
@@ -24,3 +24,4 @@ unifdef-y += unistd_32.h
unifdef-y += unistd_64.h
unifdef-y += vm86.h
unifdef-y += vsyscall.h
+unifdef-y += perf_event_p4.h
Index: linux-2.6.git/arch/x86/include/asm/perf_event_p4.h
=====================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/perf_event_p4.h
+++ linux-2.6.git/arch/x86/include/asm/perf_event_p4.h
@@ -5,6 +5,8 @@
#ifndef PERF_EVENT_P4_H
#define PERF_EVENT_P4_H
+#ifdef __KERNEL__
+
#include <linux/cpu.h>
#include <linux/bitops.h>
@@ -92,10 +94,16 @@
#define P4_ESCR_EMASK_BIT(class, name) class##__##name
/*
- * config field is 64bit width and consists of
- * HT << 63 | ESCR << 32 | CCCR
- * where HT is HyperThreading bit (since ESCR
- * has it reserved we may use it for own purpose)
+ * the config field is 64 bit width and has the following format
+ *
+ * Bits Meaning
+ * ----- -------
+ * 0-6 Metric value from enum P4_PEBS_METRIC (optional)
+ * 7-11 Reserved
+ * 12-31 Bits 12-31 of CCCR register (Intel SDM Vol 3)
+ * 32-56 Bits 0-24 of ESCR register (Intel SDM Vol 3)
+ * 57-62 Event key from enum P4_EVENTS
+ * 63 We use it to track event migration between HT threads
*
* note that this is NOT the addresses of respective
* ESCR and CCCR but rather an only packed value should
@@ -206,6 +214,21 @@ static inline u32 p4_default_escr_conf(i
return escr;
}
+#endif /* __KERNEL__ */
+
+/*
+ * RAW events specification
+ *
+ * Bits Meaning
+ * ----- -------
+ * 0-6 Metric value from enum P4_PEBS_METRIC (if needed)
+ * 7-11 Reserved, set to 0
+ * 12-31 Bits 12-31 of CCCR register (Intel SDM Vol 3)
+ * 32-56 Bits 0-24 of ESCR register (Intel SDM Vol 3)
+ * 57-62 Event key from enum P4_EVENTS
+ * 63 Reserved, set to 0
+ */
+
/*
* This are the events which should be used in "Event Select"
* field of ESCR register, they are like unique keys which allow
@@ -261,6 +284,8 @@ enum P4_EVENTS {
P4_EVENT_INSTR_COMPLETED,
};
+#ifdef __KERNEL__
+
#define P4_OPCODE(event) event##_OPCODE
#define P4_OPCODE_ESEL(opcode) ((opcode & 0x00ff) >> 0)
#define P4_OPCODE_EVNT(opcode) ((opcode & 0xff00) >> 8)
@@ -780,6 +805,8 @@ enum P4_ESCR_EMASKS {
#define p4_config_pebs_has(v, mask) (p4_config_unpack_pebs(v) & (mask))
+#endif /* __KERNEL__ */
+
enum P4_PEBS_METRIC {
P4_PEBS_METRIC__none,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists