From: Simon Horman <horms@kernel.org>
To: Sean Anderson <sean.anderson@linux.dev>
Cc: Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>,
netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Michal Simek <michal.simek@amd.com>,
Jakub Kicinski <kuba@kernel.org>,
Russell King <linux@armlinux.org.uk>,
Paolo Abeni <pabeni@redhat.com>,
Eric Dumazet <edumazet@google.com>,
linux-kernel@vger.kernel.org,
"David S . Miller" <davem@davemloft.net>
Subject: Re: [PATCH net-next 3/3] net: xilinx: axienet: Add statistics support
Date: Fri, 14 Jun 2024 17:30:50 +0100 [thread overview]
Message-ID: <20240614163050.GV8447@kernel.org> (raw)
In-Reply-To: <20240610231022.2460953-4-sean.anderson@linux.dev>
On Mon, Jun 10, 2024 at 07:10:22PM -0400, Sean Anderson wrote:
> Add support for reading the statistics counters, if they are enabled.
> The counters may be 64-bit, but we can't detect this as there's no
> ability bit for it and the counters are read-only. Therefore, we assume
> the counters are 32-bits. To ensure we don't miss an overflow, we need
> to read all counters at regular intervals, configurable with
> stats-block-usecs. This should be often enough to ensure the bytes
> counters don't wrap at 2.5 Gbit/s.
>
> Another complication is that the counters may be reset when the device
> is reset (depending on configuration). To ensure the counters persist
> across link up/down (including suspend/resume), we maintain our own
> 64-bit versions along with the last counter value we saw. Because we
> might wait up to 100 ms for the reset to complete, we use a mutex to
> protect writing hw_stats. We can't sleep in ndo_get_stats64, so we use a
> u64_stats_sync to protect readers.
>
> We can't use the byte counters for either get_stats64 or
> get_eth_mac_stats. This is because the byte counters include everything
> in the frame (destination address to FCS, inclusive). But
> rtnl_link_stats64 wants bytes excluding the FCS, and
> ethtool_eth_mac_stats wants to exclude the L2 overhead (addresses and
> length/type).
>
> Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
> ---
>
> drivers/net/ethernet/xilinx/xilinx_axienet.h | 81 ++++++
> .../net/ethernet/xilinx/xilinx_axienet_main.c | 267 +++++++++++++++++-
> 2 files changed, 345 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet.h b/drivers/net/ethernet/xilinx/xilinx_axienet.h
...
> @@ -434,6 +502,11 @@ struct skbuf_dma_descriptor {
> * @tx_packets: TX packet count for statistics
> * @tx_bytes: TX byte count for statistics
> * @tx_stat_sync: Synchronization object for TX stats
> + * @hw_last_counter: Last-seen value of each statistic
> + * @hw_stats: Interface statistics periodically updated from hardware counters
> + * @hw_stats_sync: Synchronization object for @hw_stats
nit: s/hw_stats_sync/hw_stat_sync/
Flagged by kernel-doc -none
> + * @stats_lock: Lock for writing @hw_stats and @hw_last_counter
> + * @stats_work: Work for reading the hardware statistics counters
> * @dma_err_task: Work structure to process Axi DMA errors
> * @tx_irq: Axidma TX IRQ number
> * @rx_irq: Axidma RX IRQ number
> @@ -452,6 +525,7 @@ struct skbuf_dma_descriptor {
> * @coalesce_usec_rx: IRQ coalesce delay for RX
> * @coalesce_count_tx: Store the irq coalesce on TX side.
> * @coalesce_usec_tx: IRQ coalesce delay for TX
> + * @coalesce_usec_stats: Delay between hardware statistics refreshes
> * @use_dmaengine: flag to check dmaengine framework usage.
> * @tx_chan: TX DMA channel.
> * @rx_chan: RX DMA channel.
> @@ -505,6 +579,12 @@ struct axienet_local {
> u64_stats_t tx_bytes;
> struct u64_stats_sync tx_stat_sync;
>
> + u32 hw_last_counter[STAT_COUNT];
> + u64_stats_t hw_stats[STAT_COUNT];
> + struct u64_stats_sync hw_stat_sync;
> + struct mutex stats_lock;
> + struct delayed_work stats_work;
> +
> struct work_struct dma_err_task;
>
> int tx_irq;
...
next prev parent reply other threads:[~2024-06-14 16:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-10 23:10 [PATCH net-next 0/3] net: xilinx: axienet: Add statistics support Sean Anderson
2024-06-10 23:10 ` [PATCH net-next 1/3] net: xilinx: axienet: Use NL_SET_ERR_MSG instead of netdev_err Sean Anderson
2024-06-10 23:49 ` Andrew Lunn
2024-06-11 15:06 ` Sean Anderson
2024-06-10 23:10 ` [PATCH net-next 2/3] net: xilinx: axienet: Report RxRject as rx_dropped Sean Anderson
2024-06-10 23:10 ` [PATCH net-next 3/3] net: xilinx: axienet: Add statistics support Sean Anderson
2024-06-11 0:13 ` Andrew Lunn
2024-06-11 0:29 ` Andrew Lunn
2024-06-11 16:43 ` Sean Anderson
2024-06-11 15:14 ` Sean Anderson
2024-06-11 0:26 ` Andrew Lunn
2024-06-11 15:36 ` Sean Anderson
2024-06-18 17:03 ` Sean Anderson
2024-06-18 18:19 ` Andrew Lunn
2024-06-14 16:30 ` Simon Horman [this message]
2024-06-14 20:54 ` Sean Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240614163050.GV8447@kernel.org \
--to=horms@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=michal.simek@amd.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=radhey.shyam.pandey@amd.com \
--cc=sean.anderson@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).