From patchwork Wed Oct 31 11:34:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 10662511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3ABDC17DB for ; Wed, 31 Oct 2018 11:37:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EE592A726 for ; Wed, 31 Oct 2018 11:37:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22A342A903; Wed, 31 Oct 2018 11:37:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 947B32A726 for ; Wed, 31 Oct 2018 11:37:02 +0000 (UTC) Received: from localhost ([::1]:58730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHoo1-0004ob-PF for patchwork-qemu-devel@patchwork.kernel.org; Wed, 31 Oct 2018 07:37:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHom8-0003O7-4w for qemu-devel@nongnu.org; Wed, 31 Oct 2018 07:35:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHom1-0001NI-US for qemu-devel@nongnu.org; Wed, 31 Oct 2018 07:35:02 -0400 Received: from mail-eopbgr50092.outbound.protection.outlook.com ([40.107.5.92]:6064 helo=EUR03-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gHoly-0001Ii-Rr; Wed, 31 Oct 2018 07:34:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dICbEeWDsk31VCBqXVisZH/NqMpUK6TohVwpyS0asfE=; b=OcrK2lbezwyTWag9mexULy5zk2AkkN+LAndSgi1H4I6PZkSvZpj8I5rnnAnGvKIaD+Y9bnODUXWj600JCmUjPkx93LnP5Ud8tGbPEvVOd6l3+IYfwUT4kjPDn/5OXFZJZSW7SIckp32PGY7LznhTq5dIAMTk0j0n4XMyL5lHmxw= Received: from VI1PR08MB3358.eurprd08.prod.outlook.com (52.134.31.145) by VI1PR08MB0413.eurprd08.prod.outlook.com (10.162.12.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.25; Wed, 31 Oct 2018 11:34:51 +0000 Received: from VI1PR08MB3358.eurprd08.prod.outlook.com ([fe80::614e:e2cd:51e1:a19c]) by VI1PR08MB3358.eurprd08.prod.outlook.com ([fe80::614e:e2cd:51e1:a19c%4]) with mapi id 15.20.1273.027; Wed, 31 Oct 2018 11:34:51 +0000 From: Anton Nefedov To: "qemu-devel@nongnu.org" Thread-Topic: [PATCH v5 4/9] ide: account UNMAP (TRIM) operations Thread-Index: AQHUcQ285RQ5iSyWxEibDj36IYeRAA== Date: Wed, 31 Oct 2018 11:34:51 +0000 Message-ID: <20181031113418.29796-5-anton.nefedov@virtuozzo.com> References: <20181031113418.29796-1-anton.nefedov@virtuozzo.com> In-Reply-To: <20181031113418.29796-1-anton.nefedov@virtuozzo.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR05CA0028.eurprd05.prod.outlook.com (2603:10a6:20b:2e::41) To VI1PR08MB3358.eurprd08.prod.outlook.com (2603:10a6:803:3f::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [185.231.240.5] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR08MB0413; 20:HEIfGp4+H794b6Onicq+q3Hyq4lmT9P5NyGE329j0iUyDh4E0Mfc5ezrvyXrRPBt0ogX0lVl3+53HBS3/lsWnkYHF6YuiJ9jK90pNIWB35Tx51jHTPKF98XNgpMlgpUcMVHNr05cO+8MH+pev1GR/gs/T0tmoZNDbD8uFRvWk1A= x-ms-office365-filtering-correlation-id: b34d9943-115c-4cd3-38df-08d63f24defd x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:VI1PR08MB0413; x-ms-traffictypediagnostic: VI1PR08MB0413: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231382)(944501410)(52105095)(3002001)(10201501046)(148016)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:VI1PR08MB0413; BCL:0; PCL:0; RULEID:; SRVR:VI1PR08MB0413; x-forefront-prvs: 084285FC5C x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(376002)(346002)(39850400004)(366004)(396003)(189003)(199004)(6486002)(68736007)(76176011)(66066001)(5640700003)(2900100001)(6512007)(6436002)(2616005)(476003)(2501003)(53936002)(44832011)(11346002)(5250100002)(486006)(52116002)(97736004)(5660300001)(478600001)(14454004)(6916009)(6506007)(386003)(107886003)(71200400001)(71190400001)(25786009)(4326008)(1076002)(2906002)(186003)(86362001)(7416002)(316002)(446003)(3846002)(26005)(102836004)(2351001)(305945005)(7736002)(105586002)(106356001)(99286004)(36756003)(6116002)(54906003)(8676002)(256004)(8936002)(81156014)(81166006); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR08MB0413; H:VI1PR08MB3358.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: fUWtKGcccdRtiAu6E5QdmF3N0GDsLcklzXmPh/v4aXgMmOThYkmmzbitIl4ERbezK59/IGvEKc2TzOtKsUYK4mCl2HYO/0rCW8kPonXa7zq4nHqosvmbwyytFTt6NIrWFdhMsX8tRhWKKUFR2z02IzTHVq0AT6oK33RwulgUVYPOXcWp35zMkxevAhVTqR5FkD8o59aFYV4KL1ENute1ZiCC3nXTBBt70kKpTiUIDe095KcHhigxelSfL9mjDbb+pUhBhygNsvTHrfbppmiE93pNC3qKjWOgYJllCj34PTlOyFMtRWCoXu3DjG2Xg8a9hHnczW6DzIpWWYSRizaASIftwhvb2NPCtCBTqCxEOc4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b34d9943-115c-4cd3-38df-08d63f24defd X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Oct 2018 11:34:51.6977 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB0413 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.5.92 Subject: [Qemu-devel] [PATCH v5 4/9] 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" , Vladimir Sementsov-Ogievskiy , "famz@redhat.com" , Denis Lunev , "qemu-block@nongnu.org" , "armbru@redhat.com" , "mreitz@redhat.com" , "berto@igalia.com" , Anton Nefedov , "pbonzini@redhat.com" , "jsnow@redhat.com" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/ide/core.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hw/ide/core.c b/hw/ide/core.c index 04e22e751d..8da77ff3e3 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -441,6 +441,14 @@ static void ide_issue_trim_cb(void *opaque, int ret) TrimAIOCB *iocb = opaque; IDEState *s = iocb->s; + if (iocb->i >= 0) { + if (ret >= 0) { + block_acct_done(blk_get_stats(s->blk), &s->acct); + } else { + block_acct_failed(blk_get_stats(s->blk), &s->acct); + } + } + if (ret >= 0) { while (iocb->j < iocb->qiov->niov) { int j = iocb->j; @@ -458,10 +466,14 @@ static void ide_issue_trim_cb(void *opaque, int ret) } if (!ide_sect_range_ok(s, sector, count)) { + block_acct_invalid(blk_get_stats(s->blk), BLOCK_ACCT_UNMAP); iocb->ret = -EINVAL; goto done; } + block_acct_start(blk_get_stats(s->blk), &s->acct, + count << BDRV_SECTOR_BITS, BLOCK_ACCT_UNMAP); + /* Got an entry! Submit and exit. */ iocb->aiocb = blk_aio_pdiscard(s->blk, sector << BDRV_SECTOR_BITS,