Revert "ide/ahci: Check for -ECANCELED in aio callbacks"
PATCH 1/1 Revert "ide/ahci: Check for -ECANCELED in aio callbacks"
This reverts commit 0d910cfeaf2076b116b4517166d5deb0fea76394.
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.
--- hw/ide/ahci.c | 3 --- hw/ide/core.c | 14 -------------- 2 files changed, 17 deletions(-)
hw/ide/ahci.c +0 -3
@@ -1023,9 +1023,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
@@ -722,9 +722,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 )) {
@@ -840,10 +837,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 ;
@@ -975,10 +968,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 ;
@@ -1058,9 +1047,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 )) {
Signature · 1 line
2.21.0
Hi John,
Quoted 5 lines · John Snow
This reverts commit
0d910cfeaf2076b116b4517166d5deb0fea76394.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.
Is this 4.1 material? It looks so.
Quoted 72 lines
This ought to help cases reported by Nutanix where iSCSI returns a legitimate
-ECANCELEDfor certain operations which should be propagated normally.Reported-by Shaju Abraham <[email protected]>Signed-off-by John Snow <[email protected]>--- hw/ide/ahci.c | 3 --- hw/ide/core.c | 14 -------------- 2 files changed, 17 deletions(-)hw/ide/ahci.c +0
-3@@ -1023,9 +1023,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@@ -722,9 +722,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 )) {@@ -840,10 +837,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 ;@@ -975,10 +968,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 ;@@ -1058,9 +1047,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 )) {
Quoted 10 lines · Philippe Mathieu-Daudé
Hi John,
Quoted 5 lines · John Snow
This reverts commit
0d910cfeaf2076b116b4517166d5deb0fea76394.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.
Is this 4.1 material? It looks so.
Perhaps could have been last week, but now I suggest Cc qemu-stable and delaying it to 4.2.
Paolo
Quoted 72 lines
Quoted 72 lines
This ought to help cases reported by Nutanix where iSCSI returns a legitimate
-ECANCELEDfor certain operations which should be propagated normally.Reported-by Shaju Abraham <[email protected]>Signed-off-by John Snow <[email protected]>--- hw/ide/ahci.c | 3 --- hw/ide/core.c | 14 -------------- 2 files changed, 17 deletions(-)hw/ide/ahci.c +0
-3@@ -1023,9 +1023,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@@ -722,9 +722,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 )) {@@ -840,10 +837,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 ;@@ -975,10 +968,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 ;@@ -1058,9 +1047,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 )) {
Quoted 6 lines · Paolo Bonzini
Quoted 5 lines · Philippe Mathieu-Daudé
Hi John,
Quoted 2 lines · John Snow
This reverts commit
0d910cfeaf2076b116b4517166d5deb0fea76394.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
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.
Is this 4.1 material? It looks so.
Perhaps could have been last week, but now I suggest Cc qemu-stable and delaying it to 4.2.
I was wondering because Kevin was preparing a block@ pull request.
Anyway this seems fair because the reverted commit is dated from 2014.
Thanks,
Phil.
Quoted 11 lines · Philippe Mathieu-Daudé
Hi John,
Quoted 5 lines · John Snow
This reverts commit
0d910cfeaf2076b116b4517166d5deb0fea76394.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.
Is this 4.1 material? It looks so.
Nah. This reverts a commit from 2014. I have no valid argument for why this is critical :)
Thanks for checking!
--js
John Snow
AppliedQuoted 6 lines · John Snow
This reverts commit
0d910cfeaf2076b116b4517166d5deb0fea76394.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.
Quoted 6 lines
This ought to help cases reported by Nutanix where iSCSI returns a legitimate
-ECANCELEDfor certain operations which should be propagated normally.Reported-by Shaju Abraham <[email protected]>Signed-off-by John Snow <[email protected]>
Nobody's yelling, so this is getting staged on my IDE branch, alongside Paolo's dma-helpers fix.
Thanks, applied to my IDE tree:
https://github.com/jnsnow/qemu/commits/ide
https://github.com/jnsnow/qemu.git
--js