[PATCH] virtio-net : Add check for VIRTIO_NET_F_MAC

* [PATCH] virtio-net : Add check for VIRTIO_NET_F_MAC
@ 2021-09-29  6:52 Cindy Lu
  2021-09-29 10:01 ` Michael Tokarev
  0 siblings, 1 reply; 6+ messages in thread
From: Cindy Lu @ 2021-09-29  6:52 UTC (permalink / raw)
  To: lulu, mst, jasowang, qemu-devel; +Cc: qemu-stable

For vdpa device, if the host support VIRTIO_NET_F_MAC
we need to read the mac address from hardware, so need
to check this bit, the logic is
1 if the host support VIRTIO_NET_F_MAC and the mac address
   is correct, qemu will use the mac address in hardware
2.if the host not support , qemu will use the mac from cmdline
3.if the cmdline not provide mac address, qemu will use radam mac
address

Signed-off-by: Cindy Lu <lulu@redhat.com>
---
 hw/net/virtio-net.c | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 55aac06a0a..085daa28b0 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -127,9 +127,9 @@ static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config)
     struct virtio_net_config netcfg;
     NetClientState *nc = qemu_get_queue(n->nic);
     static const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };
-
     int ret = 0;
-    memset(&netcfg, 0 , sizeof(struct virtio_net_config));
+
+    memset(&netcfg, 0, sizeof(struct virtio_net_config));
     virtio_stw_p(vdev, &netcfg.status, n->status);
     virtio_stw_p(vdev, &netcfg.max_virtqueue_pairs, n->max_queues);
     virtio_stw_p(vdev, &netcfg.mtu, n->net_conf.mtu);
@@ -159,12 +159,21 @@ static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config)
              * address has been configured correctly elsewhere - just not
              * reported by the device.
              */
+
             if (memcmp(&netcfg.mac, &zero, sizeof(zero)) == 0) {
                 info_report("Zero hardware mac address detected. Ignoring.");
                 memcpy(netcfg.mac, n->mac, ETH_ALEN);
             }
-            memcpy(config, &netcfg, n->config_size);
+            /*
+             * If the host support VIRTIO_NET_F_MAC, That means hardware
+             * will provide the mac address, otherwise we don't need to use it.
+             * use  the mac address from qemu cfg
+             */
+            if (!(virtio_host_has_feature(vdev, VIRTIO_NET_F_MAC))) {
+                memcpy(netcfg.mac, n->mac, ETH_ALEN);
+            }
         }
+        memcpy(config, &netcfg, n->config_size);
     }
 }
 
@@ -3453,11 +3462,22 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
     nc = qemu_get_queue(n->nic);
     nc->rxfilter_notify_enabled = 1;
 
-   if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_VDPA) {
+    if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_VDPA) {
+
         struct virtio_net_config netcfg = {};
-        memcpy(&netcfg.mac, &n->nic_conf.macaddr, ETH_ALEN);
-        vhost_net_set_config(get_vhost_net(nc->peer),
-            (uint8_t *)&netcfg, 0, ETH_ALEN, VHOST_SET_CONFIG_TYPE_MASTER);
+        /*
+         * get the real mac address from hardware or qemu cmline
+         *
+         * If the host support VIRTIO_NET_F_MAC, That means hardware
+         * will provide the mac address, otherwise we don't need to use it.
+         * use  the mac address from qemu cfg
+         */
+        virtio_net_get_config(vdev, (uint8_t *)&netcfg);
+        /*
+         * for vdpa device qemu need to set the real mac back to hardware
+         */
+        vhost_net_set_config(get_vhost_net(nc->peer),  (uint8_t *)&netcfg, 0,
+                             ETH_ALEN, VHOST_SET_CONFIG_TYPE_MASTER);
     }
     QTAILQ_INIT(&n->rsc_chains);
     n->qdev = dev;
-- 
2.21.3



^ permalink raw reply related	[flat|nested] 6+ messages in thread