diff options
| author | Lihong Kou <koulihong@huawei.com> | 2021-09-14 09:06:56 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-09-14 20:03:30 -0600 |
| commit | 3df49967f6f1d2121b0c27c381ca1c8386b1dab9 (patch) | |
| tree | 5f6e187a491835514d8960b668085b945f0686be | |
| parent | 783a40a1b3ac7f3714d2776fa8ac8cce3535e4f6 (diff) | |
| download | linux-stable-3df49967f6f1d2121b0c27c381ca1c8386b1dab9.tar.gz linux-stable-3df49967f6f1d2121b0c27c381ca1c8386b1dab9.tar.bz2 linux-stable-3df49967f6f1d2121b0c27c381ca1c8386b1dab9.zip | |
block: flush the integrity workqueue in blk_integrity_unregister
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>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Link: https://lore.kernel.org/r/20210914070657.87677-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/blk-integrity.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 48bfb53aa857..16d5d5338392 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)); } |