From nobody Tue Nov 4 06:35: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 1505216160282555.2776101956143; Tue, 12 Sep 2017 04:36:00 -0700 (PDT) Received: from localhost ([::1]:35039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drjTz-0008Vo-JI for importer@patchew.org; Tue, 12 Sep 2017 07:35:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drjNU-00033r-3Y for qemu-devel@nongnu.org; Tue, 12 Sep 2017 07:29:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drjNR-0004Sd-FY for qemu-devel@nongnu.org; Tue, 12 Sep 2017 07:29:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41148) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drjNO-0004QV-Mp; Tue, 12 Sep 2017 07:29:10 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C015F8553D; Tue, 12 Sep 2017 11:29:09 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F37E6C41C; Tue, 12 Sep 2017 11:29:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C015F8553D Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 12 Sep 2017 12:28:52 +0100 Message-Id: <20170912112855.24269-5-berrange@redhat.com> In-Reply-To: <20170912112855.24269-1-berrange@redhat.com> References: <20170912112855.24269-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 12 Sep 2017 11:29:09 +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 v3 4/7] block: don't use constant 512 as 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" Use the qcrypto_block_get_sector_size() value in the block crypto driver instead of hardcoding 512 as the sector size. Signed-off-by: Daniel P. Berrange --- block/crypto.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index d68cbac2ac..49d6d4c058 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -392,8 +392,9 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sec= tor_num, uint8_t *cipher_data =3D NULL; QEMUIOVector hd_qiov; int ret =3D 0; + uint64_t sector_size =3D qcrypto_block_get_sector_size(crypto->block); uint64_t payload_offset =3D - qcrypto_block_get_payload_offset(crypto->block) / 512; + qcrypto_block_get_payload_offset(crypto->block) / sector_size; assert(payload_offset < (INT64_MAX / 512)); =20 qemu_iovec_init(&hd_qiov, qiov->niov); @@ -401,9 +402,9 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sec= tor_num, /* 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 * sector_size, + qiov->size)); if (cipher_data =3D=3D NULL) { ret =3D -ENOMEM; goto cleanup; @@ -417,7 +418,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 * sector_size= ); =20 ret =3D bdrv_co_readv(bs->file, payload_offset + sector_num, @@ -428,18 +429,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 * sector_siz= e, 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 * 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 * sector_size; } =20 cleanup: @@ -460,8 +461,9 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t se= ctor_num, uint8_t *cipher_data =3D NULL; QEMUIOVector hd_qiov; int ret =3D 0; + uint64_t sector_size =3D qcrypto_block_get_sector_size(crypto->block); uint64_t payload_offset =3D - qcrypto_block_get_payload_offset(crypto->block) / 512; + qcrypto_block_get_payload_offset(crypto->block) / sector_size; assert(payload_offset < (INT64_MAX / 512)); =20 qemu_iovec_init(&hd_qiov, qiov->niov); @@ -469,9 +471,9 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t se= ctor_num, /* 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 * sector_size, + qiov->size)); if (cipher_data =3D=3D NULL) { ret =3D -ENOMEM; goto cleanup; @@ -485,18 +487,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 * sector_size); =20 if (qcrypto_block_encrypt(crypto->block, sector_num, - cipher_data, cur_nr_sectors * 512, + cipher_data, cur_nr_sectors * sector_siz= e, 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 * sector_size= ); =20 ret =3D bdrv_co_writev(bs->file, payload_offset + sector_num, @@ -507,7 +509,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 * sector_size; } =20 cleanup: --=20 2.13.5