nvme: add set feature tracing support
Subsystems (2)
cover nvme: add set feature tracing support
Add set feature tracing support to host and controller side. Also fix a style problem in nvmet_trace_admin_get_features.
Hou Pu (2):
nvme: add set feature tracing support
nvmet: add set feature tracing support
drivers/nvme/host/trace.c | 18 +++++++++++++++++- drivers/nvme/target/trace.c | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-)
Signature · 7 lines
2.28.0 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH 1/2 nvme: add set feature tracing support
A nvme connect command produces following trace.
Before:
/sys/kernel/debug/tracing# cat trace | grep feature
kworker/5:1H-98 [005] .... 3221.294844: nvme_setup_cmd: nvme0: qid=0, cmdid=25, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features cdw10=07 00 00 00 07 00 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00)
kworker/4:1H-124 [004] .... 3222.009186: nvme_setup_cmd: nvme0: qid=0, cmdid=17, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features cdw10=0b 00 00 00 00 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00)After:
/sys/kernel/debug/tracing# cat trace | grep feature
kworker/0:1H-253 [000] .... 196.060509: nvme_setup_cmd: nvme0: qid=0, cmdid=29, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features fid=0x7, sv=0x0, cdw11=0x70007)
kworker/0:1H-253 [000] .... 196.763947: nvme_setup_cmd: nvme0: qid=0, cmdid=29, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features fid=0xb, sv=0x0, cdw11=0x900)Using ',' to separate different field like others in nvmet_trace_admin_get_features.
--- drivers/nvme/host/trace.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/nvme/host/trace.c +17 -1
@@ -72,6 +72,20 @@ static const char *nvme_trace_admin_identify(struct trace_seq *p, u8 *cdw10)return ret; } +static const char *nvme_trace_admin_set_features (struct trace_seq *p, +u8 *cdw10) +{ +const char *ret =trace_seq_buffer_ptr (p); +u8 fid = cdw10[0 ]; +u8 sv = cdw10[3 ] &0x8 ; +u32 cdw11 =get_unaligned_le32 (cdw10 +4 ); + +trace_seq_printf (p,"fid=0x%x, sv=0x%x, cdw11=0x%x" , fid, sv, cdw11); +trace_seq_putc (p,0 ); + +return ret; +} +static const char *nvme_trace_admin_get_features (struct trace_seq *p,u8 *cdw10) {
@@ -80,7 +94,7 @@ static const char *nvme_trace_admin_get_features(struct trace_seq *p,u8 sel = cdw10[1 ] &0x7 ;u32 cdw11 =get_unaligned_le32 (cdw10 +4 ); -trace_seq_printf (p,"fid=0x%x sel=0x%x cdw11=0x%x" , fid, sel, cdw11); +trace_seq_printf (p,"fid=0x%x, sel=0x%x, cdw11=0x%x" , fid, sel, cdw11);trace_seq_putc (p,0 );return ret;
@@ -201,6 +215,8 @@ const char *nvme_trace_parse_admin_cmd(struct trace_seq *p,return nvme_trace_create_cq (p, cdw10);case nvme_admin_identify:return nvme_trace_admin_identify (p, cdw10); +case nvme_admin_set_features: +return nvme_trace_admin_set_features (p, cdw10);case nvme_admin_get_features:return nvme_trace_admin_get_features (p, cdw10);case nvme_admin_get_lba_status:
Signature · 7 lines
2.28.0 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 25 lines · Hou Pu
A nvme connect command produces following trace.
Before:
/sys/kernel/debug/tracing# cat trace | grep featurekworker/5:1H-98 [005] .... 3221.294844: nvme_setup_cmd: nvme0: qid=0, cmdid=25, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features cdw10=07 00 00 00 07 00 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00) kworker/4:1H-124 [004] .... 3222.009186: nvme_setup_cmd: nvme0: qid=0, cmdid=17, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features cdw10=0b 00 00 00 00 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00)After:
/sys/kernel/debug/tracing# cat trace | grep featurekworker/0:1H-253 [000] .... 196.060509: nvme_setup_cmd: nvme0: qid=0, cmdid=29, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features fid=0x7, sv=0x0, cdw11=0x70007) kworker/0:1H-253 [000] .... 196.763947: nvme_setup_cmd: nvme0: qid=0, cmdid=29, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features fid=0xb, sv=0x0, cdw11=0x900)Using ',' to separate different field like others in
nvmet_trace_admin_get_features.Signed-off-by Hou Pu <[email protected]>--- drivers/nvme/host/trace.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)drivers/nvme/host/trace.c +0
-0
drivers/nvme/host/trace.c static const char *nvme_trace_admin_identify(struct trace_seq *p, u8 *cdw10) · line 81
Quoted 10 lines
drivers/nvme/host/trace.c +7
-0@@ -72,6 +72,20 @@ static const char *nvme_trace_admin_identify(struct trace_seq *p, u8 *cdw10)return ret; } +static const char *nvme_trace_admin_set_features (struct trace_seq *p, +u8 *cdw10) +{ +const char *ret =trace_seq_buffer_ptr (p); +u8 fid = cdw10[0 ]; +u8 sv = cdw10[3 ] &0x8 ; +u32 cdw11 =get_unaligned_le32 (cdw10 +4 );
By the spec cdw10, 11, 12, 13, 14, 15 are used by set features command.
At least lets print cdw11-cdw15 as raw data and not only cdw11.
We don't want to loose information.
Quoted 11 lines
drivers/nvme/host/trace.c +7
-0+ +trace_seq_printf (p,"fid=0x%x, sv=0x%x, cdw11=0x%x" , fid, sv, cdw11); +trace_seq_putc (p,0 ); + +return ret; +} +static const char *nvme_trace_admin_get_features (struct trace_seq *p,u8 *cdw10) {
drivers/nvme/host/trace.c static const char *nvme_trace_admin_get_features(struct trace_seq *p, · line 97
Quoted 5 lines
drivers/nvme/host/trace.c +1
-1@@ -80,7 +94,7 @@ static const char *nvme_trace_admin_get_features(struct trace_seq *p,u8 sel = cdw10[1 ] &0x7 ;u32 cdw11 =get_unaligned_le32 (cdw10 +4 ); -trace_seq_printf (p,"fid=0x%x sel=0x%x cdw11=0x%x" , fid, sel, cdw11); +trace_seq_printf (p,"fid=0x%x, sel=0x%x, cdw11=0x%x" , fid, sel, cdw11);
This can be done in separate commit.
Also if you can fix the current status and print also cdw14 since it's used by get features by the spec (in separate commit).
drivers/nvme/host/trace.c const char *nvme_trace_parse_admin_cmd(struct trace_seq *p, · line 222
Quoted 12 lines
drivers/nvme/host/trace.c +2
-0trace_seq_putc (p,0 );return ret;@@ -201,6 +215,8 @@ const char *nvme_trace_parse_admin_cmd(struct trace_seq *p,return nvme_trace_create_cq (p, cdw10);case nvme_admin_identify:return nvme_trace_admin_identify (p, cdw10); +case nvme_admin_set_features: +return nvme_trace_admin_set_features (p, cdw10);case nvme_admin_get_features:return nvme_trace_admin_get_features (p, cdw10);case nvme_admin_get_lba_status:
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 41 lines · Max Gurtovoy
Quoted 25 lines · Hou Pu
A nvme connect command produces following trace.
Before:
/sys/kernel/debug/tracing# cat trace | grep featurekworker/5:1H-98 [005] .... 3221.294844: nvme_setup_cmd: nvme0: qid=0, cmdid=25, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features cdw10=07 00 00 00 07 00 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00) kworker/4:1H-124 [004] .... 3222.009186: nvme_setup_cmd: nvme0: qid=0, cmdid=17, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features cdw10=0b 00 00 00 00 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00)After:
/sys/kernel/debug/tracing# cat trace | grep featurekworker/0:1H-253 [000] .... 196.060509: nvme_setup_cmd: nvme0: qid=0, cmdid=29, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features fid=0x7, sv=0x0, cdw11=0x70007) kworker/0:1H-253 [000] .... 196.763947: nvme_setup_cmd: nvme0: qid=0, cmdid=29, nsid=0, flags=0x0, meta=0x0, cmd=(nvme_admin_set_features fid=0xb, sv=0x0, cdw11=0x900)Using ',' to separate different field like others in
nvmet_trace_admin_get_features.Signed-off-by Hou Pu <[email protected]>--- drivers/nvme/host/trace.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)drivers/nvme/host/trace.c +0
-0drivers/nvme/host/trace.c static const char *nvme_trace_admin_identify(struct trace_seq *p, u8 *cdw10) · line 81
Quoted 10 lines
drivers/nvme/host/trace.c +7
-0@@ -72,6 +72,20 @@ static const char *nvme_trace_admin_identify(struct trace_seq *p, u8 *cdw10)return ret; } +static const char *nvme_trace_admin_set_features (struct trace_seq *p, +u8 *cdw10) +{ +const char *ret =trace_seq_buffer_ptr (p); +u8 fid = cdw10[0 ]; +u8 sv = cdw10[3 ] &0x8 ; +u32 cdw11 =get_unaligned_le32 (cdw10 +4 );By the spec cdw10, 11, 12, 13, 14, 15 are used by set features command.
Quoted 3 lines
At least lets print cdw11-cdw15 as raw data and not only cdw11.
We don't want to loose information.
Yes, it's better to keep these although currently only cdw11 is used. Will change it in v2. Thanks.
Quoted 15 lines
Quoted 15 lines
drivers/nvme/host/trace.c +7
-0+ +trace_seq_printf (p,"fid=0x%x, sv=0x%x, cdw11=0x%x" , fid, sv, cdw11); +trace_seq_putc (p,0 ); + +return ret; +} +static const char *nvme_trace_admin_get_features (struct trace_seq *p,u8 *cdw10) {@@ -80,7 +94,7 @@ static const char *nvme_trace_admin_get_features(struct trace_seq *p,u8 sel = cdw10[1 ] &0x7 ;u32 cdw11 =get_unaligned_le32 (cdw10 +4 );
Quoted 7 lines
drivers/nvme/host/trace.c static const char *nvme_trace_admin_get_features(struct trace_seq *p, · line 97
Quoted 2 lines
drivers/nvme/host/trace.c +1
-1-trace_seq_printf (p,"fid=0x%x sel=0x%x cdw11=0x%x" , fid, sel, cdw11); +trace_seq_printf (p,"fid=0x%x, sel=0x%x, cdw11=0x%x" , fid, sel, cdw11);This can be done in separate commit.
Also if you can fix the current status and print also cdw14 since it's used by get features by the spec (in separate commit).
OK. Thanks for the comment.
Quoted 4 lines
Quoted 4 lines
drivers/nvme/host/trace.c +0
-0trace_seq_putc (p,0 );
Quoted 10 lines
drivers/nvme/host/trace.c const char *nvme_trace_parse_admin_cmd(struct trace_seq *p, · line 222
Quoted 10 lines
drivers/nvme/host/trace.c +2
-0return ret;@@ -201,6 +215,8 @@ const char *nvme_trace_parse_admin_cmd(struct trace_seq *p,return nvme_trace_create_cq (p, cdw10);case nvme_admin_identify:return nvme_trace_admin_identify (p, cdw10); +case nvme_admin_set_features: +return nvme_trace_admin_set_features (p, cdw10);case nvme_admin_get_features:return nvme_trace_admin_get_features (p, cdw10);case nvme_admin_get_lba_status:
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH 2/2 nvmet: add set feature tracing support
In reply to Hou PuA nvme connect command produces following trace from the target side.
Before:
kworker/0:1H-56 [000] .... 9012.155139: nvmet_req_init: nvmet1: qid=0, cmdid=16, nsid=0, flags=0x40, meta=0x0, cmd=(nvme_admin_set_features, cdw10=07 00 00 00 07 00 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00)
kworker/0:1H-56 [000] .... 9012.872272: nvmet_req_init: nvmet1: qid=0, cmdid=13, nsid=0, flags=0x40, meta=0x0, cmd=(nvme_admin_set_features, cdw10=0b 00 00 00 00 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00)cmdline:/sys/kernel/debug/tracing# cat trace | grep feature
kworker/0:1H-56 [000] .... 203.493914: nvmet_req_init: nvmet1: qid=0, cmdid=29, nsid=0, flags=0x40, meta=0x0, cmd=(nvme_admin_set_features, fid=0x7, sv=0x0, cdw11=0x70007)
kworker/0:1H-56 [000] .... 204.197079: nvmet_req_init: nvmet1: qid=0, cmdid=29, nsid=0, flags=0x40, meta=0x0, cmd=(nvme_admin_set_features, fid=0xb, sv=0x0, cdw11=0x900)Using ',' to separate different field like others in nvmet_trace_admin_get_features.
--- drivers/nvme/target/trace.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/nvme/target/trace.c +17 -1
@@ -27,7 +27,7 @@ static const char *nvmet_trace_admin_get_features(struct trace_seq *p,u8 sel = cdw10[1 ] &0x7 ;u32 cdw11 =get_unaligned_le32 (cdw10 +4 ); -trace_seq_printf (p,"fid=0x%x sel=0x%x cdw11=0x%x" , fid, sel, cdw11); +trace_seq_printf (p,"fid=0x%x, sel=0x%x, cdw11=0x%x" , fid, sel, cdw11);trace_seq_putc (p,0 );return ret;
@@ -49,6 +49,20 @@ static const char *nvmet_trace_get_lba_status(struct trace_seq *p,return ret; } +static const char *nvmet_trace_admin_set_features (struct trace_seq *p, +u8 *cdw10) +{ +const char *ret =trace_seq_buffer_ptr (p); +u8 fid = cdw10[0 ]; +u8 sv = cdw10[3 ] &0x8 ; +u32 cdw11 =get_unaligned_le32 (cdw10 +4 ); + +trace_seq_printf (p,"fid=0x%x, sv=0x%x, cdw11=0x%x" , fid, sv, cdw11); +trace_seq_putc (p,0 ); + +return ret; +} +static const char *nvmet_trace_read_write (struct trace_seq *p,u8 *cdw10) {const char *ret =trace_seq_buffer_ptr (p);
@@ -94,6 +108,8 @@ const char *nvmet_trace_parse_admin_cmd(struct trace_seq *p,switch (opcode) {case nvme_admin_identify:return nvmet_trace_admin_identify (p, cdw10); +case nvme_admin_set_features: +return nvmet_trace_admin_set_features (p, cdw10);case nvme_admin_get_features:return nvmet_trace_admin_get_features (p, cdw10);case nvme_admin_get_lba_status:
Signature · 7 lines
2.28.0 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Thanks,
applied to nvme-5.15.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme