From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaMWS-0003mr-A0 for qemu-devel@nongnu.org; Mon, 29 Feb 2016 07:01:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaMWO-0007Wd-6v for qemu-devel@nongnu.org; Mon, 29 Feb 2016 07:01:56 -0500 From: "Daniel P. Berrange" Date: Mon, 29 Feb 2016 12:00:55 +0000 Message-Id: <1456747261-22032-21-git-send-email-berrange@redhat.com> In-Reply-To: <1456747261-22032-1-git-send-email-berrange@redhat.com> References: <1456747261-22032-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v4 20/26] qcow2: make qcow2_encrypt_sectors encrypt in place List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng , qemu-block@nongnu.org Instead of requiring separate input/output buffers for encrypting data, change qcow2_encrypt_sectors() to assume use of a single buffer, encrypting in place. The current callers all used the same buffer for input/output already. Reviewed-by: Eric Blake Reviewed-by: Fam Zheng Signed-off-by: Daniel P. Berrange --- block/qcow2-cluster.c | 17 +++++------------ block/qcow2.c | 5 ++--- block/qcow2.h | 3 +-- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 3e887e9..3802d37 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -342,12 +342,8 @@ static int count_contiguous_clusters_by_type(int nb_clusters, return i; } -/* The crypt function is compatible with the linux cryptoloop - algorithm for < 4 GB images. NOTE: out_buf == in_buf is - supported */ int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num, - uint8_t *out_buf, const uint8_t *in_buf, - int nb_sectors, bool enc, + uint8_t *buf, int nb_sectors, bool enc, Error **errp) { union { @@ -367,14 +363,12 @@ int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num, } if (enc) { ret = qcrypto_cipher_encrypt(s->cipher, - in_buf, - out_buf, + buf, buf, 512, errp); } else { ret = qcrypto_cipher_decrypt(s->cipher, - in_buf, - out_buf, + buf, buf, 512, errp); } @@ -382,8 +376,7 @@ int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num, return -1; } sector_num++; - in_buf += 512; - out_buf += 512; + buf += 512; } return 0; } @@ -431,7 +424,7 @@ static int coroutine_fn copy_sectors(BlockDriverState *bs, Error *err = NULL; assert(s->cipher); if (qcow2_encrypt_sectors(s, start_sect + n_start, - iov.iov_base, iov.iov_base, n, + iov.iov_base, n, true, &err) < 0) { ret = -EIO; error_free(err); diff --git a/block/qcow2.c b/block/qcow2.c index 8babecd..0264df7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1506,7 +1506,7 @@ static coroutine_fn int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num, assert(s->cipher); Error *err = NULL; if (qcow2_encrypt_sectors(s, sector_num, cluster_data, - cluster_data, cur_nr_sectors, false, + cur_nr_sectors, false, &err) < 0) { error_free(err); ret = -EIO; @@ -1606,8 +1606,7 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs, qemu_iovec_to_buf(&hd_qiov, 0, cluster_data, hd_qiov.size); if (qcow2_encrypt_sectors(s, sector_num, cluster_data, - cluster_data, cur_nr_sectors, - true, &err) < 0) { + cur_nr_sectors, true, &err) < 0) { error_free(err); ret = -EIO; goto fail; diff --git a/block/qcow2.h b/block/qcow2.h index a063a3c..ae04285 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -540,8 +540,7 @@ int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index); void qcow2_l2_cache_reset(BlockDriverState *bs); int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset); int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num, - uint8_t *out_buf, const uint8_t *in_buf, - int nb_sectors, bool enc, Error **errp); + uint8_t *buf, int nb_sectors, bool enc, Error **errp); int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset, int *num, uint64_t *cluster_offset); -- 2.5.0