net: mana: Add counter for packet dropped by XDP

This counter will show up in ethtool stat data.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/microsoft/mana/mana.h b/drivers/net/ethernet/microsoft/mana/mana.h
index 9a12607fb511bdd33617454be355577651237306..66fc98d7e1d62268ce8591fb9733fdce621bba25 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana.h
+++ b/drivers/net/ethernet/microsoft/mana/mana.h
@@ -48,7 +48,14 @@ enum TRI_STATE {
 
 #define MAX_PORTS_IN_MANA_DEV 256
 
-struct mana_stats {
+struct mana_stats_rx {
+       u64 packets;
+       u64 bytes;
+       u64 xdp_drop;
+       struct u64_stats_sync syncp;
+};
+
+struct mana_stats_tx {
        u64 packets;
        u64 bytes;
        struct u64_stats_sync syncp;
@@ -76,7 +83,7 @@ struct mana_txq {
 
        atomic_t pending_sends;
 
-       struct mana_stats stats;
+       struct mana_stats_tx stats;
 };
 
 /* skb data and frags dma mappings */
@@ -298,7 +305,7 @@ struct mana_rxq {
 
        u32 buf_index;
 
-       struct mana_stats stats;
+       struct mana_stats_rx stats;
 
        struct bpf_prog __rcu *bpf_prog;
        struct xdp_rxq_info xdp_rxq;

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 498d0f99927544a2edc8e1cc5d171e732362d108..878c3d9bb39dc4743e5471ec23428b85f4261d1d 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -136,7 +136,7 @@ int mana_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        bool ipv4 = false, ipv6 = false;
        struct mana_tx_package pkg = {};
        struct netdev_queue *net_txq;
-       struct mana_stats *tx_stats;
+       struct mana_stats_tx *tx_stats;
        struct gdma_queue *gdma_sq;
        unsigned int csum_type;
        struct mana_txq *txq;
@@ -299,7 +299,8 @@ static void mana_get_stats64(struct net_device *ndev,
 {
        struct mana_port_context *apc = netdev_priv(ndev);
        unsigned int num_queues = apc->num_queues;
-       struct mana_stats *stats;
+       struct mana_stats_rx *rx_stats;
+       struct mana_stats_tx *tx_stats;
        unsigned int start;
        u64 packets, bytes;
        int q;
@@ -310,26 +311,26 @@ static void mana_get_stats64(struct net_device *ndev,
        netdev_stats_to_stats64(st, &ndev->stats);
 
        for (q = 0; q < num_queues; q++) {
-               stats = &apc->rxqs[q]->stats;
+               rx_stats = &apc->rxqs[q]->stats;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&stats->syncp);
-                       packets = stats->packets;
-                       bytes = stats->bytes;
-               } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
+                       start = u64_stats_fetch_begin_irq(&rx_stats->syncp);
+                       packets = rx_stats->packets;
+                       bytes = rx_stats->bytes;
+               } while (u64_stats_fetch_retry_irq(&rx_stats->syncp, start));
 
                st->rx_packets += packets;
                st->rx_bytes += bytes;
        }
 
        for (q = 0; q < num_queues; q++) {
-               stats = &apc->tx_qp[q].txq.stats;
+               tx_stats = &apc->tx_qp[q].txq.stats;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&stats->syncp);
-                       packets = stats->packets;
-                       bytes = stats->bytes;
-               } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
+                       start = u64_stats_fetch_begin_irq(&tx_stats->syncp);
+                       packets = tx_stats->packets;
+                       bytes = tx_stats->bytes;
+               } while (u64_stats_fetch_retry_irq(&tx_stats->syncp, start));
 
                st->tx_packets += packets;
                st->tx_bytes += bytes;
@@ -986,7 +987,7 @@ static struct sk_buff *mana_build_skb(void *buf_va, uint pkt_len,
 static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe,
                        struct mana_rxq *rxq)
 {
-       struct mana_stats *rx_stats = &rxq->stats;
+       struct mana_stats_rx *rx_stats = &rxq->stats;
        struct net_device *ndev = rxq->ndev;
        uint pkt_len = cqe->ppi[0].pkt_len;
        u16 rxq_idx = rxq->rxq_idx;
@@ -1007,7 +1008,7 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe,
        act = mana_run_xdp(ndev, rxq, &xdp, buf_va, pkt_len);
 
        if (act != XDP_PASS && act != XDP_TX)
-               goto drop;
+               goto drop_xdp;
 
        skb = mana_build_skb(buf_va, pkt_len, &xdp);
 
@@ -1048,9 +1049,15 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe,
        u64_stats_update_end(&rx_stats->syncp);
        return;
 
+drop_xdp:
+       u64_stats_update_begin(&rx_stats->syncp);
+       rx_stats->xdp_drop++;
+       u64_stats_update_end(&rx_stats->syncp);
+
 drop:
        free_page((unsigned long)buf_va);
        ++ndev->stats.rx_dropped;
+
        return;
 }
 

diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
index c3c81ae3fafd348f83126184c765513ef31b5ba0..e1ccb9bf62de72532d7770ebad24f844ad7d4223 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
@@ -23,7 +23,7 @@ static int mana_get_sset_count(struct net_device *ndev, int stringset)
        if (stringset != ETH_SS_STATS)
                return -EINVAL;
 
-       return ARRAY_SIZE(mana_eth_stats) + num_queues * 4;
+       return ARRAY_SIZE(mana_eth_stats) + num_queues * 5;
 }
 
 static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
@@ -46,6 +46,8 @@ static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
                p += ETH_GSTRING_LEN;
                sprintf(p, "rx_%d_bytes", i);
                p += ETH_GSTRING_LEN;
+               sprintf(p, "rx_%d_xdp_drop", i);
+               p += ETH_GSTRING_LEN;
        }
 
        for (i = 0; i < num_queues; i++) {
@@ -62,9 +64,11 @@ static void mana_get_ethtool_stats(struct net_device *ndev,
        struct mana_port_context *apc = netdev_priv(ndev);
        unsigned int num_queues = apc->num_queues;
        void *eth_stats = &apc->eth_stats;
-       struct mana_stats *stats;
+       struct mana_stats_rx *rx_stats;
+       struct mana_stats_tx *tx_stats;
        unsigned int start;
        u64 packets, bytes;
+       u64 xdp_drop;
        int q, i = 0;
 
        if (!apc->port_is_up)
@@ -74,26 +78,28 @@ static void mana_get_ethtool_stats(struct net_device *ndev,
                data[i++] = *(u64 *)(eth_stats + mana_eth_stats[q].offset);
 
        for (q = 0; q < num_queues; q++) {
-               stats = &apc->rxqs[q]->stats;
+               rx_stats = &apc->rxqs[q]->stats;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&stats->syncp);
-                       packets = stats->packets;
-                       bytes = stats->bytes;
-               } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
+                       start = u64_stats_fetch_begin_irq(&rx_stats->syncp);
+                       packets = rx_stats->packets;
+                       bytes = rx_stats->bytes;
+                       xdp_drop = rx_stats->xdp_drop;
+               } while (u64_stats_fetch_retry_irq(&rx_stats->syncp, start));
 
                data[i++] = packets;
                data[i++] = bytes;
+               data[i++] = xdp_drop;
        }
 
        for (q = 0; q < num_queues; q++) {
-               stats = &apc->tx_qp[q].txq.stats;
+               tx_stats = &apc->tx_qp[q].txq.stats;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&stats->syncp);
-                       packets = stats->packets;
-                       bytes = stats->bytes;
-               } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
+                       start = u64_stats_fetch_begin_irq(&tx_stats->syncp);
+                       packets = tx_stats->packets;
+                       bytes = tx_stats->bytes;
+               } while (u64_stats_fetch_retry_irq(&tx_stats->syncp, start));
 
                data[i++] = packets;
                data[i++] = bytes;