Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4125a09b authored by Dan Williams's avatar Dan Williams Committed by Jens Axboe
Browse files

block, libnvdimm, nvme: provide a built-in blk_integrity nop profile 



The libnvidmm-btt and nvme drivers use blk_integrity to reserve space
for per-sector metadata, but sometimes without protection checksums.
This property is generically useful, so teach the block core to
internally specify a nop profile if one is not provided at registration
time.

Cc: Keith Busch <keith.busch@intel.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Suggested-by: default avatarChristoph Hellwig <hch@lst.de>
[hch: kill the local nvme nop profile as well]
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 5a48fc14

block/blk-integrity.c

+12 −1
Original line number Diff line number Diff line
@@ -384,6 +384,17 @@ static struct kobj_type integrity_ktype = { 
	.sysfs_ops	= &integrity_ops,

};



static int blk_integrity_nop_fn(struct blk_integrity_iter *iter)

{

	return 0;

}



static struct blk_integrity_profile nop_profile = {

	.name = "nop",

	.generate_fn = blk_integrity_nop_fn,

	.verify_fn = blk_integrity_nop_fn,

};



/**

 * blk_integrity_register - Register a gendisk as being integrity-capable

 * @disk:	struct gendisk pointer to make integrity-aware
@@ -402,7 +413,7 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template 
	bi->flags = BLK_INTEGRITY_VERIFY | BLK_INTEGRITY_GENERATE |

		template->flags;

	bi->interval_exp = ilog2(queue_logical_block_size(disk->queue));

	bi->profile = template->profile;

	bi->profile = template->profile ? template->profile : &nop_profile;

	bi->tuple_size = template->tuple_size;

	bi->tag_size = template->tag_size;

drivers/nvdimm/core.c

+1 −11
Original line number Diff line number Diff line
@@ -392,24 +392,14 @@ void nvdimm_bus_unregister(struct nvdimm_bus *nvdimm_bus) 
EXPORT_SYMBOL_GPL(nvdimm_bus_unregister);



#ifdef CONFIG_BLK_DEV_INTEGRITY

static int nd_pi_nop_generate_verify(struct blk_integrity_iter *iter)

{

	return 0;

}



int nd_integrity_init(struct gendisk *disk, unsigned long meta_size)

{

	struct blk_integrity bi;

	static struct blk_integrity_profile profile = {

		.name = "ND-PI-NOP",

		.generate_fn = nd_pi_nop_generate_verify,

		.verify_fn = nd_pi_nop_generate_verify,

	};



	if (meta_size == 0)

		return 0;



	bi.profile = &profile;

	bi.profile = NULL;

	bi.tuple_size = meta_size;

	bi.tag_size = meta_size;

drivers/nvme/host/pci.c

+1 −17
Original line number Diff line number Diff line
@@ -548,22 +548,6 @@ static void nvme_dif_remap(struct request *req, 
	kunmap_atomic(pmap);

}



static int nvme_noop_verify(struct blk_integrity_iter *iter)

{

	return 0;

}



static int nvme_noop_generate(struct blk_integrity_iter *iter)

{

	return 0;

}



struct blk_integrity_profile nvme_meta_noop = {

	.name			= "NVME_META_NOOP",

	.generate_fn		= nvme_noop_generate,

	.verify_fn		= nvme_noop_verify,

};



static void nvme_init_integrity(struct nvme_ns *ns)

{

	struct blk_integrity integrity;
@@ -577,7 +561,7 @@ static void nvme_init_integrity(struct nvme_ns *ns) 
		integrity.profile = &t10_pi_type1_crc;

		break;

	default:

		integrity.profile = &nvme_meta_noop;

		integrity.profile = NULL;

		break;

	}

	integrity.tuple_size = ns->ms;