Re: [Qemu-devel] [PATCH v3 5/7] block: convert crypto driver to bdrv_co_preadv|pwritev

[Daniel P. Berrange]

On Tue, Sep 12, 2017 at 12:28:53PM +0100, Daniel P. Berrange wrote:
> Make the crypto driver implement the bdrv_co_preadv|pwritev
> callbacks, and also use bdrv_co_preadv|pwritev for I/O
> with the protocol driver beneath.
> 
> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
>  block/crypto.c | 104 
> +++++++++++++++++++++++++++++++--------------------------
>  1 file changed, 56 insertions(+), 48 deletions(-)
> 
> diff --git a/block/crypto.c b/block/crypto.c
> index 49d6d4c058..d004e9cef4 100644
> --- a/block/crypto.c
> +++ b/block/crypto.c
> @@ -383,19 +383,23 @@ static void block_crypto_close(BlockDriverState *bs)
>  #define BLOCK_CRYPTO_MAX_SECTORS 2048
>  
>  static coroutine_fn int
> -block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,
> -                      int remaining_sectors, QEMUIOVector *qiov)
> +block_crypto_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
> +                       QEMUIOVector *qiov, int flags)
>  {
>      BlockCrypto *crypto = bs->opaque;
> -    int cur_nr_sectors; /* number of sectors in current iteration */
> +    uint64_t cur_bytes; /* number of bytes in current iteration */
>      uint64_t bytes_done = 0;
>      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) / sector_size;
> -    assert(payload_offset < (INT64_MAX / 512));
> +    size_t payload_offset = qcrypto_block_get_payload_offset(crypto->block);

Opps, rebase merge error - that should be uint64_t - this is what the
patchew failure complained about.

