From patchwork Thu Dec 17 04:21:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihong Wang X-Patchwork-Id: 9590 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id CECA38D9B; Thu, 17 Dec 2015 12:24:17 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 8DBD58D93 for ; Thu, 17 Dec 2015 12:24:16 +0100 (CET) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP; 17 Dec 2015 03:24:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,440,1444719600"; d="scan'208";a="14831314" Received: from unknown (HELO dpdk5.sh.intel.com) ([10.239.129.244]) by fmsmga004.fm.intel.com with ESMTP; 17 Dec 2015 03:24:14 -0800 From: Zhihong Wang To: dev@dpdk.org Date: Wed, 16 Dec 2015 23:21:02 -0500 Message-Id: <1450326062-105574-1-git-send-email-zhihong.wang@intel.com> X-Mailer: git-send-email 2.5.0 Cc: s.dyasly@samsung.com, i.maximets@samsung.com Subject: [dpdk-dev] [PATCH] Unlink existing unused sockets at start up X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch unlinks existing unused sockets (which cause new bindings to fail, e.g. vHost PMD) to ensure smooth startup. In a lot of cases DPDK applications are terminated abnormally without proper resource release. Therefore, DPDK libs should be able to deal with unclean boot environment. Signed-off-by: Zhihong Wang --- lib/librte_vhost/vhost_user/vhost-net-user.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/lib/librte_vhost/vhost_user/vhost-net-user.c b/lib/librte_vhost/vhost_user/vhost-net-user.c index 8b7a448..eac0721 100644 --- a/lib/librte_vhost/vhost_user/vhost-net-user.c +++ b/lib/librte_vhost/vhost_user/vhost-net-user.c @@ -120,18 +120,38 @@ uds_socket(const char *path) sockfd = socket(AF_UNIX, SOCK_STREAM, 0); if (sockfd < 0) return -1; - RTE_LOG(INFO, VHOST_CONFIG, "socket created, fd:%d\n", sockfd); + RTE_LOG(INFO, VHOST_CONFIG, "socket created, fd: %d\n", sockfd); memset(&un, 0, sizeof(un)); un.sun_family = AF_UNIX; snprintf(un.sun_path, sizeof(un.sun_path), "%s", path); ret = bind(sockfd, (struct sockaddr *)&un, sizeof(un)); if (ret == -1) { - RTE_LOG(ERR, VHOST_CONFIG, "fail to bind fd:%d, remove file:%s and try again.\n", + RTE_LOG(ERR, VHOST_CONFIG, + "bind fd: %d to file: %s failed, checking socket...\n", sockfd, path); - goto err; + ret = connect(sockfd, (struct sockaddr *)&un, sizeof(un)); + if (ret == -1) { + RTE_LOG(INFO, VHOST_CONFIG, + "socket: %s is inactive, rebinding after unlink...\n", path); + unlink(path); + ret = bind(sockfd, (struct sockaddr *)&un, sizeof(un)); + if (ret == -1) { + RTE_LOG(ERR, VHOST_CONFIG, + "bind fd: %d to file: %s failed even after unlink\n", + sockfd, path); + goto err; + } + } else { + RTE_LOG(INFO, VHOST_CONFIG, + "socket: %s is alive, remove it and try again\n", path); + RTE_LOG(ERR, VHOST_CONFIG, + "bind fd: %d to file: %s failed\n", sockfd, path); + goto err; + } } - RTE_LOG(INFO, VHOST_CONFIG, "bind to %s\n", path); + RTE_LOG(INFO, VHOST_CONFIG, + "bind fd: %d to file: %s successful\n", sockfd, path); ret = listen(sockfd, MAX_VIRTIO_BACKLOG); if (ret == -1)