net: ethernet: mtk_eth_soc: introduce xdp ethtool counters

Report xdp stats through ethtool

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 9a40876e5417743feaa705ac5e063693c1bda38b..cd96eaf72b6b06ba9286b699132e6f4278ebe6f8 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -34,6 +34,10 @@ MODULE_PARM_DESC(msg_level, "Message level (-1=defaults,0=none,...,16=all)");
 #define MTK_ETHTOOL_STAT(x) { #x, \
                              offsetof(struct mtk_hw_stats, x) / sizeof(u64) }
 
+#define MTK_ETHTOOL_XDP_STAT(x) { #x, \
+                                 offsetof(struct mtk_hw_stats, xdp_stats.x) / \
+                                 sizeof(u64) }
+
 static const struct mtk_reg_map mtk_reg_map = {
        .tx_irq_mask            = 0x1a1c,
        .tx_irq_status          = 0x1a18,
@@ -141,6 +145,13 @@ static const struct mtk_ethtool_stats {
        MTK_ETHTOOL_STAT(rx_long_errors),
        MTK_ETHTOOL_STAT(rx_checksum_errors),
        MTK_ETHTOOL_STAT(rx_flow_control_packets),
+       MTK_ETHTOOL_XDP_STAT(rx_xdp_redirect),
+       MTK_ETHTOOL_XDP_STAT(rx_xdp_pass),
+       MTK_ETHTOOL_XDP_STAT(rx_xdp_drop),
+       MTK_ETHTOOL_XDP_STAT(rx_xdp_tx),
+       MTK_ETHTOOL_XDP_STAT(rx_xdp_tx_errors),
+       MTK_ETHTOOL_XDP_STAT(tx_xdp_xmit),
+       MTK_ETHTOOL_XDP_STAT(tx_xdp_xmit_errors),
 };
 
 static const char * const mtk_clks_source_name[] = {
@@ -1502,6 +1513,9 @@ static void mtk_rx_put_buff(struct mtk_rx_ring *ring, void *data, bool napi)
 static u32 mtk_xdp_run(struct mtk_eth *eth, struct mtk_rx_ring *ring,
                       struct xdp_buff *xdp, struct net_device *dev)
 {
+       struct mtk_mac *mac = netdev_priv(dev);
+       struct mtk_hw_stats *hw_stats = mac->hw_stats;
+       u64 *count = &hw_stats->xdp_stats.rx_xdp_drop;
        struct bpf_prog *prog;
        u32 act = XDP_PASS;
 
@@ -1514,13 +1528,16 @@ static u32 mtk_xdp_run(struct mtk_eth *eth, struct mtk_rx_ring *ring,
        act = bpf_prog_run_xdp(prog, xdp);
        switch (act) {
        case XDP_PASS:
-               goto out;
+               count = &hw_stats->xdp_stats.rx_xdp_pass;
+               goto update_stats;
        case XDP_REDIRECT:
                if (unlikely(xdp_do_redirect(dev, xdp, prog))) {
                        act = XDP_DROP;
                        break;
                }
-               goto out;
+
+               count = &hw_stats->xdp_stats.rx_xdp_redirect;
+               goto update_stats;
        default:
                bpf_warn_invalid_xdp_action(dev, prog, act);
                fallthrough;
@@ -1533,6 +1550,11 @@ static u32 mtk_xdp_run(struct mtk_eth *eth, struct mtk_rx_ring *ring,
 
        page_pool_put_full_page(ring->page_pool,
                                virt_to_head_page(xdp->data), true);
+
+update_stats:
+       u64_stats_update_begin(&hw_stats->syncp);
+       *count = *count + 1;
+       u64_stats_update_end(&hw_stats->syncp);
 out:
        rcu_read_unlock();
 

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index cfb7aeda3f4987afb8b2cff1582e79aa00f94ad5..2775da1a6ec3687eec6afaf618e8d01b2a5bbd1e 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -570,6 +570,16 @@ struct mtk_tx_dma_v2 {
 struct mtk_eth;
 struct mtk_mac;
 
+struct mtk_xdp_stats {
+       u64 rx_xdp_redirect;
+       u64 rx_xdp_pass;
+       u64 rx_xdp_drop;
+       u64 rx_xdp_tx;
+       u64 rx_xdp_tx_errors;
+       u64 tx_xdp_xmit;
+       u64 tx_xdp_xmit_errors;
+};
+
 /* struct mtk_hw_stats - the structure that holds the traffic statistics.
  * @stats_lock:                make sure that stats operations are atomic
  * @reg_offset:                the status register offset of the SoC
@@ -593,6 +603,8 @@ struct mtk_hw_stats {
        u64 rx_checksum_errors;
        u64 rx_flow_control_packets;
 
+       struct mtk_xdp_stats    xdp_stats;
+
        spinlock_t              stats_lock;
        u32                     reg_offset;
        struct u64_stats_sync   syncp;