qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anton Nefedov <anton.nefedov@virtuozzo.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, kwolf@redhat.com, mreitz@redhat.com,
	armbru@redhat.com, jsnow@redhat.com, pbonzini@redhat.com,
	famz@redhat.com, eblake@redhat.com, den@virtuozzo.com,
	berto@igalia.com, Anton Nefedov <anton.nefedov@virtuozzo.com>
Subject: [Qemu-devel] [PATCH v4 3/8] ide: account UNMAP (TRIM) operations
Date: Tue, 21 Aug 2018 12:46:14 +0300	[thread overview]
Message-ID: <1534844779-118784-4-git-send-email-anton.nefedov@virtuozzo.com> (raw)
In-Reply-To: <1534844779-118784-1-git-send-email-anton.nefedov@virtuozzo.com>

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
 hw/ide/core.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 2c62efc..352429b 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -440,6 +440,14 @@ static void ide_issue_trim_cb(void *opaque, int ret)
     TrimAIOCB *iocb = opaque;
     IDEState *s = iocb->s;
 
+    if (iocb->i >= 0) {
+        if (ret >= 0) {
+            block_acct_done(blk_get_stats(s->blk), &s->acct);
+        } else {
+            block_acct_failed(blk_get_stats(s->blk), &s->acct);
+        }
+    }
+
     if (ret >= 0) {
         while (iocb->j < iocb->qiov->niov) {
             int j = iocb->j;
@@ -461,6 +469,9 @@ static void ide_issue_trim_cb(void *opaque, int ret)
                     goto done;
                 }
 
+                block_acct_start(blk_get_stats(s->blk), &s->acct,
+                                 count << BDRV_SECTOR_BITS, BLOCK_ACCT_UNMAP);
+
                 /* Got an entry! Submit and exit.  */
                 iocb->aiocb = blk_aio_pdiscard(s->blk,
                                                sector << BDRV_SECTOR_BITS,
@@ -845,6 +856,7 @@ static void ide_dma_cb(void *opaque, int ret)
     }
 
     if (ret == -EINVAL) {
+        block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_UNMAP);
         ide_dma_error(s);
         return;
     }
-- 
2.7.4

  parent reply	other threads:[~2018-08-21  9:46 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-21  9:46 [Qemu-devel] [PATCH v4 0/8] discard blockstats Anton Nefedov
2018-08-21  9:46 ` [Qemu-devel] [PATCH v4 1/8] qapi: group BlockDeviceStats fields Anton Nefedov
2018-08-21  9:46 ` [Qemu-devel] [PATCH v4 2/8] qapi: add unmap to BlockDeviceStats Anton Nefedov
2018-08-21  9:46 ` Anton Nefedov [this message]
2018-10-04 15:33   ` [Qemu-devel] [PATCH v4 3/8] ide: account UNMAP (TRIM) operations Kevin Wolf
2018-10-08 14:38     ` Anton Nefedov
2018-10-08 15:03       ` Kevin Wolf
2018-10-08 15:25         ` Anton Nefedov
2018-10-08 15:46           ` Kevin Wolf
2018-10-08 16:04             ` Anton Nefedov
2018-10-08 16:43               ` Kevin Wolf
2018-10-17 15:32                 ` Anton Nefedov
2018-08-21  9:46 ` [Qemu-devel] [PATCH v4 4/8] scsi: store unmap offset and nb_sectors in request struct Anton Nefedov
2018-08-21  9:46 ` [Qemu-devel] [PATCH v4 5/8] scsi: move unmap error checking to the complete callback Anton Nefedov
2018-08-21  9:46 ` [Qemu-devel] [PATCH v4 6/8] scsi: account unmap operations Anton Nefedov
2018-10-04 15:47   ` Kevin Wolf
2018-10-08 14:43     ` Anton Nefedov
2018-08-21  9:46 ` [Qemu-devel] [PATCH v4 7/8] file-posix: account discard operations Anton Nefedov
2018-10-04 15:52   ` Kevin Wolf
2018-10-08 13:47     ` Anton Nefedov
2018-08-21  9:46 ` [Qemu-devel] [PATCH v4 8/8] qapi: query-blockstat: add driver specific file-posix stats Anton Nefedov
     [not found] ` <6d0b2d5b-f0a4-b62c-3dc4-e8d92eeb76b2@virtuozzo.com>
2018-10-04 14:04   ` [Qemu-devel] [PATCH v4 0/8] discard blockstats Anton Nefedov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1534844779-118784-4-git-send-email-anton.nefedov@virtuozzo.com \
    --to=anton.nefedov@virtuozzo.com \
    --cc=armbru@redhat.com \
    --cc=berto@igalia.com \
    --cc=den@virtuozzo.com \
    --cc=eblake@redhat.com \
    --cc=famz@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).