116 lines
3.8 KiB
Diff
116 lines
3.8 KiB
Diff
From e03f7e670e608e98fa771d3860574b95908ef3a1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
|
|
Date: Thu, 11 Aug 2022 14:12:14 +0200
|
|
Subject: [PATCH 21/29] vdpa: extract vhost_vdpa_net_load_mac from
|
|
vhost_vdpa_net_load
|
|
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: [21/25] b4b30be584aab265004648352361f25587e0ed98 (redhat/centos-stream/src/qemu-kvm)
|
|
|
|
Upstream: Not merged yet
|
|
|
|
Since there may be many commands we need to issue to load the NIC
|
|
state, let's split them in individual functions
|
|
|
|
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
---
|
|
net/vhost-vdpa.c | 62 +++++++++++++++++++++++++++++++-----------------
|
|
1 file changed, 40 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
|
|
index 535315c1d0..e799e744cd 100644
|
|
--- a/net/vhost-vdpa.c
|
|
+++ b/net/vhost-vdpa.c
|
|
@@ -365,12 +365,47 @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len,
|
|
return vhost_svq_poll(svq);
|
|
}
|
|
|
|
+static ssize_t vhost_vdpa_net_load_cmd(VhostVDPAState *s, uint8_t class,
|
|
+ uint8_t cmd, const void *data,
|
|
+ size_t data_size)
|
|
+{
|
|
+ const struct virtio_net_ctrl_hdr ctrl = {
|
|
+ .class = class,
|
|
+ .cmd = cmd,
|
|
+ };
|
|
+
|
|
+ assert(data_size < vhost_vdpa_net_cvq_cmd_page_len() - sizeof(ctrl));
|
|
+
|
|
+ memcpy(s->cvq_cmd_out_buffer, &ctrl, sizeof(ctrl));
|
|
+ memcpy(s->cvq_cmd_out_buffer + sizeof(ctrl), data, data_size);
|
|
+
|
|
+ return vhost_vdpa_net_cvq_add(s, sizeof(ctrl) + data_size,
|
|
+ sizeof(virtio_net_ctrl_ack));
|
|
+}
|
|
+
|
|
+static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n)
|
|
+{
|
|
+ uint64_t features = n->parent_obj.guest_features;
|
|
+ if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) {
|
|
+ ssize_t dev_written = vhost_vdpa_net_load_cmd(s, VIRTIO_NET_CTRL_MAC,
|
|
+ VIRTIO_NET_CTRL_MAC_ADDR_SET,
|
|
+ n->mac, sizeof(n->mac));
|
|
+ if (unlikely(dev_written < 0)) {
|
|
+ return dev_written;
|
|
+ }
|
|
+
|
|
+ return *s->status != VIRTIO_NET_OK;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int vhost_vdpa_net_load(NetClientState *nc)
|
|
{
|
|
VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
|
|
- const struct vhost_vdpa *v = &s->vhost_vdpa;
|
|
+ struct vhost_vdpa *v = &s->vhost_vdpa;
|
|
const VirtIONet *n;
|
|
- uint64_t features;
|
|
+ int r;
|
|
|
|
assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_VDPA);
|
|
|
|
@@ -379,26 +414,9 @@ static int vhost_vdpa_net_load(NetClientState *nc)
|
|
}
|
|
|
|
n = VIRTIO_NET(v->dev->vdev);
|
|
- features = n->parent_obj.guest_features;
|
|
- if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) {
|
|
- const struct virtio_net_ctrl_hdr ctrl = {
|
|
- .class = VIRTIO_NET_CTRL_MAC,
|
|
- .cmd = VIRTIO_NET_CTRL_MAC_ADDR_SET,
|
|
- };
|
|
- char *cursor = s->cvq_cmd_out_buffer;
|
|
- ssize_t dev_written;
|
|
-
|
|
- memcpy(cursor, &ctrl, sizeof(ctrl));
|
|
- cursor += sizeof(ctrl);
|
|
- memcpy(cursor, n->mac, sizeof(n->mac));
|
|
-
|
|
- dev_written = vhost_vdpa_net_cvq_add(s, sizeof(ctrl) + sizeof(n->mac),
|
|
- sizeof(virtio_net_ctrl_ack));
|
|
- if (unlikely(dev_written < 0)) {
|
|
- return dev_written;
|
|
- }
|
|
-
|
|
- return *s->status != VIRTIO_NET_OK;
|
|
+ r = vhost_vdpa_net_load_mac(s, n);
|
|
+ if (unlikely(r < 0)) {
|
|
+ return r;
|
|
}
|
|
|
|
return 0;
|
|
--
|
|
2.31.1
|
|
|