Skip to contentSkip to conversation

Vhost-vdpa Shadow Virtqueue _F_CTRL_RX_EXTRA commands support

RFC PATCH Superseded Hawkins Jiawei 2 participants 6 messages Jun 23, 2023 – Jun 26, 2023 Networking

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#1 lore raw

RFC PATCH 1/2 vdpa: Restore packet receive filtering state relative with _F_CTRL_RX_EXTRA feature

In reply to Hawkins Jiawei

This patch refactors vhost_vdpa_net_load_rx() to restore the packet receive filtering state in relation to VIRTIO_NET_F_CTRL_RX_EXTRA feature at device's startup.

---
 net/vhost-vdpa.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
net/vhost-vdpa.c +30 -0
index ca800f97e2..9b929762c5 100644
@@ -822,6 +822,36 @@ static int vhost_vdpa_net_load_rx(VhostVDPAState *s,
         }
     }
 
+    if (virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_RX_EXTRA)) {
+        /* Load the all-unicast mode */
+        on = n->alluni;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_ALLUNI, on);
+        if (r < 0) {
+            return r;
+        }
+
+        /* Load the non-multicast mode */
+        on = n->nomulti;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_NOMULTI, on);
+        if (r < 0) {
+            return r;
+        }
+
+        /* Load the non-unicast mode */
+        on = n->nouni;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_NOUNI, on);
+        if (r < 0) {
+            return r;
+        }
+
+        /* Load the non-broadcast mode */
+        on = n->nobcast;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_NOBCAST, on);
+        if (r < 0) {
+            return r;
+        }
+    }
+
     return 0;
 }
 
Signature · 1 line
2.25.1
#4 lore raw

RFC PATCH 2/2 vdpa: Allow VIRTIO_NET_F_CTRL_RX_EXTRA in SVQ

In reply to Hawkins Jiawei

Enable SVQ with VIRTIO_NET_F_CTRL_RX_EXTRA feature.

---
 net/vhost-vdpa.c | 1 +
 1 file changed, 1 insertion(+)
net/vhost-vdpa.c +1 -0
index 9b929762c5..cdfe8e454e 100644
@@ -100,6 +100,7 @@ static const uint64_t vdpa_svq_device_features =
     BIT_ULL(VIRTIO_NET_F_STATUS) |
     BIT_ULL(VIRTIO_NET_F_CTRL_VQ) |
     BIT_ULL(VIRTIO_NET_F_CTRL_RX) |
+    BIT_ULL(VIRTIO_NET_F_CTRL_RX_EXTRA) |
     BIT_ULL(VIRTIO_NET_F_MQ) |
     BIT_ULL(VIRTIO_F_ANY_LAYOUT) |
     BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR) |
Signature · 1 line
2.25.1
#0 lore raw

cover Vhost-vdpa Shadow Virtqueue _F_CTRL_RX_EXTRA commands support

This series enables shadowed CVQ to intercept rx commands related to VIRTIO_NET_F_CTRL_RX_EXTRA feature through shadowed CVQ, update the virtio NIC device model so qemu send it in a migration, and the restore of that rx state in the destination.

To test this patch series, I modify the n->parent_obj.guest_features value in vhost_vdpa_net_load_rx() using gdb, as the Linux virtio-net driver does not currently support the VIRTIO_NET_F_CTRL_RX_EXTRA feature.

Note that this patch should be based on [1], which has not been merged yet. I will submit the v2 patch after they are merged.

[1]. https://lore.kernel.org/all/[email protected]/

Hawkins Jiawei (2):
vdpa: Restore packet receive filtering state relative with
_F_CTRL_RX_EXTRA feature
vdpa: Allow VIRTIO_NET_F_CTRL_RX_EXTRA in SVQ

 net/vhost-vdpa.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH RFC 1/2] vdpa: Restore packet receive filtering state relative with _F_CTRL_RX_EXTRA feature

In reply to Hawkins Jiawei
Quoted 38 lines · Hawkins Jiawei

This patch refactors vhost_vdpa_net_load_rx() to restore the packet receive filtering state in relation to VIRTIO_NET_F_CTRL_RX_EXTRA feature at device's startup.

---
 net/vhost-vdpa.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
net/vhost-vdpa.c +20 -0
index ca800f97e2..9b929762c5 100644
@@ -822,6 +822,36 @@ static int vhost_vdpa_net_load_rx(VhostVDPAState *s,
         }
     }
 
