From nobody Wed Apr 1 22:20:22 2026 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1579847CC98; Wed, 1 Apr 2026 16:39:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775061586; cv=none; b=Tfr0aHibERkSbwE5/r8UP0t/xtj5RQbyWsvRF3fiH4JJ8GNV4ltGJDpG6asdiG1PkXq6U5G/uuk8SAXgtg+SGzaBDs0KRWJ5ncoeXgJ3Z0AdbwXaSUhxGTrRjzvrXhuT+BMEenQ2VsGOhEid9X65m7AO5Em7SMgELV07sqSB+P8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775061586; c=relaxed/simple; bh=tl1JEdPS078PG3MtDA2A1kWWBWIbEL7CJ8yJSvz6aAs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ibbSMl7ZZrfugqhRgWmADIZuYdTOFQJX/dKpIbLO/lVOYNJ3q7wQNbXsfmJ/5eFuNfOuf/9lohJm5Y+ImqQpcobLFeqPmvECQ6A7ttJbucg08fkFMhxsgq4qYRTWPzbXWcjGIe4JD0EGnOYceF6jCTq+2CCY0NnvQaZzML2sv8Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=A7nnzZDB; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="A7nnzZDB" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 7B945C5996E; Wed, 1 Apr 2026 16:40:11 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 6A8F6602BF; Wed, 1 Apr 2026 16:39:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1E5D8104509E8; Wed, 1 Apr 2026 18:39:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1775061579; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=HrzWnDXn/D9f5CDa6I0v3TWYtvCVSYZ9ed+j76pS1yQ=; b=A7nnzZDBdXRB/EGWEKYb0bJvZYGb8JmbzKycFU1YhOSnXc8YTB6l5GQZMGqF1Eb6li2yPG qgLpPWEJOPPaB/WjnJ2A5O0YHgsE740cCiHlxhZKKDidjtzPhceeAYJAMDrwvzm7K0jFFa 96sQdWNzC6OS/ksb3fNXcq+pAG0+CX2QUHGarPELIc6lgLkdrBYbADK+WZeigAe/QauxEu KYvk+52Q+UxrlOi1XWUTmxfVMc/HgCxCuTJXDLOfAty1Yjhktr93rUMgJUtVELm1ar06a4 XQMiDMRI9qk7zAdGwFGPWfeqDTrVIxKfkGu8zdLlR6IjVoRxwGZMUnDjKkk7Vg== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Wed, 01 Apr 2026 18:39:10 +0200 Subject: [PATCH net-next 07/11] net: macb: avoid macb_init_rx_buffer_size() modifying state Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260401-macb-context-v1-7-9590c5ab7272@bootlin.com> References: <20260401-macb-context-v1-0-9590c5ab7272@bootlin.com> In-Reply-To: <20260401-macb-context-v1-0-9590c5ab7272@bootlin.com> To: Nicolas Ferre , Claudiu Beznea , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Russell King Cc: Paolo Valerio , Conor Dooley , Nicolai Buchwitz , Vladimir Kondratiev , Gregory CLEMENT , =?utf-8?q?Beno=C3=AEt_Monin?= , Tawfik Bayouk , Thomas Petazzoni , Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.15.0 X-Last-TLS-Session-Version: TLSv1.3 macb_init_rx_buffer_size() takes the macb private data struct and overrides its bp->ctx->rx_buffer_size. To make it usable with multiple contexts, make it return its value. Also, move the `bufsz` computation into it. The value is only used if GEM, and for historical reason it currently lives in macb_open(). Signed-off-by: Th=C3=A9o Lebrun --- drivers/net/ethernet/cadence/macb_main.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index 0f63d9b89c11..033c36d8a3d4 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -2641,25 +2641,26 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *= skb, return ret; } =20 -static void macb_init_rx_buffer_size(struct macb *bp, size_t size) +static unsigned int macb_rx_buffer_size(struct macb *bp, unsigned int mtu) { - if (!macb_is_gem(bp)) { - bp->ctx->rx_buffer_size =3D MACB_RX_BUFFER_SIZE; - } else { - bp->ctx->rx_buffer_size =3D MIN(size, RX_BUFFER_MAX); + unsigned int size; =20 - if (bp->ctx->rx_buffer_size % RX_BUFFER_MULTIPLE) { + if (!macb_is_gem(bp)) { + size =3D MACB_RX_BUFFER_SIZE; + } else { + size =3D mtu + ETH_HLEN + ETH_FCS_LEN + NET_IP_ALIGN; + size =3D MIN(size, RX_BUFFER_MAX); + + if (size % RX_BUFFER_MULTIPLE) { netdev_dbg(bp->netdev, "RX buffer must be multiple of %d bytes, expanding\n", RX_BUFFER_MULTIPLE); - bp->ctx->rx_buffer_size =3D - roundup(bp->ctx->rx_buffer_size, - RX_BUFFER_MULTIPLE); + size =3D roundup(size, RX_BUFFER_MULTIPLE); } } =20 - netdev_dbg(bp->netdev, "mtu [%u] rx_buffer_size [%u]\n", - bp->netdev->mtu, bp->ctx->rx_buffer_size); + netdev_dbg(bp->netdev, "mtu [%u] rx_buffer_size [%u]\n", mtu, size); + return size; } =20 static void gem_free_rx_buffers(struct macb *bp) @@ -3204,7 +3205,6 @@ static void macb_set_rx_mode(struct net_device *netde= v) =20 static int macb_open(struct net_device *netdev) { - size_t bufsz =3D netdev->mtu + ETH_HLEN + ETH_FCS_LEN + NET_IP_ALIGN; struct macb *bp =3D netdev_priv(netdev); struct macb_queue *queue; unsigned int q; @@ -3223,7 +3223,7 @@ static int macb_open(struct net_device *netdev) } =20 /* RX buffers initialization */ - macb_init_rx_buffer_size(bp, bufsz); + bp->ctx->rx_buffer_size =3D macb_rx_buffer_size(bp, netdev->mtu); bp->ctx->rx_ring_size =3D bp->configured_rx_ring_size; bp->ctx->tx_ring_size =3D bp->configured_tx_ring_size; =20 --=20 2.53.0