Commit 947858b0 authored by Anton Nefedov's avatar Anton Nefedov Committed by John Snow
Browse files

ide: abort TRIM operation for invalid range 



ATA8-ACS3, 7.9 DATA SET MANAGEMENT - 06h, DMA

    7.9.5 Error Outputs
    If the Trim bit is set to one and:
      a) the device detects an invalid LBA Range Entry; or
      b) count is greater than IDENTIFY DEVICE data word 105
         (see 7.16.7.55),
    then the device shall return command aborted.
    A device may trim one or more LBA Range Entries before it returns
    command aborted. See table 209.

This check is not in the common ide_dma_cb() as the range for TRIM
is harder to reach: it is not in LBA/count registers and the buffer has
to be parsed first.

Signed-off-by: default avatarAnton Nefedov <anton.nefedov@virtuozzo.com>
Message-id: 1512735034-35327-4-git-send-email-anton.nefedov@virtuozzo.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent d8b070fe

hw/ide/core.c

+13 −2
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ typedef struct TrimAIOCB { 
    QEMUIOVector *qiov;

    BlockAIOCB *aiocb;

    int i, j;

    bool is_invalid;

} TrimAIOCB;



static void trim_aio_cancel(BlockAIOCB *acb)
@@ -427,8 +428,11 @@ static void ide_trim_bh_cb(void *opaque) 
{

    TrimAIOCB *iocb = opaque;



    if (iocb->is_invalid) {

        ide_dma_error(iocb->s);

    } else {

        iocb->common.cb(iocb->common.opaque, iocb->ret);



    }

    qemu_bh_delete(iocb->bh);

    iocb->bh = NULL;

    qemu_aio_unref(iocb);
@@ -455,6 +459,11 @@ static void ide_issue_trim_cb(void *opaque, int ret) 
                    continue;

                }



                if (!ide_sect_range_ok(s, sector, count)) {

                    iocb->is_invalid = true;

                    goto done;

                }



                /* Got an entry! Submit and exit.  */

                iocb->aiocb = blk_aio_pdiscard(s->blk,

                                               sector << BDRV_SECTOR_BITS,
@@ -470,6 +479,7 @@ static void ide_issue_trim_cb(void *opaque, int ret) 
        iocb->ret = ret;

    }



done:

    iocb->aiocb = NULL;

    if (iocb->bh) {

        qemu_bh_schedule(iocb->bh);
@@ -490,6 +500,7 @@ BlockAIOCB *ide_issue_trim( 
    iocb->qiov = qiov;

    iocb->i = -1;

    iocb->j = 0;

    iocb->is_invalid = false;

    ide_issue_trim_cb(iocb, 0);

    return &iocb->common;

}