From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.47 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794826388; b=lDD/92VEW1iVI3lvh1WFAFZAY4tDdofIHhXGkesDqateSufH5zfk/51m5081BgZIolIU yatWyRWE/IAhHTQSlH63PytRazFf5NHFoqX9EKtmszI86SccVVWl5J2JJE5q+p2L3Mop7 QlXgXpJ8N+JOdoK2qI+11HU5upjQfjj1HQnsCDA8OrF+1foLZeF9UD+pM13j1nsCUU2tr uiGUsF9g5pS+/Sllm4/CecI8xJXMxoRybTB8AOyyIGB1UmQv0R/9SdHggHY/QtgGCeehs 7+8dPHk/hh2kJoZ49lQbujOcO7kCvLmWo+s3XeThOSJaOgMOx7vq4XdnIyBVTNbuF8A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794826388; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=OS2UBcR5n5u6jJuSGCUmpdlBoEKk3jjjMEO5gyi3TM8=; b=xoUgeaBdMVxpHI84ZFiDNOnH4pH/tJsn9QG02pSzO9UW6voGrZts1fmYzgVRDqM3pHOG HpQZLatMJZ08sttuMgOESBLLZFsTdx9EWO66tDtqPHhY69bJk5ZcTJ8PYK4LBLtCkxmaA 8Aa7ib0yoiJVe/i71dUkAtdFzXZzNVVTmOeElx/qLp+SnhWHc1k2FZcGWCZQ54GR2mMaL Rb4cm8DzM3Md34DKmphaQ9WoAhVnh3WNsZByVRA0ZY+mSX+1W7hWlEuoK9O0QGZEbq/EO 38hZWCjSnFuVBlorvMSLkUu5fggHl+riZS88XUdundJBPw8dkrX49k3jqVoLP4uAN8w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=StV2Mi3B; arc=none smtp.remote-ip=209.85.210.47 Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0884606A897 for ; Mon, 16 Nov 2026 10:53:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C0884606A897 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.a=rsa-sha256 header.s=20260707 header.b=StV2Mi3B Received: by mail-ot1-f47.google.com with SMTP id 46e09a7af769-8629fc8ad64so1222470a34.1 for ; Mon, 16 Nov 2026 02:53:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794826387; x=1795431187; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=OS2UBcR5n5u6jJuSGCUmpdlBoEKk3jjjMEO5gyi3TM8=; b=StV2Mi3BI97CD0DPv/Jo8/0Zf3Qt9SNZixrrMcNNMtQHTv85C6dS710kuy6nW58Dpb PMD01OWRfDniSo+2G2knh6ZhxItF1KIDIRicLw0g91YdKTo6a9J514ZyDlaIX1SIiXor d44nZEjivsOeqmy0tmru7fJReZwx75gFdhFp13FaWDTsxuhtR2QupOkwG53SsRjSrqXL B3jLTeh9YqOQvcqVY40LYlJ0wiBodCbxoSSn6YEg3Otn1/EoswRXHP7D2GV7IIiSt9Oq Pjw8XGLOPTTdprU9xGSDixXfIDoiNngpHV/2e2IpesNd7CtTRAJG0wh4If6cNjFksgaD D4wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794826387; x=1795431187; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=OS2UBcR5n5u6jJuSGCUmpdlBoEKk3jjjMEO5gyi3TM8=; b=sEPdxaXySpmGfx0sQa3zDSd2JeoMKNI8ZK9ZvXl6I6Ss1xHOzxi3qq5WOBNOsRRGVG Zl8XMBjSL0LSoYvvGlCv1M170/ze3bZEix9xb4/GdWualA6R4KMkVUBNTbXlbHEQkCvC xVETF1TEPg0uRO2rLX26seUiOklP8j/OnrGbCtbTIj0djCo62K4XNZi+n4eKysH6ppRJ ++f/pCD6pRGDInQsrfL1OLwimDO3wBPappd9N+gU5DiKC7+13sVr2+tsoFo6jR835zF1 +T+JysOx7IOuyRR0/JDHcpy+t1X6uM6YE06TiSsrO8rX9SWdQgzouCVNj4ZmOWD341z4 jkdw== X-Forwarded-Encrypted: i=1; AL+hErFYzFiIg9+n+f9GaM9/AZ9D2UsP4XZio2aR31FTl8pRVf/icgEvQGJIc0YzTSIP/FQYINjaODvS4HgWuu0=@vger.kernel.org X-Gm-Message-State: APuU4Z+25t8u5Hhon/4jy3ITwrSmKruQuKhdgxGkz57L2KGTjlWfPVO9 J8bwvlFTKYvs7lOjI635/t+Al0R0+9zY7k71KsQazx7/DjR4BXntx2w6 X-Gm-Gg: AYBFou3+Beai+bkcakKHE/vuy8XFXg3RqdW0th1ebq77+uWvpAWyzlh83k5+7HselIR W/EHVSGpzgvrAbbVfRFvAYoJ0yJsxaVJu5DEPQ9PSFNMbGOq/HPu9i9x/5UnDST6dn+QP+LbH0f Q3Sd8MKuEV66ZstMvvwjH7Y2LQkGKuAGp24xu7x/ZAs+KOEjae4YnaU1RTQaojo5pDcCaBCQZDO UlaPAe0ggBee3oS6Iw8uKPyvDRzVbXdcD+lZIRMu3FJoeciYymzRIfv8pu7O4puBtBagTogN8Nk ZKTziXsbXOJ7mRQXJcICalSoa2k6HA4qunrrWayykoqK0O2l3HO0eSTU64ZKs2S6Q22+fkxDAX2 AfWeBM60YDBgijXzCYeHNtt/VQgWwTSfcBg7K6xc9RgnsFto/Qel+kkAeEyFGVskdYxY6umF8Z4 uUw0PODzAxcRL+Jn4DGq65XTqJPOGr+Lfq3mfvfYGUcRSn5kk0WGMWgwso+uhC08SIhWZjtPrqh 4PHA2un5sMH3bppmvMMPKnPdFIFwQnVyNTGkGKKkk1uCHjCVXbqn5fSMFyFwNJLWZjhJfQCVcKz GsUV289V++wQShU/lZh9YQhGdZzc0J9lw+uHJzn5RQpPQVgViT695Gend+3M/fO3Ra7HnLlorjf 59cwJ90gf5N7azzdngJumGMNGUSW7c7jIfQC8yjGVtJJ9EbbgyKpLkZ5AezlYbeuy82AgLJc/1F cTvuWUbqzvK2/Pabt6lQCZeaV44a1yxcBjj7Rw8BV2GcqXOOLitwwMCoJ6YL8xNQD3NfZEUGBN X-Received: by 2002:a05:6830:4492:b0:81e:b506:592d with SMTP id 46e09a7af769-862898ade72mr8685264a34.27.1794826386804; Mon, 16 Nov 2026 02:53:06 -0800 (PST) Received: from [127.0.1.1] (174-29-1-49.hlrn.qwest.net. [174.29.1.49]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-862b08b8b5bsm5555546a34.5.2026.11.16.02.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2026 02:53:06 -0800 (PST) From: James Hilliard Date: Mon, 16 Nov 2026 03:52:30 -0700 Subject: [PATCH v8 2/6] dmaengine: dw: serialize error recovery with channel termination X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261116-submit-dw-dma-synchronize-v1-v8-2-4a82d64fcd1a@gmail.com> References: <20261116-submit-dw-dma-synchronize-v1-v8-0-4a82d64fcd1a@gmail.com> In-Reply-To: <20261116-submit-dw-dma-synchronize-v1-v8-0-4a82d64fcd1a@gmail.com> To: Viresh Kumar , Andy Shevchenko , Vinod Koul , Frank Li , Dan Williams Cc: Serge Semin , Greg Kroah-Hartman , Jiri Slaby , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , dmaengine@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Sashiko , Lars-Peter Clausen , James Hilliard , stable@vger.kernel.org, Frank Li X-Mailer: b4 0.17-dev The tasklet samples RAW.ERROR before taking the channel lock. A concurrent termination can empty the active list before dwc_handle_error() uses that cached error to select a descriptor. The list head is then interpreted as a descriptor. Even with an active descriptor, moving queue.next unconditionally can put an empty queue's head on the active list and pass it to dwc_dostart(). Recheck the error status under the channel lock and stop the channel before selecting its failed descriptor. Only one transaction is issued at a time, so take that descriptor directly instead of scanning for completions first. The scan can otherwise complete it and start queued work before the error handler has identified the failed transaction. Detach the failed descriptor under the same lock and use the queued-start helper, which leaves an empty queue alone. Clear the software-LLP flag before restarting so a failed multiblock transfer does not prevent the next transaction from starting. Keep the completion callback outside the lock, with the detached descriptor owned by the tasklet. Fixes: 3bfb1d20b547 ("dmaengine: Driver for the Synopsys DesignWare DMA controller") Fixes: f336e42f73d9 ("dw_dmac: Move single descriptor from dwc->queue to dwc->active_list in dwc_complete_all") Cc: stable@vger.kernel.org Reviewed-by: Frank Li Signed-off-by: James Hilliard --- drivers/dma/dw/core.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c index 2a9db9e39f5f..f7ca9da5af90 100644 --- a/drivers/dma/dw/core.c +++ b/drivers/dma/dw/core.c @@ -403,10 +403,17 @@ static void dwc_handle_error(struct dw_dma *dw, struct dw_dma_chan *dwc) struct dw_desc *child; unsigned long flags; - dwc_scan_descriptors(dw, dwc); - spin_lock_irqsave(&dwc->lock, flags); + /* Termination may have cleared the error since the tasklet sampled it. */ + if (!(dma_readl(dw, RAW.ERROR) & dwc->mask)) + goto unlock; + + dwc_chan_disable(dw, dwc); + clear_bit(DW_DMA_IS_SOFT_LLP, &dwc->flags); + if (list_empty(&dwc->active_list)) + goto unlock; + /* * The descriptor currently at the head of the active list is * borked. Since we don't have any way to report errors, we'll @@ -414,12 +421,7 @@ static void dwc_handle_error(struct dw_dma *dw, struct dw_dma_chan *dwc) */ bad_desc = dwc_first_active(dwc); list_del_init(&bad_desc->desc_node); - list_move(dwc->queue.next, dwc->active_list.prev); - - /* Clear the error flag and try to restart the controller */ - dma_writel(dw, CLEAR.ERROR, dwc->mask); - if (!list_empty(&dwc->active_list)) - dwc_dostart(dwc, dwc_first_active(dwc)); + dwc_dostart_first_queued(dwc); /* * WARN may seem harsh, but since this only happens @@ -438,6 +440,10 @@ static void dwc_handle_error(struct dw_dma *dw, struct dw_dma_chan *dwc) /* Pretend the descriptor completed successfully */ dwc_descriptor_complete(dwc, bad_desc, true); + return; + +unlock: + spin_unlock_irqrestore(&dwc->lock, flags); } static void dw_dma_tasklet(struct tasklet_struct *t) -- 2.53.0