Skip to contentSkip to conversation

vhostuser: fix deadlock when vhost unregister

PATCH In review sunwenjie 2 participants 3 messages Jan 8, 2019 – Jan 11, 2019

lore
Share & tools
lore

sunwenjie

author
#0 lore raw

PATCH 1/1 vhostuser: fix deadlock when vhost unregister

When rte_vhost_driver_unregister delete the connection fd, fdset_try_del will always try and donot release the vhostuser.mutex if the fd is busy, but the fdset_event_dispatch will set the fd to busy and call vhost_user_msg_handler to get vhostuser.mutex, which will cause deadlock.

To fix it:
Unlock the vhost_user.mutex if fdset_try_del fail and relock it when retry.

---
 lib/librte_vhost/socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/librte_vhost/socket.c +2 -2
index 9cf34ad17..a9effa115 100644
@@ -961,13 +961,12 @@ rte_vhost_driver_unregister(const char *path)
 	int count;
 	struct vhost_user_connection *conn, *next;
 
+again:
 	pthread_mutex_lock(&vhost_user.mutex);
 
 	for (i = 0; i < vhost_user.vsocket_cnt; i++) {
 		struct vhost_user_socket *vsocket = vhost_user.vsockets[i];
-
 		if (!strcmp(vsocket->path, path)) {
-again:
 			pthread_mutex_lock(&vsocket->conn_mutex);
 			for (conn = TAILQ_FIRST(&vsocket->conn_list);
 			     conn != NULL;
@@ -981,6 +980,7 @@ rte_vhost_driver_unregister(const char *path)
 				 */
 				if (fdset_try_del(&vhost_user.fdset,
 						  conn->connfd) == -1) {
+					pthread_mutex_unlock(&vhost_user.mutex);
 					pthread_mutex_unlock(
 							&vsocket->conn_mutex);
 					goto again;
Signature · 1 line
2.14.3 (Apple Git-98)
#1 lore raw

Hi Sunwenjie,

Thanks for your patch.

Please resend with following contribution guidelines, that can be found in doc/guides/contributing/.

First, the commit message prefix should be vhost.
For other comments, please see inline:

Quoted 5 lines · sunwenjie

When rte_vhost_driver_unregister delete the connection fd, fdset_try_del will always try and donot release the vhostuser.mutex if the fd is busy, but the fdset_event_dispatch will set the fd to busy and call vhost_user_msg_handler to get vhostuser.mutex, which will cause deadlock.

The commit message should not be indented, and wrapped at 72 chars.

Quoted 3 lines

To fix it:
Unlock the vhost_user.mutex if fdset_try_del fail and relock it when retry.

You need to add your Sined-off-by with your full name.

Quoted 9 lines
---
  lib/librte_vhost/socket.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
lib/librte_vhost/socket.c +0 -0
index 9cf34ad17..a9effa115 100644

lib/librte_vhost/socket.c rte_vhost_driver_unregister(const char *path) · line 968

Quoted 9 lines
lib/librte_vhost/socket.c +1 -1
@@ -961,13 +961,12 @@ rte_vhost_driver_unregister(const char *path)
  	int count;
  	struct vhost_user_connection *conn, *next;
 
+again:
  	pthread_mutex_lock(&vhost_user.mutex);
 
  	for (i = 0; i < vhost_user.vsocket_cnt; i++) {
  		struct vhost_user_socket *vsocket = vhost_user.vsockets[i];
-

Keep this new line, it is out of the scope of the change.

Quoted 7 lines
lib/librte_vhost/socket.c +0 -1
  		if (!strcmp(vsocket->path, path)) {
-again:
  			pthread_mutex_lock(&vsocket->conn_mutex);
  			for (conn = TAILQ_FIRST(&vsocket->conn_list);
  			     conn != NULL;

lib/librte_vhost/socket.c rte_vhost_driver_unregister(const char *path) · line 986

Quoted 7 lines
lib/librte_vhost/socket.c +1 -0
@@ -981,6 +980,7 @@ rte_vhost_driver_unregister(const char *path)
  				 */
  				if (fdset_try_del(&vhost_user.fdset,
  						  conn->connfd) == -1) {
+					pthread_mutex_unlock(&vhost_user.mutex);
  					pthread_mutex_unlock(
  							&vsocket->conn_mutex);
  					goto again;

Thanks,
Maxime

author
#2 lore raw

Will do, thanks!

Quoted 70 lines · Maxime Coquelin <[email protected]> 于2019年1月10日周四 下午10:48写道:

Hi Sunwenjie,

Thanks for your patch.

Please resend with following contribution guidelines, that can be found in doc/guides/contributing/.

First, the commit message prefix should be vhost.
For other comments, please see inline:

Quoted 1 line · sunwenjie

When rte_vhost_driver_unregister delete the connection fd,

fdset_try_del will

Quoted 1 line

always try and donot release the vhostuser.mutex if the fd is busy,

but the

Quoted 1 line

fdset_event_dispatch will set the fd to busy and call

vhost_user_msg_handler

Quoted 2 lines

to get vhostuser.mutex, which will cause deadlock.

The commit message should not be indented, and wrapped at 72 chars.

Quoted 3 lines

To fix it:
Unlock the vhost_user.mutex if fdset_try_del fail and relock it when retry.

You need to add your Sined-off-by with your full name.

Quoted 9 lines
---
  lib/librte_vhost/socket.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
lib/librte_vhost/socket.c +0 -0
index 9cf34ad17..a9effa115 100644

lib/librte_vhost/socket.c rte_vhost_driver_unregister(const char *path) · line 968

Quoted 9 lines
lib/librte_vhost/socket.c +1 -1
@@ -961,13 +961,12 @@ rte_vhost_driver_unregister(const char *path)
      int count;
      struct vhost_user_connection *conn, *next;
 
+again:
      pthread_mutex_lock(&vhost_user.mutex);
 
      for (i = 0; i < vhost_user.vsocket_cnt; i++) {
              struct vhost_user_socket *vsocket = vhost_user.vsockets[i];
-

Keep this new line, it is out of the scope of the change.

lib/librte_vhost/socket.c rte_vhost_driver_unregister(const char *path) · line 983

Quoted 10 lines
lib/librte_vhost/socket.c +1 -1
              if (!strcmp(vsocket->path, path)) {
-again:
                      pthread_mutex_lock(&vsocket->conn_mutex);
                      for (conn = TAILQ_FIRST(&vsocket->conn_list);
                           conn != NULL;
@@ -981,6 +980,7 @@ rte_vhost_driver_unregister(const char *path)
                               */
                              if (fdset_try_del(&vhost_user.fdset,
                                                conn->connfd) == -1) {
+

pthread_mutex_unlock(&vhost_user.mutex);

lib/librte_vhost/socket.c rte_vhost_driver_unregister(const char *path) · line 985

Quoted 2 lines
lib/librte_vhost/socket.c +0 -0
                                      pthread_mutex_unlock(
 

&vsocket->conn_mutex);

lib/librte_vhost/socket.c rte_vhost_driver_unregister(const char *path) · line 986

Quoted 2 lines
lib/librte_vhost/socket.c +0 -0
                                      goto again;

Thanks,
Maxime