Commit 6bf74636 authored by Igor Druzhinin's avatar Igor Druzhinin Committed by Kevin Wolf
Browse files

nvme: call blk_drain in NVMe reset code to avoid lockups 



When blk_flush called in NVMe reset path S/C queues are already freed
which means that re-entering AIO handling loop having some IO requests
unfinished will lockup or crash as their SG structures being potentially
reused. Call blk_drain before freeing the queues to avoid this nasty
scenario.

Signed-off-by: default avatarIgor Druzhinin <igor.druzhinin@citrix.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent e4c8f292

hw/block/nvme.c

+2 −0
Original line number Diff line number Diff line
@@ -797,6 +797,8 @@ static void nvme_clear_ctrl(NvmeCtrl *n) 
{

    int i;



    blk_drain(n->conf.blk);



    for (i = 0; i < n->num_queues; i++) {

        if (n->sq[i] != NULL) {

            nvme_free_sq(n->sq[i], n);