[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 4/7] block: don't use constant 512 as sector size
From: |
Daniel P. Berrange |
Subject: |
[Qemu-block] [PATCH v3 4/7] block: don't use constant 512 as sector size in crypto driver |
Date: |
Tue, 12 Sep 2017 12:28:52 +0100 |
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 <address@hidden>
---
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
sector_num,
uint8_t *cipher_data = NULL;
QEMUIOVector hd_qiov;
int ret = 0;
+ uint64_t sector_size = qcrypto_block_get_sector_size(crypto->block);
uint64_t payload_offset =
- qcrypto_block_get_payload_offset(crypto->block) / 512;
+ qcrypto_block_get_payload_offset(crypto->block) / sector_size;
assert(payload_offset < (INT64_MAX / 512));
qemu_iovec_init(&hd_qiov, qiov->niov);
@@ -401,9 +402,9 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t
sector_num,
/* 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 * sector_size,
+ qiov->size));
if (cipher_data == NULL) {
ret = -ENOMEM;
goto cleanup;
@@ -417,7 +418,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 * sector_size);
ret = bdrv_co_readv(bs->file,
payload_offset + sector_num,
@@ -428,18 +429,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 * 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 * sector_size);
remaining_sectors -= cur_nr_sectors;
sector_num += cur_nr_sectors;
- bytes_done += cur_nr_sectors * 512;
+ bytes_done += cur_nr_sectors * sector_size;
}
cleanup:
@@ -460,8 +461,9 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t
sector_num,
uint8_t *cipher_data = NULL;
QEMUIOVector hd_qiov;
int ret = 0;
+ uint64_t sector_size = qcrypto_block_get_sector_size(crypto->block);
uint64_t payload_offset =
- qcrypto_block_get_payload_offset(crypto->block) / 512;
+ qcrypto_block_get_payload_offset(crypto->block) / sector_size;
assert(payload_offset < (INT64_MAX / 512));
qemu_iovec_init(&hd_qiov, qiov->niov);
@@ -469,9 +471,9 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t
sector_num,
/* 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 * sector_size,
+ qiov->size));
if (cipher_data == NULL) {
ret = -ENOMEM;
goto cleanup;
@@ -485,18 +487,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 * sector_size);
if (qcrypto_block_encrypt(crypto->block,
sector_num,
- cipher_data, cur_nr_sectors * 512,
+ cipher_data, cur_nr_sectors * 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 * sector_size);
ret = bdrv_co_writev(bs->file,
payload_offset + sector_num,
@@ -507,7 +509,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 * sector_size;
}
cleanup:
--
2.13.5
- [Qemu-block] [PATCH v3 0/7] Misc improvements to crypto block driver, Daniel P. Berrange, 2017/09/12
- [Qemu-block] [PATCH v3 3/7] block: fix data type casting for crypto payload offset, Daniel P. Berrange, 2017/09/12
- [Qemu-block] [PATCH v3 1/7] block: use 1 MB bounce buffers for crypto instead of 16KB, Daniel P. Berrange, 2017/09/12
- [Qemu-block] [PATCH v3 2/7] crypto: expose encryption sector size in APIs, Daniel P. Berrange, 2017/09/12
- [Qemu-block] [PATCH v3 4/7] block: don't use constant 512 as sector size in crypto driver,
Daniel P. Berrange <=
- [Qemu-block] [PATCH v3 5/7] block: convert crypto driver to bdrv_co_preadv|pwritev, Daniel P. Berrange, 2017/09/12
- [Qemu-block] [PATCH v3 7/7] block: support passthrough of BDRV_REQ_FUA in crypto driver, Daniel P. Berrange, 2017/09/12