net: macb: Added some queue statistics

Added statistics per queue:
- qX_rx_packets
- qX_rx_bytes
- qX_rx_dropped
- qX_tx_packets
- qX_tx_bytes
- qX_tx_dropped

Signed-off-by: Rafal Ozieblo <rafalo@cadence.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index c756f91cd932dd7783980d9cf70df1290fe9efdc..a26e7633f7e86693ee9a757ba17e061fcacb1688 100644 (file)
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -922,6 +922,34 @@ static const struct gem_statistic gem_statistics[] = {
 
 #define GEM_STATS_LEN ARRAY_SIZE(gem_statistics)
 
+#define QUEUE_STAT_TITLE(title) {      \
+       .stat_string = title,                   \
+}
+
+/* per queue statistics, each should be unsigned long type */
+struct queue_stats {
+       union {
+               unsigned long first;
+               unsigned long rx_packets;
+       };
+       unsigned long rx_bytes;
+       unsigned long rx_dropped;
+       unsigned long tx_packets;
+       unsigned long tx_bytes;
+       unsigned long tx_dropped;
+};
+
+static const struct gem_statistic queue_statistics[] = {
+               QUEUE_STAT_TITLE("rx_packets"),
+               QUEUE_STAT_TITLE("rx_bytes"),
+               QUEUE_STAT_TITLE("rx_dropped"),
+               QUEUE_STAT_TITLE("tx_packets"),
+               QUEUE_STAT_TITLE("tx_bytes"),
+               QUEUE_STAT_TITLE("tx_dropped"),
+};
+
+#define QUEUE_STATS_LEN ARRAY_SIZE(queue_statistics)
+
 struct macb;
 struct macb_queue;
 
@@ -989,6 +1017,7 @@ struct macb_queue {
        struct sk_buff          **rx_skbuff;
        void                    *rx_buffers;
        struct napi_struct      napi;
+       struct queue_stats stats;
 
 #ifdef CONFIG_MACB_USE_HWSTAMP
        struct work_struct      tx_ts_task;
@@ -1046,7 +1075,7 @@ struct macb {
        int skb_length;                         /* saved skb length for pci_unmap_single */
        unsigned int            max_tx_length;
 
-       u64                     ethtool_stats[GEM_STATS_LEN];
+       u64                     ethtool_stats[GEM_STATS_LEN + QUEUE_STATS_LEN * MACB_MAX_QUEUES];
 
        unsigned int            rx_frm_len_mask;
        unsigned int            jumbo_max_len;

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 6974933c67bb96d4e7e5675d861ed593e1b5cd31..d91a87e05382e4673bd2852bb8f987f26865a488 100644 (file)
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -759,7 +759,9 @@ static void macb_tx_error_task(struct work_struct *work)
                                            macb_tx_ring_wrap(bp, tail),
                                            skb->data);
                                bp->dev->stats.tx_packets++;
+                               queue->stats.tx_packets++;
                                bp->dev->stats.tx_bytes += skb->len;
+                               queue->stats.tx_bytes += skb->len;
                        }
                } else {
                        /* "Buffers exhausted mid-frame" errors may only happen
@@ -859,7 +861,9 @@ static void macb_tx_interrupt(struct macb_queue *queue)
                                            macb_tx_ring_wrap(bp, tail),
                                            skb->data);
                                bp->dev->stats.tx_packets++;
+                               queue->stats.tx_packets++;
                                bp->dev->stats.tx_bytes += skb->len;
+                               queue->stats.tx_bytes += skb->len;
                        }
 
                        /* Now we can safely release resources */
@@ -994,6 +998,7 @@ static int gem_rx(struct macb_queue *queue, int budget)
                        netdev_err(bp->dev,
                                   "not whole frame pointed by descriptor\n");
                        bp->dev->stats.rx_dropped++;
+                       queue->stats.rx_dropped++;
                        break;
                }
                skb = queue->rx_skbuff[entry];
@@ -1001,6 +1006,7 @@ static int gem_rx(struct macb_queue *queue, int budget)
                        netdev_err(bp->dev,
                                   "inconsistent Rx descriptor chain\n");
                        bp->dev->stats.rx_dropped++;
+                       queue->stats.rx_dropped++;
                        break;
                }
                /* now everything is ready for receiving packet */
@@ -1021,7 +1027,9 @@ static int gem_rx(struct macb_queue *queue, int budget)
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
 
                bp->dev->stats.rx_packets++;
+               queue->stats.rx_packets++;
                bp->dev->stats.rx_bytes += skb->len;
+               queue->stats.rx_bytes += skb->len;
 
                gem_ptp_do_rxstamp(bp, skb, desc);
 
@@ -2304,7 +2312,10 @@ static int macb_change_mtu(struct net_device *dev, int new_mtu)
 
 static void gem_update_stats(struct macb *bp)
 {
-       unsigned int i;
+       struct macb_queue *queue;
+       unsigned int i, q, idx;
+       unsigned long *stat;
+
        u32 *p = &bp->hw_stats.gem.tx_octets_31_0;
 
        for (i = 0; i < GEM_STATS_LEN; ++i, ++p) {
@@ -2321,6 +2332,11 @@ static void gem_update_stats(struct macb *bp)
                        *(++p) += val;
                }
        }
+
+       idx = GEM_STATS_LEN;
+       for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue)
+               for (i = 0, stat = &queue->stats.first; i < QUEUE_STATS_LEN; ++i, ++stat)
+                       bp->ethtool_stats[idx++] = *stat;
 }
 
 static struct net_device_stats *gem_get_stats(struct macb *bp)
@@ -2368,14 +2384,17 @@ static void gem_get_ethtool_stats(struct net_device *dev,
 
        bp = netdev_priv(dev);
        gem_update_stats(bp);
-       memcpy(data, &bp->ethtool_stats, sizeof(u64) * GEM_STATS_LEN);
+       memcpy(data, &bp->ethtool_stats, sizeof(u64)
+                       * (GEM_STATS_LEN + QUEUE_STATS_LEN * MACB_MAX_QUEUES));
 }
 
 static int gem_get_sset_count(struct net_device *dev, int sset)
 {
+       struct macb *bp = netdev_priv(dev);
+
        switch (sset) {
        case ETH_SS_STATS:
-               return GEM_STATS_LEN;
+               return GEM_STATS_LEN + bp->num_queues * QUEUE_STATS_LEN;
        default:
                return -EOPNOTSUPP;
        }
@@ -2383,13 +2402,25 @@ static int gem_get_sset_count(struct net_device *dev, int sset)
 
 static void gem_get_ethtool_strings(struct net_device *dev, u32 sset, u8 *p)
 {
+       char stat_string[ETH_GSTRING_LEN];
+       struct macb *bp = netdev_priv(dev);
+       struct macb_queue *queue;
        unsigned int i;
+       unsigned int q;
 
        switch (sset) {
        case ETH_SS_STATS:
                for (i = 0; i < GEM_STATS_LEN; i++, p += ETH_GSTRING_LEN)
                        memcpy(p, gem_statistics[i].stat_string,
                               ETH_GSTRING_LEN);
+
+               for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
+                       for (i = 0; i < QUEUE_STATS_LEN; i++, p += ETH_GSTRING_LEN) {
+                               snprintf(stat_string, ETH_GSTRING_LEN, "q%d_%s",
+                                               q, queue_statistics[i].stat_string);
+                               memcpy(p, stat_string, ETH_GSTRING_LEN);
+                       }
+               }
                break;
        }
 }