Skip to content

Commit

Permalink
block, libnvdimm, nvme: provide a built-in blk_integrity nop profile
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Suggested-by: Christoph Hellwig <[email protected]>
[hch: kill the local nvme nop profile as well]
Acked-by: Martin K. Petersen <[email protected]>
Signed-off-by: Dan Williams <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
djbw authored and axboe committed Oct 21, 2015
1 parent 5a48fc1 commit 4125a09
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 29 deletions.
13 changes: 12 additions & 1 deletion block/blk-integrity.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;

Expand Down
12 changes: 1 addition & 11 deletions drivers/nvdimm/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
18 changes: 1 addition & 17 deletions drivers/nvme/host/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 4125a09

Please sign in to comment.