diff options
| author |   Keith Busch <keith.busch@intel.com> | 2018-06-29 16:50:01 -0600 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2018-07-23 09:35:19 +0200 |
| commit | 5d87eb94d9ba13e5e2d5ceb56ac6fe0948259ffa (patch) | |
| tree | 06ce6e09f965fd881cce0614053d9015e2fd09e5 /drivers/nvme/host/core.c | |
| parent | nvme: cache struct nvme_ctrl reference to struct nvme_request (diff) | |
| download | linux-dev-5d87eb94d9ba13e5e2d5ceb56ac6fe0948259ffa.tar.xz linux-dev-5d87eb94d9ba13e5e2d5ceb56ac6fe0948259ffa.zip | |
nvme: use hw qid in trace events
We can not match a command to its completion based on the command
id alone. We need the submitting queue identifier to pair with the
completion, so this patch adds that to the trace buffer.
This patch is also collapsing the admin and IO submission traces into a
single one so we don't need to duplicate this and creating unnecessary
code branches: we know if the command is an admin vs IO based on the qid.
And since we're here, the patch fixes code formatting in the area.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
[hch: move the qid helper to nvme.h and made it an inline function]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host/core.c')
| -rw-r--r-- | drivers/nvme/host/core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index e541fe268bcf..e77e6418a21c 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -652,10 +652,7 @@ blk_status_t nvme_setup_cmd(struct nvme_ns *ns, struct request *req, } cmd->common.command_id = req->tag; - if (ns) - trace_nvme_setup_nvm_cmd(req->q->id, cmd); - else - trace_nvme_setup_admin_cmd(cmd); + trace_nvme_setup_cmd(req, cmd); return ret; } EXPORT_SYMBOL_GPL(nvme_setup_cmd); |