AMD Family10h IBS support for oProfile driver
PATCH 3/3 AMD Family10h IBS support for oProfile driver
Signed-off-by Barry Kasindorf <[email protected]>
Signed-off-by Mark Langsdorf <[email protected]>
--- drivers/oprofile/buffer_sync.c | 101 ++++++++++++++++++++++++++++++++++------- drivers/oprofile/cpu_buffer.c | 86 ++++++++++++++++++++++++++++++++++ drivers/oprofile/cpu_buffer.h | 3 + include/linux/oprofile.h | 13 +++++ 4 files changed, 185 insertions(+), 18 deletions(-)
drivers/oprofile/buffer_sync.c +83 -17
@@ -5,6 +5,7 @@* @remark Read the file COPYING * * @author John Levon <[email protected]> +* @author Barry Kasindorf * * This is the core of the buffer management. Each * CPU buffer is processed and entered into the
@@ -266,7 +267,17 @@ static unsigned long lookup_dcookie(struct mm_struct * mm, unsigned long addr, oreturn cookie; } +static void increment_tail (struct oprofile_cpu_buffer *b) +{ +unsigned long new_tail = b->tail_pos +1 ; + +rmb ();/* be sure fifo pointers are synchromized */ +if (new_tail < b->buffer_size) + b->tail_pos = new_tail; +else + b->tail_pos =0 ; +}static unsigned long last_cookie =INVALID_COOKIE ;static void add_cpu_switch (int i)
@@ -314,6 +325,66 @@ static void add_trace_begin(void)add_event_entry (TRACE_BEGIN_CODE ); } +/* +* Add IBS fetch and op entries to event buffer +*/ +static void add_ibs_begin (struct oprofile_cpu_buffer *cpu_buf,int code, +int in_kernel,struct mm_struct *mm) +{ +unsigned long rip; +int i, count; +unsigned long ibs_cookie =0 ; +off_t offset; + +increment_tail (cpu_buf);/* move to RIP entry */ + + rip = ((struct op_sample *)&cpu_buf->buffer[cpu_buf->tail_pos])->eip; + +#ifdef __LP64__ + rip += ((struct op_sample *)&cpu_buf->buffer[cpu_buf->tail_pos])->event <<32 ; +#endif + +if (mm) { + ibs_cookie =lookup_dcookie (mm, rip, &offset); + +if (ibs_cookie ==NO_COOKIE ) + offset = rip; +if (ibs_cookie ==INVALID_COOKIE ) { +atomic_inc (&oprofile_stats.sample_lost_no_mapping); + offset = rip; + } +if (ibs_cookie != last_cookie) { +add_cookie_switch (ibs_cookie); + last_cookie = ibs_cookie; + } + } + +else + offset = rip; + +add_event_entry (ESCAPE_CODE ); +add_event_entry (code); +add_event_entry (offset);/* Offset from Dcookie */ + +/* we send the Dcookie offset, but send the raw Linear Add also*/ +add_event_entry ( + ((struct op_sample *)&cpu_buf->buffer[cpu_buf->tail_pos])->eip); +add_event_entry ( + ((struct op_sample *)&cpu_buf->buffer[cpu_buf->tail_pos])->event); + +if (code ==IBS_FETCH_CODE ) + count =2 ; +else + count =5 ;/*IBS OP is 5 int64s long */ + +for (i =0 ; i < count; i++) { +increment_tail (cpu_buf); +add_event_entry ( + ((struct op_sample *)&cpu_buf->buffer[cpu_buf->tail_pos])->eip); +add_event_entry ( + ((struct op_sample *)&cpu_buf->buffer[cpu_buf->tail_pos])->event); + } +}static void add_sample_entry (unsigned long offset,unsigned long event) {
@@ -415,19 +486,6 @@ static unsigned long get_slots(struct oprofile_cpu_buffer * b) } -static void increment_tail (struct oprofile_cpu_buffer * b) -{ -unsigned long new_tail = b->tail_pos +1 ; - -rmb (); - -if (new_tail < b->buffer_size) - b->tail_pos = new_tail; -else - b->tail_pos =0 ; -} - -/* Move tasks along towards death. Any tasks on dead_tasks * will definitely have no remaining references in any * CPU buffers at this point, because we use two lists,
@@ -499,7 +557,6 @@ void sync_buffer(int cpu)struct task_struct * new;unsigned long cookie =0 ;int in_kernel =1 ; -unsigned int i;sync_buffer_state state = sb_buffer_start;unsigned long available;
@@ -511,9 +568,10 @@ void sync_buffer(int cpu) available =get_slots (cpu_buf); -for (i =0 ; i < available; ++i) { -struct op_sample * s = &cpu_buf->buffer[cpu_buf->tail_pos]; - + +while (get_slots (cpu_buf)) { +struct op_sample *s = &cpu_buf->buffer[cpu_buf->tail_pos]; +if (is_code (s->eip)) {if (s->event <=CPU_IS_KERNEL ) {/* kernel/userspace switch */
@@ -524,6 +582,14 @@ void sync_buffer(int cpu) }else if (s->event ==CPU_TRACE_BEGIN ) { state = sb_bt_start;add_trace_begin (); + }else if (s->event ==IBS_FETCH_BEGIN ) { + state = sb_bt_start; +add_ibs_begin (cpu_buf, +IBS_FETCH_CODE , in_kernel, mm); + }else if (s->event ==IBS_OP_BEGIN ) { + state = sb_bt_start; +add_ibs_begin (cpu_buf, +IBS_OP_CODE , in_kernel, mm); }else {struct mm_struct * oldmm = mm;
drivers/oprofile/cpu_buffer.c +85 -1
104 lines not on this page · raw message
drivers/oprofile/cpu_buffer.h +3 -0
@@ -52,7 +52,10 @@ extern struct oprofile_cpu_buffer cpu_buffer[];void cpu_buffer_reset (struct oprofile_cpu_buffer * cpu_buf);/* transient events for the CPU buffer -> event buffer */ +#define CPU_IS_USER 0#define CPU_IS_KERNEL 1#define CPU_TRACE_BEGIN 2 +#define IBS_FETCH_BEGIN 3 +#define IBS_OP_BEGIN 4#endif /* OPROFILE_CPU_BUFFER_H */
include/linux/oprofile.h +13 -0
@@ -36,6 +36,9 @@#define XEN_ENTER_SWITCH_CODE 10#define SPU_PROFILING_CODE 11#define SPU_CTX_SWITCH_CODE 12 +#define IBS_FETCH_CODE 13 +#define IBS_OP_CODE 14 +struct super_block ;struct dentry ;
@@ -106,6 +109,16 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event);void oprofile_add_ext_sample (unsigned long pc,struct pt_regs *const regs,unsigned long event,int is_kernel); +/** +* Add an AMD IBS sample. This may be called from any context. Pass +* smp_processor_id() as cpu. PAsses IBS registers as a unsigned int[8] +*/ +void oprofile_add_ibs_op_sample (struct pt_regs *const regs, +unsigned int *const ibs_op); + +void oprofile_add_ibs_fetch_sample (struct pt_regs *const regs, +unsigned int *const ibs_fetch); +/* Use this instead when the PC value is not from the regs. Doesn't * backtrace. */ void oprofile_add_pc (unsigned long pc,int is_kernel,unsigned long event);