* [RESEND PATCH] drbd: destroy workqueue when drbd device was freed
@ 2022-11-21 11:50 Wang ShaoBo
2022-11-21 14:30 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: Wang ShaoBo @ 2022-11-21 11:50 UTC (permalink / raw)
Cc: liwei391, linux-block, drbd-dev, axboe, christoph.boehmwalder,
bobo.shaobowang
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@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);
kref_put(&resource->kref, drbd_destroy_resource);
}
@@ -2810,6 +2815,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;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RESEND PATCH] drbd: destroy workqueue when drbd device was freed
2022-11-21 11:50 [RESEND PATCH] drbd: destroy workqueue when drbd device was freed Wang ShaoBo
@ 2022-11-21 14:30 ` Jens Axboe
2022-11-22 3:08 ` Wangshaobo (bobo)
0 siblings, 1 reply; 3+ messages in thread
From: Jens Axboe @ 2022-11-21 14:30 UTC (permalink / raw)
To: Wang ShaoBo; +Cc: liwei391, linux-block, drbd-dev, christoph.boehmwalder
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@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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RESEND PATCH] drbd: destroy workqueue when drbd device was freed
2022-11-21 14:30 ` Jens Axboe
@ 2022-11-22 3:08 ` Wangshaobo (bobo)
0 siblings, 0 replies; 3+ messages in thread
From: Wangshaobo (bobo) @ 2022-11-22 3:08 UTC (permalink / raw)
To: Jens Axboe; +Cc: liwei391, linux-block, drbd-dev, christoph.boehmwalder
在 2022/11/21 22:30, Jens Axboe 写道:
> 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@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?
I have sent v2 version adding a new patch for killing that memset.^-^
-- Wang ShaoBo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-22 3:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-21 11:50 [RESEND PATCH] drbd: destroy workqueue when drbd device was freed Wang ShaoBo
2022-11-21 14:30 ` Jens Axboe
2022-11-22 3:08 ` Wangshaobo (bobo)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox