Author: imp
Date: Thu Jul 18 21:58:51 2019
New Revision: 350118
URL: https://svnweb.freebsd.org/changeset/base/350118

Log:
  Provide new tunable hw.nvme.verbose_cmd_dump
  
  The nvme drive dumps only the most relevant details about a command when it
  fails. However, there are times this is not sufficient (such as debugging 
weird
  issues for a new drive with a vendor). Setting hw.nvme.verbose_cmd_dump=1
  in loader.conf will enable more complete debugging information about each
  command that fails.
  
  Reviewed by: rpokala
  Sponsored by: Netflix
  Differential Version: https://reviews.freebsd.org/D20988

Modified:
  head/share/man/man4/nvme.4
  head/sys/dev/nvme/nvme.c
  head/sys/dev/nvme/nvme_private.h
  head/sys/dev/nvme/nvme_qpair.c

Modified: head/share/man/man4/nvme.4
==============================================================================
--- head/share/man/man4/nvme.4  Thu Jul 18 21:37:50 2019        (r350117)
+++ head/share/man/man4/nvme.4  Thu Jul 18 21:58:51 2019        (r350118)
@@ -151,6 +151,17 @@ This value may also be set in the kernel config file w
 .Bd -literal -offset indent
 .Cd options NVME_USE_NVD=0
 .Ed
+.Pp
+When there is an error,
+.Nm
+prints only the most relevant information about the command by default.
+To enable dumping of all information about the command, set the following 
tunable
+value in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+hw.nvme.verbose_cmd_dump=1
+.Ed
+.Pp
 .Sh SYSCTL VARIABLES
 The following controller-level sysctls are currently implemented:
 .Bl -tag -width indent

Modified: head/sys/dev/nvme/nvme.c
==============================================================================
--- head/sys/dev/nvme/nvme.c    Thu Jul 18 21:37:50 2019        (r350117)
+++ head/sys/dev/nvme/nvme.c    Thu Jul 18 21:58:51 2019        (r350118)
@@ -54,6 +54,9 @@ struct nvme_consumer nvme_consumer[NVME_MAX_CONSUMERS]
 
 uma_zone_t     nvme_request_zone;
 int32_t                nvme_retry_count;
+int            nvme_verbose_cmd_dump;
+
+TUNABLE_INT("hw.nvme.verbose_cmd_dump", &nvme_verbose_cmd_dump);
 
 MALLOC_DEFINE(M_NVME, "nvme", "nvme(4) memory allocations");
 

Modified: head/sys/dev/nvme/nvme_private.h
==============================================================================
--- head/sys/dev/nvme/nvme_private.h    Thu Jul 18 21:37:50 2019        
(r350117)
+++ head/sys/dev/nvme/nvme_private.h    Thu Jul 18 21:58:51 2019        
(r350118)
@@ -114,6 +114,7 @@ MALLOC_DECLARE(M_NVME);
 
 extern uma_zone_t      nvme_request_zone;
 extern int32_t         nvme_retry_count;
+extern int32_t         nvme_verbose_cmd_dump;
 
 struct nvme_completion_poll_status {
 

Modified: head/sys/dev/nvme/nvme_qpair.c
==============================================================================
--- head/sys/dev/nvme/nvme_qpair.c      Thu Jul 18 21:37:50 2019        
(r350117)
+++ head/sys/dev/nvme/nvme_qpair.c      Thu Jul 18 21:58:51 2019        
(r350118)
@@ -178,6 +178,16 @@ nvme_qpair_print_command(struct nvme_qpair *qpair, str
                nvme_admin_qpair_print_command(qpair, cmd);
        else
                nvme_io_qpair_print_command(qpair, cmd);
+       if (nvme_verbose_cmd_dump) {
+               nvme_printf(qpair->ctrlr,
+                   "nsid:%#x rsvd2:%#x rsvd3:%#x mptr:%#jx prp1:%#jx 
prp2:%#jx\n",
+                   cmd->nsid, cmd->rsvd2, cmd->rsvd3, (uintmax_t)cmd->mptr,
+                   (uintmax_t)cmd->prp1, (uintmax_t)cmd->prp2);
+               nvme_printf(qpair->ctrlr,
+                   "cdw10: %#x cdw11:%#x cdw12:%#x cdw13:%#x cdw14:%#x 
cdw15:%#x\n",
+                   cmd->cdw10, cmd->cdw11, cmd->cdw12, cmd->cdw13, cmd->cdw14,
+                   cmd->cdw15);
+       }
 }
 
 struct nvme_status_string {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to