Skip to content

Commit 4a407d5

Browse files
morbidrsaChristoph Hellwig
authored andcommitted
nvme: add tracing of zns commands
When support for the NVMe ZNS commands was merged, tracing of these has been omitted. Add nvme_cmd_zone_mgmt_send, nvme_cmd_zone_mgmt_recv as well as nvme_cmd_zone_append to the nvme driver's tracing facility. Signed-off-by: Johannes Thumshirn <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 3a98c51 commit 4a407d5

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

drivers/nvme/host/trace.c

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,35 @@ static const char *nvme_trace_dsm(struct trace_seq *p, u8 *cdw10)
148148
return ret;
149149
}
150150

151+
static const char *nvme_trace_zone_mgmt_send(struct trace_seq *p, u8 *cdw10)
152+
{
153+
const char *ret = trace_seq_buffer_ptr(p);
154+
u64 slba = get_unaligned_le64(cdw10);
155+
u8 zsa = cdw10[12];
156+
u8 all = cdw10[13];
157+
158+
trace_seq_printf(p, "slba=%llu, zsa=%u, all=%u", slba, zsa, all);
159+
trace_seq_putc(p, 0);
160+
161+
return ret;
162+
}
163+
164+
static const char *nvme_trace_zone_mgmt_recv(struct trace_seq *p, u8 *cdw10)
165+
{
166+
const char *ret = trace_seq_buffer_ptr(p);
167+
u64 slba = get_unaligned_le64(cdw10);
168+
u32 numd = get_unaligned_le32(cdw10 + 8);
169+
u8 zra = cdw10[12];
170+
u8 zrasf = cdw10[13];
171+
u8 pr = cdw10[14];
172+
173+
trace_seq_printf(p, "slba=%llu, numd=%u, zra=%u, zrasf=%u, pr=%u",
174+
slba, numd, zra, zrasf, pr);
175+
trace_seq_putc(p, 0);
176+
177+
return ret;
178+
}
179+
151180
static const char *nvme_trace_common(struct trace_seq *p, u8 *cdw10)
152181
{
153182
const char *ret = trace_seq_buffer_ptr(p);
@@ -190,9 +219,14 @@ const char *nvme_trace_parse_nvm_cmd(struct trace_seq *p,
190219
case nvme_cmd_read:
191220
case nvme_cmd_write:
192221
case nvme_cmd_write_zeroes:
222+
case nvme_cmd_zone_append:
193223
return nvme_trace_read_write(p, cdw10);
194224
case nvme_cmd_dsm:
195225
return nvme_trace_dsm(p, cdw10);
226+
case nvme_cmd_zone_mgmt_send:
227+
return nvme_trace_zone_mgmt_send(p, cdw10);
228+
case nvme_cmd_zone_mgmt_recv:
229+
return nvme_trace_zone_mgmt_recv(p, cdw10);
196230
default:
197231
return nvme_trace_common(p, cdw10);
198232
}

include/linux/nvme.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,11 @@ enum nvme_opcode {
697697
nvme_opcode_name(nvme_cmd_resv_register), \
698698
nvme_opcode_name(nvme_cmd_resv_report), \
699699
nvme_opcode_name(nvme_cmd_resv_acquire), \
700-
nvme_opcode_name(nvme_cmd_resv_release))
700+
nvme_opcode_name(nvme_cmd_resv_release), \
701+
nvme_opcode_name(nvme_cmd_zone_mgmt_send), \
702+
nvme_opcode_name(nvme_cmd_zone_mgmt_recv), \
703+
nvme_opcode_name(nvme_cmd_zone_append))
704+
701705

702706

703707
/*

0 commit comments

Comments
 (0)