nvme: parse format command's lbafu when tracing

[linux-block.git] / drivers / nvme / host / trace.c

diff --git a/drivers/nvme/host/trace.c b/drivers/nvme/host/trace.c
index 1c36fcedea2008777140891d7f6b941ed080d8f1..0288315f00502872eb8d3a3a6b47027f32059042 100644 (file)
--- a/drivers/nvme/host/trace.c
+++ b/drivers/nvme/host/trace.c
@@ -119,7 +119,10 @@ static const char *nvme_trace_get_lba_status(struct trace_seq *p,
 static const char *nvme_trace_admin_format_nvm(struct trace_seq *p, u8 *cdw10)
 {
        const char *ret = trace_seq_buffer_ptr(p);
-       u8 lbaf = cdw10[0] & 0xF;
+       /*
+        * lbafu(bit 13:12) is already in the upper 4 bits, lbafl: bit 03:00.
+        */
+       u8 lbaf = (cdw10[1] & 0x30) | (cdw10[0] & 0xF);
        u8 mset = (cdw10[0] >> 4) & 0x1;
        u8 pi = (cdw10[0] >> 5) & 0x7;
        u8 pil = cdw10[1] & 0x1;
@@ -164,12 +167,27 @@ static const char *nvme_trace_dsm(struct trace_seq *p, u8 *cdw10)
 
 static const char *nvme_trace_zone_mgmt_send(struct trace_seq *p, u8 *cdw10)
 {
+       static const char * const zsa_strs[] = {
+               [0x01] = "close zone",
+               [0x02] = "finish zone",
+               [0x03] = "open zone",
+               [0x04] = "reset zone",
+               [0x05] = "offline zone",
+               [0x10] = "set zone descriptor extension"
+       };
        const char *ret = trace_seq_buffer_ptr(p);
        u64 slba = get_unaligned_le64(cdw10);
+       const char *zsa_str;
        u8 zsa = cdw10[12];
        u8 all = cdw10[13];
 
-       trace_seq_printf(p, "slba=%llu, zsa=%u, all=%u", slba, zsa, all);
+       if (zsa < ARRAY_SIZE(zsa_strs) && zsa_strs[zsa])
+               zsa_str = zsa_strs[zsa];
+       else
+               zsa_str = "reserved";
+
+       trace_seq_printf(p, "slba=%llu, zsa=%u:%s, all=%u",
+               slba, zsa, zsa_str, all);
        trace_seq_putc(p, 0);
 
        return ret;
@@ -177,15 +195,86 @@ static const char *nvme_trace_zone_mgmt_send(struct trace_seq *p, u8 *cdw10)
 
 static const char *nvme_trace_zone_mgmt_recv(struct trace_seq *p, u8 *cdw10)
 {
+       static const char * const zrasf_strs[] = {
+               [0x00] = "list all zones",
+               [0x01] = "list the zones in the ZSE: Empty state",
+               [0x02] = "list the zones in the ZSIO: Implicitly Opened state",
+               [0x03] = "list the zones in the ZSEO: Explicitly Opened state",
+               [0x04] = "list the zones in the ZSC: Closed state",
+               [0x05] = "list the zones in the ZSF: Full state",
+               [0x06] = "list the zones in the ZSRO: Read Only state",
+               [0x07] = "list the zones in the ZSO: Offline state",
+               [0x09] = "list the zones that have the zone attribute"
+       };
        const char *ret = trace_seq_buffer_ptr(p);
        u64 slba = get_unaligned_le64(cdw10);
        u32 numd = get_unaligned_le32(cdw10 + 8);
        u8 zra = cdw10[12];
        u8 zrasf = cdw10[13];
+       const char *zrasf_str;
        u8 pr = cdw10[14];
 
-       trace_seq_printf(p, "slba=%llu, numd=%u, zra=%u, zrasf=%u, pr=%u",
-                        slba, numd, zra, zrasf, pr);
+       if (zrasf < ARRAY_SIZE(zrasf_strs) && zrasf_strs[zrasf])
+               zrasf_str = zrasf_strs[zrasf];
+       else
+               zrasf_str = "reserved";
+
+       trace_seq_printf(p, "slba=%llu, numd=%u, zra=%u, zrasf=%u:%s, pr=%u",
+               slba, numd, zra, zrasf, zrasf_str, pr);
+       trace_seq_putc(p, 0);
+
+       return ret;
+}
+
+static const char *nvme_trace_resv_reg(struct trace_seq *p, u8 *cdw10)
+{
+       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;
+
+       trace_seq_printf(p, "rrega=%u, iekey=%u, ptpl=%u",
+                        rrega, iekey, ptpl);
+       trace_seq_putc(p, 0);
+
+       return ret;
+}
+
+static const char *nvme_trace_resv_acq(struct trace_seq *p, u8 *cdw10)
+{
+       const char *ret = trace_seq_buffer_ptr(p);
+       u8 racqa = cdw10[0] & 0x7;
+       u8 iekey = (cdw10[0] >> 3) & 0x1;
+       u8 rtype = cdw10[1];
+
+       trace_seq_printf(p, "racqa=%u, iekey=%u, rtype=%u",
+                        racqa, iekey, rtype);
+       trace_seq_putc(p, 0);
+
+       return ret;
+}
+
+static const char *nvme_trace_resv_rel(struct trace_seq *p, u8 *cdw10)
+{
+       const char *ret = trace_seq_buffer_ptr(p);
+       u8 rrela = cdw10[0] & 0x7;
+       u8 iekey = (cdw10[0] >> 3) & 0x1;
+       u8 rtype = cdw10[1];
+
+       trace_seq_printf(p, "rrela=%u, iekey=%u, rtype=%u",
+                        rrela, iekey, rtype);
+       trace_seq_putc(p, 0);
+
+       return ret;
+}
+
+static const char *nvme_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;
@@ -243,6 +332,14 @@ const char *nvme_trace_parse_nvm_cmd(struct trace_seq *p,
                return nvme_trace_zone_mgmt_send(p, cdw10);
        case nvme_cmd_zone_mgmt_recv:
                return nvme_trace_zone_mgmt_recv(p, cdw10);
+       case nvme_cmd_resv_register:
+               return nvme_trace_resv_reg(p, cdw10);
+       case nvme_cmd_resv_acquire:
+               return nvme_trace_resv_acq(p, cdw10);
+       case nvme_cmd_resv_release:
+               return nvme_trace_resv_rel(p, cdw10);
+       case nvme_cmd_resv_report:
+               return nvme_trace_resv_report(p, cdw10);
        default:
                return nvme_trace_common(p, cdw10);
        }