Commit 84b73542 authored Mar 03, 2022 by Keith Busch Committed by Jens Axboe Mar 07, 2022

nvme: allow integrity on extended metadata formats



The block integrity subsystem knows how to construct protection
information buffers with metadata beyond the protection information
fields. Remove the driver restriction.

Note, this can only work if the PI field appears first in the metadata,
as the integrity subsystem doesn't calculate guard tags on preceding
metadata.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20220303201312.3255347-3-kbusch@kernel.org


Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent c340b990

drivers/nvme/host/core.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -1616,12 +1616,9 @@ static void nvme_configure_metadata(struct nvme_ns ns, struct nvme_id_ns id)
		{
		struct nvme_ctrl *ctrl = ns->ctrl;

		/*
		* The PI implementation requires the metadata size to be equal to the
		* t10 pi tuple size.
		*/
		ns->ms = le16_to_cpu(id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ms);
		if (ns->ms == sizeof(struct t10_pi_tuple))
		if (id->dps & NVME_NS_DPS_PI_FIRST \|\|
		ns->ms == sizeof(struct t10_pi_tuple))
		ns->pi_type = id->dps & NVME_NS_DPS_PI_MASK;
		else
		ns->pi_type = 0;