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

Commit 538b7534 authored by Jens Axboe's avatar Jens Axboe
Browse files

blk-mq: request deadline must be visible before marking rq as started



When we start the request, we set the deadline and flip the bits
marking the request as started and non-complete. However, it's
important that the deadline store is ordered before flipping the
bits, otherwise we could have a small window where the request is
marked started but with an invalid deadline. This can confuse the
timeout handling.

Suggested-by: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 37504a3b
Loading
Loading
Loading
Loading
+6 −0
Original line number Original line Diff line number Diff line
@@ -392,6 +392,12 @@ static void blk_mq_start_request(struct request *rq, bool last)


	blk_add_timer(rq);
	blk_add_timer(rq);


	/*
	 * Ensure that ->deadline is visible before set the started
	 * flag and clear the completed flag.
	 */
	smp_mb__before_atomic();

	/*
	/*
	 * Mark us as started and clear complete. Complete might have been
	 * Mark us as started and clear complete. Complete might have been
	 * set if requeue raced with timeout, which then marked it as
	 * set if requeue raced with timeout, which then marked it as