Skip to contentSkip to conversation

vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check

PATCH In review Eugenio Pérez 4 participants 4 messages Jan 17, 2023 – Jan 29, 2023 Networking

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check

VHOST_BACKEND_F_IOTLB_ASID is the feature bit, not the bitmask. Since the device under test also provided VHOST_BACKEND_F_IOTLB_MSG_V2 and VHOST_BACKEND_F_IOTLB_BATCH, this went unnoticed.

Fixes c1a1008685 ("vdpa: always start CVQ in SVQ mode if possible")

---
Originally on SUSPEND series, but it is a fix that it is worth to send and apply individually:
https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg02574.html

---
 net/vhost-vdpa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/vhost-vdpa.c +1 -1
index 1a13a34d35..de5ed8ff22 100644
@@ -384,7 +384,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
             g_strerror(errno), errno);
         return -1;
     }
-    if (!(backend_features & VHOST_BACKEND_F_IOTLB_ASID) ||
+    if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID)) ||
         !vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) {
         return 0;
     }

--
2.31.1

Reviewed-by on v1 1/1
#1 lore raw
Quoted 30 lines · Eugenio Pérez

VHOST_BACKEND_F_IOTLB_ASID is the feature bit, not the bitmask. Since the device under test also provided VHOST_BACKEND_F_IOTLB_MSG_V2 and VHOST_BACKEND_F_IOTLB_BATCH, this went unnoticed.

Fixes c1a1008685 ("vdpa: always start CVQ in SVQ mode if possible")

---
Originally on SUSPEND series, but it is a fix that it is worth to send and apply individually:
https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg02574.html

---
  net/vhost-vdpa.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
net/vhost-vdpa.c +1 -2
index 1a13a34d35..de5ed8ff22 100644
@@ -384,7 +384,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
              g_strerror(errno), errno);
          return -1;
      }
-    if (!(backend_features & VHOST_BACKEND_F_IOTLB_ASID) ||
+    if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID)) ||
          !vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) {
          return 0;
      }
--
Quoted 1 line

2.31.1

Reviewed-by on v1 1/1
#2 lore raw
In reply to Eugenio Pérez
Quoted 7 lines · Eugenio Pérez

VHOST_BACKEND_F_IOTLB_ASID is the feature bit, not the bitmask. Since the device under test also provided VHOST_BACKEND_F_IOTLB_MSG_V2 and VHOST_BACKEND_F_IOTLB_BATCH, this went unnoticed.

Fixes c1a1008685 ("vdpa: always start CVQ in SVQ mode if possible")

Jason are you merging this?

Quoted 24 lines

---
Originally on SUSPEND series, but it is a fix that it is worth to send and apply individually:
https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg02574.html

---
 net/vhost-vdpa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/vhost-vdpa.c +1 -2
index 1a13a34d35..de5ed8ff22 100644
@@ -384,7 +384,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
             g_strerror(errno), errno);
         return -1;
     }
-    if (!(backend_features & VHOST_BACKEND_F_IOTLB_ASID) ||
+    if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID)) ||
         !vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) {
         return 0;
     }
--

2.31.1

#3 lore raw
Quoted 6 lines · Michael S. Tsirkin
Quoted 4 lines · Eugenio Pérez

VHOST_BACKEND_F_IOTLB_ASID is the feature bit, not the bitmask. Since the device under test also provided VHOST_BACKEND_F_IOTLB_MSG_V2 and VHOST_BACKEND_F_IOTLB_BATCH, this went unnoticed.

Quoted 7 lines
Quoted 3 lines
Fixes c1a1008685 ("vdpa: always start CVQ in SVQ mode if possible")

Jason are you merging this?

Queued.

Thanks

Quoted 26 lines
Quoted 25 lines

---
Originally on SUSPEND series, but it is a fix that it is worth to send and apply individually:
https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg02574.html

---
 net/vhost-vdpa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/vhost-vdpa.c +1 -2
index 1a13a34d35..de5ed8ff22 100644
@@ -384,7 +384,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
             g_strerror(errno), errno);
         return -1;
     }
-    if (!(backend_features & VHOST_BACKEND_F_IOTLB_ASID) ||
+    if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID)) ||
         !vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) {
         return 0;
     }
--

2.31.1