From: hch@lst.de (Christoph Hellwig)
Subject: [PATCH 6/6] nvme: split __nvme_revalidate_disk
Date: Thu, 2 Nov 2017 21:28:56 +0300 [thread overview]
Message-ID: <20171102182856.9162-7-hch@lst.de> (raw)
In-Reply-To: <20171102182856.9162-1-hch@lst.de>
Split out the code that applies the calculate value to a given disk/queue
into new helper that can be reused by the multipath code.
Signed-off-by: Christoph Hellwig <hch at lst.de>
---
drivers/nvme/host/core.c | 49 +++++++++++++++++++++++++-----------------------
1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 3758528be0ef..66211617e7e8 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1157,12 +1157,34 @@ static void nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid,
}
}
+static void nvme_update_disk_info(struct gendisk *disk,
+ struct nvme_ns *ns, struct nvme_id_ns *id)
+{
+ sector_t capacity = le64_to_cpup(&id->nsze) << (ns->lba_shift - 9);
+ unsigned stream_alignment = 0;
+
+ if (ns->ctrl->nr_streams && ns->sws && ns->sgs)
+ stream_alignment = ns->sws * ns->sgs;
+
+ blk_mq_freeze_queue(disk->queue);
+ blk_integrity_unregister(disk);
+
+ blk_queue_logical_block_size(disk->queue, 1 << ns->lba_shift);
+ if (ns->ms && !ns->ext &&
+ (ns->ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))
+ nvme_init_integrity(disk, ns->ms, ns->pi_type);
+ if (ns->ms && !(ns->ms == 8 && ns->pi_type) && !blk_get_integrity(disk))
+ capacity = 0;
+ set_capacity(disk, capacity);
+
+ if (ns->ctrl->oncs & NVME_CTRL_ONCS_DSM)
+ nvme_config_discard(ns->ctrl, stream_alignment, disk->queue);
+ blk_mq_unfreeze_queue(disk->queue);
+}
+
static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
{
struct nvme_ns *ns = disk->private_data;
- struct nvme_ctrl *ctrl = ns->ctrl;
- unsigned stream_alignment = 0;
- u16 bs;
/*
* If identify namespace failed, use default 512 byte block size so
@@ -1171,7 +1193,6 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
ns->lba_shift = id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ds;
if (ns->lba_shift == 0)
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);
@@ -1181,27 +1202,9 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
else
ns->pi_type = 0;
- if (ctrl->nr_streams && ns->sws && ns->sgs)
- stream_alignment = ns->sws * ns->sgs;
-
if (ns->noiob)
nvme_set_chunk_size(ns);
-
- blk_mq_freeze_queue(disk->queue);
- blk_integrity_unregister(disk);
-
- blk_queue_logical_block_size(ns->queue, bs);
- if (ns->ms && !ns->ext &&
- (ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))
- nvme_init_integrity(disk, ns->ms, ns->pi_type);
- if (ns->ms && !(ns->ms == 8 && ns->pi_type) && !blk_get_integrity(disk))
- set_capacity(disk, 0);
- else
- set_capacity(disk, le64_to_cpup(&id->nsze) << (ns->lba_shift - 9));
-
- if (ctrl->oncs & NVME_CTRL_ONCS_DSM)
- nvme_config_discard(ctrl, stream_alignment, disk->queue);
- blk_mq_unfreeze_queue(disk->queue);
+ nvme_update_disk_info(disk, ns, id);
}
static int nvme_revalidate_disk(struct gendisk *disk)
--
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 ` [PATCH 2/6] nvme: always unregister the integrity profile in __nvme_revalidate_disk Christoph Hellwig
2017-11-05 14:02 ` 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 ` Christoph Hellwig [this message]
2017-11-05 14:05 ` [PATCH 6/6] nvme: split __nvme_revalidate_disk 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-7-hch@lst.de \
--to=hch@lst.de \
/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).