diff options
| author | Klaus Jensen <k.jensen@samsung.com> | 2020-03-30 22:22:38 +0200 |
|---|---|---|
| committer | Klaus Jensen <k.jensen@samsung.com> | 2020-09-02 08:48:50 +0200 |
| commit | 904248a53f3506fc41d30c6ef63d3ee7692d76d5 (patch) | |
| tree | 3067796f5019e5a7c7bfe6faafea729c5c2b05f5 | |
| parent | a80b2ce68251cf5b11c450173128f29223045b9c (diff) | |
| download | focaccia-qemu-904248a53f3506fc41d30c6ef63d3ee7692d76d5.tar.gz focaccia-qemu-904248a53f3506fc41d30c6ef63d3ee7692d76d5.zip | |
hw/block/nvme: replace dma_acct with blk_acct equivalent
The QSG isn't always initialized, so accounting could be wrong. Issue a call to blk_acct_start instead with the size taken from the QSG or IOV depending on the kind of I/O. Signed-off-by: Klaus Jensen <k.jensen@samsung.com> Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
| -rw-r--r-- | hw/block/nvme.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 3a9e25eb0e..81f26fecad 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -637,9 +637,10 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, return NVME_INVALID_FIELD | NVME_DNR; } - dma_acct_start(n->conf.blk, &req->acct, &req->qsg, acct); if (req->qsg.nsg > 0) { req->has_sg = true; + block_acct_start(blk_get_stats(n->conf.blk), &req->acct, req->qsg.size, + acct); req->aiocb = is_write ? dma_blk_write(n->conf.blk, &req->qsg, data_offset, BDRV_SECTOR_SIZE, nvme_rw_cb, req) : @@ -647,6 +648,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, nvme_rw_cb, req); } else { req->has_sg = false; + block_acct_start(blk_get_stats(n->conf.blk), &req->acct, req->iov.size, + acct); req->aiocb = is_write ? blk_aio_pwritev(n->conf.blk, data_offset, &req->iov, 0, nvme_rw_cb, req) : |