Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nvme-6.17-2025-09-04' of git://git.infradead.org/nvme into block-6.17
Pull NVMe fix from Keith:
"nvme fixes for 6.17
- Fix protection information ref tag for device side gen/strip
(Christoph)"
* tag 'nvme-6.17-2025-09-04' of git://git.infradead.org/nvme:
nvme: fix PI insert on write
+11
-7
+11
-7
drivers/nvme/host/core.c
+11
-7
drivers/nvme/host/core.c
···
903
903
u32 upper, lower;
904
904
u64 ref48;
905
905
906
+
/* only type1 and type 2 PI formats have a reftag */
907
+
switch (ns->head->pi_type) {
908
+
case NVME_NS_DPS_PI_TYPE1:
909
+
case NVME_NS_DPS_PI_TYPE2:
910
+
break;
911
+
default:
912
+
return;
913
+
}
914
+
906
915
/* both rw and write zeroes share the same reftag format */
907
916
switch (ns->head->guard_type) {
908
917
case NVME_NVM_NS_16B_GUARD:
···
951
942
952
943
if (nvme_ns_has_pi(ns->head)) {
953
944
cmnd->write_zeroes.control |= cpu_to_le16(NVME_RW_PRINFO_PRACT);
954
-
955
-
switch (ns->head->pi_type) {
956
-
case NVME_NS_DPS_PI_TYPE1:
957
-
case NVME_NS_DPS_PI_TYPE2:
958
-
nvme_set_ref_tag(ns, cmnd, req);
959
-
break;
960
-
}
945
+
nvme_set_ref_tag(ns, cmnd, req);
961
946
}
962
947
963
948
return BLK_STS_OK;
···
1042
1039
if (WARN_ON_ONCE(!nvme_ns_has_pi(ns->head)))
1043
1040
return BLK_STS_NOTSUPP;
1044
1041
control |= NVME_RW_PRINFO_PRACT;
1042
+
nvme_set_ref_tag(ns, cmnd, req);
1045
1043
}
1046
1044
1047
1045
if (bio_integrity_flagged(req->bio, BIP_CHECK_GUARD))