| From linux@roeck-us.net Tue Oct 21 20:04:38 2025 |
| From: Guenter Roeck <linux@roeck-us.net> |
| Date: Mon, 20 Oct 2025 10:04:22 -0700 |
| Subject: dmaengine: Add missing cleanup on module unload |
| To: stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: dmaengine@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>, Yi Sun <yi.sun@intel.com>, Shuai Xue <xueshuai@linux.alibaba.com>, Dave Jiang <dave.jiang@intel.com>, Vinicius Costa Gomes <vinicius.gomes@intel.com>, Vinod Koul <vkoul@kernel.org> |
| Message-ID: <20251020170422.2630360-1-linux@roeck-us.net> |
| |
| From: Guenter Roeck <linux@roeck-us.net> |
| |
| Upstream commit b7cb9a034305 ("dmaengine: idxd: Fix refcount underflow |
| on module unload") fixes a refcount underflow by replacing the call to |
| idxd_cleanup() in the remove function with direct cleanup calls. That works |
| fine upstream. However, upstream removed support for IOMMU_DEV_FEAT_IOPF, |
| which is still supported in v6.12.y. The backport of commit b7cb9a034305 |
| into v6.12.y misses the call to disable it. This results in a warning |
| backtrace when unloading and reloading the module. |
| |
| WARNING: CPU: 0 PID: 665849 at drivers/pci/ats.c:337 pci_reset_pri+0x4c/0x60 |
| ... |
| RIP: 0010:pci_reset_pri+0xa7/0x130 |
| |
| Add the missing cleanup call to fix the problem. |
| |
| Fixes: ce81905bec91 ("dmaengine: idxd: Fix refcount underflow on module unload") |
| Cc: Yi Sun <yi.sun@intel.com> |
| Cc: Shuai Xue <xueshuai@linux.alibaba.com> |
| Cc: Dave Jiang <dave.jiang@intel.com> |
| Cc: Vinicius Costa Gomes <vinicius.gomes@intel.com> |
| Cc: Vinod Koul <vkoul@kernel.org> |
| Signed-off-by: Guenter Roeck <linux@roeck-us.net> |
| Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/dma/idxd/init.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/dma/idxd/init.c |
| +++ b/drivers/dma/idxd/init.c |
| @@ -923,6 +923,8 @@ static void idxd_remove(struct pci_dev * |
| idxd_cleanup_interrupts(idxd); |
| if (device_pasid_enabled(idxd)) |
| idxd_disable_system_pasid(idxd); |
| + if (device_user_pasid_enabled(idxd)) |
| + idxd_disable_sva(idxd->pdev); |
| pci_iounmap(pdev, idxd->reg_base); |
| put_device(idxd_confdev(idxd)); |
| pci_disable_device(pdev); |
