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

Commit e4d112e4 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: add extra RX drop counters for nodesc_trunc and noskb_drop 



Added a counter rx_noskb_drop for failure to allocate an skb.
Summed the per-channel rx_nodesc_trunc counters earlier so that they can
 be included in rx_dropped.

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d762d038

drivers/net/ethernet/sfc/ef10.c

+11 −3
Original line number Diff line number Diff line
@@ -755,6 +755,8 @@ static int efx_ef10_reset(struct efx_nic *efx, enum reset_type reset_type) 
	{ NULL, 64, 8 * MC_CMD_MAC_ ## mcdi_name }

#define EF10_OTHER_STAT(ext_name)				\

	[EF10_STAT_ ## ext_name] = { #ext_name, 0, 0 }

#define GENERIC_SW_STAT(ext_name)				\

	[GENERIC_STAT_ ## ext_name] = { #ext_name, 0, 0 }



static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = {

	EF10_DMA_STAT(tx_bytes, TX_BYTES),
@@ -798,6 +800,8 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = { 
	EF10_DMA_STAT(rx_align_error, RX_ALIGN_ERROR_PKTS),

	EF10_DMA_STAT(rx_length_error, RX_LENGTH_ERROR_PKTS),

	EF10_DMA_STAT(rx_nodesc_drops, RX_NODESC_DROPS),

	GENERIC_SW_STAT(rx_nodesc_trunc),

	GENERIC_SW_STAT(rx_noskb_drops),

	EF10_DMA_STAT(rx_pm_trunc_bb_overflow, PM_TRUNC_BB_OVERFLOW),

	EF10_DMA_STAT(rx_pm_discard_bb_overflow, PM_DISCARD_BB_OVERFLOW),

	EF10_DMA_STAT(rx_pm_trunc_vfifo_full, PM_TRUNC_VFIFO_FULL),
@@ -841,7 +845,9 @@ static const struct efx_hw_stat_desc efx_ef10_stat_desc[EF10_STAT_COUNT] = { 
			       (1ULL << EF10_STAT_rx_gtjumbo) |		\

			       (1ULL << EF10_STAT_rx_bad_gtjumbo) |	\

			       (1ULL << EF10_STAT_rx_overflow) |	\

			       (1ULL << EF10_STAT_rx_nodesc_drops))

			       (1ULL << EF10_STAT_rx_nodesc_drops) |	\

			       (1ULL << GENERIC_STAT_rx_nodesc_trunc) |	\

			       (1ULL << GENERIC_STAT_rx_noskb_drops))



/* These statistics are only provided by the 10G MAC.  For a 10G/40G

 * switchable port we do not expose these because they might not
@@ -951,7 +957,7 @@ static int efx_ef10_try_update_nic_stats(struct efx_nic *efx) 
		stats[EF10_STAT_rx_bytes_minus_good_bytes];

	efx_update_diff_stat(&stats[EF10_STAT_rx_bad_bytes],

			     stats[EF10_STAT_rx_bytes_minus_good_bytes]);



	efx_update_sw_stats(efx, stats);

	return 0;

}
@@ -990,7 +996,9 @@ static size_t efx_ef10_update_stats(struct efx_nic *efx, u64 *full_stats, 
		core_stats->tx_packets = stats[EF10_STAT_tx_packets];

		core_stats->rx_bytes = stats[EF10_STAT_rx_bytes];

		core_stats->tx_bytes = stats[EF10_STAT_tx_bytes];

		core_stats->rx_dropped = stats[EF10_STAT_rx_nodesc_drops];

		core_stats->rx_dropped = stats[EF10_STAT_rx_nodesc_drops] +

					 stats[GENERIC_STAT_rx_nodesc_trunc] +

					 stats[GENERIC_STAT_rx_noskb_drops];

		core_stats->multicast = stats[EF10_STAT_rx_multicast];

		core_stats->rx_length_errors =

			stats[EF10_STAT_rx_gtjumbo] +

drivers/net/ethernet/sfc/efx.c

+11 −0
Original line number Diff line number Diff line
@@ -2724,6 +2724,17 @@ static void efx_fini_struct(struct efx_nic *efx) 
	}

}



void efx_update_sw_stats(struct efx_nic *efx, u64 *stats)

{

	u64 n_rx_nodesc_trunc = 0;

	struct efx_channel *channel;



	efx_for_each_channel(channel, efx)

		n_rx_nodesc_trunc += channel->n_rx_nodesc_trunc;

	stats[GENERIC_STAT_rx_nodesc_trunc] = n_rx_nodesc_trunc;

	stats[GENERIC_STAT_rx_noskb_drops] = atomic_read(&efx->n_rx_noskb_drops);

}



/**************************************************************************

 *

 * PCI interface

drivers/net/ethernet/sfc/efx.h

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ void efx_get_irq_moderation(struct efx_nic *efx, unsigned int *tx_usecs, 
int efx_port_dummy_op_int(struct efx_nic *efx);

void efx_port_dummy_op_void(struct efx_nic *efx);



/* Update the generic software stats in the passed stats array */

void efx_update_sw_stats(struct efx_nic *efx, u64 *stats);



/* MTD */

#ifdef CONFIG_SFC_MTD

int efx_mtd_add(struct efx_nic *efx, struct efx_mtd_partition *parts,

drivers/net/ethernet/sfc/ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ static const struct efx_sw_stat_desc efx_sw_stat_desc[] = { 
	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_tcp_udp_chksum_err),

	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_mcast_mismatch),

	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_frm_trunc),

	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_nodesc_trunc),

	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_merge_events),

	EFX_ETHTOOL_UINT_CHANNEL_STAT(rx_merge_packets),

};

