| Message ID | 35782d70ad89c72d5dc819f9a12b2e5b4e742141.1724852597.git.ecree.xilinx@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | sfc: per-queue stats | expand |
On 8/28/2024 6:45 AM, edward.cree@amd.com wrote: > From: Edward Cree <ecree.xilinx@gmail.com> > > Signed-off-by: Edward Cree <ecree.xilinx@gmail.com> > --- Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> > drivers/net/ethernet/sfc/efx.c | 20 +++++++++++++++++--- > drivers/net/ethernet/sfc/net_driver.h | 4 ++++ > drivers/net/ethernet/sfc/tx_common.c | 2 ++ > 3 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c > index 8b46d143b6c7..bf06fbcdcbff 100644 > --- a/drivers/net/ethernet/sfc/efx.c > +++ b/drivers/net/ethernet/sfc/efx.c > @@ -653,14 +653,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->hw_gso_packets = 0; > + stats->hw_gso_wire_packets = 0; > /* If a TX channel has XDP TXQs, the stats for these will be counted > * under the channel rather than in base stats. Unclear whether this > * is correct behaviour, but we can't reliably exclude XDP TXes from > * these stats anyway because in EFX_XDP_TX_QUEUES_BORROWED we use > * the same TXQ as the core. > */ > - efx_for_each_channel_tx_queue(tx_queue, channel) > + efx_for_each_channel_tx_queue(tx_queue, channel) { > stats->packets += tx_queue->tx_packets - tx_queue->old_tx_packets; > + 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; > + } > } > > static void efx_get_base_stats(struct net_device *net_dev, > @@ -676,6 +683,8 @@ static void efx_get_base_stats(struct net_device *net_dev, > rx->hw_drops = 0; > rx->hw_drop_overruns = 0; > tx->packets = 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. > @@ -694,10 +703,15 @@ static void efx_get_base_stats(struct net_device *net_dev, > efx_for_each_channel_tx_queue(tx_queue, channel) { > if (channel->channel < efx->tx_channel_offset || > channel->channel >= efx->tx_channel_offset + > - net_dev->real_num_tx_queues) > + net_dev->real_num_tx_queues) { > tx->packets += tx_queue->tx_packets; > - else > + tx->hw_gso_packets += tx_queue->tso_bursts; > + tx->hw_gso_wire_packets += tx_queue->tso_packets; > + } else { > tx->packets += tx_queue->old_tx_packets; > + tx->hw_gso_packets += tx_queue->old_tso_bursts; > + tx->hw_gso_wire_packets += tx_queue->old_tso_packets; > + } > } > } > } > diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h > index 25701f37aa40..2cf2935a713c 100644 > --- a/drivers/net/ethernet/sfc/net_driver.h > +++ b/drivers/net/ethernet/sfc/net_driver.h > @@ -234,6 +234,8 @@ struct efx_tx_buffer { > * @notify_count: Count of notified descriptors to the NIC > * @tx_packets: Number of packets sent since this struct was created > * @old_tx_packets: Value of @tx_packets 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() > * @empty_read_count: If the completion path has seen the queue as empty > * and the transmission path has not yet checked this, the value of > * @read_count bitwise-added to %EFX_EMPTY_COUNT_VALID; otherwise 0. > @@ -284,6 +286,8 @@ struct efx_tx_queue { > /* Statistics to supplement MAC stats */ > unsigned long tx_packets; > unsigned long old_tx_packets; > + unsigned int old_tso_bursts; > + unsigned int old_tso_packets; > > /* Members shared between paths and sometimes updated */ > unsigned int empty_read_count ____cacheline_aligned_in_smp; > diff --git a/drivers/net/ethernet/sfc/tx_common.c b/drivers/net/ethernet/sfc/tx_common.c > index f1694900e0f0..cd0857131aa8 100644 > --- a/drivers/net/ethernet/sfc/tx_common.c > +++ b/drivers/net/ethernet/sfc/tx_common.c > @@ -87,6 +87,8 @@ void efx_init_tx_queue(struct efx_tx_queue *tx_queue) > tx_queue->completed_timestamp_minor = 0; > > tx_queue->old_tx_packets = tx_queue->tx_packets; > + 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; >
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 8b46d143b6c7..bf06fbcdcbff 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -653,14 +653,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->hw_gso_packets = 0; + stats->hw_gso_wire_packets = 0; /* If a TX channel has XDP TXQs, the stats for these will be counted * under the channel rather than in base stats. Unclear whether this * is correct behaviour, but we can't reliably exclude XDP TXes from * these stats anyway because in EFX_XDP_TX_QUEUES_BORROWED we use * the same TXQ as the core. */ - efx_for_each_channel_tx_queue(tx_queue, channel) + efx_for_each_channel_tx_queue(tx_queue, channel) { stats->packets += tx_queue->tx_packets - tx_queue->old_tx_packets; + 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; + } } static void efx_get_base_stats(struct net_device *net_dev, @@ -676,6 +683,8 @@ static void efx_get_base_stats(struct net_device *net_dev, rx->hw_drops = 0; rx->hw_drop_overruns = 0; tx->packets = 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. @@ -694,10 +703,15 @@ static void efx_get_base_stats(struct net_device *net_dev, efx_for_each_channel_tx_queue(tx_queue, channel) { if (channel->channel < efx->tx_channel_offset || channel->channel >= efx->tx_channel_offset + - net_dev->real_num_tx_queues) + net_dev->real_num_tx_queues) { tx->packets += tx_queue->tx_packets; - else + tx->hw_gso_packets += tx_queue->tso_bursts; + tx->hw_gso_wire_packets += tx_queue->tso_packets; + } else { tx->packets += tx_queue->old_tx_packets; + tx->hw_gso_packets += tx_queue->old_tso_bursts; + tx->hw_gso_wire_packets += tx_queue->old_tso_packets; + } } } } diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index 25701f37aa40..2cf2935a713c 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h @@ -234,6 +234,8 @@ struct efx_tx_buffer { * @notify_count: Count of notified descriptors to the NIC * @tx_packets: Number of packets sent since this struct was created * @old_tx_packets: Value of @tx_packets 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() * @empty_read_count: If the completion path has seen the queue as empty * and the transmission path has not yet checked this, the value of * @read_count bitwise-added to %EFX_EMPTY_COUNT_VALID; otherwise 0. @@ -284,6 +286,8 @@ struct efx_tx_queue { /* Statistics to supplement MAC stats */ unsigned long tx_packets; unsigned long old_tx_packets; + unsigned int old_tso_bursts; + unsigned int old_tso_packets; /* Members shared between paths and sometimes updated */ unsigned int empty_read_count ____cacheline_aligned_in_smp; diff --git a/drivers/net/ethernet/sfc/tx_common.c b/drivers/net/ethernet/sfc/tx_common.c index f1694900e0f0..cd0857131aa8 100644 --- a/drivers/net/ethernet/sfc/tx_common.c +++ b/drivers/net/ethernet/sfc/tx_common.c @@ -87,6 +87,8 @@ void efx_init_tx_queue(struct efx_tx_queue *tx_queue) tx_queue->completed_timestamp_minor = 0; tx_queue->old_tx_packets = tx_queue->tx_packets; + 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;