Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d45b9d39 authored by Sathya Perla's avatar Sathya Perla Committed by David S. Miller
Browse files

be2net: add descriptions for stat counters reported via ethtool 



Also rename a few counters appropritely and delete 2 counters that are not
implemented in HW.

vlan_mismatch_drops does not exist in BE3 and is accounted for in
address_mismatch_drops. Do the same thing for BE2 and Lancer.

Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ef78adc

drivers/net/ethernet/emulex/benet/be.h

+1 −2
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ struct be_drv_stats { 
	u32 rx_drops_no_erx_descr;

	u32 rx_drops_no_tpre_descr;

	u32 rx_drops_too_many_frags;

	u32 rx_drops_invalid_ring;

	u32 forwarded_packets;

	u32 rx_drops_mtu;

	u32 rx_crc_errors;
@@ -276,7 +275,7 @@ struct be_drv_stats { 
	u32 rx_in_range_errors;

	u32 rx_out_range_errors;

	u32 rx_frame_too_long;

	u32 rx_address_match_errors;

	u32 rx_address_mismatch_drops;

	u32 rx_dropped_too_small;

	u32 rx_dropped_too_short;

	u32 rx_dropped_header_too_small;

drivers/net/ethernet/emulex/benet/be_cmds.h

+5 −5
Original line number Diff line number Diff line
@@ -592,8 +592,8 @@ struct be_port_rxf_stats_v0 { 
	u32 rx_in_range_errors;	/* dword 10*/

	u32 rx_out_range_errors;	/* dword 11*/

	u32 rx_frame_too_long;	/* dword 12*/

	u32 rx_address_match_errors;	/* dword 13*/

	u32 rx_vlan_mismatch;	/* dword 14*/

	u32 rx_address_mismatch_drops;	/* dword 13*/

	u32 rx_vlan_mismatch_drops;	/* dword 14*/

	u32 rx_dropped_too_small;	/* dword 15*/

	u32 rx_dropped_too_short;	/* dword 16*/

	u32 rx_dropped_header_too_small;	/* dword 17*/
@@ -799,8 +799,8 @@ struct lancer_pport_stats { 
	u32 rx_control_frames_unknown_opcode_hi;

	u32 rx_in_range_errors;

	u32 rx_out_of_range_errors;

	u32 rx_address_match_errors;

	u32 rx_vlan_mismatch_errors;

	u32 rx_address_mismatch_drops;

	u32 rx_vlan_mismatch_drops;

	u32 rx_dropped_too_small;

	u32 rx_dropped_too_short;

	u32 rx_dropped_header_too_small;
@@ -1384,7 +1384,7 @@ struct be_port_rxf_stats_v1 { 
	u32 rx_in_range_errors;

	u32 rx_out_range_errors;

	u32 rx_frame_too_long;

	u32 rx_address_match_errors;

	u32 rx_address_mismatch_drops;

	u32 rx_dropped_too_small;

	u32 rx_dropped_too_short;

	u32 rx_dropped_header_too_small;

drivers/net/ethernet/emulex/benet/be_ethtool.c

+61 −3
Original line number Diff line number Diff line
@@ -42,15 +42,42 @@ static const struct be_ethtool_stat et_stats[] = { 
	{DRVSTAT_INFO(rx_alignment_symbol_errors)},

	{DRVSTAT_INFO(rx_pause_frames)},

	{DRVSTAT_INFO(rx_control_frames)},

	/* Received packets dropped when the Ethernet length field

	 * is not equal to the actual Ethernet data length.

	 */

	{DRVSTAT_INFO(rx_in_range_errors)},

	/* Received packets dropped when their length field is >= 1501 bytes

	 * and <= 1535 bytes.

	 */

	{DRVSTAT_INFO(rx_out_range_errors)},

	/* Received packets dropped when they are longer than 9216 bytes */

	{DRVSTAT_INFO(rx_frame_too_long)},

	{DRVSTAT_INFO(rx_address_match_errors)},

	/* Received packets dropped when they don't pass the unicast or

	 * multicast address filtering.

	 */

	{DRVSTAT_INFO(rx_address_mismatch_drops)},

	/* Received packets dropped when IP packet length field is less than

	 * the IP header length field.

	 */

	{DRVSTAT_INFO(rx_dropped_too_small)},

	/* Received packets dropped when IP length field is greater than

	 * the actual packet length.

	 */

	{DRVSTAT_INFO(rx_dropped_too_short)},

	/* Received packets dropped when the IP header length field is less

	 * than 5.

	 */

	{DRVSTAT_INFO(rx_dropped_header_too_small)},

	/* Received packets dropped when the TCP header length field is less

	 * than 5 or the TCP header length + IP header length is more

	 * than IP packet length.

	 */

	{DRVSTAT_INFO(rx_dropped_tcp_length)},

	{DRVSTAT_INFO(rx_dropped_runt)},

	/* Number of received packets dropped when a fifo for descriptors going

	 * into the packet demux block overflows. In normal operation, this

	 * fifo must never overflow.

	 */

	{DRVSTAT_INFO(rxpp_fifo_overflow_drop)},

	{DRVSTAT_INFO(rx_input_fifo_overflow_drop)},

	{DRVSTAT_INFO(rx_ip_checksum_errs)},
@@ -59,16 +86,35 @@ static const struct be_ethtool_stat et_stats[] = { 
	{DRVSTAT_INFO(tx_pauseframes)},

	{DRVSTAT_INFO(tx_controlframes)},

	{DRVSTAT_INFO(rx_priority_pause_frames)},

	/* Received packets dropped when an internal fifo going into

	 * main packet buffer tank (PMEM) overflows.

	 */

	{DRVSTAT_INFO(pmem_fifo_overflow_drop)},

	{DRVSTAT_INFO(jabber_events)},

	/* Received packets dropped due to lack of available HW packet buffers

	 * used to temporarily hold the received packets.

	 */

	{DRVSTAT_INFO(rx_drops_no_pbuf)},

	{DRVSTAT_INFO(rx_drops_no_txpb)},

	/* Received packets dropped due to input receive buffer

	 * descriptor fifo overflowing.

	 */

	{DRVSTAT_INFO(rx_drops_no_erx_descr)},

	/* Packets dropped because the internal FIFO to the offloaded TCP

	 * receive processing block is full. This could happen only for

	 * offloaded iSCSI or FCoE trarffic.

	 */

	{DRVSTAT_INFO(rx_drops_no_tpre_descr)},

	/* Received packets dropped when they need more than 8

	 * receive buffers. This cannot happen as the driver configures

	 * 2048 byte receive buffers.

	 */

	{DRVSTAT_INFO(rx_drops_too_many_frags)},

	{DRVSTAT_INFO(rx_drops_invalid_ring)},

	{DRVSTAT_INFO(forwarded_packets)},

	/* Received packets dropped when the frame length

	 * is more than 9018 bytes

	 */

	{DRVSTAT_INFO(rx_drops_mtu)},

	/* Number of packets dropped due to random early drop function */

	{DRVSTAT_INFO(eth_red_drops)},

	{DRVSTAT_INFO(be_on_die_temperature)}

};
@@ -84,8 +130,15 @@ static const struct be_ethtool_stat et_rx_stats[] = { 
	{DRVSTAT_RX_INFO(rx_events)},

	{DRVSTAT_RX_INFO(rx_compl)},

	{DRVSTAT_RX_INFO(rx_mcast_pkts)},

	/* Number of page allocation failures while posting receive buffers

	 * to HW.

	 */

	{DRVSTAT_RX_INFO(rx_post_fail)},

	/* Recevied packets dropped due to skb allocation failure */

	{DRVSTAT_RX_INFO(rx_drops_no_skbs)},

	/* Received packets dropped due to lack of available fetched buffers

	 * posted by the driver.

	 */

	{DRVSTAT_RX_INFO(rx_drops_no_frags)}

};

#define ETHTOOL_RXSTATS_NUM (ARRAY_SIZE(et_rx_stats))
@@ -97,9 +150,14 @@ static const struct be_ethtool_stat et_tx_stats[] = { 
	{DRVSTAT_TX_INFO(tx_compl)}, /* If moving this member see above note */

	{DRVSTAT_TX_INFO(tx_bytes)},

	{DRVSTAT_TX_INFO(tx_pkts)},

	/* Number of skbs queued for trasmission by the driver */

	{DRVSTAT_TX_INFO(tx_reqs)},

	/* Number of TX work request blocks DMAed to HW */

	{DRVSTAT_TX_INFO(tx_wrbs)},

	{DRVSTAT_TX_INFO(tx_compl)},

	/* Number of times the TX queue was stopped due to lack

	 * of spaces in the TXQ.

	 */

	{DRVSTAT_TX_INFO(tx_stops)}

};

#define ETHTOOL_TXSTATS_NUM (ARRAY_SIZE(et_tx_stats))

drivers/net/ethernet/emulex/benet/be_main.c

+7 −8
Original line number Diff line number Diff line
@@ -286,7 +286,9 @@ static void populate_be2_stats(struct be_adapter *adapter) 
	drvs->rx_input_fifo_overflow_drop = port_stats->rx_input_fifo_overflow;

	drvs->rx_dropped_header_too_small =

		port_stats->rx_dropped_header_too_small;

	drvs->rx_address_match_errors = port_stats->rx_address_match_errors;

	drvs->rx_address_mismatch_drops =

					port_stats->rx_address_mismatch_drops +

					port_stats->rx_vlan_mismatch_drops;

	drvs->rx_alignment_symbol_errors =

		port_stats->rx_alignment_symbol_errors;
@@ -298,9 +300,7 @@ static void populate_be2_stats(struct be_adapter *adapter) 
	else

		drvs->jabber_events = rxf_stats->port0_jabber_events;

	drvs->rx_drops_no_pbuf = rxf_stats->rx_drops_no_pbuf;

	drvs->rx_drops_no_txpb = rxf_stats->rx_drops_no_txpb;

	drvs->rx_drops_no_erx_descr = rxf_stats->rx_drops_no_erx_descr;

	drvs->rx_drops_invalid_ring = rxf_stats->rx_drops_invalid_ring;

	drvs->forwarded_packets = rxf_stats->forwarded_packets;

	drvs->rx_drops_mtu = rxf_stats->rx_drops_mtu;

	drvs->rx_drops_no_tpre_descr = rxf_stats->rx_drops_no_tpre_descr;
@@ -337,7 +337,7 @@ static void populate_be3_stats(struct be_adapter *adapter) 
		port_stats->rx_dropped_header_too_small;

	drvs->rx_input_fifo_overflow_drop =

		port_stats->rx_input_fifo_overflow_drop;

	drvs->rx_address_match_errors = port_stats->rx_address_match_errors;

	drvs->rx_address_mismatch_drops = port_stats->rx_address_mismatch_drops;

	drvs->rx_alignment_symbol_errors =

		port_stats->rx_alignment_symbol_errors;

	drvs->rxpp_fifo_overflow_drop = port_stats->rxpp_fifo_overflow_drop;
@@ -345,9 +345,7 @@ static void populate_be3_stats(struct be_adapter *adapter) 
	drvs->tx_controlframes = port_stats->tx_controlframes;

	drvs->jabber_events = port_stats->jabber_events;

	drvs->rx_drops_no_pbuf = rxf_stats->rx_drops_no_pbuf;

	drvs->rx_drops_no_txpb = rxf_stats->rx_drops_no_txpb;

	drvs->rx_drops_no_erx_descr = rxf_stats->rx_drops_no_erx_descr;

	drvs->rx_drops_invalid_ring = rxf_stats->rx_drops_invalid_ring;

	drvs->forwarded_packets = rxf_stats->forwarded_packets;

	drvs->rx_drops_mtu = rxf_stats->rx_drops_mtu;

	drvs->rx_drops_no_tpre_descr = rxf_stats->rx_drops_no_tpre_descr;
@@ -380,13 +378,14 @@ static void populate_lancer_stats(struct be_adapter *adapter) 
	drvs->rx_dropped_header_too_small =

				pport_stats->rx_dropped_header_too_small;

	drvs->rx_input_fifo_overflow_drop = pport_stats->rx_fifo_overflow;

	drvs->rx_address_match_errors = pport_stats->rx_address_match_errors;

	drvs->rx_address_mismatch_drops =

					pport_stats->rx_address_mismatch_drops +

					pport_stats->rx_vlan_mismatch_drops;

	drvs->rx_alignment_symbol_errors = pport_stats->rx_symbol_errors_lo;

	drvs->rxpp_fifo_overflow_drop = pport_stats->rx_fifo_overflow;

	drvs->tx_pauseframes = pport_stats->tx_pause_frames_lo;

	drvs->tx_controlframes = pport_stats->tx_control_frames_lo;

	drvs->jabber_events = pport_stats->rx_jabbers;

	drvs->rx_drops_invalid_ring = pport_stats->rx_drops_invalid_queue;

	drvs->forwarded_packets = pport_stats->num_forwards_lo;

	drvs->rx_drops_mtu = pport_stats->rx_drops_mtu_lo;

	drvs->rx_drops_too_many_frags =