On Thu, Jan 25, 2018 at 10:47:04AM -0800, Darrick J. Wong wrote:
> On Thu, Jan 25, 2018 at 12:31:28PM -0500, Brian Foster wrote:
> > On Tue, Jan 23, 2018 at 06:18:47PM -0800, Darrick J. Wong wrote:
> > > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> > >
> > > Tracepoint printk doesn't have any of the %p suffixes, so use %p.
> > >
> > > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> > > ---
> >
> > I see different behavior with this. E.g.,
> >
> > umount-1130 [003] ...1 1995.947789: xfs_log_force: dev 253:3 lsn 0x0 caller xfs_log_quiesce+0x3c/0x4b0 [xfs]
> >
> > vs.
> >
> > umount-1272 [002] ...1 2089.445135: xfs_log_force: dev 253:3 lsn 0x0 caller 00000000937cbc85
>
> Hmm, on my system all I get is:
>
> mount-3125 [000] 1634.386726: xfs_buf_submit_wait: dev 8:0 bno
> 0x4b0020 nblks 0x8 hold 1 pincount 0 lock 0 flags READ|PAGES caller
> 0xffffffffa06cca52S
>
> ...which is odd since they all map to the vsnprintf implementation, so
> this ought to work.
>
> # trace-cmd record -e 'xfs_buf*' -F mount /dev/sda
> # trace-cmd report
>
> (I don't see anything in the trace-cmd-report manpage about "resolve
> symbolic addresses" but maybe I just have an old version... or maybe
> we're just using different tools?)
For anyone following along at home, trace-cmd report does not resolve
instruction pointer addrs to name+offset tuples; for that you have to
drain the raw output:
# trace-cmd start <same arguments as record>
# cat /sys/kernel/debug/tracing/trace_pipe
# trace-cmd stop
--D
>
> > Expected?
>
> No, not at all. But since it clearly works on your system, I'll call
> you fortunate and drop this patch. :)
>
> --D
>
> >
> > Brian
> >
> > > fs/xfs/scrub/trace.h | 20 ++++++++++----------
> > > fs/xfs/xfs_trace.h | 24 ++++++++++++------------
> > > 2 files changed, 22 insertions(+), 22 deletions(-)
> > >
> > >
> > > diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h
> > > index a0a6d3c..732775f 100644
> > > --- a/fs/xfs/scrub/trace.h
> > > +++ b/fs/xfs/scrub/trace.h
> > > @@ -90,7 +90,7 @@ TRACE_EVENT(xfs_scrub_op_error,
> > > __entry->error = error;
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d type %u agno %u agbno %u error %d ret_ip %pS",
> > > + TP_printk("dev %d:%d type %u agno %u agbno %u error %d ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->type,
> > > __entry->agno,
> > > @@ -121,7 +121,7 @@ TRACE_EVENT(xfs_scrub_file_op_error,
> > > __entry->error = error;
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d ino %llu fork %d type %u offset %llu error %d ret_ip %pS",
> > > + TP_printk("dev %d:%d ino %llu fork %d type %u offset %llu error %d ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __entry->whichfork,
> > > @@ -156,7 +156,7 @@ DECLARE_EVENT_CLASS(xfs_scrub_block_error_class,
> > > __entry->bno = bno;
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d type %u agno %u agbno %u ret_ip %pS",
> > > + TP_printk("dev %d:%d type %u agno %u agbno %u ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->type,
> > > __entry->agno,
> > > @@ -207,7 +207,7 @@ DECLARE_EVENT_CLASS(xfs_scrub_ino_error_class,
> > > __entry->bno = bno;
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d ino %llu type %u agno %u agbno %u ret_ip %pS",
> > > + TP_printk("dev %d:%d ino %llu type %u agno %u agbno %u ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __entry->type,
> > > @@ -246,7 +246,7 @@ DECLARE_EVENT_CLASS(xfs_scrub_fblock_error_class,
> > > __entry->offset = offset;
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d ino %llu fork %d type %u offset %llu ret_ip %pS",
> > > + TP_printk("dev %d:%d ino %llu fork %d type %u offset %llu ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __entry->whichfork,
> > > @@ -277,7 +277,7 @@ TRACE_EVENT(xfs_scrub_incomplete,
> > > __entry->type = sc->sm->sm_type;
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d type %u ret_ip %pS",
> > > + TP_printk("dev %d:%d type %u ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->type,
> > > __entry->ret_ip)
> > > @@ -311,7 +311,7 @@ TRACE_EVENT(xfs_scrub_btree_op_error,
> > > __entry->error = error;
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d type %u btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %pS",
> > > + TP_printk("dev %d:%d type %u btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->type,
> > > __entry->btnum,
> > > @@ -354,7 +354,7 @@ TRACE_EVENT(xfs_scrub_ifork_btree_op_error,
> > > __entry->error = error;
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d ino %llu fork %d type %u btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %pS",
> > > + TP_printk("dev %d:%d ino %llu fork %d type %u btnum %d level %d ptr %d agno %u agbno %u error %d ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __entry->whichfork,
> > > @@ -393,7 +393,7 @@ TRACE_EVENT(xfs_scrub_btree_error,
> > > __entry->ptr = cur->bc_ptrs[level];
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d type %u btnum %d level %d ptr %d agno %u agbno %u ret_ip %pS",
> > > + TP_printk("dev %d:%d type %u btnum %d level %d ptr %d agno %u agbno %u ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->type,
> > > __entry->btnum,
> > > @@ -433,7 +433,7 @@ TRACE_EVENT(xfs_scrub_ifork_btree_error,
> > > __entry->ptr = cur->bc_ptrs[level];
> > > __entry->ret_ip = ret_ip;
> > > ),
> > > - TP_printk("dev %d:%d ino %llu fork %d type %u btnum %d level %d ptr %d agno %u agbno %u ret_ip %pS",
> > > + TP_printk("dev %d:%d ino %llu fork %d type %u btnum %d level %d ptr %d agno %u agbno %u ret_ip %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __entry->whichfork,
> > > diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> > > index 945de08..893081e 100644
> > > --- a/fs/xfs/xfs_trace.h
> > > +++ b/fs/xfs/xfs_trace.h
> > > @@ -119,7 +119,7 @@ DECLARE_EVENT_CLASS(xfs_perag_class,
> > > __entry->refcount = refcount;
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > - TP_printk("dev %d:%d agno %u refcount %d caller %pS",
> > > + TP_printk("dev %d:%d agno %u refcount %d caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->agno,
> > > __entry->refcount,
> > > @@ -252,7 +252,7 @@ DECLARE_EVENT_CLASS(xfs_bmap_class,
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > TP_printk("dev %d:%d ino 0x%llx state %s cur %p/%d "
> > > - "offset %lld block %lld count %lld flag %d caller %pS",
> > > + "offset %lld block %lld count %lld flag %d caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __print_flags(__entry->bmap_state, "|", XFS_BMAP_EXT_FLAGS),
> > > @@ -301,7 +301,7 @@ DECLARE_EVENT_CLASS(xfs_buf_class,
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > TP_printk("dev %d:%d bno 0x%llx nblks 0x%x hold %d pincount %d "
> > > - "lock %d flags %s caller %pS",
> > > + "lock %d flags %s caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > (unsigned long long)__entry->bno,
> > > __entry->nblks,
> > > @@ -370,7 +370,7 @@ DECLARE_EVENT_CLASS(xfs_buf_flags_class,
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "
> > > - "lock %d flags %s caller %pS",
> > > + "lock %d flags %s caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > (unsigned long long)__entry->bno,
> > > __entry->buffer_length,
> > > @@ -415,7 +415,7 @@ TRACE_EVENT(xfs_buf_ioerror,
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > TP_printk("dev %d:%d bno 0x%llx len 0x%zx hold %d pincount %d "
> > > - "lock %d error %d flags %s caller %pS",
> > > + "lock %d error %d flags %s caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > (unsigned long long)__entry->bno,
> > > __entry->buffer_length,
> > > @@ -579,7 +579,7 @@ DECLARE_EVENT_CLASS(xfs_lock_class,
> > > __entry->lock_flags = lock_flags;
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > - TP_printk("dev %d:%d ino 0x%llx flags %s caller %pS",
> > > + TP_printk("dev %d:%d ino 0x%llx flags %s caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __print_flags(__entry->lock_flags, "|", XFS_LOCK_FLAGS),
> > > @@ -697,7 +697,7 @@ DECLARE_EVENT_CLASS(xfs_iref_class,
> > > __entry->pincount = atomic_read(&ip->i_pincount);
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > - TP_printk("dev %d:%d ino 0x%llx count %d pincount %d caller %pS",
> > > + TP_printk("dev %d:%d ino 0x%llx count %d pincount %d caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __entry->count,
> > > @@ -1049,7 +1049,7 @@ TRACE_EVENT(xfs_log_force,
> > > __entry->lsn = lsn;
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > - TP_printk("dev %d:%d lsn 0x%llx caller %pS",
> > > + TP_printk("dev %d:%d lsn 0x%llx caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->lsn, (void *)__entry->caller_ip)
> > > )
> > > @@ -1403,7 +1403,7 @@ TRACE_EVENT(xfs_bunmap,
> > > __entry->flags = flags;
> > > ),
> > > TP_printk("dev %d:%d ino 0x%llx size 0x%llx bno 0x%llx len 0x%llx"
> > > - "flags %s caller %pS",
> > > + "flags %s caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __entry->size,
> > > @@ -1517,7 +1517,7 @@ TRACE_EVENT(xfs_agf,
> > > ),
> > > TP_printk("dev %d:%d agno %u flags %s length %u roots b %u c %u "
> > > "levels b %u c %u flfirst %u fllast %u flcount %u "
> > > - "freeblks %u longest %u caller %pS",
> > > + "freeblks %u longest %u caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->agno,
> > > __print_flags(__entry->flags, "|", XFS_AGF_FLAGS),
> > > @@ -2486,7 +2486,7 @@ DECLARE_EVENT_CLASS(xfs_ag_error_class,
> > > __entry->error = error;
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > - TP_printk("dev %d:%d agno %u error %d caller %pS",
> > > + TP_printk("dev %d:%d agno %u error %d caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->agno,
> > > __entry->error,
> > > @@ -2977,7 +2977,7 @@ DECLARE_EVENT_CLASS(xfs_inode_error_class,
> > > __entry->error = error;
> > > __entry->caller_ip = caller_ip;
> > > ),
> > > - TP_printk("dev %d:%d ino %llx error %d caller %pS",
> > > + TP_printk("dev %d:%d ino %llx error %d caller %p",
> > > MAJOR(__entry->dev), MINOR(__entry->dev),
> > > __entry->ino,
> > > __entry->error,
> > >
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
