Skip to contentSkip to conversation

vhost: fix the inflight resubmit check

PATCH Applied Jin Yu 2 participants 3 messages Dec 25, 2019 – Feb 13, 2020

lore
Share & tools
lore

Jin Yu

author
#0 lore raw

PATCH 1/1 vhost: fix the inflight resubmit check

The frontend may not send the get_inflight_fd and set_inflight_fd although we negotiate the protocol feature. When we meet this situation just return OK.

Fixes ad0a4ae491fe ("vhost: checkout resubmit inflight information")
Cc [email protected]
Signed-off-by Jin Yu <[email protected]>
---
 lib/librte_vhost/vhost_user.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
lib/librte_vhost/vhost_user.c +8 -2
index 0cfb8b792..eb0f27c29 100644
@@ -1629,8 +1629,11 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,
 	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))
 		return RTE_VHOST_MSG_RESULT_OK;
 
+	/* The frontend may still not support the inflight feature
+	 * although we negotiate the protocol feature.
+	 */
 	if ((!vq->inflight_split))
-		return RTE_VHOST_MSG_RESULT_ERR;
+		return RTE_VHOST_MSG_RESULT_OK;
 
 	if (!vq->inflight_split->version) {
 		vq->inflight_split->version = INFLIGHT_VERSION;

@@ -1710,8 +1713,11 @@ vhost_check_queue_inflights_packed(struct virtio_net *dev,
 	    (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))
 		return RTE_VHOST_MSG_RESULT_OK;
 
+	/* The frontend may still not support the inflight feature
+	 * although we negotiate the protocol feature.
+	 */
 	if ((!vq->inflight_packed))
-		return RTE_VHOST_MSG_RESULT_ERR;
+		return RTE_VHOST_MSG_RESULT_OK;
 
 	if (!vq->inflight_packed->version) {
 		vq->inflight_packed->version = INFLIGHT_VERSION;
Signature · 1 line
2.17.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Jin Yu

The frontend may not send the get_inflight_fd and set_inflight_fd although we negotiate the protocol feature. When we meet this situation just return OK.

Quoted 8 lines
Fixes ad0a4ae491fe ("vhost: checkout resubmit inflight information")
Cc [email protected]
Signed-off-by Jin Yu <[email protected]>
---
 lib/librte_vhost/vhost_user.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
Reviewed-by Maxime Coquelin <[email protected]>

Thanks,
Maxime

Applied
#2 lore raw
In reply to Jin Yu
Quoted 11 lines · Jin Yu

The frontend may not send the get_inflight_fd and set_inflight_fd although we negotiate the protocol feature. When we meet this situation just return OK.

Fixes ad0a4ae491fe ("vhost: checkout resubmit inflight information")
Cc [email protected]
Signed-off-by Jin Yu <[email protected]>
---
 lib/librte_vhost/vhost_user.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Applied to dpdk-next-virtio/master

Thanks,
Maxime