From: sagig@dev.mellanox.co.il (Sagi Grimberg)
Subject: [PATCH for-4.5 11/13] NVMe: Dead namespace handling
Date: Thu, 11 Feb 2016 14:59:08 +0200 [thread overview]
Message-ID: <56BC859C.6030206@dev.mellanox.co.il> (raw)
In-Reply-To: <1455128250-5984-12-git-send-email-keith.busch@intel.com>
> This adds a "dead" state to a namespace and revalidates such a namespace
> to 0 capacity. This will force buffered writers to stop writing pages
> that can't be synced, and ends requests in failure if any is submitted
> to such a namespace.
This sorta going towards a namespace state machine (like scsi). Maybe
we need to centralize it correctly instead of adding states that are
relevant is sporadic areas?
>
> Signed-off-by: Keith Busch <keith.busch at intel.com>
> ---
> drivers/nvme/host/core.c | 4 ++++
> drivers/nvme/host/nvme.h | 1 +
> drivers/nvme/host/pci.c | 12 +++++++++++-
> 3 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 41b595c..84e9f41 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -560,6 +560,10 @@ static int nvme_revalidate_disk(struct gendisk *disk)
> u16 old_ms;
> unsigned short bs;
>
> + if (test_bit(NVME_NS_DEAD, &ns->flags)) {
> + set_capacity(disk, 0);
> + return -ENODEV;
> + }
> if (nvme_identify_ns(ns->ctrl, ns->ns_id, &id)) {
> dev_warn(ns->ctrl->dev, "%s: Identify failure nvme%dn%d\n",
> __func__, ns->ctrl->instance, ns->ns_id);
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index 19a64b2..e4b4110 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -117,6 +117,7 @@ struct nvme_ns {
> unsigned long flags;
>
> #define NVME_NS_REMOVING 0
> +#define NVME_NS_DEAD 1
>
> u64 mode_select_num_blocks;
> u32 mode_select_block_len;
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index a18e4ab..7fd8a54 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -678,7 +678,9 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
>
> spin_lock_irq(&nvmeq->q_lock);
> if (unlikely(nvmeq->cq_vector < 0)) {
> - ret = BLK_MQ_RQ_QUEUE_BUSY;
> + ret = test_bit(NVME_NS_DEAD, &ns->flags) ?
> + BLK_MQ_RQ_QUEUE_ERROR :
> + BLK_MQ_RQ_QUEUE_BUSY;
> spin_unlock_irq(&nvmeq->q_lock);
> goto out;
> }
I can't say I'm a fan of doing all this in queue_rq...
besides why is this state check under the cq_vector < 0 condition?
This is really confusing...
next prev parent reply other threads:[~2016-02-11 12:59 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 18:17 [PATCH for-4.5 00/13] NVMe fixups for 4.5 Keith Busch
2016-02-10 18:17 ` [PATCH for-4.5 01/13] blk-mq: End unstarted requests on dying queue Keith Busch
2016-02-11 12:13 ` Johannes Thumshirn
2016-02-11 12:30 ` Sagi Grimberg
2016-02-10 18:17 ` [PATCH for-4.5 02/13] NVMe: Fix io incapable return values Keith Busch
2016-02-11 12:14 ` Johannes Thumshirn
2016-02-10 18:17 ` [PATCH for-4.5 03/13] NVMe: Allow request merges Keith Busch
2016-02-10 18:36 ` Christoph Hellwig
2016-02-10 18:37 ` Jens Axboe
2016-02-10 21:01 ` Keith Busch
2016-02-10 21:19 ` Jens Axboe
2016-02-11 12:15 ` Johannes Thumshirn
2016-02-11 12:33 ` Sagi Grimberg
2016-02-10 18:17 ` [PATCH for-4.5 04/13] NVMe: Set queue limits max_dev_sectors Keith Busch
2016-02-10 18:20 ` Christoph Hellwig
2016-02-10 18:24 ` Keith Busch
2016-02-10 18:40 ` Christoph Hellwig
2016-02-10 19:49 ` Keith Busch
2016-02-10 22:53 ` Martin K. Petersen
2016-02-10 18:17 ` [PATCH for-4.5 05/13] NVMe: Fix namespace removal deadlock Keith Busch
2016-02-11 12:19 ` Johannes Thumshirn
2016-02-11 16:38 ` Wenbo Wang
2016-02-10 18:17 ` [PATCH for-4.5 06/13] NVMe: Remove WQ_MEM_RECLAIM from nvme work queue Keith Busch
2016-02-10 18:46 ` Christoph Hellwig
2016-02-10 23:37 ` Keith Busch
2016-02-11 14:52 ` Keith Busch
2016-02-10 18:17 ` [PATCH for-4.5 07/13] NVMe: Requeue requests on suspended queues Keith Busch
2016-02-10 18:47 ` Christoph Hellwig
2016-02-11 12:22 ` Johannes Thumshirn
2016-02-11 12:41 ` Sagi Grimberg
2016-02-11 16:47 ` Wenbo Wang
2016-02-11 17:00 ` Keith Busch
2016-02-11 17:21 ` Wenbo Wang
2016-02-10 18:17 ` [PATCH for-4.5 08/13] NVMe: Poll device while still active during remove Keith Busch
2016-02-10 18:48 ` Christoph Hellwig
2016-02-11 12:26 ` Johannes Thumshirn
2016-02-11 12:42 ` Sagi Grimberg
2016-02-10 18:17 ` [PATCH for-4.5 09/13] NVMe: Simplify device reset failure Keith Busch
2016-02-10 18:53 ` Christoph Hellwig
2016-02-11 12:28 ` Johannes Thumshirn
2016-02-10 18:17 ` [PATCH for-4.5 10/13] NVMe: Move error handling to failed reset handler Keith Busch
2016-02-11 12:34 ` Johannes Thumshirn
2016-02-11 12:50 ` Sagi Grimberg
2016-02-11 15:11 ` Keith Busch
2016-02-10 18:17 ` [PATCH for-4.5 11/13] NVMe: Dead namespace handling Keith Busch
2016-02-11 12:43 ` Johannes Thumshirn
2016-02-11 12:59 ` Sagi Grimberg [this message]
2016-02-11 15:07 ` Keith Busch
2016-02-10 18:17 ` [PATCH for-4.5 12/13] NVMe: Mark queues as dead on degraded controller Keith Busch
2016-02-11 12:44 ` Johannes Thumshirn
2016-02-11 13:00 ` Sagi Grimberg
2016-02-10 18:17 ` [PATCH for-4.5 13/13] NVMe: Rate limit nvme IO warnings Keith Busch
2016-02-10 18:54 ` Christoph Hellwig
2016-02-10 21:10 ` Keith Busch
2016-02-11 12:29 ` Sagi Grimberg
2016-02-11 15:12 ` Keith Busch
2016-02-11 15:18 ` Christoph Hellwig
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=56BC859C.6030206@dev.mellanox.co.il \
--to=sagig@dev.mellanox.co.il \
/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.