From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 298EE397958; Fri, 7 Aug 2026 14:42:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786113761; cv=none; b=q59jTY2gL90zX/WrrSvlZxEmkTmWhdEBOqzf0/mXpyeXcOLlUjsM7ie9+vvfQRCJN82rdY7Q0VI3ft5puiEW/wxyxxigXuwyf3iXuK1FdHZa5AEqTktXRRGp6tHaP7UZdREvu5ibsG2QgBJH/uxn6ROaolgzAJTI7Lx/Jsg36w0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786113761; c=relaxed/simple; bh=1f3Bop/jJejV086Ouy+C9+zGl0SYkDfl28y3MLVW1Zg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LkFxeyicxzzeJHQIVNSHkUteVe5YFXCXxLFnWCPXr3pzKAw9i3rEjLb0nM05PY0FackiMAKJxGjIxGQJPUzn8ABkVFbzAPPGkhDSP2E/q0En01APASlvNxBoMSIC82INKMkvcK8kAAkw2T/X4BlYubInFLbwzz9LCpgeDkRs4S4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DBXUBUqg; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DBXUBUqg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A90531F00A3F; Fri, 7 Aug 2026 14:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786113751; bh=t+hulkq6LXHhZJshBaRgEL55YU9cHBcwtBa0bvSP2z0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DBXUBUqgDOyOpIQoJTD3XFPQ2E24SKgRiQuyMDab/uunTdCjDqQH9cwRJvGpRoSpI zDE0OpHzhzodo80klVs1ZFHT132hl9QnzFtkSmPsb17vFr0cfDrJaHleU8WH88YOg1 OtlbB23YnGyX/jh7yLIjIE7yCdjunlTj1JhMxK0E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hongling Zeng , Jernej Skrabec , Frank Li , Frank Li , Vinod Koul , Sasha Levin Subject: [PATCH 6.12 022/337] dmaengine: sun6i-dma: Fix reclaim descriptors while terminating DMA Date: Fri, 7 Aug 2026 16:33:45 +0200 Message-ID: <20260807143418.999362096@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260807143418.516897842@linuxfoundation.org> References: <20260807143418.516897842@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hongling Zeng [ Upstream commit ab1150115e68a46b687eb38c1ab92782018c9f2c ] When terminating DMA transfers, active descriptors are not properly reclaimed. Only cyclic descriptors were handled, leaving non-cyclic descriptors and their LLI chains to be permanently leaked. Fix by using vchan_terminate_vdesc() which handles both cyclic and non-cyclic descriptors by adding them to desc_terminated queue for proper cleanup. Add pchan->desc != pchan->done check to prevent double-adding completed descriptors, which would corrupt the list. Fixes: 555859308723 ("dmaengine: sun6i: Add driver for the Allwinner A31 DMA controller") Signed-off-by: Hongling Zeng Acked-by: Jernej Skrabec Suggested-by: Frank Li Reviewed-by: Frank Li Link: https://patch.msgid.link/20260701045733.33654-1-zenghongling@kylinos.cn Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/sun6i-dma.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index c97027379263d..1f1e21d48ad76 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -934,16 +934,13 @@ static int sun6i_dma_terminate_all(struct dma_chan *chan) spin_lock_irqsave(&vchan->vc.lock, flags); - if (vchan->cyclic) { - vchan->cyclic = false; - if (pchan && pchan->desc) { - struct virt_dma_desc *vd = &pchan->desc->vd; - struct virt_dma_chan *vc = &vchan->vc; + if (pchan && pchan->desc && pchan->desc != pchan->done) { + struct virt_dma_desc *vd = &pchan->desc->vd; - list_add_tail(&vd->node, &vc->desc_completed); - } + vchan_terminate_vdesc(vd); } + vchan->cyclic = false; vchan_get_all_descriptors(&vchan->vc, &head); if (pchan) { -- 2.53.0