david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ide: fix invalid TRIM range abortion for macio

Browse Source 
commit 947858b0 "ide: abort TRIM operation for invalid range"
is incorrect for macio; just ide_dma_error() without doing a callback
is not enough for that errorpath.

Instead, pass -EINVAL to the callback and handle it there
(see related motivation for read/write in 58ac32113).

It will however catch possible EINVAL from the block layer too.

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-id: 1520010495-58172-1-git-send-email-anton.nefedov@virtuozzo.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Anton Nefedov 2018-03-27 00:38:00 -04:00 committed by John Snow
parent 7b93d78a04
commit caeadbc8ba
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/ide/core.c
View File

@ -402,7 +402,6 @@ typedef struct TrimAIOCB {
QEMUIOVector *qiov; QEMUIOVector *qiov;
BlockAIOCB *aiocb; BlockAIOCB *aiocb;
int i, j; int i, j;
bool is_invalid;
} TrimAIOCB; } TrimAIOCB;
static void trim_aio_cancel(BlockAIOCB *acb) static void trim_aio_cancel(BlockAIOCB *acb)
@ -430,11 +429,8 @@ static void ide_trim_bh_cb(void *opaque)
{ {
TrimAIOCB *iocb = opaque; TrimAIOCB *iocb = opaque;
if (iocb->is_invalid) { iocb->common.cb(iocb->common.opaque, iocb->ret);
ide_dma_error(iocb->s);
} else {
iocb->common.cb(iocb->common.opaque, iocb->ret);
}
qemu_bh_delete(iocb->bh); qemu_bh_delete(iocb->bh);
iocb->bh = NULL; iocb->bh = NULL;
qemu_aio_unref(iocb); qemu_aio_unref(iocb);
@ -462,7 +458,7 @@ static void ide_issue_trim_cb(void *opaque, int ret)
} }
if (!ide_sect_range_ok(s, sector, count)) { if (!ide_sect_range_ok(s, sector, count)) {
iocb->is_invalid = true; iocb->ret = -EINVAL;
goto done; goto done;
} }
@ -502,7 +498,6 @@ BlockAIOCB *ide_issue_trim(
iocb->qiov = qiov; iocb->qiov = qiov;
iocb->i = -1; iocb->i = -1;
iocb->j = 0; iocb->j = 0;
iocb->is_invalid = false;
ide_issue_trim_cb(iocb, 0); ide_issue_trim_cb(iocb, 0);
return &iocb->common; return &iocb->common;
} }
@ -848,6 +843,12 @@ static void ide_dma_cb(void *opaque, int ret)
if (ret == -ECANCELED) { if (ret == -ECANCELED) {
return; return;
} }
if (ret == -EINVAL) {
ide_dma_error(s);
return;
}
if (ret < 0) { if (ret < 0) {
if (ide_handle_rw_error(s, -ret, ide_dma_cmd_to_retry(s->dma_cmd))) { if (ide_handle_rw_error(s, -ret, ide_dma_cmd_to_retry(s->dma_cmd))) {
s->bus->dma->aiocb = NULL; s->bus->dma->aiocb = NULL;