lkml.org 
[lkml]   [2011]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH v1 1/2] PM/runtime: introduce trace points for tracing rpm_* functions
    Date
    On Tuesday, September 27, 2011, tom.leiming@gmail.com wrote:
    > From: Ming Lei <ming.lei@canonical.com>
    >
    > This patch introduces 3 trace points to prepare for tracing
    > rpm_idle/rpm_suspend/rpm_resume functions, so we can use these
    > trace points to replace the current dev_dbg().
    >
    > Cc: Steven Rostedt rostedt@goodmis.org
    > Signed-off-by: Ming Lei <ming.lei@canonical.com>

    I get the following build warning from it:

    GEN /home/rafael/src/build/mainline/tosh/Makefile
    CHK include/linux/version.h
    Using /home/rafael/src/linux as source for kernel
    CHK include/generated/utsrelease.h
    CALL /home/rafael/src/linux/scripts/checksyscalls.sh
    CHK include/generated/compile.h
    CC drivers/base/power/runtime.o
    CC kernel/trace/rpm-traces.o
    In file included from /home/rafael/src/linux/include/trace/ftrace.h:296:0,
    from /home/rafael/src/linux/include/trace/define_trace.h:96,
    from /home/rafael/src/linux/include/trace/events/rpm.h:99,
    from /home/rafael/src/linux/kernel/trace/rpm-traces.c:15:
    /home/rafael/src/linux/include/trace/events/rpm.h: In function ‘ftrace_raw_output_rpm_return_int’:
    /home/rafael/src/linux/include/trace/events/rpm.h:76:1: warning: format ‘%p’ expects type ‘void *’, but argument 3 has type ‘long unsigned int’

    Care to check?

    Rafael


    > ---
    > v1: takes Steven's suggestions
    > - use __assign_str to dump device name to trace buffer
    > - pass _THIS_IP_ to trace_rpm_return_int
    > ---
    > include/trace/events/rpm.h | 99 ++++++++++++++++++++++++++++++++++++++++++++
    > kernel/trace/Makefile | 1 +
    > kernel/trace/rpm-traces.c | 21 +++++++++
    > 3 files changed, 121 insertions(+), 0 deletions(-)
    > create mode 100644 include/trace/events/rpm.h
    > create mode 100644 kernel/trace/rpm-traces.c
    >
    > diff --git a/include/trace/events/rpm.h b/include/trace/events/rpm.h
    > new file mode 100644
    > index 0000000..36805d9
    > --- /dev/null
    > +++ b/include/trace/events/rpm.h
    > @@ -0,0 +1,99 @@
    > +
    > +#undef TRACE_SYSTEM
    > +#define TRACE_SYSTEM rpm
    > +
    > +#if !defined(_TRACE_RUNTIME_POWER_H) || defined(TRACE_HEADER_MULTI_READ)
    > +#define _TRACE_RUNTIME_POWER_H
    > +
    > +#include <linux/ktime.h>
    > +#include <linux/tracepoint.h>
    > +#include <linux/device.h>
    > +
    > +/*
    > + * The rpm_internal events are used for tracing some important
    > + * runtime pm internal functions.
    > + */
    > +DECLARE_EVENT_CLASS(rpm_internal,
    > +
    > + TP_PROTO(struct device *dev, int flags),
    > +
    > + TP_ARGS(dev, flags),
    > +
    > + TP_STRUCT__entry(
    > + __string( name, dev_name(dev) )
    > + __field( int, flags )
    > + __field( int , usage_count )
    > + __field( int , disable_depth )
    > + __field( int , runtime_auto )
    > + __field( int , request_pending )
    > + __field( int , irq_safe )
    > + __field( int , child_count )
    > + ),
    > +
    > + TP_fast_assign(
    > + __assign_str(name, dev_name(dev));
    > + __entry->flags = flags;
    > + __entry->usage_count = atomic_read(
    > + &dev->power.usage_count);
    > + __entry->disable_depth = dev->power.disable_depth;
    > + __entry->runtime_auto = dev->power.runtime_auto;
    > + __entry->request_pending = dev->power.request_pending;
    > + __entry->irq_safe = dev->power.irq_safe;
    > + __entry->child_count = atomic_read(
    > + &dev->power.child_count);
    > + ),
    > +
    > + TP_printk("%s flags-%x cnt-%-2d dep-%-2d auto-%-1d p-%-1d"
    > + " irq-%-1d child-%d",
    > + __get_str(name), __entry->flags,
    > + __entry->usage_count,
    > + __entry->disable_depth,
    > + __entry->runtime_auto,
    > + __entry->request_pending,
    > + __entry->irq_safe,
    > + __entry->child_count
    > + )
    > +);
    > +DEFINE_EVENT(rpm_internal, rpm_suspend,
    > +
    > + TP_PROTO(struct device *dev, int flags),
    > +
    > + TP_ARGS(dev, flags)
    > +);
    > +DEFINE_EVENT(rpm_internal, rpm_resume,
    > +
    > + TP_PROTO(struct device *dev, int flags),
    > +
    > + TP_ARGS(dev, flags)
    > +);
    > +DEFINE_EVENT(rpm_internal, rpm_idle,
    > +
    > + TP_PROTO(struct device *dev, int flags),
    > +
    > + TP_ARGS(dev, flags)
    > +);
    > +
    > +TRACE_EVENT(rpm_return_int,
    > + TP_PROTO(struct device *dev, unsigned long ip, int ret),
    > + TP_ARGS(dev, ip, ret),
    > +
    > + TP_STRUCT__entry(
    > + __string( name, dev_name(dev))
    > + __field( unsigned long, ip )
    > + __field( int, ret )
    > + ),
    > +
    > + TP_fast_assign(
    > + __assign_str(name, dev_name(dev));
    > + __entry->ip = ip;
    > + __entry->ret = ret;
    > + ),
    > +
    > + TP_printk("%pS:%s ret=%d", __entry->ip, __get_str(name),
    > + __entry->ret)
    > +);
    > +
    > +#endif /* _TRACE_RUNTIME_POWER_H */
    > +
    > +/* This part must be outside protection */
    > +#include <trace/define_trace.h>
    > diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
    > index 761c510..56bdab5 100644
    > --- a/kernel/trace/Makefile
    > +++ b/kernel/trace/Makefile
    > @@ -53,6 +53,7 @@ endif
    > obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
    > obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
    > obj-$(CONFIG_TRACEPOINTS) += power-traces.o
    > +obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
    > ifeq ($(CONFIG_TRACING),y)
    > obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
    > endif
    > diff --git a/kernel/trace/rpm-traces.c b/kernel/trace/rpm-traces.c
    > new file mode 100644
    > index 0000000..998949e
    > --- /dev/null
    > +++ b/kernel/trace/rpm-traces.c
    > @@ -0,0 +1,21 @@
    > +/*
    > + * Power trace points
    > + *
    > + * Copyright (C) 2009 Ming Lei <ming.lei@canonical.com>
    > + */
    > +
    > +#include <linux/string.h>
    > +#include <linux/types.h>
    > +#include <linux/workqueue.h>
    > +#include <linux/sched.h>
    > +#include <linux/module.h>
    > +#include <linux/usb.h>
    > +
    > +#define CREATE_TRACE_POINTS
    > +#include <trace/events/rpm.h>
    > +
    > +EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_return_int);
    > +EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_idle);
    > +EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_suspend);
    > +EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_resume);
    > +
    >

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-09-27 22:29    [W:0.041 / U:31.552 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site