d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost: fix deadlock when message handling failed

Browse Source 
In vhost_user_msg_handler(), if vhost message handling
failed, we should check whether the queue is locked and
release the lock before returning. Or, it will cause a
deadlock later.

Fixes: 7f31d4ea05 ("vhost: fix lock on device readiness notification")
Cc: stable@dpdk.org

Signed-off-by: Wenwu Ma <wenwux.ma@intel.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Tested-by: Wei Ling <weix.ling@intel.com>
Acked-by: David Marchand <david.marchand@redhat.com>
This commit is contained in:
Wenwu Ma 2022-05-07 13:27:53 +00:00 committed by Maxime Coquelin
parent a543dcb70c
commit 9e89b06d02
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vhost/vhost_user.c
View File

@ -2887,7 +2887,6 @@ vhost_user_msg_handler(int vid, int fd)
return -1;
}
ret = 0;
request = ctx.msg.request.master;
if (request > VHOST_USER_NONE && request < RTE_DIM(vhost_message_handlers))
msg_handler = &vhost_message_handlers[request];
@ -3031,9 +3030,11 @@ vhost_user_msg_handler(int vid, int fd)
send_vhost_reply(dev, fd, &ctx);
} else if (ret == RTE_VHOST_MSG_RESULT_ERR) {
VHOST_LOG_CONFIG(ERR, "(%s) vhost message handling failed.\n", dev->ifname);
return -1;
ret = -1;
goto unlock;
}
ret = 0;
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
bool cur_ready = vq_is_ready(dev, vq);
@ -3044,10 +3045,11 @@ vhost_user_msg_handler(int vid, int fd)
}
}
unlock:
if (unlock_required)
vhost_user_unlock_all_queue_pairs(dev);
if (!virtio_is_ready(dev))
if (ret != 0 || !virtio_is_ready(dev))
goto out;
/*
@ -3074,7 +3076,7 @@ vhost_user_msg_handler(int vid, int fd)
}
out:
return 0;
return ret;
}
static int process_slave_message_reply(struct virtio_net *dev,