From: Wang ShaoBo <bobo.shaobowang@huawei.com>
To: unlisted-recipients:; (no To-header on input)
Cc: <liwei391@huawei.com>, <linux-block@vger.kernel.org>,
<drbd-dev@lists.linbit.com>, <axboe@kernel.dk>,
<christoph.boehmwalder@linbit.com>, <bobo.shaobowang@huawei.com>
Subject: [RESEND PATCH] drbd: destroy workqueue when drbd device was freed
Date: Mon, 21 Nov 2022 19:50:47 +0800 [thread overview]
Message-ID: <20221121115047.3828385-1-bobo.shaobowang@huawei.com> (raw)
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
next reply other threads:[~2022-11-21 11:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 11:50 Wang ShaoBo [this message]
2022-11-21 14:30 ` [RESEND PATCH] drbd: destroy workqueue when drbd device was freed Jens Axboe
2022-11-22 3:08 ` Wangshaobo (bobo)
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=20221121115047.3828385-1-bobo.shaobowang@huawei.com \
--to=bobo.shaobowang@huawei.com \
--cc=axboe@kernel.dk \
--cc=christoph.boehmwalder@linbit.com \
--cc=drbd-dev@lists.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