From: "Christoph Böhmwalder" <christoph.boehmwalder@linbit.com>
To: Wang ShaoBo <bobo.shaobowang@huawei.com>
Cc: linux-block@vger.kernel.org, axboe@kernel.dk,
lars.ellenberg@linbit.com, liwei391@huawei.com,
drbd-dev@lists.linbit.com
Subject: Re: [Drbd-dev] [PATCH v3 2/2] drbd: destroy workqueue when drbd device was freed
Date: Wed, 23 Nov 2022 11:16:37 +0100 [thread overview]
Message-ID: <e396a423-97e7-2b50-21e3-7ac4070b6d9a@linbit.com> (raw)
In-Reply-To: <20221123020355.2470160-3-bobo.shaobowang@huawei.com>
Am 23.11.22 um 03:03 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@huawei.com>
> ---
>
> v3:
> - add out_* label for destroy_workqueue().
>
> drivers/block/drbd/drbd_main.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index 78cae4e75af1..677240232684 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);
> }
> @@ -2771,7 +2773,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
>
> err = add_disk(disk);
> if (err)
> - goto out_idr_remove_from_resource;
> + goto out_destroy_workqueue;
>
> /* inherit the connection state */
> device->state.conn = first_connection(resource)->cstate;
> @@ -2785,6 +2787,8 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
> drbd_debugfs_device_add(device);
> return NO_ERROR;
>
> +out_destroy_workqueue:
> + destroy_workqueue(device->submit.wq);
> out_idr_remove_from_resource:
> for_each_connection_safe(connection, n, resource) {
> peer_device = idr_remove(&connection->peer_devices, vnr);
Thanks!
Reviewed-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
--
Christoph Böhmwalder
LINBIT | Keeping the Digital World Running
DRBD HA — Disaster Recovery — Software defined Storage
next prev parent reply other threads:[~2022-11-23 10:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-23 2:03 [Drbd-dev] [PATCH v3 0/2] drbd bugfix and cleanup Wang ShaoBo
2022-11-23 2:03 ` [Drbd-dev] [PATCH v3 1/2] drbd: remove call to memset before free device/resource/connection Wang ShaoBo
2022-11-23 10:16 ` Christoph Böhmwalder
2022-11-23 2:03 ` [Drbd-dev] [PATCH v3 2/2] drbd: destroy workqueue when drbd device was freed Wang ShaoBo
2022-11-23 10:16 ` Christoph Böhmwalder [this message]
2022-11-23 13:49 ` [Drbd-dev] [PATCH v3 0/2] drbd bugfix and cleanup Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e396a423-97e7-2b50-21e3-7ac4070b6d9a@linbit.com \
--to=christoph.boehmwalder@linbit.com \
--cc=axboe@kernel.dk \
--cc=bobo.shaobowang@huawei.com \
--cc=drbd-dev@lists.linbit.com \
--cc=lars.ellenberg@linbit.com \
--cc=linux-block@vger.kernel.org \
--cc=liwei391@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox