OProfile: Rework oprofile_add_ibs_sample() function
Subsystems (6)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/8 OProfile: Rework oprofile_add_ibs_sample() function
Code looks much more cleaner now.
--- arch/x86/oprofile/op_model_amd.c | 5 ++- drivers/oprofile/cpu_buffer.c | 48 ++++++++++++-------------------------- 2 files changed, 18 insertions(+), 35 deletions(-)
arch/x86/oprofile/op_model_amd.c +3 -2
@@ -67,8 +67,9 @@ static unsigned long reset_value[NUM_COUNTERS];/* The function interface needs to be fixed, something like add data. Should then be added to linux/oprofile.h. */ -extern void oprofile_add_ibs_sample (struct pt_regs *const regs, -unsigned int *const ibs_sample,u8 code); +extern void +oprofile_add_ibs_sample (struct pt_regs *const regs, +unsigned int *const ibs_sample,int ibs_code);struct ibs_fetch_sample {/* MSRC001_1031 IBS Fetch Linear Address Register */
drivers/oprofile/cpu_buffer.c +15 -33
79 lines not on this page · raw message
Signature · 1 line
1.6.0.1
PATCH 2/8 OProfile: Rework string handling in setup_ibs_files()
In reply to a message not in the archive--- arch/x86/oprofile/op_model_amd.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-)
arch/x86/oprofile/op_model_amd.c +11 -12
@@ -473,7 +473,6 @@ static int (*create_arch_files)(struct super_block * sb, struct dentry * root);static int setup_ibs_files (struct super_block * sb,struct dentry * root) { -char buf[12 ];struct dentry *dir;int ret =0 ;
@@ -495,22 +494,22 @@ static int setup_ibs_files(struct super_block * sb, struct dentry * root) ibs_config.max_cnt_op =250000 ; ibs_config.op_enabled =0 ; ibs_config.dispatched_ops =1 ; -snprintf (buf,sizeof (buf),"ibs_fetch" ); - dir =oprofilefs_mkdir (sb, root, buf); -oprofilefs_create_ulong (sb, dir,"rand_enable" , - &ibs_config.rand_en); + + dir =oprofilefs_mkdir (sb, root,"ibs_fetch" );oprofilefs_create_ulong (sb, dir,"enable" , - &ibs_config.fetch_enabled); + &ibs_config.fetch_enabled);oprofilefs_create_ulong (sb, dir,"max_count" , - &ibs_config.max_cnt_fetch); -snprintf (buf,sizeof (buf),"ibs_uops" ); - dir =oprofilefs_mkdir (sb, root, buf); + &ibs_config.max_cnt_fetch); +oprofilefs_create_ulong (sb, dir,"rand_enable" , + &ibs_config.rand_en); + + dir =oprofilefs_mkdir (sb, root,"ibs_uops" );oprofilefs_create_ulong (sb, dir,"enable" , - &ibs_config.op_enabled); + &ibs_config.op_enabled);oprofilefs_create_ulong (sb, dir,"max_count" , - &ibs_config.max_cnt_op); + &ibs_config.max_cnt_op);oprofilefs_create_ulong (sb, dir,"dispatched_ops" , - &ibs_config.dispatched_ops); + &ibs_config.dispatched_ops);return 0 ; }
Signature · 1 line
1.6.0.1
PATCH 3/8 OProfile: Rename IBS sysfs dir into "ibs_op"
In reply to a message not in the archiveThe new name is now more close to those used in the spec.
--- arch/x86/oprofile/op_model_amd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/oprofile/op_model_amd.c +1 -1
@@ -503,7 +503,7 @@ static int setup_ibs_files(struct super_block * sb, struct dentry * root)oprofilefs_create_ulong (sb, dir,"rand_enable" , &ibs_config.rand_en); - dir =oprofilefs_mkdir (sb, root,"ibs_uops" ); + dir =oprofilefs_mkdir (sb, root,"ibs_op" );oprofilefs_create_ulong (sb, dir,"enable" , &ibs_config.op_enabled); oprofilefs_create_ulong(sb, dir, "max_count",
Signature · 1 line
1.6.0.1
cover OProfile cleanup patches for v2.6.28
In reply to a message not in the archiveIngo,
I have added these cleanup patches to oprofile-for-tip ongit://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git.
Please pull from there.
In oprofile-for-tip are also patches merged in from x86-oprofile-for-tip. These patches are also for v2.6.28:
Andi Kleen (4):
oprofile: drop const in num counters field
oprofile: Don't report Nehalem as core_2
oprofile: Implement Intel architectural perfmon support
oprofile: discover counters for op ppro too
Thanks,
-Robert
PATCH 4/8 oprofile: whitespace fixes
In reply to a message not in the archive--- arch/x86/oprofile/op_model_amd.c | 20 ++++++++++---------- arch/x86/oprofile/op_model_p4.c | 32 ++++++++++++++++---------------- arch/x86/oprofile/op_model_ppro.c | 16 ++++++++-------- drivers/oprofile/buffer_sync.c | 1 - drivers/oprofile/oprof.c | 24 ++++++++++++------------ 5 files changed, 46 insertions(+), 47 deletions(-)
arch/x86/oprofile/op_model_amd.c +10 -10
@@ -530,14 +530,14 @@ static void op_amd_exit(void)#endif struct op_x86_model_spec const op_amd_spec = { - .init = op_amd_init, - .exit = op_amd_exit, - .num_counters =NUM_COUNTERS , - .num_controls =NUM_CONTROLS , - .fill_in_addresses = &op_amd_fill_in_addresses, - .setup_ctrs = &op_amd_setup_ctrs, - .check_ctrs = &op_amd_check_ctrs, - .start = &op_amd_start, - .stop = &op_amd_stop, - .shutdown = &op_amd_shutdown + .init = op_amd_init, + .exit = op_amd_exit, + .num_counters =NUM_COUNTERS , + .num_controls =NUM_CONTROLS , + .fill_in_addresses = &op_amd_fill_in_addresses, + .setup_ctrs = &op_amd_setup_ctrs, + .check_ctrs = &op_amd_check_ctrs, + .start = &op_amd_start, + .stop = &op_amd_stop, + .shutdown = &op_amd_shutdown };
arch/x86/oprofile/op_model_p4.c +16 -16
@@ -698,24 +698,24 @@ static void p4_shutdown(struct op_msrs const * const msrs)#ifdef CONFIG_SMP struct op_x86_model_spec const op_p4_ht2_spec = { - .num_counters =NUM_COUNTERS_HT2 , - .num_controls =NUM_CONTROLS_HT2 , - .fill_in_addresses = &p4_fill_in_addresses, - .setup_ctrs = &p4_setup_ctrs, - .check_ctrs = &p4_check_ctrs, - .start = &p4_start, - .stop = &p4_stop, - .shutdown = &p4_shutdown + .num_counters =NUM_COUNTERS_HT2 , + .num_controls =NUM_CONTROLS_HT2 , + .fill_in_addresses = &p4_fill_in_addresses, + .setup_ctrs = &p4_setup_ctrs, + .check_ctrs = &p4_check_ctrs, + .start = &p4_start, + .stop = &p4_stop, + .shutdown = &p4_shutdown };#endif struct op_x86_model_spec const op_p4_spec = { - .num_counters =NUM_COUNTERS_NON_HT , - .num_controls =NUM_CONTROLS_NON_HT , - .fill_in_addresses = &p4_fill_in_addresses, - .setup_ctrs = &p4_setup_ctrs, - .check_ctrs = &p4_check_ctrs, - .start = &p4_start, - .stop = &p4_stop, - .shutdown = &p4_shutdown + .num_counters =NUM_COUNTERS_NON_HT , + .num_controls =NUM_CONTROLS_NON_HT , + .fill_in_addresses = &p4_fill_in_addresses, + .setup_ctrs = &p4_setup_ctrs, + .check_ctrs = &p4_check_ctrs, + .start = &p4_start, + .stop = &p4_stop, + .shutdown = &p4_shutdown };
arch/x86/oprofile/op_model_ppro.c +8 -8
@@ -181,12 +181,12 @@ static void ppro_shutdown(struct op_msrs const * const msrs)struct op_x86_model_spec const op_ppro_spec = { - .num_counters =NUM_COUNTERS , - .num_controls =NUM_CONTROLS , - .fill_in_addresses = &ppro_fill_in_addresses, - .setup_ctrs = &ppro_setup_ctrs, - .check_ctrs = &ppro_check_ctrs, - .start = &ppro_start, - .stop = &ppro_stop, - .shutdown = &ppro_shutdown + .num_counters =NUM_COUNTERS , + .num_controls =NUM_CONTROLS , + .fill_in_addresses = &ppro_fill_in_addresses, + .setup_ctrs = &ppro_setup_ctrs, + .check_ctrs = &ppro_check_ctrs, + .start = &ppro_start, + .stop = &ppro_stop, + .shutdown = &ppro_shutdown };
drivers/oprofile/buffer_sync.c +0 -1
@@ -41,7 +41,6 @@ static cpumask_t marked_cpus = CPU_MASK_NONE;static DEFINE_SPINLOCK (task_mortuary);static void process_task_mortuary (void ); -/* Take ownership of the task struct and place it on the * list for processing. Only after two full buffer syncs * does the task eventually get freed, because by then
drivers/oprofile/oprof.c +12 -12
@@ -19,7 +19,7 @@#include "cpu_buffer.h" #include "buffer_sync.h" #include "oprofile_stats.h" - +struct oprofile_operations oprofile_ops;unsigned long oprofile_started;
@@ -36,7 +36,7 @@ static int timer = 0;int oprofile_setup (void ) {int err; - +mutex_lock (&start_mutex);if ((err =alloc_cpu_buffers ()))
@@ -44,10 +44,10 @@ int oprofile_setup(void)if ((err =alloc_event_buffer ())) goto out1; - +if (oprofile_ops.setup && (err = oprofile_ops.setup ())) goto out2; - +/* Note even though this starts part of the * profiling overhead, it's necessary to prevent * us missing task deaths and eventually oopsing
@@ -74,7 +74,7 @@ post_sync: is_setup =1 ;mutex_unlock (&start_mutex);return 0 ; - + out3:if (oprofile_ops.shutdown) oprofile_ops.shutdown ();
@@ -92,17 +92,17 @@ out:int oprofile_start (void ) {int err = -EINVAL ; - +mutex_lock (&start_mutex);if (!is_setup) goto out; - err =0 ; - + err =0 ; +if (oprofile_started) goto out; - +oprofile_reset_stats ();if ((err = oprofile_ops.start ()))
@@ -114,7 +114,7 @@ out:return err; } - +/* echo 0>/dev/oprofile/enable */ void oprofile_stop (void ) {
@@ -204,13 +204,13 @@ static void __exit oprofile_exit(void)oprofile_arch_exit (); } - +module_init (oprofile_init);module_exit (oprofile_exit);module_param_named (timer, timer, int,0644 );MODULE_PARM_DESC (timer,"force use of timer interrupt" ); - +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("John Levon <[email protected]>" );MODULE_DESCRIPTION ("OProfile system profiler" );
Signature · 1 line
1.6.0.1
PATCH 5/8 oprofile: more whitespace fixes
In reply to a message not in the archive--- arch/alpha/oprofile/common.c | 2 +- arch/ia64/oprofile/init.c | 4 +- arch/ia64/oprofile/perfmon.c | 4 +- arch/m32r/oprofile/init.c | 2 +- arch/mips/oprofile/common.c | 2 +- arch/mips/oprofile/op_impl.h | 2 +- arch/mips/oprofile/op_model_rm9000.c | 2 +- arch/parisc/oprofile/init.c | 2 +- arch/powerpc/oprofile/op_model_cell.c | 2 +- arch/sparc/oprofile/init.c | 2 +- arch/sparc64/oprofile/init.c | 2 +- arch/x86/oprofile/backtrace.c | 2 +- arch/x86/oprofile/op_model_amd.c | 6 +- arch/x86/oprofile/op_x86_model.h | 4 +- drivers/oprofile/cpu_buffer.c | 22 +++++----- drivers/oprofile/cpu_buffer.h | 6 +- drivers/oprofile/event_buffer.c | 10 ++-- drivers/oprofile/oprof.h | 4 +- drivers/oprofile/oprofile_files.c | 16 ++++---- drivers/oprofile/oprofile_stats.c | 10 ++-- drivers/oprofile/oprofile_stats.h | 2 +- drivers/oprofile/oprofilefs.c | 72 ++++++++++++++++---------------- drivers/oprofile/timer_int.c | 2 +- 23 files changed, 91 insertions(+), 91 deletions(-)
arch/alpha/oprofile/common.c +1 -1
@@ -106,7 +106,7 @@ op_axp_stop(void) }static int -op_axp_create_files (struct super_block * sb,struct dentry * root) +op_axp_create_files (struct super_block *sb,struct dentry *root) {int i;
arch/ia64/oprofile/init.c +2 -2
@@ -12,11 +12,11 @@#include <linux/init.h> #include <linux/errno.h> -extern int perfmon_init (struct oprofile_operations * ops); +extern int perfmon_init (struct oprofile_operations *ops);extern void perfmon_exit (void );extern void ia64_backtrace (struct pt_regs *const regs,unsigned int depth); -int __init oprofile_arch_init (struct oprofile_operations * ops) +int __init oprofile_arch_init (struct oprofile_operations *ops) {int ret = -ENODEV ;
arch/ia64/oprofile/perfmon.c +2 -2
@@ -56,7 +56,7 @@ static pfm_buffer_fmt_t oprofile_fmt = { }; -static char *get_cpu_type (void ) +static char *get_cpu_type (void ) {__u8 family = local_cpu_data->family;
@@ -75,7 +75,7 @@ static char * get_cpu_type(void)static int using_perfmon; -int perfmon_init (struct oprofile_operations * ops) +int perfmon_init (struct oprofile_operations *ops) {int ret =pfm_register_buffer_fmt (&oprofile_fmt);if (ret)
arch/m32r/oprofile/init.c +1 -1
@@ -12,7 +12,7 @@#include <linux/errno.h> #include <linux/init.h> -int __init oprofile_arch_init (struct oprofile_operations * ops) +int __init oprofile_arch_init (struct oprofile_operations *ops) {return -ENODEV ; }
arch/mips/oprofile/common.c +1 -1
@@ -32,7 +32,7 @@ static int op_mips_setup(void)return 0 ; } -static int op_mips_create_files (struct super_block * sb,struct dentry * root) +static int op_mips_create_files (struct super_block *sb,struct dentry *root) {int i;
arch/mips/oprofile/op_impl.h +1 -1
@@ -27,7 +27,7 @@ struct op_counter_config {/* Per-architecture configury and hooks. */ struct op_mips_model {void (*reg_setup) (struct op_counter_config *); -void (*cpu_setup) (void * dummy); +void (*cpu_setup) (void *dummy);int (*init)(void );void (*exit)(void );void (*cpu_start)(void *args);
arch/mips/oprofile/op_model_rm9000.c +1 -1
@@ -80,7 +80,7 @@ static void rm9000_cpu_stop(void *args)write_c0_perfcontrol (0 ); } -static irqreturn_t rm9000_perfcount_handler (int irq,void * dev_id) +static irqreturn_t rm9000_perfcount_handler (int irq,void *dev_id) {unsigned int control =read_c0_perfcontrol ();struct pt_regs *regs =get_irq_regs ();
arch/parisc/oprofile/init.c +1 -1
@@ -12,7 +12,7 @@#include <linux/kernel.h> #include <linux/oprofile.h> -int __init oprofile_arch_init (struct oprofile_operations * ops) +int __init oprofile_arch_init (struct oprofile_operations *ops) {return -ENODEV ; }
arch/powerpc/oprofile/op_model_cell.c +1 -1
@@ -404,7 +404,7 @@ set_count_mode(u32 kernel, u32 user) } } -static inline void enable_ctr (u32 cpu,u32 ctr,u32 * pm07_cntrl) +static inline void enable_ctr (u32 cpu,u32 ctr,u32 *pm07_cntrl) { pm07_cntrl[ctr] |=CBE_PM_CTR_ENABLE ;
arch/sparc/oprofile/init.c +1 -1
@@ -12,7 +12,7 @@#include <linux/errno.h> #include <linux/init.h> -int __init oprofile_arch_init (struct oprofile_operations * ops) +int __init oprofile_arch_init (struct oprofile_operations *ops) {return -ENODEV ; }
arch/sparc64/oprofile/init.c +1 -1
@@ -12,7 +12,7 @@#include <linux/errno.h> #include <linux/init.h> -int __init oprofile_arch_init (struct oprofile_operations * ops) +int __init oprofile_arch_init (struct oprofile_operations *ops) {return -ENODEV ; }
arch/x86/oprofile/backtrace.c +1 -1
@@ -53,7 +53,7 @@ struct frame_head { } __attribute__((packed));static struct frame_head * -dump_user_backtrace (struct frame_head * head) +dump_user_backtrace (struct frame_head *head) {struct frame_head bufhead[2 ];
arch/x86/oprofile/op_model_amd.c +3 -3
@@ -69,7 +69,7 @@ static unsigned long reset_value[NUM_COUNTERS];data. Should then be added to linux/oprofile.h. */ extern void oprofile_add_ibs_sample (struct pt_regs *const regs, -unsigned int *const ibs_sample,int ibs_code); +unsigned int *const ibs_sample,int ibs_code);struct ibs_fetch_sample {/* MSRC001_1031 IBS Fetch Linear Address Register */
@@ -469,9 +469,9 @@ static void clear_ibs_nmi(void)on_each_cpu (apic_clear_ibs_nmi_per_cpu,NULL ,1 ); } -static int (*create_arch_files)(struct super_block * sb,struct dentry * root); +static int (*create_arch_files)(struct super_block *sb,struct dentry *root); -static int setup_ibs_files (struct super_block * sb,struct dentry * root) +static int setup_ibs_files (struct super_block *sb,struct dentry *root) {struct dentry *dir;int ret =0 ;
arch/x86/oprofile/op_x86_model.h +2 -2
@@ -22,8 +22,8 @@ struct op_msr { };struct op_msrs { -struct op_msr * counters; -struct op_msr * controls; +struct op_msr *counters; +struct op_msr *controls; };struct pt_regs ;
drivers/oprofile/cpu_buffer.c +11 -11
@@ -112,7 +112,7 @@ void end_cpu_work(void) }/* Resets the cpu buffer to a sane state. */ -void cpu_buffer_reset (struct oprofile_cpu_buffer * cpu_buf) +void cpu_buffer_reset (struct oprofile_cpu_buffer *cpu_buf) {/* reset these to invalid values; the next sample * collected will populate the buffer with proper
@@ -123,7 +123,7 @@ void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf) }/* compute number of available slots in cpu_buffer queue */ -static unsigned long nr_available_slots (struct oprofile_cpu_buffer const * b) +static unsigned long nr_available_slots (struct oprofile_cpu_buffer const *b) {unsigned long head = b->head_pos;unsigned long tail = b->tail_pos;
@@ -134,7 +134,7 @@ static unsigned long nr_available_slots(struct oprofile_cpu_buffer const * b)return tail + (b->buffer_size - head) -1 ; } -static void increment_head (struct oprofile_cpu_buffer * b) +static void increment_head (struct oprofile_cpu_buffer *b) {unsigned long new_head = b->head_pos +1 ;
@@ -149,17 +149,17 @@ static void increment_head(struct oprofile_cpu_buffer * b) }static inline void -add_sample (struct oprofile_cpu_buffer * cpu_buf, +add_sample (struct oprofile_cpu_buffer *cpu_buf,unsigned long pc,unsigned long event) { -struct op_sample * entry = &cpu_buf->buffer[cpu_buf->head_pos]; +struct op_sample *entry = &cpu_buf->buffer[cpu_buf->head_pos]; entry->eip = pc; entry->event = event;increment_head (cpu_buf); }static inline void -add_code (struct oprofile_cpu_buffer * buffer,unsigned long value) +add_code (struct oprofile_cpu_buffer *buffer,unsigned long value) {add_sample (buffer,ESCAPE_CODE , value); }
@@ -173,10 +173,10 @@ add_code(struct oprofile_cpu_buffer * buffer, unsigned long value)* pc. We tag this in the buffer by generating kernel enter/exit * events whenever is_kernel changes */ -static int log_sample (struct oprofile_cpu_buffer * cpu_buf,unsigned long pc, +static int log_sample (struct oprofile_cpu_buffer *cpu_buf,unsigned long pc,int is_kernel,unsigned long event) { -struct task_struct * task; +struct task_struct *task; cpu_buf->sample_received++;
@@ -222,7 +222,7 @@ static int oprofile_begin_trace(struct oprofile_cpu_buffer *cpu_buf)return 1 ; } -static void oprofile_end_trace (struct oprofile_cpu_buffer * cpu_buf) +static void oprofile_end_trace (struct oprofile_cpu_buffer *cpu_buf) { cpu_buf->tracing =0 ; }
@@ -260,7 +260,7 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)#define MAX_IBS_SAMPLE_SIZE 14void oprofile_add_ibs_sample (struct pt_regs *const regs, -unsigned int *const ibs_sample,int ibs_code) +unsigned int *const ibs_sample,int ibs_code) {int is_kernel = !user_mode (regs);struct oprofile_cpu_buffer *cpu_buf = &__get_cpu_var (cpu_buffer);
@@ -345,7 +345,7 @@ void oprofile_add_trace(unsigned long pc)*/ static void wq_sync_buffer (struct work_struct *work) { -struct oprofile_cpu_buffer * b = +struct oprofile_cpu_buffer *b = container_of(work, struct oprofile_cpu_buffer, work.work);if (b->cpu !=smp_processor_id ()) { printk(KERN_DEBUG "WQ on CPU%d, prefer CPU%d\n",
drivers/oprofile/cpu_buffer.h +3 -3
@@ -36,10 +36,10 @@ struct oprofile_cpu_buffer {volatile unsigned long head_pos;volatile unsigned long tail_pos;unsigned long buffer_size; -struct task_struct * last_task; +struct task_struct *last_task;int last_is_kernel;int tracing; -struct op_sample * buffer; +struct op_sample *buffer;unsigned long sample_received;unsigned long sample_lost_overflow;unsigned long backtrace_aborted;
@@ -50,7 +50,7 @@ struct oprofile_cpu_buffer { DECLARE_PER_CPU(struct oprofile_cpu_buffer, cpu_buffer); -void cpu_buffer_reset (struct oprofile_cpu_buffer * cpu_buf); +void cpu_buffer_reset (struct oprofile_cpu_buffer *cpu_buf);/* transient events for the CPU buffer -> event buffer */ #define CPU_IS_KERNEL 1
drivers/oprofile/event_buffer.c +5 -5
@@ -28,7 +28,7 @@ DEFINE_MUTEX(buffer_mutex);static unsigned long buffer_opened;static DECLARE_WAIT_QUEUE_HEAD (buffer_wait); -static unsigned long * event_buffer; +static unsigned long *event_buffer;static unsigned long buffer_size;static unsigned long buffer_watershed;static size_t buffer_pos;
@@ -98,7 +98,7 @@ void free_event_buffer(void) } -static int event_buffer_open (struct inode * inode,struct file * file) +static int event_buffer_open (struct inode *inode,struct file *file) {int err = -EPERM ;
@@ -134,7 +134,7 @@ out: } -static int event_buffer_release (struct inode * inode,struct file * file) +static int event_buffer_release (struct inode *inode,struct file *file) {oprofile_stop ();oprofile_shutdown ();
@@ -146,8 +146,8 @@ static int event_buffer_release(struct inode * inode, struct file * file) } -static ssize_t event_buffer_read (struct file * file,char __user * buf, -size_t count,loff_t * offset) +static ssize_t event_buffer_read (struct file *file,char __user *buf, +size_t count,loff_t *offset) {int retval = -EINVAL ;size_t const max = buffer_size *sizeof (unsigned long );
drivers/oprofile/oprof.h +2 -2
@@ -31,8 +31,8 @@ extern unsigned long backtrace_depth;struct super_block ;struct dentry ; -void oprofile_create_files (struct super_block * sb,struct dentry * root); -void oprofile_timer_init (struct oprofile_operations * ops); +void oprofile_create_files (struct super_block *sb,struct dentry *root); +void oprofile_timer_init (struct oprofile_operations *ops);int oprofile_set_backtrace (unsigned long depth);
drivers/oprofile/oprofile_files.c +8 -8
@@ -18,13 +18,13 @@ unsigned long fs_buffer_size = 131072;unsigned long fs_cpu_buffer_size =8192 ;unsigned long fs_buffer_watershed =32768 ;/* FIXME: tune */ -static ssize_t depth_read (struct file * file,char __user * buf,size_t count,loff_t * offset) +static ssize_t depth_read (struct file *file,char __user *buf,size_t count,loff_t *offset) {return oprofilefs_ulong_to_user (backtrace_depth, buf, count, offset); } -static ssize_t depth_write (struct file * file,char const __user * buf,size_t count,loff_t * offset) +static ssize_t depth_write (struct file *file,char const __user *buf,size_t count,loff_t *offset) {unsigned long val;int retval;
@@ -50,7 +50,7 @@ static const struct file_operations depth_fops = { }; -static ssize_t pointer_size_read (struct file * file,char __user * buf,size_t count,loff_t * offset) +static ssize_t pointer_size_read (struct file *file,char __user *buf,size_t count,loff_t *offset) {return oprofilefs_ulong_to_user (sizeof (void *), buf, count, offset); }
@@ -61,7 +61,7 @@ static const struct file_operations pointer_size_fops = { }; -static ssize_t cpu_type_read (struct file * file,char __user * buf,size_t count,loff_t * offset) +static ssize_t cpu_type_read (struct file *file,char __user *buf,size_t count,loff_t *offset) {return oprofilefs_str_to_user (oprofile_ops.cpu_type, buf, count, offset); }
@@ -72,13 +72,13 @@ static const struct file_operations cpu_type_fops = { }; -static ssize_t enable_read (struct file * file,char __user * buf,size_t count,loff_t * offset) +static ssize_t enable_read (struct file *file,char __user *buf,size_t count,loff_t *offset) {return oprofilefs_ulong_to_user (oprofile_started, buf, count, offset); } -static ssize_t enable_write (struct file * file,char const __user * buf,size_t count,loff_t * offset) +static ssize_t enable_write (struct file *file,char const __user *buf,size_t count,loff_t *offset) {unsigned long val;int retval;
@@ -107,7 +107,7 @@ static const struct file_operations enable_fops = { }; -static ssize_t dump_write (struct file * file,char const __user * buf,size_t count,loff_t * offset) +static ssize_t dump_write (struct file *file,char const __user *buf,size_t count,loff_t *offset) {wake_up_buffer_waiter ();return count;
@@ -118,7 +118,7 @@ static const struct file_operations dump_fops = { .write = dump_write, }; -void oprofile_create_files (struct super_block * sb,struct dentry * root) +void oprofile_create_files (struct super_block *sb,struct dentry *root) {oprofilefs_create_file (sb, root,"enable" , &enable_fops);oprofilefs_create_file_perm (sb, root,"dump" , &dump_fops,0666 );
drivers/oprofile/oprofile_stats.c +5 -5
@@ -19,7 +19,7 @@ struct oprofile_stat_struct oprofile_stats;void oprofile_reset_stats (void ) { -struct oprofile_cpu_buffer * cpu_buf; +struct oprofile_cpu_buffer *cpu_buf;int i;for_each_possible_cpu (i) {
@@ -36,11 +36,11 @@ void oprofile_reset_stats(void) } -void oprofile_create_stats_files (struct super_block * sb,struct dentry * root) +void oprofile_create_stats_files (struct super_block *sb,struct dentry *root) { -struct oprofile_cpu_buffer * cpu_buf; -struct dentry * cpudir; -struct dentry * dir; +struct oprofile_cpu_buffer *cpu_buf; +struct dentry *cpudir; +struct dentry *dir;char buf[10 ];int i;
drivers/oprofile/oprofile_stats.h +1 -1
@@ -28,6 +28,6 @@ struct super_block;struct dentry ;/* create the stats/ dir */ -void oprofile_create_stats_files (struct super_block * sb,struct dentry * root); +void oprofile_create_stats_files (struct super_block *sb,struct dentry *root);#endif /* OPROFILE_STATS_H */
drivers/oprofile/oprofilefs.c +36 -36
177 lines not on this page · raw message
drivers/oprofile/timer_int.c +1 -1
@@ -35,7 +35,7 @@ static void timer_stop(void) } -void __init oprofile_timer_init (struct oprofile_operations * ops) +void __init oprofile_timer_init (struct oprofile_operations *ops) { ops->create_files =NULL ; ops->setup =NULL ;
Signature · 1 line
1.6.0.1
PATCH 6/8 x86/oprofile: removing unused function parameter in add_ibs_begin()
In reply to a message not in the archive--- drivers/oprofile/buffer_sync.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/oprofile/buffer_sync.c +3 -5
@@ -340,7 +340,7 @@ static void add_trace_begin(void)* 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) +struct mm_struct *mm) {unsigned long rip;int i, count;
@@ -592,12 +592,10 @@ void sync_buffer(int cpu) #ifdef CONFIG_OPROFILE_IBS }else if (s->event ==IBS_FETCH_BEGIN ) { state = sb_bt_start; -add_ibs_begin (cpu_buf, -IBS_FETCH_CODE , in_kernel, mm); +add_ibs_begin (cpu_buf,IBS_FETCH_CODE , mm); }else if (s->event ==IBS_OP_BEGIN ) { state = sb_bt_start; -add_ibs_begin (cpu_buf, -IBS_OP_CODE , in_kernel, mm); +add_ibs_begin (cpu_buf,IBS_OP_CODE , mm);#endif }else {struct mm_struct *oldmm = mm;
Signature · 1 line
1.6.0.1
PATCH 7/8 x86/oprofile: reordering functions in nmi_int.c
In reply to a message not in the archiveNo functional changes. The intension is to remove static function declarations.
--- arch/x86/oprofile/nmi_int.c | 147 +++++++++++++++++++++---------------------- 1 files changed, 71 insertions(+), 76 deletions(-)
arch/x86/oprofile/nmi_int.c +71 -76
@@ -28,85 +28,9 @@ static struct op_x86_model_spec const *model; static DEFINE_PER_CPU(struct op_msrs, cpu_msrs); static DEFINE_PER_CPU(unsigned long, saved_lvtpc); -static int nmi_start (void ); -static void nmi_stop (void ); -static void nmi_cpu_start (void *dummy); -static void nmi_cpu_stop (void *dummy); -/* 0 == registered but off, 1 == registered and on */ static int nmi_enabled =0 ; -#ifdef CONFIG_SMP -static int oprofile_cpu_notifier (struct notifier_block *b,unsigned long action, -void *data) -{ -int cpu = (unsigned long )data; -switch (action) { -case CPU_DOWN_FAILED : -case CPU_ONLINE : -smp_call_function_single (cpu, nmi_cpu_start,NULL ,0 ); -break ; -case CPU_DOWN_PREPARE : -smp_call_function_single (cpu, nmi_cpu_stop,NULL ,1 ); -break ; - } -return NOTIFY_DONE ; -} - -static struct notifier_block oprofile_cpu_nb = { - .notifier_call = oprofile_cpu_notifier -}; -#endif - -#ifdef CONFIG_PM - -static int nmi_suspend (struct sys_device *dev,pm_message_t state) -{ -/* Only one CPU left, just stop that one */ -if (nmi_enabled ==1 ) -nmi_cpu_stop (NULL ); -return 0 ; -} - -static int nmi_resume (struct sys_device *dev) -{ -if (nmi_enabled ==1 ) -nmi_cpu_start (NULL ); -return 0 ; -} - -static struct sysdev_class oprofile_sysclass = { - .name ="oprofile" , - .resume = nmi_resume, - .suspend = nmi_suspend, -}; - -static struct sys_device device_oprofile = { - .id =0 , - .cls = &oprofile_sysclass, -}; - -static int __init init_sysfs (void ) -{ -int error; - - error =sysdev_class_register (&oprofile_sysclass); -if (!error) - error =sysdev_register (&device_oprofile); -return error; -} - -static void exit_sysfs (void ) -{ -sysdev_unregister (&device_oprofile); -sysdev_class_unregister (&oprofile_sysclass); -} - -#else -#define init_sysfs () do { } while (0) -#define exit_sysfs () do { } while (0) -#endif /* CONFIG_PM */ -static int profile_exceptions_notify (struct notifier_block *self,unsigned long val,void *data) {
@@ -361,6 +285,77 @@ static int nmi_create_files(struct super_block *sb, struct dentry *root)return 0 ; } +#ifdef CONFIG_SMP +static int oprofile_cpu_notifier (struct notifier_block *b,unsigned long action, +void *data) +{ +int cpu = (unsigned long )data; +switch (action) { +case CPU_DOWN_FAILED : +case CPU_ONLINE : +smp_call_function_single (cpu, nmi_cpu_start,NULL ,0 ); +break ; +case CPU_DOWN_PREPARE : +smp_call_function_single (cpu, nmi_cpu_stop,NULL ,1 ); +break ; + } +return NOTIFY_DONE ; +} + +static struct notifier_block oprofile_cpu_nb = { + .notifier_call = oprofile_cpu_notifier +}; +#endif + +#ifdef CONFIG_PM + +static int nmi_suspend (struct sys_device *dev,pm_message_t state) +{ +/* Only one CPU left, just stop that one */ +if (nmi_enabled ==1 ) +nmi_cpu_stop (NULL ); +return 0 ; +} + +static int nmi_resume (struct sys_device *dev) +{ +if (nmi_enabled ==1 ) +nmi_cpu_start (NULL ); +return 0 ; +} + +static struct sysdev_class oprofile_sysclass = { + .name ="oprofile" , + .resume = nmi_resume, + .suspend = nmi_suspend, +}; + +static struct sys_device device_oprofile = { + .id =0 , + .cls = &oprofile_sysclass, +}; + +static int __init init_sysfs (void ) +{ +int error; + + error =sysdev_class_register (&oprofile_sysclass); +if (!error) + error =sysdev_register (&device_oprofile); +return error; +} + +static void exit_sysfs (void ) +{ +sysdev_unregister (&device_oprofile); +sysdev_class_unregister (&oprofile_sysclass); +} + +#else +#define init_sysfs () do { } while (0) +#define exit_sysfs () do { } while (0) +#endif /* CONFIG_PM */ +static int p4force;module_param (p4force, int,0 );
Signature · 1 line
1.6.0.1
PATCH 8/8 x86/oprofile: add the logic for enabling additional IBS bits
In reply to a message not in the archiveFrom: Suravee Suthikulpanit <[email protected]>
This patch adds the logic for enabling additional IBS control bits :
* IBS-Fetch IbsRandEn bit (bit 57)
* IBS-Op IbsOpCntCtl bit (bit 19)
--- arch/x86/oprofile/op_model_amd.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
arch/x86/oprofile/op_model_amd.c +5 -2
@@ -310,12 +310,15 @@ static void op_amd_start(struct op_msrs const * const msrs)#ifdef CONFIG_OPROFILE_IBS if (ibs_allowed && ibs_config.fetch_enabled) { low = (ibs_config.max_cnt_fetch >>4 ) &0xFFFF ; - high =IBS_FETCH_HIGH_ENABLE ; + high = ((ibs_config.rand_en &0x1 ) <<25 )/* bit 57 */ + +IBS_FETCH_HIGH_ENABLE ;wrmsr (MSR_AMD64_IBSFETCHCTL , low, high); }if (ibs_allowed && ibs_config.op_enabled) { - low = ((ibs_config.max_cnt_op >>4 ) &0xFFFF ) +IBS_OP_LOW_ENABLE ; + low = ((ibs_config.max_cnt_op >>4 ) &0xFFFF ) + + ((ibs_config.dispatched_ops &0x1 ) <<19 )/* bit 19 */ + +IBS_OP_LOW_ENABLE ; high =0 ;wrmsr (MSR_AMD64_IBSOPCTL , low, high); }
Signature · 1 line
1.6.0.1