From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.161.48 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795111392; b=OAGsfLn+Hpb5Av8WuXUJHrE74qMrxJIjdW+IXQMG51WGJTmZM6zi11HQ5XzjGIwsEtO6 n8rqtTtlouHYgCdjm5Dzy8oRJ2UHPHWfZER/vhX32ja7f2acmd2lClu7ZOgcZMc+rrgr/ kB0Z5GTu++tAVM+WfnTblnutsQ04oRlS7PwXTJCUJ/YxOWLkFKvMApfvXD/0thX+/ZunC 4EMjgEbmjVhpBe+BaBRMfBXwtlcZ0HL4Srsrqgp+yoqerY+6+LbcCQc8eZ4AjhHEOltzp +fU1xd9WkqPz8utNJA3Mp/e3qnSUY6UTcohbPelRDmTWK7PIS/lF1is8IKh3w1Y1bdg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795111392; 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=dfbuM0pmbxDgRGHnvK9GVp1KbnVrBOX0xw08dSvpRRw=; b=K6TFpbL7DWKeoOB7LLsCRiOi/z8RajJRQf1YvlnmBEG1GwRqmGVg43svfzuEmYJPP5P9 YfZIQxQ8lo+PdOCsFc96FUErnG4N9c5IE6mj7ACDwMo7ZEwPpAzhQ26oIu1aj4NPYh66X T/ntJ+StWu6aYhTBuVw3Z642W3xiVybS2ZoRK0hWgGdPbntpMfQ7L/WS0HO7RKrLzmNCd mj7E1NgjdsKGGkH3Up1JpoB4DeTETcSguqaHeWCpdvd8GnihMx9JlLV0ET5j8FReosWWp J91SwirZsMIpTwPxmKPM6RwwZ/xPbswLiTWi3psGod4AJjjn1oZOOY3Okrl51VlmEoA== 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=kMMJaIw1; arc=none smtp.remote-ip=209.85.161.48 Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) (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 C05F6606A33B for ; Thu, 19 Nov 2026 18:03:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C05F6606A33B 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=kMMJaIw1 Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-716c0217635so1359505eaf.0 for ; Thu, 19 Nov 2026 10:03:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1795111391; x=1795716191; 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=dfbuM0pmbxDgRGHnvK9GVp1KbnVrBOX0xw08dSvpRRw=; b=kMMJaIw1atQfQOHDkKbNI3z2L+GOPgCJHW4PfsqAw0f0i3wrVcTaOrg/D2b8I9prRV vUoeDxsjHea9FMdIjMANCtGt3N9NwINAx9mi5E9LEjBxiH2dk+sqGLGClXY8etHQTH7K j5lCvDcAabqkV0JSivgusAJmn5LXpzkr4AqbgF9CSFWo6I6/GTsCVL1//eYzfg8h/aND kmZb6WOZvScp7wNtM560ctYRiwrvPshk+UmxDTYJStO3ZdB0LfkY0raMY+rY99njfWtF PIkibAwYMNFmTmNNVf5sQCDE/MJvbXabEngC7VfHgkt67ifo94+zejMmegsFJ+v3qa8k H/Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795111391; x=1795716191; 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=dfbuM0pmbxDgRGHnvK9GVp1KbnVrBOX0xw08dSvpRRw=; b=ihFWz7inKZDD3Ueno3WoGClfSAMrVLW+TMSBpuNDwUpJzPPo4OnNTH8HE3wB5rMLtW 452T+tT5bG/RAKjz6VrsTT32nx6lffNMMo9pE7VlVGLloj18nO7bD3lpI2LfwyaXYOtr +uaUuwziycwFFaLAhyZuoK+Lui0aXFQbZOsovFtR4UHud9y2EmIUvDTdol+3DQLGvW/O saOuuUAAv0J/Z1Aj2xBTBy0qQ1X2YdAJjErZk89rttcLOZuOVkrPw2daHJxw1PW0i68/ jxyvXw8h7HkgA1Cw3zX3hW0yXTyyYU9aeLDW5D/pp39nvnetWt27li/SudP5nSDMkVlP fNcw== X-Forwarded-Encrypted: i=1; AL+hErFAm31O5m2E+Rnd8XVG+L/SGuY+D13p9AKIwYgHngziFaed8Sedi5u9IChf6O2Nuu3IgmTmBighnb7AbgQ=@vger.kernel.org X-Gm-Message-State: APuU4Z/hpDpLi3bA9aKFd9JrVoiCnFQrn51pyQsaL5HFvZunztMureJ8 RtRV+5UAmTNMcVZUIdL5rivnAH+8wrx+Ji87KxvxUHwt3xRQqhUvlHoY X-Gm-Gg: AYBFou1cc1aqiSuMY0bJkdLkmYHpK8i2eKia1Z1U3N+RQw/B4XFL5GGKtezQL91IGEB QrISKK6FE138gus+dGkZNFQ32lhYzStRI2GJrCLCxzCO3krpnWlbI0HEg6n737HcVDWkUlQjGnW mF4uCO2Z5OT9gDk9GuU1PhLf3mcPY6gfZNSxpoQZUSUuRyxW42j++sXDbk1ZZQtAJZcShifTbWN SSNOp3rpJxCZ+8+wIuO/lR+VFUgIgP+pD/x6yTs1O+dObN+Guf+8hggBU3yz1dedqUwTt+t0PVp IcrgnZcPF+sRqfL4kD57qK5HNxc0s/k0niqegiAoNWp8v9AsgLA232yFrjmGrDV/JIhJaty+gHG t7yEJguuRJX0Z+dj9FmNp2G7dm6k06wjnEw0/9UJ4mTL58JO9D7+d4awfoJdEvwy2erRpwefJoY 0EA34+opAS5BiPLFcio1dHI0A0TY+Vn+6pheKEoF1lFOKdam4cjYOmH+yx0Ocw/Jl5X7QeIB89V aLTlEAYIu2dU+PalXToA7+V3nokH5pEjGr8JL/HW/IjkLJBxL1UxU/PXZVddt5r5joN/QWzPFb9 ojyYGB7fAnXFVgUAns+KBwStwS/BHAX+LFoBsKpWEJQtwNDkExEvuBS4Z+JMH8DPV/XdoFmCJEW +rufloQS+rgBdtcC7dX/b3EGq11soYFhlb81cz/E1SEiZrAoEswP/pn5b+tC6bi6JVTvgudHU7v aBDgYV1zueaPmY/np9O4rxBOOy/ciBJC9EHqb6MlU4T9LHjJ73StQ6Gg== X-Received: by 2002:a05:6820:248a:b0:71a:f035:823e with SMTP id 006d021491bc7-71b3945d5demr218426eaf.7.1795111390594; Thu, 19 Nov 2026 10:03:10 -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 006d021491bc7-71b3806ef20sm448478eaf.7.2026.11.19.10.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2026 10:03:09 -0800 (PST) From: James Hilliard Date: Thu, 19 Nov 2026 11:02:23 -0700 Subject: [PATCH v3 3/3] dmaengine: sun4i: retire interrupt state before channel reuse 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: <20261119-submit-sun4i-dma-callback-lifetime-v1-v3-3-3935aef58db9@gmail.com> References: <20261119-submit-sun4i-dma-callback-lifetime-v1-v3-0-3935aef58db9@gmail.com> In-Reply-To: <20261119-submit-sun4i-dma-callback-lifetime-v1-v3-0-3935aef58db9@gmail.com> To: Vinod Koul , Frank Li , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Hans de Goede , =?utf-8?q?Emilio_L=C3=B3pez?= , Maxime Ripard Cc: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, James Hilliard X-Mailer: b4 0.17-dev The IRQ handler samples pending status before looking up the physical channel's virtual owner. Another CPU can terminate that owner and start a transfer on a different virtual channel using the same physical channel. The old pending bit then passes the new owner's association check and can complete its transfer before the DMA has finished. The handler also releases a completed transfer's physical channel before masking and acknowledging its interrupts. A replacement transfer can start in between, only to have its interrupts disabled or cleared by the old handler's deferred cleanup. Clear both pending interrupt sources when disabling a physical channel, and read the status back before allowing the channel to be reused. Disable the sources before releasing a completed transfer's channel. Re-read and acknowledge each pending event under the owning virtual channel's lock, before completing or rearming the transfer. This rejects stale status and keeps the old handler from clearing a replacement transfer's events. Fixes: b096c1377d1e ("dmaengine: sun4i: Add support for the DMA engine on sun[457]i SoCs") Signed-off-by: James Hilliard --- drivers/dma/sun4i-dma.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/dma/sun4i-dma.c b/drivers/dma/sun4i-dma.c index b0c91dab62f0..6ecc45cadd91 100644 --- a/drivers/dma/sun4i-dma.c +++ b/drivers/dma/sun4i-dma.c @@ -400,6 +400,13 @@ static void set_pchan_interrupt(struct sun4i_dma_dev *priv, writel_relaxed(reg, priv->base + SUN4I_DMA_IRQ_ENABLE_REG); + /* Do not leave pending events for the channel's next owner. */ + if (!half && !end) { + writel_relaxed(BIT(pchan_number * 2) | BIT(pchan_number * 2 + 1), + priv->base + SUN4I_DMA_IRQ_PENDING_STATUS_REG); + readl(priv->base + SUN4I_DMA_IRQ_PENDING_STATUS_REG); + } + spin_unlock_irqrestore(&priv->lock, flags); } @@ -1125,14 +1132,13 @@ static irqreturn_t sun4i_dma_interrupt(int irq, void *dev_id) struct sun4i_dma_vchan *vchan; struct sun4i_dma_contract *contract; struct sun4i_dma_promise *promise; - unsigned long pendirq, irqs, disableirqs; + unsigned long pendirq, irqs; int bit, i, free_room, allow_mitigation = 1; pendirq = readl_relaxed(priv->base + SUN4I_DMA_IRQ_PENDING_STATUS_REG); handle_pending: - disableirqs = 0; free_room = 0; for_each_set_bit(bit, &pendirq, 32) { @@ -1142,10 +1148,13 @@ static irqreturn_t sun4i_dma_interrupt(int irq, void *dev_id) continue; spin_lock(&vchan->vc.lock); - if (vchan->pchan != pchan || !vchan->processing) { + /* The channel may have been reused since pendirq was sampled. */ + irqs = readl_relaxed(priv->base + SUN4I_DMA_IRQ_PENDING_STATUS_REG); + if (vchan->pchan != pchan || !vchan->processing || !(irqs & BIT(bit))) { spin_unlock(&vchan->vc.lock); continue; } + writel_relaxed(BIT(bit), priv->base + SUN4I_DMA_IRQ_PENDING_STATUS_REG); contract = vchan->contract; /* @@ -1183,7 +1192,7 @@ static irqreturn_t sun4i_dma_interrupt(int irq, void *dev_id) vchan->pchan = NULL; free_room = 1; - disableirqs |= BIT(bit); + set_pchan_interrupt(priv, pchan, 0, 0); release_pchan(priv, pchan); } } else { @@ -1191,21 +1200,11 @@ static irqreturn_t sun4i_dma_interrupt(int irq, void *dev_id) if (contract->is_cyclic) vchan_cyclic_callback(&contract->vd); else - disableirqs |= BIT(bit); + set_pchan_interrupt(priv, pchan, 0, 1); } spin_unlock(&vchan->vc.lock); } - /* Disable the IRQs for events we handled */ - spin_lock(&priv->lock); - irqs = readl_relaxed(priv->base + SUN4I_DMA_IRQ_ENABLE_REG); - writel_relaxed(irqs & ~disableirqs, - priv->base + SUN4I_DMA_IRQ_ENABLE_REG); - spin_unlock(&priv->lock); - - /* Writing 1 to the pending field will clear the pending interrupt */ - writel_relaxed(pendirq, priv->base + SUN4I_DMA_IRQ_PENDING_STATUS_REG); - /* * If a pchan was freed, we may be able to schedule something else, * so have a look around -- 2.53.0