From: Ming Lei <ming.lei@redhat.com> To: Keith Busch <keith.busch@intel.com> Cc: Jens Axboe <axboe@kernel.dk>, linux-block@vger.kernel.org, Ming Lei <ming.lei@redhat.com>, James Smart <james.smart@broadcom.com>, Jianchao Wang <jianchao.w.wang@oracle.com>, Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>, linux-nvme@lists.infradead.org, Laurence Oberman <loberman@redhat.com> Subject: [PATCH V6 08/11] nvme: pci: move error handling out of nvme_reset_dev() Date: Wed, 16 May 2018 12:03:10 +0800 [thread overview] Message-ID: <20180516040313.13596-9-ming.lei@redhat.com> (raw) In-Reply-To: <20180516040313.13596-1-ming.lei@redhat.com> Once nested EH is introduced, we may not need to handle error in the inner EH, so move error handling out of nvme_reset_dev(). Meantime return the reset result to caller. Cc: James Smart <james.smart@broadcom.com> Cc: Jianchao Wang <jianchao.w.wang@oracle.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Sagi Grimberg <sagi@grimberg.me> Cc: linux-nvme@lists.infradead.org Cc: Laurence Oberman <loberman@redhat.com> Signed-off-by: Ming Lei <ming.lei@redhat.com> --- drivers/nvme/host/pci.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 50bd1818deb5..634fd7f17950 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2391,7 +2391,7 @@ static void nvme_remove_dead_ctrl(struct nvme_dev *dev, int status) nvme_put_ctrl(&dev->ctrl); } -static void nvme_reset_dev(struct nvme_dev *dev) +static int nvme_reset_dev(struct nvme_dev *dev) { bool was_suspend = !!(dev->ctrl.ctrl_config & NVME_CC_SHN_NORMAL); int result = -ENODEV; @@ -2485,6 +2485,7 @@ static void nvme_reset_dev(struct nvme_dev *dev) nvme_unfreeze(&dev->ctrl); } + result = -ENODEV; /* * If only admin queue live, keep it to do further investigation or * recovery. @@ -2496,19 +2497,22 @@ static void nvme_reset_dev(struct nvme_dev *dev) } nvme_start_ctrl(&dev->ctrl); - return; + return 0; out: - nvme_remove_dead_ctrl(dev, result); + return result; } static void nvme_reset_work(struct work_struct *work) { struct nvme_dev *dev = container_of(work, struct nvme_dev, ctrl.reset_work); + int result; mutex_lock(&dev->ctrl.reset_lock); - nvme_reset_dev(dev); + result = nvme_reset_dev(dev); + if (result) + nvme_remove_dead_ctrl(dev, result); mutex_unlock(&dev->ctrl.reset_lock); } -- 2.9.5
WARNING: multiple messages have this Message-ID (diff)
From: ming.lei@redhat.com (Ming Lei) Subject: [PATCH V6 08/11] nvme: pci: move error handling out of nvme_reset_dev() Date: Wed, 16 May 2018 12:03:10 +0800 [thread overview] Message-ID: <20180516040313.13596-9-ming.lei@redhat.com> (raw) In-Reply-To: <20180516040313.13596-1-ming.lei@redhat.com> Once nested EH is introduced, we may not need to handle error in the inner EH, so move error handling out of nvme_reset_dev(). Meantime return the reset result to caller. Cc: James Smart <james.smart at broadcom.com> Cc: Jianchao Wang <jianchao.w.wang at oracle.com> Cc: Christoph Hellwig <hch at lst.de> Cc: Sagi Grimberg <sagi at grimberg.me> Cc: linux-nvme at lists.infradead.org Cc: Laurence Oberman <loberman at redhat.com> Signed-off-by: Ming Lei <ming.lei at redhat.com> --- drivers/nvme/host/pci.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 50bd1818deb5..634fd7f17950 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2391,7 +2391,7 @@ static void nvme_remove_dead_ctrl(struct nvme_dev *dev, int status) nvme_put_ctrl(&dev->ctrl); } -static void nvme_reset_dev(struct nvme_dev *dev) +static int nvme_reset_dev(struct nvme_dev *dev) { bool was_suspend = !!(dev->ctrl.ctrl_config & NVME_CC_SHN_NORMAL); int result = -ENODEV; @@ -2485,6 +2485,7 @@ static void nvme_reset_dev(struct nvme_dev *dev) nvme_unfreeze(&dev->ctrl); } + result = -ENODEV; /* * If only admin queue live, keep it to do further investigation or * recovery. @@ -2496,19 +2497,22 @@ static void nvme_reset_dev(struct nvme_dev *dev) } nvme_start_ctrl(&dev->ctrl); - return; + return 0; out: - nvme_remove_dead_ctrl(dev, result); + return result; } static void nvme_reset_work(struct work_struct *work) { struct nvme_dev *dev = container_of(work, struct nvme_dev, ctrl.reset_work); + int result; mutex_lock(&dev->ctrl.reset_lock); - nvme_reset_dev(dev); + result = nvme_reset_dev(dev); + if (result) + nvme_remove_dead_ctrl(dev, result); mutex_unlock(&dev->ctrl.reset_lock); } -- 2.9.5
next prev parent reply other threads:[~2018-05-16 4:03 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-16 4:03 [PATCH V6 00/11] nvme: pci: fix & improve timeout handling Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 4:03 ` [PATCH V6 01/11] block: introduce blk_quiesce_timeout() and blk_unquiesce_timeout() Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 4:03 ` [PATCH V6 02/11] nvme: pci: cover timeout for admin commands running in EH Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-24 15:39 ` Keith Busch 2018-05-24 15:39 ` Keith Busch 2018-05-16 4:03 ` [PATCH V6 03/11] nvme: pci: unquiesce admin queue after controller is shutdown Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 4:03 ` [PATCH V6 04/11] nvme: pci: set nvmeq->cq_vector after alloc cq/sq Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 4:03 ` [PATCH V6 05/11] nvme: pci: only wait freezing if queue is frozen Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 4:03 ` [PATCH V6 06/11] nvme: pci: freeze queue in nvme_dev_disable() in case of error recovery Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 4:03 ` [PATCH V6 07/11] nvme: pci: prepare for supporting error recovery from resetting context Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 4:03 ` Ming Lei [this message] 2018-05-16 4:03 ` [PATCH V6 08/11] nvme: pci: move error handling out of nvme_reset_dev() Ming Lei 2018-05-16 4:03 ` [PATCH V6 09/11] nvme: pci: don't unfreeze queue until controller state updating succeeds Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 4:03 ` [PATCH V6 10/11] nvme: core: introduce nvme_force_change_ctrl_state() Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 4:03 ` [PATCH V6 11/11] nvme: pci: support nested EH Ming Lei 2018-05-16 4:03 ` Ming Lei 2018-05-16 14:12 ` Keith Busch 2018-05-16 14:12 ` Keith Busch 2018-05-16 23:10 ` Ming Lei 2018-05-16 23:10 ` Ming Lei 2018-05-17 2:20 ` Keith Busch 2018-05-17 2:20 ` Keith Busch 2018-05-17 8:41 ` Christoph Hellwig 2018-05-17 8:41 ` Christoph Hellwig 2018-05-17 14:20 ` Keith Busch 2018-05-17 14:20 ` Keith Busch 2018-05-17 14:20 ` Keith Busch 2018-05-17 14:23 ` Johannes Thumshirn 2018-05-17 14:23 ` Johannes Thumshirn 2018-05-17 14:23 ` Johannes Thumshirn 2018-05-18 16:28 ` Keith Busch 2018-05-18 16:28 ` Keith Busch 2018-05-18 16:28 ` Keith Busch 2018-05-22 7:35 ` Johannes Thumshirn 2018-05-22 7:35 ` Johannes Thumshirn 2018-05-22 7:35 ` Johannes Thumshirn 2018-05-18 0:20 ` Ming Lei 2018-05-18 0:20 ` Ming Lei 2018-05-18 1:01 ` Ming Lei 2018-05-18 1:01 ` Ming Lei 2018-05-18 13:57 ` Keith Busch 2018-05-18 13:57 ` Keith Busch 2018-05-18 16:58 ` Jens Axboe 2018-05-18 16:58 ` Jens Axboe 2018-05-18 22:26 ` Ming Lei 2018-05-18 22:26 ` Ming Lei 2018-05-18 23:45 ` Keith Busch 2018-05-18 23:45 ` Keith Busch 2018-05-18 23:51 ` Ming Lei 2018-05-18 23:51 ` 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=20180516040313.13596-9-ming.lei@redhat.com \ --to=ming.lei@redhat.com \ --cc=axboe@kernel.dk \ --cc=hch@lst.de \ --cc=james.smart@broadcom.com \ --cc=jianchao.w.wang@oracle.com \ --cc=keith.busch@intel.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=loberman@redhat.com \ --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: linkBe 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.