]> git.baikalelectronics.ru Git - kernel.git/commitdiff
nvme: set the PRACT bit when using Write Zeroes with T10 PI
authorChristoph Hellwig <hch@lst.de>
Wed, 21 Jul 2021 08:00:11 +0000 (10:00 +0200)
committerChristoph Hellwig <hch@lst.de>
Wed, 21 Jul 2021 15:24:10 +0000 (17:24 +0200)
When using Write Zeroes on a namespace that has protection
information enabled they behavior without the PRACT bit
counter-intuitive and will generally lead to validation failures
when reading the written blocks.  Fix this by always setting the
PRACT bit that generates matching PI data on the fly.

Fixes: 6e02318eaea5 ("nvme: add support for the Write Zeroes command")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/nvme/host/core.c

index 17c05a4595f0c45afe20738e8f65bc4a639c201d..dfd9dec0c1f6053b3d5de104d2f0de0c81cfa98a 100644 (file)
@@ -900,7 +900,10 @@ 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);
-       cmnd->write_zeroes.control = 0;
+       if (nvme_ns_has_pi(ns))
+               cmnd->write_zeroes.control = cpu_to_le16(NVME_RW_PRINFO_PRACT);
+       else
+               cmnd->write_zeroes.control = 0;
        return BLK_STS_OK;
 }