{"id":812803,"url":"http://patchwork.ozlabs.org/api/patches/812803/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912112855.24269-5-berrange@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170912112855.24269-5-berrange@redhat.com>","list_archive_url":null,"date":"2017-09-12T11:28:52","name":"[v3,4/7] block: don't use constant 512 as sector size in crypto driver","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"38ff0ff80d65b554e8202397119435b98de90e25","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/people/2694/?format=json","name":"Daniel P. Berrange","email":"berrange@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912112855.24269-5-berrange@redhat.com/mbox/","series":[{"id":2673,"url":"http://patchwork.ozlabs.org/api/series/2673/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2673","date":"2017-09-12T11:28:48","name":"Misc improvements to crypto block driver","version":3,"mbox":"http://patchwork.ozlabs.org/series/2673/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812803/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812803/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=berrange@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xs2ll2mTYz9s7B\n\tfor ;\n\tTue, 12 Sep 2017 21:35:15 +1000 (AEST)","from localhost ([::1]:35030 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drjTF-0007XD-Ab\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 07:35:13 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:53866)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drjNU-00033r-3Y\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 07:29:17 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drjNR-0004Sd-FY\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 07:29:16 -0400","from mx1.redhat.com ([209.132.183.28]:41148)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drjNO-0004QV-Mp; Tue, 12 Sep 2017 07:29:10 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id C015F8553D;\n\tTue, 12 Sep 2017 11:29:09 +0000 (UTC)","from localhost.localdomain.com (unknown [10.42.22.189])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 7F37E6C41C;\n\tTue, 12 Sep 2017 11:29:08 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C015F8553D","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\n\t(mx1.redhat.com [10.5.110.28]);\n\tTue, 12 Sep 2017 11:29:09 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v3 4/7] block: don't use constant 512 as sector\n\tsize in crypto driver","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Kevin Wolf , qemu-block@nongnu.org,\n\tStefan Hajnoczi , Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Use the qcrypto_block_get_sector_size() value in the block\ncrypto driver instead of hardcoding 512 as the sector size.\n\nSigned-off-by: Daniel P. Berrange \n---\n block/crypto.c | 34 ++++++++++++++++++----------------\n 1 file changed, 18 insertions(+), 16 deletions(-)","diff":"diff --git a/block/crypto.c b/block/crypto.c\nindex d68cbac2ac..49d6d4c058 100644\n--- a/block/crypto.c\n+++ b/block/crypto.c\n@@ -392,8 +392,9 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,\n uint8_t *cipher_data = NULL;\n QEMUIOVector hd_qiov;\n int ret = 0;\n+ uint64_t sector_size = qcrypto_block_get_sector_size(crypto->block);\n uint64_t payload_offset =\n- qcrypto_block_get_payload_offset(crypto->block) / 512;\n+ qcrypto_block_get_payload_offset(crypto->block) / sector_size;\n assert(payload_offset < (INT64_MAX / 512));\n \n qemu_iovec_init(&hd_qiov, qiov->niov);\n@@ -401,9 +402,9 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,\n /* Bounce buffer because we don't wish to expose cipher text\n * in qiov which points to guest memory.\n */\n- cipher_data =\n- qemu_try_blockalign(bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * 512,\n- qiov->size));\n+ cipher_data = qemu_try_blockalign(\n+ bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * sector_size,\n+ qiov->size));\n if (cipher_data == NULL) {\n ret = -ENOMEM;\n goto cleanup;\n@@ -417,7 +418,7 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,\n }\n \n qemu_iovec_reset(&hd_qiov);\n- qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * 512);\n+ qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * sector_size);\n \n ret = bdrv_co_readv(bs->file,\n payload_offset + sector_num,\n@@ -428,18 +429,18 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,\n \n if (qcrypto_block_decrypt(crypto->block,\n sector_num,\n- cipher_data, cur_nr_sectors * 512,\n+ cipher_data, cur_nr_sectors * sector_size,\n NULL) < 0) {\n ret = -EIO;\n goto cleanup;\n }\n \n qemu_iovec_from_buf(qiov, bytes_done,\n- cipher_data, cur_nr_sectors * 512);\n+ cipher_data, cur_nr_sectors * sector_size);\n \n remaining_sectors -= cur_nr_sectors;\n sector_num += cur_nr_sectors;\n- bytes_done += cur_nr_sectors * 512;\n+ bytes_done += cur_nr_sectors * sector_size;\n }\n \n cleanup:\n@@ -460,8 +461,9 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,\n uint8_t *cipher_data = NULL;\n QEMUIOVector hd_qiov;\n int ret = 0;\n+ uint64_t sector_size = qcrypto_block_get_sector_size(crypto->block);\n uint64_t payload_offset =\n- qcrypto_block_get_payload_offset(crypto->block) / 512;\n+ qcrypto_block_get_payload_offset(crypto->block) / sector_size;\n assert(payload_offset < (INT64_MAX / 512));\n \n qemu_iovec_init(&hd_qiov, qiov->niov);\n@@ -469,9 +471,9 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,\n /* Bounce buffer because we're not permitted to touch\n * contents of qiov - it points to guest memory.\n */\n- cipher_data =\n- qemu_try_blockalign(bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * 512,\n- qiov->size));\n+ cipher_data = qemu_try_blockalign(\n+ bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * sector_size,\n+ qiov->size));\n if (cipher_data == NULL) {\n ret = -ENOMEM;\n goto cleanup;\n@@ -485,18 +487,18 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,\n }\n \n qemu_iovec_to_buf(qiov, bytes_done,\n- cipher_data, cur_nr_sectors * 512);\n+ cipher_data, cur_nr_sectors * sector_size);\n \n if (qcrypto_block_encrypt(crypto->block,\n sector_num,\n- cipher_data, cur_nr_sectors * 512,\n+ cipher_data, cur_nr_sectors * sector_size,\n NULL) < 0) {\n ret = -EIO;\n goto cleanup;\n }\n \n qemu_iovec_reset(&hd_qiov);\n- qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * 512);\n+ qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * sector_size);\n \n ret = bdrv_co_writev(bs->file,\n payload_offset + sector_num,\n@@ -507,7 +509,7 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,\n \n remaining_sectors -= cur_nr_sectors;\n sector_num += cur_nr_sectors;\n- bytes_done += cur_nr_sectors * 512;\n+ bytes_done += cur_nr_sectors * sector_size;\n }\n \n cleanup:\n","prefixes":["v3","4/7"]}