Commit 643c476d authored Oct 15, 2020 by Keith Busch Committed by Christoph Hellwig Oct 22, 2020

nvme: use queuedata for nvme_req_qid



The request's rq_disk isn't set for passthrough IO commands, so tracing
uses qid 0 for these which incorrectly decodes as an admin command. Use
the request_queue's queuedata instead since that value is always set for
the IO queues, and never set for the admin queue.

Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent a87da50f

drivers/nvme/host/nvme.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ static inline struct nvme_request nvme_req(struct request req)

		static inline u16 nvme_req_qid(struct request *req)
		{
		if (!req->rq_disk)
		if (!req->q->queuedata)
		return 0;
		return blk_mq_unique_tag_to_hwq(blk_mq_unique_tag(req)) + 1;
		}

Admin message