Commit 8ec41c42 authored by John Snow's avatar John Snow
Browse files

Revert "ide/ahci: Check for -ECANCELED in aio callbacks" 



This reverts commit 0d910cfe.

It's not correct to just ignore an error code in a callback; we need to
handle that error and possible report failure to the guest so that they
don't wait indefinitely for an operation that will now never finish.

This ought to help cases reported by Nutanix where iSCSI returns a
legitimate -ECANCELED for certain operations which should be propagated
normally.

Reported-by: default avatarShaju Abraham <shaju.abraham@nutanix.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: 20190729223605.7163-1-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 539343c0

hw/ide/ahci.c

+0 −3
Original line number Diff line number Diff line
@@ -1025,9 +1025,6 @@ static void ncq_cb(void *opaque, int ret) 
    IDEState *ide_state = &ncq_tfs->drive->port.ifs[0];



    ncq_tfs->aiocb = NULL;

    if (ret == -ECANCELED) {

        return;

    }



    if (ret < 0) {

        bool is_read = ncq_tfs->cmd == READ_FPDMA_QUEUED;

hw/ide/core.c

+0 −14
Original line number Diff line number Diff line
@@ -723,9 +723,6 @@ static void ide_sector_read_cb(void *opaque, int ret) 
    s->pio_aiocb = NULL;

    s->status &= ~BUSY_STAT;



    if (ret == -ECANCELED) {

        return;

    }

    if (ret != 0) {

        if (ide_handle_rw_error(s, -ret, IDE_RETRY_PIO |

                                IDE_RETRY_READ)) {
@@ -841,10 +838,6 @@ static void ide_dma_cb(void *opaque, int ret) 
    uint64_t offset;

    bool stay_active = false;



    if (ret == -ECANCELED) {

        return;

    }



    if (ret == -EINVAL) {

        ide_dma_error(s);

        return;
@@ -976,10 +969,6 @@ static void ide_sector_write_cb(void *opaque, int ret) 
    IDEState *s = opaque;

    int n;



    if (ret == -ECANCELED) {

        return;

    }



    s->pio_aiocb = NULL;

    s->status &= ~BUSY_STAT;
@@ -1059,9 +1048,6 @@ static void ide_flush_cb(void *opaque, int ret) 


    s->pio_aiocb = NULL;



    if (ret == -ECANCELED) {

        return;

    }

    if (ret < 0) {

        /* XXX: What sector number to set here? */

        if (ide_handle_rw_error(s, -ret, IDE_RETRY_FLUSH)) {