From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, Kevin Wolf <kwolf@redhat.com>,
Max Reitz <mreitz@redhat.com>, Eric Blake <eblake@redhat.com>,
Stefan Hajnoczi <stefanha@gmail.com>,
"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v2 2/4] block: use BDRV_SECTOR_SIZE in crypto driver
Date: Thu, 31 Aug 2017 12:05:16 +0100 [thread overview]
Message-ID: <20170831110518.10741-3-berrange@redhat.com> (raw)
In-Reply-To: <20170831110518.10741-1-berrange@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
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 sector_num,
QEMUIOVector hd_qiov;
int ret = 0;
size_t payload_offset =
- qcrypto_block_get_payload_offset(crypto->block) / 512;
+ qcrypto_block_get_payload_offset(crypto->block) / BDRV_SECTOR_SIZE;
qemu_iovec_init(&hd_qiov, qiov->niov);
/* Bounce buffer because we don't wish to expose cipher text
* in qiov which points to guest memory.
*/
- cipher_data =
- qemu_try_blockalign(bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * 512,
- qiov->size));
+ cipher_data = qemu_try_blockalign(
+ bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * BDRV_SECTOR_SIZE,
+ qiov->size));
if (cipher_data == NULL) {
ret = -ENOMEM;
goto cleanup;
@@ -415,7 +415,7 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,
}
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);
ret = bdrv_co_readv(bs->file,
payload_offset + sector_num,
@@ -426,18 +426,18 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,
if (qcrypto_block_decrypt(crypto->block,
sector_num,
- cipher_data, cur_nr_sectors * 512,
+ cipher_data, cur_nr_sectors * BDRV_SECTOR_SIZE,
NULL) < 0) {
ret = -EIO;
goto cleanup;
}
qemu_iovec_from_buf(qiov, bytes_done,
- cipher_data, cur_nr_sectors * 512);
+ cipher_data, cur_nr_sectors * BDRV_SECTOR_SIZE);
remaining_sectors -= cur_nr_sectors;
sector_num += cur_nr_sectors;
- bytes_done += cur_nr_sectors * 512;
+ bytes_done += cur_nr_sectors * BDRV_SECTOR_SIZE;
}
cleanup:
@@ -459,16 +459,16 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,
QEMUIOVector hd_qiov;
int ret = 0;
size_t payload_offset =
- qcrypto_block_get_payload_offset(crypto->block) / 512;
+ qcrypto_block_get_payload_offset(crypto->block) / BDRV_SECTOR_SIZE;
qemu_iovec_init(&hd_qiov, qiov->niov);
/* Bounce buffer because we're not permitted to touch
* contents of qiov - it points to guest memory.
*/
- cipher_data =
- qemu_try_blockalign(bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * 512,
- qiov->size));
+ cipher_data = qemu_try_blockalign(
+ bs->file->bs, MIN(BLOCK_CRYPTO_MAX_SECTORS * BDRV_SECTOR_SIZE,
+ qiov->size));
if (cipher_data == NULL) {
ret = -ENOMEM;
goto cleanup;
@@ -482,18 +482,18 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,
}
qemu_iovec_to_buf(qiov, bytes_done,
- cipher_data, cur_nr_sectors * 512);
+ cipher_data, cur_nr_sectors * BDRV_SECTOR_SIZE);
if (qcrypto_block_encrypt(crypto->block,
sector_num,
- cipher_data, cur_nr_sectors * 512,
+ cipher_data, cur_nr_sectors * BDRV_SECTOR_SIZE,
NULL) < 0) {
ret = -EIO;
goto cleanup;
}
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);
ret = bdrv_co_writev(bs->file,
payload_offset + sector_num,
@@ -504,7 +504,7 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,
remaining_sectors -= cur_nr_sectors;
sector_num += cur_nr_sectors;
- bytes_done += cur_nr_sectors * 512;
+ bytes_done += cur_nr_sectors * BDRV_SECTOR_SIZE;
}
cleanup:
--
2.13.5
next prev parent reply other threads:[~2017-08-31 11:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-31 11:05 [Qemu-devel] [PATCH v2 0/4] block: improve luks driver perf & switch to byte APIs Daniel P. Berrange
2017-08-31 11:05 ` [Qemu-devel] [PATCH v2 1/4] block: use 1 MB bounce buffers for crypto instead of 16KB Daniel P. Berrange
2017-08-31 11:05 ` Daniel P. Berrange [this message]
2017-08-31 14:54 ` [Qemu-devel] [PATCH v2 2/4] block: use BDRV_SECTOR_SIZE in crypto driver Eric Blake
2017-09-05 9:52 ` Kevin Wolf
2017-09-05 10:05 ` Daniel P. Berrange
2017-09-05 10:23 ` Kevin Wolf
2017-08-31 11:05 ` [Qemu-devel] [PATCH v2 3/4] block: convert crypto driver to bdrv_co_preadv|pwritev Daniel P. Berrange
2017-08-31 15:08 ` Eric Blake
2017-09-12 10:14 ` Daniel P. Berrange
2017-08-31 11:05 ` [Qemu-devel] [PATCH v2 4/4] block: convert qcrypto_block_encrypt|decrypt to take bytes offset Daniel P. Berrange
2017-08-31 15:17 ` Eric Blake
2017-08-31 15:22 ` Daniel P. Berrange
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170831110518.10741-3-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).