nvme: change order of qid and cmdid in completion trace

Keith reported that command submission and command completion
tracepoints have the order of the cmdid and qid fields swapped.

While it isn't easily possible to change the command submission
tracepoint, as there is a regression test parsing it in blktests we
can swap the command completion tracepoint to have the fields aligned.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reported-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Keith Busch <keith.busch@intel.com>

diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h
index ea91fccd1bc07b5e57e4aa26d48ede2970f9b695..01390f0e167105413401ffb484b0533a3cd23e5d 100644 (file)
--- a/drivers/nvme/host/trace.h
+++ b/drivers/nvme/host/trace.h
@@ -148,8 +148,8 @@ TRACE_EVENT(nvme_complete_rq,
                    __entry->flags = nvme_req(req)->flags;
                    __entry->status = nvme_req(req)->status;
            ),
-           TP_printk("cmdid=%u, qid=%d, res=%llu, retries=%u, flags=0x%x, status=%u",
-                     __entry->cid, __entry->qid, __entry->result,
+           TP_printk("qid=%d, cmdid=%u, res=%llu, retries=%u, flags=0x%x, status=%u",
+                     __entry->qid, __entry->cid, __entry->result,
                      __entry->retries, __entry->flags, __entry->status)
 
 );