drivers/net/ethernet/sfc/falcon.c

+8 −1
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ 
	  hw_name ## _ ## offset }

#define FALCON_OTHER_STAT(ext_name)					\

	[FALCON_STAT_ ## ext_name] = { #ext_name, 0, 0 }

#define GENERIC_SW_STAT(ext_name)				\

	[GENERIC_STAT_ ## ext_name] = { #ext_name, 0, 0 }



static const struct efx_hw_stat_desc falcon_stat_desc[FALCON_STAT_COUNT] = {

	FALCON_DMA_STAT(tx_bytes, XgTxOctets),
@@ -191,6 +193,8 @@ static const struct efx_hw_stat_desc falcon_stat_desc[FALCON_STAT_COUNT] = { 
	FALCON_DMA_STAT(rx_length_error, XgRxLengthError),

	FALCON_DMA_STAT(rx_internal_error, XgRxInternalMACError),

	FALCON_OTHER_STAT(rx_nodesc_drop_cnt),

	GENERIC_SW_STAT(rx_nodesc_trunc),

	GENERIC_SW_STAT(rx_noskb_drops),

};

static const unsigned long falcon_stat_mask[] = {

	[0 ... BITS_TO_LONGS(FALCON_STAT_COUNT) - 1] = ~0UL,
@@ -2574,6 +2578,7 @@ static size_t falcon_update_nic_stats(struct efx_nic *efx, u64 *full_stats, 
				     stats[FALCON_STAT_rx_bytes] -

				     stats[FALCON_STAT_rx_good_bytes] -

				     stats[FALCON_STAT_rx_control] * 64);

		efx_update_sw_stats(efx, stats);

	}



	if (full_stats)
@@ -2584,7 +2589,9 @@ static size_t falcon_update_nic_stats(struct efx_nic *efx, u64 *full_stats, 
		core_stats->tx_packets = stats[FALCON_STAT_tx_packets];

		core_stats->rx_bytes = stats[FALCON_STAT_rx_bytes];

		core_stats->tx_bytes = stats[FALCON_STAT_tx_bytes];

		core_stats->rx_dropped = stats[FALCON_STAT_rx_nodesc_drop_cnt];

		core_stats->rx_dropped = stats[FALCON_STAT_rx_nodesc_drop_cnt] +

					 stats[GENERIC_STAT_rx_nodesc_trunc] +

					 stats[GENERIC_STAT_rx_noskb_drops];

		core_stats->multicast = stats[FALCON_STAT_rx_multicast];

		core_stats->rx_length_errors =

			stats[FALCON_STAT_rx_gtjumbo] +