[SCSI] lpfc 8.3.30: Enhancements for T10 DIF debugfs error injection

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

3 files changed, 203 insertions, 148 deletions

diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 22e17be04d8a..c4269ee57e9c 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -1010,25 +1010,28 @@ lpfc_debugfs_dif_err_read(struct file *file, char __user *buf,
 {
         struct dentry *dent = file->f_dentry;
         struct lpfc_hba *phba = file->private_data;
-        char cbuf[16];
+        char cbuf[32];
         int cnt = 0;
 
         if (dent == phba->debug_writeGuard)
-                cnt = snprintf(cbuf, 16, "%u\n", phba->lpfc_injerr_wgrd_cnt);
+                cnt = snprintf(cbuf, 32, "%u\n", phba->lpfc_injerr_wgrd_cnt);
         else if (dent == phba->debug_writeApp)
-                cnt = snprintf(cbuf, 16, "%u\n", phba->lpfc_injerr_wapp_cnt);
+                cnt = snprintf(cbuf, 32, "%u\n", phba->lpfc_injerr_wapp_cnt);
         else if (dent == phba->debug_writeRef)
-                cnt = snprintf(cbuf, 16, "%u\n", phba->lpfc_injerr_wref_cnt);
+                cnt = snprintf(cbuf, 32, "%u\n", phba->lpfc_injerr_wref_cnt);
         else if (dent == phba->debug_readGuard)
-                cnt = snprintf(cbuf, 16, "%u\n", phba->lpfc_injerr_rgrd_cnt);
+                cnt = snprintf(cbuf, 32, "%u\n", phba->lpfc_injerr_rgrd_cnt);
         else if (dent == phba->debug_readApp)
-                cnt = snprintf(cbuf, 16, "%u\n", phba->lpfc_injerr_rapp_cnt);
+                cnt = snprintf(cbuf, 32, "%u\n", phba->lpfc_injerr_rapp_cnt);
         else if (dent == phba->debug_readRef)
-                cnt = snprintf(cbuf, 16, "%u\n", phba->lpfc_injerr_rref_cnt);
-        else if (dent == phba->debug_InjErrLBA)
-                cnt = snprintf(cbuf, 16, "0x%lx\n",
+                cnt = snprintf(cbuf, 32, "%u\n", phba->lpfc_injerr_rref_cnt);
+        else if (dent == phba->debug_InjErrLBA) {
+                if (phba->lpfc_injerr_lba == (unsigned long)(-1))
+                        cnt = snprintf(cbuf, 32, "off\n");
+                else
+                        cnt = snprintf(cbuf, 32, "0x%lx\n",
                                  (unsigned long) phba->lpfc_injerr_lba);
-        else
+        } else
                 lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                          "0547 Unknown debugfs error injection entry\n");
 
@@ -1042,7 +1045,7 @@ lpfc_debugfs_dif_err_write(struct file *file, const char __user *buf,
         struct dentry *dent = file->f_dentry;
         struct lpfc_hba *phba = file->private_data;
         char dstbuf[32];
-        unsigned long tmp;
+        unsigned long tmp = 0;
         int size;
 
         memset(dstbuf, 0, 32);
@@ -1050,7 +1053,12 @@ lpfc_debugfs_dif_err_write(struct file *file, const char __user *buf,
         if (copy_from_user(dstbuf, buf, size))
                 return 0;
 
-        if (strict_strtoul(dstbuf, 0, &tmp))
+        if (dent == phba->debug_InjErrLBA) {
+                if ((buf[0] == 'o') && (buf[1] == 'f') && (buf[2] == 'f'))
+                        tmp = (unsigned long)(-1);
+        }
+
+        if ((tmp == 0) && (kstrtoul(dstbuf, 0, &tmp)))
                 return 0;
 
         if (dent == phba->debug_writeGuard)
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index efc055b6bac4..8021c9e1fb9f 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1,4 +1,4 @@
-/*******************************************************************
+/******************************************************************r
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
  * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
@@ -39,8 +39,8 @@
 #include "lpfc_sli4.h"
 #include "lpfc_nl.h"
 #include "lpfc_disc.h"
-#include "lpfc_scsi.h"
 #include "lpfc.h"
+#include "lpfc_scsi.h"
 #include "lpfc_logmsg.h"
 #include "lpfc_crtn.h"
 #include "lpfc_vport.h"
@@ -51,13 +51,19 @@
 int _dump_buf_done;
 
 static char *dif_op_str[] = {
-        "SCSI_PROT_NORMAL",
-        "SCSI_PROT_READ_INSERT",
-        "SCSI_PROT_WRITE_STRIP",
-        "SCSI_PROT_READ_STRIP",
-        "SCSI_PROT_WRITE_INSERT",
-        "SCSI_PROT_READ_PASS",
-        "SCSI_PROT_WRITE_PASS",
+        "PROT_NORMAL",
+        "PROT_READ_INSERT",
+        "PROT_WRITE_STRIP",
+        "PROT_READ_STRIP",
+        "PROT_WRITE_INSERT",
+        "PROT_READ_PASS",
+        "PROT_WRITE_PASS",
+};
+
+static char *dif_grd_str[] = {
+        "NO_GUARD",
+        "DIF_CRC",
+        "DIX_IP",
 };
 
 struct scsi_dif_tuple {
@@ -1281,10 +1287,14 @@ lpfc_cmd_blksize(struct scsi_cmnd *sc)
 
 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
 
-#define BG_ERR_INIT     1
-#define BG_ERR_TGT      2
-#define BG_ERR_SWAP     3
-#define BG_ERR_CHECK    4
+/* Return if if error injection is detected by Initiator */
+#define BG_ERR_INIT     0x1
+/* Return if if error injection is detected by Target */
+#define BG_ERR_TGT      0x2
+/* Return if if swapping CSUM<-->CRC is required for error injection */
+#define BG_ERR_SWAP     0x10
+/* Return if disabling Guard/Ref/App checking is required for error injection */
+#define BG_ERR_CHECK    0x20
 
 /**
  * lpfc_bg_err_inject - Determine if we should inject an error
@@ -1294,10 +1304,7 @@ lpfc_cmd_blksize(struct scsi_cmnd *sc)
  * @apptag: (out) BlockGuard application tag for transmitted data
  * @new_guard (in) Value to replace CRC with if needed
  *
- * Returns (1) if error injection is detected by Initiator
- * Returns (2) if error injection is detected by Target
- * Returns (3) if swapping CSUM->CRC is required for error injection
- * Returns (4) disabling Guard/Ref/App checking is required for error injection
+ * Returns BG_ERR_* bit mask or 0 if request ignored
  **/
 static int
 lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc,
@@ -1305,6 +1312,7 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc,
 {
         struct scatterlist *sgpe; /* s/g prot entry */
         struct scatterlist *sgde; /* s/g data entry */
+        struct lpfc_scsi_buf *lpfc_cmd = NULL;
         struct scsi_dif_tuple *src = NULL;
         uint32_t op = scsi_get_prot_op(sc);
         uint32_t blksize;
@@ -1336,6 +1344,7 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc,
                                 blockoff = numblks;
                         src = (struct scsi_dif_tuple *)sg_virt(sgpe);
                         src += blockoff;
+                        lpfc_cmd = (struct lpfc_scsi_buf *)sc->host_scribble;
                 }
         }
 
@@ -1344,56 +1353,71 @@ lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc,
                 if (phba->lpfc_injerr_wref_cnt) {
                         switch (op) {
                         case SCSI_PROT_WRITE_PASS:
-                                if (blockoff && src) {
+                                if (src) {