dpaa2-eth: add channel stat to debugfs

Compute the average number of frames processed for each CDAN (Channel
Data Availability Notification) and export it to debugfs detailed
channel stats.

Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c
index a9afe46..80291af 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-debugfs.c
@@ -127,16 +127,19 @@ static int dpaa2_dbg_ch_show(struct seq_file *file, void *offset)
        int i;
 
        seq_printf(file, "Channel stats for %s:\n", priv->net_dev->name);
-       seq_printf(file, "%s%16s%16s%16s%16s\n",
-                  "CHID", "CPU", "Deq busy", "CDANs", "Buf count");
+       seq_printf(file, "%s%16s%16s%16s%16s%16s%16s\n",
+                  "CHID", "CPU", "Deq busy", "Frames", "CDANs",
+                  "Avg Frm/CDAN", "Buf count");
 
        for (i = 0; i < priv->num_channels; i++) {
                ch = priv->channel[i];
-               seq_printf(file, "%4d%16d%16llu%16llu%16d\n",
+               seq_printf(file, "%4d%16d%16llu%16llu%16llu%16llu%16d\n",
                           ch->ch_id,
                           ch->nctx.desired_cpu,
                           ch->stats.dequeue_portal_busy,
+                          ch->stats.frames,
                           ch->stats.cdan,
+                          ch->stats.frames / ch->stats.cdan,
                           ch->buf_count);
        }
 

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
index d271c01..8ec435b 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -493,6 +493,7 @@ static int consume_frames(struct dpaa2_eth_channel *ch,
                return 0;
 
        fq->stats.frames += cleaned;
+       ch->stats.frames += cleaned;
 
        /* A dequeue operation only pulls frames from a single queue
         * into the store. Return the frame queue as an out param.

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
index 2890530..43cd840 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
@@ -288,6 +288,8 @@ struct dpaa2_eth_ch_stats {
        __u64 xdp_tx;
        __u64 xdp_tx_err;
        __u64 xdp_redirect;
+       /* Must be last, does not show up in ethtool stats */
+       __u64 frames;
 };
 
 /* Maximum number of queues associated with a DPNI */

diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
index 94347c6..bd13ee4 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
@@ -277,7 +277,7 @@ static void dpaa2_eth_get_ethtool_stats(struct net_device *net_dev,
        /* Per-channel stats */
        for (k = 0; k < priv->num_channels; k++) {
                ch_stats = &priv->channel[k]->stats;
-               for (j = 0; j < sizeof(*ch_stats) / sizeof(__u64); j++)
+               for (j = 0; j < sizeof(*ch_stats) / sizeof(__u64) - 1; j++)
                        *((__u64 *)data + i + j) += *((__u64 *)ch_stats + j);
        }
        i += j;