lkml.org 
[lkml]   [2019]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v1 2/4] mmc: core: Add trace event for SD SSR response
    On Mon, 15 Apr 2019 16:52:39 -0600
    Raul E Rangel <rrangel@chromium.org> wrote:

    > Example:
    > sd_ssr: mmc0: au: 8192, erase time: 0, erase offset: 0x0, raw: {0x0,0x3000000,0x1019000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0}
    >
    > Signed-off-by: Raul E Rangel <rrangel@chromium.org>
    > ---
    >
    > drivers/mmc/core/sd.c | 2 ++
    > include/trace/events/mmc.h | 31 +++++++++++++++++++++++++++++++
    > 2 files changed, 33 insertions(+)
    >
    > diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
    > index 3bed7c4b6d75..cc33a4f96c6a 100644
    > --- a/drivers/mmc/core/sd.c
    > +++ b/drivers/mmc/core/sd.c
    > @@ -282,6 +282,8 @@ static int mmc_read_ssr(struct mmc_card *card)
    > }
    > }
    >
    > + trace_sd_ssr(card);
    > +
    > /*
    > * starting SD5.1 discard is supported if DISCARD_SUPPORT (b313) is set
    > */
    > diff --git a/include/trace/events/mmc.h b/include/trace/events/mmc.h
    > index e45258e8a6cb..cad604ee800f 100644
    > --- a/include/trace/events/mmc.h
    > +++ b/include/trace/events/mmc.h
    > @@ -52,6 +52,37 @@ TRACE_EVENT(sd_scr,
    > )
    > );
    >
    > +TRACE_EVENT(sd_ssr,
    > +
    > + TP_PROTO(struct mmc_card *card),
    > +
    > + TP_ARGS(card),
    > +
    > + TP_STRUCT__entry(
    > + __array(u32, raw, 16)
    > + __field(unsigned int, au)
    > + __field(unsigned int, erase_timeout)
    > + __field(unsigned int, erase_offset)
    > + __string(name, mmc_hostname(card->host))
    > + ),
    > +
    > + TP_fast_assign(
    > + memcpy(__entry->raw, card->raw_ssr, sizeof(card->raw_ssr));

    Again, memcpy() with the size of the source is dangerous.

    Hmm, I wonder if a BUILD_BUG_ON(sizeof(u32)*16 < sizeof(card->raw_ssr))
    would work here too. If it does, then that would be another approach.

    -- Steve

    > + __entry->au = card->ssr.au;
    > + __entry->erase_timeout = card->ssr.erase_timeout;
    > + __entry->erase_offset = card->ssr.erase_offset;
    > + __assign_str(name, mmc_hostname(card->host));
    > + ),
    > +
    > + TP_printk("%s: au: %d, erase time: %d, erase offset: %#x, raw: %s",
    > + __get_str(name),
    > + __entry->au,
    > + __entry->erase_timeout,
    > + __entry->erase_offset,
    > + __print_array(__entry->raw, 16, sizeof(u32))
    > + )
    > +);
    > +
    > TRACE_EVENT(mmc_request_start,
    >
    > TP_PROTO(struct mmc_host *host, struct mmc_request *mrq),

    \
     
     \ /
      Last update: 2019-04-16 01:34    [W:2.302 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site