fm10k: add support for extra debug statistics
Subsystems (2)
PATCH 1/1 fm10k: add support for extra debug statistics
Add a private ethtool flag to enable display of these statistics, which are generally less useful. However, sometimes it can be useful for debugging purposes. The most useful portion is the ability to see what the PF thinks the VF mailboxes look like.
-rc2
* Add missing debug statistics from first pass
--- drivers/net/ethernet/intel/fm10k/fm10k.h | 19 ++ drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 226 +++++++++++++++++++---- drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 5 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 15 ++ drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 18 ++ drivers/net/ethernet/intel/fm10k/fm10k_type.h | 6 + 6 files changed, 248 insertions(+), 41 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k.h +19 -0
@@ -101,12 +101,19 @@ struct fm10k_tx_queue_stats {u64 csum_err;u64 tx_busy;u64 tx_done_old; +u64 csum_good; };struct fm10k_rx_queue_stats {u64 alloc_failed;u64 csum_err;u64 errors; +u64 csum_good; +u64 switch_errors; +u64 drops; +u64 pp_errors; +u64 link_errors; +u64 length_errors; };struct fm10k_ring {
@@ -251,6 +258,7 @@ struct fm10k_intfc {#define FM10K_FLAG_RSS_FIELD_IPV6_UDP (u32)(1 << 2)#define FM10K_FLAG_RX_TS_ENABLED (u32)(1 << 3)#define FM10K_FLAG_SWPRI_CONFIG (u32)(1 << 4) +#define FM10K_FLAG_DEBUG_STATS (u32)(1 << 5)int xcast_mode;/* Tx fast path data */
@@ -277,6 +285,17 @@ struct fm10k_intfc {u64 rx_drops_nic;u64 rx_overrun_pf;u64 rx_overrun_vf; + +/* Debug Statistics */ +u64 hw_sm_mbx_full; +u64 hw_csum_tx_good; +u64 hw_csum_rx_good; +u64 rx_switch_errors; +u64 rx_drops; +u64 rx_pp_errors; +u64 rx_link_errors; +u64 rx_length_errors; +u32 tx_timeout_count;/* RX */
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c +186 -40
309 lines not on this page · raw message
drivers/net/ethernet/intel/fm10k/fm10k_iov.c +4 -1
@@ -137,8 +137,11 @@ process_mbx: }/* guarantee we have free space in the SM mailbox */ -if (!hw->mbx.ops.tx_ready (&hw->mbx,FM10K_VFMBX_MSG_MTU )) +if (!hw->mbx.ops.tx_ready (&hw->mbx,FM10K_VFMBX_MSG_MTU )) { +/* keep track of how many times this occurs */ + interface->hw_sm_mbx_full++;break ; + }/* cleanup mailbox and process received messages */ mbx->ops.process (hw, mbx);
drivers/net/ethernet/intel/fm10k/fm10k_main.c +15 -0
@@ -398,6 +398,8 @@ static inline void fm10k_rx_checksum(struct fm10k_ring *ring,return ; skb->ip_summed =CHECKSUM_UNNECESSARY ; + + ring->rx_stats.csum_good++; }#define FM10K_RSS_L4_TYPES_MASK \
@@ -553,6 +555,18 @@ static bool fm10k_cleanup_headers(struct fm10k_ring *rx_ring, {if (unlikely ((fm10k_test_staterr (rx_desc,FM10K_RXD_STATUS_RXE )))) { +#define FM10K_TEST_RXD_BIT (rxd, bit) \ + ((rxd)->w.csum_err & cpu_to_le16(bit)) +if (FM10K_TEST_RXD_BIT (rx_desc,FM10K_RXD_ERR_SWITCH_ERROR )) + rx_ring->rx_stats.switch_errors++; +if (FM10K_TEST_RXD_BIT (rx_desc,FM10K_RXD_ERR_NO_DESCRIPTOR )) + rx_ring->rx_stats.drops++; +if (FM10K_TEST_RXD_BIT (rx_desc,FM10K_RXD_ERR_PP_ERROR )) + rx_ring->rx_stats.pp_errors++; +if (FM10K_TEST_RXD_BIT (rx_desc,FM10K_RXD_ERR_SWITCH_READY )) + rx_ring->rx_stats.link_errors++; +if (FM10K_TEST_RXD_BIT (rx_desc,FM10K_RXD_ERR_TOO_BIG )) + rx_ring->rx_stats.length_errors++;dev_kfree_skb_any (skb); rx_ring->rx_stats.errors++;return true;
@@ -878,6 +892,7 @@ static void fm10k_tx_csum(struct fm10k_ring *tx_ring,/* update TX checksum flag */ first->tx_flags |=FM10K_TX_FLAGS_CSUM ; + tx_ring->tx_stats.csum_good++; no_csum:/* populate Tx descriptor header size and mss */
drivers/net/ethernet/intel/fm10k/fm10k_pci.c +18 -0
@@ -328,6 +328,9 @@ void fm10k_update_stats(struct fm10k_intfc *interface) {struct net_device_stats *net_stats = &interface->netdev->stats;struct fm10k_hw *hw = &interface->hw; +u64 hw_csum_tx_good =0 , hw_csum_rx_good =0 , rx_length_errors =0 ; +u64 rx_switch_errors =0 , rx_drops =0 , rx_pp_errors =0 ; +u64 rx_link_errors =0 ;u64 rx_errors =0 , rx_csum_errors =0 , tx_csum_errors =0 ;u64 restart_queue =0 , tx_busy =0 , alloc_failed =0 ;u64 rx_bytes_nic =0 , rx_pkts_nic =0 , rx_drops_nic =0 ;
@@ -347,6 +350,7 @@ void fm10k_update_stats(struct fm10k_intfc *interface) tx_csum_errors += tx_ring->tx_stats.csum_err; bytes += tx_ring->stats.bytes; pkts += tx_ring->stats.packets; + hw_csum_tx_good += tx_ring->tx_stats.csum_good; } interface->restart_queue = restart_queue;
@@ -354,6 +358,8 @@ void fm10k_update_stats(struct fm10k_intfc *interface) net_stats->tx_bytes = bytes; net_stats->tx_packets = pkts; interface->tx_csum_errors = tx_csum_errors; + interface->hw_csum_tx_good = hw_csum_tx_good; +/* gather some stats to the interface struct that are per queue */ for (bytes =0 , pkts =0 , i =0 ; i < interface->num_rx_queues; i++) {struct fm10k_ring *rx_ring = interface->rx_ring[i];
@@ -363,12 +369,24 @@ void fm10k_update_stats(struct fm10k_intfc *interface) alloc_failed += rx_ring->rx_stats.alloc_failed; rx_csum_errors += rx_ring->rx_stats.csum_err; rx_errors += rx_ring->rx_stats.errors; + hw_csum_rx_good += rx_ring->rx_stats.csum_good; + rx_switch_errors += rx_ring->rx_stats.switch_errors; + rx_drops += rx_ring->rx_stats.drops; + rx_pp_errors += rx_ring->rx_stats.pp_errors; + rx_link_errors += rx_ring->rx_stats.link_errors; + rx_length_errors += rx_ring->rx_stats.length_errors; } net_stats->rx_bytes = bytes; net_stats->rx_packets = pkts; interface->alloc_failed = alloc_failed; interface->rx_csum_errors = rx_csum_errors; + interface->hw_csum_rx_good = hw_csum_rx_good; + interface->rx_switch_errors = rx_switch_errors; + interface->rx_drops = rx_drops; + interface->rx_pp_errors = rx_pp_errors; + interface->rx_link_errors = rx_link_errors; + interface->rx_length_errors = rx_length_errors; hw->mac.ops.update_hw_stats (hw, &interface->stats);
drivers/net/ethernet/intel/fm10k/fm10k_type.h +6 -0
@@ -762,6 +762,12 @@ enum fm10k_rxdesc_xc {#define FM10K_RXD_STATUS_L4E 0x4000/* L4 csum error */ #define FM10K_RXD_STATUS_IPE 0x8000/* IPv4 csum error */ +#define FM10K_RXD_ERR_SWITCH_ERROR 0x0001/* Switch found bad packet */ +#define FM10K_RXD_ERR_NO_DESCRIPTOR 0x0002/* No descriptor available */ +#define FM10K_RXD_ERR_PP_ERROR 0x0004/* RAM error during processing */ +#define FM10K_RXD_ERR_SWITCH_READY 0x0008/* Link transition mid-packet */ +#define FM10K_RXD_ERR_TOO_BIG 0x0010/* Pkt too big for single buf */ +struct fm10k_ftag {__be16 swpri_type_user;__be16 vlan;
Signature · 1 line
2.4.3
Singh
PATCH 1/1 fm10k: add support for extra debug statistics
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Wednesday, July 1, 2015 5:39 PM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH net-next rc2] fm10k: add support for extra debug statistics
Add a private ethtool flag to enable display of these statistics, which are generally less useful. However, sometimes it can be useful for debugging purposes. The most useful portion is the ability to see what the PF thinks the VF mailboxes look like.
-rc2
* Add missing debug statistics from first pass
---
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at lists.osuosl.org
http://lists.osuosl.org/mailman/listinfo/intel-wired-lan