Skip to content

ublk: set canceling flag even when disk is not allocated #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 1 commit into
base: linus-master_base
Choose a base branch
from
+18 −14
Open

ublk: set canceling flag even when disk is not allocated #896

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions drivers/block/ublk_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2735,23 +2735,27 @@ static void ublk_start_cancel(struct ublk_device *ub)
{
struct gendisk *disk = ublk_get_disk(ub);

/* Our disk has been dead */
if (!disk)
return;

mutex_lock(&ub->cancel_mutex);
if (ub->canceling)
goto out;
/*
* Now we are serialized with ublk_queue_rq()
*
* Make sure that ubq->canceling is set when queue is frozen,
* because ublk_queue_rq() has to rely on this flag for avoiding to
* touch completed uring_cmd
*/
blk_mq_quiesce_queue(disk->queue);
ublk_set_canceling(ub, true);
blk_mq_unquiesce_queue(disk->queue);

if (disk) {
/*
* Quiesce to serialize with ublk_queue_rq(), ensuring
* ubq->canceling is visible when the queue resumes.
*/
blk_mq_quiesce_queue(disk->queue);
ublk_set_canceling(ub, true);
blk_mq_unquiesce_queue(disk->queue);
} else {
/*
* Disk not yet allocated by ublk_ctrl_start_dev(), so
* there is no request queue and ublk_queue_rq() cannot
* be running. Just set the flag; if start_dev proceeds
* later, new I/O will see canceling and be aborted.
*/
ublk_set_canceling(ub, true);
}
out:
mutex_unlock(&ub->cancel_mutex);
ublk_put_disk(disk);
Expand Down