From nobody Sun Apr 28 14:25:30 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 1516366353286808.0833381312527; Fri, 19 Jan 2018 04:52:33 -0800 (PST) Received: from localhost ([::1]:47350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecW9k-00086h-Dn for importer@patchew.org; Fri, 19 Jan 2018 07:52:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecW7o-0006lV-3L for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecW7l-00036a-BQ for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:28 -0500 Received: from mail-db5eur01on072e.outbound.protection.outlook.com ([2a01:111:f400:fe02::72e]:17457 helo=EUR01-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 1ecW7l-000368-55; Fri, 19 Jan 2018 07:50:25 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 12:50:23 +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=BDIxRU6I1qNtTdRgPSWJgcoFc0M+FR2FCdJRQgqPsmc=; b=aWuOAcI75iSx9wKJL/QUMlThWHUyJKj8l5dytnIDfRhRiLqgRkgdb7eITGOgK5TwJQ/qAUZYl7FXqpQWIIKAdIBuFQlkEthaIM4Df30thAJp469AdjTu9l1YkNbVsSPqF5AGVzYkRkEWZNSq1mDyC7Mb22nkIpNvXkaxnbs3ZaA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 15:50:00 +0300 Message-Id: <1516366207-109842-2-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR0202CA0008.eurprd02.prod.outlook.com (2603:10a6:4:29::18) To VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: edf83017-70f7-4b36-514d-08d55f3b352f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1999; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 3:nQN7UgVXt0jDoBf1JkO02bv21CZZGbs4CtUKbLPombUPuplXIPhQ5tBobaaXxmHWFpZ5x1CKjFNX4Cq4FYdWUEuHstcDqO4zbYTfRHpdkxaPuMpoxi14Jd2lyefo+PZtVXI5weCTzGfDJzCWbfSw9K67eTbkSp4FbcxxUxuRL9YcOdW1fz/MTNAZttJCGX/6xBqXYl7c9qSMaPjyqiC+J9tAlYQ5TDjxS0LWTsuGssBzHHCjLPUa8Xb1YigNPkgw; 25:GXxytVS/vPUh2zLfGT2BXK4ovTHZNVIelTi/wN5ECI+6oP9vaW5ny/Ucmk7nvQxbIJeyP9VGm5tft3YOm7z5x3vYUQOdXLPm66XF+yb8CPIDdPGg7uVyFnYgYi8phHYEruh1FuwURyZwYJID1TuoD8Dzv2xDkbG03wgiYcq5LxX4xB9Kg2685gourSlLs2FvUSgCJKDaIeUVRRCzXicKV2H7D43+lMIwSxjU6qTq0WtdKGecgsrdxAD9xG1WzzqzSwGmwn5+GmZLuyE6y/DKGWFfF3rFmrvZ0/5enZsRmTGBgPTJuKJ3KJ4w2VF3U7AH0ylxsyH2ely26lfvXLgNMA==; 31:W0AZzR79Mq+Xg1SGlGUELPrID51FK59OQQ920Www6T3W5rp1cMgekHlcnEIR7Alye7K4xmxHWRHCRbR4j8R/CZw2/S6+LoH+T1qnVUvMie3AXLa3IcXpAZvT+9jelkHBW1qsFOHArTqx5IU/+ob5CTs6Mlb54KMRCzbS47KAR4GkKk4ZPytDUr0EYCs9Dex44vqH79rpncYJ9L18doj8iVP8ywgWka0YAMBs7Ehm9UU= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1999: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:1AaQMKkiAv82ewpC4vgPM25atk43jlCvxozw0SHHSVaANbNOmwrbDlnbUpJUgl/0VVS+5QJCuN5BCktjpuGwgDXKho3aVuxPoHOGVnNFRzbvuD4r8gzoKlqrv7VW3de63EegvhLMqyfmOmvwwpKJPwR/Z7B2imSNa6FSRHnNhy6viG4fBGqqzwsw/PGDJaYSLYDNH6k70RYA1Tuli9xkjQ64yQF9VTTklc6aKWfkGlz4TLWj0HfkGfVTgupDR2Q+Yosphx8uwunvHnoIFk2+aQsVwevIqryI87sMhSt0W9DWjEFVtn1tQ8dcM0HJPi9hAESLTuaUX6Vf6sy5W7b8yNe4xqEwE6ZHbARRGSLc7EdOtRB7URIP+YUJ0M5WUJGhMr5oOeEgrVohO01WJtXUHdRANiGalO6HUGhvuFFiXX4=; 4:U3/GecHT142cpk5INfh6+IHftlsIvf6oS9JSBIs0/q7Ee3+zDb8bJcE2gEjC2QDvXakPpxXAWUY3eYYOXOiK5J6jXY7ajkIYUlAIrtpSlWmXp6t+LOU6v6nZPc/2kQAZSElvYSRDLjEz30a53sEPCNOtDiIPADRBOFIxp5IWTFaMSLRd/j7CeqEpNa6j6KEcjAXJ0hmVe3NZu3JqmszvumjEGILbLc6y+mXO3fhH59AMfUpEgut4nNUbxNJIkBKc5hwJU8c9VL0640EuXdXroA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(2400077)(944501161)(10201501046)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:VI1PR0801MB1999; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1999; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(346002)(39850400004)(376002)(396003)(39380400002)(189003)(199004)(16586007)(5660300001)(53936002)(6666003)(6916009)(6512007)(36756003)(2950100002)(53416004)(6116002)(69596002)(105586002)(6486002)(50466002)(48376002)(2361001)(3846002)(52116002)(81166006)(106356001)(2351001)(66066001)(305945005)(47776003)(107886003)(59450400001)(7736002)(81156014)(86362001)(6506007)(478600001)(8676002)(386003)(316002)(2906002)(16526018)(76176011)(4326008)(25786009)(50226002)(68736007)(51416003)(26005)(97736004)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1999; 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; VI1PR0801MB1999; 23:5I2sPL4UeF0tjABunvwoH2kzV2hUij2xKmq7hCM?= =?us-ascii?Q?T5QKOAljLadRkelnveVL3hWTvpqPMj3YFu5JrX4et47nswn+EervduoWbGqJ?= =?us-ascii?Q?vu6OubJj9Avq1B43aE1vnK3fQofc/zVcMHp0FvQ7FUkBkkkW5x1SVBBIAou2?= =?us-ascii?Q?n49o2AukVFTbx1v2zJgIw9wfmxCjGcjGeRxUjFpGv0SL7sePoPhQgULjLWkU?= =?us-ascii?Q?wRiCv+e1dMMEWHSB6Ip9+g2/pUfRlRLmfxcDrDWNLdC3dOGBKxQcj6TTLcAp?= =?us-ascii?Q?LOHqIB5Nqvcl9Pa9GkURq67Br/ADoYmTC1KU9l+QMlWhxYHDdVRLBPeS9wO2?= =?us-ascii?Q?HthJ3ac9yEXiGS+fEwxEH0h6gXUueGSAg06wPuonScoGu5dtdDVX/QvVrWCd?= =?us-ascii?Q?8oBDYwtDnu8lxUa49lZnqbxkpV0WXItqiVNT217FJoiuJmA2zo8mnhD2viwq?= =?us-ascii?Q?icLpYB2Dfg0bJ1H9cQaYmTnVqab9UdEXXYDTQ9qpZhsrq/3HmP26zAKL9uzr?= =?us-ascii?Q?0wGDtWFTTOURl3RteoMG6Ds7+XkBf1WB2GvHeOmGY1qGZQqQNLTdIdP6tPxE?= =?us-ascii?Q?m7hwrEp/E49mdJJDv2pNOEm+prx2h9m5ztCFScmPYK3yjuhdyv+2kC0D/cqm?= =?us-ascii?Q?gRzxp2wCV/xYcMAyzpuQJFTI2HbC/zAo1/tp19XE2pa6HB0iFGn5uK5CywLT?= =?us-ascii?Q?FQCHPUIGgb7/tX6ot4PuS1D1Gix1jcVI3LQ3zX1mcLL5Z+0Q4oyjJkfi9Hqq?= =?us-ascii?Q?vaEtGFo2rxGXMjaXXtLHX2f3YiRW4mKAxFJy+hmHIcYnSLJgjjQwkt4+B7sC?= =?us-ascii?Q?/FFbpyorToRJ2htXFVMYrwJUr0ZssziyvoFRJMHQNSOI9cehOlSV4uEIR/C4?= =?us-ascii?Q?zmsjTX6ptQKNAeLQ2++dwWyKPFe2WFzKk3DxdrKUlskE9MNxqNneUg9ap90f?= =?us-ascii?Q?buLKUZv+LnPnoSBfxTs9Gh0Ig06sHPOMSnOzYdX9lsJzAh8kKgJvs+Wjexbf?= =?us-ascii?Q?JDCPHDjxsNTdZVqUoa+/pW6lzfb6cTYBEw3nwIzzEvNf/DqGdlZF8OfKfkT6?= =?us-ascii?Q?PVYrohChRIbeGytZQJIiv8q9dMePObfsaBQNAqdqDXKkL8T1taqd2NgYT/dz?= =?us-ascii?Q?B14QwsTyk4o7v1TRZVqEU/zL2ylvXVh7bXXIBPTTYA9+qz2xSZkd+zCr3s9E?= =?us-ascii?Q?6V8zVCA6RXhBGy3s5+ipopiD9f/Zg36mrNkUO?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 6:8lKaCUWVoguYIeHytQfkLLiCMkcd3rjCpPbaiQmCNJkbGSB4dpKyXyvI0Wc7WXyHNW8pxBAWrdHu2vXD5Z2XyIOJoAhx7qahRCiVkSrk/UAtf6l0JXl9zOo+6ZT/SpuH/M55gceS/1wWryhEj+fPlQKdrw4FViYJGbEfBJB7lLGuUHLBmcDLal/KDfCnO+Od0887FGvJgnmMxQMqfD1RwJOGxJLHjjthcZXTZ20fWTJUojNMYDkr522VfjizLO8/LH8tJod0UXpviNlxGecxwjiIOpUpITgW19mq7oSzpn0gbH9jVVpQzWQLB8FlKJHiT1eubvnDLrNW8cC/Ur5iwRQWzpsuoSaY8j1wh2GG4Ds=; 5:3B4yjtyf635qJFacAyxlhNbBrLnFQSXtPqNKscw3ZC7/F/voG0HokDbIf6TaUStAMmgiP2I1sN1AeHJRgsQGOsQz3qByrBt3KEdGt2QDpOCojJNZ45v8cB8VCGfK6df7dmca1XcyTHKwBEwOrE6ImZ8HWmT3+DCgmVTKxptOlZo=; 24:a1CM8YUz9zfxfls3eHjzXy06v1dH7Jh8oPGg9+5UdRa8Ap1peeH3Lft1rtpEjm4pJEAGNS2eTXzBgG/z6XXIM3h+ffOvpQV/klCLj0P0pwA=; 7:ACbSEMgqlSt9UoZn/oyPjct/bO4GTkfqO2UAU9NpF0LUQhTsbMTK1PSsjmKtAJwDK6jNtqcyToNL+hyMaBzfP24VEQQvbin9dzbqAswcH6uRK3CF5FN9+GsnnXPOZC3g/QyIEu30KCFblf+hUYHvdNg5+n6JFUJXMSJje0TC661GoO/X9yoEfKdi5e6rDoQt7mJzIZ0zzJa/SPEcJSEh0VA/7UGHBdM+avVRX7c0JCEDwFzm3peQ32uGZCWvtXoZ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:f9eeXds7CS9A4lqVtQE5ZjOW8FUyVGQlbB1tMB7T8cPmREfr9wxvLkVI817ixlPkPbnFOiIowYTrbfNAZt5mSUo3wzFL2sYTYVh6CgIU9uK84aHstUoSi6qQynL8lVNkpZ9f/9rLc0gcDe9avWhcUcd7NFiZ7x35jMH3HcM1MqU= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 12:50:23.1233 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: edf83017-70f7-4b36-514d-08d55f3b352f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1999 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe02::72e Subject: [Qemu-devel] [PATCH v2 1/8] qapi: group BlockDeviceStats fields 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, qemu-block@nongnu.org, 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" Make the stat fields definition slightly more readable. Cosmetic change only. Signed-off-by: Anton Nefedov --- qapi/block-core.json | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index e94a688..2e0665e 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -733,14 +733,26 @@ # Since: 0.14.0 ## { 'struct': 'BlockDeviceStats', - 'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'rd_operations': 'int', - 'wr_operations': 'int', 'flush_operations': 'int', + 'data': {'rd_bytes': 'int', 'wr_bytes': 'int', + + 'rd_operations': 'int', 'wr_operations': 'int', + 'flush_operations': 'int', + 'flush_total_time_ns': 'int', 'wr_total_time_ns': 'int', - 'rd_total_time_ns': 'int', 'wr_highest_offset': 'int', - 'rd_merged': 'int', 'wr_merged': 'int', '*idle_time_ns': 'int', + 'rd_total_time_ns': 'int', + + 'wr_highest_offset': 'int', + + 'rd_merged': 'int', 'wr_merged': 'int', + + '*idle_time_ns': 'int', + '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', + 'failed_flush_operations': 'int', + + 'invalid_rd_operations': 'int', 'invalid_wr_operations': 'int', + 'invalid_flush_operations': 'int', + 'account_invalid': 'bool', 'account_failed': 'bool', 'timed_stats': ['BlockDeviceTimedStats'] } } =20 --=20 2.7.4 From nobody Sun Apr 28 14:25:30 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 151636649640521.023382159934954; Fri, 19 Jan 2018 04:54:56 -0800 (PST) Received: from localhost ([::1]:47455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecWC4-0001tG-Rr for importer@patchew.org; Fri, 19 Jan 2018 07:54:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecW7r-0006nY-0c for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecW7n-00037E-Q1 for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:31 -0500 Received: from mail-db5eur01on0137.outbound.protection.outlook.com ([104.47.2.137]:55324 helo=EUR01-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 1ecW7n-000370-Fz; Fri, 19 Jan 2018 07:50:27 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 12:50:24 +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=ihoc+Xc5NytL6Zu9dnxUzmXSk6tkQ+wO0fK3JdSQy0w=; b=ZE4YqGIX6aQjsgDhqApFvuFOaRA+JxCFIzMY/EwAutszVGVCX/LjEMteAWos50sqJT0dlLH1OZKEPfEBcP0jNPPwXDXfCa0Hi/JMi5HhP5xRveT0toOwzHducH8Vy3U1ugZGSMbntLZflIPeKhj3zWD+f69H2Ma2fwcErq7owHQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 15:50:01 +0300 Message-Id: <1516366207-109842-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR0202CA0008.eurprd02.prod.outlook.com (2603:10a6:4:29::18) To VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0a1a239-4c95-4ca1-0c66-08d55f3b360d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1999; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 3:jssg3ujdOKWIFyBJAbF7mk7cq1oEGBlNl6anzK5M3TBUCaIocn5Zyxb0JBpxEe8e7E1xxkoTZZUgu+So/C0wkWfrBav9136k21CJv5B7xo0JbqwQlZ2Dh8poQ/Pk+5xV9npTzCucmkovsUFKxVyM+K6nYbQCSxge4CEPtfKdQlxlKuExz8CHF05vNnV/mMLRjRQkHuVtlrfZ1cm8ymPXDk9C9qszIyw5numGx74UhaNWHbT1TwudL7pUh6DwcTYA; 25:L9t2ZbGw3+9ce0TkFoXaCHedpuV3za5rsnNrjOgNHFfIdfhoD/kv3x8hVkbb2KrPiotR1CH4Axeb4AszTmqtgTeW6nwYKorZY573krhcFXMk7zIsgHmHPnIspVvqQllIP5OmK+Kk+AqG3bHiVqdsM4gBIhtWt7XOuD/SVX8u0VzyHu6o4QsMaer4pfRuQfG4QxEzqtlhO5CfaxVHDLtTu6E1gfTSAFNXHWiAmZ6Kck9wTIrJ81+CIVMYppGR+4OhIaCnUhZigJ9Of4jEYRYsoXOWFeH9NnlU9tKy655uCGvlYD6nCvbi9n/VKsYmAiNdo5Jdy6f4QdeKsDIJ+GN5+w==; 31:xoHSGAoIhTM0aVEXn5CzZ3Q/PcnKoRboekKZYoao1b4sMmOF+biD2zyv/lfkOMbYWXrkkFFe4DI+x2I/8nK/Kpiasx72nAnvBUDM8glY+MgI6tvkgIoF62htvDsVFoXNCscZBSWvSyhnPTUQahKe9OIG7rdDCmW8knxJkCi23332naxO8MZLVyzWb1wnPs6CE/0lMn8JNXIDR35jkVzVKZAXwS5u+KxV5Hu890Ovhz8= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1999: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:hnMMQ3+TAsCKFF4eWNcfapHZjjyu1rqVLXlGm3FKZLFWXbEobSIViOXDEVrjryg3OGuKUHg+O3jsMFfA9KMrdOXx97jab6qGNb4q9NVhzIKKoR06yqQsOG22Y6eVT+4OCx+z8u+arQ4TvxSdwnqYqGQpDjPwZ6ZwKFvEKewp5/eSkqaHdNE7suDKS75NL/tgHNW0MkCxPvAtFEQa1CSZbVYWrNe6xsBVsQSaTyokjp4CzPsMPmwfe8GAI29YeQfUEGF3XtY2MN6f6htYjnG/C4GofOko/lavEg8eNRPtN4++2u+H5OB+EpB8sDJ/5JrYgk3tTBMadme7Jj+W357DEJVDmMsibRwgWNXc9ej72bCuGdU1UN7ChgLy5JT0LAzQQ/6Qc3GN8CqbtgdT21PSEwrNhE0k3XZtw2ABFjRZ7IA=; 4:ldpcbNNdwXLR7QAgLhHMOrDEOk7+HZ/ta5yDmZFtVBt02zwtxYAuTLosqVPnDtlszc6ZPwZ964+R0p+csao48gl6irRlEaYsWTZx33s+OFu8HyalHwUGIib9CkN6+ep95bdNDkOlQvcYASOvZEg04d2yTaS8W+RTV25Gxlb5ftah4ZLEPwpShgH961aCD1YRYMza8XG7iHy30zzMoHTWYcYlgaFAs4UEmv+Xo0xXk6hi6YpsRUb5O28zgWw6q63A/DY/X38dRWRrX5OZyT8t0g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(2400077)(944501161)(10201501046)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:VI1PR0801MB1999; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1999; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(366004)(346002)(39850400004)(376002)(396003)(39380400002)(189003)(199004)(16586007)(5660300001)(53936002)(6666003)(6916009)(6512007)(36756003)(2950100002)(53416004)(6116002)(69596002)(105586002)(6486002)(50466002)(48376002)(2361001)(3846002)(52116002)(81166006)(106356001)(2351001)(66066001)(305945005)(47776003)(107886003)(59450400001)(7736002)(81156014)(86362001)(6506007)(478600001)(8676002)(386003)(575784001)(316002)(2906002)(16526018)(76176011)(4326008)(25786009)(50226002)(68736007)(51416003)(26005)(97736004)(8936002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1999; 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; VI1PR0801MB1999; 23:yY0qFRnsSqWOeiiyC6qdjgK9pKvukL0Aq8c5LSd?= =?us-ascii?Q?NOkBPyVfhBf93TF8CBq4hMIXTIz8EvydGb1jpOL4Ay2Xx3jdwWc4YtSlfa5H?= =?us-ascii?Q?/WrNNtmLjjAIauAbWEboHIy6ejeMwxTacR++SlW9hoCPhZHWr4j6eJPIPG5u?= =?us-ascii?Q?RWklPWMU3CY0bbUEf01qqSgy991NME4uYXK91vvyeUPYbcDw9whtrOqvSxVt?= =?us-ascii?Q?hvXvYvlwHcE58l8p22Biqc6d5WY55gZ84zAZotBXtzWQVQFBMnYIevnEFrOr?= =?us-ascii?Q?2aLqYjYCkt0pHW2DlSlwQacqqXXpZnwm70Qr7VjuZHkGE3hDSi5qKZAcCBOR?= =?us-ascii?Q?wtD+cODPXkng/Mdlz3qh0nXMSkQ777JqWXtNwgMkm0zL1X3fPCmDpEl1fiRN?= =?us-ascii?Q?uNOo5s9/dfOyVIHuU4f6XliYL9isXNvYM2Pjwikmr2U/YA2xAYsh/o6qnQQe?= =?us-ascii?Q?eqrdTIl34obuRxhuGcDUSdMiedf3sjHqTX/9cLhWxiSa9tWoJrd6L4CwtLss?= =?us-ascii?Q?GcH66y1ZdOEZs8ck0IiHZQxG/m5GMwHfzkVRSnIx66cnIvDU1m6ey/fs3nKV?= =?us-ascii?Q?sj/25YVmsIaXpFAsmubQ8qru3cHhgmgMaTTokSZShDrd/e0Keff42zB672Dp?= =?us-ascii?Q?ysoxx/pQhH3B332AUw2kdQQ5EbZti1/etokMB/cqY6B1BjdDdCxs5d9q/GuP?= =?us-ascii?Q?M4I/L9Ac7pVHYB6c9v+REjTNSkoloViMRLy8ILTCEYbEJEdQqIJpERnhAclT?= =?us-ascii?Q?Fg0ZrGXAO5Tjv9DDguimazxOoQsA0SBXkZ2I5SFxAJ6Wi/nurVGn/u/AT3H4?= =?us-ascii?Q?qcN4lun0aMIZE7kh680zTMEq6LRPaKugvarTFuYmUnSqpbXgj6t0MJ+Rapn2?= =?us-ascii?Q?etNQyAKcN03Z8+n77lzb442lmozln333JOcsqgd1GZkcCqIdpJJ2V/cvM7NB?= =?us-ascii?Q?x/n8BH2vVLPTs45mt1rSyujFVtzT+DdCBCOI74ZDLdoCmbI+HsNw5qSufMht?= =?us-ascii?Q?DsZymeK+d5eDxgMWRlykpvRcuT1qAuXVq7178x5ooGj+3R4nG3dgAzGBzFGY?= =?us-ascii?Q?oEySgbEGNGx1noMsI/FhaGXNsdf7VBOmYqkBfhpHA/BxCmy0Pe+vLc325QUc?= =?us-ascii?Q?1no7zVr6uZQAkDHTv6mXo8svgRVQ3VEy3UbaCBOt5H4Th6ThGvHGDojdMgYt?= =?us-ascii?Q?FrafgABlBejEnSYnzjaOn6nAgzCWSxcz1EzJ3YN3WeflaT6HYujiltexmvUS?= =?us-ascii?Q?3PTOi9HZYP3S+MuAOvPe4Xk8xnPHSpf9EVJkgrgXYFw0wKR9BrlnPp57Hz5u?= =?us-ascii?Q?hRN5cwMREtRWRAseeJzPZO6uXXv7SzVzNF7P9RFcNs1pS?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 6:jWH1yC7bMF5dZ2vc/+MrpdOAkZQRuC2cfsDaIrSKuvhxNK/aGsgkDorhaKT3p5I0d/cIyR/qvXLu4HSzd3CwmJfYVlR86ZQ1tMoBvhvzqgxW3DPEU7blA7qMYn8B0/ZNU3gC/OS5fJ77z1jVS9C5CnPYtSQ24mwlVJbQqSLdzY/Sv5VtC2VnCEBRFnzeS5M8/0GnJqrSG2uhhQQdNZha1awCdhGXEI1H1UwaDbznwg6C/rc38ygtznW62htmuQFd+/JyrToJuIHRgp4J37q76oTGHMfr46584IlMKY//Cbrxtg2/lRy2rOQVbvOPV7hchDhuglCYXWaH1re+gvK8YcN4EMzfxO4qdmIZ4/k/S8Q=; 5:E2Ww+qquYMzNBSmKDbwYVUnz/PnqOyVZFf+ZUdYBM3ZxcXPETtRs2de1Q6rMySmJHO2Ms77hCpOS3s/aRzL/4G/laxDB/JteoJuNRtynVAR48MwhTEbmUhXz8UM3+R6t+89fTbGoZILVd7YThfkNQhoQBBfADYVxwuxHoMM9iQU=; 24:ZqIUkimyzcQiUC9MdKfMRWFN+edHqpUpGYWbDUYknbQxBq3s1wa1GsY/uJIZnJ56DGSr49j5rDpFaIfINoFpeQnYTV5E21qcI9JarltivBs=; 7:ipFOBhvLDJ9fgwfZtkddyIq/9/pgZDvUv8HGht6bEoH4lRL1xLUP7E1nYTOxUbEQKH4uEBYYe9B+BanjETN8E7q1u24XPCn8wcM4ZAgm8CiD5XCk2jCLZUyyUj1QJoRZazfy1Qv+nZs8QmITjvjrKIRFsSjGOzGOLKZt3p2m27BfwGhi26LeZsX0CJKzSsj/CpTba1q4Bu/luz0t9KZhx5FSe5vQhqc6jaoYIaxnrjrdOD0weTUsio7tTVxN7Op3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:bBANiGHtqaPmXJkYDDLJMWEy8llNHkyGPIcoo6dpcIixYvl3qhvCMSnMW6DWrp1RU8+W9RPW3BMdZmPnxkcbaMmdq5R/b85TQkSZtFg7QFqzCeL/9iolwKxnN/wSUb56r3a5nvSMkMHI1B4OoE/XnqU8NMLSjg1Nyk/+vuJGNgc= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 12:50:24.5764 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0a1a239-4c95-4ca1-0c66-08d55f3b360d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1999 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.137 Subject: [Qemu-devel] [PATCH v2 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 , den@virtuozzo.com, qemu-block@nongnu.org, 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 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 2e0665e..3fa2d3a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -674,6 +674,8 @@ # # @wr_bytes: The number of bytes written by the device. # +# @unmap_bytes: The number of bytes unmapped by the device (Since 2.12) +# # @rd_operations: The number of read operations performed by the device. # # @wr_operations: The number of write operations performed by the device. @@ -681,6 +683,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 2.12) +# # @flush_total_time_ns: Total time spend on cache flushes in nano-seconds # (since 0.15.0). # @@ -688,6 +693,9 @@ # # @rd_total_time_ns: Total_time_spend on reads in nano-seconds (since 0.15= .0). # +# @unmap_total_time_ns: Total time spent on unmap operations in nano-secon= ds +# (Since 2.12) +# # @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 @@ -699,6 +707,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 anoth= er +# request (Since 2.12) +# # @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). @@ -712,6 +723,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 2.12) +# # @invalid_rd_operations: The number of invalid read operations # performed by the device (Since 2.5) # @@ -721,6 +735,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 perfor= med +# by the device (Since 2.12) +# # @account_invalid: Whether invalid operations are included in the # last access statistics (Since 2.5) # @@ -733,25 +750,25 @@ # Since: 0.14.0 ## { 'struct': 'BlockDeviceStats', - 'data': {'rd_bytes': 'int', 'wr_bytes': 'int', + 'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'unmap_bytes' : 'int', =20 'rd_operations': 'int', 'wr_operations': 'int', - 'flush_operations': 'int', + 'flush_operations': 'int', 'unmap_operations': 'int', =20 'flush_total_time_ns': 'int', 'wr_total_time_ns': 'int', - 'rd_total_time_ns': 'int', + 'rd_total_time_ns': 'int', 'unmap_total_time_ns': 'int', =20 'wr_highest_offset': 'int', =20 - 'rd_merged': 'int', 'wr_merged': 'int', + 'rd_merged': 'int', 'wr_merged': 'int', 'unmap_merged': 'int', =20 '*idle_time_ns': 'int', =20 'failed_rd_operations': 'int', 'failed_wr_operations': 'int', - 'failed_flush_operations': 'int', + 'failed_flush_operations': 'int', 'failed_unmap_operations': 'i= nt', =20 'invalid_rd_operations': 'int', 'invalid_wr_operations': 'int', - 'invalid_flush_operations': 'int', + 'invalid_flush_operations': 'int', 'invalid_unmap_operations': = 'int', =20 'account_invalid': 'bool', 'account_failed': 'bool', 'timed_stats': ['BlockDeviceTimedStats'] } } 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 Sun Apr 28 14:25:30 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 1516366635732789.8400912332354; Fri, 19 Jan 2018 04:57:15 -0800 (PST) Received: from localhost ([::1]:47536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecWEM-0003qi-WF for importer@patchew.org; Fri, 19 Jan 2018 07:57:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecW7s-0006pn-Ql for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecW7p-00037x-LN for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:32 -0500 Received: from mail-db5eur01on0090.outbound.protection.outlook.com ([104.47.2.90]:56398 helo=EUR01-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 1ecW7o-00037O-Pa; Fri, 19 Jan 2018 07:50:29 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 12:50:26 +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=QpizvfvgHRIsIk/9t6uQde2ycomDeRp9cWJV9d1GfIw=; b=KlQ7HXpoN1YHav4SXWgu3e6PmJb87Mzxdt+6oeWjiW0RJ8MbC3savVNL8HTFEES+kU7hACnLhlLD1UmIzwWSTTZ0jNDGQG71kJTnYom7qg4Dx+vYsOKlBRHziiZIkFipXHExaPT5yqgzMX32bQnS4GMsgT/1NLMI8ExqxfEu0WY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 15:50:02 +0300 Message-Id: <1516366207-109842-4-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR0202CA0008.eurprd02.prod.outlook.com (2603:10a6:4:29::18) To VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6542121-8b3e-4a52-15a7-08d55f3b36f9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1999; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 3:M1bfGj7BJ6LWDy0NP9zkDDclU2rYk2X7SDG156rV+9oxMPKqxLSDvNPcuYOgMGyD/8xodmrU+Vq1ylmshivjaUZpwlEIkcBLXigHb91Z/F3dfN4LV0pFSBj/KiayJzl0cgFB3cbK3Vbfb4eCthiAI4/nji0BsQuBJIBK4uFPATqPT/UluN50to63qKClkHf4v9zUkUEQG3vUPWEKAsM1V8yUx6iM/DDuQvFij5xsT2keZHrSqh8NFhRQ8/w9zyDr; 25:3f6vwPOVTEFl7CzDtrpcs9BPnwTIh1XfEHw2Q/Vnqv902miGoXprGRFzlOgM2QIY5XDYXSayQ6LazrOo/nTAdkCpAvmvo3fixZ+WvUbTtXbngRdoqkIYgSAhdTJWu8aFmIyzL9kDI9mr1TgHo6KMrbXMvsMO9yGkK+a5S7lgcO5pKxa74yeVvkTiQdKJXO5v/vk4GZMKI22ah4NZh7cSbAzLUNbDFqu9k7wzfcmUPybAq0vRDuTeubcb7P1QpgTu+J1WYOR7tiSxIxAwZ0Pw7rNOWF07T6s1JKxWssvy02doduTGWPl1F+A8q7391CbQqaYRFOHY3qktp+s4ntchGg==; 31:Y8fOt7GfomOXbSdTUBScSTZWNefcnlJbx4i6eVkgYT6lDJ+dMb2GGOf91HXGt0UD/UA/9w418Duz9xz4Lu4C+KFz7dQWgztdHrcdHn+6vy38ThEJmMtRrvpzFcUDEYG0BruhE9fQe+ukqyf+CDwsiQ4Rjfmxl2xeLQ9Cwmf3ozRHneghcOQZzZBJmZRQIQ/dZpZuHPKoU6T3VrHW5J2BR40FSIKCKcisWUzekhda2Nc= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1999: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:0dKl6aeVsKX68sIOMQF0Gc6t5LIrySXalL/vUuKCPYb0fbkprKgk//wSsNaNm55dWUtsl1UujXHMbYUWaQl40GlH61geQhuLu6UCgiMhFTUT5fB2MImtBNSt2rqCZk9MFbaD5hiEQ25apxIjkm7M7SZ6S/wGj0jHNDnkd2ZSb99l5XOmbZtCjrFxlcnZ+Q4QT2MfUO4935Ft/9ZZ/nViMKo1jS8kL0ufxZdzuCzefl9Q3FsPs6cesmn9R2MbHiP+5gLdcXSzuugmM08LOAbCcdz/xPKyHyI6O54MKwPGNJSVs87BAJNDbHzrb7aHXPPsVd5j9Euq4H59Y4H7CZVHXOYvV/JmJipuPtWVZul2hwJNJmNhsVK6BoWX1YvZ6+680Wjze6ak3cJsH46FaUwmzGrOXc6cZ3Jrj4jrV730UMA=; 4:q0NNWAT0Djw1oYPIKAf0p9g1ismkLIuJ6fEB3ckN51sk4GcdGbt8YwCGdgGWOlHoBJmvHClamYIrmnmw149FXSNfRP9BaYrtbTGj8fhpVI3XY5VNyVbOCd4p3zy2YQQUp64IjWFCPZeoFQSygXahR4C3P0Q1ItNl0E9xW9PXa+iPkVlUeEXoN+m0BYK/gfV56SFmAmE/ThSbWXrAcjDkZHk5xbhG5MwbBhyFuA89U4XhL2GvQ1ciGXhuYoyWNmqP90qQpgzUUZE22IiseWn2Pg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(2400077)(944501161)(10201501046)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:VI1PR0801MB1999; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1999; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(346002)(39850400004)(376002)(396003)(39380400002)(189003)(199004)(16586007)(5660300001)(53936002)(6666003)(6916009)(6512007)(36756003)(2950100002)(53416004)(6116002)(69596002)(105586002)(6486002)(50466002)(48376002)(2361001)(3846002)(52116002)(81166006)(106356001)(2351001)(66066001)(305945005)(47776003)(107886003)(7736002)(81156014)(86362001)(6506007)(478600001)(8676002)(386003)(316002)(2906002)(16526018)(76176011)(4326008)(25786009)(50226002)(68736007)(51416003)(26005)(97736004)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1999; 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; VI1PR0801MB1999; 23:0p6b4N92PRPTC1K01bYZ581QXsNWSz2raVxtx0a?= =?us-ascii?Q?HMHEOnkoN7Z2Ag5aXNuTZOIJfqzSgIvcZ/evUyZY6rp1NsHdGa0pAckp5B3/?= =?us-ascii?Q?mLOx4uov+suKfOrNa6qyeVa6LSD4hYM4Prdi4vqNP4YT+cpp0UZz/p9K1I+0?= =?us-ascii?Q?+kO2OvhU56VJbMf2z5zh6ihlHWVPuT8VHQaHE9pts+yfHT71Yjh5L4KdDaAe?= =?us-ascii?Q?W+kSrYmmIHBXzWD5m+LfwROP1HN+IaOX0wYdZ458CxQkRefTNrSJuKsixB84?= =?us-ascii?Q?MvsEy2NsoKSKytstL2NqvWEvPgRI9OvwKfHCPS5aHlm4/Wb31HA4HH4ohLa9?= =?us-ascii?Q?+/2wmzjTakZmRqkoWAllEBriw5G8CbabYxKjvfgqh3fcUvJ84sAPrv8lupWC?= =?us-ascii?Q?R9k9FrW0ZWDcIwlvubsYTTyjUmiyCuqqoHPQTARkBJyXlxf3T6prrSG1bqv+?= =?us-ascii?Q?B1Q0+xp2aHpyENssKh0iYa8OL9tvUKMdXW0OUA5Y95RefPtfIqmkaCHe/k9q?= =?us-ascii?Q?sjvz1abxlZWgwO/rxFelAxPmWHjdkIH0svAtIBgPI2X6jCsFZIaeGsvbDcIt?= =?us-ascii?Q?keZr710tdtvMx1xgJRqErPuF7ZcPJvXwbPFvU24UdAcP2jNnGoqx1fgZ9umg?= =?us-ascii?Q?wQoWT6tu/CUp7kfucgeWkwEJbs+tJtM09FkGstcLW47NSxofD2lqVo6Hp559?= =?us-ascii?Q?lYMcOuAYQvsxC0YrFU7WPJSDQ7P5gpdtwiwe6T5nH/7oqAgHffdsMCAKQynx?= =?us-ascii?Q?y1kQ7K9+ehtQRAhENeiRdJn89Mc56Q73k2MfhMRJZldyk7C3bXZV2ZAPPagE?= =?us-ascii?Q?FYW8Q1+Aq2Fu5WTsq7M94JaY+c+tTuk8TfV5Nm4yOeSK7jq266E54lM2P5oH?= =?us-ascii?Q?oWl+ryuEW3yunAlmZXgl8+kages3LK5avPnLdLu2VRhkNoXqbHDBX2aQ1Zq3?= =?us-ascii?Q?XYIBEEDZsqkKMQRSbui8dDtzT5FcjkdqJo0NAXATTTNAYQMVDNWEK/Y/xZ7h?= =?us-ascii?Q?hTjy8iSmLq/1ZXjpKKm14hFMVtjnmYt6fH3pGUgI3kryhV0+bRvsvHF+KeLJ?= =?us-ascii?Q?yUIv7tiIKNMIm3sCgtrAmFjrAJnaICw8o8kzsb6c4neOqS48oTwg/JOK1LBz?= =?us-ascii?Q?rha/ACyKdc60iT/dkekkOL2OmmmbgAJV2WGnQUzfsrqcUZDTELbUEIbd8Sh5?= =?us-ascii?Q?zfEp1W6PcIJy53lQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 6:sSiWkripP297BrA2Y/0Zk3UJfHltNCrrmwgqNOXaWud+OYgx4jJ3KBhrwb5gAunTpg8Pf9mEolkyQwneEo+Yl7b+yDvE4rrdAZ3D6LJ6viAFaBxTYHJMeOZIitiBI98qKgoLPLDAdv1TvccwPWSN+varqUAblotyQKo700fxQngYALctSvgAbWkwm18OkBIvip66hI04GS87Jva6T9NEoAbWAqN5zRxxgojQCB/WwAeYvMCmaRjjxhcAeap/AvIY3a9QaDNQVSp2Np3vdIyWnn4jJORNtHC/UV2BESpAOq+G7ybDZP8aBYcoear7pDy9Mez2Y0jhBkl4no5Youbn7eG8DAOcPLJoS9A7eEj26+U=; 5:d+RHNOPFX2caHlQeE3cBWukHiL0d+HPiyZMCnpXvX3p7ErSMbpfoydNiudkIwU6EcAob7SUn3jB+ke5bDLfHgpGTclERm3ZyRZC3NK2zQTWnf600QRt5PWTtzkWZ4/ej1wE3QJKhF7LQSLotSSrOR3PLQJDghNDdjsMTDzdCmE4=; 24:HftKa3F3pvvmxKXBgICIrtOosOy686AIEz/btm2c7urUeCq6a+PO/Ji2ZnjiU8vLlL2BZMhcGuxy5Xp5nS+CTYO63MGY4F/LRN1gyzJRERQ=; 7:bNVZJVjLXRH0fRj9QodcyzspN0/OpdZyT2VTFQXnxvu3FP4Vyel8IlrxdtQMHVrJHNkx2xGOuXjNWNdunqJ4ixqHpuZQjEJrHI0D9ArTaRyBYjceaMtMBLOSBWvDzabZ9RyutSgb3hlLg9xnkdwcQ6w4Pwd3XNqbetLSL+7r6AFvrcNekaMdsojKeDRnX+sl/2gCnMRnwh++1gfPF6T4PhhZdIzxTCM0rC4UnLDt71dyZPy5oGtqM7y5PkiLFnrt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:TpAz8UvU7516N5cfEKnoV51zF+wIV0wzwhOBMaa0/O7YcTJhOOL+xj76J4CvpkiLSBmla/X0bP1G5AjmPHOEKBs6MHEisUx0xAk6VzF0nlx6TSAgNllw6ZQFHBUTgS1z29M9h6t8Chid1o765RNm9cc83N0P0k3w0B41MQdtewo= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 12:50:26.1233 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6542121-8b3e-4a52-15a7-08d55f3b36f9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1999 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.90 Subject: [Qemu-devel] [PATCH v2 3/8] 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, qemu-block@nongnu.org, 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: Alberto Garcia --- hw/ide/core.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/ide/core.c b/hw/ide/core.c index 5be72d4..6fdc936 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -443,6 +443,14 @@ static void ide_issue_trim_cb(void *opaque, int ret) TrimAIOCB *iocb =3D opaque; IDEState *s =3D iocb->s; =20 + if (iocb->i >=3D 0) { + if (ret >=3D 0) { + block_acct_done(blk_get_stats(s->blk), &s->acct); + } else { + block_acct_failed(blk_get_stats(s->blk), &s->acct); + } + } + if (ret >=3D 0) { while (iocb->j < iocb->qiov->niov) { int j =3D iocb->j; @@ -460,10 +468,15 @@ static void ide_issue_trim_cb(void *opaque, int ret) } =20 if (!ide_sect_range_ok(s, sector, count)) { + block_acct_invalid(blk_get_stats(s->blk), + BLOCK_ACCT_UNMAP); iocb->is_invalid =3D true; goto done; } =20 + block_acct_start(blk_get_stats(s->blk), &s->acct, + count << BDRV_SECTOR_BITS, BLOCK_ACCT_UNM= AP); + /* Got an entry! Submit and exit. */ iocb->aiocb =3D blk_aio_pdiscard(s->blk, sector << BDRV_SECTOR_BITS, --=20 2.7.4 From nobody Sun Apr 28 14:25:30 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 1516366405331951.6970803742845; Fri, 19 Jan 2018 04:53:25 -0800 (PST) Received: from localhost ([::1]:47353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecWAe-0000T9-Fo for importer@patchew.org; Fri, 19 Jan 2018 07:53:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecW7s-0006po-R2 for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecW7q-00038I-5v for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:32 -0500 Received: from mail-db5eur01on0090.outbound.protection.outlook.com ([104.47.2.90]:56398 helo=EUR01-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 1ecW7p-00037O-S5; Fri, 19 Jan 2018 07:50:30 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 12:50:27 +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=Pc6uK6KgXcRiCjzGql3ZtbSpB8fQpDg3IKJzCBAcmIo=; b=DMW67YLQEdyn1FNrbrPljIasIRaNKCP8flnqUC/XAon9YUpJ5UjI/jYzHTHCAt+j5lTCFtGz3srJJE34ZL5y8RIwQvLycTiL8qS1EDWWB6WElemfevCd8Q+b2phEC4N97PiusT7kicu5EbaqA6WRLBUZmGZbNec44PWj7JHb2/s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 15:50:03 +0300 Message-Id: <1516366207-109842-5-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR0202CA0008.eurprd02.prod.outlook.com (2603:10a6:4:29::18) To VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5023d96a-8c83-4385-332c-08d55f3b37d9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1999; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 3:ml96+f8dFQupYuQWEHUq3SDDX+MQwz1trqZlcqueDJZ8u3sJFMbUIsqfQv63j8x+HmOIRNUvpIFgMR1ejnYT+1BTxszsen25o5BZKlb/pk4ehfFxstSnFs+Uz2wLl9Jn1739GimPy4+su6KC1lMTdz5SUc/ZO5+b1Nd82wMQeVZYBmMgrJ3sUBaPdibGOq2LU2jgKMqdoN7w11Cn8rKwxHMul5gkGZtjEhSNGp7PPH+vox+/hV1mTw/KJZTjo+CV; 25:oPSCxFSLwe1rVTHsi3hX4HT/vqfl7IWzDnlR/zqEzn/GW97FWOz7oe+rOIXzmeTiZ0QF7uAC/a+OGkpgaOxy5ThdqNKIOAJfnkJRgknw8HVCOFwIaGRZQOj3s8K3mcbw6mklF519dOkH8V+jJ9ed/BeAEoVK2ZX5EQ6lbe4rWMAR4ADJLVgrFD46fMr7HbbAlUGR+SFb3gtjn/xxnots50oPngNAuheB1A46Wyt6OFKSPdIzyPtemymJGVXcBFTMvx+Y0rif6YZ3G7CY+HX3ec3hXpIn3wfu/DdDmqrBBuYHHpYGkEROfw2IlrvXyfY3GrkZRbdPLVrZVAzNn/1P3g==; 31:0rsDu4v58hXZU4Nbkj6woZYvfCVa8nyNzq8KawnRYpd6tdlkdqEP/xvESdSsz8pGYYjt67yYe1jwUVy+hEh8eGME0AqzIesPDMwBAG7n63Rx34e6A2kpKbdd9VqFTtI/F8wIsBNM2JVCK4fHyMgMsWRwhgob4U8I6BxFKDhkWtyxAtOwSlZ1QFrxq8GlHmn861/SCKwZV7FUX4Fd6OsGzRwjtGmBWromCXHHYTBT+Fw= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1999: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:WKgKZFsIp0kIR1i5jc3+PNmZOYUGpf66PZX8gMUpGOlYOvWCs5g6ExPH2q9Nbz1gvTKNSwght2ny5E6K84NHLG3/ABIvsKqZB9r2pRLCwk4Gm05lhgtueeYesFTfwD8vRdbDyFg/fFlmNk0AhgsIfA7KLrdBqz0OF1Xnm30WRsFc4WZc9iuVjYeoUeX+8ci5kS4+D8IjUXnCv+YCRYIui687EFc6RNtnvptq9w3j49zL3FkEOdofr9TK5QAAb03ghOdh9revc+Ia4GS7blISw9Boq28nIn38CtcmvGtvCBzgeoJn0YDGNTde3NXWXKMZybo/LBMpRnA5wWad+9mX3j8/CTTjprU03szLon4mcXU2WfvOkoCeMhmfBSxHHQBTxSUrZJV1cxIdHKodSgd9eInOjtN9mRCTIJDwde67N80=; 4:HPdTsXBrqHGjGPEuxWd9WW6qrtHkj1YhSPjFo9EExXSjv2LtyHIdUV8G0n3zEvwPdz/DVtWayPoG78gj9fO7wQ4OZJU3Xl0uRj6qJ8FECRiN+jFihaNspWVldjBT6SjQRm2wvuX5sWWhuAfzuqJ+BpTFIR0N4GccoXzkI7/ohekWtRkJEomKWf30G7ehM3ro122mv+skvLWOsswam+uu3tP8w9T9fuK4qYTbQBayk1n1YFhBpWazBWJ1SHwlhtL/PrbNf334RS/Er0Ry070EFw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(2400077)(944501161)(10201501046)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:VI1PR0801MB1999; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1999; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(346002)(39850400004)(376002)(396003)(39380400002)(189003)(199004)(16586007)(5660300001)(53936002)(6666003)(6916009)(6512007)(36756003)(2950100002)(53416004)(6116002)(69596002)(105586002)(6486002)(50466002)(48376002)(2361001)(3846002)(52116002)(81166006)(106356001)(2351001)(66066001)(305945005)(47776003)(107886003)(7736002)(81156014)(86362001)(6506007)(478600001)(8676002)(386003)(575784001)(316002)(2906002)(16526018)(76176011)(4326008)(25786009)(50226002)(68736007)(51416003)(26005)(97736004)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1999; 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; VI1PR0801MB1999; 23:9qPD+An66rv9RE2NtzLO2vglPyVyNJRCdxaqnBs?= =?us-ascii?Q?uVY/jZSJEMDjze6rX7sLsNOHbRGKwwhd80DGmSvcMK9EQNDUTN2OYUgSHidg?= =?us-ascii?Q?+yLp5HzzDrBF/rgbvpSWXxGSYv0uiF8XmnzGQfjO2VgjUmionZc7Gt69hs9y?= =?us-ascii?Q?ER3zhfWwLzAJqQKDJ2cXHXxaoLmlX7Zx0MLCwKq3T4+16/mBcG196I+cGCPa?= =?us-ascii?Q?x7YU1sDdNmGbwEKAJ/e7uRCaUJC7nN8Pdm+g3HJidvyYlaCbMLUuFaUUelss?= =?us-ascii?Q?GEWTznC18R1vb8bsOWFWnxFQtE/qVjIA51y/mjV/Kpe29avsrk82uHwE4Pl8?= =?us-ascii?Q?kbdJcobbgP1QaDoLgWT+HGqNqzctBhh0zHNxkoosXUc+uGcZM+8xNCh9EfIV?= =?us-ascii?Q?1PpUjv7p9P+wkCB4LdD06p0ttMd6VFK3szXUlxA9BUlUnYCW3HLD1LyS4q5p?= =?us-ascii?Q?HbJW2mm1kF6vTsGEb6GU00SF5GLgWF6el0ixhqbNjCHAFk0G9CT0hdcIL061?= =?us-ascii?Q?Y6nKcPNGFPcv+0z6TeehbkDuBxTpwfQcly5d54qCM/WkipyjoE8aPwDb1hbr?= =?us-ascii?Q?jqOESix6B2fysHALcG0Wd4gQfM62oM50pos9ggQ6Vk97zqRgyJ010eV+X+K2?= =?us-ascii?Q?MGB4c8pTxLs9QTiTIjxRxHx8UAD2pyi7I7YNHUlK2dFh9CeuWCbWj+kUH3gT?= =?us-ascii?Q?eErSFD2FKChsaD4ABqJH2+3Zzbm15FqY0dg3CuSjIEu6Jtw9Crb8P+EqazDw?= =?us-ascii?Q?smeZkRU0Gjsz7leMW5YU/Uxce9s9G0RJKYnD6LroOA5b8Zve683SQuaraTWN?= =?us-ascii?Q?g8oZMntDX7USIJQM8cbXcnvPv6RLHZDrqy4TAfHVkZkNxV3ND6y/ZetnIBYF?= =?us-ascii?Q?MoFAnj/5XVjvilmkVoM/+02lSFDm2WMOhzGi9B0u/tiSSsixxgpvWxlqm3yW?= =?us-ascii?Q?TVpAP9d+akE5MC35N/R+lsYvorQ4SQp5qWBvlocT7AQm9o2izyEKJM1WWwdk?= =?us-ascii?Q?RWnw8tkHXLDL/EcsYz5u35YoQC1XK/Dvr3pqKBjPmP65CPsQUYqZOBFEvswB?= =?us-ascii?Q?6btjNUcInnFqRqQh7vQCatYxf26/W5ncjnbXrDRFZwDY8//ogzw3GnHUHuGy?= =?us-ascii?Q?bXMOarGOVto7uiwRq6Oxj9LAP1rtX4fLIXcJDR69gD/WhcCQUvPZJ9fUHIdI?= =?us-ascii?Q?MSiFLzPEomRoi27BP1ls8qpJVHcemAbRTLZXg?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 6:XA+TaXsHOZXi9OJMLwWrhzqhCqdn3Ei3x4mKHz9NoT07XscwXbdUvVpnE6DRpgbLXGR61354VnwYW1iEqwCajY+y4welnnmWep7U2VOu2IXtxy/eyPCp5bSiw1QeVCKOxXCuZ9TcuyNviDBTGS+/wXEpP/WoUnGkuk82MQJp5tpsnRAPaISXlGU3SjJxhP8uLCar8+sEcLTDX1YLeF9wPgEgI/aUVahDba1Fz+830iFTSjfxZ/7HlsRqWn9UggPTe35tuq6uxoFtW4IcmOT74NV8PlsSVX1Uquvmq1k5h/dLhKyifFiPnkjKrlVZEcYP5l8kuB5KNZ2ELNoc1Ngt9hXVk/rIzxmKcjDCXGd2GSE=; 5:C7MQVenc2EiyxkQglqOsCDM1zj0QcFDdcjK/LBBs2kK1z7g1PFUWfF7VNLI8QdQN/vxfl998EElOghTj0y+B/nllIIdwBOZlq7rT92G1sB9o66wQZ165pheT4XrrVd26F/SfGm7lBOc1iMUzbdQYzoa8J+qt3B89T1nBVs9C6Bc=; 24:nJX/Udoflyg6facPhu7RijnrGZG1ZiFEIZ9PgnFpkv29Aj/1p7zsKQzYrksnEPFDeuamyLMew4ryVxLy88Zae1Jd+TdUfzoB6BMTHyc5qlE=; 7:B+NYxCLMq2BVXeLxCDcu5du8/zliPeN7vRVP0n8uM8rpkU252GKbvxfaXDAfaQmvMoGrgVPHzUlYTwG0QP8qWBajsormu3FBz9ISX69dQfMwdv5LZDdGIOlFcNRNcmaDnVRAZnsWZVNlfW0b7MLqPIb4OLDgiVb+v+c6b50IRsIS82tpOS3I1UQaSlRkw+CDhB33cYjRts8JC1uXT9qaY6OG1WAwmloGtVNpCd3wQ0T1sLmBbvm7SubNT5QQ+eRs SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:2suBAKLM/0uhUfzSMnf61Vqgpi3Sl/6FoGHMOPkok/nwk76dwh8sVnS1YpCCkwXiW+GufuuDJQDt/GkwAc0vxqyhxrGnrTUodCdXU3yr4H4saoJSHR5D74pvKJ3rxfAznYchkpaboQIPOMq0tg3rIuSxacx+oxvyvyIvwcgfZuo= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 12:50:27.6077 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5023d96a-8c83-4385-332c-08d55f3b37d9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1999 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.90 Subject: [Qemu-devel] [PATCH v2 4/8] 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, qemu-block@nongnu.org, 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" 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 49d2559..7b8e0ed 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 Sun Apr 28 14:25:30 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516366527449261.09350923079; Fri, 19 Jan 2018 04:55:27 -0800 (PST) Received: from localhost ([::1]:47468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecWCX-0002IO-35 for importer@patchew.org; Fri, 19 Jan 2018 07:55:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecW7t-0006q7-4H for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecW7s-000393-BE for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:33 -0500 Received: from mail-db5eur01on0700.outbound.protection.outlook.com ([2a01:111:f400:fe02::700]:5568 helo=EUR01-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 1ecW7s-00038e-0b; Fri, 19 Jan 2018 07:50:32 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 12:50:29 +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=xUqmIyLbqxxYhTGIlS+MpppviaJ6yfZ5RAnIam+R1tw=; b=GfdVBfzac7sVOZQGZ+nwFN2KsjymiA3A9zq5/ao/1UMvLcQOZewlfPe5GKrLoV46mN1j0fGOCGvOOKeM8xlVdqCCh89Cj30hginBAQrDGwQvbe/iII9kW0MHLvkYgNLN6bfeCr8U5Ntnl9BNjI+3K3XqCbmquQ5JQAhL1YyCdGY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 15:50:04 +0300 Message-Id: <1516366207-109842-6-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR0202CA0008.eurprd02.prod.outlook.com (2603:10a6:4:29::18) To VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b3c0bd0-8f61-4620-298f-08d55f3b38b2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1999; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 3:Zipk8VKtQoDwGwP6U2v9I3jR1D0z357xE1YXc4seJcNSwJqxJUv8GjvmG0Im6gnrHG4L8y1KdOtSbP3fPw9N1FQt1FbwWiMweyOOE3UqF51j6BGNXt+f1kwBPOaIo5dEt14UtX/0NBgpbFa0YK6slkgtQuPwjaV4OuFkfNTAAOupwEsPkXyVtssJMGjx/ybRmV5t7rByxIlwG8OlHQfcG3+IEAs45MsCPudpqTCFzwPxpYY9Kcz+VjOkLdfvti/T; 25:DYQixVEN5bJEN1rQ0YrINXDgbzfwD8r2sD0M4aa8JnB+Q0U0Ea+7ssEuSLyMXEcU1wSMoouIl3WbfD1uDoU2iz4bBKP8vA2gP6dDSz45EL5gZBrUpP2IEdCy8BpiP378gu6CbL4BcD7JJiLLczdw0aqD46OCjmhhFG6DphKRX7+TOcQTeMqhOeoZWk0y2TVNcb8T7OgttQYak02QjazpvVJGgJajHoCuun3VRi52Z0M+52Txogg3uY8U5tSd5aSzmNYUHRpHQBecYkwu9YZ82lPz3Fj33hjmA9xvnT1cI8qSxuO8Rg4wlybOdDHw5V86ab6S28cwVd4dJDmHrJs4ww==; 31:3hJic4u4nH3XCqLIx7QSVqRvWqsIzEh++V9+kadkBbg83Upn9gQlNELj96YNZ2z0RDm3+tP52a68aYOuXWJ0Z6Ysb3tMs4qzepgbZnQG62GnpJ5NAgZtPLAghXiKLKhcZJdrRhwTb7gdd9/hGq7UDzoGS9c2t7HBphnW9kxpVU5wk3vqBXVwgSQvgfAL9p+KiSUdxo4kn54nwUbp3Fbbn50Q3hwAJL3jpljruFogOBw= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1999: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:+i9iwkhGqEvpkIwmTweyheN58rCjCYXMlhXifQ/oRU2p0RIrVNCeuGVF+dlXdaRG+G5WjX4bfLwNwGMlddfmFH4+ZMaC8xAm5f5mLDc5BrOy1fIfcjgVrgCjQQVIayba6ENgO3QvdyrqdIrtekGVmf21K7LzPj7cQniKl4LGBf+At0kmOa1rVRs/1/tiLG/Aznn9QCp93XfOLR/T0KVXbVdORGJqv5carWLmlWTPgTpPr+UEC1l2z9TqQeXqq5Oj3WeJl54VFbeLcvrWp3Nt8u1FM99vcLX84xGYGOkJd9nDpHtY2kqzC9paysp83pRrh4uo5gGnw/9awh2EZz/Yp3hMyR2nVR1Z47BMxjKLAv8dnCRg+QFDwIz9YfQ07r+I+aeD/1c/VglgW+Qhq2QdWb0SaWiM7oJalO053hqt86g=; 4:AvgtlrzSK//uHlpr95fIcAI553EgVFuvqb7eYqF2DGwlYC0hdiQst/cN37UkobmZjUId/n/uFNC8TUjykGfumjK4I7Mmg2SDW+NYZxWBVohzVx+acb/pxeeC08dPg+RRP8V268AuhNxta0HMLQVb3MoMuJ3gR3KFe2HfkG3lTi4tZUjSQO81Ujt5D9BAd4/fe2kVfQlwuAQJ7+LhAGpd2I8POnHObdQBSzlgKcMet3XT5Gmri9KGnfoHbj3gu3Bj/LAbIA6ikZiHx/NoiQxqGA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(2400077)(944501161)(10201501046)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:VI1PR0801MB1999; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1999; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(346002)(39850400004)(376002)(396003)(39380400002)(189003)(199004)(16586007)(5660300001)(53936002)(6666003)(6916009)(6512007)(36756003)(2950100002)(53416004)(6116002)(69596002)(105586002)(6486002)(50466002)(48376002)(2361001)(3846002)(52116002)(81166006)(106356001)(2351001)(66066001)(305945005)(47776003)(107886003)(59450400001)(7736002)(81156014)(86362001)(6506007)(478600001)(8676002)(386003)(575784001)(316002)(2906002)(16526018)(76176011)(4326008)(25786009)(50226002)(68736007)(51416003)(26005)(97736004)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1999; 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; VI1PR0801MB1999; 23:RoO6dypXhI2wWOscrVRX5cmN1hRfkgX0pjntlcn?= =?us-ascii?Q?SWzMgLvamGbGZYqm2srI4bONiAM3i0uX46JskYEHd3jbhincAShrRgcjeXzO?= =?us-ascii?Q?WCuVg3bFNgmbqmmqjQX47aPpbqAb7vdKLtMEmwrBWzNllmTr1qPLXzeWNDAe?= =?us-ascii?Q?LryY61q/rRIdWLllKYCs1P0JvRvGBQ/MVpgtTPEXN3SYWef0MuJxBjyhCzE8?= =?us-ascii?Q?pkbgfgj+ICBdZPT7UnCpjcvZtqEi/EVR4A4zyDHrfPF94LidMEd1TK/lc4Qy?= =?us-ascii?Q?AjUVTijpk/V/GS3DgfbkKPiemvmrKs1JuoqmjqGmxr1Luv/rxjCO9lmAjkP2?= =?us-ascii?Q?8/BrAbn0QBuQLSakBl5DAFu5YDMHMz9YsHatX2geHofSVM0eOUh6WIlSf9bn?= =?us-ascii?Q?1Y8qJlGhdajCkbfXQIQEDGNcW3bl8NRdqKTyNwBXP3oXTSkR2sSeCMIkmsBK?= =?us-ascii?Q?cRB8QMHKea0eB581G7dTKTlf6cRgghCcdH0B4xhIqlLSCVPlsdAnHHLv/VmU?= =?us-ascii?Q?L0nmhFec4QVvYTtgzVgmiU6t8zf17ChnzpphyJf6sROsOQzue7ueJIJ39tkB?= =?us-ascii?Q?yTBDglIXln1Wigymq44GPOxI3+e7wDVggSewycghVFAyEc2PHcJG6FDp0p6P?= =?us-ascii?Q?b0YUnOHiEFN5GdQgitklECE9acY4Izj3VB3Ol5hAqrNpgksnKuU2GFY8NjAO?= =?us-ascii?Q?HWhSp0z06nOoUablWF5ED19KocpztA/QD1pC2y6AYL2G0z2GymO5YgO7zLnV?= =?us-ascii?Q?f1wXANtGfBDeMlwjjZKwFoFdBwvk09dV8Z+FtqgmzY93Un/qR/L2ir4OkYQG?= =?us-ascii?Q?KikMOO2OHVuOjEmlNzQzepEz9JwkphNdNtK2enyS6jV8BbSa0bc2FCMPMQ+A?= =?us-ascii?Q?HHPQbX64vEjHLK0KY0j4ZGg3WiHBb4mPz0zg7g5HYjrPIXgT/HjRS36reTq+?= =?us-ascii?Q?ACJYk4L7IeFAGapaob7hpZQXobOzvEjgHcuS5LC3VrLuTqW4Wbmz6+XTIL+V?= =?us-ascii?Q?WAoRZxeOUQ42UyDWpw3AEJuxkYxh0Pz4eq7u6PzWsPRrc0mEneGXpDhjNtEX?= =?us-ascii?Q?Xjy7KIlAasAiLUemFhuDu/bXkqFXrz+aUbe5N0JqfSQoPaGqf2TGGwnGOPSJ?= =?us-ascii?Q?3FLqFg+3zl3dBiP5nXVL4+W5+W7ZHhOqR151b35C1HoI16EVEAPOcv9RMSzo?= =?us-ascii?Q?zUHp3OICf7tVOkxSHHRYbYXvU+6uW08iCQY7a9cm+snLcZTwFLoJbfbLKbQ?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 6:c9NWJwXqj907v7dZVKUCSx4S2PmeYOHJDf/Y7ZRRSJr5eavmRKX2oVdgk2HcyOLFoOOHjZq4S/kEuBhARQ2mdDKZluogCPGK6eTLbUIlZrcimaxTJo0qj2gCkzQnzHNKo8vT/S7sOUTGah9ByUR0j9wfyCo15FvYTWbbLpwS3YHY9rmdciuvwK7bnOvbxlE75s1h1qkoMNbaWYiw66xJXgDsIPBmqROkPMOprFjn21veSK5da9yL7z6mixXITwp8OSXJ/h/EJOnXUbcjr1i/NmgziUB3nMKminKHMRb41QFwQubiJcXnUMvaeRL54FQgOw5xmS+OGrpKofVFmthzujFCkefpGU3Mvfxc7OABIOM=; 5:XUVR6dWcNeIzJuKlkpWYJBCQ/0VRTblj/UKWQlhPGB2JB/ckbaddEYBMOuaYE6yBlH8/AAyWrZh04G9yjEZxfQChlOAQsPMTigkKXpbNHOx6y/N/zsSsYz9uHdBplQEmDy3V055iU0bXmWa1XNujJ9PyjN2n6hno7Sf3nm1n0q8=; 24:IdY5EtMTlbAonY9aPX2Qnty+lfMw8J8fyukm1gZAu9sUvxIWVK3LDSMl9OHg9j1r/+wBB/qsckHmQ9MONXgW1DcKonQwTjnRokgoYBsl9z0=; 7:UT8JEp8Mf4Ogri9w3E3zcFN3ZyfvJzUS9MYVbZHdD4GrLd5tM+wha5y2c5m49DZdXjfF8oDOOp7iotHl/HSI+I7QDkeeWZnXB2VWxJMHqOYd0c2QUOnbyK8HDDij2mIKhd6EBQqzq+1ETV10oLRQtjQvxjbxDU3F5pY1Q1cSSpOLJMrCah6ibYSBZMLG+5oLygKmgIaYUT1nKc/jhjmIJWMYXs9w+ZMVhsP2GEesauWXWqiDbZqJ1kCOsDc5edt9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:N2YAKhuoo9jmH9SeDeBh4EYXWZvU1Dr/hiGKTCxKGQ9U3MbrZ/80/2ixy0TvmpiGpJMonqhiep665e4juU/3PfuQBGaJtVMqgD3cooIC+emmTXilBieecnhROLc9Kpm6b9Vgj/daWjHWs2d8QSUnlYcxP2bDsAcAxYszArV5Y+0= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 12:50:29.0296 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b3c0bd0-8f61-4620-298f-08d55f3b38b2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1999 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe02::700 Subject: [Qemu-devel] [PATCH v2 5/8] 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, qemu-block@nongnu.org, 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" 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 Reviewed-by: Alberto Garcia --- 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 7b8e0ed..693a754 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 Sun Apr 28 14:25:30 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 1516366630485920.6579160579148; Fri, 19 Jan 2018 04:57:10 -0800 (PST) Received: from localhost ([::1]:47531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecWEE-0003iC-NT for importer@patchew.org; Fri, 19 Jan 2018 07:57:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecW7x-0006uP-6L for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecW7t-00039n-VB for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:37 -0500 Received: from mail-db5eur01on071f.outbound.protection.outlook.com ([2a01:111:f400:fe02::71f]:63680 helo=EUR01-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 1ecW7t-000399-LE; Fri, 19 Jan 2018 07:50:33 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 12:50:30 +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=qHjx21Xud7LXKXXYcSOhmImJqU58yDYu8pnLiEF3qmo=; b=KGEn4GxA0/kEKTu3232wkd4Jfz8JJKjl8a9jEQQT6gZWt52zwPLAicnb5c3eUt+zmOIPBeDQfiLNhYS8NLitI2sqDvjxif4OOGTvtvTg0CL+9ca/XIKJtL4kf79ch8L4JmQlbBK9cWnxm7N77CRYNUdcuW+OO522Ks+N0vi+2Qc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 15:50:05 +0300 Message-Id: <1516366207-109842-7-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR0202CA0008.eurprd02.prod.outlook.com (2603:10a6:4:29::18) To VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 265332bb-bb39-49d6-f630-08d55f3b39c1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1999; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 3:tuBKl6Hm2tOAtw0fAAwtk3riVTNJQz6+jbdhK0HlVMox6YKBTL8021b/+npvHcMjsWTgtNZkf2yUO7SbJfUhQ/TvSTYNSC+cT9l8EI0jK1/pSLMTiK9xsxDNX3JOPF6kZMscgYPBdVqXymUSAahZwoJ+tMl6p7owR1aNBb5yviOunk4udA9vMkcNo4wYrc7yFXNidFjAfk8ZimEcJ1a39zbXxtSBTmXpAJTlZW+61bTwH4bR65Fbh32axIzR1Ao4; 25:hhwCWuJ/cbJHW8sglN4AI45wtJhfomiw9voyDrYIpB6V73BzqY3E74zxOmSBBufUcK12Ch92BMYDOn74lOznjH1JhbOwhYNukZ3VR8B+M27T+KyDjOywojI1IACv02BFS8nN1xb7KeZ3/+2SpnufVGzcj7JtnLMlmIOmoLnYVHJRSMrMXejmlP2VGQUpnQngHAEqipty5+xEdK5Bdb8sM2br2YYIiV2PNzC80kK8021l0uR6p+9PTMhXRBFcZPDYRzdN3TwnCBdp/f6lG/SJM8ypk4vzlMioXWDVlGmHKrbZbe/W0BjeOvAR0P48WFLZZ/VKdxqGhe+hEot9tbh82A==; 31:gxXY4sDwiwIMJCUa1RFJ3GMeusCGrIdLOp+HHuWoia+TG3tEhzvUdgsuiYaurrY+qfNzSloXuRAiOoHXYLgBdqMRF0/QkE2fOaHQ2/lOzJCeLFp1d+KBL9QTfVtBfSNBGIS6YT5PGBuS1nxz3Fx9tJ1EX9SF3Tv4iHhqOkPR+M7cbBeIbPPPA2bvJrDVVNYfDxdakJ6PzB3oNNQpvNYLTfH8AQBDsQC4eQlh40ZRgZk= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1999: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:2WtVz+45F3GxU19uwwg1UidslW+Q2rMG4qNqc3B+PJPAS1NAvBgJBoqGVWCqYImtmLkwiyjwz5Lbxi3PxiFETJPnRUvRMGDYqigE1x5PSGL9IHSdRCau6nWfSRhBSlkvmXyzqV55T9yo04nrfP6QwpJUOyBHP4WsJRDHsNq7tAkxKJUq4DZuYIlR5Fp8gZXK0X01klHRwkLNEdV7Dv2VOyEMrPqXFOCm0Gul1MvDZxxsj9SpMZEDimO9ysZ5DKO16k1s1QlL9OyCeOdiqD+X7v+KphY6pB2XITIPvnDplXpBVN1FQ+6nyfH94MfHsEYWu4tkvNNf0yyjyHKjVtGJ64bIvq2ZVimkzAdMFTv7jJlt65Zt6Da/Yh9wTzDuG4BOxmhcqfh/xukJfecIqJXvFdT0n3mbvytZHPFACQUbGQI=; 4:B2byciuPc4vWpwMKC7rGMqbnztrCujFTprayVP4uvuONFYOLGIcHAJ9yA5662PMOz4IUbBnUOFawhLaIlKdjHIfXkJs5axRB9y8dFHv+bhbJJA0PNTuw9e840bLtjd3koWzeRLOs0fx8KGm+OIrhYoiH+C+AxT5VtTNSeyf+ezTQlmOpFGcoEhXSWolKV7pBAmmqiGllVUfiy/b8/vBvyrRaYfc/JZKHblOnWtoBUZwPfZDCPuAe/xWG8XCFDEfbECEfpOtrI/7N304nueSoeQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(2400077)(944501161)(10201501046)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:VI1PR0801MB1999; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1999; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(346002)(39850400004)(376002)(396003)(39380400002)(189003)(199004)(16586007)(5660300001)(53936002)(6666003)(6916009)(6512007)(36756003)(2950100002)(53416004)(6116002)(69596002)(105586002)(6486002)(50466002)(48376002)(2361001)(3846002)(52116002)(81166006)(106356001)(2351001)(66066001)(305945005)(47776003)(107886003)(59450400001)(7736002)(81156014)(86362001)(6506007)(478600001)(8676002)(386003)(316002)(2906002)(16526018)(76176011)(4326008)(25786009)(50226002)(68736007)(51416003)(26005)(97736004)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1999; 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; VI1PR0801MB1999; 23:360Zv7HB/9G43GodCgApJVJ37myayOThUce4cB5?= =?us-ascii?Q?4u6THaB+yIvm7WHQIaPLfm4K6+FxRwfOrbPVVAe14gGfGbkGVaNDDYyQa333?= =?us-ascii?Q?UInFoTcUATjQyyeFsEQ7lYxcbZcGXU77Ux3YKvKIxLh0hJ2tV/lOW4/oDi6P?= =?us-ascii?Q?+p8HfQFoHM8SONMPq9w9Y8bKuiJsArM3Fk4WfFcKoEqO4M3KmGXZ6ygxHRon?= =?us-ascii?Q?LXRGHFf/hvwkRPmX1GIP3MQeQsFA8B6p03Q5x+f+KA5odcs3R9NsK79Di63f?= =?us-ascii?Q?3k+YWqRVMeXjW8VXiBCxaqnL4K/3RIzOHPhEAs76O/FNQHicRczTAlsX8cnr?= =?us-ascii?Q?JE8O1KffJcfTo0t+5aMvHpXUxfy/Srcc2dghQ7BV0zvn0FWxN3ZxvV9Pc7vW?= =?us-ascii?Q?vjRFHBFXq/lXOULcMSPyB7fzbplA5UvQnzc52fGKRoUBRbyUFy0hL5mxRF1p?= =?us-ascii?Q?myg5SwLNFk++cD+ZH+m4UjTMCYiaEz0YG3PvTiQDeF+aM2Amj9Sg1e6xK/ie?= =?us-ascii?Q?NOUpk8n0XL672EB492Yz8LkVWSpz9OaLb8/Sg83ROX48z12JSzDH3kJlPqjh?= =?us-ascii?Q?RPaCHXzjzRgAhnF/OkorIaqAa4iW/1tfvONA+8dX4RnwyX2tJz7zhniv7z/w?= =?us-ascii?Q?rfS4RSD0GEnAuN1WSJEGV48NRU3WoO5qnRPp7LB9fkTbFQwlRqHCjz76vTDg?= =?us-ascii?Q?kRB2dMQpwn+3im2QvyOly3ajjrST63UMEmOwGZ7KMnbuUswc1h1/XytvvdWw?= =?us-ascii?Q?UUoMq1Hhk51r7Ac4eCceHMcOncWnb5lT1P6y/djgbdoyAVdMCtf8E+7dT73n?= =?us-ascii?Q?M04Jp+z06YUD7oxvLjkiZjlbYRk7sr7R7H+bkDDTLe7aaK+5W3P1GyGMCex2?= =?us-ascii?Q?UwdDbpOREduGccURFSViTfaQDr5ac0qGADfWYaZEtbENfYTVc4zjx57BOlt9?= =?us-ascii?Q?rcGi02cFP1XlusyyKntP/3dzHp0FK3ns0tK5FAvn4lLm29/YixhWV3pNOegY?= =?us-ascii?Q?5Fw4x3Ju1FRRMNLOLYty5+Apd56Hg+VgKUzp4cJh5lZhmBzfzB/4r1mDhbmZ?= =?us-ascii?Q?hB8ExPUj0sJI8nNEqOUr16cUqnB+8DIWHFjK/7vkFYa9X9fNWueXqSuOgJrL?= =?us-ascii?Q?C1Smtevlo/UM5VGANUvkeWutA26Mv5/Byz3EYvDYk5DVlk1d6kRXplY/MUqW?= =?us-ascii?Q?BaxqAQsSg3IzxNZoaToNCBEyiBmwEyQL/PrSQ?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 6:XW4Rtz9QiDwNxCXbM3pBEsoUdniTzhdcXrsT9X9oNLDLBmaOHE4qYB/XoCG6RZCDzTP8ZgjbvPvJWYEiOmBjknH90x8/GvmukxhJnkv4pEFYazxcDcbeFupYLc5tc40ZXc0vxj6+dGqqdf/5cV+5IX8dabSsU5iHQx8bJCqVJz8UnINOSwP1RpFYSpw2lPR6PtYVE1dZyY0A7RA/4bxyoGQ9aJGopIM75tQ6MUuHQzjg702Bw0q7algHCeVaKf4L/k1U4wcEdZxjJFKbgxo5LbihtRX9oNUEQGfa5hJVj6p/eW+eXjl1rkZcDztKhur31fIFmmvgHqUmg201RmjkMVECMAc+oPvtbhV00DBi3YY=; 5:plUgMLgP8YNpcRbcv7GSjgnrBSrGanRb6t4llJX+eNNlLg4Bs+BlP1YdRLjuolyWtGetLKOv1/JNx0A4K2H2tF2e2hv9REaik4QEhbBMPCd/NHgHERVlM8VCyIV/+KNCh0jkeEVZcBB39o/c3Q6qpxJGrB9TBCF6pf6VsiCU22Y=; 24:QswJfzQ7ZqCI/WKpa8Of8/iUwnDAJMQr5WI1Yp4Vvq7EvTeHQOhYclqR4WUu/KenThDyy7RxA5K21mUGZJ/rDB6z6xmvlOqMADWAN8sdNqg=; 7:Fntz7LOEG+BZ3ECiCSpvPpxC1GtIOj7nv5ISpeObplLl1DKXbpmaLlnYM0pANzkvbd1HiSpKXMuS0sVs1DFCoLgR04HA84PyhwN8ZqdbuaFAFPmnmw3Ca2ba0U9caKJROXc/KlcfyfC+b3URS2X0yUESSSDzQRrSNriPRAn47auI0z6JWZrpBaPgcgd7KYTXOvCU3PktfOTPO6iRuyYjMWFy8RncSYf67KcIT61332JLyDX/oOuRPe26SVLzJtu2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:4OWbqPeDNqI+fFzdKrtwo9Ruj3ZEBtWGyrxfl6seHBeSBc0IyYRQssc+Q/tJCARIQ1pjcgEViBrFUWwgc9NJtcJXOXmEpzcSkjxr9f0zH5BanHmYgqLYAmpophex6cNQsZL8UUFkk1XDPzac0mrEsa6yxmpIycLn1maO/BN7BjA= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 12:50:30.7952 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 265332bb-bb39-49d6-f630-08d55f3b39c1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1999 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe02::71f Subject: [Qemu-devel] [PATCH v2 6/8] 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, qemu-block@nongnu.org, 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 --- 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 693a754..6881664 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 Sun Apr 28 14:25:30 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 1516366767189845.2176201253412; Fri, 19 Jan 2018 04:59:27 -0800 (PST) Received: from localhost ([::1]:47679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecWGU-0005kj-Fj for importer@patchew.org; Fri, 19 Jan 2018 07:59:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecW7x-0006uG-47 for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecW7v-0003Au-Qs for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:37 -0500 Received: from mail-db5eur01on070e.outbound.protection.outlook.com ([2a01:111:f400:fe02::70e]:26048 helo=EUR01-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 1ecW7v-0003A7-GH; Fri, 19 Jan 2018 07:50:35 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 12:50:32 +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=b5T/BtQByH+yXnba6uPp7qxCizNSLJ2+eew5fmS0YvWbrsusoydWlIDJumgGsu50AapOZzR/gAVusGpWEBsjqXgR2w0zfVbP/BZt7jp0jBpq8F1bGE5mgxL2iDTW/jV0x+7zuhMw1RJW+1cl5kIOE4Izi8rgcEwheZq/w/prF7E= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 15:50:06 +0300 Message-Id: <1516366207-109842-8-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR0202CA0008.eurprd02.prod.outlook.com (2603:10a6:4:29::18) To VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 502496b1-0710-4c14-b152-08d55f3b3a9f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1999; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 3:3LVIfvfuK59DKQzvbafIua2vaREYuWK2f2DqDpC499cNa3dIKgYmghU8DmcZlDwuocR46o1hh2RkXxqaavu0owuACvu+F5X7Vd3ziPXEF2xGxJ5IsPXvpJSNqqcmZ4MGp9w22VZSs331LeY1TCXA8uvfUsvreUHEznRY+/ozP58SXwatEDiwIqThIv0ZgNXgb9Uou8KHSu02YWmE5FisnBjW3dQzb692qUEcQr+29Pb4KieBBLkMISG0XrUb0bxQ; 25:vAizoyJrW0ncn2F91LdZv6+YrETXj01ctvBXf37YBpuxpTzI+xXa0wWdmwQim5rWV2xmuuDy5XNwexji4npsq+QIuatFV+xt+wbS+pkIcY+r1t4yxnuzrmiD262k8U9vZ5JX/knZldtgZ3/tlGpzkxir/jR0ytsMbtyMTuDWiYKr6fNebfFAZTo2A+0LwkawP7jzmk6sIsh2oUAPCMEgOGlH2n16LZo6nZ0xXBBrRtDz1KwN1DCAMDq8DZAU82HRnRZOiAt9nc5bXRKTASP5JOwX4WBIhZd7Pkm+JVSn+upbybpSPwRoecpZrOcM+olJ9rZ8yHIuYv50tDZ7Ay+WWQ==; 31:/tk4vhhXH8LqYOIxVNJX38evupem0GgVuk3qFT1wXHehAYS4F0hsLUXeImjK/k1k6Pokq/g4g0pbpG78ew1x94pSH/3oRFGoaIt/mjLczo4oOWVdbV+oRerqF6ksWik38jDJgC7u4XhLlr0UqCa6WCYqTtqZssGqRn9C6L7X8ENhTVdhK+HtyKfQr4G5jvNP1JjGEwcjemJLtHINGd1oi6liFQGTzrHVzvcKrZSHygA= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1999: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:9GES22oHz703V12yzHsL7AtTMSD0/f4aaCdJsLgEvycXxsQoxZIrGXXfDzrzAQECLWCBIa1EomNEKLALzmyDPWXqGGDiF9Chc2yAFT3QdMX8mK35fdQskp7MF8uGhCL2eyatrxtlEQEVgHeH3JkjDdDNtGbZ8tUWoWuYzQNWmBEy2Nfcfw6GirhjIm54P8O1p/k8QqYoTa/hNyOj4YGAjwUUVWsZ9uL5ffXTR4ML/o3OFg2z1iZgS9HYFuwZ1hi2PgBsnS01iv9mqeHg48Dm49qQJ3RstCT0xYLQYPQKhbMXfSDzFBQErW9WkNxB6YlqIWPs9t0CxNFBkO7YvWlw60r+cY+2jAIzVa1ld/QBLOEf/1WoVnhG4PQDW5yyYy147GPCwRvosyjcK/5QPOq5eNGbMWJ39ixOMh29W34ADdA=; 4:WLEajSL8UzRy+bN6kRL/Dt5l7ti8DMULV1A+67KKLPOJso1/8lz3n+smzSLbYKNoTE9yIwv6l1kzLBkPzV1WLsJr9EjsPFQyZUW2wxWn1j6/wPnefpN3Vm4cByUpcstvQvu6Inmfrm3ercUJwUe1iiw6sTGX4AevhzCNee/TgoUyg1dYKGxgk4Jg2uhYS1xlorB1XahYPEDGnlIlFIvw7kXXAgPhmRQ9bAX7Npv4x/+aZ0mkqyEs2m+bJOgC7yip6wI2ctxIDOJu/Pf+wOqmtg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(2400077)(944501161)(10201501046)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:VI1PR0801MB1999; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1999; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(346002)(39850400004)(376002)(396003)(39380400002)(189003)(199004)(16586007)(5660300001)(53936002)(6666003)(6916009)(6512007)(36756003)(2950100002)(53416004)(6116002)(69596002)(105586002)(6486002)(50466002)(48376002)(2361001)(3846002)(52116002)(81166006)(106356001)(2351001)(66066001)(305945005)(47776003)(107886003)(59450400001)(7736002)(15650500001)(81156014)(86362001)(6506007)(478600001)(8676002)(386003)(316002)(2906002)(16526018)(76176011)(4326008)(25786009)(50226002)(68736007)(51416003)(26005)(97736004)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1999; 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; VI1PR0801MB1999; 23:xobwrPYb6DwHlVA9wMEsAmQGIoY08CIyk/bH7G3?= =?us-ascii?Q?N7Ojy41S7/Hnp/iYIcdED8CqlbNSaUPWWwE2WVlkFSz7LdkgcWmFY4xb647y?= =?us-ascii?Q?d71NDcdwwxKN+65c/kbmjdKqlTmJ2UwsPapeRlVOWpZWLkLO+ZRsowig5dtD?= =?us-ascii?Q?e1B1AVR0gu5kKixi4S0J9BdBYIdQREcFp4h3K2ZsAElJl3x1JId2MXsvkGMt?= =?us-ascii?Q?fPQa7emVA2GpOoKh/LuPm8Lgp+aiYLgZrcCj+faSmnP851n46kbIaxpN59XT?= =?us-ascii?Q?/l4LnC3oRbbj698XZAJhEYcUlDH4rcwKf6jnguRn3e/nY0NYjupecXNaAMiC?= =?us-ascii?Q?n7rkdPVc83yDpi+agQ9Zom5Z09WRtntwwF7qUamcED707HnjIJ3c2rS0JrGT?= =?us-ascii?Q?e9P6wAYty8Xyw7SKhBlxNDToZ8Jhdc2U5jCOSJ42UnaUMb8eofjykDFJbVns?= =?us-ascii?Q?Jg9kOhs3rUYKDVtLwRfRdnBOZna/x2q08/+WPsJeC/sFzVHZxGgjI6sG5Jus?= =?us-ascii?Q?iFx9ckPL/B1E8DAX0vOrQFnE38PQyTnPVMn+Fz9ceNrrLr/Zk9fLdzKHIwLO?= =?us-ascii?Q?bPPxiDSu+lJH6Ma6DxTjUIEHhKAO5VCfj+vLut06ffA/xZhmoeSnuLAd0rzV?= =?us-ascii?Q?CrcG3OegCb6Pa4c4LXuD7Hbp5dLXnRBDZrXmLcIrfAz3xqFc1IaNEbB8d6aP?= =?us-ascii?Q?51QlHp2GBKuxoPgHB8lv7kLDRWJro+PIZy/1hf2xOp+hirOx7ExtmtIN8oVd?= =?us-ascii?Q?O3dwsVF3Y/ZReMCIeZvm8uK7jZgr2QuIJt27wuAZdFrFiFMUwH9M7JZWH/ld?= =?us-ascii?Q?Ks1NjWJ9vUZdbFa0qwfUdsBdodhjdpMQU69i5qjxDeAqv8Nt5hGeRaJKyd8J?= =?us-ascii?Q?B6G1FxTWTdcNBStLLQNyrLhOKiztxsBfBi7yf8zDs/vDn0pqyM9cLHOSpRzY?= =?us-ascii?Q?rNLNmSJwdxY+lYt/V5gzCQ0wXy1fd9zQa4ojp3dl5Gisjob4rqnn+fSI7jeD?= =?us-ascii?Q?JuchOSa81JR286Tpfrv/OC3m5E0zyF/9W1BfT09oPanl9c6ZstBdJarvu1zU?= =?us-ascii?Q?LWn+G8ed9MBXdIVeBHcyymD2qrp6x1nwxENJm4cXIMeF4fbYM5UCdnUCcKGK?= =?us-ascii?Q?QagdipAQu8kegRMTnqJ2cWgWnxvcDFSyEU3VOhltjhnMukv93DVA6z/nHzXA?= =?us-ascii?Q?7Qlyv6EnevlK4aGktPUW6wlPLPPMpc81KRlvaW73LOe3yU1sNjE6+i2XMRfn?= =?us-ascii?Q?Rl3GUHPebCLCuDE2yEGM=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 6:CSm+37Rb++eFWDJYi/F2+V0Ub5AUx0621rAowJa6EdICLFNkh5A+doJmOYuJs61P4SKhqrkoDXQdYRN59NADVZhGOIGUnqC3pZkug2+t+puNR1sEtTHwqIdPq6xYgL26WCG2qNyunajMpsQG0rzoFkUyHZPIYyN4RQBVVLevQZgHRUgWVQxI3GavZtiywheBDUZc16QIZ6BGTtVf1oJwp+oQXTz5z2fqdnrPGaYdwpD2Y4S2IACnd5lAnwOfeRae7BE6wDSTPs45b7Jli5c187jwYbdGuQUG9G7pz8l5AZGNMReqOWvwZaa5FVyax6AwVLMeBiwoNe1qkspv+cnth9lenjPnxF6keavVOTLrhVY=; 5:/kTygf3arJnMOIXM8AvIg6ACfpF+rDAV3vZc/0qF2g7hRfrVi4FCtRMG4BFa0s9TWmL///SnV8Zru9nJLxfAHfi3rkj17S3U5LZO+We6QvM32Qjboy6fl1/NzhLPYR4WlvfVH8y/xcXpZmAaTucWpjmGTEvEeUqX3reMzFNBJYQ=; 24:PPUJ6MR+OO6dnBkCR7j8LsaX/4rzzHHhJFhRj5DGRvLl6Be2kpkIdzqqQ8sbVL90w2xnCrLrfpGKqeCaTvbFVMKg+WQsTE5sOZosWuZZDnU=; 7:0gbT4O412UXAeAPrFGkP7OwddZqz5h3Bo3TquigKu88kObPmsh6g7UsNXqDiNE32cik3mbP4QbxpaRW0MtZ7ZossQtyEcj9II5pH/d+c9LmLzcGvVjrCIKb/ZFEwR4AkDkaJkvaDA5HAmKkXnLpRhcjT4sdWJdcDCx53rBlQlvbD9C8L9jYuHgouksI7gCPyR35ueEkVlgN8QUHnOoSJEwhwOwlbUAlGPtFJ9qwhq5zQ1WSsOCd47JONyyiL6Qmt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:Q3BD8PUXVNWX5PEAfrSnNIEbNGpmDABVVw4rCw6sMfrEQLDrOxYdrluOu0NpN7+yvXI2L+6z+ggqLY/8i0cogIBMBFET9xf+OPY0oRQhGK9xqJdi42kUVsdVGjZv4v0udvNwkmKv5gV+jE0LkAauYT2HaDED5b48RxszWknzXkk= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 12:50:32.2327 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 502496b1-0710-4c14-b152-08d55f3b3a9f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1999 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe02::70e Subject: [Qemu-devel] [PATCH v2 7/8] 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, qemu-block@nongnu.org, 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" 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 Reviewed-by: Alberto Garcia --- 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 Sun Apr 28 14:25:30 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 1516366371373208.83782068522828; Fri, 19 Jan 2018 04:52:51 -0800 (PST) Received: from localhost ([::1]:47352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecWA5-0008RX-GC for importer@patchew.org; Fri, 19 Jan 2018 07:52:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecW7x-0006uj-EW for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecW7w-0003B9-9c for qemu-devel@nongnu.org; Fri, 19 Jan 2018 07:50:37 -0500 Received: from mail-db5eur01on070e.outbound.protection.outlook.com ([2a01:111:f400:fe02::70e]:26048 helo=EUR01-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 1ecW7w-0003A7-1a; Fri, 19 Jan 2018 07:50:36 -0500 Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Fri, 19 Jan 2018 12:50:33 +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=g10+Lv3+OfA5bzD2rehKUouDC5a3Mphh8bB2LUsjhpA=; b=Jeobp2ejnDg0xf0s1EDuE1A47Ino20HtMQZ1wzLDsCyCR9LTexOj9rYlenJ4rGRJxE2mydrNmyVMInkpH3GsNtgPgZ6QUuWXna9IlbRk/LoNooAyNqfz244XXKYoPx2iwY9BIQv/d5FTTcV1reeOvZ4WJbA5IiuyQPyfTg03imo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; From: Anton Nefedov To: qemu-devel@nongnu.org Date: Fri, 19 Jan 2018 15:50:07 +0300 Message-Id: <1516366207-109842-9-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1516366207-109842-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR0202CA0008.eurprd02.prod.outlook.com (2603:10a6:4:29::18) To VI1PR0801MB1999.eurprd08.prod.outlook.com (2603:10a6:800:8a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bac5fd51-17d9-4932-ced3-08d55f3b3b7f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR0801MB1999; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 3:dRg6hRcC2bTJggB1pz9KNDea1/20+vsOdyaFSfKZjiBOzCS5jfslxLGqrwnE8f/61Jbdi7jaqQ+DZz/jBKGMYysE3CxzVN8vW4D+xMh+Bx6xPNSPmoeaDGunRPjZWUPxuDEXAbnIBwi2/qIpzyXI68547PRBf6Jwp0lKnRlOTUAYfd/Ii1UZOKFeFAmY+5cjipWNO0TliA2ZWuNWg2Jt4M+GXm33QFogHfe0kuu2s60XGqdbwc3lypIKcd99Gn+2; 25:58mPjr4/EBBr4bNVRH4edDCymoLdNe0m94HBKF68yi34qiqa7bLm8P4KN6NZ2NmyuZ5+64FKRa98+sTDAt8Lvd8XGNOB1bsshmO3EVjemHGuek3cqMfKFsSZ8+jW8j30MEA2VBEqtoaEXAnIitZM/y7gM1L7HGHVM7t5E99KtU5+wJL086OsE2oPewqw/SksstSlHefab07iWzTEJrRcxzLNXLfRjSbTPUX+GeTlA/A+IgQQCmNmmQAz+qkhfOSpwWInVe8n8Fodh+CV/QvvUaaAJ6d46FQwBomDTfnH6vb9HorGQzmHBM/89OF+dRNrQmOrZAiZ62JJLKtv4v7WUw==; 31:77duK5TeoJC9zhOO42hWSOfL1zlRkOjhqRfJpsaqghP6e/J/yF0cELx/YCMZpMVYI8nxxc60QnKaWWXfyi/rUmrzotBfL0dCshch8SqQAv40QLocVDbqpBXTaQMwPeYiM5Nq1//Ud4nOcj7MEKhlJ5tFtZ27+POHjECICEYT8ya8VS153+xSdYMxDfJCMJST1ypOsZKw1tTg9t5g3B/rihHv7j94jIew7WWZQlO3qE8= X-MS-TrafficTypeDiagnostic: VI1PR0801MB1999: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:ZazHkjdy/VE9c2muX9bbtdtuYOAQDMz1FlTTSdfwJsXEQTHR61Q/nsD3WDd772dNML2cD5MXvBY6k3AB3vE0dRDh/GvPw08e018WnE3PsmawYN/5HWCbtlTmL9pJRs2n9sfp78CI2fGFioY8RwU1cpneQD8mB5Qfkq4sl1weJQ3RD7bKhqa+ln8HVBtb2W36wGA5Q6hhfU9ravK0fngfSg/RZWf7Lf2WyPSyQ4idtxMFwVDeh4toXCrx+F+3t3h5dMeC5Mdel4i9+k3JycxcVTdUOAS5iBW0wN6Krore5CZKYRJtNAafrgsM3+N8Y/yIDD1k3GuDSh7r7BfvSW92gPoQ7P8nOIuMC7sFOq1WVpDEqSJp8+OlJQBzI53bItNpaHE8c5FP0aO6fqDIGVSCSoCAM9seKBnCW2+QBLM6eBk=; 4:1xuLgq8iwTn1yvu1ZEv/0vdzEJTeLVMHUkADnZuSS1ppUAYMa5plo11r4xfgFNN8yMY/MYdoGElpGmJhwPndc51Qluxd/ksipsYyl/ZBjeCuzVTSJaO3NnQrV+LwKPHoUksPSXUULhCqWefUVnJXQcJICzvPnSH499/gAMBeNFn0htZUfWcTpAMbVUt0F0AfPLXLWbGK3NhtEqiBpETxMbG3Ieq3SYyf9ii7Y631vCAh7i1n+mLi+gQ/tRY+m4xI6BlnF8jCYO3XWailtQ6w0D9cafDxQjC9ury88fKuB9GnyssQsMWbMIJwbrIktHWl X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(20558992708506); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231023)(2400077)(944501161)(10201501046)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:VI1PR0801MB1999; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VI1PR0801MB1999; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(346002)(39850400004)(376002)(396003)(39380400002)(189003)(199004)(16586007)(5660300001)(53936002)(6666003)(6916009)(6512007)(36756003)(2950100002)(53416004)(6116002)(69596002)(105586002)(6486002)(50466002)(48376002)(2361001)(3846002)(52116002)(81166006)(106356001)(2351001)(66066001)(305945005)(47776003)(107886003)(59450400001)(7736002)(81156014)(86362001)(6506007)(478600001)(8676002)(386003)(316002)(2906002)(16526018)(76176011)(4326008)(25786009)(50226002)(68736007)(51416003)(26005)(97736004)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0801MB1999; 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; VI1PR0801MB1999; 23:MdOAscSrY/UXxxTWYeuG12wGRFA+dDl53qhoJhV?= =?us-ascii?Q?MaF5tYDuDWs0PuJZUF4aerDLdj+0+EN12oAEQiykN+VhQ9UlW4Tgjx6AD6en?= =?us-ascii?Q?UiBbMkJgMKtFKiSoillJ/RXoU1FqwsBSX1SCAWUtQA8/renoSOlWJBi+jf8y?= =?us-ascii?Q?4dWc2jSrjMbS+0JlnzT0w8dG9Xsg4qiobQfqoZ0yZASwKK/shap0kC4VW13Q?= =?us-ascii?Q?kqGU+PV98bxui/rirPXnVF1ZobjI+uEIdoik20OReWsWLKX3S4gXmoSp4TN6?= =?us-ascii?Q?QGO7+5vsV3e2oC6Cptt/lFqvE+SEKTFiyZlDBRFabIkyfHt+6aYqx25gvG7v?= =?us-ascii?Q?M+RezA/1cgP/KRiz0Nd0RCTnQPk2DhtjxTtmR4Jwa9L7azyZEl27wZDtc6PG?= =?us-ascii?Q?n5yGHco03e/kk3GEINwz6nAVh9/g3i8vOk32CyVt7YLXIhsCS50mjSVmv9qa?= =?us-ascii?Q?r9GERaOIAexiUU5Bu8O84vKnVqO2ydqIpsLczV90I17rq2aB/++ZM6SaIjn1?= =?us-ascii?Q?4D/8CsLDFLv+geYkoIgUl5E3+tIGge02flfqG4WnVwJXwgKEmmgMp4iP2qsS?= =?us-ascii?Q?nQlzs+kg2JPIaMGhp95axWn+RAjD4y3CBdO10iHcjUx8Y5lwN17llp7UCi4M?= =?us-ascii?Q?w0G85+mz3o7AuqQ6qMyy3gabRSmUJve8ATddztdamhCfXAOt2zR2aHMwm15R?= =?us-ascii?Q?Mlc74AIz9avpIBLRwcwI7wvrsU3sqlhOHViNwzi9EGJ/rm38V/5C3EOK7dTd?= =?us-ascii?Q?1ivzPEXuu92iGttkxL+Z4u6p6Lpsf50xeMPV8E86LhYQqfKAxIO/50//lUlM?= =?us-ascii?Q?0s3mtFgg0S/qXskOCBFDvGuHZTS0IFnQiFJ2e93wYWpZRN7Gc+9NksuKXA/o?= =?us-ascii?Q?ZtP+S9kGKYKfSBBpg82IFSWKsjJTo/HnPy0PmaZT9XqrL1U4Zz33U+y/52pW?= =?us-ascii?Q?UpiWXDcilrs81Ur/WYfdWhN6NQDhw0ZrjxJz6CfJvOx5lVE/bPT6zVDGoxaY?= =?us-ascii?Q?6SiF435xZ/zf5LQ8kx9FKSHimJy/v3aBoauYSDDQ9+b93iS06q+Yq9hZt/of?= =?us-ascii?Q?OGFcURMfP1Ku4pTMt6xO6g3hY5GCUvbFkOvtvktGx5pxBjJz9k8f4ckOhKcx?= =?us-ascii?Q?LlOufuPY2PpOyuYbn/T7Laz5kngZ/s9OBvIBY0rdHhix7A5UooOPrD7C0o++?= =?us-ascii?Q?PdtJaGYuySQ6/j+hFhO8P9HkoH9wwRdRdIOCT?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 6:3VdIx+eWcbwMJt5IFUkOqsOEj9fpd420PLFVKc7bWPb/oVb78u4lNUdm6gqXUCsUMPN6VVWzhjjCbc+A7tgHXuGe021PKFRD5hv3y/YNRLalC6EQU6CnJUVJpeDEoi+XpDXT5NLE17gp0dYTOJXRhKUBoWR/EfoNu7O2Ym/39hZPOpxNa9IlDgBgGJmNYQsRQV0IjVqwrXES258cZzX/q4plVBs0Z5dd+1cPhl6Vxqd5oVPslf5CCf62Btpd9TpFdNRqls/+ibBIle2MPGKTnG/XtNsiIsKZytM2njMY+rTjAqP+h1geFYMSuk7NRhf2g/EZ+zdcl8SYeNEaY4wl/YkzQFWPjo1QMAhF6FBSK6U=; 5:UJfjp1cXsG9stcrT63R2fKNq5TqFpqyc4PwGo4dIz04bosjy4unroCZXWy2SYL1EfpfySTb7fhBd99G6SIdoTVO5S3j/Gd4tkTALYhrQWI3/VZ8FavWH/BRz69ZsNa06Cp6gZ3cnVMaWCafOJ1oR5WGGnN4tUnRqmLZVdOe4DRE=; 24:AT26vH8m1tdzXDTTsOir59Z88IMDJP+1QRzjFhJlVlR49wsm1+5Hs5HGvjg4c+f28dFFSxAsnT9dcXSJfPTjid2rPuHSKmL8Jwr/AuEeQTo=; 7:VSRE7+SfzeqWi1glbhcHTx4tAlKgaJmD1AnqgH/YHjkCfDLER35bDTF6A0/SIMVJEfsQZYAHUF3dOMbfcufuCN2SXcwJ6hGR9WR195NwolMn8z1tRjQ8QZAQUqTKM8Mku2zStJJBEEN+RtKV76eWfMrYPYGdWP/Nd5wG4+x1RIKxPkLjT+jbOkTjCnUM4/VocwNY9MF5xxWWJy3ARfHFztaalTWot+yWnLaJ0pWq+6j3QQPC90+QvjvWSrzn0l1d SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1999; 20:L/LQWEkNk1vvCntgRAEN5GBMg4nP7I/hi73RpYnOLbg1YBz4X93zE6N9JzgUAmdZRUWZ7Qvca9/8uyQrQjJnSCAaAp++UHD6pXH/SrXnj7gxF2xHqrGzNCl8GOITGL56Gsr6ZzvOkk/JfV+e43ydR/p+N0VCWedEixtvIXj93R4= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 12:50:33.7171 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bac5fd51-17d9-4932-ced3-08d55f3b3b7f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1999 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe02::70e Subject: [Qemu-devel] [PATCH v2 8/8] 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, qemu-block@nongnu.org, 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 3fa2d3a..0d9dc01 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -774,6 +774,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. @@ -785,6 +819,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 @@ -798,6 +834,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 9b12774..2f20697 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 29cafa4..6f56aeb 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 a8da4f2..8c03587 100644 --- a/block.c +++ b/block.c @@ -4062,6 +4062,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