From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: "Eugenio Pérez" <eperezma@redhat.com>,
"Jason Wang" <jasowang@redhat.com>
Subject: [PULL 18/21] vdpa: Add virtio-net mac address via CVQ at start
Date: Fri, 2 Sep 2022 14:41:35 +0800 [thread overview]
Message-ID: <20220902064138.56468-19-jasowang@redhat.com> (raw)
In-Reply-To: <20220902064138.56468-1-jasowang@redhat.com>
From: Eugenio Pérez <eperezma@redhat.com>
This is needed so the destination vdpa device see the same state a the
guest set in the source.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/vhost-vdpa.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 3575bf6..640434d 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -363,11 +363,51 @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState *s, size_t out_len,
return vhost_svq_poll(svq);
}
+static int vhost_vdpa_net_load(NetClientState *nc)
+{
+ VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
+ const struct vhost_vdpa *v = &s->vhost_vdpa;
+ const VirtIONet *n;
+ uint64_t features;
+
+ assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_VDPA);
+
+ if (!v->shadow_vqs_enabled) {
+ return 0;
+ }
+
+ 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 *((virtio_net_ctrl_ack *)s->cvq_cmd_in_buffer) != VIRTIO_NET_OK;
+ }
+
+ return 0;
+}
+
static NetClientInfo net_vhost_vdpa_cvq_info = {
.type = NET_CLIENT_DRIVER_VHOST_VDPA,
.size = sizeof(VhostVDPAState),
.receive = vhost_vdpa_receive,
.start = vhost_vdpa_net_cvq_start,
+ .load = vhost_vdpa_net_load,
.stop = vhost_vdpa_net_cvq_stop,
.cleanup = vhost_vdpa_cleanup,
.has_vnet_hdr = vhost_vdpa_has_vnet_hdr,
--
2.7.4
next prev parent reply other threads:[~2022-09-02 7:19 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-02 6:41 [PULL 00/21] Net patches Jason Wang
2022-09-02 6:41 ` [PULL 01/21] vdpa: Skip the maps not in the iova tree Jason Wang
2022-09-02 6:41 ` [PULL 02/21] vdpa: do not save failed dma maps in SVQ " Jason Wang
2022-09-02 6:41 ` [PULL 03/21] util: accept iova_tree_remove_parameter by value Jason Wang
2022-09-02 6:41 ` [PULL 04/21] vdpa: Remove SVQ vring from iova_tree at shutdown Jason Wang
2022-09-02 6:41 ` [PULL 05/21] vdpa: Make SVQ vring unmapping return void Jason Wang
2022-09-02 6:41 ` [PULL 06/21] vhost: Always store new kick fd on vhost_svq_set_svq_kick_fd Jason Wang
2022-09-02 6:41 ` [PULL 07/21] vdpa: Use ring hwaddr at vhost_vdpa_svq_unmap_ring Jason Wang
2022-09-02 6:41 ` [PULL 08/21] vhost: stop transfer elem ownership in vhost_handle_guest_kick Jason Wang
2022-09-02 6:41 ` [PULL 09/21] vhost: use SVQ element ndescs instead of opaque data for desc validation Jason Wang
2022-09-02 6:41 ` [PULL 10/21] vhost: Delete useless read memory barrier Jason Wang
2022-09-02 6:41 ` [PULL 11/21] vhost: Do not depend on !NULL VirtQueueElement on vhost_svq_flush Jason Wang
2022-09-02 6:41 ` [PULL 12/21] vhost_net: Add NetClientInfo start callback Jason Wang
2022-09-02 6:41 ` [PULL 13/21] vhost_net: Add NetClientInfo stop callback Jason Wang
2022-09-02 6:41 ` [PULL 14/21] vdpa: add net_vhost_vdpa_cvq_info NetClientInfo Jason Wang
2022-09-02 6:41 ` [PULL 15/21] vdpa: Move command buffers map to start of net device Jason Wang
2022-09-02 6:41 ` [PULL 16/21] vdpa: extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail Jason Wang
2022-09-02 6:41 ` [PULL 17/21] vhost_net: add NetClientState->load() callback Jason Wang
2022-09-02 6:41 ` Jason Wang [this message]
2022-09-02 6:41 ` [PULL 19/21] vdpa: Delete CVQ migration blocker Jason Wang
2022-09-02 6:41 ` [PULL 20/21] net/colo.c: Fix the pointer issue reported by Coverity Jason Wang
2022-09-02 6:41 ` [PULL 21/21] net: tulip: Restrict DMA engine to memories Jason Wang
2022-09-02 20:33 ` [PULL 00/21] Net patches Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220902064138.56468-19-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=eperezma@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).