Commit 00b33cf3 authored by Klaus Jensen's avatar Klaus Jensen Committed by Christoph Hellwig
Browse files

nvme: fix write zeroes pi 



Write Zeroes sets PRACT when block integrity is enabled (as it should),
but neglects to also set the reftag which is expected by reads. This
causes protection errors on reads.

Fix this by setting the reftag for type 1 and 2 (for type 3, reads will
not check the reftag).

Signed-off-by: default avatarKlaus Jensen <k.jensen@samsung.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 8e8aaf51

drivers/nvme/host/core.c

+12 −3
Original line number Diff line number Diff line
@@ -895,10 +895,19 @@ static inline blk_status_t nvme_setup_write_zeroes(struct nvme_ns *ns, 
		cpu_to_le64(nvme_sect_to_lba(ns, blk_rq_pos(req)));

	cmnd->write_zeroes.length =

		cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1);

	if (nvme_ns_has_pi(ns))



	if (nvme_ns_has_pi(ns)) {

		cmnd->write_zeroes.control = cpu_to_le16(NVME_RW_PRINFO_PRACT);

	else

		cmnd->write_zeroes.control = 0;



		switch (ns->pi_type) {

		case NVME_NS_DPS_PI_TYPE1:

		case NVME_NS_DPS_PI_TYPE2:

			cmnd->write_zeroes.reftag =

				cpu_to_le32(t10_pi_ref_tag(req));

			break;

		}

	}



	return BLK_STS_OK;

}