lkml.org 
[lkml]   [2021]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 27/35] nvme: fix nvme_setup_command metadata trace event
    Date
    From: Keith Busch <kbusch@kernel.org>

    [ Upstream commit 234211b8dd161fa25f192c78d5a8d2dd6bf920a0 ]

    The metadata address is set after the trace event, so the trace is not
    capturing anything useful. Rather than logging the memory address, it's
    useful to know if the command carries a metadata payload, so change the
    trace event to log that true/false state instead.

    Signed-off-by: Keith Busch <kbusch@kernel.org>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/trace.h | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h
    index daaf700eae79..35bac7a25422 100644
    --- a/drivers/nvme/host/trace.h
    +++ b/drivers/nvme/host/trace.h
    @@ -56,7 +56,7 @@ TRACE_EVENT(nvme_setup_cmd,
    __field(u8, fctype)
    __field(u16, cid)
    __field(u32, nsid)
    - __field(u64, metadata)
    + __field(bool, metadata)
    __array(u8, cdw10, 24)
    ),
    TP_fast_assign(
    @@ -66,13 +66,13 @@ TRACE_EVENT(nvme_setup_cmd,
    __entry->flags = cmd->common.flags;
    __entry->cid = cmd->common.command_id;
    __entry->nsid = le32_to_cpu(cmd->common.nsid);
    - __entry->metadata = le64_to_cpu(cmd->common.metadata);
    + __entry->metadata = !!blk_integrity_rq(req);
    __entry->fctype = cmd->fabrics.fctype;
    __assign_disk_name(__entry->disk, req->rq_disk);
    memcpy(__entry->cdw10, &cmd->common.cdw10,
    sizeof(__entry->cdw10));
    ),
    - TP_printk("nvme%d: %sqid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%llx, cmd=(%s %s)",
    + TP_printk("nvme%d: %sqid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%x, cmd=(%s %s)",
    __entry->ctrl_id, __print_disk_name(__entry->disk),
    __entry->qid, __entry->cid, __entry->nsid,
    __entry->flags, __entry->metadata,
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-08-06 10:26    [W:3.138 / U:1.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site