Commit 1753f3dc authored by Alberto Garcia's avatar Alberto Garcia Committed by Kevin Wolf
Browse files

nvme: Account for failed and invalid operations 



Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: 678dc67da229759d404b44f7cc2bf5ed8bf8ad14.1446044838.git.berto@igalia.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 4214face

hw/block/nvme.c

+8 −3
Original line number Diff line number Diff line
@@ -201,10 +201,11 @@ static void nvme_rw_cb(void *opaque, int ret) 
    NvmeCtrl *n = sq->ctrl;

    NvmeCQueue *cq = n->cq[sq->cqid];



    block_acct_done(blk_get_stats(n->conf.blk), &req->acct);

    if (!ret) {

        block_acct_done(blk_get_stats(n->conf.blk), &req->acct);

        req->status = NVME_SUCCESS;

    } else {

        block_acct_failed(blk_get_stats(n->conf.blk), &req->acct);

        req->status = NVME_INTERNAL_DEV_ERROR;

    }

    if (req->has_sg) {
@@ -238,18 +239,22 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, 
    uint64_t data_size = (uint64_t)nlb << data_shift;

    uint64_t aio_slba  = slba << (data_shift - BDRV_SECTOR_BITS);

    int is_write = rw->opcode == NVME_CMD_WRITE ? 1 : 0;

    enum BlockAcctType acct = is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_READ;



    if ((slba + nlb) > ns->id_ns.nsze) {

        block_acct_invalid(blk_get_stats(n->conf.blk), acct);

        return NVME_LBA_RANGE | NVME_DNR;

    }



    if (nvme_map_prp(&req->qsg, prp1, prp2, data_size, n)) {

        block_acct_invalid(blk_get_stats(n->conf.blk), acct);

        return NVME_INVALID_FIELD | NVME_DNR;

    }



    assert((nlb << data_shift) == req->qsg.size);



    req->has_sg = true;

    dma_acct_start(n->conf.blk, &req->acct, &req->qsg,

                   is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_READ);

    dma_acct_start(n->conf.blk, &req->acct, &req->qsg, acct);

    req->aiocb = is_write ?

        dma_blk_write(n->conf.blk, &req->qsg, aio_slba, nvme_rw_cb, req) :

        dma_blk_read(n->conf.blk, &req->qsg, aio_slba, nvme_rw_cb, req);