[SCSI] fnic: Fnic Statistics Collection

This feature gathers active and cumulative per fnic stats for io,
abort, terminate, reset, vlan discovery path and it also includes
various important stats for debugging issues. It also provided
debugfs and ioctl interface for user to retrieve these stats.
It also provides functionality to reset cumulative stats through
user interface.

Signed-off-by: Hiral Patel <hiralpat@cisco.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c
index 006fa92a02df..60a1c50aa68f 100644
--- a/drivers/scsi/fnic/fnic_fcs.c
+++ b/drivers/scsi/fnic/fnic_fcs.c
@@ -302,6 +302,7 @@ static inline int is_fnic_fip_flogi_reject(struct fcoe_ctlr *fip,
 static void fnic_fcoe_send_vlan_req(struct fnic *fnic)
 {
         struct fcoe_ctlr *fip = &fnic->ctlr;
+        struct fnic_stats *fnic_stats = &fnic->fnic_stats;
         struct sk_buff *skb;
         char *eth_fr;
         int fr_len;
@@ -337,6 +338,7 @@ static void fnic_fcoe_send_vlan_req(struct fnic *fnic)
         vlan->desc.wwnn.fd_desc.fip_dtype = FIP_DT_NAME;
         vlan->desc.wwnn.fd_desc.fip_dlen = sizeof(vlan->desc.wwnn) / FIP_BPW;
         put_unaligned_be64(fip->lp->wwnn, &vlan->desc.wwnn.fd_wwn);
+        atomic64_inc(&fnic_stats->vlan_stats.vlan_disc_reqs);
 
         skb_put(skb, sizeof(*vlan));
         skb->protocol = htons(ETH_P_FIP);
@@ -354,6 +356,7 @@ static void fnic_fcoe_process_vlan_resp(struct fnic *fnic, struct sk_buff *skb)
         struct fcoe_ctlr *fip = &fnic->ctlr;
         struct fip_header *fiph;
         struct fip_desc *desc;
+        struct fnic_stats *fnic_stats = &fnic->fnic_stats;
         u16 vid;
         size_t rlen;
         size_t dlen;
@@ -402,6 +405,7 @@ static void fnic_fcoe_process_vlan_resp(struct fnic *fnic, struct sk_buff *skb)
         /* any VLAN descriptors present ? */
         if (list_empty(&fnic->vlans)) {
                 /* retry from timer */
+                atomic64_inc(&fnic_stats->vlan_stats.resp_withno_vlanID);
                 FNIC_FCS_DBG(KERN_INFO, fnic->lport->host,
                           "No VLAN descriptors in FIP VLAN response\n");
                 spin_unlock_irqrestore(&fnic->vlans_lock, flags);
@@ -533,6 +537,7 @@ drop:
 void fnic_handle_fip_frame(struct work_struct *work)
 {
         struct fnic *fnic = container_of(work, struct fnic, fip_frame_work);
+        struct fnic_stats *fnic_stats = &fnic->fnic_stats;
         unsigned long flags;
         struct sk_buff *skb;
         struct ethhdr *eh;
@@ -567,6 +572,8 @@ void fnic_handle_fip_frame(struct work_struct *work)
                          * fcf's & restart from scratch
                          */
                         if (is_fnic_fip_flogi_reject(&fnic->ctlr, skb)) {
+                                atomic64_inc(
+                                        &fnic_stats->vlan_stats.flogi_rejects);
                                 shost_printk(KERN_INFO, fnic->lport->host,
                                           "Trigger a Link down - VLAN Disc\n");
                                 fcoe_ctlr_link_down(&fnic->ctlr);
@@ -753,6 +760,7 @@ static void fnic_rq_cmpl_frame_recv(struct vnic_rq *rq, struct cq_desc
         struct fnic *fnic = vnic_dev_priv(rq->vdev);
         struct sk_buff *skb;
         struct fc_frame *fp;
+        struct fnic_stats *fnic_stats = &fnic->fnic_stats;
         unsigned int eth_hdrs_stripped;
         u8 type, color, eop, sop, ingress_port, vlan_stripped;
         u8 fcoe = 0, fcoe_sof, fcoe_eof;
@@ -803,6 +811,7 @@ static void fnic_rq_cmpl_frame_recv(struct vnic_rq *rq, struct cq_desc
                 eth_hdrs_stripped = 0;
                 skb_trim(skb, bytes_written);
                 if (!fcs_ok) {
+                        atomic64_inc(&fnic_stats->misc_stats.frame_errors);
                         FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
                                      "fcs error.  dropping packet.\n");
                         goto drop;
@@ -818,6 +827,7 @@ static void fnic_rq_cmpl_frame_recv(struct vnic_rq *rq, struct cq_desc
         }
 
         if (!fcs_ok || packet_error || !fcoe_fc_crc_ok || fcoe_enc_error) {
+                atomic64_inc(&fnic_stats->misc_stats.frame_errors);
                 FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,
                              "fnic rq_cmpl fcoe x%x fcsok x%x"
                              " pkterr x%x fcoe_fc_crc_ok x%x, fcoe_enc_err"
@@ -1205,6 +1215,7 @@ void fnic_handle_fip_timer(struct fnic *fnic)
 {
         unsigned long flags;
         struct fcoe_vlan *vlan;
+        struct fnic_stats *fnic_stats = &fnic->fnic_stats;
         u64 sol_time;
 
         spin_lock_irqsave(&fnic->fnic_lock, flags);
@@ -1273,6 +1284,7 @@ void fnic_handle_fip_timer(struct fnic *fnic)
                         vlan->state = FIP_VLAN_SENT; /* sent now */
                 }
                 spin_unlock_irqrestore(&fnic->vlans_lock, flags);
+                atomic64_inc(&fnic_stats->vlan_stats.sol_expiry_count);
                 vlan->sol_count++;
                 sol_time = jiffies + msecs_to_jiffies
                                         (FCOE_CTLR_START_DELAY);