driver core: Call dma_cleanup() on the test_remove path

[PATCH v2] driver core: Call dma_cleanup() on the test_remove path

Posted by Jason Gunthorpe 2 years, 6 months ago

When test_remove is enabled really_probe() does not properly pair
dma_configure() with dma_remove(), it will end up calling dma_configure()
twice. This corrupts the owner_cnt and renders the group unusable with
VFIO/etc.

Add the missing cleanup before going back to re_probe.

Fixes: 25f3bcfc54bc ("driver core: Add dma_cleanup callback in bus_type")
Reported-by: Zenghui Yu <yuzenghui@huawei.com>
Tested-by: Zenghui Yu <yuzenghui@huawei.com>
Closes: https://lore.kernel.org/all/6472f254-c3c4-8610-4a37-8d9dfdd54ce8@huawei.com/
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
 drivers/base/dd.c | 2 ++
 1 file changed, 2 insertions(+)

v2:
 - Post to correct lists, add Tested-by

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 878aa7646b37e4..a528cec24264ab 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -693,6 +693,8 @@ static int really_probe(struct device *dev, struct device_driver *drv)
 
 		device_remove(dev);
 		driver_sysfs_remove(dev);
+		if (dev->bus && dev->bus->dma_cleanup)
+			dev->bus->dma_cleanup(dev);
 		device_unbind_cleanup(dev);
 
 		goto re_probe;

base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
-- 
2.41.0

RE: [PATCH v2] driver core: Call dma_cleanup() on the test_remove path

Posted by Tian, Kevin 2 years, 6 months ago

> From: Jason Gunthorpe <jgg@nvidia.com>
> Sent: Tuesday, July 25, 2023 1:41 AM
> 
> When test_remove is enabled really_probe() does not properly pair
> dma_configure() with dma_remove(), it will end up calling dma_configure()
> twice. This corrupts the owner_cnt and renders the group unusable with
> VFIO/etc.
> 
> Add the missing cleanup before going back to re_probe.
> 
> Fixes: 25f3bcfc54bc ("driver core: Add dma_cleanup callback in bus_type")
> Reported-by: Zenghui Yu <yuzenghui@huawei.com>
> Tested-by: Zenghui Yu <yuzenghui@huawei.com>
> Closes: https://lore.kernel.org/all/6472f254-c3c4-8610-4a37-
> 8d9dfdd54ce8@huawei.com/
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

Reviewed-by: Kevin Tian <kevin.tian@intel.com>