lkml.org 
[lkml]   [2017]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 063/138] SUNRPC: Fix tracepoint storage issues with svc_recv and svc_rqst_status
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Trond Myklebust <trond.myklebust@primarydata.com>

    commit e9d4bf219c83d09579bc62512fea2ca10f025d93 upstream.

    There is no guarantee that either the request or the svc_xprt exist
    by the time we get round to printing the trace message.

    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/trace/events/sunrpc.h | 17 ++++++++++-------
    1 file changed, 10 insertions(+), 7 deletions(-)

    --- a/include/trace/events/sunrpc.h
    +++ b/include/trace/events/sunrpc.h
    @@ -455,20 +455,22 @@ TRACE_EVENT(svc_recv,
    TP_ARGS(rqst, status),

    TP_STRUCT__entry(
    - __field(struct sockaddr *, addr)
    __field(__be32, xid)
    __field(int, status)
    __field(unsigned long, flags)
    + __dynamic_array(unsigned char, addr, rqst->rq_addrlen)
    ),

    TP_fast_assign(
    - __entry->addr = (struct sockaddr *)&rqst->rq_addr;
    __entry->xid = status > 0 ? rqst->rq_xid : 0;
    __entry->status = status;
    __entry->flags = rqst->rq_flags;
    + memcpy(__get_dynamic_array(addr),
    + &rqst->rq_addr, rqst->rq_addrlen);
    ),

    - TP_printk("addr=%pIScp xid=0x%x status=%d flags=%s", __entry->addr,
    + TP_printk("addr=%pIScp xid=0x%x status=%d flags=%s",
    + (struct sockaddr *)__get_dynamic_array(addr),
    be32_to_cpu(__entry->xid), __entry->status,
    show_rqstp_flags(__entry->flags))
    );
    @@ -513,22 +515,23 @@ DECLARE_EVENT_CLASS(svc_rqst_status,
    TP_ARGS(rqst, status),

    TP_STRUCT__entry(
    - __field(struct sockaddr *, addr)
    __field(__be32, xid)
    - __field(int, dropme)
    __field(int, status)
    __field(unsigned long, flags)
    + __dynamic_array(unsigned char, addr, rqst->rq_addrlen)
    ),

    TP_fast_assign(
    - __entry->addr = (struct sockaddr *)&rqst->rq_addr;
    __entry->xid = rqst->rq_xid;
    __entry->status = status;
    __entry->flags = rqst->rq_flags;
    + memcpy(__get_dynamic_array(addr),
    + &rqst->rq_addr, rqst->rq_addrlen);
    ),

    TP_printk("addr=%pIScp rq_xid=0x%x status=%d flags=%s",
    - __entry->addr, be32_to_cpu(__entry->xid),
    + (struct sockaddr *)__get_dynamic_array(addr),
    + be32_to_cpu(__entry->xid),
    __entry->status, show_rqstp_flags(__entry->flags))
    );


    \
     
     \ /
      Last update: 2017-11-28 11:54    [W:4.162 / U:0.892 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site