> +    uint64_t sector_num = offset / sector_size;
> +
> +    assert(!flags);
> +    assert(payload_offset < INT64_MAX);
> +    assert(QEMU_IS_ALIGNED(offset, sector_size));
> +    assert(QEMU_IS_ALIGNED(bytes, sector_size));
>  
>      qemu_iovec_init(&hd_qiov, qiov->niov);
>  
> @@ -410,37 +414,33 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t 
> sector_num,
>          goto cleanup;
>      }
>  
> -    while (remaining_sectors) {
> -        cur_nr_sectors = remaining_sectors;
> +    while (bytes) {
> +        cur_bytes = bytes;
>  
> -        if (cur_nr_sectors > BLOCK_CRYPTO_MAX_SECTORS) {
> -            cur_nr_sectors = BLOCK_CRYPTO_MAX_SECTORS;
> +        if (cur_bytes > (BLOCK_CRYPTO_MAX_SECTORS * sector_size)) {
> +            cur_bytes = BLOCK_CRYPTO_MAX_SECTORS * sector_size;
>          }
>  
>          qemu_iovec_reset(&hd_qiov);
> -        qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * sector_size);
> +        qemu_iovec_add(&hd_qiov, cipher_data, cur_bytes);
>  
> -        ret = bdrv_co_readv(bs->file,
> -                            payload_offset + sector_num,
> -                            cur_nr_sectors, &hd_qiov);
> +        ret = bdrv_co_preadv(bs->file, payload_offset + offset + bytes_done,
> +                             cur_bytes, &hd_qiov, 0);
>          if (ret < 0) {
>              goto cleanup;
>          }
>  
> -        if (qcrypto_block_decrypt(crypto->block,
> -                                  sector_num,
> -                                  cipher_data, cur_nr_sectors * sector_size,
> -                                  NULL) < 0) {
> +        if (qcrypto_block_decrypt(crypto->block, sector_num, cipher_data,
> +                                  cur_bytes, NULL) < 0) {
>              ret = -EIO;
>              goto cleanup;
>          }
>  
> -        qemu_iovec_from_buf(qiov, bytes_done,
> -                            cipher_data, cur_nr_sectors * sector_size);
> +        qemu_iovec_from_buf(qiov, bytes_done, cipher_data, cur_bytes);
>  
> -        remaining_sectors -= cur_nr_sectors;
> -        sector_num += cur_nr_sectors;
> -        bytes_done += cur_nr_sectors * sector_size;
> +        sector_num += cur_bytes / sector_size;
> +        bytes -= cur_bytes;
> +        bytes_done += cur_bytes;
>      }
>  
>   cleanup:
> @@ -452,19 +452,23 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t 
> sector_num,
>  
>  
>  static coroutine_fn int
> -block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,
> -                       int remaining_sectors, QEMUIOVector *qiov)
> +block_crypto_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t 
> bytes,
> +                        QEMUIOVector *qiov, int flags)
>  {
>      BlockCrypto *crypto = bs->opaque;
> -    int cur_nr_sectors; /* number of sectors in current iteration */
> +    uint64_t cur_bytes; /* number of bytes in current iteration */
>      uint64_t bytes_done = 0;
>      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) / sector_size;
> -    assert(payload_offset < (INT64_MAX / 512));
> +    uint64_t payload_offset = 
> qcrypto_block_get_payload_offset(crypto->block);
> +    uint64_t sector_num = offset / sector_size;
> +
> +    assert(!flags);
> +    assert(payload_offset < INT64_MAX);
> +    assert(QEMU_IS_ALIGNED(offset, sector_size));
> +    assert(QEMU_IS_ALIGNED(bytes, sector_size));
>  
>      qemu_iovec_init(&hd_qiov, qiov->niov);
>  
> @@ -479,37 +483,33 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t 
> sector_num,
>          goto cleanup;
>      }
>  
> -    while (remaining_sectors) {
> -        cur_nr_sectors = remaining_sectors;
> +    while (bytes) {
> +        cur_bytes = bytes;
>  
> -        if (cur_nr_sectors > BLOCK_CRYPTO_MAX_SECTORS) {
> -            cur_nr_sectors = BLOCK_CRYPTO_MAX_SECTORS;
> +        if (cur_bytes > (BLOCK_CRYPTO_MAX_SECTORS * sector_size)) {
> +            cur_bytes = BLOCK_CRYPTO_MAX_SECTORS * sector_size;
>          }
>  
> -        qemu_iovec_to_buf(qiov, bytes_done,
> -                          cipher_data, cur_nr_sectors * sector_size);
> +        qemu_iovec_to_buf(qiov, bytes_done, cipher_data, cur_bytes);
>  
> -        if (qcrypto_block_encrypt(crypto->block,
> -                                  sector_num,
> -                                  cipher_data, cur_nr_sectors * sector_size,
> -                                  NULL) < 0) {
> +        if (qcrypto_block_encrypt(crypto->block, sector_num, cipher_data,
> +                                  cur_bytes, NULL) < 0) {
>              ret = -EIO;
>              goto cleanup;
>          }
>  
>          qemu_iovec_reset(&hd_qiov);
> -        qemu_iovec_add(&hd_qiov, cipher_data, cur_nr_sectors * sector_size);
> +        qemu_iovec_add(&hd_qiov, cipher_data, cur_bytes);
>  
> -        ret = bdrv_co_writev(bs->file,
> -                             payload_offset + sector_num,
> -                             cur_nr_sectors, &hd_qiov);
> +        ret = bdrv_co_pwritev(bs->file, payload_offset + offset + bytes_done,
> +                              cur_bytes, &hd_qiov, 0);
>          if (ret < 0) {
>              goto cleanup;
>          }
>  
> -        remaining_sectors -= cur_nr_sectors;
> -        sector_num += cur_nr_sectors;
> -        bytes_done += cur_nr_sectors * sector_size;
> +        sector_num += cur_bytes / sector_size;
> +        bytes -= cur_bytes;
> +        bytes_done += cur_bytes;
>      }
>  
>   cleanup:
> @@ -519,6 +519,13 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t 
> sector_num,
>      return ret;
>  }
>  
> +static void block_crypto_refresh_limits(BlockDriverState *bs, Error **errp)
> +{
> +    BlockCrypto *crypto = bs->opaque;
> +    uint64_t sector_size = qcrypto_block_get_sector_size(crypto->block);
> +    bs->bl.request_alignment = sector_size; /* No sub-sector I/O */
> +}
> +
>  
>  static int64_t block_crypto_getlength(BlockDriverState *bs)
>  {
> @@ -618,8 +625,9 @@ BlockDriver bdrv_crypto_luks = {
>      .bdrv_truncate      = block_crypto_truncate,
>      .create_opts        = &block_crypto_create_opts_luks,
>  
> -    .bdrv_co_readv      = block_crypto_co_readv,
> -    .bdrv_co_writev     = block_crypto_co_writev,
> +    .bdrv_refresh_limits = block_crypto_refresh_limits,
> +    .bdrv_co_preadv     = block_crypto_co_preadv,
> +    .bdrv_co_pwritev    = block_crypto_co_pwritev,
>      .bdrv_getlength     = block_crypto_getlength,
>      .bdrv_get_info      = block_crypto_get_info_luks,
>      .bdrv_get_specific_info = block_crypto_get_specific_info_luks,
> -- 
> 2.13.5
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|