From: Christoph Hellwig <hch@lst.de>
To: Keith Busch <keith.busch@intel.com>, Sagi Grimberg <sagi@grimberg.me>
Cc: Jens Axboe <axboe@kernel.dk>, Hannes Reinecke <hare@suse.de>,
Johannes Thumshirn <jthumshirn@suse.de>,
linux-nvme@lists.infradead.org, linux-block@vger.kernel.org
Subject: [PATCH 2/6] nvme: always unregister the integrity profile in __nvme_revalidate_disk
Date: Thu, 2 Nov 2017 21:28:52 +0300 [thread overview]
Message-ID: <20171102182856.9162-3-hch@lst.de> (raw)
In-Reply-To: <20171102182856.9162-1-hch@lst.de>
This is safe because the queue is always frozen when we revalidate, and
it simplifies both the existing code as well as the multipath
implementation.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/nvme/host/core.c | 40 ++++++++++------------------------------
1 file changed, 10 insertions(+), 30 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 1c2686d4eaf3..bc27f6603861 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1081,29 +1081,6 @@ static int nvme_getgeo(struct block_device *bdev, struct hd_geometry *geo)
}
#ifdef CONFIG_BLK_DEV_INTEGRITY
-static void nvme_prep_integrity(struct gendisk *disk, struct nvme_id_ns *id,
- u16 bs)
-{
- struct nvme_ns *ns = disk->private_data;
- u16 old_ms = ns->ms;
- u8 pi_type = 0;
-
- ns->ms = le16_to_cpu(id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ms);
- ns->ext = ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT);
-
- /* PI implementation requires metadata equal t10 pi tuple size */
- if (ns->ms == sizeof(struct t10_pi_tuple))
- pi_type = id->dps & NVME_NS_DPS_PI_MASK;
-
- if (blk_get_integrity(disk) &&
- (ns->pi_type != pi_type || ns->ms != old_ms ||
- bs != queue_logical_block_size(disk->queue) ||
- (ns->ms && ns->ext)))
- blk_integrity_unregister(disk);
-
- ns->pi_type = pi_type;
-}
-
static void nvme_init_integrity(struct nvme_ns *ns)
{
struct blk_integrity integrity;
@@ -1130,10 +1107,6 @@ static void nvme_init_integrity(struct nvme_ns *ns)
blk_queue_max_integrity_segments(ns->queue, 1);
}
#else
-static void nvme_prep_integrity(struct gendisk *disk, struct nvme_id_ns *id,
- u16 bs)
-{
-}
static void nvme_init_integrity(struct nvme_ns *ns)
{
}
@@ -1202,15 +1175,22 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
ns->lba_shift = 9;
bs = 1 << ns->lba_shift;
ns->noiob = le16_to_cpu(id->noiob);
+ ns->ext = ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT);
+ ns->ms = le16_to_cpu(id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ms);
+ /* the PI implementation requires metadata equal t10 pi tuple size */
+ if (ns->ms == sizeof(struct t10_pi_tuple))
+ ns->pi_type = id->dps & NVME_NS_DPS_PI_MASK;
+ else
+ ns->pi_type = 0;
blk_mq_freeze_queue(disk->queue);
+ blk_integrity_unregister(disk);
- if (ctrl->ops->flags & NVME_F_METADATA_SUPPORTED)
- nvme_prep_integrity(disk, id, bs);
blk_queue_logical_block_size(ns->queue, bs);
if (ns->noiob)
nvme_set_chunk_size(ns);
- if (ns->ms && !blk_get_integrity(disk) && !ns->ext)
+ if (ns->ms && !ns->ext &&
+ (ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))
nvme_init_integrity(ns);
if (ns->ms && !(ns->ms == 8 && ns->pi_type) && !blk_get_integrity(disk))
set_capacity(disk, 0);
--
2.14.2
next prev parent reply other threads:[~2017-11-02 18:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 18:28 nvme cleanups in preparation for the multipath code Christoph Hellwig
2017-11-02 18:28 ` [PATCH 1/6] nvme: move the dying queue check from cancel to completion Christoph Hellwig
2017-11-05 14:01 ` Sagi Grimberg
2017-11-06 14:46 ` Keith Busch
2017-11-02 18:28 ` Christoph Hellwig [this message]
2017-11-05 14:02 ` [PATCH 2/6] nvme: always unregister the integrity profile in __nvme_revalidate_disk Sagi Grimberg
2017-11-06 14:46 ` Keith Busch
2017-11-02 18:28 ` [PATCH 3/6] nvme: don't pass struct nvme_ns to nvme_init_integrity Christoph Hellwig
2017-11-05 14:03 ` Sagi Grimberg
2017-11-06 14:47 ` Keith Busch
2017-11-02 18:28 ` [PATCH 4/6] nvme: don't pass struct nvme_ns to nvme_config_discard Christoph Hellwig
2017-11-06 14:47 ` Keith Busch
2017-11-02 18:28 ` [PATCH 5/6] nvme: set the chunk size before freezing the queue Christoph Hellwig
2017-11-06 14:48 ` Keith Busch
2017-11-02 18:28 ` [PATCH 6/6] nvme: split __nvme_revalidate_disk Christoph Hellwig
2017-11-05 14:05 ` Sagi Grimberg
2017-11-06 14:49 ` 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=20171102182856.9162-3-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=hare@suse.de \
--cc=jthumshirn@suse.de \
--cc=keith.busch@intel.com \
--cc=linux-block@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox