114 lines
4.2 KiB
Diff
114 lines
4.2 KiB
Diff
From d44701ad634f05c31a1b0f0b84b168ed1ec19f71 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
|
Date: Wed, 24 Aug 2022 20:28:35 +0200
|
|
Subject: [PATCH 20/29] vdpa: Make VhostVDPAState cvq_cmd_in_buffer control ack
|
|
type
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
RH-MergeRequest: 117: vDPA SVQ Multiqueue support
|
|
RH-Jira: RHELX-57
|
|
RH-Acked-by: Jason Wang <jasowang@redhat.com>
|
|
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
|
RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
|
|
RH-Commit: [20/25] fd7012502f7002f61ea2e0c90baac013e09282de (redhat/centos-stream/src/qemu-kvm)
|
|
|
|
Upstream: Not merged yet
|
|
|
|
This allows to simplify the code. Rename to status while we're at it.
|
|
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
---
|
|
net/vhost-vdpa.c | 23 ++++++++++++-----------
|
|
1 file changed, 12 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
|
|
index 6ce68fcd3f..535315c1d0 100644
|
|
--- a/net/vhost-vdpa.c
|
|
+++ b/net/vhost-vdpa.c
|
|
@@ -35,7 +35,9 @@ typedef struct VhostVDPAState {
|
|
VHostNetState *vhost_net;
|
|
|
|
/* Control commands shadow buffers */
|
|
- void *cvq_cmd_out_buffer, *cvq_cmd_in_buffer;
|
|
+ void *cvq_cmd_out_buffer;
|
|
+ virtio_net_ctrl_ack *status;
|
|
+
|
|
bool started;
|
|
} VhostVDPAState;
|
|
|
|
@@ -158,7 +160,7 @@ static void vhost_vdpa_cleanup(NetClientState *nc)
|
|
struct vhost_dev *dev = &s->vhost_net->dev;
|
|
|
|
qemu_vfree(s->cvq_cmd_out_buffer);
|
|
- qemu_vfree(s->cvq_cmd_in_buffer);
|
|
+ qemu_vfree(s->status);
|
|
if (dev->vq_index + dev->nvqs == dev->vq_index_end) {
|
|
g_clear_pointer(&s->vhost_vdpa.iova_tree, vhost_iova_tree_delete);
|
|
}
|
|
@@ -310,7 +312,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
|
|
return r;
|
|
}
|
|
|
|
- r = vhost_vdpa_cvq_map_buf(&s->vhost_vdpa, s->cvq_cmd_in_buffer,
|
|
+ r = vhost_vdpa_cvq_map_buf(&s->vhost_vdpa, s->status,
|
|
vhost_vdpa_net_cvq_cmd_page_len(), true);
|
|
if (unlikely(r < 0)) {
|
|
vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, s->cvq_cmd_out_buffer);
|
|
@@ -327,7 +329,7 @@ static void vhost_vdpa_net_cvq_stop(NetClientState *nc)
|
|
|
|
if (s->vhost_vdpa.shadow_vqs_enabled) {
|
|
vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, s->cvq_cmd_out_buffer);
|
|
- vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, s->cvq_cmd_in_buffer);
|
|
+ vhost_vdpa_cvq_unmap_buf(&s->vhost_vdpa, s->status);
|
|
}
|
|
}
|
|
|
|
@@ -340,7 +342,7 @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len,
|
|
.iov_len = out_len,
|
|
};
|
|
const struct iovec in = {
|
|
- .iov_base = s->cvq_cmd_in_buffer,
|
|
+ .iov_base = s->status,
|
|
.iov_len = sizeof(virtio_net_ctrl_ack),
|
|
};
|
|
VhostShadowVirtqueue *svq = g_ptr_array_index(s->vhost_vdpa.shadow_vqs, 0);
|
|
@@ -396,7 +398,7 @@ static int vhost_vdpa_net_load(NetClientState *nc)
|
|
return dev_written;
|
|
}
|
|
|
|
- return *((virtio_net_ctrl_ack *)s->cvq_cmd_in_buffer) != VIRTIO_NET_OK;
|
|
+ return *s->status != VIRTIO_NET_OK;
|
|
}
|
|
|
|
return 0;
|
|
@@ -491,8 +493,7 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadowVirtqueue *svq,
|
|
goto out;
|
|
}
|
|
|
|
- memcpy(&status, s->cvq_cmd_in_buffer, sizeof(status));
|
|
- if (status != VIRTIO_NET_OK) {
|
|
+ if (*s->status != VIRTIO_NET_OK) {
|
|
return VIRTIO_NET_ERR;
|
|
}
|
|
|
|
@@ -549,9 +550,9 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
|
|
s->cvq_cmd_out_buffer = qemu_memalign(qemu_real_host_page_size(),
|
|
vhost_vdpa_net_cvq_cmd_page_len());
|
|
memset(s->cvq_cmd_out_buffer, 0, vhost_vdpa_net_cvq_cmd_page_len());
|
|
- s->cvq_cmd_in_buffer = qemu_memalign(qemu_real_host_page_size(),
|
|
- vhost_vdpa_net_cvq_cmd_page_len());
|
|
- memset(s->cvq_cmd_in_buffer, 0, vhost_vdpa_net_cvq_cmd_page_len());
|
|
+ s->status = qemu_memalign(qemu_real_host_page_size(),
|
|
+ vhost_vdpa_net_cvq_cmd_page_len());
|
|
+ memset(s->status, 0, vhost_vdpa_net_cvq_cmd_page_len());
|
|
|
|
s->vhost_vdpa.shadow_vq_ops = &vhost_vdpa_net_svq_ops;
|
|
s->vhost_vdpa.shadow_vq_ops_opaque = s;
|
|
--
|
|
2.31.1
|
|
|