Revert "nvme: use command_id instead of req->tag in trace_nvme_complete_rq()"

This reverts commit 706960d328f5bdb1a9cde0b17a98ab84a59eed8e which is
commit 679c54f2de672b7d79d02f8c4ad483ff6dd8ce2e upstream.

It is reported to cause issues.

Reported-by: John Sperbeck <jsperbeck@google.com>
Link: https://lore.kernel.org/r/20240109181722.228783-1-jsperbeck@google.com
Cc: Bean Huo <beanhuo@micron.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h
index b258f7b8788e1b222c2ccde020138b6c1179cd0b..700fdce2ecf155e3a710915738489ff26a1ce26d 100644 (file)
--- 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 = nvme_req(req)->cmd->common.command_id;
+               __entry->cid = req->tag;
                __entry->result = le64_to_cpu(nvme_req(req)->result.u64);
                __entry->retries = nvme_req(req)->retries;
                __entry->flags = nvme_req(req)->flags;