tracing: %pF is only for function pointers

Use %pS for actual addresses, otherwise you'll get bad output
on arches like ppc64 where %pF expects a function descriptor.

Link: http://lkml.kernel.org/r/1426130037-17956-22-git-send-email-scottwood@freescale.com
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 1faecea..572e650 100644 (file)
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -962,7 +962,7 @@ TRACE_EVENT(alloc_extent_state,
                __entry->ip     = IP
        ),
 
-       TP_printk("state=%p; mask = %s; caller = %pF", __entry->state,
+       TP_printk("state=%p; mask = %s; caller = %pS", __entry->state,
                  show_gfp_flags(__entry->mask), (void *)__entry->ip)
 );
 
@@ -982,7 +982,7 @@ TRACE_EVENT(free_extent_state,
                __entry->ip = IP
        ),
 
-       TP_printk(" state=%p; caller = %pF", __entry->state,
+       TP_printk(" state=%p; caller = %pS", __entry->state,
                  (void *)__entry->ip)
 );
 

diff --git a/include/trace/events/ext3.h b/include/trace/events/ext3.h
index 6797b9d..7f20707 100644 (file)
--- a/include/trace/events/ext3.h
+++ b/include/trace/events/ext3.h
@@ -144,7 +144,7 @@ TRACE_EVENT(ext3_mark_inode_dirty,
                __entry->ip     = IP;
        ),
 
-       TP_printk("dev %d,%d ino %lu caller %pF",
+       TP_printk("dev %d,%d ino %lu caller %pS",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  (unsigned long) __entry->ino, (void *)__entry->ip)
 );

diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h
index 6e5abd6..47fca36 100644 (file)
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
@@ -240,7 +240,7 @@ TRACE_EVENT(ext4_mark_inode_dirty,
                __entry->ip     = IP;
        ),
 
-       TP_printk("dev %d,%d ino %lu caller %pF",
+       TP_printk("dev %d,%d ino %lu caller %pS",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  (unsigned long) __entry->ino, (void *)__entry->ip)
 );
@@ -1762,7 +1762,7 @@ TRACE_EVENT(ext4_journal_start,
                __entry->rsv_blocks      = rsv_blocks;
        ),
 
-       TP_printk("dev %d,%d blocks, %d rsv_blocks, %d caller %pF",
+       TP_printk("dev %d,%d blocks, %d rsv_blocks, %d caller %pS",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  __entry->blocks, __entry->rsv_blocks, (void *)__entry->ip)
 );
@@ -1784,7 +1784,7 @@ TRACE_EVENT(ext4_journal_start_reserved,
                __entry->blocks          = blocks;
        ),
 
-       TP_printk("dev %d,%d blocks, %d caller %pF",
+       TP_printk("dev %d,%d blocks, %d caller %pS",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  __entry->blocks, (void *)__entry->ip)
 );

diff --git a/include/trace/events/module.h b/include/trace/events/module.h
index 81c4c18..28c4599 100644 (file)
--- a/include/trace/events/module.h
+++ b/include/trace/events/module.h
@@ -84,7 +84,7 @@ DECLARE_EVENT_CLASS(module_refcnt,
                __assign_str(name, mod->name);
        ),
 
-       TP_printk("%s call_site=%pf refcnt=%d",
+       TP_printk("%s call_site=%ps refcnt=%d",
                  __get_str(name), (void *)__entry->ip, __entry->refcnt)
 );
 
@@ -121,7 +121,7 @@ TRACE_EVENT(module_request,
                __assign_str(name, name);
        ),
 
-       TP_printk("%s wait=%d call_site=%pf",
+       TP_printk("%s wait=%d call_site=%ps",
                  __get_str(name), (int)__entry->wait, (void *)__entry->ip)
 );
 

diff --git a/include/trace/events/random.h b/include/trace/events/random.h
index 805af6d..4684de3 100644 (file)
--- a/include/trace/events/random.h
+++ b/include/trace/events/random.h
@@ -22,7 +22,7 @@ TRACE_EVENT(add_device_randomness,
                __entry->IP             = IP;
        ),
 
-       TP_printk("bytes %d caller %pF",
+       TP_printk("bytes %d caller %pS",
                __entry->bytes, (void *)__entry->IP)
 );
 
@@ -43,7 +43,7 @@ DECLARE_EVENT_CLASS(random__mix_pool_bytes,
                __entry->IP             = IP;
        ),
 
-       TP_printk("%s pool: bytes %d caller %pF",
+       TP_printk("%s pool: bytes %d caller %pS",
                  __entry->pool_name, __entry->bytes, (void *)__entry->IP)
 );
 
@@ -82,7 +82,7 @@ TRACE_EVENT(credit_entropy_bits,
        ),
 
        TP_printk("%s pool: bits %d entropy_count %d entropy_total %d "
-                 "caller %pF", __entry->pool_name, __entry->bits,
+                 "caller %pS", __entry->pool_name, __entry->bits,
                  __entry->entropy_count, __entry->entropy_total,
                  (void *)__entry->IP)
 );
@@ -207,7 +207,7 @@ DECLARE_EVENT_CLASS(random__get_random_bytes,
                __entry->IP             = IP;
        ),
 
-       TP_printk("nbytes %d caller %pF", __entry->nbytes, (void *)__entry->IP)
+       TP_printk("nbytes %d caller %pS", __entry->nbytes, (void *)__entry->IP)
 );
 
 DEFINE_EVENT(random__get_random_bytes, get_random_bytes,
@@ -242,7 +242,7 @@ DECLARE_EVENT_CLASS(random__extract_entropy,
                __entry->IP             = IP;
        ),
 
-       TP_printk("%s pool: nbytes %d entropy_count %d caller %pF",
+       TP_printk("%s pool: nbytes %d entropy_count %d caller %pS",
                  __entry->pool_name, __entry->nbytes, __entry->entropy_count,
                  (void *)__entry->IP)
 );

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index e2d027a..ee7b94a 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -223,7 +223,7 @@ FTRACE_ENTRY(bprint, bprint_entry,
                __dynamic_array(        u32,    buf     )
        ),
 
-       F_printk("%pf: %s",
+       F_printk("%ps: %s",
                 (void *)__entry->ip, __entry->fmt),
 
        FILTER_OTHER
@@ -238,7 +238,7 @@ FTRACE_ENTRY(print, print_entry,
                __dynamic_array(        char,   buf     )
        ),
 
-       F_printk("%pf: %s",
+       F_printk("%ps: %s",
                 (void *)__entry->ip, __entry->buf),
 
        FILTER_OTHER
@@ -253,7 +253,7 @@ FTRACE_ENTRY(bputs, bputs_entry,
                __field(        const char *,   str     )
        ),
 
-       F_printk("%pf: %s",
+       F_printk("%ps: %s",
                 (void *)__entry->ip, __entry->str),
 
        FILTER_OTHER

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index afe20ed..2c0bd8f 100644 (file)
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -3976,7 +3976,7 @@ static struct print_arg *make_bprint_args(char *fmt, void *data, int size, struc
        if (asprintf(&arg->atom.atom, "%lld", ip) < 0)
                goto out_free;
 
-       /* skip the first "%pf: " */
+       /* skip the first "%ps: " */
        for (ptr = fmt + 5, bptr = data + field->offset;
             bptr < data + size && *ptr; ptr++) {
                int ls = 0;