lkml.org 
[lkml]   [2022]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 04/13] tracing/brcm: Use the new __vstring() helper
    From: "Steven Rostedt (Google)" <rostedt@goodmis.org>

    Instead of open coding a __dynamic_array() with a fixed length (which
    defeats the purpose of the dynamic array in the first place). Use the new
    __vstring() helper that will use a va_list and only write enough of the
    string into the ring buffer that is needed.

    Cc: Arend van Spriel <aspriel@gmail.com>
    Cc: Franky Lin <franky.lin@broadcom.com>
    Cc: Hante Meuleman <hante.meuleman@broadcom.com>
    Cc: Kalle Valo <kvalo@kernel.org>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Eric Dumazet <edumazet@google.com>
    Cc: Jakub Kicinski <kuba@kernel.org>
    Cc: Paolo Abeni <pabeni@redhat.com>
    Cc: linux-wireless@vger.kernel.org
    Cc: brcm80211-dev-list.pdl@broadcom.com
    Cc: SHA-cyfmac-dev-list@infineon.com
    Cc: netdev@vger.kernel.org
    Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
    ---
    .../broadcom/brcm80211/brcmfmac/tracepoint.h | 12 ++++--------
    .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h | 12 ++++--------
    2 files changed, 8 insertions(+), 16 deletions(-)

    diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h
    index 338c66d0c5f8..5a139d7ed47a 100644
    --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h
    +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h
    @@ -33,13 +33,11 @@ TRACE_EVENT(brcmf_err,
    TP_ARGS(func, vaf),
    TP_STRUCT__entry(
    __string(func, func)
    - __dynamic_array(char, msg, MAX_MSG_LEN)
    + __vstring(msg, vaf->fmt, vaf->va)
    ),
    TP_fast_assign(
    __assign_str(func, func);
    - WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
    - MAX_MSG_LEN, vaf->fmt,
    - *vaf->va) >= MAX_MSG_LEN);
    + __assign_vstr(msg, vaf->fmt, vaf->va);
    ),
    TP_printk("%s: %s", __get_str(func), __get_str(msg))
    );
    @@ -50,14 +48,12 @@ TRACE_EVENT(brcmf_dbg,
    TP_STRUCT__entry(
    __field(u32, level)
    __string(func, func)
    - __dynamic_array(char, msg, MAX_MSG_LEN)
    + __vstring(msg, vaf->fmt, vaf->va)
    ),
    TP_fast_assign(
    __entry->level = level;
    __assign_str(func, func);
    - WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
    - MAX_MSG_LEN, vaf->fmt,
    - *vaf->va) >= MAX_MSG_LEN);
    + __assign_vstr(msg, vaf->fmt, vaf->va);
    ),
    TP_printk("%s: %s", __get_str(func), __get_str(msg))
    );
    diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h
    index 0e8a69ab909f..488456420353 100644
    --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h
    +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h
    @@ -28,12 +28,10 @@ DECLARE_EVENT_CLASS(brcms_msg_event,
    TP_PROTO(struct va_format *vaf),
    TP_ARGS(vaf),
    TP_STRUCT__entry(
    - __dynamic_array(char, msg, MAX_MSG_LEN)
    + __vstring(msg, vaf->fmt, vaf->va)
    ),
    TP_fast_assign(
    - WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
    - MAX_MSG_LEN, vaf->fmt,
    - *vaf->va) >= MAX_MSG_LEN);
    + __assign_vstr(msg, vaf->fmt, vaf->va);
    ),
    TP_printk("%s", __get_str(msg))
    );
    @@ -64,14 +62,12 @@ TRACE_EVENT(brcms_dbg,
    TP_STRUCT__entry(
    __field(u32, level)
    __string(func, func)
    - __dynamic_array(char, msg, MAX_MSG_LEN)
    + __vstring(msg, vaf->fmt, vaf->va)
    ),
    TP_fast_assign(
    __entry->level = level;
    __assign_str(func, func);
    - WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
    - MAX_MSG_LEN, vaf->fmt,
    - *vaf->va) >= MAX_MSG_LEN);
    + __assign_vstr(msg, vaf->fmt, vaf->va);
    ),
    TP_printk("%s: %s", __get_str(func), __get_str(msg))
    );
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-07-06 00:50    [W:4.185 / U:1.500 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site