All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Eugenio Pérez" <eperezma@redhat.com>
To: qemu-devel@nongnu.org
Cc: Harpreet Singh Anand <hanand@xilinx.com>,
	Stefano Garzarella <sgarzare@redhat.com>,
	Laurent Vivier <lvivier@redhat.com>, Eli Cohen <eli@mellanox.com>,
	Parav Pandit <parav@mellanox.com>,
	Markus Armbruster <armbru@redhat.com>,
	Eric Blake <eblake@redhat.com>,
	Zhu Lingshan <lingshan.zhu@intel.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>, Cindy Lu <lulu@redhat.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Liuxiangdong <liuxiangdong5@huawei.com>,
	Jason Wang <jasowang@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	"Gonglei (Arei)" <arei.gonglei@huawei.com>,
	Gautam Dawar <gdawar@xilinx.com>
Subject: [RFC PATCH 11/12] vdpa: Add virtio-net mac address via CVQ at start
Date: Sat, 16 Jul 2022 13:34:06 +0200	[thread overview]
Message-ID: <20220716113407.2730331-12-eperezma@redhat.com> (raw)
In-Reply-To: <20220716113407.2730331-1-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>
---
 net/vhost-vdpa.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 0183fce353..2873be2ba4 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -383,7 +383,7 @@ static virtio_net_ctrl_ack vhost_vdpa_net_svq_add(VhostShadowVirtqueue *svq,
     return VIRTIO_NET_OK;
 }
 
-static int vhost_vdpa_start_control_svq(struct vhost_vdpa *v)
+static int vhost_vdpa_enable_control_svq(struct vhost_vdpa *v)
 {
     struct vhost_vring_state state = {
         .index = v->dev->vq_index,
@@ -395,6 +395,57 @@ static int vhost_vdpa_start_control_svq(struct vhost_vdpa *v)
     return r < 0 ? -errno : r;
 }
 
+static int vhost_vdpa_start_control_svq(struct vhost_vdpa *v)
+{
+
+    VirtIONet *n = VIRTIO_NET(v->dev->vdev);
+    uint64_t features = v->dev->vdev->host_features;
+    VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, 0);
+    VhostVDPAState *s = container_of(v, VhostVDPAState, vhost_vdpa);
+    int r;
+
+    r = vhost_vdpa_enable_control_svq(v);
+    if (unlikely(r < 0)) {
+        return r;
+    }
+
+    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,
+        };
+        uint8_t mac[6];
+        const struct iovec out[] = {
+            {
+                .iov_base = (void *)&ctrl,
+                .iov_len = sizeof(ctrl),
+            },{
+                .iov_base = mac,
+                .iov_len = sizeof(mac),
+            },
+        };
+        struct iovec dev_buffers[2] = {
+            { .iov_base = s->cvq_cmd_out_buffer },
+            { .iov_base = s->cvq_cmd_in_buffer },
+        };
+        bool ok;
+        virtio_net_ctrl_ack state;
+
+        ok = vhost_vdpa_net_cvq_map_sg(s, out, ARRAY_SIZE(out), dev_buffers);
+        if (unlikely(!ok)) {
+            return -1;
+        }
+
+        memcpy(mac, n->mac, sizeof(mac));
+        state = vhost_vdpa_net_svq_add(svq, dev_buffers);
+        vhost_vdpa_cvq_unmap_buf(v, dev_buffers[0].iov_base);
+        vhost_vdpa_cvq_unmap_buf(v, dev_buffers[1].iov_base);
+        return state == VIRTIO_NET_OK ? 0 : 1;
+    }
+
+    return 0;
+}
+
 /**
  * Do not forward commands not supported by SVQ. Otherwise, the device could
  * accept it and qemu would not know how to update the device model.
-- 
2.31.1



  parent reply	other threads:[~2022-07-16 11:44 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-16 11:33 [RFC PATCH 00/12] NIC vhost-vdpa state restore via Shadow CVQ Eugenio Pérez
2022-07-16 11:33 ` [RFC PATCH 01/12] vhost: Get vring base from vq, not svq Eugenio Pérez
2022-07-18  5:48   ` Jason Wang
2022-07-18  7:14     ` Eugenio Perez Martin
2022-07-16 11:33 ` [RFC PATCH 02/12] vhost: Move SVQ queue rewind to the destination Eugenio Pérez
2022-07-18  5:49   ` Jason Wang
2022-07-18  7:20     ` Eugenio Perez Martin
2022-07-16 11:33 ` [RFC PATCH 03/12] vdpa: Small rename of error labels Eugenio Pérez
2022-07-18  5:50   ` Jason Wang
2022-07-18  7:21     ` Eugenio Perez Martin
2022-07-16 11:33 ` [RFC PATCH 04/12] vdpa: delay set_vring_ready after DRIVER_OK Eugenio Pérez
2022-07-18  6:34   ` Jason Wang
2022-07-18  6:57     ` Eugenio Perez Martin
2022-07-16 11:34 ` [RFC PATCH 05/12] vhost: stop transfer elem ownership in vhost_handle_guest_kick Eugenio Pérez
2022-07-16 11:34 ` [RFC PATCH 06/12] vhost: Use opaque data in SVQDescState Eugenio Pérez
2022-07-16 11:34 ` [RFC PATCH 07/12] vhost: Add VhostVDPAStartOp operation Eugenio Pérez
2022-07-17 11:01   ` Eugenio Perez Martin
2022-07-18  8:50   ` Jason Wang
2022-07-18  9:08     ` Eugenio Perez Martin
2022-07-16 11:34 ` [RFC PATCH 08/12] vdpa: Add vhost_vdpa_start_control_svq Eugenio Pérez
2022-07-16 11:34 ` [RFC PATCH 09/12] vdpa: Extract vhost_vdpa_net_svq_add from vhost_vdpa_net_handle_ctrl_avail Eugenio Pérez
2022-07-18  8:53   ` Jason Wang
2022-07-18 10:15     ` Eugenio Perez Martin
2022-07-16 11:34 ` [RFC PATCH 10/12] vdpa: Make vhost_vdpa_net_cvq_map_elem accept any out sg Eugenio Pérez
2022-07-16 11:34 ` Eugenio Pérez [this message]
2022-07-18  8:55   ` [RFC PATCH 11/12] vdpa: Add virtio-net mac address via CVQ at start Jason Wang
2022-07-18  9:07     ` Eugenio Perez Martin
2022-07-16 11:34 ` [RFC PATCH 12/12] vdpa: Delete CVQ migration blocker Eugenio Pérez

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=20220716113407.2730331-12-eperezma@redhat.com \
    --to=eperezma@redhat.com \
    --cc=arei.gonglei@huawei.com \
    --cc=armbru@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=eblake@redhat.com \
    --cc=eli@mellanox.com \
    --cc=gdawar@xilinx.com \
    --cc=hanand@xilinx.com \
    --cc=jasowang@redhat.com \
    --cc=lingshan.zhu@intel.com \
    --cc=liuxiangdong5@huawei.com \
    --cc=lulu@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=parav@mellanox.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sgarzare@redhat.com \
    --cc=stefanha@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.