[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 37/44] nvme: Account for failed and invalid operation
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 37/44] nvme: Account for failed and invalid operations |
Date: |
Tue, 10 Nov 2015 14:14:32 +0000 |
From: Alberto Garcia <address@hidden>
Signed-off-by: Alberto Garcia <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/block/nvme.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 5da41b2..169e4fa 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -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);
--
2.5.0
- [Qemu-devel] [PULL 29/44] block: Add statistics for failed and invalid I/O operations, (continued)
- [Qemu-devel] [PULL 29/44] block: Add statistics for failed and invalid I/O operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 32/44] block: Add average I/O queue depth to BlockDeviceTimedStats, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 34/44] qemu-io: Account for failed, invalid and flush operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 31/44] block: Compute minimum, maximum and average I/O latencies, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 33/44] block: New option to define the intervals for collecting I/O statistics, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 35/44] block: Use QEMU_CLOCK_VIRTUAL for the accounting code in qtest mode, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 37/44] nvme: Account for failed and invalid operations,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 36/44] iotests: Add test for the block device statistics, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 39/44] xen_disk: Account for failed and invalid operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 38/44] virtio-blk: Account for failed and invalid operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 42/44] macio: Account for failed operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 44/44] block: Update copyright of the accounting code, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 40/44] atapi: Account for failed and invalid operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 43/44] scsi-disk: Account for failed operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 41/44] ide: Account for failed and invalid operations, Stefan Hajnoczi, 2015/11/10