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=1795055762; b=kPa//3PC/+jKXxtN58h1cNZXD51Ob5twAqriOm8UVq0GB4ARCiapQab/0Cgj1dX7UvdH 3pPLHHR8XuV+Y3o4Sywg4f4Wxql5//xw08FpNLxnltUu/kvdKQ0LC3m8zX0MKXN5kGay3 J+HzywkRTb3/bc6qjXSzsPlSjl/OfrIoEpqydyfuf4xg2a0XyfLASnsYm5mW5tPZ0rBAB xdq1yjjGOCoXzi7fRChvQ4a9XUL0yZ1TsIWv7YZk5bPVakz7vb8ypIruAIL9Ay9DjqaUo IjCmo6i0VtGVErb9QCuavJNfqf03f6gtK5AiBEpeyPZnNOrzHD7cozd/Rs8uyZ3DwjA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795055762; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=F+yhMYwy2uSP5W7ENZdxmXgTPrZaNTaBeATD2aKyLKw=; b=avV0SoI+Bay9tioZuzNSTuyrcwgG2flML3LNmVqwY2tsyiWRmU6k/Rw2yYAZUK/w8m1J qHLSL2bvMDwanbvXtX9/Sz8IDvnaltl1fupd8klog1RiPPUfI5K2d2Z7+1E0YwslIxVA5 cv5mAdR51QZSV3AhWFTfF0A8SR7BoZHYzPh8CQTQEwxdr5nPbFE94NDTd5f1zdwGDxEuO EG8g0vQTR37tb3+ANWCkafPsqw0GeyMfN4WfhfSoozLKySG0smu+utnL6on2fHOZ8TQV2 wKL9ODzGAjXsNM4xBpyQiKNPRfFIReWC9Afd6/eumgUilMxA15ScnTN322GjhhMXcnA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=K09DKcH9; 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 80650606A31C; Thu, 19 Nov 2026 02:36:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=K09DKcH9 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C839A1F000C9; Thu, 19 Nov 2026 02:36:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795055762; bh=F+yhMYwy2uSP5W7ENZdxmXgTPrZaNTaBeATD2aKyLKw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=K09DKcH9LqJMEKnc+WhgBWDRh/yGXw/lBmimlm+VkH14cD04Y/AYCKBXJZCyCc92p 2YJfuMBih9kmDtjj2HDJ/MACWLxb8a8CIyAj8iaJlUThjqX17QNMXrTrXwh17MNidB SyqHdDfUlAeKn7PPoIdZ15t6l/HMsCR1b/FMrpGI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Dave Jiang , Frank Li , Logan Gunthorpe , Vinod Koul , Sasha Levin Subject: [PATCH 5.15 1747/2214] dmaengine: ioat: disable relaxed ordering before registering the device Date: Wed, 18 Nov 2026 15:57:03 +0100 Message-ID: <20261118150121.499565269@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Logan Gunthorpe [ Upstream commit 10d34fbca6e09a6a18d64fa3ebaa3db9f27fc1a6 ] ioat3_dma_probe() disabled PCIe relaxed ordering after calling dma_async_device_register(), so if an error occurs and the code jumps to err_disable_interrupts, the function returns with the device still registered in the core's dma_device_list while the caller frees the ioatdma_device struct, leaving a dangling registration that anything walking the device list can dereference after it's been freed. Move the capability read/write ahead of dma_async_device_register() instead. Nothing after registration depends on relaxed ordering already being disabled, and nothing before it depends on the device being registered, so this is a plain reordering. It also means every remaining step after registration can't fail, so there's no need to ever have to unregister the device once registered. Fixes: 511deae0261c ("dmaengine: ioatdma: disable relaxed ordering for ioatdma") Reported-by: Sashiko Link: https://lore.kernel.org/dmaengine/20260707165906.249F41F000E9@smtp.kernel.org Acked-by: Dave Jiang Reviewed-by: Frank Li Signed-off-by: Logan Gunthorpe Link: https://lore.kernel.org/dmaengine/20260707165906.249F41F000E9@smtp.kernel.org/T/#u Link: https://patch.msgid.link/20260902062153.31048-9-logang@deltatee.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ioat/init.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c index 2a47b9053bad8..677efa50fefce 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c @@ -1168,15 +1168,6 @@ static int ioat3_dma_probe(struct ioatdma_device *ioat_dma, int dca) ioat_chan->reg_base + IOAT_DCACTRL_OFFSET); } - err = dma_async_device_register(&ioat_dma->dma_dev); - if (err) - goto err_disable_interrupts; - - ioat_kobject_add(ioat_dma, &ioat_ktype); - - if (dca) - ioat_dma->dca = ioat_dca_init(pdev, ioat_dma->reg_base); - /* disable relaxed ordering */ err = pcie_capability_read_word(pdev, PCI_EXP_DEVCTL, &val16); if (err) { @@ -1192,6 +1183,15 @@ static int ioat3_dma_probe(struct ioatdma_device *ioat_dma, int dca) goto err_disable_interrupts; } + err = dma_async_device_register(&ioat_dma->dma_dev); + if (err) + goto err_disable_interrupts; + + ioat_kobject_add(ioat_dma, &ioat_ktype); + + if (dca) + ioat_dma->dca = ioat_dca_init(pdev, ioat_dma->reg_base); + if (ioat_dma->cap & IOAT_CAP_DPS) writeb(ioat_pending_level + 1, ioat_dma->reg_base + IOAT_PREFETCH_LIMIT_OFFSET); -- 2.53.0