Signed-off-by: Alberto Faria <afa...@redhat.com>
---
block/export/virtio-blk-handler.c | 7 ++--
hw/block/virtio-blk.c | 41 +++++++++++-----------
hw/core/machine.c | 4 ++-
hw/virtio/virtio-qmp.c | 2 ++
include/hw/virtio/virtio-blk.h | 1 +
tests/qtest/virtio-blk-test.c | 56 +++++++++++++++++++++++++++++++
6 files changed, 88 insertions(+), 23 deletions(-)
diff --git a/block/export/virtio-blk-handler.c
b/block/export/virtio-blk-handler.c
index bc1cec67570..db40529fa68 100644
--- a/block/export/virtio-blk-handler.c
+++ b/block/export/virtio-blk-handler.c
@@ -169,11 +169,13 @@ int coroutine_fn virtio_blk_process_req(VirtioBlkHandler
*handler,
type = le32_to_cpu(out.type);
switch (type & ~VIRTIO_BLK_T_BARRIER) {
case VIRTIO_BLK_T_IN:
- case VIRTIO_BLK_T_OUT: {
+ case VIRTIO_BLK_T_OUT:
+ case VIRTIO_BLK_T_OUT_FUA: {
QEMUIOVector qiov;
int64_t offset;
ssize_t ret = 0;
bool is_write = type & VIRTIO_BLK_T_OUT;
+ bool is_fua = type == VIRTIO_BLK_T_OUT_FUA;
int64_t sector_num = le64_to_cpu(out.sector);
if (is_write && !handler->writable) {
@@ -197,7 +199,8 @@ int coroutine_fn virtio_blk_process_req(VirtioBlkHandler
*handler,
offset = sector_num << VIRTIO_BLK_SECTOR_BITS;
if (is_write) {
- ret = blk_co_pwritev(blk, offset, qiov.size, &qiov, 0);
+ ret = blk_co_pwritev(blk, offset, qiov.size, &qiov,
+ is_fua ? BDRV_REQ_FUA : 0);
} else {
ret = blk_co_preadv(blk, offset, qiov.size, &qiov, 0);
}
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index b54d01d3a24..48eb468f3bd 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -220,6 +220,7 @@ static inline void submit_requests(VirtIOBlock *s,
MultiReqBuffer *mrb,
QEMUIOVector *qiov = &mrb->reqs[start]->qiov;
int64_t sector_num = mrb->reqs[start]->sector_num;
bool is_write = mrb->is_write;
+ bool is_fua = mrb->is_fua;
BdrvRequestFlags flags = 0;
if (num_reqs > 1) {
@@ -256,6 +257,9 @@ static inline void submit_requests(VirtIOBlock *s,
MultiReqBuffer *mrb,
}
if (is_write) {
+ if (is_fua) {
+ flags |= BDRV_REQ_FUA;
+ }
blk_aio_pwritev(blk, sector_num << BDRV_SECTOR_BITS, qiov,
flags, virtio_blk_rw_complete,
mrb->reqs[start]);
@@ -828,13 +832,16 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
type = virtio_ldl_p(vdev, &req->out.type);
- /* VIRTIO_BLK_T_OUT defines the command direction. VIRTIO_BLK_T_BARRIER
- * is an optional flag. Although a guest should not send this flag if
- * not negotiated we ignored it in the past. So keep ignoring it. */
- switch (type & ~(VIRTIO_BLK_T_OUT | VIRTIO_BLK_T_BARRIER)) {
+ /* VIRTIO_BLK_T_BARRIER is an optional flag. Although a guest should not
+ * send this flag if not negotiated we ignored it in the past. So keep
+ * ignoring it. */
+ switch (type & ~VIRTIO_BLK_T_BARRIER) {
case VIRTIO_BLK_T_IN:
+ case VIRTIO_BLK_T_OUT:
+ case VIRTIO_BLK_T_OUT_FUA:
{
bool is_write = type & VIRTIO_BLK_T_OUT;
+ bool is_fua = (type & ~VIRTIO_BLK_T_BARRIER) == VIRTIO_BLK_T_OUT_FUA;
req->sector_num = virtio_ldq_p(vdev, &req->out.sector);
if (is_write) {
@@ -858,10 +865,10 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
block_acct_start(blk_get_stats(s->blk), &req->acct, req->qiov.size,
is_write ? BLOCK_ACCT_WRITE : BLOCK_ACCT_READ);
- /* merge would exceed maximum number of requests or IO direction
- * changes */
+ /* merge would exceed maximum number of requests or type changes */
if (mrb->num_reqs > 0 && (mrb->num_reqs == VIRTIO_BLK_MAX_MERGE_REQS ||
is_write != mrb->is_write ||
+ is_fua != mrb->is_fua ||
!s->conf.request_merging)) {
virtio_blk_submit_multireq(s, mrb);
}
@@ -869,6 +876,7 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
assert(mrb->num_reqs < VIRTIO_BLK_MAX_MERGE_REQS);
mrb->reqs[mrb->num_reqs++] = req;
mrb->is_write = is_write;
+ mrb->is_fua = is_fua;
break;
}
case VIRTIO_BLK_T_FLUSH:
@@ -910,7 +918,7 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
g_free(req);
break;
}
- case VIRTIO_BLK_T_ZONE_APPEND & ~VIRTIO_BLK_T_OUT:
+ case VIRTIO_BLK_T_ZONE_APPEND:
/*
* Passing out_iov/out_num and in_iov/in_num is not safe
* to access req->elem.out_sg directly because it may be
@@ -918,13 +926,8 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
*/
virtio_blk_handle_zone_append(req, out_iov, in_iov, out_num, in_num);
break;
- /*
- * VIRTIO_BLK_T_DISCARD and VIRTIO_BLK_T_WRITE_ZEROES are defined with
- * VIRTIO_BLK_T_OUT flag set. We masked this flag in the switch statement,
- * so we must mask it for these requests, then we will check if it is set.
- */
- case VIRTIO_BLK_T_DISCARD & ~VIRTIO_BLK_T_OUT:
- case VIRTIO_BLK_T_WRITE_ZEROES & ~VIRTIO_BLK_T_OUT:
+ case VIRTIO_BLK_T_DISCARD:
+ case VIRTIO_BLK_T_WRITE_ZEROES:
{
struct virtio_blk_discard_write_zeroes dwz_hdr;
size_t out_len = iov_size(out_iov, out_num);
@@ -932,12 +935,8 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
VIRTIO_BLK_T_WRITE_ZEROES;
uint8_t err_status;
- /*
- * Unsupported if VIRTIO_BLK_T_OUT is not set or the request contains
- * more than one segment.
- */
- if (unlikely(!(type & VIRTIO_BLK_T_OUT) ||
- out_len > sizeof(dwz_hdr))) {
+ /* Unsupported if the request contains more than one segment. */
+ if (unlikely(out_len > sizeof(dwz_hdr))) {
virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP);
g_free(req);
return 0;
@@ -1882,6 +1881,8 @@ static const Property virtio_blk_properties[] = {
conf.max_discard_sectors, BDRV_REQUEST_MAX_SECTORS),
DEFINE_PROP_UINT32("max-write-zeroes-sectors", VirtIOBlock,
conf.max_write_zeroes_sectors,
BDRV_REQUEST_MAX_SECTORS),
+ DEFINE_PROP_BIT64("fua-write", VirtIOBlock, host_features,
+ VIRTIO_BLK_F_OUT_FUA, true),
DEFINE_PROP_BOOL("x-enable-wce-if-config-wce", VirtIOBlock,
conf.x_enable_wce_if_config_wce, true),
};
diff --git a/hw/core/machine.c b/hw/core/machine.c
index ed01798d37c..8439b094904 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -37,7 +37,9 @@
#include "hw/virtio/virtio-iommu.h"
#include "audio/audio.h"
-GlobalProperty hw_compat_10_0[] = {};
+GlobalProperty hw_compat_10_0[] = {
+ { "virtio-blk-device", "fua-write", "false" },
+};
const size_t hw_compat_10_0_len = G_N_ELEMENTS(hw_compat_10_0);
GlobalProperty hw_compat_9_2[] = {
diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
index 3b6377cf0d2..9cbdd543623 100644
--- a/hw/virtio/virtio-qmp.c
+++ b/hw/virtio/virtio-qmp.c
@@ -173,6 +173,8 @@ static const qmp_virtio_feature_map_t
virtio_blk_feature_map[] = {
"VIRTIO_BLK_F_SECURE_ERASE: Secure erase supported"),
FEATURE_ENTRY(VIRTIO_BLK_F_ZONED, \
"VIRTIO_BLK_F_ZONED: Zoned block devices"),
+ FEATURE_ENTRY(VIRTIO_BLK_F_OUT_FUA, \
+ "VIRTIO_BLK_F_OUT_FUA: FUA write command supported"),
#ifndef VIRTIO_BLK_NO_LEGACY
FEATURE_ENTRY(VIRTIO_BLK_F_BARRIER, \
"VIRTIO_BLK_F_BARRIER: Request barriers supported"),
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
index 3d8dee7ec15..916df26b6f0 100644
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -98,6 +98,7 @@ typedef struct MultiReqBuffer {
VirtIOBlockReq *reqs[VIRTIO_BLK_MAX_MERGE_REQS];
unsigned int num_reqs;
bool is_write;
+ bool is_fua;
} MultiReqBuffer;
typedef struct VirtIOBlkClass {
diff --git a/tests/qtest/virtio-blk-test.c b/tests/qtest/virtio-blk-test.c
index 98c906ebb4a..a90838b8912 100644
--- a/tests/qtest/virtio-blk-test.c
+++ b/tests/qtest/virtio-blk-test.c
@@ -88,6 +88,7 @@ static uint64_t virtio_blk_request(QGuestAllocator *alloc,
QVirtioDevice *d,
switch (req->type) {
case VIRTIO_BLK_T_IN:
case VIRTIO_BLK_T_OUT:
+ case VIRTIO_BLK_T_OUT_FUA:
g_assert_cmpuint(data_size % 512, ==, 0);
break;
case VIRTIO_BLK_T_DISCARD:
@@ -280,6 +281,61 @@ static QVirtQueue *test_basic(QVirtioDevice *dev,
QGuestAllocator *alloc)
guest_free(alloc, req_addr);
}
+ if (features & (1u << VIRTIO_BLK_F_OUT_FUA)) {
+ /* FUA write and read with 3 descriptor layout */
+ /* FUA write request */
+ req.type = VIRTIO_BLK_T_OUT_FUA;
+ req.ioprio = 1;
+ req.sector = 0;
+ req.data = g_malloc0(512);
+ strcpy(req.data, "test");
+
+ req_addr = virtio_blk_request(alloc, dev, &req, 512);
+
+ g_free(req.data);
+
+ free_head = qvirtqueue_add(qts, vq, req_addr, 16, false, true);
+ qvirtqueue_add(qts, vq, req_addr + 16, 512, false, true);
+ qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false);
+
+ qvirtqueue_kick(qts, dev, vq, free_head);
+
+ qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL,
+ QVIRTIO_BLK_TIMEOUT_US);
+ status = readb(req_addr + 528);
+ g_assert_cmpint(status, ==, 0);
+
+ guest_free(alloc, req_addr);
+
+ /* Read request */
+ req.type = VIRTIO_BLK_T_IN;
+ req.ioprio = 1;
+ req.sector = 0;
+ req.data = g_malloc0(512);
+
+ req_addr = virtio_blk_request(alloc, dev, &req, 512);
+
+ g_free(req.data);
+
+ free_head = qvirtqueue_add(qts, vq, req_addr, 16, false, true);
+ qvirtqueue_add(qts, vq, req_addr + 16, 512, true, true);
+ qvirtqueue_add(qts, vq, req_addr + 528, 1, true, false);
+
+ qvirtqueue_kick(qts, dev, vq, free_head);
+
+ qvirtio_wait_used_elem(qts, dev, vq, free_head, NULL,
+ QVIRTIO_BLK_TIMEOUT_US);
+ status = readb(req_addr + 528);
+ g_assert_cmpint(status, ==, 0);
+
+ data = g_malloc0(512);
+ memread(req_addr + 16, data, 512);
+ g_assert_cmpstr(data, ==, "test");
+ g_free(data);
+
+ guest_free(alloc, req_addr);
+ }
+
if (features & (1u << VIRTIO_F_ANY_LAYOUT)) {
/* Write and read with 2 descriptor layout */
/* Write request */
--
2.49.0
