[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 6/8] scsi: account unmap operations
From: |
Anton Nefedov |
Subject: |
[Qemu-block] [PATCH v3 6/8] scsi: account unmap operations |
Date: |
Wed, 13 Jun 2018 20:44:24 +0300 |
Signed-off-by: Anton Nefedov <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
hw/scsi/scsi-disk.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 0b68a8d..ed72662 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -1653,6 +1653,10 @@ static void scsi_unmap_complete_noio(UnmapCBData *data,
int ret)
goto done;
}
+ block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct,
+ r->sector_count * s->qdev.blocksize,
+ BLOCK_ACCT_UNMAP);
+
r->req.aiocb = blk_aio_pdiscard(s->qdev.conf.blk,
r->sector * s->qdev.blocksize,
r->sector_count * s->qdev.blocksize,
@@ -1679,10 +1683,11 @@ static void scsi_unmap_complete(void *opaque, int ret)
r->req.aiocb = NULL;
aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk));
- if (scsi_disk_req_check_error(r, ret, false)) {
+ if (scsi_disk_req_check_error(r, ret, true)) {
scsi_req_unref(&r->req);
g_free(data);
} else {
+ block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
scsi_unmap_complete_noio(data, ret);
}
aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
@@ -1729,10 +1734,12 @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r,
uint8_t *inbuf)
return;
invalid_param_len:
+ block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
return;
invalid_field:
+ block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP);
scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
}
--
2.7.4
- [Qemu-block] [PATCH v3 0/8] discard blockstats, Anton Nefedov, 2018/06/13
- [Qemu-block] [PATCH v3 3/8] ide: account UNMAP (TRIM) operations, Anton Nefedov, 2018/06/13
- [Qemu-block] [PATCH v3 4/8] scsi: store unmap offset and nb_sectors in request struct, Anton Nefedov, 2018/06/13
- [Qemu-block] [PATCH v3 2/8] qapi: add unmap to BlockDeviceStats, Anton Nefedov, 2018/06/13
- [Qemu-block] [PATCH v3 5/8] scsi: move unmap error checking to the complete callback, Anton Nefedov, 2018/06/13
- [Qemu-block] [PATCH v3 1/8] qapi: group BlockDeviceStats fields, Anton Nefedov, 2018/06/13
- [Qemu-block] [PATCH v3 7/8] file-posix: account discard operations, Anton Nefedov, 2018/06/13
- [Qemu-block] [PATCH v3 6/8] scsi: account unmap operations,
Anton Nefedov <=
- [Qemu-block] [PATCH v3 8/8] qapi: query-blockstat: add driver specific file-posix stats, Anton Nefedov, 2018/06/13
- Re: [Qemu-block] [Qemu-devel] [PATCH v3 0/8] discard blockstats, no-reply, 2018/06/13
- Re: [Qemu-block] [Qemu-devel] [PATCH v3 0/8] discard blockstats, no-reply, 2018/06/13