[PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Nicholas A. Bellinger]

From: Nicholas Bellinger <nab@linux-iscsi.org>

While doing recent bring-up of nvme/host with target-core T10-PI,
I noticed /sys/block/nvme*/integrity/device_is_integrity_capable
was false, and /sys/block/nvme*/integrity/tag_size contained
a bogus value.

AFAICT outside of blk_integrity_compare() for DM + MD these
are informational values, but go ahead and add the missing
assignments for nvme/host to match what SCSI does within
sd_dif_config_host() for consistency's sake.

Cc: Keith Busch <keith.busch@intel.com>
Cc: Jay Freyensee <james.p.freyensee@intel.com>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Sagi Grimberg <sagig@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@fb.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
---
 drivers/nvme/host/core.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b8e22fe..cbd08f8 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -674,10 +674,14 @@ static void nvme_init_integrity(struct nvme_ns *ns)
 	switch (ns->pi_type) {
 	case NVME_NS_DPS_PI_TYPE3:
 		integrity.profile = &t10_pi_type3_crc;
+		integrity.tag_size = sizeof(u16) + sizeof(u32);
+		integrity.flags |= BLK_INTEGRITY_DEVICE_CAPABLE;
 		break;
 	case NVME_NS_DPS_PI_TYPE1:
 	case NVME_NS_DPS_PI_TYPE2:
 		integrity.profile = &t10_pi_type1_crc;
+		integrity.tag_size = sizeof(u16);
+		integrity.flags |= BLK_INTEGRITY_DEVICE_CAPABLE;
 		break;
 	default:
 		integrity.profile = NULL;
-- 
1.9.1

[PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Nicholas A. Bellinger]

From: Nicholas Bellinger <nab@linux-iscsi.org>

While doing recent bring-up of nvme/host with target-core T10-PI,
I noticed /sys/block/nvme*/integrity/device_is_integrity_capable
was false, and /sys/block/nvme*/integrity/tag_size contained
a bogus value.

AFAICT outside of blk_integrity_compare() for DM + MD these
are informational values, but go ahead and add the missing
assignments for nvme/host to match what SCSI does within
sd_dif_config_host() for consistency's sake.

Cc: Keith Busch <keith.busch at intel.com>
Cc: Jay Freyensee <james.p.freyensee at intel.com>
Cc: Martin K. Petersen <martin.petersen at oracle.com>
Cc: Sagi Grimberg <sagig at grimberg.me>
Cc: Christoph Hellwig <hch at lst.de>
Cc: Jens Axboe <axboe at fb.com>
Signed-off-by: Nicholas Bellinger <nab at linux-iscsi.org>
---
 drivers/nvme/host/core.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b8e22fe..cbd08f8 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -674,10 +674,14 @@ static void nvme_init_integrity(struct nvme_ns *ns)
 	switch (ns->pi_type) {
 	case NVME_NS_DPS_PI_TYPE3:
 		integrity.profile = &t10_pi_type3_crc;
+		integrity.tag_size = sizeof(u16) + sizeof(u32);
+		integrity.flags |= BLK_INTEGRITY_DEVICE_CAPABLE;
 		break;
 	case NVME_NS_DPS_PI_TYPE1:
 	case NVME_NS_DPS_PI_TYPE2:
 		integrity.profile = &t10_pi_type1_crc;
+		integrity.tag_size = sizeof(u16);
+		integrity.flags |= BLK_INTEGRITY_DEVICE_CAPABLE;
 		break;
 	default:
 		integrity.profile = NULL;
-- 
1.9.1

Re: [PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Sagi Grimberg]

Looks fine,

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

[PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Sagi Grimberg]

Looks fine,

Reviewed-by: Sagi Grimberg <sagi at grimberg.me>

Re: [PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Christoph Hellwig]

Does NVMe really force ATO=1?  Sorry, didn't have much time to spend
with that part of the spec.

[PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Christoph Hellwig]

Does NVMe really force ATO=1?  Sorry, didn't have much time to spend
with that part of the spec.

Re: [PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Martin K. Petersen]

>>>>> "Nicholas" == Nicholas A Bellinger <nab@daterainc.com> writes:

Nicholas> While doing recent bring-up of nvme/host with target-core
Nicholas> T10-PI, I noticed
Nicholas> /sys/block/nvme*/integrity/device_is_integrity_capable was
Nicholas> false, and /sys/block/nvme*/integrity/tag_size contained a
Nicholas> bogus value.

Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

-- 
Martin K. Petersen	Oracle Linux Engineering

[PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Martin K. Petersen]

>>>>> "Nicholas" == Nicholas A Bellinger <nab at daterainc.com> writes:

Nicholas> While doing recent bring-up of nvme/host with target-core
Nicholas> T10-PI, I noticed
Nicholas> /sys/block/nvme*/integrity/device_is_integrity_capable was
Nicholas> false, and /sys/block/nvme*/integrity/tag_size contained a
Nicholas> bogus value.

Reviewed-by: Martin K. Petersen <martin.petersen at oracle.com>

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Martin K. Petersen]

>>>>> "Christoph" == Christoph Hellwig <hch@lst.de> writes:

Christoph> Does NVMe really force ATO=1?

It does.

-- 
Martin K. Petersen	Oracle Linux Engineering

[PATCH] nvme/host: Add missing blk_integrity tag_size + flags assignments

[Martin K. Petersen]

>>>>> "Christoph" == Christoph Hellwig <hch at lst.de> writes:

Christoph> Does NVMe really force ATO=1?

It does.

-- 
Martin K. Petersen	Oracle Linux Engineering