Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cfc766e authored by Dan Williams's avatar Dan Williams Committed by Jens Axboe
Browse files

nvme: suspend i/o during runtime blk_integrity_unregister 



Synchronize pending i/o against a change in the integrity profile to
avoid the possibility of spurious integrity errors.

Cc: Matthew Wilcox <willy@linux.intel.com>
Acked-by: default avatarKeith Busch <keith.busch@intel.com>
[keith: also protect dynamic integrity registration]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent c7bfced9

drivers/nvme/host/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -2035,6 +2035,7 @@ static int nvme_revalidate_disk(struct gendisk *disk) 
	pi_type = ns->ms == sizeof(struct t10_pi_tuple) ?

					id->dps & NVME_NS_DPS_PI_MASK : 0;



	blk_mq_freeze_queue(disk->queue);

	if (blk_get_integrity(disk) && (ns->pi_type != pi_type ||

				ns->ms != old_ms ||

				bs != queue_logical_block_size(disk->queue) ||
@@ -2054,6 +2055,7 @@ static int nvme_revalidate_disk(struct gendisk *disk) 


	if (dev->oncs & NVME_CTRL_ONCS_DSM)

		nvme_config_discard(ns);

	blk_mq_unfreeze_queue(disk->queue);



	kfree(id);

	return 0;