Re: [PATCH 4/5] nvme-tcp: remove nvme_tcp_destroy_io_queues()

[Hannes Reinecke <hare@suse.de>]

On 11/23/24 14:37, brookxu.cn wrote:
> From: "Chunguang.xu" <chunguang.xu@shopee.com>
> 
> Now maybe we can remove nvme_tcp_destroy_io_queues() to simplify
> the code and avoid unnecessary call of nvme_tcp_stop_io_queues().
> 
> Signed-off-by: Chunguang.xu <chunguang.xu@shopee.com>
> ---
>   drivers/nvme/host/tcp.c | 32 ++++++++++++++------------------
>   1 file changed, 14 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
> index 45cbaa7523e6..57f0f0290cc8 100644
> --- a/drivers/nvme/host/tcp.c
> +++ b/drivers/nvme/host/tcp.c
> @@ -2024,14 +2024,6 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
>   	return __nvme_tcp_alloc_io_queues(ctrl);
>   }
>   
> -static void nvme_tcp_destroy_io_queues(struct nvme_ctrl *ctrl, bool remove)
> -{
> -	nvme_tcp_stop_io_queues(ctrl);
> -	if (remove)
> -		nvme_remove_io_tag_set(ctrl);
> -	nvme_tcp_free_io_queues(ctrl);
> -}
> -
>   static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new)
>   {
>   	int ret, nr_queues;
> @@ -2170,15 +2162,17 @@ static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl,
>   static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl,
>   		bool remove)
>   {
> -	if (ctrl->queue_count <= 1)
> -		return;
> -	nvme_quiesce_io_queues(ctrl);
> -	nvme_sync_io_queues(ctrl);
> -	nvme_tcp_stop_io_queues(ctrl);
> -	nvme_cancel_tagset(ctrl);
> -	if (remove)
> -		nvme_unquiesce_io_queues(ctrl);
> -	nvme_tcp_destroy_io_queues(ctrl, remove);
> +	if (ctrl->queue_count > 1) {
> +		nvme_quiesce_io_queues(ctrl);
> +		nvme_sync_io_queues(ctrl);
> +		nvme_tcp_stop_io_queues(ctrl);
> +		nvme_cancel_tagset(ctrl);
> +		if (remove) {
> +			nvme_unquiesce_io_queues(ctrl);
> +			nvme_remove_io_tag_set(ctrl);
> +		}
> +		nvme_tcp_free_io_queues(ctrl);
> +	}
>   }
>   
Please don't reorder the function; if you keep
the first 'if (ctrl->queue_count <= 1)' condition
you'll incur less churn and the patch is easier to read.

>   static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl,
> @@ -2267,7 +2261,9 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)
>   		nvme_sync_io_queues(ctrl);
>   		nvme_tcp_stop_io_queues(ctrl);
>   		nvme_cancel_tagset(ctrl);
> -		nvme_tcp_destroy_io_queues(ctrl, new);
> +		if (new)
> +			nvme_remove_io_tag_set(ctrl);
> +		nvme_tcp_free_io_queues(ctrl);
>   	}
>   destroy_admin:
>   	nvme_stop_keep_alive(ctrl);

Cheers,

Hannes
-- 
Dr. Hannes Reinecke                  Kernel Storage Architect
hare@suse.de                                +49 911 74053 688
SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg
HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich