oprofile: adding cpu_buffer_write_commit()

[safe/jmp/linux-2.6] / drivers / oprofile / cpu_buffer.c

diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index b47ce03..d6f5de6 100644 (file)
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -22,7 +22,7 @@
 #include <linux/oprofile.h>
 #include <linux/vmalloc.h>
 #include <linux/errno.h>
- 
+
 #include "event_buffer.h"
 #include "cpu_buffer.h"
 #include "buffer_sync.h"
@@ -38,27 +38,40 @@ static int work_enabled;
 void free_cpu_buffers(void)
 {
        int i;
- 
-       for_each_online_cpu(i) {
+
+       for_each_possible_cpu(i) {
                vfree(per_cpu(cpu_buffer, i).buffer);
                per_cpu(cpu_buffer, i).buffer = NULL;
        }
 }
 
+unsigned long oprofile_get_cpu_buffer_size(void)
+{
+       return fs_cpu_buffer_size;
+}
+
+void oprofile_cpu_buffer_inc_smpl_lost(void)
+{
+       struct oprofile_cpu_buffer *cpu_buf
+               = &__get_cpu_var(cpu_buffer);
+
+       cpu_buf->sample_lost_overflow++;
+}
+
 int alloc_cpu_buffers(void)
 {
        int i;
- 
+
        unsigned long buffer_size = fs_cpu_buffer_size;
- 
-       for_each_online_cpu(i) {
+
+       for_each_possible_cpu(i) {
                struct oprofile_cpu_buffer *b = &per_cpu(cpu_buffer, i);
- 
+
                b->buffer = vmalloc_node(sizeof(struct op_sample) * buffer_size,
                        cpu_to_node(i));
                if (!b->buffer)
                        goto fail;
- 
+
                b->last_task = NULL;
                b->last_is_kernel = -1;
                b->tracing = 0;
@@ -114,9 +127,10 @@ void end_cpu_work(void)
 /* Resets the cpu buffer to a sane state. */
 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
-        * values to initialize the buffer
+       /*
+        * reset these to invalid values; the next sample collected
+        * will populate the buffer with proper values to initialize
+        * the buffer
         */
        cpu_buf->last_is_kernel = -1;
        cpu_buf->last_task = NULL;
@@ -134,28 +148,14 @@ 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)
-{
-       unsigned long new_head = b->head_pos + 1;
-
-       /* Ensure anything written to the slot before we
-        * increment is visible */
-       wmb();
-
-       if (new_head < b->buffer_size)
-               b->head_pos = new_head;
-       else
-               b->head_pos = 0;
-}
-
 static inline void
 add_sample(struct oprofile_cpu_buffer *cpu_buf,
-           unsigned long pc, unsigned long event)
+          unsigned long pc, unsigned long event)
 {
-       struct op_sample *entry = &cpu_buf->buffer[cpu_buf->head_pos];
+       struct op_sample *entry = cpu_buffer_write_entry(cpu_buf);
        entry->eip = pc;
        entry->event = event;
-       increment_head(cpu_buf);
+       cpu_buffer_write_commit(cpu_buf);
 }
 
 static inline void
@@ -205,7 +205,7 @@ static int log_sample(struct oprofile_cpu_buffer *cpu_buf, unsigned long pc,
                cpu_buf->last_task = task;
                add_code(cpu_buf, (unsigned long)task);
        }
- 
+
        add_sample(cpu_buf, pc, event);
        return 1;
 }
@@ -240,8 +240,10 @@ void oprofile_add_ext_sample(unsigned long pc, struct pt_regs * const regs,
        if (!oprofile_begin_trace(cpu_buf))
                return;
 
-       /* if log_sample() fail we can't backtrace since we lost the source
-        * of this event */
+       /*
+        * if log_sample() fail we can't backtrace since we lost the
+        * source of this event
+        */
        if (log_sample(cpu_buf, pc, is_kernel, event))
                oprofile_ops.backtrace(regs, backtrace_depth);
        oprofile_end_trace(cpu_buf);
@@ -259,8 +261,8 @@ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event)
 
 #define MAX_IBS_SAMPLE_SIZE 14
 
-void oprofile_add_ibs_sample(struct pt_regs *const regs,
-                            unsigned int *const ibs_sample, int ibs_code)
+void oprofile_add_ibs_sample(struct pt_regs * const regs,
+                            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);
@@ -325,8 +327,10 @@ void oprofile_add_trace(unsigned long pc)
                return;
        }
 
-       /* broken frame can give an eip with the same value as an escape code,
-        * abort the trace if we get it */
+       /*
+        * broken frame can give an eip with the same value as an
+        * escape code, abort the trace if we get it
+        */
        if (pc == ESCAPE_CODE) {
                cpu_buf->tracing = 0;
                cpu_buf->backtrace_aborted++;
@@ -350,6 +354,11 @@ static void wq_sync_buffer(struct work_struct *work)
        if (b->cpu != smp_processor_id()) {
                printk(KERN_DEBUG "WQ on CPU%d, prefer CPU%d\n",
                       smp_processor_id(), b->cpu);
+
+               if (!cpu_online(b->cpu)) {
+                       cancel_delayed_work(&b->work);
+                       return;
+               }
        }
        sync_buffer(b->cpu);