net: mana: Add counter for XDP_TX

This counter will show up in ethtool stat. It is the
number of packets received and forwarded by XDP program.

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 66fc98d7e1d62268ce8591fb9733fdce621bba25..8ead960f898ded562bf8d83e5ddf80922815323a 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana.h
+++ b/drivers/net/ethernet/microsoft/mana/mana.h
@@ -52,6 +52,7 @@ struct mana_stats_rx {
        u64 packets;
        u64 bytes;
        u64 xdp_drop;
+       u64 xdp_tx;
        struct u64_stats_sync syncp;
 };
 

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 878c3d9bb39dc4743e5471ec23428b85f4261d1d..12067bf5b7d6ae8e9bf028b4d7042c776b7bfaf7 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -1035,6 +1035,14 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe,
                        skb_set_hash(skb, hash_value, PKT_HASH_TYPE_L3);
        }
 
+       u64_stats_update_begin(&rx_stats->syncp);
+       rx_stats->packets++;
+       rx_stats->bytes += pkt_len;
+
+       if (act == XDP_TX)
+               rx_stats->xdp_tx++;
+       u64_stats_update_end(&rx_stats->syncp);
+
        if (act == XDP_TX) {
                skb_set_queue_mapping(skb, rxq_idx);
                mana_xdp_tx(skb, ndev);
@@ -1043,10 +1051,6 @@ static void mana_rx_skb(void *buf_va, struct mana_rxcomp_oob *cqe,
 
        napi_gro_receive(napi, skb);
 
-       u64_stats_update_begin(&rx_stats->syncp);
-       rx_stats->packets++;
-       rx_stats->bytes += pkt_len;
-       u64_stats_update_end(&rx_stats->syncp);
        return;
 
 drop_xdp:

diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c
index e1ccb9bf62de72532d7770ebad24f844ad7d4223..e13f2453eabb6019be26bd1b66504b8725aceb85 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 * 5;
+       return ARRAY_SIZE(mana_eth_stats) + num_queues * 6;
 }
 
 static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
@@ -48,6 +48,8 @@ static void mana_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
                p += ETH_GSTRING_LEN;
                sprintf(p, "rx_%d_xdp_drop", i);
                p += ETH_GSTRING_LEN;
+               sprintf(p, "rx_%d_xdp_tx", i);
+               p += ETH_GSTRING_LEN;
        }
 
        for (i = 0; i < num_queues; i++) {
@@ -69,6 +71,7 @@ static void mana_get_ethtool_stats(struct net_device *ndev,
        unsigned int start;
        u64 packets, bytes;
        u64 xdp_drop;
+       u64 xdp_tx;
        int q, i = 0;
 
        if (!apc->port_is_up)
@@ -85,11 +88,13 @@ static void mana_get_ethtool_stats(struct net_device *ndev,
                        packets = rx_stats->packets;
                        bytes = rx_stats->bytes;
                        xdp_drop = rx_stats->xdp_drop;
+                       xdp_tx = rx_stats->xdp_tx;
                } while (u64_stats_fetch_retry_irq(&rx_stats->syncp, start));
 
                data[i++] = packets;
                data[i++] = bytes;
                data[i++] = xdp_drop;
+               data[i++] = xdp_tx;
        }
 
        for (q = 0; q < num_queues; q++) {