From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A09EF33B6CC for ; Sun, 18 Oct 2026 02:08:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792289334; cv=none; b=c63ErFrayOWqfalW30KTtqRDipTuMNAPTDOciM3FwTdfeV30INMRdEzRMrGhHRwsXor+HpS/67B6m9UlMXuzHHpu8hlsk8bJM5b48/oJdRdyyWrsPAmZ+2nGl3NvA3fyc2vOBLMQTijZG6bJq7DKLmVY5G5P7S3IGAfdQsvBT8Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792289334; c=relaxed/simple; bh=T5jvT7tm0aW6akXxOM7o5G0i/6YErUOWkthgtqpj6FY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N4laLbKkg/S5pTCwaG5f8eHoaQ/S1wes7rd77DFbEyM/KQv3mnCU1oZNx5tNTvbaRz+YxywJwmprYqWqC3xU/N0lxK2bLj1thzmHVYMdZJWDUYi1ZUd9kMISEnzi+KbxV3+gXCMF6cSQ4tejQWF2wEmo1CFLO9RqsyiutpCceg8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mIcZFt4h; arc=none smtp.client-ip=209.85.160.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mIcZFt4h" Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-533797e72e8so5577811cf.2 for ; Sat, 17 Oct 2026 19:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792289331; x=1792894131; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=IivJPlqVutyc9WqVZ+S/63gE6BUOeFCDRKPNo/hGECs=; b=mIcZFt4hk308FQS5sGul2EVVweNtmUQj+9BS/V86n/l57Xn3yW+SVrnOVlrv7AOPIt CbdFvXl9u7dJNKnYL4Fr5fQdxXOugfwqLPhdE2dr8SXVt3rN+uTaahNiUSGTWvessWVR GLuWuj9AGMx8ocaWTcfACE49DGmmXQlW8Wr8GQLN9wGrc+i/mbyBJF7Zx352NZ7q2/Pz EnwvBxxjhOO+8cFErh5miJm1BkLyDlKnazCclC/yi4odle89BUtqlZL+4Z2anrFJXN/B miim9J8cT2KCVC1d2MkecXBPjGXKEJhp4wQCnxqMBpueie6bgjnInz7qmINB4uiKkt6D IaTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792289331; x=1792894131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=IivJPlqVutyc9WqVZ+S/63gE6BUOeFCDRKPNo/hGECs=; b=Pfpmfj/pgQcimY0+5BovBMONBurGsPZw4CSt4wj2szJamAEQHyGyTerd93KhIz5tDn CD3cz6/7Q7Uc+oNCqy08NX0hYTBIk3mIwH2mOGECCu2+CvtXS6i+N9DSA/mc0/Iw7xmU Tp6KfEqC25j2Dmi1ki/obQvsGERDcPikcAkPqBDdKVGS4L8ELugcvEsfa0MgXglxfP9t 71LzCrgWXPyuPnN+hWsBHh/ks51lP8n6GZt9Z6PxKW4xwNtSMnKlcwN/syiRj+j14OpE 3t9arL1/hcx1ADccP/qGGBjYxPA4eHqPLuwExPrTUgkloLUPKikabhEIY/o/qKMGGjFf 2A0g== X-Forwarded-Encrypted: i=1; AKwUvBwF9qlY2e7h7OctEgEo8BSKISagNM2UBaJosamW7cffrJGLaU3/DdxGKosxRCr2HVvdon9lSd8=@vger.kernel.org X-Gm-Message-State: AFq9FYJbYVY9UWJQJaOgpZip3+XqJPDdZefafX1l+Xd7flVzgDDM/SlL 53Kgf2pTm+y3t3Ky3ntnlZVdvPCi59nRZbOx9zlMqjWf1X8WgQ4ISFs= X-Gm-Gg: AYBFou33qH5i/fnbssB1B/FpwlQaFtOJaWXH7FpmMVAtskOkJUZupFbArqb1CaSQY93 mzCpb7CK1mFk+53d5QvJu6mwP1tMm6I4Zs3qbZMGWtxfRyHCKonD0HjCsgf8r+q7p7xet6AqoMf jX5x5ATasgUy0TcGXJWcQyz515apX9eh0VOQ3fnlKfY0mxwhaNd8BWTfMcoRbh3Nz4iLn0blasR fSoh5BkPXPW9YD1S1QcWFIWpxjawpgUrQal0sTYCFdmuVaiLAe8VzvsjwE/SagufM8LftIXPtqS bA+wCFowdJTwrRFQR28sfnC0lLUvORNj4VwXOJyfro5Tc+GxW9Ha5CHCeDnXPyEzqIofwEf9wyG t1N8G8DpIIobZL2Q+YEiKfnjorQ4b582nD6jmlBN05z5oqbgGx9xm7xSJSWMnx1EbL/6+gyVSFk bSy3JEPdxWnwSaqqKVELcaH6xzLbwW2tCDJjYur2A5YcVABnTLRmTed6FfmVzTR5CF1plsaJb/n 1HcteEZ9FXqjn1/RGzu3Scb8EKkvCmk8qiPG6blpKHkW2onAb9/ktd+5Og6XbnY3tRgSYw3yXIr PxIHyYfi0CQwZsXSClZ7Kbu5WuVE X-Received: by 2002:a05:622a:180e:b0:535:ba01:d8d with SMTP id d75a77b69052e-5364602c40emr56977811cf.39.1792289331426; Sat, 17 Oct 2026 19:08:51 -0700 (PDT) Received: from i4-gl-tmk5904-1.ad.psu.edu ([130.203.156.90]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-5362aa68f8esm61731291cf.29.2026.10.17.19.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2026 19:08:50 -0700 (PDT) From: Myeonghun Pak To: netdev@vger.kernel.org Cc: andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org, stable@vger.kernel.org, ae878000@gmail.com, daniel.machon@microchip.com Subject: [PATCH net v3 2/2] net: nixge: wait for DMA reset before releasing buffers Date: Sat, 17 Oct 2026 22:08:40 -0400 Message-ID: <20261018020840.3851552-3-mhun512@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261018020840.3851552-1-mhun512@gmail.com> References: <20261018020840.3851552-1-mhun512@gmail.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nixge_stop() clears RUNSTOP before releasing the DMA buffers, but this does not ensure that outstanding DMA accesses have completed. Pending error recovery can also restart both channels and enable interrupts while the stop path drains dma_err_tasklet. After both IRQ handlers and the error tasklet have been drained, mask channel interrupts and clear RUNSTOP again. Reset the DMA engine and wait for reset completion before releasing the buffers. Return the reset result from __nixge_device_reset() so the stop path can check it. If reset times out, retain the DMA buffers and reject subsequent opens to prevent those buffers from being freed or their pointers overwritten while DMA may still be using them. Fixes: 492caffa8a1a ("net: ethernet: nixge: Add support for National Instruments XGE netdev") Cc: stable@vger.kernel.org Assisted-by: LLM Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak --- drivers/net/ethernet/ni/nixge.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index 8697a76..8bfda27 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c @@ -185,6 +185,7 @@ struct nixge_priv { void __iomem *dma_regs; struct tasklet_struct dma_err_tasklet; + bool dma_stop_failed; int tx_irq; int rx_irq; @@ -391,7 +392,7 @@ out: return -ENOMEM; } -static void __nixge_device_reset(struct nixge_priv *priv, off_t offset) +static int __nixge_device_reset(struct nixge_priv *priv, off_t offset) { u32 status; int err; @@ -407,6 +408,8 @@ static void __nixge_device_reset(struct nixge_priv *priv, off_t offset) 1000); if (err) netdev_err(priv->ndev, "%s: DMA reset timeout!\n", __func__); + + return err; } static void nixge_device_reset(struct net_device *ndev) @@ -869,6 +872,10 @@ static int nixge_open(struct net_device *ndev) struct phy_device *phy; int ret; + /* A failed stop retained buffers which DMA may still be using. */ + if (priv->dma_stop_failed) + return -EIO; + nixge_device_reset(ndev); phy = of_phy_connect(ndev, priv->phy_node, @@ -910,6 +917,7 @@ err_tx_irq: static int nixge_stop(struct net_device *ndev) { struct nixge_priv *priv = netdev_priv(ndev); + int ret; u32 cr; netif_stop_queue(ndev); @@ -920,6 +928,7 @@ static int nixge_stop(struct net_device *ndev) phy_disconnect(ndev->phydev); } + /* Stop DMA while the completion IRQ handlers are still installed. */ cr = nixge_dma_read_reg(priv, XAXIDMA_RX_CR_OFFSET); nixge_dma_write_reg(priv, XAXIDMA_RX_CR_OFFSET, cr & (~XAXIDMA_CR_RUNSTOP_MASK)); @@ -933,6 +942,23 @@ static int nixge_stop(struct net_device *ndev) tasklet_kill(&priv->dma_err_tasklet); + /* Error recovery may have restarted DMA and enabled interrupts. */ + cr = nixge_dma_read_reg(priv, XAXIDMA_RX_CR_OFFSET); + nixge_dma_write_reg(priv, XAXIDMA_RX_CR_OFFSET, + cr & ~(XAXIDMA_CR_RUNSTOP_MASK | XAXIDMA_IRQ_ALL_MASK)); + cr = nixge_dma_read_reg(priv, XAXIDMA_TX_CR_OFFSET); + nixge_dma_write_reg(priv, XAXIDMA_TX_CR_OFFSET, + cr & ~(XAXIDMA_CR_RUNSTOP_MASK | XAXIDMA_IRQ_ALL_MASK)); + + /* Either channel's reset quiesces the entire AXI DMA engine. */ + ret = __nixge_device_reset(priv, XAXIDMA_TX_CR_OFFSET); + if (ret) { + /* Retain DMA buffers and prevent a subsequent open replacing them. */ + priv->dma_stop_failed = true; + netdev_err(ndev, "DMA stop failed; retaining DMA buffers\n"); + return ret; + } + nixge_hw_dma_bd_release(ndev); return 0; -- 2.53.0