]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
net: ethernet: ti: am65-cpsw: fix RX & TX statistics for XDP_TX case
authorRoger Quadros <rogerq@kernel.org>
Mon, 10 Feb 2025 14:52:16 +0000 (16:52 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 13 Feb 2025 04:12:58 +0000 (20:12 -0800)
For successful XDP_TX and XDP_REDIRECT cases, the packet was received
successfully so update RX statistics. Use original received
packet length for that.

TX packets statistics are incremented on TX completion so don't
update it while TX queueing.

If xdp_convert_buff_to_frame() fails, increment tx_dropped.

Signed-off-by: Roger Quadros <rogerq@kernel.org>
Fixes: 8acacc40f733 ("net: ethernet: ti: am65-cpsw: Add minimal XDP support")
Link: https://patch.msgid.link/20250210-am65-cpsw-xdp-fixes-v1-2-ec6b1f7f1aca@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/ti/am65-cpsw-nuss.c

index 021c5a4df8fd456067b9ef9d5c040a30501b77d0..38f3be310928d8d74c9eaeeb75a0ed09fb2c9bb6 100644 (file)
@@ -1170,9 +1170,11 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow,
        struct xdp_frame *xdpf;
        struct bpf_prog *prog;
        struct page *page;
+       int pkt_len;
        u32 act;
        int err;
 
+       pkt_len = *len;
        prog = READ_ONCE(port->xdp_prog);
        if (!prog)
                return AM65_CPSW_XDP_PASS;
@@ -1190,8 +1192,10 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow,
                netif_txq = netdev_get_tx_queue(ndev, tx_chn->id);
 
                xdpf = xdp_convert_buff_to_frame(xdp);
-               if (unlikely(!xdpf))
+               if (unlikely(!xdpf)) {
+                       ndev->stats.tx_dropped++;
                        goto drop;
+               }
 
                __netif_tx_lock(netif_txq, cpu);
                err = am65_cpsw_xdp_tx_frame(ndev, tx_chn, xdpf,
@@ -1200,14 +1204,14 @@ static int am65_cpsw_run_xdp(struct am65_cpsw_rx_flow *flow,
                if (err)
                        goto drop;
 
-               dev_sw_netstats_tx_add(ndev, 1, *len);
+               dev_sw_netstats_rx_add(ndev, pkt_len);
                ret = AM65_CPSW_XDP_CONSUMED;
                goto out;
        case XDP_REDIRECT:
                if (unlikely(xdp_do_redirect(ndev, xdp, prog)))
                        goto drop;
 
-               dev_sw_netstats_rx_add(ndev, *len);
+               dev_sw_netstats_rx_add(ndev, pkt_len);
                ret = AM65_CPSW_XDP_REDIRECT;
                goto out;
        default: