From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=185.171.202.116 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794921709; b=Y8d24kzZjJnrq7zyhYt9hYvqJHkyMbpmkTx7ygXhgzVIMgXWVVIBb9spkX0lffnk/Zbk DMmN282Nem/wo6lV42V/CiPwX3FIO3cJivQyY1T5egMpwQ0TLJhKiAqIFA4NWLKodC+RG /4fsZ5s8Ww4AEzgrBJ+D14FuC96sMRbRwbGMux//8QspwbFibfl5g/VsoynBou9vTsj9f B4XudEQkiPuPMcJ7mf/z9UN/yRXoSwOeX6h0GNuvVXN2Ne4R0kyVJv058U304pCOm99Aa 5Tge1JxGV3/5aXa3jY96RcNx7iyNlw64iafY/qgkzf5rXtgU68jOUs4g3ZFy+3bveYg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794921709; h=DMARC-Filter:Received:Received:Received:DKIM-Signature:Message-ID: Date:MIME-Version:User-Agent:Subject:To:Cc:References:From: Content-Language:In-Reply-To:Content-Type:Content-Transfer-Encoding: X-Last-TLS-Session-Version; bh=Dwgskig9h6iqU3KR/twPrHbj/qykGXE3PcHP9fx9wKA=; b=GNWdX3HDhtVtgKctmeJWdGt970rWkl800Vq2fSH2XyPmlsQ/0F7SVvyMIgnXp4AOWdVa FXIp2Kw2bkTZbOUKOpXT/7JseGJvK50WFJYXLVFXgyQpnD/XrYtF5Q0v5vxMhLG1Qyo0x uQ6xC63jvDphInnP72VraUdJX4mxNFmxm2IR6E+NPslx/eVzpVwwKdt6WfD23LR4rIKp9 Sqq1d23ZajVyqeErTUVkSfqEiVnChLpIulEbK5TIt2eOAVfK/lsaxnPZiKnKu9xpaz9A7 RkvufV6SHw9wlziwGO63v/zfCzVXIdjSfRSoHj83NY5sXwKiirD7uH2g6PAAiOXX3Zg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass header.d=bootlin.com header.i=@bootlin.com header.a=rsa-sha256 header.s=dkim header.b=PvkjzJcK; arc=none smtp.remote-ip=185.171.202.116 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90A3A606A31C; Tue, 17 Nov 2026 13:21:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 90A3A606A31C 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.a=rsa-sha256 header.s=dkim header.b=PvkjzJcK Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 18DB7C79A97; Tue, 17 Nov 2026 13:21:51 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id AA6365FC81; Tue, 17 Nov 2026 13:21:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 8E12D11BC0026; Tue, 17 Nov 2026 14:21:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1794921705; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:content-language:in-reply-to:references; bh=Dwgskig9h6iqU3KR/twPrHbj/qykGXE3PcHP9fx9wKA=; b=PvkjzJcKgfUAPBAW52SsDYZGyBgweWeE1bS+J5zb3I/lWnRn1latHT4KJqrp2L181qVyzI gX6ltYdWoYCZ0cS1xMjwfDlQdpnT8sbc5PjjlktHojAC7O6OFdTo0r/SQWVVUNJvtRtx7D 9PBIddrSNLMnKvEBFdPWkhHvhVX+Kzw4I/zCJq4VBZu0SwycBj/yIqrhlLxgn/JU56qdKm rGNmEYZFVGMm0UKaQi0TbX5tyLKlp/8K01l8203XhZTXjhsZK4wtpYu4JVhFPCH5aPkq9w XqFoDUu/soIQL+9yMFF6xfX4lsJLrvVYlKX4C8zwX8kOrfjy+5Xin1zVWMIn0g== Message-ID: <73d6b341-3553-4243-83aa-ea8bb223cef9@bootlin.com> Date: Tue, 17 Nov 2026 14:21:29 +0100 X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net v7 2/4] net: stmmac: track unfilled XSK RX descriptors explicitly To: Ding Hui , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , "open list:STMMAC ETHERNET DRIVER" , "moderated list:ARM/STM32 ARCHITECTURE" , "moderated list:ARM/STM32 ARCHITECTURE" , open list Cc: tommaso.merciai.xr@bp.renesas.com, dinghui@lixiang.com, xiasanbo@lixiang.com, yangchen11@lixiang.com, liuxuanjun@lixiang.com References: <92136a2c509f26f7a02053380a0b3c0fa426df48.1794646293.git.dinghui@lixiang.com> From: Maxime Chevallier Content-Language: en-US In-Reply-To: <92136a2c509f26f7a02053380a0b3c0fa426df48.1794646293.git.dinghui@lixiang.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Last-TLS-Session-Version: TLSv1.3 Hi, On 11/14/26 10:21, Ding Hui wrote: > From: Ding Hui > > An XSK fill ring may supply fewer buffers than the RX ring needs. Those > unfilled descriptors must remain CPU-owned, including on legacy cores > whose clear callback only clears the buffer address. Add an ownership > operation that preserves descriptor size and ring/chain control fields. > > Track the number of descriptors awaiting refill independently of the > ring indices, so an entirely empty ring can be distinguished from one > with no pending refills. Initialize the pending region after the allocated > prefix and stop consumption before entering it. Retry pending refills > on each poll, including userspace wakeups with fewer than a batch of > buffers, and retain batching during packet processing. > > Update the tail after successful refills and kick legacy RX DMA. Use the > end-of-ring tail address for a refill ending at index zero, including a > completely empty ring populated before DMA has advanced from the base. > Select the receive buffer size from the XSK pool even if no buffers were > available at initialization. > > Fixes: bba2556efad6 ("net: stmmac: Enable RX via AF_XDP zero-copy") > Signed-off-by: Ding Hui > --- > .../ethernet/stmicro/stmmac/dwmac4_descs.c | 6 +++ > .../ethernet/stmicro/stmmac/dwxgmac2_descs.c | 6 +++ > .../net/ethernet/stmicro/stmmac/enh_desc.c | 6 +++ > drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 ++ > .../net/ethernet/stmicro/stmmac/norm_desc.c | 6 +++ > drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 + > .../net/ethernet/stmicro/stmmac/stmmac_main.c | 49 +++++++++++++------ > 7 files changed, 63 insertions(+), 15 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c > index c6a8f8d73501..307bbd63dbcb 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c > @@ -176,6 +176,11 @@ static void dwmac4_set_tx_owner(struct dma_desc *p) > p->des3 |= cpu_to_le32(TDES3_OWN); > } > > +static void dwmac4_clear_rx_owner(struct dma_desc *p) > +{ > + p->des3 &= cpu_to_le32(~RDES3_OWN); > +} > + > static void dwmac4_set_rx_owner(struct dma_desc *p, int disable_rx_ic) > { > u32 flags = (RDES3_OWN | RDES3_BUFFER1_VALID_ADDR); > @@ -539,6 +544,7 @@ const struct stmmac_desc_ops dwmac4_desc_ops = { > .rx_status = dwmac4_wrback_get_rx_status, > .set_tx_owner = dwmac4_set_tx_owner, > .set_rx_owner = dwmac4_set_rx_owner, > + .clear_rx_owner = dwmac4_clear_rx_owner, > .get_rx_vlan_tci = dwmac4_wrback_get_rx_vlan_tci, > .get_rx_vlan_valid = dwmac4_wrback_get_rx_vlan_valid, > .get_rx_frame_len = dwmac4_wrback_get_rx_frame_len, > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > index 6719ac6e395b..ad377c76ed4e 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c > @@ -51,6 +51,11 @@ static void dwxgmac2_set_tx_owner(struct dma_desc *p) > p->des3 |= cpu_to_le32(XGMAC_TDES3_OWN); > } > > +static void dwxgmac2_clear_rx_owner(struct dma_desc *p) > +{ > + p->des3 &= cpu_to_le32(~XGMAC_RDES3_OWN); sparse says : +../drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c:181:20: warning: cast truncates bits from constant value (ffffffff7fffffff becomes 7fffffff) +../drivers/net/ethernet/stmicro/stmmac/norm_desc.c:146:20: warning: cast truncates bits from constant value (ffffffff7fffffff becomes 7fffffff) +../drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c:56:20: warning: cast truncates bits from constant value (ffffffff7fffffff becomes 7fffffff) +../drivers/net/ethernet/stmicro/stmmac/enh_desc.c:304:20: warning: cast truncates bits from constant value (ffffffff7fffffff becomes 7fffffff) Not too big of a deal, but let's not add new sparse warnings. We've seen that before, you can maybe use some trickery like here : https://elixir.bootlin.com/linux/v7.4-rc1/source/drivers/net/ethernet/stmicro/stmmac/descs.h#L73 The rests of the series starts to look fairly solid, I've quickly tested it and it does seem to work, I'll properly review the next iteration, Thank you, Maxime