kernel: pick patches for MediaTek Ethernet from linux-next

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 706-02-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-ethtool-count.patch

diff --git a/target/linux/generic/backport-5.15/706-02-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-ethtool-count.patch b/target/linux/generic/backport-5.15/706-02-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-ethtool-count.patch
new file mode 100644 (file)
index 0000000..b68f44a
--- /dev/null
+++ b/target/linux/generic/backport-5.15/706-02-v6.0-net-ethernet-mtk_eth_soc-introduce-xdp-ethtool-count.patch
@@ -0,0 +1,110 @@
+From 916a6ee836d6b7b8ef1ed5f0515e256ca60e9968 Mon Sep 17 00:00:00 2001
+From: Lorenzo Bianconi <lorenzo@kernel.org>
+Date: Fri, 22 Jul 2022 09:19:38 +0200
+Subject: [PATCH] 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>
+---
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 26 +++++++++++++++++++--
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 12 ++++++++++
+ 2 files changed, 36 insertions(+), 2 deletions(-)
+
+--- 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 lev
+ #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[] = {
+@@ -1458,6 +1469,9 @@ static void mtk_rx_put_buff(struct mtk_r
+ 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;
+ 
+@@ -1470,13 +1484,16 @@ static u32 mtk_xdp_run(struct mtk_eth *e
+       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(act);
+               fallthrough;
+@@ -1489,6 +1506,11 @@ static u32 mtk_xdp_run(struct mtk_eth *e
+ 
+       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();
+ 
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+@@ -567,6 +567,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
+@@ -590,6 +600,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;