| Message ID | 153269370853.3084.10985190108092225790.stgit@devbox (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | selftests/ftrace: Improve ftracetest with coverage check | expand |
On Fri, 27 Jul 2018 21:15:08 +0900 Masami Hiramatsu <mhiramat@kernel.org> wrote: > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc > @@ -4,11 +4,18 @@ > > [ -f kprobe_events ] || exit_unsupported # this is configurable > > +rmmod trace-printk ||: > +if ! modprobe trace-printk.ko ; then > + echo "No trace-printk sample module - please make CONFIG_SAMPLE_TRACE_PRINTK= > +m" > + exit_unresolved; > +fi > + > +MOD=trace_printk > +FUNC=trace_printk_irq_work Hmm, this caused a problem with CONFIG_KPROBE_EVENTS_ON_NOTRACE=n. However, as far as I can see, the trace_printk_irq_work() is not marked as notrace... Anyway, I'll find another better module to test. Thanks,
On Thu, 2 Aug 2018 10:02:40 +0900 Masami Hiramatsu <mhiramat@kernel.org> wrote: > On Fri, 27 Jul 2018 21:15:08 +0900 > Masami Hiramatsu <mhiramat@kernel.org> wrote: > > > --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc > > +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc > > @@ -4,11 +4,18 @@ > > > > [ -f kprobe_events ] || exit_unsupported # this is configurable > > > > +rmmod trace-printk ||: > > +if ! modprobe trace-printk.ko ; then > > + echo "No trace-printk sample module - please make CONFIG_SAMPLE_TRACE_PRINTK= > > +m" > > + exit_unresolved; > > +fi > > + > > +MOD=trace_printk > > +FUNC=trace_printk_irq_work > > Hmm, this caused a problem with CONFIG_KPROBE_EVENTS_ON_NOTRACE=n. > However, as far as I can see, the trace_printk_irq_work() is not > marked as notrace... Ah, I found this was caused by my prevent probe on notrace patch. I was a bit too greedy to check out-of-range probes in it. I'll fix that. Thank you,
diff --git a/tools/testing/selftests/ftrace/config b/tools/testing/selftests/ftrace/config index b01924c71c09..766669592173 100644 --- a/tools/testing/selftests/ftrace/config +++ b/tools/testing/selftests/ftrace/config @@ -4,3 +4,7 @@ CONFIG_FUNCTION_PROFILER=y CONFIG_TRACER_SNAPSHOT=y CONFIG_STACK_TRACER=y CONFIG_HIST_TRIGGERS=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_SAMPLES=y +CONFIG_SAMPLE_TRACE_PRINTK=m diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc index ec6c5fffef1e..1efe9e616bc4 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_module.tc @@ -4,11 +4,18 @@ [ -f kprobe_events ] || exit_unsupported # this is configurable +rmmod trace-printk ||: +if ! modprobe trace-printk.ko ; then + echo "No trace-printk sample module - please make CONFIG_SAMPLE_TRACE_PRINTK= +m" + exit_unresolved; +fi + +MOD=trace_printk +FUNC=trace_printk_irq_work + :;: "Add an event on a module function without specifying event name" ;: -MOD=`lsmod | head -n 2 | tail -n 1 | cut -f1 -d" "` -FUNC=`grep -m 1 ".* t .*\\[$MOD\\]" /proc/kallsyms | xargs | cut -f3 -d" "` -[ "x" != "x$MOD" -a "y" != "y$FUNC" ] || exit_unresolved echo "p $MOD:$FUNC" > kprobe_events PROBE_NAME=`echo $MOD:$FUNC | tr ".:" "_"` test -d events/kprobes/p_${PROBE_NAME}_0 || exit_failure @@ -22,3 +29,25 @@ test -d events/kprobes/event1 || exit_failure echo "p:kprobes1/event1 $MOD:$FUNC" > kprobe_events test -d events/kprobes1/event1 || exit_failure + +:;: "Remove target module, but event still be there" ;: +if ! rmmod trace-printk ; then + echo "Failed to unload module - please enable CONFIG_MODULE_UNLOAD" + exit_unresolved; +fi +test -d events/kprobes1/event1 + +:;: "Check posibility to defining events on unloaded module";: +echo "p:event2 $MOD:$FUNC" >> kprobe_events + +:;: "Target is gone, but we can prepare for next time";: +echo 1 > events/kprobes1/event1/enable + +:;: "Load module again, which means the event1 should be recorded";: +modprobe trace-printk.ko +grep "event1:" trace + +:;: "Remove the module again and check the event is not locked" +rmmod trace-printk +echo 0 > events/kprobes1/event1/enable +echo "-:kprobes1/event1" >> kprobe_events
Improve kprobe events on module testcase to check module load/unload with disabled/enabled events. This also change the target module to trace_printk.ko, so it depends on CONFIG_SAMPLE_TRACE_PRINTK=m. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> --- tools/testing/selftests/ftrace/config | 4 ++ .../ftrace/test.d/kprobe/kprobe_module.tc | 35 ++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html