[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/17] hw/block/nvme: replace dma_acct with blk_acct equivalent
From: |
Klaus Jensen |
Subject: |
[PATCH 03/17] hw/block/nvme: replace dma_acct with blk_acct equivalent |
Date: |
Mon, 29 Jun 2020 21:50:03 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
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>
---
hw/block/nvme.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index aaf4651eab4c..54f31e7429c6 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -585,9 +585,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) :
@@ -595,6 +596,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) :
--
2.27.0
- [PATCH 00/17] hw/block/nvme: AIO and address mapping refactoring, Klaus Jensen, 2020/06/29
- [PATCH 01/17] hw/block/nvme: memset preallocated requests structures, Klaus Jensen, 2020/06/29
- [PATCH 04/17] hw/block/nvme: remove redundant has_sg member, Klaus Jensen, 2020/06/29
- [PATCH 02/17] hw/block/nvme: add mapping helpers, Klaus Jensen, 2020/06/29
- [PATCH 03/17] hw/block/nvme: replace dma_acct with blk_acct equivalent,
Klaus Jensen <=
- [PATCH 10/17] hw/block/nvme: add check for mdts, Klaus Jensen, 2020/06/29
- [PATCH 05/17] hw/block/nvme: refactor dma read/write, Klaus Jensen, 2020/06/29
- [PATCH 06/17] hw/block/nvme: pass request along for tracing, Klaus Jensen, 2020/06/29
- [PATCH 08/17] hw/block/nvme: verify validity of prp lists in the cmb, Klaus Jensen, 2020/06/29
- [PATCH 07/17] hw/block/nvme: add request mapping helper, Klaus Jensen, 2020/06/29
- [PATCH 09/17] hw/block/nvme: refactor request bounds checking, Klaus Jensen, 2020/06/29
- [PATCH 11/17] hw/block/nvme: be consistent about zeros vs zeroes, Klaus Jensen, 2020/06/29
- [PATCH 13/17] hw/block/nvme: consolidate qsg/iov clearing, Klaus Jensen, 2020/06/29
- [PATCH 16/17] hw/block/nvme: add nvme_check_rw helper, Klaus Jensen, 2020/06/29
- [PATCH 14/17] hw/block/nvme: remove NvmeCmd parameter, Klaus Jensen, 2020/06/29