Am 22.11.22 um 04:04 schrieb Wang ShaoBo:
> 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@xxxxxxxxxx>
> ---
> drivers/block/drbd/drbd_main.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index 78cae4e75af1..2d6b6d1c5ff4 100644
> --- a/drivers/block/drbd/drbd_main.c
> +++ b/drivers/block/drbd/drbd_main.c
> @@ -2217,6 +2217,8 @@ 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);
> kfree(device);
> kref_put(&resource->kref, drbd_destroy_resource);
> }
> @@ -2807,6 +2809,8 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
> put_disk(disk);
> out_no_disk:
> kref_put(&resource->kref, drbd_destroy_resource);
> + if (device->submit.wq)
> + destroy_workqueue(device->submit.wq);
> kfree(device);
> return err;
> }
Thanks, that is better.
Just one more nitpick: in drbd_create_device, we usually order the
allocations/frees in a "last in, first out" fashion. That is, data
should be released in the reverse order that it was allocated. This also
helps with error handling, which is what the out_* labels are used for.
So maybe we can put that destroy_workqueue() under its own out_* label
and make sure it gets freed first in the cleanup section (since it gets
allocated last).
--
Christoph Böhmwalder
LINBIT | Keeping the Digital World Running
DRBD HA — Disaster Recovery — Software defined Storage
