]> www.infradead.org Git - users/hch/misc.git/commitdiff
octeon_ep: remove firmware stats fetch in ndo_get_stats64
authorShinas Rasheed <srasheed@marvell.com>
Fri, 17 Jan 2025 09:46:50 +0000 (01:46 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sun, 19 Jan 2025 01:26:38 +0000 (17:26 -0800)
The firmware stats fetch call that happens in ndo_get_stats64()
is currently not required, and causes a warning to issue.

The warn log is given below:

[  123.316837] ------------[ cut here ]------------
[  123.316840] Voluntary context switch within RCU read-side critical section!
[  123.316917] pc : rcu_note_context_switch+0x2e4/0x300
[  123.316919] lr : rcu_note_context_switch+0x2e4/0x300
[  123.316947] Call trace:
[  123.316949]  rcu_note_context_switch+0x2e4/0x300
[  123.316952]  __schedule+0x84/0x584
[  123.316955]  schedule+0x38/0x90
[  123.316956]  schedule_timeout+0xa0/0x1d4
[  123.316959]  octep_send_mbox_req+0x190/0x230 [octeon_ep]
[  123.316966]  octep_ctrl_net_get_if_stats+0x78/0x100 [octeon_ep]
[  123.316970]  octep_get_stats64+0xd4/0xf0 [octeon_ep]
[  123.316975]  dev_get_stats+0x4c/0x114
[  123.316977]  dev_seq_printf_stats+0x3c/0x11c
[  123.316980]  dev_seq_show+0x1c/0x40
[  123.316982]  seq_read_iter+0x3cc/0x4e0
[  123.316985]  seq_read+0xc8/0x110
[  123.316987]  proc_reg_read+0x9c/0xec
[  123.316990]  vfs_read+0xc8/0x2ec
[  123.316993]  ksys_read+0x70/0x100
[  123.316995]  __arm64_sys_read+0x20/0x30
[  123.316997]  invoke_syscall.constprop.0+0x7c/0xd0
[  123.317000]  do_el0_svc+0xb4/0xd0
[  123.317002]  el0_svc+0xe8/0x1f4
[  123.317005]  el0t_64_sync_handler+0x134/0x150
[  123.317006]  el0t_64_sync+0x17c/0x180
[  123.317008] ---[ end trace 63399811432ab69b ]---

Fixes: 6a610a46bad1 ("octeon_ep: add support for ndo ops")
Signed-off-by: Shinas Rasheed <srasheed@marvell.com>
Link: https://patch.msgid.link/20250117094653.2588578-2-srasheed@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/marvell/octeon_ep/octep_main.c

index 549436efc20488a3ab2d0ae978ba498d050ffbbf..730aa5632cceee6eff388c01f056f6eb67f3de0b 100644 (file)
@@ -995,12 +995,6 @@ static void octep_get_stats64(struct net_device *netdev,
        struct octep_device *oct = netdev_priv(netdev);
        int q;
 
-       if (netif_running(netdev))
-               octep_ctrl_net_get_if_stats(oct,
-                                           OCTEP_CTRL_NET_INVALID_VFID,
-                                           &oct->iface_rx_stats,
-                                           &oct->iface_tx_stats);
-
        tx_packets = 0;
        tx_bytes = 0;
        rx_packets = 0;
@@ -1018,10 +1012,6 @@ static void octep_get_stats64(struct net_device *netdev,
        stats->tx_bytes = tx_bytes;
        stats->rx_packets = rx_packets;
        stats->rx_bytes = rx_bytes;
-       stats->multicast = oct->iface_rx_stats.mcast_pkts;
-       stats->rx_errors = oct->iface_rx_stats.err_pkts;
-       stats->collisions = oct->iface_tx_stats.xscol;
-       stats->tx_fifo_errors = oct->iface_tx_stats.undflw;
 }
 
 /**