{"id":808195,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808195/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20170831110518.10741-3-berrange@redhat.com>","date":"2017-08-31T11:05:16","name":"[v2,2/4] block: use BDRV_SECTOR_SIZE in crypto driver","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3bb48ae4af6b01c479771da193638fad9c8e72d0","submitter":{"id":2694,"url":"http://patchwork.ozlabs.org/api/1.0/people/2694/?format=json","name":"Daniel P. Berrangé","email":"berrange@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831110518.10741-3-berrange@redhat.com/mbox/","series":[{"id":795,"url":"http://patchwork.ozlabs.org/api/1.0/series/795/?format=json","date":"2017-08-31T11:05:16","name":"block: improve luks driver perf & switch to byte APIs","version":2,"mbox":"http://patchwork.ozlabs.org/series/795/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808195/checks/","tags":{},"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-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xjfhS2Cb2z9t1t\n\tfor ;\n\tThu, 31 Aug 2017 21:06:48 +1000 (AEST)","from localhost ([::1]:55035 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnNJ8-000708-6d\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 07:06:46 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50021)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnNHy-0006bc-IE\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 07:05:40 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnNHx-0007dC-Bm\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 07:05:34 -0400","from mx1.redhat.com ([209.132.183.28]:41672)\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 1dnNHu-0007ZE-JD; Thu, 31 Aug 2017 07:05:30 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 8703B267CD;\n\tThu, 31 Aug 2017 11:05:29 +0000 (UTC)","from localhost.localdomain.com (unknown [10.42.22.189])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id F15819ABBC;\n\tThu, 31 Aug 2017 11:05:27 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 8703B267CD","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\n\t(mx1.redhat.com [10.5.110.30]);\n\tThu, 31 Aug 2017 11:05:29 +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 v2 2/4] block: use BDRV_SECTOR_SIZE in crypto\n\tdriver","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":"Signed-off-by: Daniel P. Berrange \n---\n block/crypto.c | 32 ++++++++++++++++----------------\n 1 file changed, 16 insertions(+), 16 deletions(-)","diff":"diff --git a/block/crypto.c b/block/crypto.c\nindex cc8afe0e0d..e63f094379 100644\n--- a/block/crypto.c\n+++ b/block/crypto.c\n@@ -392,16 +392,16 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,\n QEMUIOVector hd_qiov;\n int ret = 0;\n size_t payload_offset =\n- qcrypto_block_get_payload_offset(crypto->block) / 512;\n+ qcrypto_block_get_payload_offset(crypto->block) / BDRV_SECTOR_SIZE;\n \n qemu_iovec_init(&hd_qiov, qiov->niov);\n \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 * BDRV_SECTOR_SIZE,\n+ qiov->size));\n if (cipher_data == NULL) {\n ret = -ENOMEM;\n goto cleanup;\n@@ -415,7 +415,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 * BDRV_SECTOR_SIZE);\n \n ret = bdrv_co_readv(bs->file,\n payload_offset + sector_num,\n@@ -426,18 +426,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 * BDRV_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 * BDRV_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 * BDRV_SECTOR_SIZE;\n }\n \n cleanup:\n@@ -459,16 +459,16 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,\n QEMUIOVector hd_qiov;\n int ret = 0;\n size_t payload_offset =\n- qcrypto_block_get_payload_offset(crypto->block) / 512;\n+ qcrypto_block_get_payload_offset(crypto->block) / BDRV_SECTOR_SIZE;\n \n qemu_iovec_init(&hd_qiov, qiov->niov);\n \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 * BDRV_SECTOR_SIZE,\n+ qiov->size));\n if (cipher_data == NULL) {\n ret = -ENOMEM;\n goto cleanup;\n@@ -482,18 +482,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 * BDRV_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 * BDRV_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 * BDRV_SECTOR_SIZE);\n \n ret = bdrv_co_writev(bs->file,\n payload_offset + sector_num,\n@@ -504,7 +504,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 * BDRV_SECTOR_SIZE;\n }\n \n cleanup:\n","prefixes":["v2","2/4"]}