qla2xxx: Add FW resource count in DebugFS.

DebugFS now will show fw_resource_count node.

FW Resource count

Original TGT exchg count[0]
current TGT exchg count[0]
original Initiator Exchange count[2048]
Current Initiator Exchange count[2048]
Original IOCB count[2078]
Current IOCB count[2067]
MAX VP count[254]
MAX FCF count[0]

Signed-off-by: Quinn Tran <quinn.tran@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index f63de357660941a9a49f732348ce46aac6d02dbe..8e89848131b49c454f3007b0e1e7ca2f7b6f918c 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2917,7 +2917,7 @@ struct qlt_hw_data {
 #define MAX_QFULL_CMDS_ALLOC   8192
 #define Q_FULL_THRESH_HOLD_PERCENT 90
 #define Q_FULL_THRESH_HOLD(ha) \
-       ((ha->fw_xcb_count/100) * Q_FULL_THRESH_HOLD_PERCENT)
+       ((ha->cur_fw_xcb_count/100) * Q_FULL_THRESH_HOLD_PERCENT)
 
 #define LEAK_EXCHG_THRESH_HOLD_PERCENT 75      /* 75 percent */
 
@@ -3298,8 +3298,14 @@ struct qla_hw_data {
 #define RISC_START_ADDRESS_2100 0x1000
 #define RISC_START_ADDRESS_2300 0x800
 #define RISC_START_ADDRESS_2400 0x100000
-       uint16_t        fw_xcb_count;
-       uint16_t        fw_iocb_count;
+
+       uint16_t        orig_fw_tgt_xcb_count;
+       uint16_t        cur_fw_tgt_xcb_count;
+       uint16_t        orig_fw_xcb_count;
+       uint16_t        cur_fw_xcb_count;
+       uint16_t        orig_fw_iocb_count;
+       uint16_t        cur_fw_iocb_count;
+       uint16_t        fw_max_fcf_count;
 
        uint32_t        fw_shared_ram_start;
        uint32_t        fw_shared_ram_end;
@@ -3343,6 +3349,7 @@ struct qla_hw_data {
        struct dentry *dfs_dir;
        struct dentry *dfs_fce;
        struct dentry *dfs_tgt_counters;
+       struct dentry *dfs_fw_resource_cnt;
 
        dma_addr_t      fce_dma;
        void            *fce;

diff --git a/drivers/scsi/qla2xxx/qla_dfs.c b/drivers/scsi/qla2xxx/qla_dfs.c
index 449541f007074e1e2d30a03202b7696fe354af70..cd8b96a4b0dd6161759928c0782dee1b8f65d0de 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dfs.c
+++ b/drivers/scsi/qla2xxx/qla_dfs.c
@@ -12,6 +12,43 @@
 static struct dentry *qla2x00_dfs_root;
 static atomic_t qla2x00_dfs_root_count;
 
+static int
+qla_dfs_fw_resource_cnt_show(struct seq_file *s, void *unused)
+{
+       struct scsi_qla_host *vha = s->private;
+       struct qla_hw_data *ha = vha->hw;
+
+       seq_puts(s, "FW Resource count\n\n");
+       seq_printf(s, "Original TGT exchg count[%d]\n",
+           ha->orig_fw_tgt_xcb_count);
+       seq_printf(s, "current TGT exchg count[%d]\n",
+           ha->cur_fw_tgt_xcb_count);
+       seq_printf(s, "original Initiator Exchange count[%d]\n",
+           ha->orig_fw_xcb_count);
+       seq_printf(s, "Current Initiator Exchange count[%d]\n",
+           ha->cur_fw_xcb_count);
+       seq_printf(s, "Original IOCB count[%d]\n", ha->orig_fw_iocb_count);
+       seq_printf(s, "Current IOCB count[%d]\n", ha->cur_fw_iocb_count);
+       seq_printf(s, "MAX VP count[%d]\n", ha->max_npiv_vports);
+       seq_printf(s, "MAX FCF count[%d]\n", ha->fw_max_fcf_count);
+
+       return 0;
+}
+
+static int
+qla_dfs_fw_resource_cnt_open(struct inode *inode, struct file *file)
+{
+       struct scsi_qla_host *vha = inode->i_private;
+       return single_open(file, qla_dfs_fw_resource_cnt_show, vha);
+}
+
+static const struct file_operations dfs_fw_resource_cnt_ops = {
+       .open           = qla_dfs_fw_resource_cnt_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
 static int
 qla_dfs_tgt_counters_show(struct seq_file *s, void *unused)
 {
@@ -188,6 +225,14 @@ create_dir:
        atomic_inc(&qla2x00_dfs_root_count);
 
 create_nodes:
+       ha->dfs_fw_resource_cnt = debugfs_create_file("fw_resource_count",
+           S_IRUSR, ha->dfs_dir, vha, &dfs_fw_resource_cnt_ops);
+       if (!ha->dfs_fw_resource_cnt) {
+               ql_log(ql_log_warn, vha, 0x00fd,
+                   "Unable to create debugFS fw_resource_count node.\n");
+               goto out;
+       }
+
        ha->dfs_tgt_counters = debugfs_create_file("tgt_counters", S_IRUSR,
            ha->dfs_dir, vha, &dfs_tgt_counters_ops);
        if (!ha->dfs_tgt_counters) {
@@ -212,6 +257,11 @@ qla2x00_dfs_remove(scsi_qla_host_t *vha)
 {
        struct qla_hw_data *ha = vha->hw;
 
+       if (ha->dfs_fw_resource_cnt) {
+               debugfs_remove(ha->dfs_fw_resource_cnt);
+               ha->dfs_fw_resource_cnt = NULL;
+       }
+
        if (ha->dfs_tgt_counters) {
                debugfs_remove(ha->dfs_tgt_counters);
                ha->dfs_tgt_counters = NULL;

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 3dc323caaa950d64db0e1af7fe45cc15ad06cb7e..e37b4c3f654d2203797de7c6669f9211142dd802 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -329,8 +329,7 @@ extern int
 qla2x00_get_id_list(scsi_qla_host_t *, void *, dma_addr_t, uint16_t *);
 
 extern int
-qla2x00_get_resource_cnts(scsi_qla_host_t *, uint16_t *, uint16_t *,
-    uint16_t *, uint16_t *, uint16_t *, uint16_t *);
+qla2x00_get_resource_cnts(scsi_qla_host_t *);
 
 extern int
 qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map);

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index b3ed3b3ff55ef2470facc489757acd2e3778b0f0..35d1ea8a58d113132f59398505ef657406b0740e 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1766,10 +1766,10 @@ qla2x00_alloc_outstanding_cmds(struct qla_hw_data *ha, struct req_que *req)
            (ql2xmultique_tag || ql2xmaxqueues > 1)))
                req->num_outstanding_cmds = DEFAULT_OUTSTANDING_COMMANDS;
        else {
-               if (ha->fw_xcb_count <= ha->fw_iocb_count)
-                       req->num_outstanding_cmds = ha->fw_xcb_count;
+               if (ha->cur_fw_xcb_count <= ha->cur_fw_iocb_count)
+                       req->num_outstanding_cmds = ha->cur_fw_xcb_count;
                else
-                       req->num_outstanding_cmds = ha->fw_iocb_count;
+                       req->num_outstanding_cmds = ha->cur_fw_iocb_count;
        }
 
        req->outstanding_cmds = kzalloc(sizeof(srb_t *) *
@@ -1878,9 +1878,7 @@ enable_82xx_npiv:
                                                ha->max_npiv_vports =
                                                    MIN_MULTI_ID_FABRIC - 1;
                                }
-                               qla2x00_get_resource_cnts(vha, NULL,
-                                   &ha->fw_xcb_count, NULL, &ha->fw_iocb_count,
-                                   &ha->max_npiv_vports, NULL);
+                               qla2x00_get_resource_cnts(vha);
 
                                /*
                                 * Allocate the array of outstanding commands
@@ -2262,7 +2260,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
        if (IS_FWI2_CAPABLE(ha)) {
                mid_init_cb->options = cpu_to_le16(BIT_1);
                mid_init_cb->init_cb.execution_throttle =
-                   cpu_to_le16(ha->fw_xcb_count);
+                   cpu_to_le16(ha->cur_fw_xcb_count);
                /* D-Port Status */
                if (IS_DPORT_CAPABLE(ha))
                        mid_init_cb->init_cb.firmware_options_1 |=

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index c7ca2235c60afa9aa6c54c53b63b3ab7a303f078..87e6758302f61b648907d16d5b2a65b3fddfe0eb 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -2620,10 +2620,9 @@ qla2x00_get_id_list(scsi_qla_host_t *vha, void *id_list, dma_addr_t id_list_dma,
  *     Kernel context.
  */
 int
-qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
-    uint16_t *orig_xchg_cnt, uint16_t *cur_iocb_cnt,
-    uint16_t *orig_iocb_cnt, uint16_t *max_npiv_vports, uint16_t *max_fcfs)
+qla2x00_get_resource_cnts(scsi_qla_host_t *vha)
 {
+       struct qla_hw_data *ha = vha->hw;
        int rval;
        mbx_cmd_t mc;
        mbx_cmd_t *mcp = &mc;
@@ -2651,19 +2650,16 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha, uint16_t *cur_xchg_cnt,
                    mcp->mb[3], mcp->mb[6], mcp->mb[7], mcp->mb[10],
                    mcp->mb[11], mcp->mb[12]);
 
-               if (cur_xchg_cnt)
-                       *cur_xchg_cnt = mcp->mb[3];
-               if (orig_xchg_cnt)
-                       *orig_xchg_cnt = mcp->mb[6];
-               if (cur_iocb_cnt)
-                       *cur_iocb_cnt = mcp->mb[7];
-               if (orig_iocb_cnt)
-                       *orig_iocb_cnt = mcp->mb[10];
-               if (vha->hw->flags.npiv_supported && max_npiv_vports)
-                       *max_npiv_vports = mcp->mb[11];
-               if ((IS_QLA81XX(vha->hw) || IS_QLA83XX(vha->hw) ||
-                   IS_QLA27XX(vha->hw)) && max_fcfs)
-                       *max_fcfs = mcp->mb[12];
+               ha->orig_fw_tgt_xcb_count =  mcp->mb[1];
+               ha->cur_fw_tgt_xcb_count = mcp->mb[2];
+               ha->cur_fw_xcb_count = mcp->mb[3];
+               ha->orig_fw_xcb_count = mcp->mb[6];
+               ha->cur_fw_iocb_count = mcp->mb[7];
+               ha->orig_fw_iocb_count = mcp->mb[10];
+               if (ha->flags.npiv_supported)
+                       ha->max_npiv_vports = mcp->mb[11];
+               if (IS_QLA81XX(ha) || IS_QLA83XX(ha) || IS_QLA27XX(ha))
+                       ha->fw_max_fcf_count = mcp->mb[12];
        }
 
        return (rval);

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index f404e48329a958328a2ef3594d460919105869c9..661124afae90f0011071d9f35cb765217fe6d146 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -3034,7 +3034,7 @@ static void qlt_init_term_exchange(struct scsi_qla_host *vha)
        struct qla_tgt_cmd *cmd, *tcmd;
 
        vha->hw->tgt.leak_exchg_thresh_hold =
-           (vha->hw->fw_xcb_count/100) * LEAK_EXCHG_THRESH_HOLD_PERCENT;
+           (vha->hw->cur_fw_xcb_count/100) * LEAK_EXCHG_THRESH_HOLD_PERCENT;
 
        cmd = tcmd = NULL;
        if (!list_empty(&vha->hw->tgt.q_full_list)) {
@@ -3064,7 +3064,7 @@ static void qlt_chk_exch_leak_thresh_hold(struct scsi_qla_host *vha)
 
                ql_dbg(ql_dbg_tgt, vha, 0xe079,
                    "Chip reset due to exchange starvation: %d/%d.\n",
-                   total_leaked, vha->hw->fw_xcb_count);
+                   total_leaked, vha->hw->cur_fw_xcb_count);
 
                if (IS_P3P_TYPE(vha->hw))
                        set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);

diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index e7951f3c1b5887d1bdc7627ad3c85b2b2b1e23d2..cdd53c652b057129956228c0ecc4eaaa9d6d3011 100644 (file)
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -1357,7 +1357,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(
        struct qla_tgt_sess *sess = qla_tgt_sess;
        unsigned char port_name[36];
        unsigned long flags;
-       int num_tags = (ha->fw_xcb_count) ? ha->fw_xcb_count :
+       int num_tags = (ha->cur_fw_xcb_count) ? ha->cur_fw_xcb_count :
                       TCM_QLA2XXX_DEFAULT_TAGS;
 
        lport = vha->vha_tgt.target_lport_ptr;