Expose per-action XDP counters via ethtool -S: xdp_pass, xdp_drop, xdp_tx, xdp_tx_err, xdp_redirect, and xdp_redirect_err. These use the existing soft MIB infrastructure and are incremented in bcmgenet_run_xdp() alongside the existing driver statistics. Signed-off-by: Nicolai Buchwitz --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 17 ++++++++++++++++- drivers/net/ethernet/broadcom/genet/bcmgenet.h | 6 ++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 30181f9cff98..ef499192b325 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1168,6 +1168,13 @@ static const struct bcmgenet_stats bcmgenet_gstrings_stats[] = { STAT_GENET_SOFT_MIB("tx_realloc_tsb", mib.tx_realloc_tsb), STAT_GENET_SOFT_MIB("tx_realloc_tsb_failed", mib.tx_realloc_tsb_failed), + /* XDP counters */ + STAT_GENET_SOFT_MIB("xdp_pass", mib.xdp_pass), + STAT_GENET_SOFT_MIB("xdp_drop", mib.xdp_drop), + STAT_GENET_SOFT_MIB("xdp_tx", mib.xdp_tx), + STAT_GENET_SOFT_MIB("xdp_tx_err", mib.xdp_tx_err), + STAT_GENET_SOFT_MIB("xdp_redirect", mib.xdp_redirect), + STAT_GENET_SOFT_MIB("xdp_redirect_err", mib.xdp_redirect_err), /* Per TX queues */ STAT_GENET_Q(0), STAT_GENET_Q(1), @@ -2368,6 +2375,7 @@ bcmgenet_run_xdp(struct bcmgenet_rx_ring *ring, struct bpf_prog *prog, switch (act) { case XDP_PASS: + priv->mib.xdp_pass++; return XDP_PASS; case XDP_TX: { struct bcmgenet_tx_ring *tx_ring; @@ -2381,18 +2389,24 @@ bcmgenet_run_xdp(struct bcmgenet_rx_ring *ring, struct bpf_prog *prog, if (unlikely(!bcmgenet_xdp_xmit_frame(priv, tx_ring, xdpf))) { spin_unlock(&tx_ring->lock); xdp_return_frame_rx_napi(xdpf); + priv->mib.xdp_tx_err++; return XDP_DROP; } bcmgenet_xdp_ring_doorbell(priv, tx_ring); spin_unlock(&tx_ring->lock); + priv->mib.xdp_tx++; return XDP_TX; } case XDP_REDIRECT: - if (unlikely(xdp_do_redirect(priv->dev, xdp, prog))) + if (unlikely(xdp_do_redirect(priv->dev, xdp, prog))) { + priv->mib.xdp_redirect_err++; goto drop_page; + } + priv->mib.xdp_redirect++; return XDP_REDIRECT; case XDP_DROP: drop_page: + priv->mib.xdp_drop++; page_pool_put_full_page(ring->page_pool, rx_page, true); return XDP_DROP; default: @@ -2400,6 +2414,7 @@ bcmgenet_run_xdp(struct bcmgenet_rx_ring *ring, struct bpf_prog *prog, fallthrough; case XDP_ABORTED: trace_xdp_exception(priv->dev, prog, act); + priv->mib.xdp_drop++; page_pool_put_full_page(ring->page_pool, rx_page, true); return XDP_ABORTED; } diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h index 192db0defbfc..b3f1b7ed604a 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -156,6 +156,12 @@ struct bcmgenet_mib_counters { u32 tx_dma_failed; u32 tx_realloc_tsb; u32 tx_realloc_tsb_failed; + u32 xdp_pass; + u32 xdp_drop; + u32 xdp_tx; + u32 xdp_tx_err; + u32 xdp_redirect; + u32 xdp_redirect_err; }; struct bcmgenet_tx_stats64 { -- 2.51.0