From 81c09d03d8d8f37867f776ecf29a6c205883c4d9 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Tue, 3 Jan 2017 12:44:15 +0000 Subject: VPP-574: fix VPP hang during security group configuration on a suspended VM The unix connect() in vhost-user driver in VPP is blocking, and a non-expedient accept() on the other side causes the entire VPP to hang. Solution: set the nonblocking flag for the socket fd before calling connect(), and set the socket back to blocking after the accept() succeeds. Change-Id: I2d535ea9b95a92922d305d79a8d860062c95faf4 Signed-off-by: Andrew Yourtchenko --- vnet/vnet/devices/virtio/vhost-user.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vnet/vnet/devices/virtio/vhost-user.c b/vnet/vnet/devices/virtio/vhost-user.c index bde8106c501..fa64f102311 100644 --- a/vnet/vnet/devices/virtio/vhost-user.c +++ b/vnet/vnet/devices/virtio/vhost-user.c @@ -2325,9 +2325,13 @@ vhost_user_process (vlib_main_t * vm, strncpy (sun.sun_path, (char *) vui->sock_filename, sizeof (sun.sun_path) - 1); + /* Avoid hanging VPP if the other end does not accept */ + fcntl(sockfd, F_SETFL, O_NONBLOCK); if (connect (sockfd, (struct sockaddr *) &sun, sizeof (struct sockaddr_un)) == 0) { + /* Set the socket to blocking as it was before */ + fcntl(sockfd, F_SETFL, 0); vui->sock_errno = 0; template.file_descriptor = sockfd; template.private_data = -- cgit 1.2.3-korg