nvme: trace bio completion (35fe0d12) · Commits · 戴 / test

drivers/nvme/host/core.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -22,12 +22,12 @@
		#include <linux/pm_qos.h>
		#include <asm/unaligned.h>

		#define CREATE_TRACE_POINTS
		#include "trace.h"

		#include "nvme.h"
		#include "fabrics.h"

		#define CREATE_TRACE_POINTS
		#include "trace.h"

		#define NVME_MINORS (1U << MINORBITS)

		unsigned int admin_timeout = 60;
		@@ -279,6 +279,8 @@ void nvme_complete_rq(struct request *req)
		return;
		}
		}

		nvme_trace_bio_complete(req, status);
		blk_mq_end_request(req, status);
		}
		EXPORT_SYMBOL_GPL(nvme_complete_rq);

+16 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@
		#include <linux/fault-inject.h>
		#include <linux/rcupdate.h>

		#include <trace/events/block.h>

		extern unsigned int nvme_io_timeout;
		#define NVME_IO_TIMEOUT (nvme_io_timeout * HZ)

		@@ -511,6 +513,16 @@ static inline void nvme_mpath_check_last_path(struct nvme_ns *ns)
		kblockd_schedule_work(&head->requeue_work);
		}

		static inline void nvme_trace_bio_complete(struct request *req,
		blk_status_t status)
		{
		struct nvme_ns *ns = req->q->queuedata;

		if (req->cmd_flags & REQ_NVME_MPATH)
		trace_block_bio_complete(ns->head->disk->queue,
		req->bio, status);
		}

		extern struct device_attribute dev_attr_ana_grpid;
		extern struct device_attribute dev_attr_ana_state;
		extern struct device_attribute subsys_attr_iopolicy;
		@@ -554,6 +566,10 @@ static inline void nvme_mpath_clear_current_path(struct nvme_ns *ns)
		static inline void nvme_mpath_check_last_path(struct nvme_ns *ns)
		{
		}
		static inline void nvme_trace_bio_complete(struct request *req,
		blk_status_t status)
		{
		}
		static inline int nvme_mpath_init(struct nvme_ctrl *ctrl,
		struct nvme_id_ctrl *id)
		{