2023-07-24 04:49:24

by Zenghui Yu

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

+Cc: LKML

On 2023/7/22 0:20, Jason Gunthorpe wrote:
> 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 <[email protected]>
> Closes: https://lore.kernel.org/all/[email protected]/
> Signed-off-by: Jason Gunthorpe <[email protected]>
> ---
> drivers/base/dd.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> 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
>

Tested-by: Zenghui Yu <[email protected]>

Thanks,
Zenghui

2023-07-24 17:57:46

by Jason Gunthorpe

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

On Mon, Jul 24, 2023 at 11:56:09AM +0800, Zenghui Yu wrote:
> +Cc: LKML

Oh, I accidentally missed that, I will repost this, thanks

Jason