nvme: add tracepoint for nvme_complete_rq

Add a tracepoint in nvme_complete_rq() for completions of NVMe commands. An
expmale output of the trace-point is as follows:

<idle>-0     [001] d.h.     3.505266: nvme_complete_rq: cmdid=989, qid=1, res=0, retries=0, flags=0x0, status=0

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f1430ca79a5b05599d7a8950424a73dca7407bf7..b3af8e914570ab44fad02bcd8ba9bcbb065670d4 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -220,6 +220,8 @@ void nvme_complete_rq(struct request *req)
 {
        blk_status_t status = nvme_error_status(req);
 
+       trace_nvme_complete_rq(req);
+
        if (unlikely(status != BLK_STS_OK && nvme_req_needs_retry(req))) {
                if (nvme_req_needs_failover(req, status)) {
                        nvme_failover_req(req);

diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h
index feadf0b57d17c195676ceffed9de69575a9639c1..ea91fccd1bc07b5e57e4aa26d48ede2970f9b695 100644 (file)
--- a/drivers/nvme/host/trace.h
+++ b/drivers/nvme/host/trace.h
@@ -129,6 +129,31 @@ TRACE_EVENT(nvme_setup_nvm_cmd,
                      __parse_nvme_cmd(__entry->opcode, __entry->cdw10))
 );
 
+TRACE_EVENT(nvme_complete_rq,
+           TP_PROTO(struct request *req),
+           TP_ARGS(req),
+           TP_STRUCT__entry(
+                   __field(int, qid)
+                   __field(int, cid)
+                   __field(u64, result)
+                   __field(u8, retries)
+                   __field(u8, flags)
+                   __field(u16, status)
+           ),
+           TP_fast_assign(
+                   __entry->qid = req->q->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;
+                   __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,
+                     __entry->retries, __entry->flags, __entry->status)
+
+);
+
 #endif /* _TRACE_NVME_H */
 
 #undef TRACE_INCLUDE_PATH