From: Hannes Reinecke <hare@suse.de>
To: Daniel Wagner <dwagner@suse.de>
Cc: Guenter Roeck <linux@roeck-us.net>,
Daniel Wagner <wagi@kernel.org>, Keith Busch <kbusch@kernel.org>,
Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
Sagi Grimberg <sagi@grimberg.me>,
James Smart <james.smart@broadcom.com>,
Shinichiro Kawasaki <shinichiro.kawasaki@wdc.com>,
linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] nvme: only allow entering LIVE from CONNECTING state
Date: Tue, 29 Apr 2025 19:54:05 +0200 [thread overview]
Message-ID: <f0329c90-56d6-455a-8cbb-a4c28cb85057@suse.de> (raw)
In-Reply-To: <6894c914-a734-4a7b-97cb-e9a344fa5560@flourine.local>
On 4/29/25 15:55, Daniel Wagner wrote:
> On Mon, Apr 28, 2025 at 03:21:18PM +0200, Hannes Reinecke wrote:
>> On 4/28/25 14:44, Daniel Wagner wrote:
>>> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
>>> index b502ac07483b..d3c4eacf607f 100644
>>> --- a/drivers/nvme/host/core.c
>>> +++ b/drivers/nvme/host/core.c
>>> @@ -4493,7 +4493,8 @@ static void nvme_fw_act_work(struct work_struct *work)
>>> msleep(100);
>>> }
>>>
>>> - if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))
>>> + if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_CONNECTING) ||
>>> + !nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))
>>> return;
>>>
>>> nvme_unquiesce_io_queues(ctrl);
>>
>> I would rather have a separate state for firmware activation.
>> (Ab-)using the 'RESETTING' state here has direct implications
>> with the error handler, as for the error handler 'RESETTING'
>> means that the error handler has been scheduled.
>> Which is not true for firmware activation.
>
> Okay, so something like this here (untested, working on it)?
>
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index b502ac07483b..32482712d0f2 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -565,6 +565,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
> case NVME_CTRL_LIVE:
> switch (old_state) {
> case NVME_CTRL_CONNECTING:
> + case NVME_CTRL_FW_ACTIVATION:
> changed = true;
> fallthrough;
> default:
> @@ -575,6 +576,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
> switch (old_state) {
> case NVME_CTRL_NEW:
> case NVME_CTRL_LIVE:
> + case NVME_CTRL_FW_ACTIVATION:
> changed = true;
> fallthrough;
> default:
> @@ -596,6 +598,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
> case NVME_CTRL_LIVE:
> case NVME_CTRL_RESETTING:
> case NVME_CTRL_CONNECTING:
> + case NVME_CTRL_FW_ACTIVATION:
> changed = true;
> fallthrough;
> default:
> @@ -621,6 +624,15 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
> break;
> }
> break;
> + case NVME_CTRL_FW_ACTIVATION:
> + switch (old_state) {
> + case NVME_CTRL_LIVE:
> + changed = true;
> + fallthrough;
> + default:
> + break;
> + }
> + break;
> default:
> break;
> }
> @@ -4529,7 +4541,7 @@ static bool nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result)
> * recovery actions from interfering with the controller's
> * firmware activation.
> */
> - if (nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) {
> + if (nvme_change_ctrl_state(ctrl, NVME_CTRL_FW_ACTIVATION)) {
> requeue = false;
> queue_work(nvme_wq, &ctrl->fw_act_work);
> }
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index 51e078642127..3a383225afed 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -247,6 +247,7 @@ static inline u16 nvme_req_qid(struct request *req)
> * shutdown or removal. In this case we forcibly
> * kill all inflight I/O as they have no chance to
> * complete
> + * @NVME_CTRL_FW_ACTIVATION: Controller is in firmware activation state.
> */
> enum nvme_ctrl_state {
> NVME_CTRL_NEW,
> @@ -256,6 +257,7 @@ enum nvme_ctrl_state {
> NVME_CTRL_DELETING,
> NVME_CTRL_DELETING_NOIO,
> NVME_CTRL_DEAD,
> + NVME_CTRL_FW_ACTIVATION,
> };
>
> struct nvme_fault_inject {
>
Indeed, something like it.
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
next prev parent reply other threads:[~2025-04-29 17:54 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-14 8:02 [PATCH 0/2] nvme-fc: fix schedule in atomic context Daniel Wagner
2025-02-14 8:02 ` [PATCH 1/2] nvme: only allow entering LIVE from CONNECTING state Daniel Wagner
2025-02-20 10:34 ` Sagi Grimberg
2025-04-27 15:59 ` Guenter Roeck
2025-04-28 12:44 ` Daniel Wagner
2025-04-28 13:21 ` Hannes Reinecke
2025-04-29 13:55 ` Daniel Wagner
2025-04-29 17:54 ` Hannes Reinecke [this message]
2025-04-29 18:13 ` Keith Busch
2025-04-29 18:23 ` Guenter Roeck
2025-04-29 18:42 ` Keith Busch
2025-04-30 6:43 ` Daniel Wagner
2025-04-30 16:01 ` Keith Busch
2025-04-30 16:12 ` Guenter Roeck
2025-05-02 9:02 ` Daniel Wagner
2025-04-30 16:11 ` Guenter Roeck
2025-04-30 6:08 ` Hannes Reinecke
2026-01-09 19:18 ` John Meneghini
2026-01-11 9:33 ` Nilay Shroff
2026-01-12 8:14 ` Daniel Wagner
2026-01-13 6:10 ` Nilay Shroff
2026-01-13 13:55 ` John Meneghini
2025-02-14 8:02 ` [PATCH 2/2] nvme-fc: rely on state transitions to handle connectivity loss Daniel Wagner
2025-02-20 10:36 ` Sagi Grimberg
2025-02-20 8:00 ` [PATCH 0/2] nvme-fc: fix schedule in atomic context Daniel Wagner
2025-02-20 12:50 ` Shinichiro Kawasaki
2025-02-20 17:23 ` Keith Busch
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=f0329c90-56d6-455a-8cbb-a4c28cb85057@suse.de \
--to=hare@suse.de \
--cc=axboe@kernel.dk \
--cc=dwagner@suse.de \
--cc=hch@lst.de \
--cc=james.smart@broadcom.com \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux@roeck-us.net \
--cc=sagi@grimberg.me \
--cc=shinichiro.kawasaki@wdc.com \
--cc=wagi@kernel.org \
/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.