lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 311/330] NFS: nfs_xdr_status should record the procedure name
    Date
    From: Chuck Lever <chuck.lever@oracle.com>

    [ Upstream commit 5be5945864ea143fda628e8179c8474457af1f43 ]

    When sunrpc trace points are not enabled, the recorded task ID
    information alone is not helpful.

    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfs/nfstrace.h | 15 +++++++++++++--
    1 file changed, 13 insertions(+), 2 deletions(-)

    diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
    index 361cc10d6f95d..c8081d2b4166a 100644
    --- a/fs/nfs/nfstrace.h
    +++ b/fs/nfs/nfstrace.h
    @@ -1147,7 +1147,12 @@ TRACE_EVENT(nfs_xdr_status,
    __field(unsigned int, task_id)
    __field(unsigned int, client_id)
    __field(u32, xid)
    + __field(int, version)
    __field(unsigned long, error)
    + __string(program,
    + xdr->rqst->rq_task->tk_client->cl_program->name)
    + __string(procedure,
    + xdr->rqst->rq_task->tk_msg.rpc_proc->p_name)
    ),

    TP_fast_assign(
    @@ -1157,13 +1162,19 @@ TRACE_EVENT(nfs_xdr_status,
    __entry->task_id = task->tk_pid;
    __entry->client_id = task->tk_client->cl_clid;
    __entry->xid = be32_to_cpu(rqstp->rq_xid);
    + __entry->version = task->tk_client->cl_vers;
    __entry->error = error;
    + __assign_str(program,
    + task->tk_client->cl_program->name)
    + __assign_str(procedure, task->tk_msg.rpc_proc->p_name)
    ),

    TP_printk(
    - "task:%u@%d xid=0x%08x error=%ld (%s)",
    + "task:%u@%d xid=0x%08x %sv%d %s error=%ld (%s)",
    __entry->task_id, __entry->client_id, __entry->xid,
    - -__entry->error, nfs_show_status(__entry->error)
    + __get_str(program), __entry->version,
    + __get_str(procedure), -__entry->error,
    + nfs_show_status(__entry->error)
    )
    );

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-09-18 04:08    [W:3.816 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site