public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Andrew Lunn <andrew@lunn.ch>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>,
	Alexei Starovoitov <ast@kernel.org>,
	Andrew Lunn <andrew+netdev@lunn.ch>,
	bpf@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Jesper Dangaard Brouer <hawk@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-stm32@st-md-mailman.stormreply.com, netdev@vger.kernel.org,
	Paolo Abeni <pabeni@redhat.com>,
	Stanislav Fomichev <sdf@fomichev.me>
Subject: [PATCH net-next v3 08/15] net: stmmac: use consistent tests for receive buffer size
Date: Fri, 13 Mar 2026 09:51:38 +0000	[thread overview]
Message-ID: <E1w0zBC-0000000D4Fg-2QA6@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <abPdzyXJHqt5v3bi@shell.armlinux.org.uk>

Two out of the three sites that set the receive buffer size (via
stmmac_set_dma_bfsize()) check for rx_q->xsk_pool &&
rx_q->buf_alloc_num. One uses just rx_q->xsk_pool.

Discussing with Yoong Siang Song, the conclusion is that
stmmac_dma_operation_mode() is missing the rx_q->buf_alloc_num
check. Add this check.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 1d40168ec68d..787b02c2607a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2612,7 +2612,7 @@ static void stmmac_dma_operation_mode(struct stmmac_priv *priv)
 		stmmac_dma_rx_mode(priv, priv->ioaddr, rxmode, chan,
 				rxfifosz, qmode);
 
-		if (rx_q->xsk_pool) {
+		if (rx_q->xsk_pool && rx_q->buf_alloc_num) {
 			buf_size = xsk_pool_get_rx_frame_size(rx_q->xsk_pool);
 			stmmac_set_dma_bfsize(priv, priv->ioaddr,
 					      buf_size,
-- 
2.47.3


  parent reply	other threads:[~2026-03-13  9:51 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-13  9:50 [PATCH net-next v3 00/15] net: stmmac: clean up descriptor handling part 1 Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 01/15] net: stmmac: rearrange stmmac_tx_info members to pack better Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 02/15] net: stmmac: helpers for filling tx_q->tx_skbuff_dma Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 03/15] net: stmmac: clean up stmmac_clear_rx_descriptors() Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 04/15] net: stmmac: add helper to get hardware receive descriptor Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 05/15] net: stmmac: add helper to get size of a " Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 06/15] net: stmmac: add helper to set receive tail pointer Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 07/15] net: stmmac: remove rx_tail_addr Russell King (Oracle)
2026-03-13  9:51 ` Russell King (Oracle) [this message]
2026-03-13  9:51 ` [PATCH net-next v3 09/15] net: stmmac: add helper to set receive buffer size Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 10/15] net: stmmac: simplify stmmac_set_queue_rx_buf_size() Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 11/15] net: stmmac: add helper to get hardware transmit descriptor Russell King (Oracle)
2026-03-13 12:12   ` Russell King (Oracle)
2026-03-13  9:51 ` [PATCH net-next v3 12/15] net: stmmac: add helper to get size of a " Russell King (Oracle)
2026-03-13  9:52 ` [PATCH net-next v3 13/15] net: stmmac: add helper to set transmit tail pointer Russell King (Oracle)
2026-03-13  9:52 ` [PATCH net-next v3 14/15] net: stmmac: remove tx_tail_addr Russell King (Oracle)
2026-03-13  9:52 ` [PATCH net-next v3 15/15] net: stmmac: use queue rather than ->queue_index Russell King (Oracle)

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=E1w0zBC-0000000D4Fg-2QA6@rmk-PC.armlinux.org.uk \
    --to=rmk+kernel@armlinux.org.uk \
    --cc=alexandre.torgue@foss.st.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=andrew@lunn.ch \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=hawk@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-stm32@st-md-mailman.stormreply.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=sdf@fomichev.me \
    /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