From patchwork Thu Jan 10 11:34:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Burakov, Anatoly" X-Patchwork-Id: 49577 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D61B31B610; Thu, 10 Jan 2019 12:34:16 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 6A2251B5A8; Thu, 10 Jan 2019 12:34:15 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jan 2019 03:34:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,461,1539673200"; d="scan'208";a="117034533" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 10 Jan 2019 03:34:13 -0800 Received: from sivswdev05.ir.intel.com (sivswdev05.ir.intel.com [10.243.17.64]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id x0ABYCUQ010521; Thu, 10 Jan 2019 11:34:12 GMT Received: from sivswdev05.ir.intel.com (localhost [127.0.0.1]) by sivswdev05.ir.intel.com with ESMTP id x0ABYC4H026066; Thu, 10 Jan 2019 11:34:12 GMT Received: (from aburakov@localhost) by sivswdev05.ir.intel.com with LOCAL id x0ABY83P026054; Thu, 10 Jan 2019 11:34:08 GMT From: Anatoly Burakov To: dev@dpdk.org Cc: Bruce Richardson , thomas@monjalon.net, stable@dpdk.org Date: Thu, 10 Jan 2019 11:34:08 +0000 Message-Id: X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH] eal/bsdapp: don't clean up files at startup 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" On FreeBSD, closing the file descriptor drops the lock even if the file descriptor was mmap'ed. This leads to the cleanup at the end of EAL init to remove fbarray files that are still in use by the process itself. However, instead of working around this issue, we can take advantage of the fact that FreeBSD doesn't really create any per-process files in the first place, so no cleanup is actually needed. Fixes: 0a529578f162 ("eal: clean up unused files on initialization") Cc: stable@dpdk.org Signed-off-by: Anatoly Burakov --- lib/librte_eal/bsdapp/eal/eal.c | 84 ++------------------------------- 1 file changed, 3 insertions(+), 81 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index c8e0da097..a6e573933 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -3,8 +3,6 @@ * Copyright(c) 2014 6WIND S.A. */ -#include -#include #include #include #include @@ -146,86 +144,10 @@ eal_create_runtime_dir(void) int eal_clean_runtime_dir(void) { - DIR *dir; - struct dirent *dirent; - int dir_fd, fd, lck_result; - static const char * const filters[] = { - "fbarray_*", - "mp_socket_*" - }; - - /* open directory */ - dir = opendir(runtime_dir); - if (!dir) { - RTE_LOG(ERR, EAL, "Unable to open runtime directory %s\n", - runtime_dir); - goto error; - } - dir_fd = dirfd(dir); - - /* lock the directory before doing anything, to avoid races */ - if (flock(dir_fd, LOCK_EX) < 0) { - RTE_LOG(ERR, EAL, "Unable to lock runtime directory %s\n", - runtime_dir); - goto error; - } - - dirent = readdir(dir); - if (!dirent) { - RTE_LOG(ERR, EAL, "Unable to read runtime directory %s\n", - runtime_dir); - goto error; - } - - while (dirent != NULL) { - unsigned int f_idx; - bool skip = true; - - /* skip files that don't match the patterns */ - for (f_idx = 0; f_idx < RTE_DIM(filters); f_idx++) { - const char *filter = filters[f_idx]; - - if (fnmatch(filter, dirent->d_name, 0) == 0) { - skip = false; - break; - } - } - if (skip) { - dirent = readdir(dir); - continue; - } - - /* try and lock the file */ - fd = openat(dir_fd, dirent->d_name, O_RDONLY); - - /* skip to next file */ - if (fd == -1) { - dirent = readdir(dir); - continue; - } - - /* non-blocking lock */ - lck_result = flock(fd, LOCK_EX | LOCK_NB); - - /* if lock succeeds, remove the file */ - if (lck_result != -1) - unlinkat(dir_fd, dirent->d_name, 0); - close(fd); - dirent = readdir(dir); - } - - /* closedir closes dir_fd and drops the lock */ - closedir(dir); + /* FreeBSD doesn't need this implemented for now, because, unlike Linux, + * FreeBSD doesn't create per-process files, so no need to clean up. + */ return 0; - -error: - if (dir) - closedir(dir); - - RTE_LOG(ERR, EAL, "Error while clearing runtime dir: %s\n", - strerror(errno)); - - return -1; }