summaryrefslogtreecommitdiffstats
path: root/drivers/nvme/host/trace.h
diff options
context:
space:
mode:
authorJohannes Thumshirn2018-04-26 22:25:15 +0200
committerKeith Busch2018-04-26 21:30:08 +0200
commitcde6bf4f440631b2735be83c39426f4f469b0b21 (patch)
treed13b0ea06b9671e8e8ad72a6a77e083d31768e03 /drivers/nvme/host/trace.h
parentnvme: fc: provide a descriptive error (diff)
downloadkernel-qcow2-linux-cde6bf4f440631b2735be83c39426f4f469b0b21.tar.gz
kernel-qcow2-linux-cde6bf4f440631b2735be83c39426f4f469b0b21.tar.xz
kernel-qcow2-linux-cde6bf4f440631b2735be83c39426f4f469b0b21.zip
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>
Diffstat (limited to 'drivers/nvme/host/trace.h')
-rw-r--r--drivers/nvme/host/trace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h
index ea91fccd1bc0..01390f0e1671 100644
--- 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)
);