From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A4421C27C77 for ; Fri, 14 Jun 2024 16:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cpOK+IlZWk030MZKRR2xz38+nGwxAm4Qs3/0zqB+BUc=; b=DQSk8RnVHk//0mTXypPnM0Rk75 500mKzvU7MjVnlWd3wR5/Npb7bIp3gaUvF19gYe0B/29SKPTWgKZyAOev4AVeJK2tzwqvdaXp3c5d DMwe8ih4PS1ynaXMd1QbOzpYoIVkC2w08qLyYV+cvvF4T4BqbFQofa5Epz5F0tlGYOrhNk+M/J2fR CqG+g81YD78RKccFDeKtp+RVfyPvSsyuxa8/AkAcCkzaSIFOaO0lzGgPQ3qYh4APFBylQi8GUagKt pXZqxwqg9ruVRqKevMd4YKlFFpYRxIQyis68+lNHDuTUatZA2so2LNGrlIiYEcq9gW2Lf6erDIyXg +w8FNiJg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sI9pM-00000003Qd2-13g4; Fri, 14 Jun 2024 16:31:00 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sI9pI-00000003Qbn-2PbJ for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2024 16:30:58 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8D9E362004; Fri, 14 Jun 2024 16:30:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5CE24C2BD10; Fri, 14 Jun 2024 16:30:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718382654; bh=4uMCD3nfnmamh+k914AZ9iNaZiZ2iLQY8YW/o+RixDM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=G97+WiomIY+D1ScJvy+hWtvGznEx91P7NiLKw1qcgJ99tAQHrmn62kfqKjwz4Huqw zaXjNqnM0oar5JZ7AMC7V/J1HJUrYj7k1XtSqxMtS10HyfX75UoUSU8Sx/Ikv000nE MlJ6HJG/MCsjPIbCra2j5XPn6Boxj+1YQHyWsoEVTjgPX8t0JH42QF1DjbXySDIz2Z YzkOil7NFjfE8zjaqOoWuhUYqNFp6ayy36oq0G3/WAQ4HDQ9fjwrIsMfqZQpBGtAoC bas4pGTLt4b9shevSwSOMi1ixt4IUQS11CBozeMN9sOKI9bRwP5/OQDu8mAPTIaw/i Chgx66MC+MT1Q== Date: Fri, 14 Jun 2024 17:30:50 +0100 From: Simon Horman To: Sean Anderson Cc: Radhey Shyam Pandey , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Michal Simek , Jakub Kicinski , Russell King , Paolo Abeni , Eric Dumazet , linux-kernel@vger.kernel.org, "David S . Miller" Subject: Re: [PATCH net-next 3/3] net: xilinx: axienet: Add statistics support Message-ID: <20240614163050.GV8447@kernel.org> References: <20240610231022.2460953-1-sean.anderson@linux.dev> <20240610231022.2460953-4-sean.anderson@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240610231022.2460953-4-sean.anderson@linux.dev> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240614_093056_731912_54572DE8 X-CRM114-Status: GOOD ( 25.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 > --- > > 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; ...