ring-buffer: Really make it generic.
Subsystems (4)
PATCH 1/2 ring-buffer: Really make it generic.
In hunting down the cause for the hwlat_detector ring buffer spew in my failed -next builds it became obvious that folks are now treating ring_buffer as something that is generic independent of tracing and thus, suitable for public driver consumption.
Given that there are only a few minor areas in ring_buffer that have any reliance on CONFIG_TRACING or CONFIG_FUNCTION_TRACER, provide stubs for those and make it generally available.
---
kernel/Makefile | 1 + kernel/trace/ring_buffer.c | 11 +++++++++++ kernel/trace/trace.h | 7 +++++++ 3 files changed, 19 insertions(+)
kernel/Makefile +1 -0
@@ -96,6 +96,7 @@ obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o obj-$(CONFIG_FUNCTION_TRACER) += trace/ obj-$(CONFIG_TRACING) += trace/ obj-$(CONFIG_X86_DS) += trace/ +obj-$(CONFIG_RING_BUFFER) += trace/ obj-$(CONFIG_SMP) += sched_cpupri.o obj-$(CONFIG_SLOW_WORK) += slow-work.o obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
kernel/trace/ring_buffer.c +11 -0
@@ -1563,6 +1563,8 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer,return NULL ; } +#ifdef CONFIG_TRACING +#define TRACE_RECURSIVE_DEPTH 16static int trace_recursive_lock (void )
@@ -1593,6 +1595,13 @@ static void trace_recursive_unlock(void) current->trace_recursion--; } +#else + +#define trace_recursive_lock () (0) +#define trace_recursive_unlock () do { } while (0) + +#endif + static DEFINE_PER_CPU(int, rb_need_resched);/**
@@ -3104,6 +3113,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer, }EXPORT_SYMBOL_GPL (ring_buffer_read_page); +#ifdef CONFIG_TRACING static ssize_t rb_simple_read (struct file *filp,char __user *ubuf,size_t cnt,loff_t *ppos)
@@ -3171,6 +3181,7 @@ static __init int rb_init_debugfs(void) }fs_initcall (rb_init_debugfs); +#endif #ifdef CONFIG_HOTPLUG_CPU static int rb_cpu_notify(struct notifier_block *self,
kernel/trace/trace.h +7 -0
@@ -597,6 +597,7 @@ print_graph_function(struct trace_iterator *iter)extern struct pid *ftrace_pid_trace; +#ifdef CONFIG_FUNCTION_TRACER static inline int ftrace_trace_task (struct task_struct *task) {if (!ftrace_pid_trace)
@@ -604,6 +605,12 @@ static inline int ftrace_trace_task(struct task_struct *task) return test_tsk_trace_trace(task); } +#else +static inline int ftrace_trace_task (struct task_struct *task) +{ +return 1 ; +} +#endif /* * trace_iterator_flags is an enumeration that defines bit
PATCH 2/2 hwlat_detector: select RING_BUFFER.
The hwlat_detector broke quite a few of the sh module builds:
ERROR: "ring_buffer_write" [drivers/misc/hwlat_detector.ko] undefined!
ERROR: "ring_buffer_reset" [drivers/misc/hwlat_detector.ko] undefined!
ERROR: "__ring_buffer_alloc" [drivers/misc/hwlat_detector.ko] undefined!
ERROR: "ring_buffer_event_data" [drivers/misc/hwlat_detector.ko] undefined!
ERROR: "ring_buffer_consume" [drivers/misc/hwlat_detector.ko] undefined!
ERROR: "ring_buffer_free" [drivers/misc/hwlat_detector.ko] undefined! make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2
This fixes it up by selecting RING_BUFFER outright.
---
drivers/misc/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/misc/Kconfig +1 -0
@@ -79,6 +79,7 @@ config IBM_ASM config HWLAT_DETECTOR tristate "Testing module to detect hardware-induced latencies" depends on DEBUG_FS + select RING_BUFFER default m ---help--- A simple hardware latency detector. Use this module to detect
Quoted 8 lines · Paul Mundt
In hunting down the cause for the
hwlat_detectorring buffer spew in my failed -next builds it became obvious that folks are now treatingring_bufferas something that is generic independent of tracing and thus, suitable for public driver consumption.Given that there are only a few minor areas in
ring_bufferthat have any reliance onCONFIG_TRACINGorCONFIG_FUNCTION_TRACER, provide stubs for those and make it generally available.
Thanks for this. I had discussed it with Steven previously and I can't imagine why he wouldn't be in favor of wider use - I suggested that it's about time ring_buffer moved out of trace/ and got it's own place (it's getting to be a big boy now, full of youthful aspiration) but we'll have to wait for him to get back from his trip and let us know what he wants.
Jon.
Quoted 10 lines · Jon Masters
Quoted 8 lines · Paul Mundt
In hunting down the cause for the
hwlat_detectorring buffer spew in my failed -next builds it became obvious that folks are now treatingring_bufferas something that is generic independent of tracing and thus, suitable for public driver consumption.Given that there are only a few minor areas in
ring_bufferthat have any reliance onCONFIG_TRACINGorCONFIG_FUNCTION_TRACER, provide stubs for those and make it generally available.
Quoted 6 lines
Thanks for this. I had discussed it with Steven previously and I can't imagine why he wouldn't be in favor of wider use - I suggested that it's about time
ring_buffermoved out of trace/ and got it's own place (it's getting to be a big boy now, full of youthful aspiration) but we'll have to wait for him to get back from his trip and let us know what he wants.
Ok, then as a stop-gap solution it should at least depend on RING_BUFFER so that it doesn't blow up the other builds ;-)
Quoted 10 lines · Jon Masters
Quoted 8 lines · Paul Mundt
In hunting down the cause for the
hwlat_detectorring buffer spew in my failed -next builds it became obvious that folks are now treatingring_bufferas something that is generic independent of tracing and thus, suitable for public driver consumption.Given that there are only a few minor areas in
ring_bufferthat have any reliance onCONFIG_TRACINGorCONFIG_FUNCTION_TRACER, provide stubs for those and make it generally available.
Quoted 6 lines
Thanks for this. I had discussed it with Steven previously and I can't imagine why he wouldn't be in favor of wider use - I suggested that it's about time
ring_buffermoved out of trace/ and got it's own place (it's getting to be a big boy now, full of youthful aspiration) but we'll have to wait for him to get back from his trip and let us know what he wants.
The patch makes sense - i've queued it up in tip:tracing/urgent - the sooner we have it upstream the better.
Ingo
[tip:tracing/urgent] ring-buffer: Make it generally available
In reply to Paul MundtCommit-ID: 1155de47cd66d0c496d5a6fb2223e980ef1285b2 Gitweb: http://git.kernel.org/tip/1155de47cd66d0c496d5a6fb2223e980ef1285b2 Author: Paul Mundt <[email protected]> AuthorDate: Thu, 25 Jun 2009 14:30:12 +0900 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 25 Jun 2009 10:31:30 +0200
ring-buffer: Make it generally available
In hunting down the cause for the hwlat_detector ring buffer spew in my failed -next builds it became obvious that folks are now treating ring_buffer as something that is generic independent of tracing and thus, suitable for public driver consumption.
Given that there are only a few minor areas in ring_buffer that have any reliance on CONFIG_TRACING or CONFIG_FUNCTION_TRACER, provide stubs for those and make it generally available.
LKML-Reference: <[email protected]>
--- kernel/Makefile | 1 + kernel/trace/ring_buffer.c | 11 +++++++++++ kernel/trace/trace.h | 7 +++++++ 3 files changed, 19 insertions(+), 0 deletions(-)
kernel/Makefile +1 -0
@@ -96,6 +96,7 @@ obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o obj-$(CONFIG_FUNCTION_TRACER) += trace/ obj-$(CONFIG_TRACING) += trace/ obj-$(CONFIG_X86_DS) += trace/ +obj-$(CONFIG_RING_BUFFER) += trace/ obj-$(CONFIG_SMP) += sched_cpupri.o obj-$(CONFIG_SLOW_WORK) += slow-work.o obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
kernel/trace/ring_buffer.c +11 -0
@@ -1563,6 +1563,8 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer,return NULL ; } +#ifdef CONFIG_TRACING +#define TRACE_RECURSIVE_DEPTH 16static int trace_recursive_lock (void )
@@ -1593,6 +1595,13 @@ static void trace_recursive_unlock(void) current->trace_recursion--; } +#else + +#define trace_recursive_lock () (0) +#define trace_recursive_unlock () do { } while (0) + +#endif + static DEFINE_PER_CPU(int, rb_need_resched);/**
@@ -3104,6 +3113,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer, }EXPORT_SYMBOL_GPL (ring_buffer_read_page); +#ifdef CONFIG_TRACING static ssize_t rb_simple_read (struct file *filp,char __user *ubuf,size_t cnt,loff_t *ppos)
@@ -3171,6 +3181,7 @@ static __init int rb_init_debugfs(void) }fs_initcall (rb_init_debugfs); +#endif #ifdef CONFIG_HOTPLUG_CPU static int rb_cpu_notify(struct notifier_block *self,
kernel/trace/trace.h +7 -0
@@ -597,6 +597,7 @@ print_graph_function(struct trace_iterator *iter)extern struct pid *ftrace_pid_trace; +#ifdef CONFIG_FUNCTION_TRACER static inline int ftrace_trace_task (struct task_struct *task) {if (!ftrace_pid_trace)
@@ -604,6 +605,12 @@ static inline int ftrace_trace_task(struct task_struct *task) return test_tsk_trace_trace(task); } +#else +static inline int ftrace_trace_task (struct task_struct *task) +{ +return 1 ; +} +#endif /* * trace_iterator_flags is an enumeration that defines bit
Re: [tip:tracing/urgent] ring-buffer: Make it generally available
Quoted 14 lines · tip-bot for Paul Mundt
Commit-ID: 1155de47cd66d0c496d5a6fb2223e980ef1285b2 Gitweb: http://git.kernel.org/tip/1155de47cd66d0c496d5a6fb2223e980ef1285b2 Author: Paul Mundt <[email protected]> AuthorDate: Thu, 25 Jun 2009 14:30:12 +0900 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 25 Jun 2009 10:31:30 +0200ring-buffer: Make it generally available
In hunting down the cause for the
hwlat_detectorring buffer spew in my failed -next builds it became obvious that folks are now treatingring_bufferas something that is generic independent of tracing and thus, suitable for public driver consumption.
Quoted 7 lines
Given that there are only a few minor areas in
ring_bufferthat have any reliance onCONFIG_TRACINGorCONFIG_FUNCTION_TRACER, provide stubs for those and make it generally available.Signed-off-by Paul Mundt <[email protected]>Cc Jon Masters <[email protected]>Cc Steven Rostedt <[email protected]>
Thanks!
-- Steve
Quoted 91 lines
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>--- kernel/Makefile | 1 + kernel/trace/ring_buffer.c | 11 +++++++++++ kernel/trace/trace.h | 7 +++++++ 3 files changed, 19 insertions(+), 0 deletions(-)kernel/Makefile +1
-0@@ -96,6 +96,7 @@ obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o obj-$(CONFIG_FUNCTION_TRACER) += trace/ obj-$(CONFIG_TRACING) += trace/ obj-$(CONFIG_X86_DS) += trace/ +obj-$(CONFIG_RING_BUFFER) += trace/ obj-$(CONFIG_SMP) += sched_cpupri.o obj-$(CONFIG_SLOW_WORK) += slow-work.o obj-$(CONFIG_PERF_COUNTERS) += perf_counter.okernel/trace/ring_buffer.c +11
-0@@ -1563,6 +1563,8 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer,return NULL ; } +#ifdef CONFIG_TRACING +#define TRACE_RECURSIVE_DEPTH 16static int trace_recursive_lock (void )@@ -1593,6 +1595,13 @@ static void trace_recursive_unlock(void) current->trace_recursion--; } +#else + +#define trace_recursive_lock () (0) +#define trace_recursive_unlock () do { } while (0) + +#endif + static DEFINE_PER_CPU(int, rb_need_resched);/** @@ -3104,6 +3113,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer, }EXPORT_SYMBOL_GPL (ring_buffer_read_page); +#ifdef CONFIG_TRACING static ssize_t rb_simple_read (struct file *filp,char __user *ubuf,size_t cnt,loff_t *ppos)@@ -3171,6 +3181,7 @@ static __init int rb_init_debugfs(void) }fs_initcall (rb_init_debugfs); +#endif #ifdef CONFIG_HOTPLUG_CPU static int rb_cpu_notify(struct notifier_block *self,kernel/trace/trace.h +7
-0@@ -597,6 +597,7 @@ print_graph_function(struct trace_iterator *iter)extern struct pid *ftrace_pid_trace; +#ifdef CONFIG_FUNCTION_TRACER static inline int ftrace_trace_task (struct task_struct *task) {if (!ftrace_pid_trace)@@ -604,6 +605,12 @@ static inline int ftrace_trace_task(struct task_struct *task) return test_tsk_trace_trace(task); } +#else +static inline int ftrace_trace_task (struct task_struct *task) +{ +return 1 ; +} +#endif /* * trace_iterator_flags is an enumeration that defines bit