All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ming Lei <ming.lei@redhat.com>
To: Daniel Wagner <dwagner@suse.de>
Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
	James Smart <james.smart@broadcom.com>,
	Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
	Sagi Grimberg <sagi@grimberg.me>
Subject: Re: [PATCH 1/2] nvme-fc: Update hardware queues before using them
Date: Tue, 29 Jun 2021 09:32:11 +0800	[thread overview]
Message-ID: <YNp4GyXwOlJeqtby@T590> (raw)
In-Reply-To: <20210625101649.49296-2-dwagner@suse.de>

On Fri, Jun 25, 2021 at 12:16:48PM +0200, Daniel Wagner wrote:
> In case the number of hardware queues changes, do the update the
> tagset and ctx to hctx first before using the mapping to recreate and
> connnect the IO queues.
> 
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
>  drivers/nvme/host/fc.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 8a3c4814d21b..a9645cd89eca 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -2951,14 +2951,6 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)
>  	if (ctrl->ctrl.queue_count == 1)
>  		return 0;
>  
> -	ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1);
> -	if (ret)
> -		goto out_free_io_queues;
> -
> -	ret = nvme_fc_connect_io_queues(ctrl, ctrl->ctrl.sqsize + 1);
> -	if (ret)
> -		goto out_delete_hw_queues;
> -
>  	if (prior_ioq_cnt != nr_io_queues) {
>  		dev_info(ctrl->ctrl.device,
>  			"reconnect: revising io queue count from %d to %d\n",
> @@ -2968,6 +2960,14 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)
>  		nvme_unfreeze(&ctrl->ctrl);
>  	}
>  
> +	ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1);
> +	if (ret)
> +		goto out_free_io_queues;
> +
> +	ret = nvme_fc_connect_io_queues(ctrl, ctrl->ctrl.sqsize + 1);
> +	if (ret)
> +		goto out_delete_hw_queues;
> +
>  	return 0;
>  
>  out_delete_hw_queues:
> -- 
> 2.29.2
> 

This way may cause correct hctx_idx to be passed to blk_mq_alloc_request_hctx(), so:

Reviewed-by: Ming Lei <ming.lei@redhat.com>


Thanks,
Ming


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

WARNING: multiple messages have this Message-ID (diff)
From: Ming Lei <ming.lei@redhat.com>
To: Daniel Wagner <dwagner@suse.de>
Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
	James Smart <james.smart@broadcom.com>,
	Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
	Sagi Grimberg <sagi@grimberg.me>
Subject: Re: [PATCH 1/2] nvme-fc: Update hardware queues before using them
Date: Tue, 29 Jun 2021 09:32:11 +0800	[thread overview]
Message-ID: <YNp4GyXwOlJeqtby@T590> (raw)
In-Reply-To: <20210625101649.49296-2-dwagner@suse.de>

On Fri, Jun 25, 2021 at 12:16:48PM +0200, Daniel Wagner wrote:
> In case the number of hardware queues changes, do the update the
> tagset and ctx to hctx first before using the mapping to recreate and
> connnect the IO queues.
> 
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
>  drivers/nvme/host/fc.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 8a3c4814d21b..a9645cd89eca 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -2951,14 +2951,6 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)
>  	if (ctrl->ctrl.queue_count == 1)
>  		return 0;
>  
> -	ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1);
> -	if (ret)
> -		goto out_free_io_queues;
> -
> -	ret = nvme_fc_connect_io_queues(ctrl, ctrl->ctrl.sqsize + 1);
> -	if (ret)
> -		goto out_delete_hw_queues;
> -
>  	if (prior_ioq_cnt != nr_io_queues) {
>  		dev_info(ctrl->ctrl.device,
>  			"reconnect: revising io queue count from %d to %d\n",
> @@ -2968,6 +2960,14 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)
>  		nvme_unfreeze(&ctrl->ctrl);
>  	}
>  
> +	ret = nvme_fc_create_hw_io_queues(ctrl, ctrl->ctrl.sqsize + 1);
> +	if (ret)
> +		goto out_free_io_queues;
> +
> +	ret = nvme_fc_connect_io_queues(ctrl, ctrl->ctrl.sqsize + 1);
> +	if (ret)
> +		goto out_delete_hw_queues;
> +
>  	return 0;
>  
>  out_delete_hw_queues:
> -- 
> 2.29.2
> 

This way may cause correct hctx_idx to be passed to blk_mq_alloc_request_hctx(), so:

Reviewed-by: Ming Lei <ming.lei@redhat.com>


Thanks,
Ming


  parent reply	other threads:[~2021-06-29  1:32 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25 10:16 [PATCH 0/2] Handle update hardware queues and queue freeze more carefully Daniel Wagner
2021-06-25 10:16 ` Daniel Wagner
2021-06-25 10:16 ` [PATCH 1/2] nvme-fc: Update hardware queues before using them Daniel Wagner
2021-06-25 10:16   ` Daniel Wagner
2021-06-27 13:47   ` James Smart
2021-06-27 13:47     ` James Smart
2021-06-29  1:32   ` Ming Lei [this message]
2021-06-29  1:32     ` Ming Lei
2021-06-29 12:31   ` Hannes Reinecke
2021-06-29 12:31     ` Hannes Reinecke
2021-06-25 10:16 ` [PATCH 2/2] nvme-fc: Wait with a timeout for queue to freeze Daniel Wagner
2021-06-25 10:16   ` Daniel Wagner
2021-06-27 14:04   ` James Smart
2021-06-27 14:04     ` James Smart
2021-06-29  1:39   ` Ming Lei
2021-06-29  1:39     ` Ming Lei
2021-06-29  7:48     ` Daniel Wagner
2021-06-29  7:48       ` Daniel Wagner
2021-07-05 16:34     ` Daniel Wagner
2021-07-05 16:34       ` Daniel Wagner
2021-07-06  7:29       ` Ming Lei
2021-07-06  7:29         ` Ming Lei
2021-07-06  8:10         ` Daniel Wagner
2021-07-06  8:10           ` Daniel Wagner
2021-07-06  8:45           ` Ming Lei
2021-07-06  8:45             ` Ming Lei
2021-07-06  8:59             ` Daniel Wagner
2021-07-06  8:59               ` Daniel Wagner
2021-07-06 12:21               ` Daniel Wagner
2021-07-06 12:21                 ` Daniel Wagner
2021-07-07  2:46                 ` Ming Lei
2021-07-07  2:46                   ` Ming Lei
2021-06-29 12:31   ` Hannes Reinecke
2021-06-29 12:31     ` Hannes Reinecke
2021-06-25 12:21 ` [PATCH 0/2] Handle update hardware queues and queue freeze more carefully Daniel Wagner
2021-06-25 12:21   ` Daniel Wagner
2021-06-25 13:00   ` Ming Lei
2021-06-25 13:00     ` Ming Lei
2021-06-29  1:31     ` Ming Lei
2021-06-29  1:31       ` Ming Lei

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=YNp4GyXwOlJeqtby@T590 \
    --to=ming.lei@redhat.com \
    --cc=axboe@fb.com \
    --cc=dwagner@suse.de \
    --cc=james.smart@broadcom.com \
    --cc=kbusch@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.