From patchwork Thu Jan 10 05:02:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5a2Z5paH5p2w?= X-Patchwork-Id: 49762 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8A5B81B555; Sat, 12 Jan 2019 23:18:34 +0100 (CET) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id A72111B57B for ; Thu, 10 Jan 2019 06:02:26 +0100 (CET) Received: by mail-pg1-f193.google.com with SMTP id m1so4321136pgq.8 for ; Wed, 09 Jan 2019 21:02:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MofC+7J4ke+aWtW2Raoom8QL3U3gU7uiL1eVvq7KZ2E=; b=knlidF2uC1thtBlRg6abKMcqGx52QFGYw+P3k0EU9GYwoaktuhngPbNdi1NbHqkzfx gHEhXwMbXvC/vKFOQeZRyfcdOlNjf7sjZ+oGOdMAX2DiJBJdIK8ywUcPCxbkyDZctSgH 9wmBAZC00ZLvqCSDaePXuXXbaAQmg9AImiiLVJT/V1WqVbrysT0HoV54ZGiJ01udX8v7 BrD2sR9yHCcW9/tc4/uUH44CuBJVTyZ/UsP6+Ol7ElCSZtbQ8JLGkVw4CDXKwYHsXIuS QKV09T3u7stnYtO3kyo2NPBQGjh1ol+4SmGaqQhwuFlGR80hhkrglEe78EzTaWnD8HUg 30tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MofC+7J4ke+aWtW2Raoom8QL3U3gU7uiL1eVvq7KZ2E=; b=iFCRvHvZG+UvvBq4QSJuSWzBBYGpV7fZxJeZtblbJf5vCEsfALyGajkQUM3TqukbPp nCMWAKijfJE0WBrBsL68l13+VuDRN6XWEbdexL7eZjMmJn/lzfK3pFzfzzrEhheIrV4Q 5NK2mwV2zRHpV7T6DjnVjfx05wkHh7cF+qzzw1k5+Cw1fHYDrVU5NrCKsnYxBh41USQl X1cGs0WA67Z3GV9r7uKtZcJZnjQO8FvAjTfsX8uOfGQ9iAnKlcnyH9WZY1wDI/PTcjbW Oev9yJOjyc7qvjwneF4k4Sd63VQ3O1RAezoOPzXSAC+sBjfUmeFWH7BrkDQbYE5D8Swt Yd5w== X-Gm-Message-State: AJcUukfPQg7TVIg9st7vv7vHf6GQq/mARiawiExx4J5WX38/dIGZxYWj S2oYQ03ySOpjvWpRDg9YgRkNAfPP X-Google-Smtp-Source: ALg8bN5JniD30AniFMR2bjNhn2BZjtE1UKjMhElcwHFMGQjXi38ykQYoeWSZzvAzZikmJ9JmqNV4eA== X-Received: by 2002:a63:b649:: with SMTP id v9mr8091973pgt.436.1547096545536; Wed, 09 Jan 2019 21:02:25 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id m67sm140130168pfb.25.2019.01.09.21.02.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Jan 2019 21:02:24 -0800 (PST) From: sunwenjie To: dev@dpdk.org Cc: sunwenjie , sunwenjie Date: Thu, 10 Jan 2019 13:02:18 +0800 Message-Id: <20190110050218.3081-1-findtheonlyway@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Approved-At: Sat, 12 Jan 2019 23:18:31 +0100 Subject: [dpdk-dev] [PATCH] vhostuser: fix deadlock when vhost unregister X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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. Unlock the vhost_user.mutex if fdset_try_del fail and relock it when retry. Signed-off-by: findtheonlway Signed-off-by: sunwenjie --- lib/librte_vhost/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 9cf34ad17..a9effa115 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -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;