|author||Carl Love <email@example.com>||2008-10-14 23:37:01 +0000|
|committer||Benjamin Herrenschmidt <firstname.lastname@example.org>||2008-10-21 15:17:48 +1100|
powerpc/oprofile: Fix mutex locking for cell spu-oprofile
The issue is the SPU code is not holding the kernel mutex lock while adding samples to the kernel buffer. This patch creates per SPU buffers to hold the data. Data is added to the buffers from in interrupt context. The data is periodically pushed to the kernel buffer via a new Oprofile function oprofile_put_buff(). The oprofile_put_buff() function is called via a work queue enabling the funtion to acquire the mutex lock. The existing user controls for adjusting the per CPU buffer size is used to control the size of the per SPU buffers. Similarly, overflows of the SPU buffers are reported by incrementing the per CPU buffer stats. This eliminates the need to have architecture specific controls for the per SPU buffers which is not acceptable to the OProfile user tool maintainer. The export of the oprofile add_event_entry() is removed as it is no longer needed given this patch. Note, this patch has not addressed the issue of indexing arrays by the spu number. This still needs to be fixed as the spu numbering is not guarenteed to be 0 to max_num_spus-1. Signed-off-by: Carl Love <email@example.com> Signed-off-by: Maynard Johnson <firstname.lastname@example.org> Signed-off-by: Arnd Bergmann <email@example.com> Acked-by: Acked-by: Robert Richter <firstname.lastname@example.org> Signed-off-by: Benjamin Herrenschmidt <email@example.com>
Diffstat (limited to 'include/linux/oprofile.h')
1 files changed, 9 insertions, 7 deletions
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index bcb8f725427c..5231861f357d 100644
@@ -86,13 +86,6 @@ int oprofile_arch_init(struct oprofile_operations * ops);
- * Add data to the event buffer.
- * The data passed is free-form, but typically consists of
- * file offsets, dcookies, context information, and ESCAPE codes.
-void add_event_entry(unsigned long data);
* Add a sample. This may be called from any context. Pass
* smp_processor_id() as cpu.
@@ -162,5 +155,14 @@ int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, siz
/** lock for read/write safety */
extern spinlock_t oprofilefs_lock;
+ * Add the contents of a circular buffer to the event buffer.
+void oprofile_put_buff(unsigned long *buf, unsigned int start,
+ unsigned int stop, unsigned int max);
+unsigned long oprofile_get_cpu_buffer_size(void);
#endif /* OPROFILE_H */