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

sfc: implement per-queue TSO (hw_gso) stats 



Use our existing TSO stats, which count enqueued TSO TXes.
Users may expect them to count completions, as tx-packets and
 tx-bytes do; however, these are the counters we have, and the
 qstats documentation doesn't actually specify.

Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 07e5fa5b

drivers/net/ethernet/sfc/efx.c

+16 −0
Original line number Diff line number Diff line
@@ -654,11 +654,21 @@ static void efx_get_queue_stats_tx(struct net_device *net_dev, int idx, 
	channel = efx_get_tx_channel(efx, idx);

	stats->packets = 0;

	stats->bytes = 0;

	stats->hw_gso_packets = 0;

	stats->hw_gso_wire_packets = 0;

	efx_for_each_channel_tx_queue(tx_queue, channel) {

		stats->packets += tx_queue->complete_packets -

				  tx_queue->old_complete_packets;

		stats->bytes += tx_queue->complete_bytes -

				tx_queue->old_complete_bytes;

		/* Note that, unlike stats->packets and stats->bytes,

		 * these count TXes enqueued, rather than completed,

		 * which may not be what users expect.

		 */

		stats->hw_gso_packets += tx_queue->tso_bursts -

					 tx_queue->old_tso_bursts;

		stats->hw_gso_wire_packets += tx_queue->tso_packets -

					      tx_queue->old_tso_packets;

	}

}
@@ -676,6 +686,8 @@ static void efx_get_base_stats(struct net_device *net_dev, 
	rx->hw_drop_overruns = 0;

	tx->packets = 0;

	tx->bytes = 0;

	tx->hw_gso_packets = 0;

	tx->hw_gso_wire_packets = 0;



	/* Count all packets on non-core queues, and packets before last

	 * datapath start on core queues.
@@ -697,9 +709,13 @@ static void efx_get_base_stats(struct net_device *net_dev, 
						net_dev->real_num_tx_queues) {

				tx->packets += tx_queue->complete_packets;

				tx->bytes += tx_queue->complete_bytes;

				tx->hw_gso_packets += tx_queue->tso_bursts;

				tx->hw_gso_wire_packets += tx_queue->tso_packets;

			} else {

				tx->packets += tx_queue->old_complete_packets;

				tx->bytes += tx_queue->old_complete_bytes;

				tx->hw_gso_packets += tx_queue->old_tso_bursts;

				tx->hw_gso_wire_packets += tx_queue->old_tso_packets;

			}

			/* Include XDP TX in device-wide stats */

			tx->packets += tx_queue->complete_xdp_packets;

drivers/net/ethernet/sfc/net_driver.h

+4 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ struct efx_tx_buffer { 
 *	efx_init_tx_queue()

 * @old_complete_bytes: Value of @complete_bytes as of last

 *	efx_init_tx_queue()

 * @old_tso_bursts: Value of @tso_bursts as of last efx_init_tx_queue()

 * @old_tso_packets: Value of @tso_packets as of last efx_init_tx_queue()

 * @read_count: Current read pointer.

 *	This is the number of buffers that have been removed from both rings.

 * @old_write_count: The value of @write_count when last checked.
@@ -276,6 +278,8 @@ struct efx_tx_queue { 
	bool xdp_tx;

	unsigned long old_complete_packets;

	unsigned long old_complete_bytes;

	unsigned int old_tso_bursts;

	unsigned int old_tso_packets;



	/* Members used mainly on the completion path */

	unsigned int read_count ____cacheline_aligned_in_smp;

drivers/net/ethernet/sfc/tx_common.c

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ void efx_init_tx_queue(struct efx_tx_queue *tx_queue) 


	tx_queue->old_complete_packets = tx_queue->complete_packets;

	tx_queue->old_complete_bytes = tx_queue->complete_bytes;

	tx_queue->old_tso_bursts = tx_queue->tso_bursts;

	tx_queue->old_tso_packets = tx_queue->tso_packets;



	tx_queue->xdp_tx = efx_channel_is_xdp_tx(tx_queue->channel);

	tx_queue->tso_version = 0;