lkml.org 
[lkml]   [2022]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0880/1157] nvme: use command_id instead of req->tag in trace_nvme_complete_rq()
    Date
    From: Bean Huo <beanhuo@micron.com>

    [ Upstream commit 679c54f2de672b7d79d02f8c4ad483ff6dd8ce2e ]

    Use command_id instead of req->tag in trace_nvme_complete_rq(),
    because of commit e7006de6c238 ("nvme: code command_id with a genctr
    for use authentication after release"), cmd->common.command_id is set to
    ((genctl & 0xf)< 12 | req->tag), no longer req->tag, which makes cid in
    trace_nvme_complete_rq and trace_nvme_setup_cmd are not the same.

    Fixes: e7006de6c238 ("nvme: code command_id with a genctr for use authentication after release")
    Signed-off-by: Bean Huo <beanhuo@micron.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/trace.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h
    index 37c7f4c89f92..6f0eaf6a1528 100644
    --- a/drivers/nvme/host/trace.h
    +++ b/drivers/nvme/host/trace.h
    @@ -98,7 +98,7 @@ TRACE_EVENT(nvme_complete_rq,
    TP_fast_assign(
    __entry->ctrl_id = nvme_req(req)->ctrl->instance;
    __entry->qid = nvme_req_qid(req);
    - __entry->cid = req->tag;
    + __entry->cid = nvme_req(req)->cmd->common.command_id;
    __entry->result = le64_to_cpu(nvme_req(req)->result.u64);
    __entry->retries = nvme_req(req)->retries;
    __entry->flags = nvme_req(req)->flags;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 06:47    [W:2.612 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site