From nobody Sat May 4 06:42:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511196983266512.4903139742709; Mon, 20 Nov 2017 08:56:23 -0800 (PST) Received: from localhost ([::1]:58264 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpMn-0007iv-D9 for importer@patchew.org; Mon, 20 Nov 2017 11:56:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpI3-0002f9-EF for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGpHz-0003pg-34 for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:23 -0500 Received: from mail-eopbgr20093.outbound.protection.outlook.com ([40.107.2.93]:54656 helo=EUR02-VE1-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 1eGpHy-0003oW-O3; Mon, 20 Nov 2017 11:51:19 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Mon, 20 Nov 2017 16:51:16 +0000 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; bh=n3C9QSiPR/zk8ctQfyfK30CSa20w8BCZGTbN7SShY78=; b=cYcxner02OuLoujGvHKYC1CdI7br9c1I1KehsNA+c8QUBm63Jgb9G2B0ZyOUZ1/uJlFO4E1zp/Lch/0Vx9R8mBJ+XMU9NgWL4ldqntxa6tO2HoTtDYffZWZ3FDJipPctxc6HUxXetGT+R2+63BMSkQXSpzJrNoCFgyJI5BtPOto= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 20 Nov 2017 19:50:58 +0300 Message-Id: <1511196664-85304-2-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0202CA0042.eurprd02.prod.outlook.com (2603:10a6:3:e4::28) To AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c5df26c-9284-426f-3b92-08d53036eaf3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:AM5PR0801MB1988; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 3:Ias/iIeBs6ePG9Ckm4p10XMZKPAN95Ul4/4rUGWENTfgcbusPwR/ar0+dzO2hUCosSGmolLk59Jp3cJxEjqXWfQDGsbpJzFn2Dn1WgYFIZPpdYriaZpHSRLz3gOIIvbL+KHh694lMW7QODiwctUOJgH8fup/lng/9t6Z2QH+LQyy+EoQkJowM6B8lxAy+WCxCTtAsB+t+KB8k+C08DgFa1H7KDsZMvfgix33OLX+9DQ7OQGD6MTCAMru2cndp/V3; 25:jfeOK9Q10txwPtg9zJJ5eARZt9xBnLil/z+PX0/p5IMoL8mSs7o3NRx/MIW9T/4B/QMUcTL6mpmRw4iRtdUK7Hy7nAYiRwMng2zP274oxxck5GhCdaec3HkF/qcDS1Sm30SapIu+3uXTNcnjhhS1nGomb8pMsJib7+DyEqisp6cv816fCmGNLMvtIBKjp2v+oJ5cF5FW4sXG7EhBk566ZPR47Kg0Ed1498AJ4y9KcMa/mPstJ+vmWbtWAdgC7WfIEPqUXmsZEbj1p/JlS7UznkgeW0rF5X1G/Ywh7Yw74nLgOWc76AelE1TxVLqiptKXr5iX0+PossigBST9D2/TNg==; 31:gWmndPfMe1qb8BAMubJ50Ymt0cgPRUoZqUE6GLGCAp7kgW9ZM+PIyI9Vcap/H4s7SojoiiAFRFpQN4FK2yML1BdAIYO75+cIDs1nm8+BE8VR9TzOG/R0liYUw1XlYsg+lEq6R9B4n7LzdRdUSWbNw88RDj8dFeOiw1Lu2RdcqA17RS4J7Bc2ZBNb/FbfU3AgHrHFE/42OVXrlfV6wvdQWwuxvJTcWmrZCaazcced73Y= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1988: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:IxhzbHCgLWbYjvxnyVl0zO4Q04jnG6NTk8j/gFejL1SCaoDHsEyPTfkY09pCQppSa5Qy/8yUMCkNC5mlkR5dxVekISHdNwcB+azf9M/+nXe+yx+S1ZEJKLe3hsIX8SMojFlYoYB3uIk+MlBaW9jMQvm/td+/0EK5FinQv8LRrjMHcwk/9GSYPx3q8zXOuDezjlfxq424HkdUi4U8OjmCPMFPGESjZaI9xOpmIwfW5L12N/THBVbkmUqWL8ugiRZXZzZ6lMFYopFXxgc5GIZD7TTgi589fAoS21+8sNqGcR+peapvWOU/7eSJ6A0bu/WhOzsWEhiRHMwzC8vxfmJvwYbPfnxdPIJqgYeNfnSMnXQGBIKB5GO4jJwKE8cEVLcwmANlnuZLJr0G6CoLDzkDADLoYY7BKP92h8djVkI6pYI=; 4:u8Xm+ZjAaoPaG8RdWUrPDBGVfYLoqWSLujDE/LN4emfgaJ1H/QhqS9frNwbEODZ6ZmG1YOo8Pupqw+P+ER4+bqef6CN5pWs9zkgmjBmo77BqkQ10PbAxvhqt0JEZanU0Eb4jdUSyp3u5Dqnor5POAB8pwWymbaK0W+WMFB0sKOhbldrvCC4/MsPWFDgYgUdK5VNNGq3Tlz353qTYttUfuDOO2p0oLg+YCTz6hisNqSQ1rajUBs2SL5kpKB66hxYs+PfCuGbbMDkL9xwccP05PA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(3231022)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM5PR0801MB1988; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5PR0801MB1988; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(376002)(346002)(189002)(199003)(6506006)(6486002)(25786009)(189998001)(6512007)(16586007)(86362001)(50226002)(478600001)(575784001)(316002)(68736007)(8936002)(69596002)(16526018)(50986999)(55236003)(76176999)(47776003)(5003940100001)(48376002)(50466002)(7736002)(305945005)(106356001)(101416001)(105586002)(66066001)(2906002)(3846002)(2950100002)(6666003)(53416004)(97736004)(5660300001)(107886003)(8676002)(81166006)(6116002)(33646002)(4326008)(81156014)(36756003)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1988; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1988; 23:uiNQFjX9ZQPHF83yo5v/NAdr4Cw0412F7HI0Gqa?= =?us-ascii?Q?K1WfSVwtg+mkQY7wGvYXcqSLq3YiHtaE88cx1JfCsCQjObajEVAV2KCpvzqH?= =?us-ascii?Q?MzNX/D/lBYIrV7qhiWhVHs03ZZrP6XrYiAVKARdxv/5LauWiNcKu0OX6icnm?= =?us-ascii?Q?fIEJQorkDm7652MjyNzSOLQSEhP/pyAREI4O2Li25MidG+ShuEU0p2H788KO?= =?us-ascii?Q?tWnkynl3mbYjU2SPX5znXNsk2Y/MTY4eMaaDec0/5g+Qxi4Buf3HMwjhwVmp?= =?us-ascii?Q?5KvCR50+mLF+8CRSlnRFzP8LzWweEpLrDmMS8UjTJzf7dF7Dbqx8/jIO/4Y7?= =?us-ascii?Q?6nHELNwf6df4fo1E6BM0R+2niBy+YsrSvmAFawLomcwYNHGX/0NuJvD+dnxs?= =?us-ascii?Q?WpywEcxQo0Seydgf9YUqNTOKW79ybXPVk2kougs+o/y+7+gw+SkJrZxyy0Zs?= =?us-ascii?Q?s3oOxMHkFcANtQvCIIufFOCLvwrK7YHnHksAnx4dIfDE+XFDBsMOTpXkHAsj?= =?us-ascii?Q?RhqvmhYgXj5rVHwU2vyPF7D3AOeIWYXBlAuQ0sREAvpGw1At7gZM+uVdTe99?= =?us-ascii?Q?RWOCwAE/Iqdo1mZNAb+WX5GXZIL6F506hemAEaNbOObY2rENuuk3W1SgZva4?= =?us-ascii?Q?Hy6T7w2RriXqKqY7HvKyFEgfn1U191wQiWUW2+lPcHHNdRmvgQ51XyZPPkqF?= =?us-ascii?Q?Y3UmWw0n9PgUVm+nNqgaVLUjXWRBn+4GBawP3Cuk3x0El9X2bEdeCyiO15Lt?= =?us-ascii?Q?EhIHfR7HXe0tUNaDGJti4aH9I01AFO2IgXHh5iHqOL5NgpeKzIcb+Hp2GZ/F?= =?us-ascii?Q?z/HXGvk5n910U29hSyPd56Jx5DNoabgkaE/WUw0p3G4Wg0wEjiok6P7HXWNG?= =?us-ascii?Q?gYeYDhRCoTtgozVZ7m348pvNQkNayBe6hBvAuZ/eJiLATWVvjbntdhGsHOEK?= =?us-ascii?Q?Bda0BH/e4nh69cnBVQLk1EE+MjkQO46z2/7Qz6aA+iunfp9a1E+Tf5l1IspQ?= =?us-ascii?Q?smoBkdoGKmsXfyxR5Qec3dKcWCRyRvINML9SG0UWULaMwQmz7IcQRwBdpoYR?= =?us-ascii?Q?ZfbKO/kfGe6DX7rYYq2UdxySmP7BRgy7zBMbDTQIgOyW+6m3i8hkybDmfdpQ?= =?us-ascii?Q?Fz3XX4Z/m50GWM9K8b415vGVPRcdWVxAAFezkYRZjelVYKk62A4EqPg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 6:ycEk/i9+zXuDIGFuamVsB7wkCEdgWUmJQOmzfRDcwSVdM24q9VeJ6aMPa9QBBC6X60MXHiGDV906BcJG7QeGrMRWEVAE94J5zhO4YMqvJ8FPlKqUyo1j66QF47daTlaRIrylNp/g7wm8MsKedUOKEZuDGw6CkY8ZJOM347/9ARsjFH1RZlwfJY9ff5Fx+u7D/810fY1Rs5bEOeCSEGxMfAxQdHy+mlElf/waLtuKfytw50biva/5QNap+CrPEba33A40LDJ/t6c7m20ts13GhO6Oq0B0aY5+ffY0ZRYPX32JHhqQ9gjBK7jfhN+gxhH8I6sMylgHNUUaSg3YWbHRMIUBnSbVprgbWCLWzCY9Ts0=; 5:PCQw4H1o/DOLQQjnvR+Jh+T9WuGpIXA7p0CAPjNAfN/j9y+jFcqz9TcXZwxHWmjq9TPf4nFT3JdTNxnCCTVS5dh1l9yiInMmn7ObrnHCOIQ+P8XMtrpxqs3PRVj/Irnqd3HE78ZHyc7vdeXElgDGOdSNmGeMha40u7jd8JHglBQ=; 24:jmNSA4I2Hs6gTUe/QMqjY3UM6CoKhjRo3OUcKz/PlbCgbEbGFjioxAn3eSptnBdKAzpF7V4buQlLaQtQmIQPGFxedm7VBvklnvaRX85i7LQ=; 7:M8JDDGdtLTc5Try0/QnAyq5l+1nhrw20eZU8hS2LoGHo5wdFo+VeesaDEnDKdGiMsGRssa3nYmUjteJB/vlBhxJKH9DIe3IbQtTM49fhIuK+KVuCdxeld9rDboj+FZEili1/LqnWkOE0FjZXzo3vwb2igpNrI5TkVV0GJwcqx/hVxIxZlHFscj78kwG6xBhgQhOP3QoelziYih0tOSLbmOOWwE7HwuFBUJLIAZhI9qNN6LS6ssxeMWv9bgpMD1Zn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:GAO6V6+0fTGgBDNKsCueTJIlWRL3VaXKYduV2O9FMtG7tq3YEkc1r8/tbN/bmJ7CtZDexZIbg9QIOFARBnADJCMNDGPCPDTsL5pEdyFJ3ljrXTfr9CEfnNEtZe6Vubu0Hfx497X/EGLnbymMU15HQtU1xhNuE61a2cgN6CJPXtg= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:51:16.3938 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6c5df26c-9284-426f-3b92-08d53036eaf3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1988 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.93 Subject: [Qemu-devel] [PATCH 1/7] 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 , den@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia --- qapi/block-core.json | 20 ++++++++++++++++++++ include/block/accounting.h | 1 + block/qapi.c | 6 ++++++ 3 files changed, 27 insertions(+) diff --git a/qapi/block-core.json b/qapi/block-core.json index 76bf50f..ba2705d 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -730,6 +730,23 @@ # @timed_stats: Statistics specific to the set of previously defined # intervals of time (Since 2.5) # +# @unmap_bytes: The number of bytes unmapped by the device (Since 2.12) +# +# @unmap_operations: The number of unmap operations performed by the device +# (Since 2.12) +# +# @unmap_total_time_ns: Total time spent on unmap operations in nano-secon= ds +# (Since 2.12) +# +# @unmap_merged: Number of unmap requests that have been merged into anoth= er +# request (Since 2.12) +# +# @failed_unmap_operations: The number of failed unmap operations performed +# by the device (Since 2.12) +# +# @invalid_unmap_operations: The number of invalid unmap operations perfor= med +# by the device (Since 2.12) +# # Since: 0.14.0 ## { 'struct': 'BlockDeviceStats', @@ -741,6 +758,9 @@ 'failed_rd_operations': 'int', 'failed_wr_operations': 'int', 'failed_flush_operations': 'int', 'invalid_rd_operations': 'int= ', 'invalid_wr_operations': 'int', 'invalid_flush_operations': 'in= t', + 'unmap_bytes' : 'int', 'unmap_operations': 'int', + 'unmap_total_time_ns': 'int', 'unmap_merged': 'int', + 'failed_unmap_operations': 'int', 'invalid_unmap_operations': '= int', 'account_invalid': 'bool', 'account_failed': 'bool', 'timed_stats': ['BlockDeviceTimedStats'] } } =20 diff --git a/include/block/accounting.h b/include/block/accounting.h index b833d26..4e53c4a 100644 --- a/include/block/accounting.h +++ b/include/block/accounting.h @@ -35,6 +35,7 @@ enum BlockAcctType { BLOCK_ACCT_READ, BLOCK_ACCT_WRITE, BLOCK_ACCT_FLUSH, + BLOCK_ACCT_UNMAP, BLOCK_MAX_IOTYPE, }; =20 diff --git a/block/qapi.c b/block/qapi.c index fc10f0a..6e110f2 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -396,24 +396,30 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds= , BlockBackend *blk) =20 ds->rd_bytes =3D stats->nr_bytes[BLOCK_ACCT_READ]; ds->wr_bytes =3D stats->nr_bytes[BLOCK_ACCT_WRITE]; + ds->unmap_bytes =3D stats->nr_bytes[BLOCK_ACCT_UNMAP]; ds->rd_operations =3D stats->nr_ops[BLOCK_ACCT_READ]; ds->wr_operations =3D stats->nr_ops[BLOCK_ACCT_WRITE]; + ds->unmap_operations =3D stats->nr_ops[BLOCK_ACCT_UNMAP]; =20 ds->failed_rd_operations =3D stats->failed_ops[BLOCK_ACCT_READ]; ds->failed_wr_operations =3D stats->failed_ops[BLOCK_ACCT_WRITE]; ds->failed_flush_operations =3D stats->failed_ops[BLOCK_ACCT_FLUSH]; + ds->failed_unmap_operations =3D stats->failed_ops[BLOCK_ACCT_UNMAP]; =20 ds->invalid_rd_operations =3D stats->invalid_ops[BLOCK_ACCT_READ]; ds->invalid_wr_operations =3D stats->invalid_ops[BLOCK_ACCT_WRITE]; ds->invalid_flush_operations =3D stats->invalid_ops[BLOCK_ACCT_FLUSH]; + ds->invalid_unmap_operations =3D stats->invalid_ops[BLOCK_ACCT_UNMAP]; =20 ds->rd_merged =3D stats->merged[BLOCK_ACCT_READ]; ds->wr_merged =3D stats->merged[BLOCK_ACCT_WRITE]; + ds->unmap_merged =3D stats->merged[BLOCK_ACCT_UNMAP]; ds->flush_operations =3D stats->nr_ops[BLOCK_ACCT_FLUSH]; ds->wr_total_time_ns =3D stats->total_time_ns[BLOCK_ACCT_WRITE]; ds->rd_total_time_ns =3D stats->total_time_ns[BLOCK_ACCT_READ]; ds->flush_total_time_ns =3D stats->total_time_ns[BLOCK_ACCT_FLUSH]; + ds->unmap_total_time_ns =3D stats->total_time_ns[BLOCK_ACCT_UNMAP]; =20 ds->has_idle_time_ns =3D stats->last_access_time_ns > 0; if (ds->has_idle_time_ns) { --=20 2.7.4 From nobody Sat May 4 06:42:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511196827931425.9050015237383; Mon, 20 Nov 2017 08:53:47 -0800 (PST) Received: from localhost ([::1]:58241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpKH-0004wi-Qo for importer@patchew.org; Mon, 20 Nov 2017 11:53:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpI3-0002f6-Dm for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGpHz-0003px-HX for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:23 -0500 Received: from mail-eopbgr20093.outbound.protection.outlook.com ([40.107.2.93]:54656 helo=EUR02-VE1-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 1eGpHz-0003oW-9y; Mon, 20 Nov 2017 11:51:19 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Mon, 20 Nov 2017 16:51:17 +0000 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; bh=yOaiDv5bevmymI1BCKCCg/P6l2u+X3rZhOd5GQCh8fQ=; b=XXJbGPwYR8q68ivscPdGk85y+0xr9fuB7WtOMNGQfrU08jSMsF4EOQ4WwOXcN25DBL1dqPxdb62zVQNvpxkmAu/47e39n28yVw5+U3j5oxYOwiV+m0bkr1eIeZ6U982q0/HDRxUyLM6Rc/hriEZTp7GpEaQzuZ4al+j1PrJLbqo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 20 Nov 2017 19:50:59 +0300 Message-Id: <1511196664-85304-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0202CA0042.eurprd02.prod.outlook.com (2603:10a6:3:e4::28) To AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb9f5e98-bc3e-4598-ab82-08d53036eb84 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:AM5PR0801MB1988; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 3:PEXHhn3ptoSsdwaKagBEBXBoQZj+tBFEkNOwJR5BjxXfB9+zZknLBzLKLBjga+J7itrQGIjafUxazsRKGaZbdoRB+AWvFBUR7PjaMeST4CaWq5Iv2WkRvPaKrkbT3ZTFX1/Td+j3Rhun31tPphGJ1tSWqarLHbHGwDcm7m3/IDch52z0YE2OqP7wEamj04LOylamXY2rVsmoVHh0qBqFzt6ktW7h25+cM1DGrh385msvvhRMcEwWPw01LuxUOeTL; 25:UFpvttjuJ4uNxN1lgU4+Q/IT2bfIAqc1HuK5awOsUpUnS4+eDv+C9ExCC0vV12VaA5Ci4pljMEyfHBzWZykA9hT/dfFBuF/aBo35Z3NUoEQXTJeqBTE9cZ7aKz1R1DEDS9qdZZr8uUkeAEpK1Dk6SOShFBQoLoW75a9p88wXpoeQk+DJ15Z7eKG0KxiGKRGhze7b5QwGTmQD5x47niFZSqdKlfL1FRlR2zNbYuVzo3sC8Tz1FvInXCNndlOdygmjEx5XNHN/I+uNpSYeKlGQkCw3ojajwuVTrdtCm2Mv475BjoVA9gKjMzrcefJ/HffENxNy0GpcMfecVM3yRMlVwg==; 31:CqoJjl8/nfLC3w1jEm5Wzj78oUYXPj+U5Ud9drD6wQldXdgNW9DGX/R58sfhLr89EGjoErp1RA83/a0u17zoFUvUmxUuh7mo2CmCjBj1x0zY5iJ5lM55ql1V3CXk359twHRxQGAo3gqyjfAENuxhC6Etr868pj+PM/RdT9raItoArxhEr9BWUiHPjgOQRaApFw6TsaLsQ7wjY9FXBd2ZGCeH9AOou1ivgtyHD8slpzI= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1988: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:igzvnrSKYVtqED+TNJ4kgLBAwQbLeW0VHyXhB2emhqTTSMCeeWRU8/B35LKzQQYWpRwDT5nqPSLHcMbC3bkCeThMsvHQvVtSdusi5+RnNuujPd+l9Mpc8dGGU6D8gYb8GF8kGg/O3XNjJv3RGmGf2hyjnM9lPbmWEhPNKLaojzLaaEyn7NKSFSpgnwerXq8wbuJn5LZhkwhuQeMcyd3sS0HU8GivHU0YZJIJoVYNmulot2VKtKF+O23B4e/SKxzBnq/h6T9AKKDa80Sor2LSVJ4Jq4/VGEFeQJtGyafY95vyUG9vsoUsYFyk2858DebUqbNF2fZ6eauNiyl8zsIhbe0sNVYXgamYYU59aGuKzstfVh/UO/SLu6ItJFSEGkcKRqbMKpA4T+UxPY3seHWO7A+j05szd4z2N3SRB0SrWaU=; 4:4KnZCZahLGtADV1RhlhbYJdl41PeiCz5YFEIDcC8NOpFgu4kJG7XzwW6R7BETOTrxrOqPigg4McSmnSoRSTlZr2fuCN4IMZHfyaRyKGT0ATd5+Einw4PPN+iczaXFuKUkVWVZOWlnUmIgWsiJf1iXrLUIbzJNG7sCgcBm2Z3agxoODHn/YTKkVwFtQNNE61Y0xfYGzJ4vlMEL+uukw7920Muq7Hde2n8rAY1AdvwUOrmTjTy7ulbIBCnkJ/ZE9qoEpoUPX67y72O03FiyJwPCA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(3231022)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM5PR0801MB1988; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5PR0801MB1988; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(376002)(346002)(189002)(199003)(6506006)(6486002)(25786009)(189998001)(6512007)(16586007)(86362001)(50226002)(478600001)(575784001)(316002)(68736007)(8936002)(69596002)(16526018)(50986999)(55236003)(76176999)(47776003)(5003940100001)(48376002)(50466002)(7736002)(305945005)(106356001)(101416001)(105586002)(66066001)(2906002)(3846002)(2950100002)(6666003)(53416004)(97736004)(5660300001)(107886003)(8676002)(81166006)(6116002)(33646002)(4326008)(81156014)(36756003)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1988; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1988; 23:umBdByuV1CXZ+fIoU1u1UuSfB3zwUD54XT+nRWL?= =?us-ascii?Q?3JeKmsoH1xkhLr0L5mxB+lGzyof0XL01nB5KgHfjIScB8bMQJBKtpDGlDwrL?= =?us-ascii?Q?O3t/Ew0mkuQEmauHaxTIq+BuzhotNQQD14FjdobK+JBMDf8RUwnrlBJJxGkn?= =?us-ascii?Q?3dnYW9PgLMc8xxnl3mib8S7jiHgk6IxBouGoM1PIno4BKWWr8rrITlzbaf88?= =?us-ascii?Q?y9wbMAwbI+GSE10ZlytUchO9htZa+0InvBSJb2CIHyTFnQQZv1Zcb1n3B9zI?= =?us-ascii?Q?qJt+07PeZOtQAXf5yZr2xx0Vu5JBCtdtiNBBUMpSSt89bbhoV0PN/tUzubRD?= =?us-ascii?Q?hR6qZ9R6E93yDaQlDvzIoa52JVR/DDHWv+faWI+u59VFFDcBEjPaRZ1WC/E2?= =?us-ascii?Q?9m1Bf+CxaY2QSXgatMLjjbWQ7dN+/7asWW9HIT83MPeGiLoOKGWWuOZlyCgn?= =?us-ascii?Q?jJb4a1AJr4bf/SP5zXNQ90Vq/hJE2NL03ORFt6DPJQn19Y9xt0U5bJk0/jlV?= =?us-ascii?Q?DWboFDMTJNwjzvUUFWJWv8hZtonF8jZJlh4CTy1ZEBgyKqPqzYx0Mme2EkFi?= =?us-ascii?Q?IfwRLitXPh0v9bP9lEQAjYjCQwdZx2nvWJmmsRhEAMY/oNxVL0MKhNERnLe7?= =?us-ascii?Q?GErv+xcuMatx9hKUQUZuVb47vfoYFs64qfIe7lHUWxV7F543G3ZA7uD2qOhD?= =?us-ascii?Q?kAKU7ywIlfrdlfAM3zu8uzYphW1RqMRNgDJLV1U4EnLoz1f6KiOeOgxAJXqO?= =?us-ascii?Q?zCvhb1LLNxnn2azbXsm9+49wvV5YbUbYHmS4th9y+KDWyJgmdyPCrXGbL4Ax?= =?us-ascii?Q?drQNvzpT9XeLpnlrTswiKFh6oupm1xVMkxaI94uyF0u6YOVpV+f7c9bsoIL+?= =?us-ascii?Q?76dKajGUo56bp3TzUQxZpNA28PrPWrwQCZLe28cxa/wRuTXiFhb3rzKb3/Q+?= =?us-ascii?Q?pBYVORmKgltDSyc5ttDeC0bJ3ViR1Fh62Fp1gmuh3hFZa0EVEhuFA0bT4Q+t?= =?us-ascii?Q?YheGGmhGCVHycPxTcqGpZSA04Wpu5szsvfosWjI4Eso6+bkGS00Py5ekcVa0?= =?us-ascii?Q?IU2VNQKUGi+6d/9Dp/qjVo7XowFbXBl0LYqIZTSz21w7bYF59qqAI+UNNKvA?= =?us-ascii?Q?YwJN+5dbrjjZvtH/B9fSdca3GmhkAjfZm+mNtVF9uxUYEdo7TFpRdnw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 6:eBtMmmpZvBpIFhyTVol6KLRmnPRHtCMe5ffS+a13xOpKBDbvIP6bsF6dAuKWD9WRIXVZqHPQ/qEyP/f5yFBycGaaoRNhP4JdtoWPdxrT7uQMHOjUxZpTf3/h5p1bAu/IdMVubi9Y6+qfRCAJ+IuQYfUC7/cqP4PalQSnOjjoXiw6u0sKwBC5mVgezg1aILFxdz+5hGPhuru/MeaXz5Kv8SP/sN7LRM4ZF6HAFVwzBd+CqzalheSBAWNJgQZuvpbTqkhTDwamv5v8pHot/no4twD1ElVtoTaKFJtO7B+twFYch2MMWFh5XHIkyAjlJ16xxxEa3LmYAfdka3lUmM5GZUo/RNhWhlYR0ww9lsuZ9wI=; 5:DmUWR44t9AzqSXjgjBp5rANOVAz/OMxWBnoGs0xTIqCjxBM2HlrdNcGYkt67wgouvu8ZAOEQXUGwRKgt/6A0pphMvcRiFYdGf+i9nGVqr1H3K5KH5V/a6egJMHfbdR88NbqSLkrynaaB5fX8NWfVzWOICf+WBBlpr6izlXm8bh4=; 24:cXDtHGWUPeubn+P7XVY6GG+plBnSbxoQQCGPWtFK3rxmYmvhPK60fH0KtxCjMg30I/yEemZKlQf63LINugTZlF8iPthQ0aY46Odt5H6qaE8=; 7:Red7fvqEMEcHPZKShceLagRWcEB0I/cflOFsEtMjRmMIl/68AV7Ma+D4JjsJ31h4q2CHkYkCYts0nFjuUg2Kez4l7vF2y78pynq4hpNlDDmclqBOuKDTOpQumXuGrQBXn3qw7g6yjW7NHMEAnCZ/Za6IWGbp34bK9JstrStDf0tSdH+Hp7fpiJrmoO0SC+yvpv5loVY7RD6vjl0GBmrED3OKguCup0Fo6ni1sBsfVaaPq4aorT06eiY2sFudGLGg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:u0W+/7QyYZBbbmW5BLSbEYNsxnFfVfYTNCm7cfHA5qVGVihj/42eUbVEW2kNfoIuRS2aYp/PbyRDcAfrvj4VSyoNlvWeOSI3YCVsDD1vXHyFvrSV6312mEPqTJMyqSwBzU3eLJ296wh4J+D8MXHIKGrNmrN1JzMrl4xu3idHt2o= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:51:17.3625 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb9f5e98-bc3e-4598-ab82-08d53036eb84 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1988 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.93 Subject: [Qemu-devel] [PATCH 2/7] ide: account UNMAP (TRIM) operations 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 , den@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/ide/core.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hw/ide/core.c b/hw/ide/core.c index 471d0c9..2e4dea7 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -389,6 +389,7 @@ typedef struct TrimAIOCB { QEMUIOVector *qiov; BlockAIOCB *aiocb; int i, j; + BlockAcctCookie acct; } TrimAIOCB; =20 static void trim_aio_cancel(BlockAIOCB *acb) @@ -426,6 +427,14 @@ static void ide_trim_bh_cb(void *opaque) static void ide_issue_trim_cb(void *opaque, int ret) { TrimAIOCB *iocb =3D opaque; + if (iocb->i >=3D 0) { + if (ret >=3D 0) { + block_acct_done(blk_get_stats(iocb->blk), &iocb->acct); + } else { + block_acct_failed(blk_get_stats(iocb->blk), &iocb->acct); + } + } + if (ret >=3D 0) { while (iocb->j < iocb->qiov->niov) { int j =3D iocb->j; @@ -442,6 +451,9 @@ static void ide_issue_trim_cb(void *opaque, int ret) continue; } =20 + block_acct_start(blk_get_stats(iocb->blk), &iocb->acct, + count << BDRV_SECTOR_BITS, BLOCK_ACCT_UNM= AP); + /* Got an entry! Submit and exit. */ iocb->aiocb =3D blk_aio_pdiscard(iocb->blk, sector << BDRV_SECTOR_BITS, --=20 2.7.4 From nobody Sat May 4 06:42:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511197118678895.3049648103067; Mon, 20 Nov 2017 08:58:38 -0800 (PST) Received: from localhost ([::1]:58289 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpOo-0001EK-PK for importer@patchew.org; Mon, 20 Nov 2017 11:58:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpI5-0002gl-UG for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGpI1-0003qT-Da for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:26 -0500 Received: from mail-eopbgr20123.outbound.protection.outlook.com ([40.107.2.123]:50533 helo=EUR02-VE1-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 1eGpI1-0003qB-1t; Mon, 20 Nov 2017 11:51:21 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Mon, 20 Nov 2017 16:51:18 +0000 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; bh=6aBeib1e8HDd3HFvtF/+XW70A1mwvg56qRQ9ZyI5WmU=; b=InFBo08UHApkR1rNOUKQTgXHQoaez+WE/HvCbCd+BoVd3I2mVLfogW1cT18Cj4zxbnnltf1msJ11p394LBXOZSj1aRGDlLuo5dmt/6TjBOa9WJ8LNiyMTdoi7J72iqT0149wXrbBrPB1ptAZq8nFF4geMwgDGNIrw7NuYWjnWj0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 20 Nov 2017 19:51:00 +0300 Message-Id: <1511196664-85304-4-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0202CA0042.eurprd02.prod.outlook.com (2603:10a6:3:e4::28) To AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1a72a0c1-c03c-4b09-7dce-08d53036ec18 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:AM5PR0801MB1988; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 3:zZtUZw8pnhsZEqF6ZCr2kb82dlbflkdwx7BeNNX5qgYDkNFBT+jVvaiKxmnDV8vp1UCP+ItGpkLUmGpR/8vIUlbGvq0ZdGmCJWm9ZEZ2cW2nFmGvqJtErtWRGQiWj2EyOW2H0FEpBCCLdzKKa5d1+h60rNNAoTpwqjopEENTKzEl5SnArqKG+8IwfpmulPluNzjA+iNra4phQtg4BjDmB7V+9vdaN7AxVke4W9cYW3NqtRgEQqKRhEzPFEf0qDDr; 25:v8UudVn6terRH2AqzEJN3sncm07vtIbLfqCovWyn6VEvwJgwPYoE5fWG+lXx0wJOJD9WxXLYuO6T9w2sbKi3HayHkCwvLCvFge/EUV1/9b/0KJRcLYF1OlkMxr8OjBoPrm088CupFY49v63XKbmL9YntAQyW8+0bCgfcvY9lC4kNapW84tjkWY1tyMbxtVdhSvAkZGA7fPOofDz77hPOJ0adpP5yZSF9Z60EZRS3d4+qcQ9yYmG07qFep+Pn2xNpu4rgwSKOZW8cF1vt790HFqnlFV0qbdHXJrq5JwmB6o+fVluHU0QZ5hTJ4XjbWSl4Pse+MMbv5T1lFQUswZE9sw==; 31:dW77g4qCv7g6I8VEAvxl5D0L+8j9jeIIQp+SQ2y/xq5fgs3LljCVvs6GrIkdB+v5cpGYs8bx9fWiikSGu4J15lJKGT3OfFJ0CvxgVahdZ/hRJT+Px5S9ediK32U2SlKUDkWoLXBtEcTM5TrHhSvPbUR6SavHIIOmWwCme3q+xzG/Xyno4boEVXUr3G1omo31XMnrFNAimDmTSItzyPGBXMZcdFAW/nSefvLbW5pk/KA= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1988: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:NzrBCD8WbN9YmcOeoQDG2vsYRGALedvh0MB0F7cxIGcbqTpXEtLBMf6zY1wtjdLcvFYHETBLR6lIuWUGZn1LPeFHvdNrILMS34XlO4EO/TxtJXt+iQkbP2lTHCcpO5t3m7bUWQazY/ScIlGDjhSVw4KCdApH5xNLEl2AqP1+YsxwW61br+aswavgRzkRENFTxy6Vmg8Rzbi0EI10Vmev0LeeggQjVKkAileHjH1V+L9QqZdUCo176gyPhnwBwmyqXliQcDQx8cSvWDivvbjkD35CNb4wZoFvNE6GEGczKgLkL6GHTuk0Ax0Syuh3+UwIMKlNapD4z65eihO67U4whB0/bkDFzdW4xzDPmCTbTaw1uKwoa6XMYkngNvTuGeqz3uTnm9vOkUY2Gm3OGW0bFApLj8sxQqemNKfmOLXM084=; 4:KboiKv/vA2njOHj2ABtcT8sJoj1YCqmOSc85k0Do2rO4hnBDEuHCZFISa5dUkuOQ0q7dGWdbsMn1JCJIPNsDOqzKv0WLQ3kLdMz3NI9TIAr10L1C8mizbHrbfMjszDWSz6L6gUvSRo/zVffGmfx3upBD4v6mWsm54BalDAPQBjHssLYcMtuc4r2/PrA0LXR+Kzh/5xyiGZiEn0vOOs/UuYgLDf1qdgMhjeQjzTKq/MW6qi+Iryg6wHcDiF3fogWdI2Djiqs9lVP/yQCkSXT0Pw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(3231022)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM5PR0801MB1988; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5PR0801MB1988; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(376002)(346002)(189002)(199003)(6506006)(6486002)(25786009)(189998001)(6512007)(16586007)(86362001)(50226002)(478600001)(316002)(68736007)(8936002)(69596002)(16526018)(50986999)(55236003)(76176999)(47776003)(5003940100001)(48376002)(50466002)(7736002)(305945005)(106356001)(101416001)(105586002)(66066001)(2906002)(3846002)(2950100002)(6666003)(53416004)(97736004)(5660300001)(107886003)(8676002)(81166006)(6116002)(33646002)(4326008)(81156014)(36756003)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1988; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1988; 23:Y/gd6s28cS3++vHf3hkQ8o6pqL3btAmTdOKNTrH?= =?us-ascii?Q?2WOubspAk8yQkWWR9Gd94AzWHy8nYbkIJowIKOEGi5Gh95GsoGFo0PIko6fO?= =?us-ascii?Q?y7D4l/By+6k4RimTkUlnZDw8nloc59tn5/Vo1FbpwbaziaXcC5bOQ41b4wz/?= =?us-ascii?Q?Qpu9BbebYqMAgO6mZ2iEQtKukP6GX0OCDDX6l00tIMnG5K1bBcgSsh4hOMwf?= =?us-ascii?Q?jFYpVWARz1SDu7muAR89GoiKeWtKvbHNCZ7MPimKSEZruSyXKuS1kGP+ffzS?= =?us-ascii?Q?ZWuienqRRYffHZtXO0LyCC61flk1hex6yhO4y5el/eAYKXr89dFrRZhah8l8?= =?us-ascii?Q?9J0QKjcdU1ek3v7Qfd8bGYMsMVundPnBnCValogKWmCI+1kXDJR1d9xDavyB?= =?us-ascii?Q?ghaQeTUwwnbbzIh/1ZjS0/cGzPg0n4nJY6Oawo5DlTE4QzAkmZZnduCAmvdp?= =?us-ascii?Q?KS1LvThwgVwuzQvokFJ63AqQqAOUeWwLVWbbC1te3MzhqD0ku2vwo4KVZrC+?= =?us-ascii?Q?0Evu6d+MFR7CWUV+356zL9S+OrM5UncKKOM36ewxMRRsExa4BdN1eQVqPjMC?= =?us-ascii?Q?BykgJGbUyLfa7gxfceg3w40fQSz6J948kMTkQYwPHNEByooy/Fcvd/aB4T/A?= =?us-ascii?Q?4gZQd9jRBnnaqNpjv2l4GMAJQf1rifOyIWE+N4LFTtalFm9Ln/RDeIDt1AMp?= =?us-ascii?Q?HDNjrAWKL5fsDoix3onRJTCkG1oVt6rpIXTjjwr8fNoCx56jlLYU/m7TJK2B?= =?us-ascii?Q?JklFCQObuziGN6ymAJdcr6hIcSlTvpj/rlu9P6zDjWitJjL4tu+hLJ4hvg7u?= =?us-ascii?Q?4c0+SNhEdBB6RehOyqR+STVQ10jRJ/KZ8XeR1zOsD3NFH/T+ot9T3Y94RnVB?= =?us-ascii?Q?wq5PZnrSRtkbJm1mS/Gqo+ssmxYG7bxciWLMKBD8/OCYliEC5GT7K8/zy6lX?= =?us-ascii?Q?AmLgoPK+YbDPo91hsHAB9Pi2h3jDnpxTnu4YmkmxTCbf0quuOs02XPuSVG22?= =?us-ascii?Q?Jgxx1gCW2U/4GQuL+XzAQWyAQbY3nMBA1YSDQGMvhis9Esdxa4vDX4JUJNTH?= =?us-ascii?Q?Vp8CefIMr3zxJ7+Pd9PZugnuBRKbYEzA58jT6pL9gK4Rf73LuVAb2jxAZiVX?= =?us-ascii?Q?IWpZRTSQOVxY=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 6:StoxgmVf0m5N7T6qaEuyecsdqFCsKTGC8et+nRfPEIoohzuB57MWkPf/dmZRiBqv5iNs9uazs6j0BUFgh39K4AGq36ZU2Kizz/pg6QXNsDWrTO5gFLuKNgQthTRAZiGKLYvC2WHoZdTIxtIKMYbOwFc/yGrCfj9cLWJ9zLNJKBGnCBIRDisP7Hb3guG7Y8yNtJyaAOd8k1tRNKlXAyFupyh89U8D9vPkArJ9q3VQjTRRPCAv54MgBjlTMlR1FcEGc1Hv1vW9KA88ix/AuXYV1bywTBlA9TZp1TNO43Al3K572wz1k2uHPwlwrx5a3D3M5XttatCagReZJx3GqfHMHsAi5yPBr2etgBICnxTpAY4=; 5:O1VqIZlABr5jtQHLeOjT3sCCB9OHzdh03uURRpXEoqJoYimmpoG3MfJSnGZjuTUcIRqWgjLbUVDgrH5up9sXSkEdlWb9SUqDoPEapFBX5VPX9aF7u6enkvEARGifzpGH+RuboCwQt2g+bm8tOBHbZVWizwu3YPOPtRk4fURnt9g=; 24:FH5bUaRIOm10P6XhUvTTzzafLmpdl5ApVz9WCDIbGQHF4xTwTV4dzBw5m2woWwbV3f5orCjhDfKlLocRqZimHYZX37RWnGQaKtYnbq2r69U=; 7:LloBxKvETsaStLIKNC5qp1KrU0bC7DRQnwxFI+b0iSTcOPkITeX5JSphZ8vRNDCggV6tDwhqgB5eV1IxYmUX1cYIfM+nqI1L8Dl1kH0Uc4+Yd9svESORwc26ikvywpFMt0UEYaDigyDdh/2tVjVIimEzWERTr86cVKjqj3hD56UhGBfhI5QSXcM2QbSbz0qNDQ+HqCju06qgWeGIw4FKz+DvHNdYRD3YLAcx2tBoERELKUtGDKGk13XBRrmq6qf2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:wvQmaLG3BDlCtt3Q5TdxFGue83SPHWlpcBpvJuDI3eTVTuHeYlEuTVsV5SIW3pqFGxBokBgerAgGAAMQU3Ffc+QJkxErA03DeZrxNHKw6pwDe66XIgGgXB3+xTj7tXox2FA8qp1SwuyG+9ZlJkB2mBzWLvzRaZuVgFcJaj/fQ88= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:51:18.3157 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a72a0c1-c03c-4b09-7dce-08d53036ec18 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1988 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.123 Subject: [Qemu-devel] [PATCH 3/7] scsi: store unmap offset and nb_sectors in request struct 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 , den@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" it allows to report it in the error handler Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia --- hw/scsi/scsi-disk.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 1243117..3882052 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1625,8 +1625,6 @@ static void scsi_unmap_complete_noio(UnmapCBData *dat= a, int ret) { SCSIDiskReq *r =3D data->r; SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - uint64_t sector_num; - uint32_t nb_sectors; =20 assert(r->req.aiocb =3D=3D NULL); if (scsi_disk_req_check_error(r, ret, false)) { @@ -1634,16 +1632,16 @@ static void scsi_unmap_complete_noio(UnmapCBData *d= ata, int ret) } =20 if (data->count > 0) { - sector_num =3D ldq_be_p(&data->inbuf[0]); - nb_sectors =3D ldl_be_p(&data->inbuf[8]) & 0xffffffffULL; - if (!check_lba_range(s, sector_num, nb_sectors)) { + r->sector =3D ldq_be_p(&data->inbuf[0]); + r->sector_count =3D ldl_be_p(&data->inbuf[8]) & 0xffffffffULL; + if (!check_lba_range(s, r->sector, r->sector_count)) { scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE)); goto done; } =20 r->req.aiocb =3D blk_aio_pdiscard(s->qdev.conf.blk, - sector_num * s->qdev.blocksize, - nb_sectors * s->qdev.blocksize, + r->sector * s->qdev.blocksize, + r->sector_count * s->qdev.blocksiz= e, scsi_unmap_complete, data); data->count--; data->inbuf +=3D 16; --=20 2.7.4 From nobody Sat May 4 06:42:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511197007528252.75231727922255; Mon, 20 Nov 2017 08:56:47 -0800 (PST) Received: from localhost ([::1]:58266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpMy-0007qh-4t for importer@patchew.org; Mon, 20 Nov 2017 11:56:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpI6-0002h0-7t for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGpI1-0003qb-S9 for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:26 -0500 Received: from mail-eopbgr20123.outbound.protection.outlook.com ([40.107.2.123]:50533 helo=EUR02-VE1-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 1eGpI1-0003qB-K2; Mon, 20 Nov 2017 11:51:21 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Mon, 20 Nov 2017 16:51:19 +0000 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; bh=PNyBDxRyfIWURA89ji/z4Fh2TNLG2MKvpCMAOW7AqZo=; b=fxbTvK0Uzg+xt4wh/OPDvuFRfLZcQIjIUO1JFVj8fok7LdesM54eSdxU/+IKDUlkFpr+5/vrzUVFHEqyaoG2tB/u5P06WMVSGk07xKEjR9PQO/2TsiDKhljpLH9g0pRh6MRW9EPNBn7E8TAnz8th7UI8sPugwLF9bZuW7pEUK/4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 20 Nov 2017 19:51:01 +0300 Message-Id: <1511196664-85304-5-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0202CA0042.eurprd02.prod.outlook.com (2603:10a6:3:e4::28) To AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39a3c481-8d0a-4627-edc7-08d53036eca9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:AM5PR0801MB1988; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 3:3d/+AWlv6qNa/q9Xxj6w9Ho066OpIw2UvQjYjrhacggNVEuXMVppojx1ihbCOPBsPfdKrdb0f3QLsIHMEJfR6BOMCAvCf5h4Zj7Fn5dEc3t90mbH/q026iiQa5GdtmxaCRKr4F9U8NkkKFsHL+Sqz7xbvj1f4j98rL2uwcDUAi/6IVP3k+BJvPXTDtYb+WGA+HxA5QWgjTQX9S8K4Jy/u0rUYz/2mRQK2bkmJ8Kjy/sBwVnnlUS+nUlVVaBi10Ep; 25:/zCBfO7jGSW3uTsc9QgwSzPbfiY5TjPlQoiv/FPkZKDBCfCLYW3BaiXxU7mZ/Fjpq81pVxHKcErDij6CfOfBTP3LaQ5ED5XHL/WC+eZczs32AcwvuG2sJ+nxmju4KbIUgQVAW1JaOGq3vqKGoZO6V1oM+FrvOjeObFjEYep4rS35/7zFw+pPv+7I//mI7HPI1LNOIdQMXUEG1Bra9rraVBsba5ITX+Ui0GzdzPiBjbSnjMsJdFbtYpyPoMSjD/B5TDQEsskDqDUIS/Og68l2gdwaSBDB98yoMVyTbq3elSTnXlXIv0DcrRx/ATuySN89BDYojYKus5n78x2woNbkiA==; 31:AzGg0So3hbsWg3HPRwx40KolXQrt1RXPT0rbPHKRgHGdUUhRvu7FVZ8dIdDiD3QAG9ereuzMCKqrDxQNiYlARVMupdBWEGajUb3s/QtO7XduB7LSjbRirIpyw5AzSeZ27spCxeJ6jezu/kV153T1rUJJF58WhauYb6nkH/N1gulckFfiVJg7V2Q1mAfUTe0fgY7m/FRmGJoBWwmT+JfXKioduAxbTH+2E1+pS9JPEdI= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1988: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:3UARo2scmpVgiB2cRqgwlVISgOqphezuvYngCBs6yoCHujCVQMQcxJ7VsN/GHqO1jwYA9yVv692E/pCcAIxD/S6N/FBj00oYpVcxiLNF0+2Lsf9bx1R38eOFVZjR+sHzhhsSZUMWLcziP8JdMRL49/cDw4CB8n9bDTfkMVzmdwYccoXR3MT56sOgk8F7OBuaBwMlojHsRFTqcXRF38YNN8QsU6Hpb9tY48v5QTZ1xQd1XVvSC2E3U+TYRkAmkbBhR3hukoXeZQFItTeNL1mxxto40P+zi1Opm0dIpky1NRtOZ36AfuIa9KSFKgJDbZKFbJ4EHWihD336DbYTEw70HdtsCuntN2aW+RR7iIUR+brK5RKvwCVxBDY1saXc7F3pp7j10iIEzYTqEXWmmiNbVUF6JkUwSGa6Cvh37vWkpnM=; 4:x9X0geacMDw3sp/rBiIsQQNP+8v7bc+Z1CrgRlXUj83MUql1MhLDus5i5MZoD6qNi+HTzLnu0Wm/wg7VbNQZoN6qJSiqzqCd34CiDsHo8sHRXRDlKq5HYbyWzrW7pybehn/a3Sct/r10kYw7Ys55SiljAn29BD5Z3MExVDzi9s0co8r8yut7mwFIq3ueVEmmoGz9JCoB70XClboBmXGzkF+59md10qoiG5ws150oBUVjd5YCd7TR94bQeEKJuMwr7Bn+RBb/W/An+5c1FMkkAQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(3231022)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM5PR0801MB1988; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5PR0801MB1988; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(6009001)(376002)(346002)(189002)(199003)(6506006)(6486002)(25786009)(189998001)(6512007)(16586007)(86362001)(50226002)(478600001)(316002)(68736007)(8936002)(69596002)(16526018)(50986999)(55236003)(76176999)(47776003)(5003940100001)(48376002)(50466002)(7736002)(305945005)(106356001)(101416001)(105586002)(66066001)(2906002)(3846002)(2950100002)(6666003)(53416004)(97736004)(5660300001)(107886003)(8676002)(81166006)(6116002)(33646002)(4326008)(81156014)(36756003)(53936002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1988; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1988; 23:IaF7RLDajTiYk6cexgJSNh6IFg8c37z03GjAhKc?= =?us-ascii?Q?ow5bdwMpMHXk8fMgA5Vp0Fqu++BioehErudhRqrQTG5Mx9J59XJHodmsNNz6?= =?us-ascii?Q?IOcjq1J2IHlBuVcjC53sRUjNv99v08bhEaozX5Bi6lTkPSLPIJdUStnfPb6P?= =?us-ascii?Q?LkTCwzO0UuLc2trti34wX4lAcerd7SJzlVRpN1QOwQNIyJLo9qgMkZPkpjne?= =?us-ascii?Q?Fb3fj3FPCP71OOYC9cWyE3tXjowkYqbfSLKUsFuf+J8yK6sGKmKdCCTKP+nc?= =?us-ascii?Q?NLajysonsqMC26ALYFEahXFEs3EzrJgaimilw5Qtj3CU9+WESDRWnXL1oJed?= =?us-ascii?Q?ikj70U9/k7vCw4/wBWCNlnFsak6Ig9ByJKz4fKh1eckBm4JY2FA6c5TsErSd?= =?us-ascii?Q?t45jW2/cJGo2NZeEL9mSP3B+vAxa70/2F/5Vht3aSN++yIh0zi79ce7b8mwC?= =?us-ascii?Q?W68Z/u41Q+CCG8AB8eGt6ZhJGdQR9t5Cqq3adrI5eXxL2ief+Z6A19cBV5P2?= =?us-ascii?Q?ZNmp6JOSu2hxb8VfYVkEUdoQpUQWuHfZy31QVfjUTEZWs9euFwLXwOCKWylx?= =?us-ascii?Q?AY1iBuYMQw95mNSt3ehSEUFXqCL9PrB2iCtWLImuGKHenoA+mnGQulea1clK?= =?us-ascii?Q?T//iHuSpYngnkLgigqXABH3Ati894hlyFuYR+1p4tfUNWGiWJQVL+hAfdYRa?= =?us-ascii?Q?pN4LqcJxpL5BLhKIJTjifMpLxTeHc7qFeJlmOcGBbAE05wUKOfYp0DjCFyCs?= =?us-ascii?Q?RW2RCmekChtP5HEyRUVLqtVmO9d8NgTh2j7rJMFl6hKkofwXi/2ulbFlj75/?= =?us-ascii?Q?Q8a3w3e2nIjaf0SfUrG+qXpbd+iSIJd9DlHJrWxg30NTVv0b0sap0HtVJJGn?= =?us-ascii?Q?zYoAbDRuuzGUyusbcqjqvniKPmFSqNS4scpv377Nqx5eEBtgp840FesuErKv?= =?us-ascii?Q?F6akrTopPlCd1w3L+ABJf0I/2Kc2bimt0Xc8SoaSkugoK1AeWg2s7DzZaMY4?= =?us-ascii?Q?/uHpETfQI/+jk/3rR3UUAjkwOc+RrlhBYlESIWlMk88g8VQcw8mXwcvU27BF?= =?us-ascii?Q?HWfslTuk/G0mbuwVsBBZ17h7zfpU58MXiHxrHNGv2kI4YbH2vqCPmh3CseJ1?= =?us-ascii?Q?mneunX1bu0kjw1p1+UYh4IGp9pWfXndbqxepUR/E4nkBnVYpsSEcgRQmO+3x?= =?us-ascii?Q?wxznsedNkFtAvFemO67+T8OyMlL7LrhGyQpTaqIIdyPY1nalGpM9VsSE3Sg?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 6:CDluoD5Ukj7v0uNI/MJwgVJ6K1wMEvKTpM/lbFvYCY6IN+cv/qTMTNbkMTGAj/AndXZcvt6iHKS4Hc/nDJcz5VOb5aFBGBmV2DQ7+INFi9Lf+yYfxnTOuvPmRLrubvN1oVT39nFBmywRF3aoAdcVtlH4qVhSZai04A2WWSgfpF/BTHF7O+nhbPMNIpS7icpSWm2DpczA/W431hrHiwyKvxHkI4dgREItWhmp4PDAY/b2UGvUnuvmYOntBThUNh67FQLHrmZEqcrDD7WuKtm84sUZevygHtYlN+gAx89PmyReDXb1OMxYrOg5URJPsfni3eXSGrIEZSEHQFZyB4yoELdhHg2JxNT6ChhtvKw7hDM=; 5:c7AICN4DS5XwAN79WVal8X1SReFxyu5Y3VdNn+xK4NtszxwKbnTLUFoE99/+7ZRWtFcoZOelHcMTY6ytz8EDwzCDwfm8NrzGP34jKQ46UF3/RU31laVOyZWT5skY0HaGvy5gXvnkM3QOdYV0pkYYzdRIEpuDnaTGKqBlSrKpmnY=; 24:06dJqO4+NArhfjCOz21BhcrCgiSp78i6me8V37Bqc8xTJY2omGHw6YWZKEKF9PpyOY8xl9poicVflU+sMZvaen4oPISdHpgXpZswM2vF4To=; 7:D8pBLMrraM8M5lkBJPnHLW+4ZXt4cniitVFKlktuu3t4aHqcFJBdQEgvyXlniYmPHJsA5bR+iavDitLUa2bcAXTSCkQ34XukZvUaTEviEkmHjTldgbagfCM3x7r7yCINd83xlyMoAKpD6v4Su4xWuI0NtctYT67ULzN1XFJ6yPnJwzFm76sn43Q5o/InyzmXmZ5TjdTAduTHWMeQERQttJeXs5wrlQCNy9g3zKLII4pV0b49NVr/If/HhDuF96Pu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:WcLPl6vG83l+BbTUZ8KVwS2QhQG/StTFLlxfhcrO4r60XoS8qPzrqjtB4+TD1XWgMoW2usP4H7Z42/8FreUm2UQ9Vso5/XprJiSqud/Rae8SLf/xrekTVNcXks2nJBPH2QtXsf0pJGqShUt/wQnM2kIdC/WjteBrvnROj2MCVKQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:51:19.2844 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39a3c481-8d0a-4627-edc7-08d53036eca9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1988 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.123 Subject: [Qemu-devel] [PATCH 4/7] scsi: move unmap error checking to the complete callback 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 , den@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This will help to account the operation in the following commit. The difference is that we don't call scsi_disk_req_check_error() before the 1st discard iteration anymore. That function also checks if the request is cancelled, however it shouldn't get canceled until it yields in blk_aio() functions anyway. Same approach is already used for emulate_write_same. Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/scsi/scsi-disk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 3882052..eca6a15 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1627,9 +1627,6 @@ static void scsi_unmap_complete_noio(UnmapCBData *dat= a, int ret) SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); =20 assert(r->req.aiocb =3D=3D NULL); - if (scsi_disk_req_check_error(r, ret, false)) { - goto done; - } =20 if (data->count > 0) { r->sector =3D ldq_be_p(&data->inbuf[0]); @@ -1665,7 +1662,12 @@ static void scsi_unmap_complete(void *opaque, int re= t) r->req.aiocb =3D NULL; =20 aio_context_acquire(blk_get_aio_context(s->qdev.conf.blk)); - scsi_unmap_complete_noio(data, ret); + if (scsi_disk_req_check_error(r, ret, false)) { + scsi_req_unref(&r->req); + g_free(data); + } else { + scsi_unmap_complete_noio(data, ret); + } aio_context_release(blk_get_aio_context(s->qdev.conf.blk)); } =20 --=20 2.7.4 From nobody Sat May 4 06:42:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511196995718356.48293059488265; Mon, 20 Nov 2017 08:56:35 -0800 (PST) Received: from localhost ([::1]:58265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpMp-0007kA-OB for importer@patchew.org; Mon, 20 Nov 2017 11:56:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpI8-0002hP-6Y for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGpI3-0003rt-LH for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:28 -0500 Received: from mail-eopbgr20090.outbound.protection.outlook.com ([40.107.2.90]:45238 helo=EUR02-VE1-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 1eGpI3-0003qp-AR; Mon, 20 Nov 2017 11:51:23 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Mon, 20 Nov 2017 16:51:20 +0000 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; bh=fPNDgOPGxcgl0+yuHBr+ylRA4gtiXgM8LUXum+Fe+lA=; b=ZamN/RjGN8zxyua2RbFtSyQXaXjWWOwNL+uxZaEMUQjnXKh+LZfnxoM9Xmg1h4bYp0lKwbzkfoQ/ht2QldZIuKZZ6PdlRodpSVdNIzIuNKGUVr8+Up6/xh4TwiBoJD6SVOSQ38Hhs+IsUYKMytWdpHSw30C+0yjE0auIDt7vRak= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 20 Nov 2017 19:51:02 +0300 Message-Id: <1511196664-85304-6-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0202CA0042.eurprd02.prod.outlook.com (2603:10a6:3:e4::28) To AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa80ee06-9976-45ec-c013-08d53036ed3d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:AM5PR0801MB1988; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 3:UaGF4hHbJKDq5VKl7hUPShBgQyUDsK+7i/Krapn2Nc6vjE8DWkVNm85mNwHSPnJK4xgwpDMPmkg2CTRjkhw9Vf31eX4p22/PVRk3dXCOOKywyHLORvdkZpdlBFS8u1dmjfQScHzoNHYRWNKhDByxRdXFfKTuACwdQJD+skF0BD7X1VQHw9r6mK/Ht4fPPIEHPobxod8uVyApH7Mz9CMhjRPleAZ5DOBf+FXyUdrUfXMidFm2U8vHddp+ulqrc+tR; 25:nNNli7cFVIKfmRmSW3rRSsbZanXvAmAk7C4ahzChNEbdF3k7tzegM+dl3gzajjRmSwtJmDl84+0jOpTvpDUgJTP2frOHF79lw7Q4G1Ccr8/i+aIxGuK3nZZOI8cnMLrw18zb7VeU1NazSOTtuFXKDSb7sqlMDxBdVQyHY9RVIJvV5mk6RHbv2awpenMjgI/z1W7I9Q/RBw4J8S92Ef6Pl2AK3qzqvWsD1PH6jvS10tBpeQG1nLheOgu/ZQt354R3H/OT+TVuiGEfZJ5KhwFmTSQyo76YvPL8AklW3hpFnsg82eqLEQoTFp6Hh05PYUqxchvuG3d5zTvxjzEuGqM5vQ==; 31:0THVBLhf96T6NNr95Ujqi9oqY2CZG0vi4lsYfEthBC/1VV9IUhaMSl3JducyclD4501meYUmOyamAh+pAU7DZK0hd8ebviFVdbYM204dZEy+NPO+oNQ138DUqT44euJigUydSY/zpGe8CPYO61JkjzWshfgkO5HFYrwbJc/qQz0wa+jDSZmDeyrVzDMnS4w7aaw1xtHynHkRVX79Hrf2Dk0B+5j+Shl+QyENskIaLIQ= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1988: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:/CZw80XHUSLBZ7gU8zjcTMHU7UplfkHyv7vt11GzUKAKRtaCaepIq07FckFxdULmaOnL4JNNSS2SL0GjmMFxp/7mV97Wj9uYonlt7Mqiebdt0YtMXtPQu5LNEMHIIyy+NOoYb2UPIiokG+6D5xMW7f07zCrZUOQ0jhfvYb0NMrPZsV4h2WuJ0eG9zN8uUKmrh6SP5DP1QrglSS2aVBmTsQrAIjcDhNKuqi90OWgviXb7xdLszn7LcRmCsCIaKdqvl2LvFtWlddjNDrZeLAey2CJksfSyZUexLS1AwWBmQelakOK2SmWkxoUgMnQo5l/PEyIYYIRcDkziznQBkYC+zdUIBhY7irDmtGLP3h4UunVg5OINu8yXXAm0+f6rSFlGJ3YRfN8fcVMOOcoQPhWtgwlK4vh101Q0wx8S5sLoCFI=; 4:AvPSAWHxs1WMCJAGh34Jk/y1+0/wAnt74932m1PpA7RMybfMknZDiBy/MsuMljgabgTrEUaJPRDLz+ba5GnvTkQTL7O/O1TVVyp5WkT/+jz1THLdFC4ldWNfB5/oRwP8RE9ZN3BoBUjIKHPfpCi+B7o2Su7A2Wyl37wlQrqerrBCScLHs187lihz+d5qDiNkZ4EMj0qmJESIib8sXAyIiiUrGPDJ1VHYdhOI361OZhemo3QfHu4662YCGNlvJc7B7f0nj0P7cFb9efV1iKP+VA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(3231022)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM5PR0801MB1988; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5PR0801MB1988; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(376002)(346002)(189002)(199003)(6506006)(6486002)(25786009)(189998001)(6512007)(16586007)(86362001)(50226002)(478600001)(316002)(68736007)(8936002)(69596002)(16526018)(50986999)(55236003)(76176999)(47776003)(5003940100001)(48376002)(50466002)(7736002)(305945005)(106356001)(101416001)(105586002)(66066001)(2906002)(3846002)(2950100002)(6666003)(53416004)(97736004)(5660300001)(107886003)(8676002)(81166006)(6116002)(33646002)(4326008)(81156014)(36756003)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1988; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1988; 23:5OxXHb8OgLMChlr/LjPEHo6xdxPSthY27UppT26?= =?us-ascii?Q?/u/ICLR1IWpmsAFgIdYaRPNZkg1YGzmvbaW6qFA/b2/UM2EyDMGwqpHsmwry?= =?us-ascii?Q?Wjrh6KE3clco7AnBM+tKrwrntCpcnxyefsdtbsClTif73D/0+AzpXqI/HZ3K?= =?us-ascii?Q?jl+SOxrty6uEW0ywDkmlJete/Q9L27f5QaRyKsRm60YonZhGoUAOgpmqVfKW?= =?us-ascii?Q?4NsZGB2qJzSQd/ILsFksFKJ4HEfZy9p31AqEEXEWy7bxZuLsYbHlM0iBCjgV?= =?us-ascii?Q?J+VzdpSzUyZjs2r10Ui3erqpfuY7H1LKmf/TsOKh3oc17tNEUGnA2gXizQTa?= =?us-ascii?Q?QYsbU+nxEZ1c2tWO4KmAUeNBZUBBMmh4tR7/3LMDg70/cm9F+z58pbDsi9Ki?= =?us-ascii?Q?RGOIukevQy8/x+kk6UZYgyz7hqLZN9PdduI+pCzGI+G1bvyVU3LOIH3S0+kD?= =?us-ascii?Q?hpJPvU41M2ng7wDEJf3ZcigXYwmfT42H5j1nii4d5bB/MrBFcUux/imAVp3a?= =?us-ascii?Q?lYhz9xbPlb9/YzzT0x9K9NGhkFgOmkFa2YG+6afgQhx77bmDXe9DctrS2CtB?= =?us-ascii?Q?9pHk7DYwrgV5jLiI405TiXbqCx8/Tle8OXLzT7IE+ssa+M+Ap+YFp887959o?= =?us-ascii?Q?yWjyaBfVj/JNJGoo8ZeaWN8PfMvurRmCfkEMKO+ftzQgXa3pduGmORjj1oUb?= =?us-ascii?Q?A/QlE3xfc0JJyqt3FcSpyX3vTIDvx+J1HvgmUwaGlxC1D1iF7G1CARwoVh8h?= =?us-ascii?Q?KlhUztFVwIuKh19MTVgGEq/r28S27X86y09zPh+k7p0BSBwM8yefobJUsrbw?= =?us-ascii?Q?Ue99hCeqX+IExm9ORLyPSOweZ7J6X4wxJv6L8wNlaE5bq5us4/hJqpwhsRQQ?= =?us-ascii?Q?rHgvDh7CLn8TirdYwhJDSaSC4Bn9+sISVt2RMn8uIFnKAW10pEveWktr5F4O?= =?us-ascii?Q?Uk2rge9GpMnUXc4kRsGzfbWsVOQ9R3MV3hvLcNCkPnnl/+f3woib4FxvBYUU?= =?us-ascii?Q?ZJxZfhi0SZjuEH4gFU7G2qykbfEe9aO9bdpXJnYEsPerTHP9e41JgDWyRDCW?= =?us-ascii?Q?kPnIdkWXcwjgoytDKinqGGjNpOJ13w+HlOHSvgBo2SVjCMp89OQHw6ygr7fV?= =?us-ascii?Q?6LnOK1fKgknA=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 6:2XAu3PFdh8CZD+9rnG589g4Xs+dwXWLRmYzqWLvmSKfIynmRFFZRwMrHvb9s8jHzhW9nr6s2OnqMZBjyqoelzF0AsH38N+0mS8VQSPv4LeCQ2gMjFrgFcDhlnWn46y921R5jd6BUiuCJOJwF1WeP3it+9us7EDUMD22T3lAF9fObMLCT6me4wr6tMSF+p4j5DGfQU959f28Vsp4ymGBJHAuASJ76zx/FAoiBsIab4KcEv/l4YxmfXjRftodBzsq8gqGYux0wcWVqrkImsWIJ0WtFmpcl6kOoX4TQ0DrLsqQ/A8tRvpTheAdfjvZBwKv2ml9+60kS8b0PcvohTARfZJG9lTgaXdGaeneX8mc7SFk=; 5:ifcDWezFmbFMO2eGX+YQ0ihkvSS1+qGIOYaYDxNage9rxoZA1hK+1+0TGpkklVDpbSRRhxflj7/t6XWwzjtsnYG3vKk8BWCIksPj50UJgqTLFUOiobIQ+0V/zqh7q82a2QHYncViw6+WlUVybI63umMQj+uq7d8d58mqQs4wflQ=; 24:MkMexpwFliDjhJH9lpcHWyitFltph8tHwVaeAG5wnf2izoTDJ5bU3/1khW9DtOCy/6zqzdvL4JhQEeeGsKOD41w1ayzF6SjtTlsK+NifGwg=; 7:NLyOrmNaoJCzN5NpyTgq1GAOepzXIYxR5lbaknT6vAuVwAFvus5XKF34ekYNWqWwWMWUpV9m2oUrmLeRwyB6SdooyNG1W5ixXDfkCfXb5EbH7BmWuwUroUwUEuqBQNzHkz7WrWAPysK8df7LvP5nMdP9O6qNYORdbJSkD/qXeRKalfcqVz0euw5vXPv/aMoYE8X/7n+ExN+PRRXNaq42N6S6LEiAWBPTF154eywMpYVhwpaWY+jO6xAhpJxew2iC SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:xaYNG9ScBOHSJpdVYtSSYMB7AEJvc8GSDUoH+UVwAUyH4pstNbYSo3xERvXTTzyRZBr/SKD7JWOYxZppn5iiM6K1Gv9ud1RFU4IT+CISxTB1ujEpS/trjlL2RShAa5/Fa4OO9Jr3mganJ2AfKNOmDmd/2PGboZw4Nyf4X11Wfww= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:51:20.2532 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa80ee06-9976-45ec-c013-08d53036ed3d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1988 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.90 Subject: [Qemu-devel] [PATCH 5/7] scsi: account unmap operations 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 , den@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy --- 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 eca6a15..6c33418 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1636,6 +1636,10 @@ static void scsi_unmap_complete_noio(UnmapCBData *da= ta, int ret) goto done; } =20 + block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, + r->sector_count * s->qdev.blocksize, + BLOCK_ACCT_UNMAP); + r->req.aiocb =3D blk_aio_pdiscard(s->qdev.conf.blk, r->sector * s->qdev.blocksize, r->sector_count * s->qdev.blocksiz= e, @@ -1662,10 +1666,11 @@ static void scsi_unmap_complete(void *opaque, int r= et) r->req.aiocb =3D NULL; =20 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)); @@ -1712,10 +1717,12 @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r,= uint8_t *inbuf) return; =20 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; =20 invalid_field: + block_acct_invalid(blk_get_stats(s->qdev.conf.blk), BLOCK_ACCT_UNMAP); scsi_check_condition(r, SENSE_CODE(INVALID_FIELD)); } =20 --=20 2.7.4 From nobody Sat May 4 06:42:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511197233860309.5132106224481; Mon, 20 Nov 2017 09:00:33 -0800 (PST) Received: from localhost ([::1]:58297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpQe-0002SJ-Ks for importer@patchew.org; Mon, 20 Nov 2017 12:00:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpI8-0002hQ-GS for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGpI4-0003sI-4a for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:28 -0500 Received: from mail-eopbgr20090.outbound.protection.outlook.com ([40.107.2.90]:45238 helo=EUR02-VE1-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 1eGpI3-0003qp-Sa; Mon, 20 Nov 2017 11:51:24 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Mon, 20 Nov 2017 16:51:21 +0000 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; bh=tTpj6RSHEb46TbUuxgUyqBn6eyQqKtS5Mj1dkUQDvzE=; b=LyDp0D1QL77IOXdqbpGEw24UmhY66wMoQ5Z8QHJfTwV/PNxfA4U5E/If3403M3Sw9Nhjb0SfdPtLL3Nh5HHP+T/i4lvBClDsNA4b8YFxDEPfaZRy97PUVyWCRAVoUqWVJx/WMexXEc2MWLiXd/dvtDMt/AG2jvrmGAa39SzP2Rg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 20 Nov 2017 19:51:03 +0300 Message-Id: <1511196664-85304-7-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0202CA0042.eurprd02.prod.outlook.com (2603:10a6:3:e4::28) To AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb68b09b-6403-40c1-4195-08d53036ee01 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:AM5PR0801MB1988; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 3:62yqxHL2t23Lb8VEta1IHBE9xyYvFXk+4OHoxTz8R+SjRkIb/EMxW3WYdYw97lYSOjSZdr3RL3IV690EjF1alE/HnhHw1OmHO4y1MVzOMYVzDgIy6CS8RkknPVpcNgtm+jsW0eE3KvKI45pE5IwNU6vRkB2zTHjr8eCY1Rx2CSI6Pv+rCtYxOYvmKr3sj+Wx+rKVb329aBH7QdV6XQ5nMzCz06cu9eglIyA4VJkNOo1ZuJaSgqvt2/n7CNnb9q/W; 25:ekkwNH3NLhnog8htCpZg+vHjRUh9rwwpK6FHwXZPuPej/L3o88xeY82Yi1XVur0ghId4kPChAjGOaGvohn5dwLnIJOYPJZKxmblR9KGsHTeF8VyANe9PZuAkWsjQOIj0jE9g4dpdWY26QoaOBAsmK/eTBygkIvA4nEFpQAUw7N+JwwxR6Tsa4gULr/28eELj6wZwDU10o4+e40r/dRgIqpIztcynpmqcY3VJ8ygNkT1QtQUm8zb7ue0eKHBakldBtm5b2U3XrWTgD4oD2FIzFYG9q3ZpV0u29LYELMdiauGxhmDZ7yc2Y4R9wHC+TmBZzGIzXXE/Wo4cGSLgKtHbEQ==; 31:7tAs5LuiZQaKOEbP0xLHhSHl9J/93JSjymZPlYc4wjP8SPX16DDqJL9G/QbRDUZgtrUMCdGIJF2yXaluICeVKDxFvDMowKB9uQycPQSADf/DvMAluXImQWD/sMGnXORe6AEdlSMV/ATxV85FgeRt+Da+EFkr7yK5jsJzoEo23OmSET3uyVnKi1CrTapduRr2K1k55vXYgq7dut8mGBrDBax1nvpeRMjKVu5SQyyAbSA= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1988: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:CtzDOJlJFwu0wG3Yn3XTI081nQfXixgFpq9A0os/TtcJpFtBfqF3eT/VWwcgt2lTYnlHnQlLavincPpE/Vx6erNh3Ql8ku5bJ2d/XFcFi8KoFD5QUTaNjDWCtwcU4P6v5nlvAAuQUs7B5RWV2DOg1Mhk2eak0m/PZHDu4trYa9BQ+Hlo7CixwqxxLrSixJawY1pSztjE23ipua499DgLb1arUCM7TeLwTOGyBQl07RX0D54M7HWD9jTi49v6eDfoVJpd2Ju5XAqvTQZG+jBMX4fD9qmK6e55dlbiYvDoDYdiX/WcDKxZ1NmXpQUZokkEK2bdyRyx2koPmu0QPHKeKolK5dZwH0j/idO6rypsTBUJZosaaPUiWdr+5zDtSuoBHAbUGwRKkemP4l6T/VlwssTx5tguiC6gm9SBG7rYdno=; 4:8ZEtgmrHR+Q/Ci0RQtradvqeH+MMwX1Ut7MR6SS3e0lVhIefa9pGbQQF4BEuLtxGpjBEvpw+rGMY5YwKTaFMKQi23K3pBcg6WMQLuXMFlAF+H8s6Dne3U7J/XxbSdHvuUjaALIWR+/3Uf32YbKONAxp3zBfE16RVLcoyNlp8nG4rQ6sEpLCcEvNhqmVIaur+V9BJeXH/Fzt+oT/YLFNvTMsL9cfpyHlvuM0Cv3uXHPccKkV2GHCysUJMPS9JUv/Y3+aqjDmh/VsGQplBIKmz7g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(3231022)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM5PR0801MB1988; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5PR0801MB1988; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(376002)(346002)(189002)(199003)(6506006)(15650500001)(6486002)(25786009)(189998001)(6512007)(16586007)(86362001)(50226002)(478600001)(316002)(68736007)(8936002)(69596002)(16526018)(50986999)(55236003)(76176999)(47776003)(5003940100001)(48376002)(50466002)(7736002)(305945005)(106356001)(101416001)(105586002)(66066001)(2906002)(3846002)(2950100002)(6666003)(53416004)(97736004)(5660300001)(107886003)(8676002)(81166006)(6116002)(33646002)(4326008)(81156014)(36756003)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1988; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1988; 23:30G6QA/nvBz8HapRwJuHuqGBgWofHMQw+WhraOp?= =?us-ascii?Q?d+j3PTPdPCNrxDCN6gjs9+JN54eD6WHGvy805vv0IMEkBQa4GENTvV5f/G8w?= =?us-ascii?Q?EqSzUcXDNHUNZQZKUQnL5KoXf53yxFFPhl9fF/Cn+YJKamPmnvP6OeKIOLix?= =?us-ascii?Q?7v0I39npOssf4Caka00OgdF9+I37rW15hZNr8uYyAkCgQvKGy8Sayx+cxrQ7?= =?us-ascii?Q?DnTfH7RknA1unSaP46KkDsKisI6v68CG7E8rvEnLS0l/lIJOeasdnrkXe/nH?= =?us-ascii?Q?m88VnE54xjtfnVsO59yd+HpniAazCN9laFR83Q7IL2q26OPo/zJyrCtlje22?= =?us-ascii?Q?rdNeVPHLi+rV/UBxB2m3do0BLJP23rMzZJKS+ODidsDIbOXDKPYPle9SREVh?= =?us-ascii?Q?0JOtsAZx7dIdLXYYwxEO1oWW/QzD4j0JHR5QPqeVGQueyy6hocmHzgW7Mzdd?= =?us-ascii?Q?1ZwqIecA0s2Beca39WENv4QqDxbrrT1m38ese5jUypfOs3RF3c/PWvvQnVxq?= =?us-ascii?Q?81qyvQ9IKJYcrhVyLyiquRuOXyzYbh07eHURkKFvHlf97TRY1CXgUVojKdlE?= =?us-ascii?Q?LuUbrOvZEjLNCZJQi30+mX6kDV+l8S8jf1B2m0VGF5GEZrvvXd9baOS3y+V5?= =?us-ascii?Q?gYUvFp955ycxujEeVqv4LjuUnJJbxLOJMUMc5W/+ZvLOm7bLtRWV9MX6ULZR?= =?us-ascii?Q?+iQJBPnev6CtFJ5qBORgHHjCvye6pI34Nw1rYvNCSAiunUeHwINVpnvKXmwb?= =?us-ascii?Q?2268x0CLTjy2b8IkdLGIjKfGLzYjjyUH2mKWgp/iM+YBvnKBbofEoit/u7g2?= =?us-ascii?Q?E6gMKtLiNjcORGnBcLvnX3rzySJ5yEJHHXVj1pGkNuTcVdxDDipdSbQTurQ9?= =?us-ascii?Q?d86Y4oUsgCA/I7VCjD0ybTl4E03mHmwKsLFfFN07s2oVFzfUaXvUDmMmwmEr?= =?us-ascii?Q?AYcz6BhMcofOakzKkT2G5EsFtXBa17U1KKzJf2IpWwBk1/OOmbT0pccv9gxL?= =?us-ascii?Q?hwmoP8pPRO3jpKX054dazDAQvGKHqiRp4vJDpgftMOJii6O3+9ngTs06RBT9?= =?us-ascii?Q?RgDyiyn/ZdkgvYdxxdD1ZIaJhHl6/F3VYy+ndELEBGJX2BWg4TzwW1rVxYH8?= =?us-ascii?Q?gkqvxcfRb7QXHYSZArFhkVCiWWaeB75XZ+B4LK0xn53RfFhmADNvwNA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 6:8kocbDq36HFLE7WohvCc5ppFepl6PbrCQolXtk9/lmNOPw7D0qATDlDjNHc+yFE26N3EqFQ/naZQJ+5a0rlgu5psrBGx4IueI3ReRLE5WeJkgUcEAmFkBuz6DDGVz5YcFl0nrNyJU6+RLKZwYdgOmBh60znLxUmtFsntI5gu8e0PpUgx/4Ad0eAlLjny9l596KeOk3z34ciyfVNkeYbOXZuNRcLiGbG480FjzWGfIQsMiGIrhldD0yqrT1nJ0pcdp1yHwK6hq4IJxKNbb33gziUldFd25SEO56KvMfhQ+qCpPbABBOFKIxvP2m/ZHBJSAYpU48Md8/jNj/w2YtmxXSGmfsJvJ/PT9xGuVVDwOiw=; 5:LUK1wKmOX3yQRMWA4sdqXPIxAqb33lTv1yaFCTXKOs6EnibI+TLHPSVI7a/AJAlTcYw29hQ9JfSC7W9URq03yk4pSoY8WbPwvxP4ukcyRLXkPz5RP6okLOSKWbDGIWMNuG/36u69U72FndMm3ySUGvxtNW9iitXH+5Ov9GDylV4=; 24:dVAGLz3bxdwpvIu7sMLYYXc9z7gOiV8cgTq6sE9+MKqju6zb/BcrqiHRrIdOqdvy733W1NkDLZwT78Sm9M28euba1gw8Toh97+QUS0axXxU=; 7:hnDEAHRYUQPBJTotfUWJCaRMHHSVQreIgVV5FkBjUD5TNiWceDwXidZPjsuNoJeJgZbsYpyhcPiRPy1DiT8A+PlQRWnU+NAp2FmGRK1ukfPfdFJuktbQvXYtSOIlyCJjdVGy/RIvMLxKKd1FxbJSbgppbun1801HHXIZC4rNLGflh6WUbDYIoXpq9QCtwbe7t3vLQiDIMjVZoGRfdw5XbDM47TnHa5EGfR9xxzCGxEmGOYWjB6gVMifJ2CAs9jgi SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:9RqyfGeLleo0FgwsDGgzu0tm1ymV61eGZkjkG9Aq1joZcDloBk/Cm4QvxeZDYun8KUF0PCs7EVA/US9GbZhvRfweH3N03Ed6Knockeu77YUS/x2rMcfsnfHeHIj7Wi3548Z8q0Ii9Y4lXHmspatGvdX+PKRhGD6r/auwMrWT2yw= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:51:21.5345 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb68b09b-6403-40c1-4195-08d53036ee01 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1988 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.90 Subject: [Qemu-devel] [PATCH 6/7] file-posix: account discard operations 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 , den@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This will help to identify how many of the user-issued discard operations (accounted on a device level) have actually suceeded down on the host file (even though the numbers will not be exactly the same if non-raw format driver is used (e.g. qcow2 sending metadata discards)). Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy --- block/file-posix.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 36ee89e..544ae58 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -158,6 +158,11 @@ typedef struct BDRVRawState { bool page_cache_inconsistent:1; bool has_fallocate; bool needs_alignment; + struct { + int64_t discard_nb_ok; + int64_t discard_nb_failed; + int64_t discard_bytes_ok; + } stats; =20 PRManager *pr_mgr; } BDRVRawState; @@ -1458,6 +1463,16 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData = *aiocb) return ret; } =20 +static void raw_account_discard(BDRVRawState *s, uint64_t nbytes, int ret) +{ + if (ret) { + s->stats.discard_nb_failed++; + } else { + s->stats.discard_nb_ok++; + s->stats.discard_bytes_ok +=3D nbytes; + } +} + static int aio_worker(void *arg) { RawPosixAIOData *aiocb =3D arg; @@ -1494,6 +1509,7 @@ static int aio_worker(void *arg) break; case QEMU_AIO_DISCARD: ret =3D handle_aiocb_discard(aiocb); + raw_account_discard(aiocb->bs->opaque, aiocb->aio_nbytes, ret); break; case QEMU_AIO_WRITE_ZEROES: ret =3D handle_aiocb_write_zeroes(aiocb); @@ -2654,8 +2670,9 @@ static coroutine_fn BlockAIOCB *hdev_aio_pdiscard(Blo= ckDriverState *bs, BlockCompletionFunc *cb, void *opaque) { BDRVRawState *s =3D bs->opaque; - - if (fd_open(bs) < 0) { + int ret =3D fd_open(bs); + if (ret < 0) { + raw_account_discard(s, bytes, ret); return NULL; } return paio_submit(bs, s->fd, offset, NULL, bytes, --=20 2.7.4 From nobody Sat May 4 06:42:42 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151119683368916.720042965981293; Mon, 20 Nov 2017 08:53:53 -0800 (PST) Received: from localhost ([::1]:58243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpKQ-00051m-FG for importer@patchew.org; Mon, 20 Nov 2017 11:53:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGpIA-0002jV-Kc for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGpI5-0003tR-Vu for qemu-devel@nongnu.org; Mon, 20 Nov 2017 11:51:30 -0500 Received: from mail-eopbgr20101.outbound.protection.outlook.com ([40.107.2.101]:47470 helo=EUR02-VE1-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 1eGpI5-0003sX-Dy; Mon, 20 Nov 2017 11:51:25 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Mon, 20 Nov 2017 16:51:22 +0000 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; bh=KH0oW/MRjNRIrkkfPV6PS+iLpOiHS7QujG3aExCr2q8=; b=Ty7XHpNuSEFhAp63e2NvjcU7h9NKJCu/Lec1qfrDx1T/vw8RO6ZaQAonFk8BXgre27de2szsQ8eTrp9Ym6pQjnkHJuwPBWroC1cp9gJaNh6nvgpwcmjsSm6ff7mkdZ1QzgMGQTDYpDuworb3KIWA8n9WlZkKbO6l4uWp2EFml7w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 20 Nov 2017 19:51:04 +0300 Message-Id: <1511196664-85304-8-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1511196664-85304-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0202CA0042.eurprd02.prod.outlook.com (2603:10a6:3:e4::28) To AM5PR0801MB1988.eurprd08.prod.outlook.com (2603:10a6:203:4b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fea8934d-dadf-4707-b17d-08d53036ee92 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:AM5PR0801MB1988; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 3:Fn0q9L2txh6/yvpzz0CF6AS4XXDtOitV4UhHFrxL4578Gm/jYmXxnaWVUxNyf8GwDMBe5vjc03rwYlWgJu0o7AjkXU3QvsHqZ+ocLIpsX4chuSUT3F6pt1eseyIE3klAh1VVCKAjI3prqrjmLClQsoHzxPEgD/slspi+ax28PqsTZ44pFEm2pyIGavupIKGzytVwJxvwToyitzIj0m/gxY/Cz+nsc4Ghf0jFLzw3t5iRqya1PZxH2hbFchyjF4lc; 25:M2MTi5FcNhJRHUhYz+oiurXkqoQtYh5fa6IQFOEKyWgzgNZG8VZNURQIwkXGPJyiFhdgvURhFK/7OkyH5mw3+/0sbPaCXv6kf4ZbIUNrmZwO+qDDBRi6guZCwutWt6a7/yA6M9PMA8mnKUVZ1gY+ZuppLUW8HmpCk835lkFpNr6jh5xhvU5d841ZoTorU6pmm4TWH7rQPkAjvC1KoB/QoNmRHBZpUPxM+Fa3y/OIh1lI1F5fEjFpk0o+tI3BgJPXqtMTtDn+N802RJB0ANTBx21FEU5m+T/ps+3eDKXhtj0mlYNMVoNUHfL45xwh8ax2fS6cm13Slb4XkkBuoC6CqQ==; 31:3yXPeGMoJWJuoQKoQjwc9Y/QJl2y0SNzr5emXVskzRbhL9NnMcBtYauVGKTjybsKKq6dTjss9DQOv3k8uK/BWuxGRUe9irZBR7UkdCVeStSpqyHnBwP+OyceHnnC6Pe7Fx8cP7OWRA23igYQYamV7MNrhv5wXGLd4y3u81YI5jzXmZwOoIJmtxvoeD2GRvS5lz4sxiB3Ci/Flxx+KGT7SK/5CI2lmTkl25CUeO1VA1Q= X-MS-TrafficTypeDiagnostic: AM5PR0801MB1988: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:or5oA59Qp5xgFhXvOSEAM5QYAULf6iIHY8pzAofIhAfoooXk7OYO+Mb5aOKhJtrhd2ZSg5K9jCZzmo3fCnOQDokU3fX50YZ25AN41wsxaI3VSikIIBCeecXjIqVLxKPie2oEWv/A7XTyQKLo+TL3U1Qko8tnSKUTRaCQF+OTjV6asMt/lVxerOGNcSrUCbF5mP2wXiwEod9PT7k7NwetICHKqd7MVVWc9RbeAxrHdJkreKvMaFtuZBgIhsjJkGwZTf1p2gWCckaGyPwvgUDBUSq/PH7A3ZY0iMmWVSym3HIh7vJyKGhSNF33+P622rFY9HjcrgKJ4um/fDjelEUHR0OnQtxTJRQTAiaH2vwTowAeiOxe2KtCON7JydKRQjObXBLSM0WIORkP66iNiNIi7QTzhp6cGC4+Cd3XoaXlUFA=; 4:CXHM1xdBOvs3STYKvBpHpW4rda1pMOmlHOM+UCCOWBBsITUrgifYWD3iJ+FC/a3zla51BxiRE+2++fRrSRr1aQk8PRetVwNGh9iw9Qm7yJZKvNLJE4M3QRajFMa6pyL0m9RbQYiqdB7QfGpndapMZ8Ww9MgoPthaOThx9z4cWEtS8aJEPYsDSd8iv9/Ee4YcoPJyA8I3JVNCH7pGyxLvt3iERMAtERDlxdZkbM91OwhMHx/NOafAYf/PktpT0yei4pv4X0Y0sZcuBZ5QWbuvD2e4MzH7AHeNBIAbk8qXDfey+Rt8Iw8NtAukDGvHSguv X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(20558992708506); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(3231022)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM5PR0801MB1988; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5PR0801MB1988; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(376002)(346002)(189002)(199003)(6506006)(6486002)(25786009)(189998001)(6512007)(16586007)(86362001)(50226002)(478600001)(316002)(68736007)(8936002)(69596002)(16526018)(50986999)(55236003)(76176999)(47776003)(5003940100001)(48376002)(50466002)(7736002)(305945005)(106356001)(101416001)(105586002)(66066001)(2906002)(3846002)(2950100002)(6666003)(53416004)(97736004)(5660300001)(107886003)(8676002)(81166006)(6116002)(33646002)(4326008)(81156014)(36756003)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB1988; H:xantnef-ws.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB1988; 23:BMmafwlgEiDvWZKobIsQIoKTWCMtvwKsF4R/sUa?= =?us-ascii?Q?+zXY3rOon9WMv2OXqLmkw8u70UW9ZWp/zUODzYPg1m1slOXANX81hd/V+BbI?= =?us-ascii?Q?L+46uMOqj0u7gGecMHdi2i2Ce01Z0yBI1BvvUwDA6nX0a9C7QUFbxQByZ0mV?= =?us-ascii?Q?AvP6HAbgzB6/qXM2uszVHCAwcadYY8eZ+CTDA8dZVjAwVZz4n/ubg2GGrrBs?= =?us-ascii?Q?Hty3i1x426RFc36w47v0PbOCNEwoaYFv/tByVzNrL5FgcMJoVl2xaF77GJIC?= =?us-ascii?Q?qh4SWE5aYquRNTHf6c6MJVGBknKscrPCK9iQFvCxBgRwzphd+Y3gjRKdedat?= =?us-ascii?Q?2bkNWp5ztwdF+XpPVmvQPEMDws5LaKYd5ka7TvGtzBf4SKRb/LJY72C1vFzB?= =?us-ascii?Q?juMXrN6idi8EZaA86gYt047pBIFDRn8Erotxb5qzSkoN2By7osvuf1oJSed5?= =?us-ascii?Q?gp8lH4SIyakwlfjuQT/8ZwNw2l+aoT5Sv2w6G/dH0EZ78uOlVKiFmFdQY0Zt?= =?us-ascii?Q?ToDkVgcWerWQjpES7E5MnBdHrvMG5f0PUzNEUUR/AXIi93ZBt0/kfZcyQzgN?= =?us-ascii?Q?QbdiRsv3kyZ/fW5HOXhtNvZzVc2bMYmvL8DGR3bQ+tBWmrwqoFxDq1VdLe3E?= =?us-ascii?Q?Zq2S1GBpO7RDVUSMv8lzh4HB4t4IYwL/MDyeMEACN2b9c7cpj/casNHYL2ov?= =?us-ascii?Q?tSvFQSl0VU/Lp+xrTWt7ceFhLt7x7zS7YMn1vgV/Ok8XSfjlTZLf6442Xvof?= =?us-ascii?Q?AiGVae9EdzEzPoWG+PI2osXWGIgwHa7oJRBcG5T8XB07S8TxGHSxcZkN7nKe?= =?us-ascii?Q?3zrCYvPTzdfr17ZwTuXhAG2vegh0DL68jPVDcYeJNZIum4yuTbBqw10w5tDM?= =?us-ascii?Q?7jXVSqsBFY/44JD6lNEHRY6gtZBf9r0pkqUiaS9m3/ts+l1OoBxqzs3FHSav?= =?us-ascii?Q?/GlU4txs4tXUmNNlkPKRFzuShjyZ71ZxazjZJVf8Iz78k3goHHofR74YLprh?= =?us-ascii?Q?v+L29jUv7VnF0ar9GoKmM235VE7oWC0zEgfBdcKJUTtWFcY6SghMyS/YL7IB?= =?us-ascii?Q?5TD0TJ041o+ozcoBbwqdAci3OgTcD1SMx6k2fnJy7N5nQDWaB6b1lOzY+7Yc?= =?us-ascii?Q?gUgI0wYihQUc=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 6:4FxnfPV5cSO8N1QkgLqhUTTja4NawtX8F6t3LiPA5PpWObzM7+KbTNv/Gx03nAOR27H6AR6hQmRcflc0PNNdv++Nr1Mqyx7ACsBjwWtOKLtt9RstDj/n7GLuX6+CroVKjqMsnSwKqHKaYUDsrjjZUJc9DF27tF/e/vpcOuZrFLyHnOP/POC5l/TqMEG/XncjNtMeNBbl3GmkobyfUATEoFw93E9cwwvho1HLP55QA+4IDptlStGe+ZX9bMqahlpSbJTVb9rP7L0W9JgqEvNMAByDNMj1lDJa7d5984aNpqN+nCCH/7PdkDsKHt6dmongwcZDg1+P4JHZcEiTk0c44VQRwdjDRbzotwbIudO9bs8=; 5:aY8473/vRppJclnqnhWVA2KRP/7qrCz9AS1UcAkmGLrubu9EcBub4Wuz4fUA48bf3YJfBXWczpjvPbH069GiX7tFql9yA+xn3TZl3qGLElyoBFWILFcUqSKmnoxPnv2I11ljdFx7gQ1yXN5prOE8SUM1e4iqP0MDDFaKGcjKXJo=; 24:OORVIRGav6qNrL8yOevkXI6LsPwMiKj6ht2AWvXo3kNx1JsD6XQcoM2Blbjay8EGg/y+1P3yH4FPGquYBjeB47kI3fEuWXOPW5m+uCNsgTE=; 7:7plD/KWicFUMSmqTrmYqo1Csu84ze5uTIh7cGz/tvS9rozzLJOTKjcjm25JBRb33mjYTL1aqoRT5aMpCKf4pckWVd1Kv1BbItH9KLYpElH6osSge+D99fKmbZlNlA3OrVWggIyTFVsQVuZQ34uhl40vtWttPDm+NjUmpmzVp/RI4gv/mRBHrXlAS5j9el38ze1Q90ify6lkd2QFe+jWMbVATLM8H2NdwGusoFA3STERqMd2mlMiYuWrGK0Q06qCf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1988; 20:Sl8paRK9ciNb3A5TJgGPRm4W0q1+cM8kQLfgTDkrnrEm7c1XIandS88mzLi3QDxAHEqrsXlzgh8ZWVLa1e8efZR+/CwDsBPTI4nSxUyknUU/STCQsSGCw2oiExuzd1QV+QruaE8KsTQA43u5kisa2wkEgFfDvyhPJYFGH2Ft2mE= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:51:22.4876 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fea8934d-dadf-4707-b17d-08d53036ee92 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1988 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.2.101 Subject: [Qemu-devel] [PATCH 7/7] qapi: query-blockstat: add driver specific file-posix stats 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 , den@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A block driver can provide a callback to report driver-specific statistics. file-posix driver now reports discard statistics Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy --- qapi/block-core.json | 37 +++++++++++++++++++++++++++++++++++++ include/block/block.h | 1 + include/block/block_int.h | 1 + block.c | 9 +++++++++ block/file-posix.c | 21 +++++++++++++++++++++ block/qapi.c | 5 +++++ 6 files changed, 74 insertions(+) diff --git a/qapi/block-core.json b/qapi/block-core.json index ba2705d..aefccf6 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -765,6 +765,40 @@ 'timed_stats': ['BlockDeviceTimedStats'] } } =20 ## +# @BlockDriverStatsFile: +# +# File driver statistics +# +# @discard_nb_ok: The number of succeeded discard operations performed by +# the driver. +# +# @discard_nb_failed: The number of failed discard operations performed by +# the driver. +# +# @discard_bytes_ok: The number of bytes discarded by the driver. +# +# Since 2.12 +## +{ 'struct': 'BlockDriverStatsFile', + 'data': { + 'discard_nb_ok': 'int', + 'discard_nb_failed': 'int', + 'discard_bytes_ok': 'int' + } } + +## +# @BlockDriverStats: +# +# Statistics of a block driver (driver-specific) +# +# Since: 2.12 +## +{ 'union': 'BlockDriverStats', + 'data': { + 'file': 'BlockDriverStatsFile' + } } + +## # @BlockStats: # # Statistics of a virtual block device or a block backing device. @@ -776,6 +810,8 @@ # # @stats: A @BlockDeviceStats for the device. # +# @driver-stats: Optional driver-specific statistics. (Since 2.12) +# # @parent: This describes the file block device if it has one. # Contains recursively the statistics of the underlying # protocol (e.g. the host file for a qcow2 image). If there is @@ -789,6 +825,7 @@ { 'struct': 'BlockStats', 'data': {'*device': 'str', '*node-name': 'str', 'stats': 'BlockDeviceStats', + '*driver-stats': 'BlockDriverStats', '*parent': 'BlockStats', '*backing': 'BlockStats'} } =20 diff --git a/include/block/block.h b/include/block/block.h index c05cac5..e6baead 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -473,6 +473,7 @@ const char *bdrv_get_device_or_node_name(const BlockDri= verState *bs); int bdrv_get_flags(BlockDriverState *bs); int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi); ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs); +BlockDriverStats *bdrv_get_driver_stats(BlockDriverState *bs); void bdrv_round_to_clusters(BlockDriverState *bs, int64_t offset, int64_t bytes, int64_t *cluster_offset, diff --git a/include/block/block_int.h b/include/block/block_int.h index a548277..a127861 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -269,6 +269,7 @@ struct BlockDriver { Error **errp); int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi); ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs); + BlockDriverStats *(*bdrv_get_stats)(BlockDriverState *bs); =20 int coroutine_fn (*bdrv_save_vmstate)(BlockDriverState *bs, QEMUIOVector *qiov, diff --git a/block.c b/block.c index 6c8ef98..7e5822f 100644 --- a/block.c +++ b/block.c @@ -4016,6 +4016,15 @@ ImageInfoSpecific *bdrv_get_specific_info(BlockDrive= rState *bs) return NULL; } =20 +BlockDriverStats *bdrv_get_driver_stats(BlockDriverState *bs) +{ + BlockDriver *drv =3D bs->drv; + if (!drv || !drv->bdrv_get_stats) { + return NULL; + } + return drv->bdrv_get_stats(bs); +} + void bdrv_debug_event(BlockDriverState *bs, BlkdebugEvent event) { if (!bs || !bs->drv || !bs->drv->bdrv_debug_event) { diff --git a/block/file-posix.c b/block/file-posix.c index 544ae58..3ab92e6 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2240,6 +2240,25 @@ static int raw_get_info(BlockDriverState *bs, BlockD= riverInfo *bdi) return 0; } =20 +static BlockDriverStats *raw_get_stats(BlockDriverState *bs) +{ + BDRVRawState *s =3D bs->opaque; + BlockDriverStats *stats =3D g_new(BlockDriverStats, 1); + + *stats =3D (BlockDriverStats){ + .type =3D BLOCK_DRIVER_STATS_KIND_FILE, + .u.file.data =3D g_new(BlockDriverStatsFile, 1), + }; + + *stats->u.file.data =3D (BlockDriverStatsFile){ + .discard_nb_ok =3D s->stats.discard_nb_ok, + .discard_nb_failed =3D s->stats.discard_nb_failed, + .discard_bytes_ok =3D s->stats.discard_bytes_ok, + }; + + return stats; +} + static QemuOptsList raw_create_opts =3D { .name =3D "raw-create-opts", .head =3D QTAILQ_HEAD_INITIALIZER(raw_create_opts.head), @@ -2312,6 +2331,7 @@ BlockDriver bdrv_file =3D { .bdrv_get_info =3D raw_get_info, .bdrv_get_allocated_file_size =3D raw_get_allocated_file_size, + .bdrv_get_stats =3D raw_get_stats, .bdrv_check_perm =3D raw_check_perm, .bdrv_set_perm =3D raw_set_perm, .bdrv_abort_perm_update =3D raw_abort_perm_update, @@ -2790,6 +2810,7 @@ static BlockDriver bdrv_host_device =3D { .bdrv_get_info =3D raw_get_info, .bdrv_get_allocated_file_size =3D raw_get_allocated_file_size, + .bdrv_get_stats =3D raw_get_stats, .bdrv_check_perm =3D raw_check_perm, .bdrv_set_perm =3D raw_set_perm, .bdrv_abort_perm_update =3D raw_abort_perm_update, diff --git a/block/qapi.c b/block/qapi.c index 6e110f2..4191e6c 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -489,6 +489,11 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverSta= te *bs, =20 s->stats->wr_highest_offset =3D stat64_get(&bs->wr_highest_offset); =20 + s->driver_stats =3D bdrv_get_driver_stats(bs); + if (s->driver_stats) { + s->has_driver_stats =3D true; + } + if (bs->file) { s->has_parent =3D true; s->parent =3D bdrv_query_bds_stats(bs->file->bs, blk_level); --=20 2.7.4