History

blk-mq: move failure injection out of blk_mq_complete_request

Move the call to blk_should_fake_timeout out of blk_mq_complete_request and into the drivers, skipping call sites that are obvious error handlers, and remove the now superflous blk_mq_force_complete_rq helper. This ensures we don't keep injecting errors into completions that just terminate the Linux request after the hardware has been reset or the command has been aborted.

Christoph Hellwig committed 6 years ago

Commit 15f73f51 parent d391a7a19 files · +61 −72Browse files

Showing the changes to include/linux (1 of 19 files). Show all

Unified · Split

include/linux/blk-mq.h+10−2
@@ -503,8 +503,7 @@ void __blk_mq_end_request(struct request *rq, blk_status_t error); · 502 unmodified lines
503void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list);503void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list);
504void blk_mq_kick_requeue_list(struct request_queue *q);504void blk_mq_kick_requeue_list(struct request_queue *q);
505void blk_mq_delay_kick_requeue_list(struct request_queue *q, unsigned long msecs);505void blk_mq_delay_kick_requeue_list(struct request_queue *q, unsigned long msecs);
506bool blk_mq_complete_request(struct request *rq);506void blk_mq_complete_request(struct request *rq);
507void blk_mq_force_complete_rq(struct request *rq);
508bool blk_mq_bio_list_merge(struct request_queue *q, struct list_head *list,507bool blk_mq_bio_list_merge(struct request_queue *q, struct list_head *list,
509 struct bio *bio, unsigned int nr_segs);508 struct bio *bio, unsigned int nr_segs);
510bool blk_mq_queue_stopped(struct request_queue *q);509bool blk_mq_queue_stopped(struct request_queue *q);
@@ -537,6 +536,15 @@ void blk_mq_quiesce_queue_nowait(struct request_queue *q); · 26 unmodified lines
537 536
538unsigned int blk_mq_rq_cpu(struct request *rq);537unsigned int blk_mq_rq_cpu(struct request *rq);
539 538
539bool __blk_should_fake_timeout(struct request_queue *q);
540static inline bool blk_should_fake_timeout(struct request_queue *q)
541{
542 if (IS_ENABLED(CONFIG_FAIL_IO_TIMEOUT) &&
543 test_bit(QUEUE_FLAG_FAIL_IO, &q->queue_flags))
544 return __blk_should_fake_timeout(q);
545 return false;
546}
547
540/**548/**
541 * blk_mq_rq_from_pdu - cast a PDU to a request549 * blk_mq_rq_from_pdu - cast a PDU to a request
542 * @pdu: the PDU (Protocol Data Unit) to be casted550 * @pdu: the PDU (Protocol Data Unit) to be casted

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t