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 v3 7/7] block: support passthrough of BDRV_REQ_FUA in crypto driver
Date: Tue, 12 Sep 2017 12:28:55 +0100 [thread overview]
Message-ID: <20170912112855.24269-8-berrange@redhat.com> (raw)
In-Reply-To: <20170912112855.24269-1-berrange@redhat.com>
The BDRV_REQ_FUA flag can trivially be allowed in the crypt driver
as a passthrough to the underlying block driver.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
block/crypto.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index 1f77095336..d1c28d62c1 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -279,6 +279,9 @@ static int block_crypto_open_generic(QCryptoBlockFormat format,
return -EINVAL;
}
+ bs->supported_write_flags = BDRV_REQ_FUA &
+ bs->file->bs->supported_write_flags;
+
opts = qemu_opts_create(opts_spec, NULL, 0, &error_abort);
qemu_opts_absorb_qdict(opts, options, &local_err);
if (local_err) {
@@ -462,7 +465,7 @@ block_crypto_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
uint64_t sector_size = qcrypto_block_get_sector_size(crypto->block);
uint64_t payload_offset = qcrypto_block_get_payload_offset(crypto->block);
- assert(!flags);
+ assert(!(flags & ~BDRV_REQ_FUA));
assert(payload_offset < INT64_MAX);
assert(QEMU_IS_ALIGNED(offset, sector_size));
assert(QEMU_IS_ALIGNED(bytes, sector_size));
@@ -499,7 +502,7 @@ block_crypto_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
qemu_iovec_add(&hd_qiov, cipher_data, cur_bytes);
ret = bdrv_co_pwritev(bs->file, payload_offset + offset + bytes_done,
- cur_bytes, &hd_qiov, 0);
+ cur_bytes, &hd_qiov, flags);
if (ret < 0) {
goto cleanup;
}
--
2.13.5
next prev parent reply other threads:[~2017-09-12 11:29 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-12 11:28 [Qemu-devel] [PATCH v3 0/7] Misc improvements to crypto block driver Daniel P. Berrange
2017-09-12 11:28 ` [Qemu-devel] [PATCH v3 1/7] block: use 1 MB bounce buffers for crypto instead of 16KB Daniel P. Berrange
2017-09-16 16:25 ` Max Reitz
2017-09-12 11:28 ` [Qemu-devel] [PATCH v3 2/7] crypto: expose encryption sector size in APIs Daniel P. Berrange
2017-09-16 16:25 ` Max Reitz
2017-09-18 13:53 ` Eric Blake
2017-09-12 11:28 ` [Qemu-devel] [PATCH v3 3/7] block: fix data type casting for crypto payload offset Daniel P. Berrange
2017-09-16 16:25 ` Max Reitz
2017-09-18 13:56 ` Eric Blake
2017-09-12 11:28 ` [Qemu-devel] [PATCH v3 4/7] block: don't use constant 512 as sector size in crypto driver Daniel P. Berrange
2017-09-16 16:24 ` Max Reitz
2017-09-18 15:02 ` Daniel P. Berrange
2017-09-18 13:57 ` Eric Blake
2017-09-12 11:28 ` [Qemu-devel] [PATCH v3 5/7] block: convert crypto driver to bdrv_co_preadv|pwritev Daniel P. Berrange
2017-09-12 12:06 ` Daniel P. Berrange
2017-09-16 16:54 ` Max Reitz
2017-09-27 12:34 ` Daniel P. Berrange
2017-09-12 11:28 ` [Qemu-devel] [PATCH v3 6/7] block: convert qcrypto_block_encrypt|decrypt to take bytes offset Daniel P. Berrange
2017-09-16 17:13 ` Max Reitz
2017-09-12 11:28 ` Daniel P. Berrange [this message]
2017-09-16 17:18 ` [Qemu-devel] [PATCH v3 7/7] block: support passthrough of BDRV_REQ_FUA in crypto driver Max Reitz
2017-09-18 14:02 ` Eric Blake
2017-09-12 11:49 ` [Qemu-devel] [PATCH v3 0/7] Misc improvements to crypto block driver no-reply
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=20170912112855.24269-8-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).