Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6268953e authored by Keith Busch's avatar Keith Busch Committed by Christoph Hellwig
Browse files

nvme: add disk name to trace events 



This will print the disk name to the nvme event trace for io requests so
a user can better distinguish traffic to different disks. This can be used
to  create disk based filters. For example, to see only nvme0n2 traffic:

  echo "disk == \"nvme0n2\"" > /sys/kernel/debug/tracing/events/nvme/filter

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
[hch: turned __assign_disk_name into an inline function]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent b80a55e2

drivers/nvme/host/trace.c

+11 −0
Original line number Diff line number Diff line
@@ -128,3 +128,14 @@ const char *nvme_trace_parse_nvm_cmd(struct trace_seq *p, 
		return nvme_trace_common(p, cdw10);

	}

}



const char *nvme_trace_disk_name(struct trace_seq *p, char *name)

{

	const char *ret = trace_seq_buffer_ptr(p);



	if (*name)

		trace_seq_printf(p, "disk=%s, ", name);

	trace_seq_putc(p, 0);



	return ret;

}

drivers/nvme/host/trace.h

+26 −7
Original line number Diff line number Diff line
@@ -78,10 +78,25 @@ const char *nvme_trace_parse_nvm_cmd(struct trace_seq *p, u8 opcode, 
	 nvme_trace_parse_nvm_cmd(p, opcode, cdw10) : 		\

	 nvme_trace_parse_admin_cmd(p, opcode, cdw10))



const char *nvme_trace_disk_name(struct trace_seq *p, char *name);

#define __print_disk_name(name)				\

	nvme_trace_disk_name(p, name)



#ifndef TRACE_HEADER_MULTI_READ

static inline void __assign_disk_name(char *name, struct gendisk *disk)

{

	if (disk)

		memcpy(name, disk->disk_name, DISK_NAME_LEN);

	else

		memset(name, 0, DISK_NAME_LEN);

}

#endif



TRACE_EVENT(nvme_setup_cmd,

	    TP_PROTO(struct request *req, struct nvme_command *cmd),

	    TP_ARGS(req, cmd),

	    TP_STRUCT__entry(

		__array(char, disk, DISK_NAME_LEN)

		__field(int, ctrl_id)

		__field(int, qid)

		__field(u8, opcode)
@@ -99,12 +114,14 @@ TRACE_EVENT(nvme_setup_cmd, 
		__entry->cid = cmd->common.command_id;

		__entry->nsid = le32_to_cpu(cmd->common.nsid);

		__entry->metadata = le64_to_cpu(cmd->common.metadata);

		__assign_disk_name(__entry->disk, req->rq_disk);

		memcpy(__entry->cdw10, cmd->common.cdw10,

		       sizeof(__entry->cdw10));

	    ),

	    TP_printk("nvme%d: qid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%llx, cmd=(%s %s)",

		      __entry->ctrl_id, __entry->qid, __entry->cid,

		      __entry->nsid, __entry->flags, __entry->metadata,

	    TP_printk("nvme%d: %sqid=%d, cmdid=%u, nsid=%u, flags=0x%x, meta=0x%llx, cmd=(%s %s)",

		      __entry->ctrl_id, __print_disk_name(__entry->disk),

		      __entry->qid, __entry->cid, __entry->nsid,

		      __entry->flags, __entry->metadata,

		      show_opcode_name(__entry->qid, __entry->opcode),

		      parse_nvme_cmd(__entry->qid, __entry->opcode, __entry->cdw10))

);
@@ -113,6 +130,7 @@ TRACE_EVENT(nvme_complete_rq, 
	    TP_PROTO(struct request *req),

	    TP_ARGS(req),

	    TP_STRUCT__entry(

		__array(char, disk, DISK_NAME_LEN)

		__field(int, ctrl_id)

		__field(int, qid)

		__field(int, cid)
@@ -129,11 +147,12 @@ TRACE_EVENT(nvme_complete_rq, 
		__entry->retries = nvme_req(req)->retries;

		__entry->flags = nvme_req(req)->flags;

		__entry->status = nvme_req(req)->status;

		__assign_disk_name(__entry->disk, req->rq_disk);

	    ),

	    TP_printk("nvme%d: qid=%d, cmdid=%u, res=%llu, retries=%u, flags=0x%x, status=%u",

		      __entry->ctrl_id,  __entry->qid, __entry->cid,

		      __entry->result, __entry->retries, __entry->flags,

		      __entry->status)

	    TP_printk("nvme%d: %sqid=%d, cmdid=%u, res=%llu, retries=%u, flags=0x%x, status=%u",

		      __entry->ctrl_id, __print_disk_name(__entry->disk),

		      __entry->qid, __entry->cid, __entry->result,

		      __entry->retries, __entry->flags, __entry->status)



);