From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794048127; b=4JYHNcXi/rdgb1AQj9FgOJek15x+x33B9fL+gXYBQtNtcKjU05jRAgFF7VyexwHbjQcl odKA4GH12pyB2J8Mee9jIxIFv04irKX1cha/YtdlhoFhzLtSbCfMtlvl4WcAg2XUbVibh T3tekHdaQnohxvlxNlCWNvL6WEWaW43784PZeNl0lvQtjlQEtH46Z6vxE7kimPrgU6Eju Eo7qHhP3boxCxJ91+svi6TNO5uzPQdmrDKGM/Oek0+Q5RaSGg9sJ/ZKp2NE7OvBH+bfs4 3XGDKh+QZvfrx71gnUxAe4BvESPlk9OyI0eMaPoyC1PDxv5/+SClaogo9CHVCXx6m0A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048127; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=N5rewoNyMWFLdT+i9vTGxOhxmKQyzdgcNxHNh1ipFjM=; b=lIwNqFwnLLATzlcTsT48mpDmhSnHx87W1ZXANm2TLmfjhKDfBvGe7TX+AzGgMLeJUriA 4hqkTXvJTgBYNd3ECOlxYD/1eMGWIEoSCLZaOxap3b43U0kYHqDSPKVOOzrpsh2UlGg2U 8lcWZIr7eyTPsRGPUI3aX2Tt6w02+4qGxtuy0HgCMq0rzqS1Kl4AI/8fIJfzuGXEx6iKF QKvgelHMJ932uecCP0aJrNHc47oc8z+ze+SfeMWNMnVrIH8eSHDIVb0wwUEe3RAJ5WD1X bqy/S14IVMQgarcUcuqOn4XXg7Jett/WUMewaCsZnr7tFA3Lx0sFWusQ9npZ1pNyDng== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=buQ7W1zG; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38778606A326 for ; Sat, 7 Nov 2026 10:42:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=buQ7W1zG Received: by smtp.kernel.org (Postfix) with ESMTPSA id A82A21F0089F; Sat, 7 Nov 2026 10:42:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048127; bh=N5rewoNyMWFLdT+i9vTGxOhxmKQyzdgcNxHNh1ipFjM=; h=From:To:Cc:Subject:Date; b=buQ7W1zGrGYkYnmV60g9nQNgNypIWpImpIxs8Ah7N8CFvznxm82MwIvHB9Ekcht23 GsLDCStGv5hx55OKw9/cPMDjsEHSjWevH81Izo/jGKlx5Ee8v+WDAtZTK+MEeJZrkL vKFXIUiRf5eF3Tco4/VTr/UZ3GcJNF9NKlhP2/AW6s6SI4PlHMsz4iV3Xk0HkhsLGC 21sORPzp+sCJwABl+jZr3Jvjq340HhrmpMS7cx2V5h/4mcH+l7KHTz8F20u8qK08OD jsrZInRu3qPcH+NAkJgTwUGUq4u9GQ9Sk/sAgURBoY/crVOp6+5fhQmi6/Q4Txal7L Xe14MoYELTsAQ== From: Sasha Levin To: cassel@kernel.org, dlemoal@kernel.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] ata: libahci: Free the IRQs when activating a multi-IRQ host fails" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:42:05 -0500 Message-ID: <20261107054205-failed-6.1-34a4a34431ed@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@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: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 34a4a34431ed81d85d14f8fb8035e5a25214ad39 # git commit -s git send-email --to '' --in-reply-to '20261107054205-failed-6.1-34a4a34431ed@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 34a4a34431ed81d85d14f8fb8035e5a25214ad39 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 15 Sep 2026 10:41:30 +0200 Subject: [PATCH] ata: libahci: Free the IRQs when activating a multi-IRQ host fails ahci_host_activate_multi_irqs() requests one IRQ per port, but it does not free them when requesting one of them, or when registering the host, fails. The IRQs are only freed by the driver core, when it releases the devres of the device after probe() has returned, while the caller of ahci_host_activate() releases the resources of the host in its probe() error path, e.g. ahci_probe() disables the clocks, regulators, resets and PHYs of the host. An IRQ handler running in that window would access the MMIO of a host which is no longer clocked. ahci_host_activate_multi_irqs() did free the IRQs until commit 0a142b26921c ("ahci: cleanup ahci_host_activate_multi_irqs"), which removed the explicit free because devm makes it unnecessary. That is true for freeing the IRQs as such, but not for the window described above: devres is only released after probe() has returned, i.e. after the error path of the caller has released the resources of the host. Note that this window cannot be hit with the current users: the only user of AHCI_HFLAG_MULTI_MSI is the AHCI PCI driver, which does not release any resource in its probe() error path, and the ports of the host are still frozen, i.e. their interrupts are masked, when ata_host_register() fails. Free the IRQs explicitly again, like ata_host_activate() does, so that the IRQ handlers cannot run once ahci_host_activate() has failed. Fixes: 0a142b26921c ("ahci: cleanup ahci_host_activate_multi_irqs") Cc: stable@vger.kernel.org Reviewed-by: Damien Le Moal Link: https://lore.kernel.org/r/20260915084127.692494-12-cassel@kernel.org Signed-off-by: Niklas Cassel --- drivers/ata/libahci.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index bea9a39dacedf..1290dd5401011 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -2724,11 +2724,33 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host, 0, pp->irq_desc, host->ports[i]); if (rc) - return rc; + goto free_irqs; ata_port_desc_misc(host->ports[i], irq); } - return ata_host_register(host, sht); + rc = ata_host_register(host, sht); + if (rc) + goto free_irqs; + + return 0; + +free_irqs: + /* + * Free the IRQs which have been requested, so that the handlers can no + * longer access the MMIO of the host once we return, e.g. after the + * caller has disabled the clocks of the host. + */ + while (--i >= 0) { + struct ahci_port_priv *pp = host->ports[i]->private_data; + + if (!pp) + continue; + + devm_free_irq(host->dev, hpriv->get_irq_vector(host, i), + host->ports[i]); + } + + return rc; } /** -- 2.53.0