From: Christoph Hellwig <hch@lst.de>
To: Keith Busch <kbusch@kernel.org>
Cc: Sagi Grimberg <sagi@grimberg.me>,
James Smart <james.smart@broadcom.com>,
linux-nvme@lists.infradead.org,
Edmund Nadolski <edmund.nadolski@intel.com>,
Judy Brock <judy.brock@samsung.com>,
Christoph Hellwig <hch@lst.de>
Subject: Re: [PATCHv3 4/5] nvme: Prevent resets during paused controller state
Date: Thu, 10 Oct 2019 18:09:11 +0200 [thread overview]
Message-ID: <20191010160911.GA1868@lst.de> (raw)
In-Reply-To: <20191010160527.22376-5-kbusch@kernel.org>
On Fri, Oct 11, 2019 at 01:05:26AM +0900, Keith Busch wrote:
> +/*
> + * Use this function to proceed with scheduling reset_work for a controller
> + * that had previously been set to the resetting state. This is intended for
> + * code paths that can't be interrupted by other reset attempts.
> + */
> +static int nvme_reset_schedule(struct nvme_ctrl *ctrl)
> +{
> + if (ctrl->state != NVME_CTRL_RESETTING)
> + return -EBUSY;
> + if (!queue_work(nvme_reset_wq, &ctrl->reset_work))
> + return -EBUSY;
> + return 0;
> +}
> +
> int nvme_reset_ctrl(struct nvme_ctrl *ctrl)
> {
> if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
> @@ -3829,13 +3843,13 @@ static void nvme_fw_act_work(struct work_struct *work)
> if (time_after(jiffies, fw_act_timeout)) {
> dev_warn(ctrl->device,
> "Fw activation timeout, reset controller\n");
> - nvme_reset_ctrl(ctrl);
> - break;
> + nvme_reset_schedule(ctrl);
> + return;
I don't really see a point in that nvme_reset_schedule helper,
especially as the name is a little confusing. Moving the comment here
and just open coding a
if (ctrl->state == NVME_CTRL_RESETTING)
queue_work(nvme_reset_wq, &ctrl->reset_work))
would seem much more obvious and matches the nvme_handle_aen_notice
side.
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2019-10-10 16:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 16:05 [PATCHv3 0/5] nvme: double reset prevention Keith Busch
2019-10-10 16:05 ` [PATCHv3 1/5] nvme-pci: Free tagset if no IO queues Keith Busch
2019-10-10 16:05 ` [PATCHv3 2/5] nvme: Remove ADMIN_ONLY state Keith Busch
2019-10-10 16:05 ` [PATCHv3 3/5] nvme: Restart request timers in resetting state Keith Busch
2019-10-10 16:05 ` [PATCHv3 4/5] nvme: Prevent resets during paused controller state Keith Busch
2019-10-10 16:09 ` Christoph Hellwig [this message]
2019-10-10 16:17 ` Keith Busch
2019-10-10 16:05 ` [PATCHv3 5/5] nvme: Wait for reset state when required Keith Busch
2019-10-10 16:18 ` Christoph Hellwig
2019-10-10 16:30 ` 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=20191010160911.GA1868@lst.de \
--to=hch@lst.de \
--cc=edmund.nadolski@intel.com \
--cc=james.smart@broadcom.com \
--cc=judy.brock@samsung.com \
--cc=kbusch@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).