From patchwork Tue Aug 21 09:46:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 960179 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="W6Z6mlhg"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vmBJ1NmVz9s78 for ; Tue, 21 Aug 2018 19:50:16 +1000 (AEST) Received: from localhost ([::1]:51980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs3Ij-0005mG-KV for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 05:50:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs3FR-0003qr-2e for qemu-devel@nongnu.org; Tue, 21 Aug 2018 05:46:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fs3FP-0007vF-24 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 05:46:48 -0400 Received: from mail-eopbgr40122.outbound.protection.outlook.com ([40.107.4.122]:7520 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fs3FO-0007oN-PM; Tue, 21 Aug 2018 05:46:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sCq2aFzlxgOzENqfBbPjGjb30pC+vJ8Ra3rkJ3Q9W/c=; b=W6Z6mlhgOsqBMV/NOY0aj1o2/b9Vc3iNtap4Du0nCGhj1XY6ISjqgQ6GxfWY/rmaRg5dofpveW8UghaNZ732dD39Mf4b7y4rGP9Zc1Dx7A0dNxRiwZ9GQRJTZlF50UF+I0J8HnFvVMrmTKZOLiDcn3p71vpqhUOJ51fxot7BNgU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (185.231.240.5) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.22; Tue, 21 Aug 2018 09:46:42 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 12:46:13 +0300 Message-Id: <1534844779-118784-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1534844779-118784-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1534844779-118784-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [185.231.240.5] X-ClientProxiedBy: HE1PR08CA0076.eurprd08.prod.outlook.com (2603:10a6:7:2a::47) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bca5607a-335c-4733-7695-08d6074b00e4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:d7C4GsLMZImJNqc5Gu9dHkhsRK2td8it++wBaPo4G57N9xAyKMmE6TZd+BR11DtVNZ8JCbAzZLBSh92BQJ9kBxaDwZB48ZZ9Io9rverYYH97v3ppq6eVJRxgocN0gf2hsp0OH73MbxymiOvxP5+w4BMvcaTqivtODsny+5+b66kflF4/nLNXgg0+dW4f9kJM+ix/FqI+vrIQxmMwTSkaKACg8K39pSQfbOruV3xBCbQ4n7AUYIHDgrrGcPA83T+3; 25:qtP32jTglW3adIDs80f10++rifNvA0rxoHY7eeHyrcaLtfg2az6WNZ7Rt4yZJOo9jzHoMPJLKRxIeDSvRUYcf4u4pSgoRAc+eVWk+SlIoVuOadhp3FIP9poSUULzOAq2FiblM9lE3lgfKXP5AGne3ekFB5y4eEk3STvyL3pDUjZYtQP1Abw1SFbUjhUNdoa87du4TSDtuW4SH5mEUQxBg8z1UQMWgEJ/Ii/8mPc8rBG78tsLKKfsB1GT5tKDwa6Mhn/1v/vw1HpeTj48XPY/YEswo8wqUpCltlYEjrt49hlKQkfXDm2k3ZN1B8K5IkdEZqWfHRyCjiy144cfXIvgog==; 31:eKYm7aAGu0MEp1R0pJ+eIKHCctCeN9Kd2F5ngsJ0+poXUfKdVeG//i1cbm/EwXcSQwLs8NCj6YbjWN1wiA1tR2rQ8ZsuRIjm+mWelMEiF5tE/CD0JwuUNeguyUchMOC5Vyc7CVM/VoEDqIcAnuJKcLc3/RMV+t9CSDUNAWRICl0y8gEcgJhsHqBoR2gw0q/LAPk79OKRNyvCn4W29TKMnyUZEecUWlG30fKVZvWAUCY= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:8DMDpX478a5wnEkyKGXhWWTCapkRXtOSMQpd+ULUeZ2A98u4qxLiTLoDLzQ0s+xDhxf/nnulp+91umHUZBngVx5tFeyHf/FWjYwBzB79nMxW6QIYJQdo0DssiSCTHUx840siw4x+7phM1WgXiQTieunmq8UYUe5UYbTvqDodwfld7Lc9tmfuCeCXPD+oJXSR5L8ibmYZLyGtRB+0GbeU1UjrtSX6pNkia+A2aY4LrhjEaoH48n6KzgnYkjBOnPMh3OD+hFAtKEEIjBPIIvE6Xp7yyzlQ/PmwJ02Mi4Zdq3cSd8HTisA7jh7m1+QgOrZ0Kdc5f40GWIEOyXEw1owL8tapvXcFBwqq0CfZVZAdnwvhpucd8TDXJryv24VimgqdGhwUsvkfYqNFY/JswBVLteXjbAuLGToR8RHQiDwsNS0PdGR8CnY/zVXLeOY0Op/gw9kE9fdORLjIdPUcT27DXolFyrm/WZMLyQtf0P7KCcnt9kNqqaeohxPySdoDtuKt; 4:G6O7B9Du87y0wUBYzDzarA2XLaiIj9DF7ttjMxI6x0aSJetAfmm0G+6k5oNQPSOoYvdkanBMLXcexcW9HVhamXuyAoeL8LjzdPhbxhs9pQoU5cfWmOYNcdDJMLHnhxNlafDSPYCxBm6vgcBViWeIr6knZT7uJ6cmGBMZiF3dnlbtfivfa26vofuadO1TdFeh0LHYTVG+iOeP1n7EhQn2Sx/Je7QNk+7ztB+Xy07WRPwsf36/x1hRX6njT31usGbN9bbgb1zGNXN+nFpURTMWhg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 0771670921 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39850400004)(136003)(396003)(376002)(366004)(346002)(199004)(189003)(36756003)(305945005)(53416004)(105586002)(51416003)(48376002)(50226002)(8936002)(6116002)(7736002)(956004)(3846002)(69596002)(50466002)(68736007)(186003)(106356001)(2616005)(16526019)(16586007)(47776003)(486006)(476003)(52116002)(446003)(66066001)(86362001)(14444005)(107886003)(76176011)(2351001)(4326008)(316002)(5660300001)(25786009)(53936002)(478600001)(2361001)(6506007)(386003)(2906002)(6916009)(6486002)(6512007)(81156014)(81166006)(97736004)(6666003)(11346002)(8676002)(26005)(7416002)(44832011); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:1gvOPJXjcHa/yLvmzfNVET+FNFH5sFVV9VIlFvZms?= xLeayEGCOpCe+6HznhkIT+oriCU4WmM4iGrYB5tTtOPxpa1q5VDjNLtIO+jEjQfQDXgVDLkvI+/m76mZz0TBjNqx2vnWmf35Oa7dkeyPxb/5QkQjLYUYdEXXsUvdMUyePkbxnZrFfQPW8h0illiw7qWUDTbKdDpqCi2Yjy5FTZ2oWsMqVzftq1Qwnufql3TuRGz4z169K8Oo33by98wDlQEVi6rOA2YKeD3+EZfiADRlbR8IU9HE05cMEfSOG+DMsNsjeJw2vCUZC34JnqWYMrVdCdibJ90kOPxpCX5VIQ8AXMwp3xzMBDOZCOSadzlbFCX0NdQjpxVxSGwUBO3I2JlTMDDHMWCnlPP+spNJy8DQuQH84GYAD9KHcFCe49eabCZVXmjCTEVYLxN2ZeBiVitskmKU6kPF4g0PA16kJ6cAWKQydQh9hgtwT63W11oGMJ6DdIq3RmZfNkzKqmahN+AkVB7rwHCExyeNx1jpe8y5crXNZ0s63QwifL6Ky2+VOxIi7D4u/aHLUNODXAGq6V5iH/1HhRC72VVCvgbOgApil3m86dFGZ3HfnrB9u6Oo7DmZFV+dZdXRI5qQvn8bnbAey3tPlytxIuPLE6lEF6hQ/N8cOxbjg+DILdvEX2kZ4FtLvf8Z+ACwp3OPZoUMqzYuzpyaZANlMLX6MOuMX64o9lxEim30mCO2yiHOYFQ5yPDoA71GkQw3in4K+cs+zi23XcDPIuHprvmvsI7sOlHExzLJuz8kU6QmGl7VDUGf2ZubKz8tj/LJiGio318lih1L7PUprkOyWwnugE1QxYpBeXs0VZUZ+4VzSG8abAwmjZWXijQiXaUGJIHVEN6q77fbHZOycqppePTIbwAW7yF+j98STFZXoCgKmO/+4aW4NWnHH2Q+x4hWEjQo8jP+8tc8k3oIp931gemu7gLV3d8SNnuhoxIB2+RTepzWqICpgUw3xGSRrRXoeYOhFCtu8xQtbHGLeT6ySuSy+jbWogbi6o+WGRIkMhAbB2mFJyRzPVz3JFXeUtL8joJi6G4/8FdeE3jgvTsr08B6DuPEpePx9Z/qDtGodE8EGEfiVaoQ0WafCW0L8bkdr4WbjOc4VsRK3vbUkRvXPRPDMNSdT3cQZ4PQiwLs1KbiuaouxCoMUORXg664eOVYiA63OCfjYz39vgeuSQpGKpkBGpwYXTijCq5aav0jI8mqx1sVHnZh8kH56fwsVXLn+PEW35RA5XWmbvqpix8Qh2x3eKGqHyBWtGg07les0/a81c2Btf6GvOuFZHAWh54IugPyP/dIebe X-Microsoft-Antispam-Message-Info: xsEhMh83/AkwXACvhbfjJPfm9TFgR9R9djSU8vZkxk5Us2tmPhBFBxwAAXmiBRDVAKeP6ElB4mbGyAs97KJnB8kC4zuh9CF0Rkwk7pWR30kiMyyEuNm+xsYzL02YprCqoxSTQHAXmobsM0pwPh9uG8QYBvij/Ut6IQc0ZPq/HMqQIkituv5VpJqEW0GvewG3d71pOCgJ901exVcpNDCCUyd4vTqBvgaXNPdRJb/XIU4yScKumPiECXSs+LXR40bZfAdQ4keDBQ/5DYQL9KPJ6SFwMyyl7EnWIdZwBsajMO3nJ5KuBmbH3JxvY60p7d/3hqmeEsQ+HONAV3WfOSpHSsEfo+s1iCaZg+UNkFt8c5Y= X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:B3oVca+wSBfiLE7u0vajBTPtvqoyZLmuTU8y3pWGGRSbPMUF8LLbwP0hViti19BhBACeta5JgcYx7KQPUhbK8Yv5AlsjgX/3udQI0loe167EPZMfWwQfTxjZrVcvg8IYu51X38WpOSQPn2Kib2AMRGcV9BqymidPcmA8u2iXrPQKAfsGZ+K4ZD/1T1TK0znL459KVLG+GCH4yeL5F5N8c2PdAJRRfTuhSun2pOBDcMkZtqsH/p6grix6oUXSMQaafVBZiYfRQTcXojLuNBndKwF2P6+VGz6SYIaSGyJ4HkcNst7XRIuhKLM8nRxRO0LBsdjVXdmnQG5phdmxHBMkAUt3W7nd18CFWLebZaEa+BOrpAxHM2t4gMUJpTcIng6mzSSV/AToG6N5wGIY+X0MpyvUn53gUc46Qp5l422SjrwjFE2KxGtUlBrxglgCAjutXV7VAiNETKM6Fx9/DOperw==; 5:YIqEo7oCc2sAJwTSb78tUTz2Osxi4IOp88A5P3QsLXAqp5+c9f4+pXBJ5lKTDtfT0paducAT9QM+BLnQoM7AzikrmriJX6/xYV+bGRL3o8AdKjIlLvTRMBghel8bNmDSiszZoE5SqqtsrnyWKrPZVV+fZyoA0v1edei13mptPvk=; 7:cw01gqbuMj1sPLVJxMOdTTBTzkTDAFFIbaKGB5v2LVaZagaC72assfd+AMXKzLcc7Senx1nLlBIt8tx5k/G+K/tnJzTyvVs+Hu7detVHoMur+USeppoE8LfiCd2JjRQAngFQULStRMobhgUDeX80EXiKpLKl0spO67xZh4v/llrHFT9I5Nu9htjskUvmqYwlVFwBh3B40wwvHLDs/ibF77/hP3g4L1vQvDyowIpm3reuiAzmNsIoDSYf9tG6J+B6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:nZua+CisQnIrzkd9Gncv8WhR2QdRa7K8Nm4wuAEe8gAN19tDWocI+HOLVJjAlz3tFUer/Nl8TACOr3yt2TWBsiXucDP+ZiWUqOb4vLAnig9pqvzTMmIe1VK1mlOvuePpxUtq7msMm9+utbcwzL07f64vNV7syVZ8xOthema/aOs= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2018 09:46:42.7480 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bca5607a-335c-4733-7695-08d6074b00e4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.4.122 Subject: [Qemu-devel] [PATCH v4 2/8] qapi: add unmap to BlockDeviceStats X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, Anton Nefedov , famz@redhat.com, den@virtuozzo.com, qemu-block@nongnu.org, armbru@redhat.com, mreitz@redhat.com, berto@igalia.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia Reviewed-by: Eric Blake --- qapi/block-core.json | 29 +++++++++++++++++++++++------ include/block/accounting.h | 1 + block/qapi.c | 6 ++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 44d992f..19d4743 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -777,6 +777,8 @@ # # @wr_bytes: The number of bytes written by the device. # +# @unmap_bytes: The number of bytes unmapped by the device (Since 3.1) +# # @rd_operations: The number of read operations performed by the device. # # @wr_operations: The number of write operations performed by the device. @@ -784,6 +786,9 @@ # @flush_operations: The number of cache flush operations performed by the # device (since 0.15.0) # +# @unmap_operations: The number of unmap operations performed by the device +# (Since 3.1) +# # @rd_total_time_ns: Total time spent on reads in nanoseconds (since 0.15.0). # # @wr_total_time_ns: Total time spent on writes in nanoseconds (since 0.15.0). @@ -791,6 +796,9 @@ # @flush_total_time_ns: Total time spent on cache flushes in nanoseconds # (since 0.15.0). # +# @unmap_total_time_ns: Total time spent on unmap operations in nanoseconds +# (Since 3.1) +# # @wr_highest_offset: The offset after the greatest byte written to the # device. The intended use of this information is for # growable sparse files (like qcow2) that are used on top @@ -802,6 +810,9 @@ # @wr_merged: Number of write requests that have been merged into another # request (Since 2.3). # +# @unmap_merged: Number of unmap requests that have been merged into another +# request (Since 3.1) +# # @idle_time_ns: Time since the last I/O operation, in # nanoseconds. If the field is absent it means that # there haven't been any operations yet (Since 2.5). @@ -815,6 +826,9 @@ # @failed_flush_operations: The number of failed flush operations # performed by the device (Since 2.5) # +# @failed_unmap_operations: The number of failed unmap operations performed +# by the device (Since 3.1) +# # @invalid_rd_operations: The number of invalid read operations # performed by the device (Since 2.5) # @@ -824,6 +838,9 @@ # @invalid_flush_operations: The number of invalid flush operations # performed by the device (Since 2.5) # +# @invalid_unmap_operations: The number of invalid unmap operations performed +# by the device (Since 3.1) +# # @account_invalid: Whether invalid operations are included in the # last access statistics (Since 2.5) # @@ -842,18 +859,18 @@ # Since: 0.14.0 ## { 'struct': 'BlockDeviceStats', - 'data': {'rd_bytes': 'int', 'wr_bytes': 'int', + 'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'unmap_bytes' : 'int', 'rd_operations': 'int', 'wr_operations': 'int', - 'flush_operations': 'int', + 'flush_operations': 'int', 'unmap_operations': 'int', 'rd_total_time_ns': 'int', 'wr_total_time_ns': 'int', - 'flush_total_time_ns': 'int', + 'flush_total_time_ns': 'int', 'unmap_total_time_ns': 'int', 'wr_highest_offset': 'int', - 'rd_merged': 'int', 'wr_merged': 'int', + 'rd_merged': 'int', 'wr_merged': 'int', 'unmap_merged': 'int', '*idle_time_ns': 'int', 'failed_rd_operations': 'int', 'failed_wr_operations': 'int', - 'failed_flush_operations': 'int', + 'failed_flush_operations': 'int', 'failed_unmap_operations': 'int', 'invalid_rd_operations': 'int', 'invalid_wr_operations': 'int', - 'invalid_flush_operations': 'int', + 'invalid_flush_operations': 'int', 'invalid_unmap_operations': 'int', 'account_invalid': 'bool', 'account_failed': 'bool', 'timed_stats': ['BlockDeviceTimedStats'], '*x_rd_latency_histogram': 'BlockLatencyHistogramInfo', diff --git a/include/block/accounting.h b/include/block/accounting.h index d1f67b1..ba8b04d 100644 --- a/include/block/accounting.h +++ b/include/block/accounting.h @@ -36,6 +36,7 @@ enum BlockAcctType { BLOCK_ACCT_READ, BLOCK_ACCT_WRITE, BLOCK_ACCT_FLUSH, + BLOCK_ACCT_UNMAP, BLOCK_MAX_IOTYPE, }; diff --git a/block/qapi.c b/block/qapi.c index c66f949..df31f35 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -432,24 +432,30 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) ds->rd_bytes = stats->nr_bytes[BLOCK_ACCT_READ]; ds->wr_bytes = stats->nr_bytes[BLOCK_ACCT_WRITE]; + ds->unmap_bytes = stats->nr_bytes[BLOCK_ACCT_UNMAP]; ds->rd_operations = stats->nr_ops[BLOCK_ACCT_READ]; ds->wr_operations = stats->nr_ops[BLOCK_ACCT_WRITE]; + ds->unmap_operations = stats->nr_ops[BLOCK_ACCT_UNMAP]; ds->failed_rd_operations = stats->failed_ops[BLOCK_ACCT_READ]; ds->failed_wr_operations = stats->failed_ops[BLOCK_ACCT_WRITE]; ds->failed_flush_operations = stats->failed_ops[BLOCK_ACCT_FLUSH]; + ds->failed_unmap_operations = stats->failed_ops[BLOCK_ACCT_UNMAP]; ds->invalid_rd_operations = stats->invalid_ops[BLOCK_ACCT_READ]; ds->invalid_wr_operations = stats->invalid_ops[BLOCK_ACCT_WRITE]; ds->invalid_flush_operations = stats->invalid_ops[BLOCK_ACCT_FLUSH]; + ds->invalid_unmap_operations = stats->invalid_ops[BLOCK_ACCT_UNMAP]; ds->rd_merged = stats->merged[BLOCK_ACCT_READ]; ds->wr_merged = stats->merged[BLOCK_ACCT_WRITE]; + ds->unmap_merged = stats->merged[BLOCK_ACCT_UNMAP]; ds->flush_operations = stats->nr_ops[BLOCK_ACCT_FLUSH]; ds->wr_total_time_ns = stats->total_time_ns[BLOCK_ACCT_WRITE]; ds->rd_total_time_ns = stats->total_time_ns[BLOCK_ACCT_READ]; ds->flush_total_time_ns = stats->total_time_ns[BLOCK_ACCT_FLUSH]; + ds->unmap_total_time_ns = stats->total_time_ns[BLOCK_ACCT_UNMAP]; ds->has_idle_time_ns = stats->last_access_time_ns > 0; if (ds->has_idle_time_ns) {