[v1] nvme: Use command_id instead of req->tag in trace_nvme_complete_rq()

[PATCH] nvme: Use command_id instead of req->tag in trace_nvme_complete_rq()

Posted by Bean Huo 3 years, 9 months ago

From: Bean Huo <beanhuo@micron.com>

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.

Signed-off-by: Bean Huo <beanhuo@micron.com>
---
 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 b5f85259461a..fe8c90080731 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.34.1

Re: [PATCH] nvme: Use command_id instead of req->tag in trace_nvme_complete_rq()

Posted by Jens Axboe 3 years, 9 months ago

On 7/15/22 1:48 PM, Bean Huo wrote:
> From: Bean Huo <beanhuo@micron.com>
> 
> 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.

Needs a fixes tag.

-- 
Jens Axboe