[Drbd-dev] [RESEND PATCH] drbd: destroy workqueue when drbd device was freed

Jens Axboe axboe at kernel.dk
Mon Nov 21 15:30:44 CET 2022


On 11/21/22 4:50 AM, Wang ShaoBo wrote:
> A submitter workqueue is dynamically allocated by init_submitter()
> called by drbd_create_device(), we should destroy it when this
> device is not needed or destroyed.
> 
> Fixes: 113fef9e20e0 ("drbd: prepare to queue write requests on a submit worker")
> Signed-off-by: Wang ShaoBo <bobo.shaobowang at huawei.com>
> ---
> 
> Changes in RESEND:
>   put destroy_workqueue() before memset(device, ...)
> 
>  drivers/block/drbd/drbd_main.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index 8532b839a343..082bc34cd317 100644
> --- a/drivers/block/drbd/drbd_main.c
> +++ b/drivers/block/drbd/drbd_main.c
> @@ -2217,7 +2217,12 @@ void drbd_destroy_device(struct kref *kref)
>  		kref_put(&peer_device->connection->kref, drbd_destroy_connection);
>  		kfree(peer_device);
>  	}
> +
> +	if (device->submit.wq)
> +		destroy_workqueue(device->submit.wq);
> +
>  	memset(device, 0xfd, sizeof(*device));
> +
>  	kfree(device);

Maybe you can send a separate patch killing that very odd (and useless)
memset as well?

-- 
Jens Axboe




More information about the drbd-dev mailing list