+    if (virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_RX_EXTRA)) {
+        /* Load the all-unicast mode */
+        on = n->alluni;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_ALLUNI, on);
+        if (r < 0) {
+            return r;
+        }
+
+        /* Load the non-multicast mode */
+        on = n->nomulti;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_NOMULTI, on);
+        if (r < 0) {
+            return r;
+        }
+
+        /* Load the non-unicast mode */
+        on = n->nouni;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_NOUNI, on);
+        if (r < 0) {
+            return r;

net/vhost-vdpa.c static int vhost_vdpa_net_load_rx(VhostVDPAState *s, · line 854

Quoted 10 lines
net/vhost-vdpa.c +10 -0
+        }
+
+        /* Load the non-broadcast mode */
+        on = n->nobcast;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_NOBCAST, on);
+        if (r < 0) {
+            return r;
+        }
+    }
+

Can we skip the load if the state matches the virtio defaults? by virtio_net_reset the defaults are:

    n->promisc = 1;
    n->allmulti = 0;
    n->alluni = 0;
    n->nomulti = 0;
    n->nouni = 0;
    n->nobcast = 0;

Thanks!

Quoted 6 lines
net/vhost-vdpa.c +0 -1
     return 0;
 }
 
--

2.25.1

Acked-by on v1 2/2
#5 lore raw

Re: [PATCH RFC 2/2] vdpa: Allow VIRTIO_NET_F_CTRL_RX_EXTRA in SVQ

In reply to Hawkins Jiawei
Quoted 4 lines · Hawkins Jiawei

Enable SVQ with VIRTIO_NET_F_CTRL_RX_EXTRA feature.

Quoted 19 lines
---
 net/vhost-vdpa.c | 1 +
 1 file changed, 1 insertion(+)
net/vhost-vdpa.c +1 -1
index 9b929762c5..cdfe8e454e 100644
@@ -100,6 +100,7 @@ static const uint64_t vdpa_svq_device_features =
     BIT_ULL(VIRTIO_NET_F_STATUS) |
     BIT_ULL(VIRTIO_NET_F_CTRL_VQ) |
     BIT_ULL(VIRTIO_NET_F_CTRL_RX) |
+    BIT_ULL(VIRTIO_NET_F_CTRL_RX_EXTRA) |
     BIT_ULL(VIRTIO_NET_F_MQ) |
     BIT_ULL(VIRTIO_F_ANY_LAYOUT) |
     BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR) |
--

2.25.1

#3 lore raw

Re: [PATCH RFC 1/2] vdpa: Restore packet receive filtering state relative with _F_CTRL_RX_EXTRA feature

In reply to Eugenio Perez Martin
Quoted 52 lines · Eugenio Perez Martin
Quoted 38 lines · Hawkins Jiawei

This patch refactors vhost_vdpa_net_load_rx() to restore the packet receive filtering state in relation to VIRTIO_NET_F_CTRL_RX_EXTRA feature at device's startup.

---
  net/vhost-vdpa.c | 30 ++++++++++++++++++++++++++++++
  1 file changed, 30 insertions(+)
net/vhost-vdpa.c +20 -0
index ca800f97e2..9b929762c5 100644
@@ -822,6 +822,36 @@ static int vhost_vdpa_net_load_rx(VhostVDPAState *s,
          }
      }
 
+    if (virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_RX_EXTRA)) {
+        /* Load the all-unicast mode */
+        on = n->alluni;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_ALLUNI, on);
+        if (r < 0) {
+            return r;
+        }
+
+        /* Load the non-multicast mode */
+        on = n->nomulti;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_NOMULTI, on);
+        if (r < 0) {
+            return r;
+        }
+
+        /* Load the non-unicast mode */
+        on = n->nouni;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_NOUNI, on);
+        if (r < 0) {
+            return r;

net/vhost-vdpa.c static int vhost_vdpa_net_load_rx(VhostVDPAState *s, · line 854

Quoted 10 lines
net/vhost-vdpa.c +10 -0
+        }
+
+        /* Load the non-broadcast mode */
+        on = n->nobcast;
+        r = vhost_vdpa_net_load_rx_mode(s, VIRTIO_NET_CTRL_RX_NOBCAST, on);
+        if (r < 0) {
+            return r;
+        }
+    }
+

Can we skip the load if the state matches the virtio defaults? by virtio_net_reset the defaults are:

Quoted 6 lines
     n->promisc = 1;
     n->allmulti = 0;
     n->alluni = 0;
     n->nomulti = 0;
     n->nouni = 0;
     n->nobcast = 0;

Yes, you are right.

Thanks for your reminder, I forgot this part when coding. I will refactor the patch according to your suggestion and take care of it in the following patches for this part.

Thanks!

Quoted 10 lines

Thanks!

Quoted 6 lines
net/vhost-vdpa.c +0 -1
      return 0;
  }
 
--

2.25.1