[Drbd-dev] [PATCH v3 0/2] drbd bugfix and cleanup.

[Drbd-dev] [PATCH v3 0/2] drbd bugfix and cleanup.

[Wang ShaoBo]

drbd bugfix and cleanup.

v3:
  - add out_* label for destroy_workqueue().

v2:
  - add new patch for removing useless memset().


Wang ShaoBo (2):
  drbd: remove call to memset before free device/resource/connection
  drbd: destroy workqueue when drbd device was freed

 drivers/block/drbd/drbd_main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

-- 
2.25.1

[Drbd-dev] [PATCH v3 1/2] drbd: remove call to memset before free device/resource/connection

[Wang ShaoBo]

This revert c2258ffc56f2 ("drbd: poison free'd device, resource and
connection structs"), add memset is odd here for debugging, there are
some methods to accurately show what happened, such as kdump.

Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
---
 drivers/block/drbd/drbd_main.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 8532b839a343..78cae4e75af1 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2217,7 +2217,6 @@ void drbd_destroy_device(struct kref *kref)
 		kref_put(&peer_device->connection->kref, drbd_destroy_connection);
 		kfree(peer_device);
 	}
-	memset(device, 0xfd, sizeof(*device));
 	kfree(device);
 	kref_put(&resource->kref, drbd_destroy_resource);
 }
@@ -2309,7 +2308,6 @@ void drbd_destroy_resource(struct kref *kref)
 	idr_destroy(&resource->devices);
 	free_cpumask_var(resource->cpu_mask);
 	kfree(resource->name);
-	memset(resource, 0xf2, sizeof(*resource));
 	kfree(resource);
 }
 
@@ -2650,7 +2648,6 @@ void drbd_destroy_connection(struct kref *kref)
 	drbd_free_socket(&connection->data);
 	kfree(connection->int_dig_in);
 	kfree(connection->int_dig_vv);
-	memset(connection, 0xfc, sizeof(*connection));
 	kfree(connection);
 	kref_put(&resource->kref, drbd_destroy_resource);
 }
-- 
2.25.1

[Drbd-dev] [PATCH v3 2/2] drbd: destroy workqueue when drbd device was freed

[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);
-- 
2.25.1

Re: [Drbd-dev] [PATCH v3 1/2] drbd: remove call to memset before free device/resource/connection

[Christoph Böhmwalder]

Am 23.11.22 um 03:03 schrieb Wang ShaoBo:
> This revert c2258ffc56f2 ("drbd: poison free'd device, resource and
> connection structs"), add memset is odd here for debugging, there are
> some methods to accurately show what happened, such as kdump.
> 
> Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
> ---
>  drivers/block/drbd/drbd_main.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index 8532b839a343..78cae4e75af1 100644
> --- a/drivers/block/drbd/drbd_main.c
> +++ b/drivers/block/drbd/drbd_main.c
> @@ -2217,7 +2217,6 @@ void drbd_destroy_device(struct kref *kref)
>  		kref_put(&peer_device->connection->kref, drbd_destroy_connection);
>  		kfree(peer_device);
>  	}
> -	memset(device, 0xfd, sizeof(*device));
>  	kfree(device);
>  	kref_put(&resource->kref, drbd_destroy_resource);
>  }
> @@ -2309,7 +2308,6 @@ void drbd_destroy_resource(struct kref *kref)
>  	idr_destroy(&resource->devices);
>  	free_cpumask_var(resource->cpu_mask);
>  	kfree(resource->name);
> -	memset(resource, 0xf2, sizeof(*resource));
>  	kfree(resource);
>  }
>  
> @@ -2650,7 +2648,6 @@ void drbd_destroy_connection(struct kref *kref)
>  	drbd_free_socket(&connection->data);
>  	kfree(connection->int_dig_in);
>  	kfree(connection->int_dig_vv);
> -	memset(connection, 0xfc, sizeof(*connection));
>  	kfree(connection);
>  	kref_put(&resource->kref, drbd_destroy_resource);
>  }

Thanks!

Acked-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>

-- 
Christoph Böhmwalder
LINBIT | Keeping the Digital World Running
DRBD HA —  Disaster Recovery — Software defined Storage

Re: [Drbd-dev] [PATCH v3 2/2] drbd: destroy workqueue when drbd device was freed

[Christoph Böhmwalder]

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

Re: [Drbd-dev] [PATCH v3 0/2] drbd bugfix and cleanup.

[Jens Axboe]

On 11/22/22 7:03 PM, Wang ShaoBo wrote:
> drbd bugfix and cleanup.
> 
> v3:
>   - add out_* label for destroy_workqueue().
> 
> v2:
>   - add new patch for removing useless memset().
> 
> 
> Wang ShaoBo (2):
>   drbd: remove call to memset before free device/resource/connection
>   drbd: destroy workqueue when drbd device was freed
> 
>  drivers/block/drbd/drbd_main.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 

Patch 2/2 doesn't apply to the for-6.2/block branch. Can you respin
it?

-- 
Jens Axboe