From: Anatoly Burakov <anatoly.burakov@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
thomas@monjalon.net, stable@dpdk.org
Subject: [dpdk-dev] [PATCH] eal/bsdapp: don't clean up files at startup
Date: Thu, 10 Jan 2019 11:34:08 +0000 [thread overview]
Message-ID: <ed6e20b3f60e2927de4cb098ae8e50385081a7de.1547120005.git.anatoly.burakov@intel.com> (raw)
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 <anatoly.burakov@intel.com>
---
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 <dirent.h>
-#include <fnmatch.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
@@ -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;
}
--
2.17.1
next reply other threads:[~2019-01-10 11:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 11:34 Anatoly Burakov [this message]
2019-01-14 14:22 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ed6e20b3f60e2927de4cb098ae8e50385081a7de.1547120005.git.anatoly.burakov@intel.com \
--to=anatoly.burakov@intel.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).