From: Ian Rogers <irogers@google.com>
To: Dimitris Michailidis <dmichail@fungible.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
llvm@lists.linux.dev, Elkin Cruz <elkin@google.com>,
Ian Rogers <irogers@google.com>
Subject: [PATCH net] eth: funeth: Include FEC stats in fun_free_stats_area() DMA free size
Date: Thu, 19 Nov 2026 09:06:13 -0800 [thread overview]
Message-ID: <20261119170613.1519353-1-irogers@google.com> (raw)
fun_init_stats_area() allocates coherent DMA memory for
(PORT_MAC_RX_STATS_MAX + PORT_MAC_TX_STATS_MAX + PORT_MAC_FEC_STATS_MAX)
64-bit counters (632 bytes), whereas fun_free_stats_area() omits
PORT_MAC_FEC_STATS_MAX and passes 616 bytes to dma_free_coherent(),
triggering DMA-API debug size-mismatch warnings on teardown.
Extract a shared fun_stats_area_size() helper used by both allocation and
deallocation paths, and cast the leading enum constant to unsigned int to
avoid cross-enum arithmetic.
Found via an x86_64 LLVM=1 (Clang 21.1.8) allyesconfig audit with
-Wenum-enum-conversion enabled; fix and changelog drafted with an AI
coding assistant. Build-tested under LLVM=1 W=1 and
-Wenum-enum-conversion; not tested on Fungible Ethernet hardware.
Fixes: ee6373ddf3a9 ("net/funeth: probing and netdev ops")
Signed-off-by: Ian Rogers <irogers@google.com>
---
.../ethernet/fungible/funeth/funeth_main.c | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/fungible/funeth/funeth_main.c b/drivers/net/ethernet/fungible/funeth/funeth_main.c
index bad8276d26b0..e0d4e69abfa4 100644
--- a/drivers/net/ethernet/fungible/funeth/funeth_main.c
+++ b/drivers/net/ethernet/fungible/funeth/funeth_main.c
@@ -1457,17 +1457,20 @@ void fun_set_ring_count(struct net_device *netdev, unsigned int ntx,
}
}
-static int fun_init_stats_area(struct funeth_priv *fp)
+static size_t fun_stats_area_size(void)
{
- unsigned int nstats;
+ unsigned int nstats = (unsigned int)PORT_MAC_RX_STATS_MAX +
+ PORT_MAC_TX_STATS_MAX + PORT_MAC_FEC_STATS_MAX;
+
+ return nstats * sizeof(u64);
+}
+static int fun_init_stats_area(struct funeth_priv *fp)
+{
if (!(fp->port_caps & FUN_PORT_CAP_STATS))
return 0;
- nstats = PORT_MAC_RX_STATS_MAX + PORT_MAC_TX_STATS_MAX +
- PORT_MAC_FEC_STATS_MAX;
-
- fp->stats = dma_alloc_coherent(&fp->pdev->dev, nstats * sizeof(u64),
+ fp->stats = dma_alloc_coherent(&fp->pdev->dev, fun_stats_area_size(),
&fp->stats_dma_addr, GFP_KERNEL);
if (!fp->stats)
return -ENOMEM;
@@ -1476,11 +1479,8 @@ static int fun_init_stats_area(struct funeth_priv *fp)
static void fun_free_stats_area(struct funeth_priv *fp)
{
- unsigned int nstats;
-
if (fp->stats) {
- nstats = PORT_MAC_RX_STATS_MAX + PORT_MAC_TX_STATS_MAX;
- dma_free_coherent(&fp->pdev->dev, nstats * sizeof(u64),
+ dma_free_coherent(&fp->pdev->dev, fun_stats_area_size(),
fp->stats, fp->stats_dma_addr);
fp->stats = NULL;
}
--
2.56.1.708.g77570a6a1d-goog
reply other threads:[~2026-11-19 17:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261119170613.1519353-1-irogers@google.com \
--to=irogers@google.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=dmichail@fungible.com \
--cc=edumazet@kernel.org \
--cc=elkin@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/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