From patchwork Wed Jun 13 17:44:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 929000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Z+qOQz3e"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 415Z0l07xPz9s3C for ; Thu, 14 Jun 2018 03:45:41 +1000 (AEST) Received: from localhost ([::1]:35951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT9py-0003Lh-3G for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2018 13:45:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT9pF-0003LF-IS for qemu-devel@nongnu.org; Wed, 13 Jun 2018 13:44:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fT9pE-00075g-HG for qemu-devel@nongnu.org; Wed, 13 Jun 2018 13:44:53 -0400 Received: from mail-eopbgr10138.outbound.protection.outlook.com ([40.107.1.138]:47432 helo=EUR02-HE1-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 1fT9pE-0006sA-8F; Wed, 13 Jun 2018 13:44:52 -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=UHgzfHYlMbyk5Bo1miEXBGJ97bmZHE2eX7x6Ly3MZgo=; b=Z+qOQz3ebVq7UQw2je23n2++st0Ude7myrwWsGtjcp0O+ih+tL5hNag6+Jh/PJSnU4WxFM+SKEcmAvj3jDB4BolGGFNHPBx1i9ODgB0HTKaLK40a16QvXboqoTiaSZ0Y5A8cnj/etH2YODkKpHavao2nd+5MkQOVhFjVbm4c7KY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Wed, 13 Jun 2018 17:44:49 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Wed, 13 Jun 2018 20:44:22 +0300 Message-Id: <1528911866-37489-5-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528911866-37489-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1528911866-37489-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0902CA0023.eurprd09.prod.outlook.com (2603:10a6:3:e5::33) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 084237d8-61d2-4b6d-1bed-08d5d1555cbd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(711020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3347; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 3:VToX6Aic9lKmsL3+7s5JQvg9wt5Lo4sEzeXWtSYmouczfsnSeDvUn1d4Qkjb6+anM0/lL0Yx6Enb1JT4NGKlBjtNIPvjG30N2BVmvuvRKortHDYvUyYprqfvPYpSbhBTYLy0/Rom3h4YoWemVO3Qg49GCcftAIigCU1cxOxb5e1hQuLJXCpsISdu8BDsdQSQslVA8+Q+1pqJnGRfpixR8U9asZ7hQfOqJwaYCD6Okry/Pn+BNKxPBRklDOf6cBPv; 25:pBfoZD61TTBuXXTrNs4JCY+oF5d+OfV8bFFFU3qt1CMQWNiTg4Exry504hfYxbTEwzR8VBpSsufDTizrp4VUi/WX/JLIKvFdMCTWlZPpWPUKqcymU97ysav1HeauWNjZebOVkPQsmVAtoKTDG77EDctxcX5kGF0SptHjUgaibiFQbn5XWB0fbTtaTsElxiROXbEfUmQ+b3RYeZ6Rdruy2shNsequHkOVB4NtefGBEW+vIwYFteHVKAPz4PebjUwm+KvRg8q0K+qofo5OcEP76yPpDED2RkbTSDsWDTOa3xx04Ke025sKoQd6Z7n5mmU2oJLsPQIEkCuAKPIGFLaDlQ==; 31:oSxAC7m6V8dVGMwJ4djIe22ysJCRXeo9Ukz+ke5kFqO9msZvd0ai6mAQ7KqEzcGaj9bFl6phyfHAkml44xlm+CRL/RZOr+DzmfUlQjznYz/sBYSuXspEbK35oHkF9n2swSnxynmVnWCO+dn7zwaocdXhbGY+I3cQXA3Uiz1gjg+/T+ULcmqMOqqGwaL1BW6v7yluYodERi8i4AnqKAUMqV2od6cweMeaABywdmeLjWc= X-MS-TrafficTypeDiagnostic: AM0PR08MB3347: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 20:0azQ8Lqddpz3Z5U61rnz4EEQLGKCvRVyTp4LV/qazfQoEtuYrW4MO6Hw0d0ZNPqQTwD84XOaQlQ3lh3YPLwXyME9nU9NQ0yWxfjtv3pXLcUuKvc2Z5ay7YZ966H8MjVRCHnlMbV22+U4ukQOVY4pFGCAncK8XR+y9+L8Ozib7R2bT8qED3gwksd0+LjPZMQf/hle4et2UzzIyk0D969828wjcp8SK6kJhqmMSvZR6AruDS9VSdgLY1Iy1FRGUW9iwDnLcQefmsh8L2ifmqbD046tb+lfzHPQCZYZKwQj8qUv4MnHebGFraktZP+OAuQMks/GWqME+RjYPMaSIirXSI9H95MOgE0WV7YJYWaUD0JjZRYn0y/Tawac+WHNYbljxzZSfmBN3LapKRjCirOTvtZf91hOHqaa6TjV1tuxyr7E2JCCpae+IoqYxasMnkMwYTSyB6tuN4Rio65QG/0DROWeuEsgc4bG8chJRBdzVaRKTGh364SJfWBkfSbcfYfD; 4:OBPRWIL04+wvZ/PMcyfZpCF3/qWyzgj28ZO5gUK8E47imsEW4hA1yIRwqYzTxiKi16S64raQLTC8w3Khw438vDc225iK9qCWUmJat2SQK0YEcKOxgxMC5Bk6YZbUjM4Q0f7Zx2cwyYBLRgAuzsxs+W+fRnxyH/lmhEuePNFCJMLSe0w9Hp5m8KtX2Cifzgj0kDWvBXvfqec4NruJRIlVMsOhZsO4jb6jHxmt+cwfH/udiOzIMyu8TZspPLHo4y+g0udS/YN7yfy6p8Dc3/GwoQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:AM0PR08MB3347; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3347; X-Forefront-PRVS: 07025866F6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(346002)(376002)(39850400004)(366004)(39380400002)(199004)(189003)(50466002)(2351001)(386003)(4326008)(2361001)(6512007)(52116002)(105586002)(486006)(478600001)(106356001)(44832011)(53416004)(107886003)(51416003)(53936002)(76176011)(11346002)(956004)(446003)(2616005)(476003)(69596002)(6486002)(48376002)(16526019)(6506007)(7736002)(97736004)(186003)(5660300001)(6666003)(25786009)(6916009)(305945005)(8936002)(6116002)(3846002)(50226002)(66066001)(36756003)(8676002)(86362001)(47776003)(55236004)(68736007)(316002)(2906002)(16586007)(81166006)(26005)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3347; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3347; 23:pb0MSxFGk0eyeBXnp2qEvq1qtiZlUSfsmOCoWywGa?= Od2F2CGbsxspqJ/a0CVPlg6dDJwYKyeIuaTg+eFYWv6FhhDS3agE4AtARPJY2KlJS1Fy9F1RNk29uD8CNRizxYbuevREVZ1YS9XhLQ8ntKpXiH6BGDGV4E//rvawRMHYDhySoT6Mg497HvGl8eDjJ1UGq0XXikIg0ppYBJzfY9P7X16Qp6vdistlMRRVFHIUHyk6sbpU4AwQ0hQAxtOGvaANkra/9bpE4pvxwHO2s+7O6N/c+x/Z2+/0xwZzDBGEXit92zTq00Gvyj6jHdgCRwV7lrVq3oXMbtJf+JWX9OgtLfah9mhBWOpSdqTSsXXz+1BZx2ymDPcHi8N5+bghiap89INvd6mcIRdgEUHSDX5zl3Zh2gGJzKNNGu7bwmVsHkxykbpI67juzAo6fhm0CSJi6qrwfBYp8srly5zSoGVWiFpcFzf9MMWuHr/pmyMQKbnCocNomUmw65rawvTbXMOKMtfL8trt9RzvUJQw/m6l6cgGySjrGL095UaV/blNeDaQ/drMN4JpEKuZDPXUDIVB9J3mQ4Bs2K2Lva0sOHsqp2iIrh+zQNEfCQBR3APqr5j27w6F88hBJ59rPNjo3vyjvofDiIe7PORfWKc/7rPFDd3M810ihw+lYxu45nawmXYcnf6tdM8XuZtCEWkB0slBsBY4z8Pb1b6/rMhi3C6y3ynqhaPPn56C9LjsTIos20xCqz4jOaxtnZA6v9iYFqiZtZTtnDQM9n479mCC72l3I3MmeAFqn9+3hXy2tAGyRZZw4CEyXhT4GP7zQU+0iDtvOiDgx9ZjQ/dQXsmy4R3aqo/LDg7RCYh693y2/6E5yXlT3HAcdrFHWXSSmkGaJ5WTTuP2oUBLZB22vk1mGPMtCVdb+v8Aj1SpbE08pQj5UfA28/ViSbMue5RR+aLPY7KPfWB8yiavfemojfAg1BlGoc9e2B2UQmPwU41/thq0fCBT/HHqiqFfxMNjCLFT3fPftwbNntj3L/RGbFgW6iGCj4Vs9ALFYu1vV1+/M2EXSZ3m+tYMdFmd2SyrHWK51ATcTrT5iBdXJPW37Rk4IF6/IOIDcOgCHTID5LTny16MssPP+zejQ84CVW7lB6LZ6jDKRL63aeqsh5seJCWP8mnRiH9ijBziQkzwaW9YyIKKCtDsvoSawU8h/jd64i2lXyj2PFw1B+ENOK0rjbtRWsJJmLO3F6Uf6yNNiNXgXAWzgdBPlHs+7V+LN+BFhe+QH5AIQRrOz5jT1px4hOwSR2RCB3pr/oDpRRNjdlTTNRdSt4= X-Microsoft-Antispam-Message-Info: BgJRp8+ic9Gl1el37VicC9Ygotsai69gWD1ylOc+6Fad/D32aOEvfa10FwcQibX+ht7H5DgwUn6xWF/gA/nQ2hZEAW9mi+817bYF/I+VXODExoFX5t2yVE+siTQkkQ63kKQiBUFiIDh6A03fS8x1wfJsdgBXFN7W5B4nZVBynWHZqRkjjVk/4/gG26B/B2nq X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 6:+0ebtyQf8urLLary8zMoFa3vX7Mi1/X4j5YpjsjlEe85+y9XsJhCEXsBvKExw+H7UmYo3nzy/8eV0hN+VRCyfzfI6qygLJVIapFz+7VBO2A1X7U1FnW5l3sTGW+Dh0t+GbYRaAGHlnSkbz1gS06xvbo+swekjRFFO8kthCN05kcI5v4k2uUW5M8omhDKgF8Ba7f+3WgG0U9IovmE37FyMMRwHGacNvnKSYixa5kM7sU/V3DdxNO/NobOsjBc4DIPlmZ36EhS3G3HMf+Uv0SqHpqwkUAJqUNV+Fya0/Udo9ZQGTZfDdpRJPR4XtGHgU1AMxMJE9ZMfi5aAVscIvVY8gksJPFr3pGDcQA3F/lGURQKqYgKZ6J6v3M1gjWthzxhVTNyohDdWVZrA+tO9vgnJ+9AmUTzBA9EUVX7IPFFlkdmSE9i3WxU6G8Xe3zeOEOnY/T+CMLCrDT6IZWM7sHpkQ==; 5:71EuHe6v7tOo/VkcnPCGIwy1In/Freg/DjO4IyCezAxpwB+ZcN5WUPBDtOIAw2dbabeGW5sP2/2MA2XeGAtbWPOp6VCP8XMikCCIDyG+eCID4zml14il2rb8Luadjd6xfHanI+EyDFE+5If57tFMF3nZAOAcAoo8r/rbR373Gq4=; 24:zFSBZ1X1lFlNulmoGYoco/187fiJJXiUTCWOtjREtuPP0pMcyzM2s/Hd2KWAaPCFDB1WYoeVrsbCUOVeMHuTUhboZWr2UYu8uaghYryc+u4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3347; 7:s7Am49unhUVFqgIpui6dbg9xxi853Be+ccml//bp0QWl0s6qtCCCR63sEAPJ13IE/l7nmdg5eFXSuDc6Ksc/q/P5eJoX4NY2/+OqfX72J1LmXgstIJHSrjxXRm9Nyvkg6PE4DiRUrzYN4pMcBGB3nGqyiD9WNmsyINrkKhkz02BVgbuQhbYxQJk0dPOtITSZVshbWfTtq3WR+7w9Jvo3fHuW9j9UV5vSx26FDWgk+FJRani6tJQZ+S32lTM3ouzZ; 20:gAl7qvtdfPNVGIngzlHiM5LBeHxgQN0wtVAOAppdwFAx07QjcM454OHo4VxxBJ4SBQp/R690gu7HbMiz28IalibdeFk2dnlHDC+w+biHDzwndFvBAt2U3e9PMIZ1NJbo11HIn8dWO7JnHLYVovvGPsOjN70Hl+u4cNzKgHGhJ0A= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2018 17:44:49.3510 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 084237d8-61d2-4b6d-1bed-08d5d1555cbd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3347 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.1.138 Subject: [Qemu-devel] [PATCH v3 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 , berto@igalia.com, den@virtuozzo.com, qemu-block@nongnu.org, armbru@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 ded23d3..b08ce8a 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1642,8 +1642,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)) { @@ -1651,16 +1649,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;