block: blk_flush_integrity() for bio-based drivers (5a48fc14) · Commits · 戴 / test

Since they lack requests to pin the request_queue active, synchronous bio-based drivers may have in-flight integrity work from bio_integrity_endio() that is not flushed by blk_freeze_queue(). Flush that work to prevent races to free the queue and the final usage of the blk_integrity profile. This is temporary unless/until bio-based drivers start to generically take a q_usage_counter reference while a bio is in-flight. Cc: Martin K. Petersen <martin.petersen@oracle.com> [martin: fix the CONFIG_BLK_DEV_INTEGRITY=n case] Tested-by:

Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by:

Dan Williams <dan.j.williams@intel.com> Signed-off-by:

Jens Axboe <axboe@fb.com>

block/bio-integrity.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,11 @@
		static struct kmem_cache *bip_slab;
		static struct workqueue_struct *kintegrityd_wq;

		void blk_flush_integrity(void)
		{
		flush_workqueue(kintegrityd_wq);
		}

		/**
		* bio_integrity_alloc - Allocate integrity payload and attach it to bio
		* @bio: bio to attach integrity metadata to

block/blk-core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -561,6 +561,9 @@ void blk_cleanup_queue(struct request_queue *q)
		queue_flag_set(QUEUE_FLAG_DEAD, q);
		spin_unlock_irq(lock);

		/* for synchronous bio-based driver finish in-flight integrity i/o */
		blk_flush_integrity();

		/* @q won't process any more request, flush async actions */
		del_timer_sync(&q->backing_dev_info.laptop_mode_wb_timer);
		blk_sync_queue(q);

block/blk.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,14 @@ static inline void blk_queue_enter_live(struct request_queue *q)
		percpu_ref_get(&q->q_usage_counter);
		}

		#ifdef CONFIG_BLK_DEV_INTEGRITY
		void blk_flush_integrity(void);
		#else
		static inline void blk_flush_integrity(void)
		{
		}
		#endif

		void blk_rq_timed_out_timer(unsigned long data);
		unsigned long blk_rq_timeout(unsigned long timeout);
		void blk_add_timer(struct request *req);

Admin message