ublk: speed up ublk server exit handling

[blktests-ci]

Pull request for series with
subject: ublk: speed up ublk server exit handling
version: 2
url: https://patchwork.kernel.org/project/linux-block/list/?series=978954

[blktests-ci]

Upstream branch: 8c2e52e
series: https://patchwork.kernel.org/project/linux-block/list/?series=978954
version: 2

[blktests-ci]

Upstream branch: bc9ff19
series: https://patchwork.kernel.org/project/linux-block/list/?series=978954
version: 2

[blktests-ci]

Upstream branch: bc9ff19
series: https://patchwork.kernel.org/project/linux-block/list/?series=978954
version: 2

[blktests-ci]

Upstream branch: bc9ff19
series: https://patchwork.kernel.org/project/linux-block/list/?series=978954
version: 2

[blktests-ci]

Upstream branch: 40f92e7
series: https://patchwork.kernel.org/project/linux-block/list/?series=978954
version: 2

[blktests-ci]

Upstream branch: 40f92e7
series: https://patchwork.kernel.org/project/linux-block/list/?series=978954
version: 2

[blktests-ci]

Upstream branch: 89be9a8
series: https://patchwork.kernel.org/project/linux-block/list/?series=978954
version: 2

[blktests-ci]

Upstream branch: 25fae0b
series: https://patchwork.kernel.org/project/linux-block/list/?series=978954
version: 2

[blktests-ci]

Upstream branch: 260f6f4
series: https://patchwork.kernel.org/project/linux-block/list/?series=978954
version: 2

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

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: ublk: speed up ublk server exit handling
Using index info to reconstruct a base tree...
M	drivers/block/ublk_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/ublk_drv.c
CONFLICT (content): Merge conflict in drivers/block/ublk_drv.c
Patch failed at 0001 ublk: speed up ublk server exit handling'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc drivers/block/ublk_drv.c
index 6561d2a561fa,870d57a853a4..000000000000
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@@ -238,7 -237,6 +238,10 @@@ struct ublk_device 
  	unsigned int		nr_privileged_daemon;
  	struct mutex cancel_mutex;
  	bool canceling;
++<<<<<<< HEAD
 +	pid_t 	ublksrv_tgid;
++=======
++>>>>>>> ublk: speed up ublk server exit handling
  };
  
  /* header of ublk_params */
@@@ -1622,11 -1591,13 +1625,21 @@@ static int ublk_ch_release(struct inod
  	 * All requests may be inflight, so ->canceling may not be set, set
  	 * it now.
  	 */
++<<<<<<< HEAD
 +	mutex_lock(&ub->cancel_mutex);
 +	ublk_set_canceling(ub, true);
 +	for (i = 0; i < ub->dev_info.nr_hw_queues; i++)
 +		ublk_abort_queue(ub, ublk_get_queue(ub, i));
 +	mutex_unlock(&ub->cancel_mutex);
++=======
+ 	ub->canceling = true;
+ 	for (i = 0; i < ub->dev_info.nr_hw_queues; i++) {
+ 		struct ublk_queue *ubq = ublk_get_queue(ub, i);
+ 
+ 		ubq->canceling = true;
+ 		ublk_abort_queue(ub, ubq);
+ 	}
++>>>>>>> ublk: speed up ublk server exit handling
  	blk_mq_kick_requeue_list(disk->queue);
  
  	/*
@@@ -1768,7 -1740,9 +1782,13 @@@ static void ublk_start_cancel(struct ub
  	 * touch completed uring_cmd
  	 */
  	blk_mq_quiesce_queue(disk->queue);
++<<<<<<< HEAD
 +	ublk_set_canceling(ub, true);
++=======
+ 	ub->canceling = true;
+ 	for (i = 0; i < ub->dev_info.nr_hw_queues; i++)
+ 		ublk_get_queue(ub, i)->canceling = true;
++>>>>>>> ublk: speed up ublk server exit handling
  	blk_mq_unquiesce_queue(disk->queue);
  out:
  	mutex_unlock(&ub->cancel_mutex);
@@@ -1968,11 -1942,10 +1988,15 @@@ static void ublk_reset_io_flags(struct 
  		for (j = 0; j < ubq->q_depth; j++)
  			ubq->ios[j].flags &= ~UBLK_IO_FLAG_CANCELED;
  		spin_unlock(&ubq->cancel_lock);
 -		ubq->canceling = false;
  		ubq->fail_io = false;
  	}
++<<<<<<< HEAD
 +	mutex_lock(&ub->cancel_mutex);
 +	ublk_set_canceling(ub, false);
 +	mutex_unlock(&ub->cancel_mutex);
++=======
+ 	ub->canceling = false;
++>>>>>>> ublk: speed up ublk server exit handling
  }
  
  /* device can only be started after all IOs are ready */
@@@ -3494,11 -3435,14 +3518,21 @@@ static int ublk_ctrl_quiesce_dev(struc
  		goto put_disk;
  
  	/* Mark the device as canceling */
++<<<<<<< HEAD
 +	mutex_lock(&ub->cancel_mutex);
 +	blk_mq_quiesce_queue(disk->queue);
 +	ublk_set_canceling(ub, true);
++=======
+ 	blk_mq_quiesce_queue(disk->queue);
+ 	ub->canceling = true;
+ 	for (i = 0; i < ub->dev_info.nr_hw_queues; i++) {
+ 		struct ublk_queue *ubq = ublk_get_queue(ub, i);
+ 
+ 		ubq->canceling = true;
+ 	}
++>>>>>>> ublk: speed up ublk server exit handling
  	blk_mq_unquiesce_queue(disk->queue);
 +	mutex_unlock(&ub->cancel_mutex);
  
  	if (!timeout_ms)
  		timeout_ms = UINT_MAX;