blk-mq: recover from stale cached request in blk_mq_submit_bio

[blktests-ci]

Pull request for series with
subject: blk-mq: recover from stale cached request in blk_mq_submit_bio
version: 1
url: https://patchwork.kernel.org/project/linux-block/list/?series=1085314

[blktests-ci]

Upstream branch: dd6c438
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: dca922e
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: e75a43c
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: 66edb90
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: 6d35786
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: 6d35786
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: aa54b1d
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: 70eda68
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: 8bc67e4
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: 6779b50
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

[blktests-ci]

Upstream branch: 79bd2dd
series: https://patchwork.kernel.org/project/linux-block/list/?series=1085314
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=1085314
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: blk-mq: recover from stale cached request in blk_mq_submit_bio
Using index info to reconstruct a base tree...
M	block/blk-mq.c
Falling back to patching base and 3-way merge...
Auto-merging block/blk-mq.c
CONFLICT (content): Merge conflict in block/blk-mq.c
Patch failed at 0001 blk-mq: recover from stale cached request in blk_mq_submit_bio
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc block/blk-mq.c
index 28c2d931e75e,2ca914505d93..000000000000
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@@ -3097,6 -3096,25 +3097,28 @@@ static struct request *blk_mq_get_cache
  	return rq;
  }
  
++<<<<<<< HEAD
++=======
+ static bool blk_mq_use_cached_rq(struct request *rq, struct blk_plug *plug,
+ 		struct bio *bio)
+ {
+ 	/*
+ 	 * We will have flushed the plug and hence killed the cached_rq list as
+ 	 * well if anything had blocked. Pop this entry before we throttle if
+ 	 * the entry is still valid.
+ 	 */
+ 	if (rq_list_pop(&plug->cached_rqs) != rq)
+ 		return false;
+ 
+ 	rq_qos_throttle(rq->q, bio);
+ 
+ 	blk_mq_rq_time_init(rq, blk_time_get_ns());
+ 	rq->cmd_flags = bio->bi_opf;
+ 	INIT_LIST_HEAD(&rq->queuelist);
+ 	return true;
+ }
+ 
++>>>>>>> blk-mq: recover from stale cached request in blk_mq_submit_bio
  static bool bio_unaligned(const struct bio *bio, struct request_queue *q)
  {
  	unsigned int bs_mask = queue_logical_block_size(q) - 1;
@@@ -3194,11 -3212,13 +3216,21 @@@ void blk_mq_submit_bio(struct bio *bio
  
  new_request:
  	if (rq) {
++<<<<<<< HEAD
 +		rq_qos_throttle(rq->q, bio);
 +		blk_mq_rq_time_init(rq, blk_time_get_ns());
 +		rq->cmd_flags = bio->bi_opf;
 +		INIT_LIST_HEAD(&rq->queuelist);
 +	} else {
++=======
+ 		if (!blk_mq_use_cached_rq(rq, plug, bio)) {
+ 			rq = NULL;
+ 			if (unlikely(bio_queue_enter(bio)))
+ 				return;
+ 		}
+ 	}
+ 	if (!rq) {
++>>>>>>> blk-mq: recover from stale cached request in blk_mq_submit_bio
  		rq = blk_mq_get_new_requests(q, plug, bio);
  		if (unlikely(!rq)) {
  			if (bio->bi_opf & REQ_NOWAIT)