From nobody Tue Nov 4 13:04:20 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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 1504177663801143.53413150341112; Thu, 31 Aug 2017 04:07:43 -0700 (PDT) Received: from localhost ([::1]:55038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnNK1-00080n-3O for importer@patchew.org; Thu, 31 Aug 2017 07:07:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnNHy-0006bc-IE for qemu-devel@nongnu.org; Thu, 31 Aug 2017 07:05:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnNHx-0007dC-Bm for qemu-devel@nongnu.org; Thu, 31 Aug 2017 07:05:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41672) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnNHu-0007ZE-JD; Thu, 31 Aug 2017 07:05:30 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8703B267CD; Thu, 31 Aug 2017 11:05:29 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id F15819ABBC; Thu, 31 Aug 2017 11:05:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8703B267CD Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 31 Aug 2017 12:05:16 +0100 Message-Id: <20170831110518.10741-3-berrange@redhat.com> In-Reply-To: <20170831110518.10741-1-berrange@redhat.com> References: <20170831110518.10741-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 31 Aug 2017 11:05:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/4] block: use BDRV_SECTOR_SIZE in crypto driver 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: Kevin Wolf , qemu-block@nongnu.org, Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrange Reviewed-by: Eric Blake --- block/crypto.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index cc8afe0e0d..e63f094379 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -392,16 +392,16 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t s= ector_num, QEMUIOVector hd_qiov; int ret =3D 0; size_t payload_offset =3D - qcrypto_block_get_payload_offset(crypto->block) / 512; + qcrypto_block_get_payload_offset(crypto->block) / BDRV_SECTOR_SIZE; =20 qemu_iovec_init(&hd_qiov, qiov->niov); =20 /* Bounce buffer because we don't wish to expose cipher text * in qiov which points to guest memory. */ - cipher_data =3D - qemu_try_blockalign(bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * 5= 12, - qiov->size)); + cipher_data =3D qemu_try_blockalign( + bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * BDRV_SECTOR_SIZE, + qiov->size)); if (cipher_data =3D=3D NULL) { ret =3D -ENOMEM; goto cleanup; @@ -415,7 +415,7 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sec= tor_num, } =20 qemu_iovec_reset(&hd_qiov); - qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * 512); + qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * BDRV_SECTOR= _SIZE); =20 ret =3D bdrv_co_readv(bs->file, payload_offset + sector_num, @@ -426,18 +426,18 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t s= ector_num, =20 if (qcrypto_block_decrypt(crypto->block, sector_num, - cipher_data, cur_nr_sectors * 512, + cipher_data, cur_nr_sectors * BDRV_SECTO= R_SIZE, NULL) < 0) { ret =3D -EIO; goto cleanup; } =20 qemu_iovec_from_buf(qiov, bytes_done, - cipher_data, cur_nr_sectors * 512); + cipher_data, cur_nr_sectors * BDRV_SECTOR_SIZE= ); =20 remaining_sectors -=3D cur_nr_sectors; sector_num +=3D cur_nr_sectors; - bytes_done +=3D cur_nr_sectors * 512; + bytes_done +=3D cur_nr_sectors * BDRV_SECTOR_SIZE; } =20 cleanup: @@ -459,16 +459,16 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t = sector_num, QEMUIOVector hd_qiov; int ret =3D 0; size_t payload_offset =3D - qcrypto_block_get_payload_offset(crypto->block) / 512; + qcrypto_block_get_payload_offset(crypto->block) / BDRV_SECTOR_SIZE; =20 qemu_iovec_init(&hd_qiov, qiov->niov); =20 /* Bounce buffer because we're not permitted to touch * contents of qiov - it points to guest memory. */ - cipher_data =3D - qemu_try_blockalign(bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * 5= 12, - qiov->size)); + cipher_data =3D qemu_try_blockalign( + bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * BDRV_SECTOR_SIZE, + qiov->size)); if (cipher_data =3D=3D NULL) { ret =3D -ENOMEM; goto cleanup; @@ -482,18 +482,18 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t = sector_num, } =20 qemu_iovec_to_buf(qiov, bytes_done, - cipher_data, cur_nr_sectors * 512); + cipher_data, cur_nr_sectors * BDRV_SECTOR_SIZE); =20 if (qcrypto_block_encrypt(crypto->block, sector_num, - cipher_data, cur_nr_sectors * 512, + cipher_data, cur_nr_sectors * BDRV_SECTO= R_SIZE, NULL) < 0) { ret =3D -EIO; goto cleanup; } =20 qemu_iovec_reset(&hd_qiov); - qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * 512); + qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * BDRV_SECTOR= _SIZE); =20 ret =3D bdrv_co_writev(bs->file, payload_offset + sector_num, @@ -504,7 +504,7 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t se= ctor_num, =20 remaining_sectors -=3D cur_nr_sectors; sector_num +=3D cur_nr_sectors; - bytes_done +=3D cur_nr_sectors * 512; + bytes_done +=3D cur_nr_sectors * BDRV_SECTOR_SIZE; } =20 cleanup: --=20 2.13.5