Add the tracing of reservation commands
Subsystems (2)
cover Add the tracing of reservation commands
Host:
- Parse the action and rtype to string.
Target:
- Add the tracing of reservation commands, and also parse actions rtype to string.
Guixin Liu (2):
nvme: parse reservation commands's action and rtype to string
nvmet: add tracing of reservation commands
drivers/nvme/host/trace.c | 58 +++++++++++++++++-- drivers/nvme/target/trace.c | 108 ++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 6 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/2 nvme: parse reservation commands's action and rtype to string
Parse reservation commands's action(including rrega, racqa and rrela) and rtype to string to make the trace log more human-readable.
--- drivers/nvme/host/trace.c | 58 +++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 6 deletions(-)
drivers/nvme/host/trace.c +52 -6
@@ -228,27 +228,61 @@ static const char *nvme_trace_zone_mgmt_recv(struct trace_seq *p, u8 *cdw10)static const char *nvme_trace_resv_reg (struct trace_seq *p,u8 *cdw10) { +static const char *const rrega_strs[] = { + [0x00 ] ="register" , + [0x01 ] ="unregister" , + [0x02 ] ="replace" , + };const char *ret =trace_seq_buffer_ptr (p);u8 rrega = cdw10[0 ] &0x7 ;u8 iekey = (cdw10[0 ] >>3 ) &0x1 ;u8 ptpl = (cdw10[3 ] >>6 ) &0x3 ; +const char *rrega_str; + +if (rrega <ARRAY_SIZE (rrega_strs) && rrega_strs[rrega]) + rrega_str = rrega_strs[rrega]; +else + rrega_str ="reserved" ; -trace_seq_printf (p,"rrega=%u, iekey=%u, ptpl=%u" , - rrega, iekey, ptpl); +trace_seq_printf (p,"rrega=%u:%s, iekey=%u, ptpl=%u" , + rrega, rrega_str, iekey, ptpl);trace_seq_putc (p,0 );return ret; } +static const char *const rtype_strs[] = { + [0x00 ] ="reserved" , + [0x01 ] ="write exclusive" , + [0x02 ] ="exclusive access" , + [0x03 ] ="write exclusive registrants only" , + [0x04 ] ="exclusive access registrants only" , + [0x05 ] ="write exclusive all registrants" , + [0x06 ] ="exclusive access all registrants" , +}; +static const char *nvme_trace_resv_acq (struct trace_seq *p,u8 *cdw10) { +static const char *const racqa_strs[] = { + [0x00 ] ="acquire" , + [0x01 ] ="preempt" , + [0x02 ] ="preempt and abort" , + };const char *ret =trace_seq_buffer_ptr (p);u8 racqa = cdw10[0 ] &0x7 ;u8 iekey = (cdw10[0 ] >>3 ) &0x1 ;u8 rtype = cdw10[1 ]; +const char *racqa_str ="reserved" ; +const char *rtype_str ="reserved" ; -trace_seq_printf (p,"racqa=%u, iekey=%u, rtype=%u" , - racqa, iekey, rtype); +if (racqa <ARRAY_SIZE (racqa_strs) && racqa_strs[racqa]) + racqa_str = racqa_strs[racqa]; + +if (rtype <ARRAY_SIZE (rtype_strs) && rtype_strs[rtype]) + rtype_str = rtype_strs[rtype]; + +trace_seq_printf (p,"racqa=%u:%s, iekey=%u, rtype=%u:%s" , + racqa, racqa_str, iekey, rtype, rtype_str);trace_seq_putc (p,0 );return ret;
@@ -256,13 +290,25 @@ static const char *nvme_trace_resv_acq(struct trace_seq *p, u8 *cdw10)static const char *nvme_trace_resv_rel (struct trace_seq *p,u8 *cdw10) { +static const char *const rrela_strs[] = { + [0x00 ] ="release" , + [0x01 ] ="clear" , + };const char *ret =trace_seq_buffer_ptr (p);u8 rrela = cdw10[0 ] &0x7 ;u8 iekey = (cdw10[0 ] >>3 ) &0x1 ;u8 rtype = cdw10[1 ]; +const char *rrela_str ="reserved" ; +const char *rtype_str ="reserved" ; + +if (rrela <ARRAY_SIZE (rrela_strs) && rrela_strs[rrela]) + rrela_str = rrela_strs[rrela]; + +if (rtype <ARRAY_SIZE (rtype_strs) && rtype_strs[rtype]) + rtype_str = rtype_strs[rtype]; -trace_seq_printf (p,"rrela=%u, iekey=%u, rtype=%u" , - rrela, iekey, rtype); +trace_seq_printf (p,"rrela=%u:%s, iekey=%u, rtype=%u:%s" , + rrela, rrela_str, iekey, rtype, rtype_str);trace_seq_putc (p,0 );return ret;
Signature · 1 line
2.43.0
Re: [PATCH 1/2] nvme: parse reservation commands's action and rtype to string
Quoted 4 lines · Guixin Liu
Parse reservation commands's
action(including rrega, racqa and rrela)and rtype to string to make the trace log more human-readable.Signed-off-by Guixin Liu<[email protected]>
Looks good.
-ck
Re: [PATCH 1/2] nvme: parse reservation commands's action and rtype to string
In reply to Guixin LiuLooks good:
Re: [PATCH 1/2] nvme: parse reservation commands's action and rtype to string
In reply to Guixin LiuPATCH 2/2 nvmet: add tracing of reservation commands
In reply to Guixin LiuAdd tracing of reservation commands, including register, acquire, release and report, and also parse the action and rtype to string to make the trace log more human-readable.
--- drivers/nvme/target/trace.c | 108 ++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+)
drivers/nvme/target/trace.c +108 -0
@@ -180,6 +180,106 @@ static const char *nvmet_trace_zone_mgmt_recv(struct trace_seq *p, u8 *cdw10)return ret; } +static const char *nvmet_trace_resv_reg (struct trace_seq *p,u8 *cdw10) +{ +static const char *const rrega_strs[] = { + [0x00 ] ="register" , + [0x01 ] ="unregister" , + [0x02 ] ="replace" , + }; +const char *ret =trace_seq_buffer_ptr (p); +u8 rrega = cdw10[0 ] &0x7 ; +u8 iekey = (cdw10[0 ] >>3 ) &0x1 ; +u8 ptpl = (cdw10[3 ] >>6 ) &0x3 ; +const char *rrega_str; + +if (rrega <ARRAY_SIZE (rrega_strs) && rrega_strs[rrega]) + rrega_str = rrega_strs[rrega]; +else + rrega_str ="reserved" ; + +trace_seq_printf (p,"rrega=%u:%s, iekey=%u, ptpl=%u" , + rrega, rrega_str, iekey, ptpl); +trace_seq_putc (p,0 ); + +return ret; +} + +static const char *const rtype_strs[] = { + [0x00 ] ="reserved" , + [0x01 ] ="write exclusive" , + [0x02 ] ="exclusive access" , + [0x03 ] ="write exclusive registrants only" , + [0x04 ] ="exclusive access registrants only" , + [0x05 ] ="write exclusive all registrants" , + [0x06 ] ="exclusive access all registrants" , +}; + +static const char *nvmet_trace_resv_acq (struct trace_seq *p,u8 *cdw10) +{ +static const char *const racqa_strs[] = { + [0x00 ] ="acquire" , + [0x01 ] ="preempt" , + [0x02 ] ="preempt and abort" , + }; +const char *ret =trace_seq_buffer_ptr (p); +u8 racqa = cdw10[0 ] &0x7 ; +u8 iekey = (cdw10[0 ] >>3 ) &0x1 ; +u8 rtype = cdw10[1 ]; +const char *racqa_str ="reserved" ; +const char *rtype_str ="reserved" ; + +if (racqa <ARRAY_SIZE (racqa_strs) && racqa_strs[racqa]) + racqa_str = racqa_strs[racqa]; + +if (rtype <ARRAY_SIZE (rtype_strs) && rtype_strs[rtype]) + rtype_str = rtype_strs[rtype]; + +trace_seq_printf (p,"racqa=%u:%s, iekey=%u, rtype=%u:%s" , + racqa, racqa_str, iekey, rtype, rtype_str); +trace_seq_putc (p,0 ); + +return ret; +} + +static const char *nvmet_trace_resv_rel (struct trace_seq *p,u8 *cdw10) +{ +static const char *const rrela_strs[] = { + [0x00 ] ="release" , + [0x01 ] ="clear" , + }; +const char *ret =trace_seq_buffer_ptr (p); +u8 rrela = cdw10[0 ] &0x7 ; +u8 iekey = (cdw10[0 ] >>3 ) &0x1 ; +u8 rtype = cdw10[1 ]; +const char *rrela_str ="reserved" ; +const char *rtype_str ="reserved" ; + +if (rrela <ARRAY_SIZE (rrela_strs) && rrela_strs[rrela]) + rrela_str = rrela_strs[rrela]; + +if (rtype <ARRAY_SIZE (rtype_strs) && rtype_strs[rtype]) + rtype_str = rtype_strs[rtype]; + +trace_seq_printf (p,"rrela=%u:%s, iekey=%u, rtype=%u:%s" , + rrela, rrela_str, iekey, rtype, rtype_str); +trace_seq_putc (p,0 ); + +return ret; +} + +static const char *nvmet_trace_resv_report (struct trace_seq *p,u8 *cdw10) +{ +const char *ret =trace_seq_buffer_ptr (p); +u32 numd =get_unaligned_le32 (cdw10); +u8 eds = cdw10[4 ] &0x1 ; + +trace_seq_printf (p,"numd=%u, eds=%u" , numd, eds); +trace_seq_putc (p,0 ); + +return ret; +} +const char *nvmet_trace_parse_nvm_cmd (struct trace_seq *p,u8 opcode,u8 *cdw10) {
@@ -195,6 +295,14 @@ const char *nvmet_trace_parse_nvm_cmd(struct trace_seq *p,return nvmet_trace_zone_mgmt_send (p, cdw10);case nvme_cmd_zone_mgmt_recv:return nvmet_trace_zone_mgmt_recv (p, cdw10); +case nvme_cmd_resv_register: +return nvmet_trace_resv_reg (p, cdw10); +case nvme_cmd_resv_acquire: +return nvmet_trace_resv_acq (p, cdw10); +case nvme_cmd_resv_release: +return nvmet_trace_resv_rel (p, cdw10); +case nvme_cmd_resv_report: +return nvmet_trace_resv_report (p, cdw10);default :return nvmet_trace_common (p, cdw10); }
Signature · 1 line
2.43.0
Re: [PATCH 2/2] nvmet: add tracing of reservation commands
Quoted 6 lines · Guixin Liu
Add tracing of reservation commands, including register, acquire, release and report, and also parse the action and rtype to string to make the trace log more human-readable.
Signed-off-by Guixin Liu<[email protected]>---
Looks good.
-ck
Re: [PATCH 2/2] nvmet: add tracing of reservation commands
In reply to Guixin LiuLooks good:
Re: [PATCH 2/2] nvmet: add tracing of reservation commands
In reply to Guixin LiuHi Keith,
I found that this patchset is not aplied yet, could you please take a look?
Best Regards,
Guixin Liu
Quoted 14 lines · Guixin Liu
Host:
- Parse the action and rtype to string.
Target:
- Add the tracing of reservation commands, and also parse actions rtype to string.Guixin Liu (2):
nvme: parse reservation commands's action and rtype to string
nvmet: add tracing of reservation commandsdrivers/nvme/host/trace.c | 58 +++++++++++++++++-- drivers/nvme/target/trace.c | 108 ++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 6 deletions(-)
Quoted 9 lines · Guixin Liu
Host:
- Parse the action and rtype to string.
Target:
- Add the tracing of reservation commands, and also parse actions rtype to string.Guixin Liu (2):
nvme: parse reservation commands's action and rtype to string
nvmet: add tracing of reservation commands
Thanks, applied to nvme-6.13.