diff options
| author | Jens Axboe | 2018-12-19 16:08:41 +0100 |
|---|---|---|
| committer | Jens Axboe | 2018-12-19 16:08:41 +0100 |
| commit | 499aeb45b2e225e423ef333ec68bd9b33a42c8be (patch) | |
| tree | 896081abe12f6fd5b12c79515dbc2b08457dc6f3 /drivers/nvme/host/trace.h | |
| parent | blk-mq: enable IO poll if .nr_queues of type poll > 0 (diff) | |
| parent | nvme-pci: trace SQ status on completions (diff) | |
| download | kernel-qcow2-linux-499aeb45b2e225e423ef333ec68bd9b33a42c8be.tar.gz kernel-qcow2-linux-499aeb45b2e225e423ef333ec68bd9b33a42c8be.tar.xz kernel-qcow2-linux-499aeb45b2e225e423ef333ec68bd9b33a42c8be.zip | |
Merge branch 'nvme-4.21' of git://git.infradead.org/nvme into for-4.21/block
Pull last batch of NVMe updates for 4.21 from Christoph:
"This contains a series from Sagi to restore poll support for nvme-rdma,
a new tracepoint from yupeng and various fixes."
* 'nvme-4.21' of git://git.infradead.org/nvme:
nvme-pci: trace SQ status on completions
nvme-rdma: implement polling queue map
nvme-fabrics: allow user to pass in nr_poll_queues
nvme-fabrics: allow nvmf_connect_io_queue to poll
nvme-core: optionally poll sync commands
block: make request_to_qc_t public
nvme-tcp: fix spelling mistake "attepmpt" -> "attempt"
nvme-tcp: fix endianess annotations
nvmet-tcp: fix endianess annotations
nvme-pci: refactor nvme_poll_irqdisable to make sparse happy
nvme-pci: only set nr_maps to 2 if poll queues are supported
nvmet: use a macro for default error location
nvmet: fix comparison of a u16 with -1
Diffstat (limited to 'drivers/nvme/host/trace.h')
| -rw-r--r-- | drivers/nvme/host/trace.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h index 1978deb6fcc7..3564120aa7b3 100644 --- a/drivers/nvme/host/trace.h +++ b/drivers/nvme/host/trace.h @@ -184,6 +184,29 @@ TRACE_EVENT(nvme_async_event, #undef aer_name +TRACE_EVENT(nvme_sq, + TP_PROTO(struct request *req, __le16 sq_head, int sq_tail), + TP_ARGS(req, sq_head, sq_tail), + TP_STRUCT__entry( + __field(int, ctrl_id) + __array(char, disk, DISK_NAME_LEN) + __field(int, qid) + __field(u16, sq_head) + __field(u16, sq_tail) + ), + TP_fast_assign( + __entry->ctrl_id = nvme_req(req)->ctrl->instance; + __assign_disk_name(__entry->disk, req->rq_disk); + __entry->qid = nvme_req_qid(req); + __entry->sq_head = le16_to_cpu(sq_head); + __entry->sq_tail = sq_tail; + ), + TP_printk("nvme%d: %sqid=%d, head=%u, tail=%u", + __entry->ctrl_id, __print_disk_name(__entry->disk), + __entry->qid, __entry->sq_head, __entry->sq_tail + ) +); + #endif /* _TRACE_NVME_H */ #undef TRACE_INCLUDE_PATH |