Patch "drbd: destroy workqueue when drbd device was freed" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drbd: destroy workqueue when drbd device was freed

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drbd-destroy-workqueue-when-drbd-device-was-freed.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 4c27feea436b35e089f82017a957c5f93cdc81db
Author: Wang ShaoBo <bobo.shaobowang@xxxxxxxxxx>
Date:   Thu Nov 24 09:58:17 2022 +0800

    drbd: destroy workqueue when drbd device was freed
    
    [ Upstream commit 8692814b77ca4228a99da8a005de0acf40af6132 ]
    
    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>
    Link: https://lore.kernel.org/r/20221124015817.2729789-3-bobo.shaobowang@xxxxxxxxxx
    Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index be819f80884f..eaf20a332401 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2244,6 +2244,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);
 }
@@ -2797,7 +2799,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;
@@ -2811,6 +2813,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);