diff mbox series

[2/3] block: flush the integrity workqueue in blk_integrity_unregister

Message ID 20210914070657.87677-3-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series [1/3] block: check if a profile is actually registered in blk_integrity_unregister | expand

Commit Message

Christoph Hellwig Sept. 14, 2021, 7:06 a.m. UTC 
From: Lihong Kou <koulihong@huawei.com>

When the integrity profile is unregistered there can still be integrity
reads queued up which could see a NULL verify_fn as shown by the race
window below:

CPU0                                    CPU1
  process_one_work                      nvme_validate_ns
    bio_integrity_verify_fn                nvme_update_ns_info
	                                     nvme_update_disk_info
	                                       blk_integrity_unregister
                                               ---set queue->integrity as 0
	bio_integrity_process
	--access bi->profile->verify_fn(bi is a pointer of queue->integity)

Before calling blk_integrity_unregister in nvme_update_disk_info, we must
make sure that there is no work item in the kintegrityd_wq. Just call
blk_flush_integrity to flush the work queue so the bug can be resolved.

Signed-off-by: Lihong Kou <koulihong@huawei.com>
[hch: split up and shortened the changelog]
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-integrity.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Sagi Grimberg Sept. 14, 2021, 7:19 a.m. UTC | #1 
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
diff mbox series

Patch

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 48bfb53aa8571..16d5d5338392a 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -430,6 +430,9 @@  void blk_integrity_unregister(struct gendisk *disk)
 
 	if (!bi->profile)
 		return;
+
+	/* ensure all bios are off the integrity workqueue */
+	blk_flush_integrity();
 	blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, disk->queue);
 	memset(bi, 0, sizeof(*bi));
 }