From: Alberto Faria <[email protected]>
Signed-off-by: Alberto Faria <[email protected]>
Message-ID: <[email protected]>
Reviewed-by: Stefan Hajnoczi <[email protected]>
[kwolf: Squashed in definitions from spec missing in Linux headers]
Reviewed-by: Kevin Wolf <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>
---
include/hw/virtio/virtio-blk.h | 1 +
hw/block/virtio-blk.c | 37 ++++++++++++++++++++++++++++++++++
hw/core/machine.c | 1 +
hw/virtio/virtio-qmp.c | 10 +++++++++
4 files changed, 49 insertions(+)
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
index 0070ca6ba9c..26e35351d7d 100644
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -99,6 +99,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/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index eeeb405127c..9b7c84fda6c 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -38,6 +38,16 @@
#include "hw/virtio/virtio-blk-common.h"
#include "qemu/coroutine.h"
+/* TODO Remove once the Linux headers have caught up */
+#ifndef VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA
+#define VIRTIO_BLK_F_REQ_FLAGS 18 /* Request flags supported */
+#define VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA 19 /* FUA flag supported */
+
+#define VIRTIO_BLK_REQ_FLAG_OUT_FUA 0
+
+#define VIRTIO_BLK_OUTDHR_FLAGS(out) out.ioprio
+#endif
+
/* Internal buffer size limit for zone report */
#define VIRTIO_BLK_MAX_ZONES_PER_BATCH 4096
@@ -219,6 +229,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) {
@@ -255,6 +266,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]);
@@ -895,6 +909,7 @@ out:
static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb)
{
uint32_t type;
+ uint32_t flags;
struct iovec *in_iov = req->elem.in_sg;
struct iovec *out_iov = req->elem.out_sg;
unsigned in_num = req->elem.in_num;
@@ -931,6 +946,7 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
&req->inhdr_undo);
type = virtio_ldl_p(vdev, &req->out.type);
+ flags = virtio_ldl_p(vdev, &VIRTIO_BLK_OUTDHR_FLAGS(req->out));
/* 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
@@ -939,6 +955,9 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
case VIRTIO_BLK_T_IN:
{
bool is_write = type & VIRTIO_BLK_T_OUT;
+ bool is_fua = is_write &&
+ virtio_vdev_has_feature(vdev, VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA) &&
+ (flags & (1U << VIRTIO_BLK_REQ_FLAG_OUT_FUA));
req->sector_num = virtio_ldq_p(vdev, &req->out.sector);
if (is_write) {
@@ -975,6 +994,7 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req,
MultiReqBuffer *mrb)
* 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);
}
@@ -982,6 +1002,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:
@@ -1363,6 +1384,10 @@ static uint64_t virtio_blk_get_features(VirtIODevice
*vdev, uint64_t features,
/* Firstly sync all virtio-blk possible supported features */
features |= s->host_features;
+ if (virtio_has_feature(features, VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA)) {
+ virtio_add_feature(&features, VIRTIO_BLK_F_REQ_FLAGS);
+ }
+
virtio_add_feature(&features, VIRTIO_BLK_F_SEG_MAX);
virtio_add_feature(&features, VIRTIO_BLK_F_GEOMETRY);
virtio_add_feature(&features, VIRTIO_BLK_F_TOPOLOGY);
@@ -1388,6 +1413,15 @@ static uint64_t virtio_blk_get_features(VirtIODevice
*vdev, uint64_t features,
return features;
}
+static int virtio_blk_validate_features(VirtIODevice *vdev)
+{
+ if (virtio_vdev_has_feature(vdev, VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA) &&
+ !virtio_vdev_has_feature(vdev, VIRTIO_BLK_F_REQ_FLAGS)) {
+ return -EINVAL;
+ }
+ return 0;
+}
+
static int virtio_blk_set_status(VirtIODevice *vdev, uint8_t status)
{
VirtIOBlock *s = VIRTIO_BLK(vdev);
@@ -2043,6 +2077,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", VirtIOBlock, host_features,
+ VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA, true),
/*
* Zero is valid, and says that the device does not support zone append,
* as a ZBC or ZAC disk does not.
@@ -2066,6 +2102,7 @@ static void virtio_blk_class_init(ObjectClass *klass,
const void *data)
vdc->get_config = virtio_blk_update_config;
vdc->set_config = virtio_blk_set_config;
vdc->get_features = virtio_blk_get_features;
+ vdc->validate_features = virtio_blk_validate_features;
vdc->set_status = virtio_blk_set_status;
vdc->reset = virtio_blk_reset;
vdc->save = virtio_blk_save_device;
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 4da24f014aa..d8716e37894 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -44,6 +44,7 @@ GlobalProperty hw_compat_11_1[] = {
{ "sysbus-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
{ "pci-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
{ "pcie-root-port", "speed", "16" },
+ { "virtio-blk-device", "fua", "off" },
};
const size_t hw_compat_11_1_len = G_N_ELEMENTS(hw_compat_11_1);
diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
index 8d190c4c70d..af2f4b73dce 100644
--- a/hw/virtio/virtio-qmp.c
+++ b/hw/virtio/virtio-qmp.c
@@ -33,6 +33,12 @@
#include "standard-headers/linux/virtio_vsock.h"
#include "standard-headers/linux/virtio_gpio.h"
+/* TODO Remove once the Linux headers have caught up */
+#ifndef VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA
+#define VIRTIO_BLK_F_REQ_FLAGS 18 /* Request flags supported */
+#define VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA 19 /* FUA flag supported */
+#endif
+
#define FEATURE_ENTRY(name, desc) (qmp_virtio_feature_map_t) \
{ .virtio_bit = name, .feature_desc = desc }
@@ -171,6 +177,10 @@ 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_REQ_FLAGS, \
+ "VIRTIO_BLK_F_REQ_FLAGS: Request flags supported"),
+ FEATURE_ENTRY(VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA, \
+ "VIRTIO_BLK_F_REQ_FLAGS_OUT_FUA: FUA flag for OUT requests"),
FEATURE_ENTRY(VIRTIO_BLK_F_BARRIER, \
"VIRTIO_BLK_F_BARRIER: Request barriers supported"),
FEATURE_ENTRY(VIRTIO_BLK_F_SCSI, \
--
2.56.0
