[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/12] vhost: add method vhost_set_vring_err
From: |
Michael S. Tsirkin |
Subject: |
[PULL 03/12] vhost: add method vhost_set_vring_err |
Date: |
Tue, 28 Jun 2022 00:42:33 -0400 |
From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Kernel and user vhost may report virtqueue errors via eventfd.
This is only reliable way to get notification about protocol error.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Message-Id: <20220623161325.18813-2-vsementsov@yandex-team.ru>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Roman Kagan <rvkagan@yandex-team.ru>
---
include/hw/virtio/vhost-backend.h | 3 +++
hw/virtio/vhost-backend.c | 7 +++++++
hw/virtio/vhost-user.c | 6 ++++++
3 files changed, 16 insertions(+)
diff --git a/include/hw/virtio/vhost-backend.h
b/include/hw/virtio/vhost-backend.h
index 81bf3109f8..eab46d7f0b 100644
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -69,6 +69,8 @@ typedef int (*vhost_set_vring_kick_op)(struct vhost_dev *dev,
struct vhost_vring_file *file);
typedef int (*vhost_set_vring_call_op)(struct vhost_dev *dev,
struct vhost_vring_file *file);
+typedef int (*vhost_set_vring_err_op)(struct vhost_dev *dev,
+ struct vhost_vring_file *file);
typedef int (*vhost_set_vring_busyloop_timeout_op)(struct vhost_dev *dev,
struct vhost_vring_state
*r);
typedef int (*vhost_set_features_op)(struct vhost_dev *dev,
@@ -145,6 +147,7 @@ typedef struct VhostOps {
vhost_get_vring_base_op vhost_get_vring_base;
vhost_set_vring_kick_op vhost_set_vring_kick;
vhost_set_vring_call_op vhost_set_vring_call;
+ vhost_set_vring_err_op vhost_set_vring_err;
vhost_set_vring_busyloop_timeout_op vhost_set_vring_busyloop_timeout;
vhost_set_features_op vhost_set_features;
vhost_get_features_op vhost_get_features;
diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c
index 4de8b6b3b0..8e581575c9 100644
--- a/hw/virtio/vhost-backend.c
+++ b/hw/virtio/vhost-backend.c
@@ -146,6 +146,12 @@ static int vhost_kernel_set_vring_call(struct vhost_dev
*dev,
return vhost_kernel_call(dev, VHOST_SET_VRING_CALL, file);
}
+static int vhost_kernel_set_vring_err(struct vhost_dev *dev,
+ struct vhost_vring_file *file)
+{
+ return vhost_kernel_call(dev, VHOST_SET_VRING_ERR, file);
+}
+
static int vhost_kernel_set_vring_busyloop_timeout(struct vhost_dev *dev,
struct vhost_vring_state *s)
{
@@ -309,6 +315,7 @@ const VhostOps kernel_ops = {
.vhost_get_vring_base = vhost_kernel_get_vring_base,
.vhost_set_vring_kick = vhost_kernel_set_vring_kick,
.vhost_set_vring_call = vhost_kernel_set_vring_call,
+ .vhost_set_vring_err = vhost_kernel_set_vring_err,
.vhost_set_vring_busyloop_timeout =
vhost_kernel_set_vring_busyloop_timeout,
.vhost_set_features = vhost_kernel_set_features,
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 4b9be26e84..75b8df21a4 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -1313,6 +1313,11 @@ static int vhost_user_set_vring_call(struct vhost_dev
*dev,
return vhost_set_vring_file(dev, VHOST_USER_SET_VRING_CALL, file);
}
+static int vhost_user_set_vring_err(struct vhost_dev *dev,
+ struct vhost_vring_file *file)
+{
+ return vhost_set_vring_file(dev, VHOST_USER_SET_VRING_ERR, file);
+}
static int vhost_user_get_u64(struct vhost_dev *dev, int request, uint64_t
*u64)
{
@@ -2616,6 +2621,7 @@ const VhostOps user_ops = {
.vhost_get_vring_base = vhost_user_get_vring_base,
.vhost_set_vring_kick = vhost_user_set_vring_kick,
.vhost_set_vring_call = vhost_user_set_vring_call,
+ .vhost_set_vring_err = vhost_user_set_vring_err,
.vhost_set_features = vhost_user_set_features,
.vhost_get_features = vhost_user_get_features,
.vhost_set_owner = vhost_user_set_owner,
--
MST
- [PULL 00/12] virtio: fixes, Michael S. Tsirkin, 2022/06/28
- [PULL 02/12] msi: fix MSI vector limit check in msi_set_mask(), Michael S. Tsirkin, 2022/06/28
- [PULL 03/12] vhost: add method vhost_set_vring_err,
Michael S. Tsirkin <=
- [PULL 04/12] vhost: setup error eventfd and dump errors, Michael S. Tsirkin, 2022/06/28
- [PULL 01/12] virtio-iommu: Fix the partial copy of probe request, Michael S. Tsirkin, 2022/06/28
- [PULL 05/12] virtio-iommu: Fix migration regression, Michael S. Tsirkin, 2022/06/28
- [PULL 06/12] docs/vhost-user: Fix mismerge, Michael S. Tsirkin, 2022/06/28
- [PULL 07/12] libvhost-user: Fix VHOST_USER_GET_MAX_MEM_SLOTS reply, Michael S. Tsirkin, 2022/06/28
- [PULL 09/12] MAINTAINERS: Collect memory device files in "Memory devices", Michael S. Tsirkin, 2022/06/28
- [PULL 11/12] include/hw/virtio: document vhost_get_features, Michael S. Tsirkin, 2022/06/28
- [PULL 12/12] include/hw/virtio: document vhost_ack_features, Michael S. Tsirkin, 2022/06/28
- [PULL 10/12] contrib/vhost-user-blk: fix 32 bit build and enable, Michael S. Tsirkin, 2022/06/28
- [PULL 08/12] libvhost-user: Fix VHOST_USER_ADD_MEM_REG reply, Michael S. Tsirkin, 2022/06/28