Commit 1f6b281a authored by Jens Axboe's avatar Jens Axboe
Browse files

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
parents 95a7c500 7ac3c288

drivers/nvme/host/core.c

+11 −7
Original line number Diff line number Diff line
@@ -903,6 +903,15 @@ static void nvme_set_ref_tag(struct nvme_ns *ns, struct nvme_command *cmnd, 
	u32 upper, lower;

	u64 ref48;



	/* only type1 and type 2 PI formats have a reftag */

	switch (ns->head->pi_type) {

	case NVME_NS_DPS_PI_TYPE1:

	case NVME_NS_DPS_PI_TYPE2:

		break;

	default:

		return;

	}



	/* both rw and write zeroes share the same reftag format */

	switch (ns->head->guard_type) {

	case NVME_NVM_NS_16B_GUARD:
@@ -942,13 +951,7 @@ static inline blk_status_t nvme_setup_write_zeroes(struct nvme_ns *ns, 


	if (nvme_ns_has_pi(ns->head)) {

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



		switch (ns->head->pi_type) {

		case NVME_NS_DPS_PI_TYPE1:

		case NVME_NS_DPS_PI_TYPE2:

		nvme_set_ref_tag(ns, cmnd, req);

			break;

		}

	}



	return BLK_STS_OK;
@@ -1039,6 +1042,7 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns, 
			if (WARN_ON_ONCE(!nvme_ns_has_pi(ns->head)))

				return BLK_STS_NOTSUPP;

			control |= NVME_RW_PRINFO_PRACT;

			nvme_set_ref_tag(ns, cmnd, req);

		}



		if (bio_integrity_flagged(req->bio, BIP_CHECK_GUARD))