net: mscc: ocelot: report FIFO drop counters through stats->rx_dropped

if_link.h says:

 * @rx_dropped: Number of packets received but not processed,
 *   e.g. due to lack of resources or unsupported protocol.
 *   For hardware interfaces this counter may include packets discarded
 *   due to L2 address filtering but should not include packets dropped
 *   by the device due to buffer exhaustion which are counted separately in
 *   @rx_missed_errors (since procfs folds those two counters together).

Currently we report "stats->rx_dropped = dev->stats.rx_dropped", the
latter being incremented by various entities in the stack. This is not
wrong, but we'd like to move ocelot_get_stats64() in the common ocelot
switch lib which is independent of struct net_device.

To do that, report the hardware RX drop counters instead. These drops
are due to policer action, or due to no destinations. When we have no
memory in the queue system, report this through rx_missed_errors, as
instructed.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c
index 330d30841cdc47c351531e26c34cb339c1c41c93..d7956fd051e6a94b3a81024c474ab171a60b1d65 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_net.c
+++ b/drivers/net/ethernet/mscc/ocelot_net.c
@@ -745,7 +745,32 @@ static void ocelot_get_stats64(struct net_device *dev,
                            s[OCELOT_STAT_RX_1024_1526] +
                            s[OCELOT_STAT_RX_1527_MAX];
        stats->multicast = s[OCELOT_STAT_RX_MULTICAST];
-       stats->rx_dropped = dev->stats.rx_dropped;
+       stats->rx_missed_errors = s[OCELOT_STAT_DROP_TAIL];
+       stats->rx_dropped = s[OCELOT_STAT_RX_RED_PRIO_0] +
+                           s[OCELOT_STAT_RX_RED_PRIO_1] +
+                           s[OCELOT_STAT_RX_RED_PRIO_2] +
+                           s[OCELOT_STAT_RX_RED_PRIO_3] +
+                           s[OCELOT_STAT_RX_RED_PRIO_4] +
+                           s[OCELOT_STAT_RX_RED_PRIO_5] +
+                           s[OCELOT_STAT_RX_RED_PRIO_6] +
+                           s[OCELOT_STAT_RX_RED_PRIO_7] +
+                           s[OCELOT_STAT_DROP_LOCAL] +
+                           s[OCELOT_STAT_DROP_YELLOW_PRIO_0] +
+                           s[OCELOT_STAT_DROP_YELLOW_PRIO_1] +
+                           s[OCELOT_STAT_DROP_YELLOW_PRIO_2] +
+                           s[OCELOT_STAT_DROP_YELLOW_PRIO_3] +
+                           s[OCELOT_STAT_DROP_YELLOW_PRIO_4] +
+                           s[OCELOT_STAT_DROP_YELLOW_PRIO_5] +
+                           s[OCELOT_STAT_DROP_YELLOW_PRIO_6] +
+                           s[OCELOT_STAT_DROP_YELLOW_PRIO_7] +
+                           s[OCELOT_STAT_DROP_GREEN_PRIO_0] +
+                           s[OCELOT_STAT_DROP_GREEN_PRIO_1] +
+                           s[OCELOT_STAT_DROP_GREEN_PRIO_2] +
+                           s[OCELOT_STAT_DROP_GREEN_PRIO_3] +
+                           s[OCELOT_STAT_DROP_GREEN_PRIO_4] +
+                           s[OCELOT_STAT_DROP_GREEN_PRIO_5] +
+                           s[OCELOT_STAT_DROP_GREEN_PRIO_6] +
+                           s[OCELOT_STAT_DROP_GREEN_PRIO_7];
 
        /* Get Tx stats */
        stats->tx_bytes = s[OCELOT_STAT_TX_OCTETS];