From 41f32b052c78898d20d04913a7e205970b96309a Mon Sep 17 00:00:00 2001 From: Roland Qi Date: Tue, 21 Apr 2020 16:59:39 +0800 Subject: [PATCH] vhost: fix peer close check In process_slave_message_reply(), there is a possibility that receiving a peer close message instead of a real message response. This patch targeting to handle the peer close scenario and report the correct error message. Fixes: a277c7159876 ("vhost: refactor code structure") Cc: stable@dpdk.org Signed-off-by: Roland Qi Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_user.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index bd1be01040..971ccdb01c 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -2812,11 +2812,19 @@ static int process_slave_message_reply(struct virtio_net *dev, if ((msg->flags & VHOST_USER_NEED_REPLY) == 0) return 0; - if (read_vhost_message(dev->slave_req_fd, &msg_reply) < 0) { + ret = read_vhost_message(dev->slave_req_fd, &msg_reply); + if (ret <= 0) { + if (ret < 0) + VHOST_LOG_CONFIG(ERR, + "vhost read slave message reply failed\n"); + else + VHOST_LOG_CONFIG(INFO, + "vhost peer closed\n"); ret = -1; goto out; } + ret = 0; if (msg_reply.request.slave != msg->request.slave) { VHOST_LOG_CONFIG(ERR, "Received unexpected msg type (%u), expected %u\n", -- 2.20.1