From: Max Gurtovoy <maxg@mellanox.com>
To: linux-nvme@lists.infradead.org, kbusch@kernel.org, hch@lst.de,
sagi@grimberg.me, martin.petersen@oracle.com,
jsmart2021@gmail.com, linux-rdma@vger.kernel.org
Cc: axboe@kernel.dk, vladimirk@mellanox.com, shlomin@mellanox.com,
israelr@mellanox.com, idanb@mellanox.com, jgg@mellanox.com,
oren@mellanox.com, maxg@mellanox.com
Subject: [PATCH 01/17] nvme: introduce namespace features flag
Date: Fri, 27 Mar 2020 20:15:29 +0300 [thread overview]
Message-ID: <20200327171545.98970-3-maxg@mellanox.com> (raw)
In-Reply-To: <20200327171545.98970-1-maxg@mellanox.com>
From: Israel Rukshin <israelr@mellanox.com>
Centralize all the metadata checks to one place and make the code more
readable. Introduce a new enum nvme_ns_features for that matter.
The features flag description:
- NVME_NS_EXT_LBAS - NVMe namespace supports extended LBA format.
- NVME_NS_MD_HOST_SUPPORTED - NVMe namespace supports getting metadata
from host's block layer.
- NVME_NS_MD_CTRL_SUPPORTED - NVMe namespace supports metadata actions
by the controller (generate/strip).
Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Israel Rukshin <israelr@mellanox.com>
---
drivers/nvme/host/core.c | 42 ++++++++++++++++++++++++++++--------------
drivers/nvme/host/nvme.h | 8 +++++++-
2 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 1cab3c6..f3a184f 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -203,11 +203,6 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
nvme_put_ctrl(ctrl);
}
-static inline bool nvme_ns_has_pi(struct nvme_ns *ns)
-{
- return ns->pi_type && ns->ms == sizeof(struct t10_pi_tuple);
-}
-
static blk_status_t nvme_error_status(u16 status)
{
switch (status & 0x7ff) {
@@ -706,7 +701,8 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns,
* namespace capacity to zero to prevent any I/O.
*/
if (!blk_integrity_rq(req)) {
- if (WARN_ON_ONCE(!nvme_ns_has_pi(ns)))
+ if (WARN_ON_ONCE(!(ns->features &
+ NVME_NS_MD_CTRL_SUPPORTED)))
return BLK_STS_NOTSUPP;
control |= NVME_RW_PRINFO_PRACT;
}
@@ -1277,7 +1273,7 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
meta_len = (io.nblocks + 1) * ns->ms;
metadata = (void __user *)(uintptr_t)io.metadata;
- if (ns->ext) {
+ if (ns->features & NVME_NS_EXT_LBAS) {
length += meta_len;
meta_len = 0;
} else if (meta_len) {
@@ -1837,11 +1833,12 @@ static void nvme_update_disk_info(struct gendisk *disk,
blk_queue_io_min(disk->queue, phys_bs);
blk_queue_io_opt(disk->queue, io_opt);
- if (ns->ms && !ns->ext &&
- (ns->ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))
+ if (ns->features & NVME_NS_MD_HOST_SUPPORTED)
nvme_init_integrity(disk, ns->ms, ns->pi_type);
- if ((ns->ms && !nvme_ns_has_pi(ns) && !blk_get_integrity(disk)) ||
- ns->lba_shift > PAGE_SHIFT)
+
+ if ((ns->ms && !(ns->features & NVME_NS_MD_CTRL_SUPPORTED) &&
+ !(ns->features & NVME_NS_MD_HOST_SUPPORTED) &&
+ !blk_get_integrity(disk)) || ns->lba_shift > PAGE_SHIFT)
capacity = 0;
set_capacity(disk, capacity);
@@ -1870,12 +1867,29 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)
ns->lba_shift = 9;
ns->noiob = le16_to_cpu(id->noiob);
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);
+ ns->features = 0;
/* the PI implementation requires metadata equal t10 pi tuple size */
- if (ns->ms == sizeof(struct t10_pi_tuple))
+ if (ns->ms == sizeof(struct t10_pi_tuple)) {
ns->pi_type = id->dps & NVME_NS_DPS_PI_MASK;
- else
+ if (ns->pi_type)
+ ns->features |= NVME_NS_MD_CTRL_SUPPORTED;
+ } else {
ns->pi_type = 0;
+ }
+
+ if (ns->ms) {
+ if (id->flbas & NVME_NS_FLBAS_META_EXT)
+ ns->features |= NVME_NS_EXT_LBAS;
+
+ /*
+ * For PCI, Extended logical block will be generated by the
+ * controller.
+ */
+ if (ns->ctrl->ops->flags & NVME_F_METADATA_SUPPORTED) {
+ if (!(ns->features & NVME_NS_EXT_LBAS))
+ ns->features |= NVME_NS_MD_HOST_SUPPORTED;
+ }
+ }
if (ns->noiob)
nvme_set_chunk_size(ns);
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 2e04a36..83296d0 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -363,6 +363,12 @@ struct nvme_ns_head {
#endif
};
+enum nvme_ns_features {
+ NVME_NS_EXT_LBAS = 1 << 0,
+ NVME_NS_MD_HOST_SUPPORTED = 1 << 1,
+ NVME_NS_MD_CTRL_SUPPORTED = 1 << 2,
+};
+
struct nvme_ns {
struct list_head list;
@@ -382,8 +388,8 @@ struct nvme_ns {
u16 ms;
u16 sgs;
u32 sws;
- bool ext;
u8 pi_type;
+ unsigned long features;
unsigned long flags;
#define NVME_NS_REMOVING 0
#define NVME_NS_DEAD 1
--
1.8.3.1
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-03-27 18:30 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 17:15 [PATCH 00/17 V5] nvme-rdma/nvmet-rdma: Add metadata/T10-PI support Max Gurtovoy
2020-03-27 17:15 ` [PATCH 1/1] nvme-cli/fabrics: Add pi_enable param to connect cmd Max Gurtovoy
2020-03-27 17:15 ` Max Gurtovoy [this message]
2020-04-21 11:59 ` [PATCH 01/17] nvme: introduce namespace features flag Christoph Hellwig
2020-04-21 15:53 ` James Smart
2020-04-21 18:11 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 02/17] nvme: Add has_md field to the nvme_req structure Max Gurtovoy
2020-04-21 11:59 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 03/17] nvme: Enforce extended LBA format for fabrics metadata Max Gurtovoy
2020-04-21 12:08 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 04/17] nvme: introduce max_integrity_segments ctrl attribute Max Gurtovoy
2020-04-21 12:09 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 05/17] nvme-fabrics: Allow user enabling metadata/T10-PI support Max Gurtovoy
2020-04-21 12:12 ` Christoph Hellwig
2020-04-21 15:17 ` Christoph Hellwig
2020-04-22 22:07 ` Max Gurtovoy
2020-04-22 22:24 ` James Smart
2020-04-22 22:39 ` Max Gurtovoy
2020-04-23 5:54 ` Christoph Hellwig
2020-04-23 7:30 ` Max Gurtovoy
2020-04-24 7:06 ` Christoph Hellwig
2020-04-26 9:48 ` Max Gurtovoy
2020-04-27 6:04 ` Christoph Hellwig
2020-04-27 13:52 ` Max Gurtovoy
2020-04-27 13:54 ` Christoph Hellwig
2020-04-28 9:18 ` Max Gurtovoy
2020-04-23 5:53 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 06/17] nvme: introduce NVME_INLINE_MD_SG_CNT Max Gurtovoy
2020-04-21 12:12 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 07/17] nvme-rdma: Introduce nvme_rdma_sgl structure Max Gurtovoy
2020-04-21 12:13 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 08/17] nvme-rdma: add metadata/T10-PI support Max Gurtovoy
2020-04-21 12:20 ` Christoph Hellwig
2020-04-23 9:22 ` Max Gurtovoy
2020-04-24 7:09 ` Christoph Hellwig
2020-04-26 10:04 ` Max Gurtovoy
2020-03-27 17:15 ` [PATCH 09/17] nvmet: prepare metadata request Max Gurtovoy
2020-04-21 15:21 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 10/17] nvmet: add metadata characteristics for a namespace Max Gurtovoy
2020-04-21 15:23 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 11/17] nvmet: Rename nvmet_rw_len to nvmet_rw_data_len Max Gurtovoy
2020-03-27 17:15 ` [PATCH 12/17] nvmet: Rename nvmet_check_data_len to nvmet_check_transfer_len Max Gurtovoy
2020-03-27 17:15 ` [PATCH 13/17] nvme: Add Metadata Capabilities enumerations Max Gurtovoy
2020-04-21 15:24 ` Christoph Hellwig
2020-04-23 12:09 ` Max Gurtovoy
2020-04-24 7:12 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 14/17] nvmet: Add metadata/T10-PI support Max Gurtovoy
2020-04-21 15:30 ` Christoph Hellwig
2020-04-23 12:39 ` Max Gurtovoy
2020-04-24 7:14 ` Christoph Hellwig
2020-04-26 10:50 ` Max Gurtovoy
2020-04-27 6:06 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 15/17] nvmet: Add metadata support for block devices Max Gurtovoy
2020-04-21 15:33 ` Christoph Hellwig
2020-04-23 17:25 ` Max Gurtovoy
2020-04-24 7:54 ` Christoph Hellwig
2020-03-27 17:15 ` [PATCH 16/17] RDMA/rw: Expose maximal page list for a device per 1 MR Max Gurtovoy
2020-03-27 17:15 ` [PATCH 17/17] nvmet-rdma: Add metadata/T10-PI support Max Gurtovoy
2020-04-21 15:37 ` 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=20200327171545.98970-3-maxg@mellanox.com \
--to=maxg@mellanox.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=idanb@mellanox.com \
--cc=israelr@mellanox.com \
--cc=jgg@mellanox.com \
--cc=jsmart2021@gmail.com \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-rdma@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=oren@mellanox.com \
--cc=sagi@grimberg.me \
--cc=shlomin@mellanox.com \
--cc=vladimirk@mellanox.com \
/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).