From patchwork Wed Oct 31 11:34:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 10662519 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 5AC9114BD for ; Wed, 31 Oct 2018 11:43:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B33C2AA98 for ; Wed, 31 Oct 2018 11:43:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A2142AAB3; Wed, 31 Oct 2018 11:43:02 +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 AAD742AA98 for ; Wed, 31 Oct 2018 11:43:01 +0000 (UTC) Received: from localhost ([::1]:58770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHoto-0002ZK-4U for patchwork-qemu-devel@patchwork.kernel.org; Wed, 31 Oct 2018 07:43:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHomB-0003QW-Sx for qemu-devel@nongnu.org; Wed, 31 Oct 2018 07:35:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHom6-0001bW-Qm for qemu-devel@nongnu.org; Wed, 31 Oct 2018 07:35:05 -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 1gHom2-0001Ii-T7; Wed, 31 Oct 2018 07:35:01 -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=T7d00VIXJCHusrNm7FzSX6sTHWt2zZbowtGMz0IasEM=; b=IZg0pohj00MRfAPS31pGEHhZzq6aGCyw7cqNx2116TuxVxfxIY7+2etcOKdO+sjryKK2tkLPqKQl/kb72qcEMXi20dWOrE6TRQVvW7pXRfS/JjdhGIDwgOsp74aXvG6GPhMnuhcTaxOd8A+L8OWNSzNrx+VFNEr6A149f6Xvj70= 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:54 +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:54 +0000 From: Anton Nefedov To: "qemu-devel@nongnu.org" Thread-Topic: [PATCH v5 5/9] scsi: store unmap offset and nb_sectors in request struct Thread-Index: AQHUcQ2+Xbmu1wESakeKmqeFa8xk7w== Date: Wed, 31 Oct 2018 11:34:54 +0000 Message-ID: <20181031113418.29796-6-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:s15oaen/UXlnvh2uV9xtq7DNuLIeEbiFm2llgm2RaE/unvZA469mnJjQwzlamtTk0fkgw2KV2KnWdlUjXaR/khMGNYYe7JB9qQ1rgbqf9xWrHtJAZ0mHihs2VE+YgQYIN1Dwsb+PmlUE88QOLArlXY9gyb3yA8le6wwXCQksXCU= x-ms-office365-filtering-correlation-id: a5dc7d17-09e8-42d0-1d44-08d63f24e08f 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: O8pJ5KlIvmS71Az9EAeAfqIt++9+gfqNZ60hSxgw027oX2UVVf/ajQmMsfn7MezJMyMXeY2P5i4juRtVdUI+Ne5zP1MOB8DNgDizwowmEA7iwQiI5Irc8wa7RRvxssL6GBrrpNUE19U2k/zORzw4RWNApjr9X6NEMOcyCYqKJTdTPvwGSdA2KA72Iah7j76w0M1DqdZZru0vOmjjFa595RkdpZw3dICEVv8/agtaYuyazi4ctiNm3gTTcUJto+uExaBmsp+s0kzY33ySri5lwNIRT7UtPIIC+EDqj84ljXvG9cwXOLJcc13oBOLXquVL+BampRwbewRXcHzN0msriOB89qbrXDgXjnmCaAusFUw= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5dc7d17-09e8-42d0-1d44-08d63f24e08f X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Oct 2018 11:34:54.3045 (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 5/9] 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" , 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 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 e2c5408aa2..661228b569 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1656,8 +1656,6 @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret) { SCSIDiskReq *r = data->r; SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - uint64_t sector_num; - uint32_t nb_sectors; assert(r->req.aiocb == NULL); if (scsi_disk_req_check_error(r, ret, false)) { @@ -1665,16 +1663,16 @@ static void scsi_unmap_complete_noio(UnmapCBData *data, int ret) } if (data->count > 0) { - sector_num = ldq_be_p(&data->inbuf[0]); - nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL; - if (!check_lba_range(s, sector_num, nb_sectors)) { + r->sector = ldq_be_p(&data->inbuf[0]); + r->sector_count = 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; } r->req.aiocb = 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.blocksize, scsi_unmap_complete, data); data->count--; data->inbuf += 16;