Skip to contentSkip to conversation

vhost: add protocol feature check

PATCH In review Jin Yu 2 participants 2 messages Dec 25, 2019 – Jan 13, 2020

lore
Share & tools
lore

Jin Yu

author
#0 lore raw

PATCH 1/1 vhost: add protocol feature check

Add VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD check in
getting inflight ring functions.

Fixes 4d891f77ddfa ("vhost: add APIs to get inflight ring")
---
 lib/librte_vhost/vhost.c | 8 ++++++++
 1 file changed, 8 insertions(+)
lib/librte_vhost/vhost.c +8 -0
index 1cbe948f7..dfb71732b 100644
@@ -862,6 +862,10 @@ rte_vhost_get_vhost_ring_inflight(int vid, uint16_t vring_idx,
 	if (unlikely(!dev))
 		return -1;
 
+	if (unlikely(!(dev->protocol_features &
+	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
+		return 0;
+
 	if (vring_idx >= VHOST_MAX_VRING)
 		return -1;
 
@@ -1431,6 +1435,10 @@ rte_vhost_get_vring_base_from_inflight(int vid,
 	if (dev == NULL || last_avail_idx == NULL || last_used_idx == NULL)
 		return -1;
 
+	if (unlikely(!(dev->protocol_features &
+	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
+		return 0;
+
 	if (!vq_is_packed(dev))
 		return -1;
 
Signature · 1 line
2.17.2
#1 lore raw
Quoted 16 lines · Jin Yu

Add VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD check in
getting inflight ring functions.

Fixes 4d891f77ddfa ("vhost: add APIs to get inflight ring")
---
 lib/librte_vhost/vhost.c | 8 ++++++++
 1 file changed, 8 insertions(+)
lib/librte_vhost/vhost.c +0 -0
index 1cbe948f7..dfb71732b 100644

lib/librte_vhost/vhost.c rte_vhost_get_vhost_ring_inflight(int vid, uint16_t vring_idx, · line 867

Quoted 6 lines
lib/librte_vhost/vhost.c +3 -0
@@ -862,6 +862,10 @@ rte_vhost_get_vhost_ring_inflight(int vid, uint16_t vring_idx,
 	if (unlikely(!dev))
 		return -1;
 
+	if (unlikely(!(dev->protocol_features &
+	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
+		return 0;

Why this is needed?
The caller needs to know whether _INFLIGHT_SHMFD is negotiated or not anyway. Even if rte_vhost_get_vhost_ring_inflight() returns success, the inflight info returned is still invalid.

Quoted 18 lines
lib/librte_vhost/vhost.c +5 -0
+
 	if (vring_idx >= VHOST_MAX_VRING)
 		return -1;
 
@@ -1431,6 +1435,10 @@ rte_vhost_get_vring_base_from_inflight(int vid,
 	if (dev == NULL || last_avail_idx == NULL || last_used_idx == NULL)
 		return -1;
 
+	if (unlikely(!(dev->protocol_features &
+	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))))
+		return 0;
+
 	if (!vq_is_packed(dev))
 		return -1;
 
Signature · 1 line
2.17.2