From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: kkanas@marvell.com, stable@dpdk.org
Subject: [dpdk-dev] [PATCH v4] test: optimise fd closing in forked test process
Date: Tue, 12 Nov 2019 21:31:02 +0100 [thread overview]
Message-ID: <1573590662-31370-1-git-send-email-david.marchand@redhat.com> (raw)
In-Reply-To: <20190902075251.2917-1-kkanas@marvell.com>
From: Krzysztof Kanas <kkanas@marvell.com>
Caught while investigating timeouts on a ARM64 server.
Stracing a test process running the eal_flags_autotest, we can see that
the fork helper is checking all possible file descriptors from
getdtablesize() to 2, and close the existing ones.
We can do better by inspecting this forked process /proc/self/fd
directory.
Besides, checking file descriptors via /proc/self/fd only makes sense for
Linux. This code was a noop on FreeBSD.
Fixes: af75078fece3 ("first public release")
Cc: stable@dpdk.org
Signed-off-by: Krzysztof Kanas <kkanas@marvell.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
Changelog since v3:
- rewrote commit log message,
- restricted the fix to Linux only,
---
app/test/process.h | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 44 insertions(+), 6 deletions(-)
diff --git a/app/test/process.h b/app/test/process.h
index 128ce41..191d279 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -11,6 +11,7 @@
#include <stdlib.h> /* NULL */
#include <string.h> /* strerror */
#include <unistd.h> /* readlink */
+#include <dirent.h>
#include <sys/wait.h>
#include <rte_string_fns.h> /* strlcpy */
@@ -40,7 +41,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
{
int num;
char *argv_cpy[numargs + 1];
- int i, fd, status;
+ int i, status;
char path[32];
#ifdef RTE_LIBRTE_PDUMP
pthread_t thread;
@@ -56,13 +57,50 @@ process_dup(const char *const argv[], int numargs, const char *env_value)
argv_cpy[i] = NULL;
num = numargs;
- /* close all open file descriptors, check /proc/self/fd to only
- * call close on open fds. Exclude fds 0, 1 and 2*/
- for (fd = getdtablesize(); fd > 2; fd-- ) {
- snprintf(path, sizeof(path), "/proc/" exe "/fd/%d", fd);
- if (access(path, F_OK) == 0)
+#ifdef RTE_EXEC_ENV_LINUX
+ {
+ const char *procdir = "/proc/" self "/fd/";
+ struct dirent *dirent;
+ char *endptr;
+ int fd, fdir;
+ DIR *dir;
+
+ /* close all open file descriptors, check /proc/self/fd
+ * to only call close on open fds. Exclude fds 0, 1 and
+ * 2
+ */
+ dir = opendir(procdir);
+ if (dir == NULL) {
+ rte_panic("Error opening %s: %s\n", procdir,
+ strerror(errno));
+ }
+
+ fdir = dirfd(dir);
+ if (fdir < 0) {
+ status = errno;
+ closedir(dir);
+ rte_panic("Error %d obtaining fd for dir %s: %s\n",
+ fdir, procdir,
+ strerror(status));
+ }
+
+ while ((dirent = readdir(dir)) != NULL) {
+ errno = 0;
+ fd = strtol(dirent->d_name, &endptr, 10);
+ if (errno != 0 || endptr[0] != '\0') {
+ printf("Error converting name fd %d %s:\n",
+ fd, dirent->d_name);
+ continue;
+ }
+
+ if (fd == fdir || fd <= 2)
+ continue;
+
close(fd);
+ }
+ closedir(dir);
}
+#endif
printf("Running binary with argv[]:");
for (i = 0; i < num; i++)
printf("'%s' ", argv_cpy[i]);
--
1.8.3.1
next prev parent reply other threads:[~2019-11-12 20:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-02 7:52 [dpdk-dev] [PATCH] test: fix process dup fd close kkanas
2019-09-02 9:49 ` [dpdk-dev] [PATCH v2] " kkanas
2019-09-23 11:32 ` Krzysztof Kanas
2019-10-30 9:06 ` David Marchand
2019-11-04 7:52 ` [dpdk-dev] [EXT] " Krzysztof Kanas
2019-11-06 14:36 ` David Marchand
2019-11-06 14:58 ` [dpdk-dev] " David Marchand
2019-11-08 10:21 ` [dpdk-dev] [PATCH v3 0/3] test: fix timeout in flags autotest kkanas
2019-11-08 10:21 ` [dpdk-dev] [PATCH v3 1/3] " kkanas
2019-11-08 10:21 ` [dpdk-dev] [PATCH v3 2/3] test: move close files to separate function kkanas
2019-11-08 10:21 ` [dpdk-dev] [PATCH v3 3/3] test: fix FreeBSD file closing function kkanas
2019-11-08 11:05 ` [dpdk-dev] [PATCH v3 0/3] test: fix timeout in flags autotest David Marchand
2019-11-08 11:11 ` David Marchand
2019-11-08 13:45 ` David Marchand
2019-11-12 8:26 ` [dpdk-dev] [EXT] " Krzysztof Kanas
2019-11-12 20:34 ` David Marchand
2019-11-13 13:35 ` Krzysztof Kanas
2019-11-12 20:31 ` David Marchand [this message]
2019-11-14 19:31 ` [dpdk-dev] [PATCH v4] test: optimise fd closing in forked test process Kevin Traynor
2019-11-15 8:11 ` David Marchand
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=1573590662-31370-1-git-send-email-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=kkanas@marvell.com \
--cc=stable@dpdk.org \
/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).