Skip to contentSkip to conversation

vdpa: Allow VDPA to work on big-endian machine

PATCH In review Konstantin Shkolnyy 2 participants 2 messages Apr 27 – May 7 Networking

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 vdpa: Allow VDPA to work on big-endian machine

After commit 0caed25cd171 vhost_vdpa_net_load_vlan() started seeing VIRTIO_NET_F_CTRL_VLAN flag and making 4096 calls to the kernel with VIRTIO_NET_CTRL_VLAN_ADD command. However, it forgot to convert the 16-bit VLAN IDs to LE format. On BE machine, the kernel calls failed when they saw "VLAN IDs" greater than 4095, and QEMU then said:
"unable to start vhost net: 5: falling back on userspace virtio", and VDPA became disabled.

Convert the VLAN ID to LE before putting it into virtio queue.

Fixes 8f7e9967484d ("vdpa: Restore vlan filtering state")

---
This patch was reviewed several months ago but was never applied. Resending... Changes in v3:
- Add Reviewed-by: Akihiko Odaki.

---
 net/vhost-vdpa.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
net/vhost-vdpa.c +3 -2
index 3df6091274..f1523697e2 100644
@@ -1200,9 +1200,10 @@ static int vhost_vdpa_net_load_single_vlan(VhostVDPAState *s,
                                            struct iovec *in_cursor,
                                            uint16_t vid)
 {
+    uint16_t vid_le = cpu_to_le16(vid);
     const struct iovec data = {
-        .iov_base = &vid,
-        .iov_len = sizeof(vid),
+        .iov_base = &vid_le,
+        .iov_len = sizeof(vid_le),
     };
     ssize_t r = vhost_vdpa_net_load_cmd(s, out_cursor, in_cursor,
                                         VIRTIO_NET_CTRL_VLAN,
Signature · 1 line
2.34.1
#1 lore raw
Quoted 15 lines · Konstantin Shkolnyy

After commit 0caed25cd171 vhost_vdpa_net_load_vlan() started seeing VIRTIO_NET_F_CTRL_VLAN flag and making 4096 calls to the kernel with VIRTIO_NET_CTRL_VLAN_ADD command. However, it forgot to convert the 16-bit VLAN IDs to LE format. On BE machine, the kernel calls failed when they saw "VLAN IDs" greater than 4095, and QEMU then said:
"unable to start vhost net: 5: falling back on userspace virtio", and VDPA became disabled.

Convert the VLAN ID to LE before putting it into virtio queue.

Fixes 8f7e9967484d ("vdpa: Restore vlan filtering state")
Quoted 7 lines

---
This patch was reviewed several months ago but was never applied. Resending... Changes in v3:
- Add Reviewed-by: Akihiko Odaki.

---
  net/vhost-vdpa.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

Queued via hw-misc since acked by Jason.