nvme-pci: disable the write zeros command for Intel 600P/P3100
Subsystems (2)
PATCH 1/1 nvme-pci: disable the write zeros command for Intel 600P/P3100
From: David Milburn <[email protected]>
[ Upstream commit ce4cc3133dc72c31bd49ddcf22d0f9eeff47a761 ]
The write zeros command does not work with 4k range.
bash-4.4# ./blkdiscard /dev/nvme0n1p2
bash-4.4# strace -efallocate xfs_io -c "fzero 536895488 2048" /dev/nvme0n1p2 fallocate(3, FALLOC_FL_ZERO_RANGE, 536895488, 2048) = 0
+++ exited with 0 +++
bash-4.4# dd bs=1 if=/dev/nvme0n1p2 skip=536895488 count=512 | hexdump -C 00000000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| *
00000200
bash-4.4# ./blkdiscard /dev/nvme0n1p2
bash-4.4# strace -efallocate xfs_io -c "fzero 536895488 4096" /dev/nvme0n1p2 fallocate(3, FALLOC_FL_ZERO_RANGE, 536895488, 4096) = 0
+++ exited with 0 +++
bash-4.4# dd bs=1 if=/dev/nvme0n1p2 skip=536895488 count=512 | hexdump -C
00000000 5c 61 5c b0 96 21 1b 5e 85 0c 07 32 9c 8c eb 3c |\a\..!.^...2...<| 00000010 4a a2 06 ca 67 15 2d 8e 29 8d a8 a0 7e 46 8c 62 |J...g.-.)...~F.b| 00000020 bb 4c 6c c1 6b f5 ae a5 e4 a9 bc 93 4f 60 ff 7a |.Ll.k.......O`.z|
---
Applicable to 5.4. NVME_QUIRK_DISABLE_WRITE_ZEROES was introduced in 5.0. The original commit needs a fix for 5.4 because NVME_QUIRK_NO_TEMP_THRESH_CHANGE doesn't exist - it looks like it was added in 5.5.
Observed with mke2fs failures on 5.4 wih Intel 600P.
--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +2 -1
@@ -3110,7 +3110,8 @@ static const struct pci_device_id nvme_id_table[] = { NVME_QUIRK_DEALLOCATE_ZEROES, }, { PCI_VDEVICE(INTEL, 0xf1a5), /* Intel 600P/P3100 */ .driver_data =NVME_QUIRK_NO_DEEPEST_PS | - NVME_QUIRK_MEDIUM_PRIO_SQ }, +NVME_QUIRK_MEDIUM_PRIO_SQ | + NVME_QUIRK_DISABLE_WRITE_ZEROES, }, { PCI_VDEVICE(INTEL, 0xf1a6), /* Intel 760p/Pro 7600p */ .driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_VDEVICE(INTEL, 0x5845), /* Qemu emulated controller */
Signature · 1 line
2.26.2
Quoted 31 lines · Jason Andryuk
From: David Milburn <[email protected]>
[ Upstream commit
ce4cc3133dc72c31bd49ddcf22d0f9eeff47a761]The write zeros command does not work with 4k range.
bash-4.4# ./blkdiscard
/dev/nvme0n1p2
bash-4.4# strace -efallocatexfs_io-c "fzero 536895488 2048"/dev/nvme0n1p2fallocate(3, FALLOC_FL_ZERO_RANGE, 536895488, 2048)= 0
+++ exited with 0 +++
bash-4.4# dd bs=1 if=/dev/nvme0n1p2 skip=536895488 count=512 | hexdump -C 00000000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| *
00000200bash-4.4# ./blkdiscard
/dev/nvme0n1p2
bash-4.4# strace -efallocatexfs_io-c "fzero 536895488 4096"/dev/nvme0n1p2fallocate(3, FALLOC_FL_ZERO_RANGE, 536895488, 4096)= 0
+++ exited with 0 +++
bash-4.4# dd bs=1 if=/dev/nvme0n1p2 skip=536895488 count=512 | hexdump -C00000000 5c 61 5c b0 96 21 1b 5e 85 0c 07 32 9c 8c eb 3c |\a\..!.^...2...<| 00000010 4a a2 06 ca 67 15 2d 8e 29 8d a8 a0 7e 46 8c 62 |J...g.-.)...~F.b| 00000020 bb 4c 6c c1 6b f5 ae a5 e4 a9 bc 93 4f 60 ff 7a |.Ll.k.......O`.z|Reported-by Eric Sandeen <[email protected]>Signed-off-by David Milburn <[email protected]>Tested-by Eric Sandeen <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>[ Fix-up for 5.4 since NVME_QUIRK_NO_TEMP_THRESH_CHANGE doesn't exist ]Signed-off-by Jason Andryuk <[email protected]>
Quoted 7 lines
---
Applicable to 5.4.NVME_QUIRK_DISABLE_WRITE_ZEROESwas introduced in 5.0. The original commit needs a fix for 5.4 becauseNVME_QUIRK_NO_TEMP_THRESH_CHANGEdoesn't exist - it looks like it was added in 5.5.Observed with mke2fs failures on 5.4 wih Intel 600P.
Now queued up, thanks.
greg k-h