* [PATCH] nfs-utils 2 of 10 - Incorporate some clean up code from Ulrich Drepper
@ 2005-09-23 14:44 Steve Dickson
2005-09-23 15:52 ` Trond Myklebust
0 siblings, 1 reply; 4+ messages in thread
From: Steve Dickson @ 2005-09-23 14:44 UTC (permalink / raw)
To: nfs
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: nfs-utils-1.0.6-fd-sig-cleanup.patch --]
[-- Type: text/x-patch, Size: 7132 bytes --]
Incorporate some clean up code from Ulrich Drepper (bz# 134025)
As stated in https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=134025
Various daemons in nfs-utils close all file descriptors before
starting work. This happens in a very inefficient way. All iterate
over all possible descriptor values and make a close(2) call. Image
what happens if the file descriptor limit is high?
There is no reason for this, programs can learn exactly which
descriptors are used from the /proc/self/fd directory.
Signed-off-by: Steve Dickson <steved@redhat.com>
---------
--- nfs-utils-1.0.6/utils/mountd/mountd.c.orig 2004-11-01 16:39:37.823132000 -0500
+++ nfs-utils-1.0.6/utils/mountd/mountd.c 2004-11-01 16:41:23.098656000 -0500
@@ -18,6 +18,7 @@
#include <getopt.h>
#include <errno.h>
#include <fcntl.h>
+#include <dirent.h>
#include <sys/resource.h>
#include "xmalloc.h"
#include "misc.h"
@@ -553,9 +554,23 @@
/* Daemons should close all extra filehandles ... *before* RPC init. */
if (!foreground) {
- int fd = sysconf (_SC_OPEN_MAX);
- while (--fd > 2)
- (void) close(fd);
+ DIR *dir = opendir("/proc/self/fd");
+ if (dir != NULL) {
+ int dfd = dirfd(dir);
+ struct dirent *d;
+
+ while ((d = readdir(dir)) != NULL) {
+ char *endp;
+ long n = strtol(d->d_name, &endp, 10);
+ if (*endp == '\0' && n > 2 && n != dfd)
+ (void) close(n);
+ }
+ closedir(dir);
+ } else {
+ int fd = sysconf (_SC_OPEN_MAX);
+ while (--fd > 2)
+ (void) close(fd);
+ }
}
new_cache = check_new_cache();
--- nfs-utils-1.0.6/utils/nfsd/nfsd.c.orig 2002-09-12 17:08:42.000000000 -0400
+++ nfs-utils-1.0.6/utils/nfsd/nfsd.c 2004-11-01 16:41:23.111659000 -0500
@@ -18,6 +18,7 @@
#include <getopt.h>
#include <syslog.h>
#include <netdb.h>
+#include <dirent.h>
#include "nfslib.h"
static void usage(const char *);
@@ -27,6 +28,7 @@
{
int count = 1, c, error, port, fd;
struct servent *ent;
+ DIR *dir;
ent = getservbyname ("nfs", "udp");
if (ent != NULL)
@@ -80,9 +82,22 @@
(void) dup2(fd, 1);
(void) dup2(fd, 2);
}
- fd = sysconf(_SC_OPEN_MAX);
- while (--fd > 2)
- (void) close(fd);
+ dir = opendir("/proc/self/fd");
+ if (dir != NULL) {
+ int dfd = dirfd(dir);
+ struct dirent *d;
+ while ((d = readdir(dir)) != NULL) {
+ char *endp;
+ long int n = strtol(d->d_name, &endp, 10);
+ if (*endp == '\0' && n > 2 && n != dfd)
+ (void) close(n);
+ }
+ closedir(dir);
+ } else {
+ fd = sysconf(_SC_OPEN_MAX);
+ while (--fd > 2)
+ (void) close(fd);
+ }
if ((error = nfssvc(port, count)) < 0) {
int e = errno;
--- nfs-utils-1.0.6/utils/statd/statd.c.orig 2004-11-01 16:39:37.860131000 -0500
+++ nfs-utils-1.0.6/utils/statd/statd.c 2004-11-01 16:45:33.853911000 -0500
@@ -15,6 +15,7 @@
#include <errno.h>
#include <string.h>
#include <getopt.h>
+#include <dirent.h>
#include <rpc/rpc.h>
#include <rpc/pmap_clnt.h>
#include <rpcmisc.h>
@@ -227,6 +228,7 @@
int arg;
int port = 0, out_port = 0;
struct rlimit rlim;
+ struct sigaction sa;
int pipefds[2] = { -1, -1};
char status;
@@ -368,6 +370,7 @@
if (!(run_mode & MODE_NODAEMON)) {
int filedes, fdmax, tempfd;
+ DIR *dir;
if (pipe(pipefds)<0) {
perror("statd: unable to create pipe");
@@ -401,13 +404,27 @@
}
}
tempfd = open("/dev/null", O_RDWR);
- close(0); dup2(tempfd, 0);
- close(1); dup2(tempfd, 1);
- close(2); dup2(tempfd, 2);
- fdmax = sysconf (_SC_OPEN_MAX);
- for (filedes = 3; filedes < fdmax; filedes++)
- if (filedes != pipefds[1])
- close (filedes);
+ dup2(tempfd, 0);
+ dup2(tempfd, 1);
+ dup2(tempfd, 2);
+ dir = opendir("/proc/self/fd");
+ if (dir != NULL) {
+ int dfd = dirfd(dir);
+ struct dirent *d;
+ while ((d = readdir(dir)) != NULL) {
+ char *endp;
+ long int n = strtol(d->d_name, &endp, 10);
+ if (*endp == '\0' && n > 2 && n != dfd &&
+ n != pipefds[1])
+ (void) close(n);
+ }
+ closedir(dir);
+ } else {
+ fdmax = sysconf (_SC_OPEN_MAX);
+ for (filedes = 3; filedes < fdmax; filedes++)
+ if (filedes != pipefds[1])
+ close (filedes);
+ }
}
@@ -417,9 +434,16 @@
log_modes();
- signal (SIGHUP, killer);
- signal (SIGINT, killer);
- signal (SIGTERM, killer);
+ sa.sa_handler = killer;
+ sigemptyset(&sa.sa_mask);
+ sigaddset(&sa.sa_mask, SIGINT);
+ sigaddset(&sa.sa_mask, SIGTERM);
+ sigaddset(&sa.sa_mask, SIGHUP);
+ sa.sa_flags = 0;
+ (void) sigaction(SIGINT, &sa, NULL);
+ (void) sigaction(SIGTERM, &sa, NULL);
+ (void) sigaction(SIGHUP, &sa, NULL);
+
/* PRC: trap SIGUSR1 to re-read notify list from disk */
signal(SIGUSR1, sigusr);
/* WARNING: the following works on Linux and SysV, but not BSD! */
--- nfs-utils-1.0.6/utils/idmapd/idmapd.c.orig 2004-11-01 16:39:37.630133000 -0500
+++ nfs-utils-1.0.6/utils/idmapd/idmapd.c 2004-11-01 16:47:53.804606000 -0500
@@ -58,6 +58,7 @@
#include <grp.h>
#include <limits.h>
#include <ctype.h>
+#include <dirent.h>
#include <nfsidmap.h>
#ifdef HAVE_CONFIG_H
@@ -859,14 +860,28 @@
}
if (noclose == 0) {
+ DIR *dir;
tempfd = open("/dev/null", O_RDWR);
- close(0); dup2(tempfd, 0);
- close(1); dup2(tempfd, 1);
- close(2); dup2(tempfd, 2);
- fdmax = sysconf (_SC_OPEN_MAX);
- for (filedes = 3; filedes < fdmax; filedes++)
- if (filedes != pipefds[1])
- close (filedes);
+ dup2(tempfd, 0);
+ dup2(tempfd, 1);
+ dup2(tempfd, 2);
+ dir = opendir("/proc/self/fd");
+ if (dir != NULL) {
+ int dfd = dirfd(dir);
+ struct dirent *d;
+ while ((d = readdir(dir)) != NULL) {
+ char *endp;
+ long int n = strtol(d->d_name, &endp, 10);
+ if (*endp == '\0' && n > 2 && n != dfd &&
+ n != pipefds[1])
+ (void) close(n);
+ }
+ } else {
+ fdmax = sysconf (_SC_OPEN_MAX);
+ for (filedes = 3; filedes < fdmax; filedes++)
+ if (filedes != pipefds[1])
+ close (filedes);
+ }
}
return;
--- nfs-utils-1.0.6/utils/svcgssd/svcgssd.c.orig 2004-11-01 16:39:37.520131000 -0500
+++ nfs-utils-1.0.6/utils/svcgssd/svcgssd.c 2004-11-01 16:49:34.897112000 -0500
@@ -52,6 +52,7 @@
#include <stdlib.h>
#include <string.h>
#include <signal.h>
+#include <dirent.h>
#include "svcgssd.h"
#include "gss_util.h"
#include "err_util.h"
@@ -110,14 +111,29 @@
}
if (noclose == 0) {
+ DIR *dir;
tempfd = open("/dev/null", O_RDWR);
- close(0); dup2(tempfd, 0);
- close(1); dup2(tempfd, 1);
- close(2); dup2(tempfd, 2);
- fdmax = sysconf (_SC_OPEN_MAX);
- for (filedes = 3; filedes < fdmax; filedes++)
- if (filedes != pipefds[1])
- close (filedes);
+ dup2(tempfd, 0);
+ dup2(tempfd, 1);
+ dup2(tempfd, 2);
+ dir = opendir("/proc/self/fd");
+ if (dir != NULL) {
+ int dfd = dirfd(dir);
+ struct dirent *d;
+ while ((d = readdir(dir)) != NULL) {
+ char *endp;
+ long int n = strtol(d->d_name, &endp, 10);
+ if (*endp == '\0' && n > 2 && n != dfd &&
+ n != pipefds[1])
+ (void) close(n);
+ }
+ closedir(dir);
+ } else {
+ fdmax = sysconf (_SC_OPEN_MAX);
+ for (filedes = 3; filedes < fdmax; filedes++)
+ if (filedes != pipefds[1])
+ close (filedes);
+ }
}
return;
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] nfs-utils 2 of 10 - Incorporate some clean up code from Ulrich Drepper
2005-09-23 14:44 [PATCH] nfs-utils 2 of 10 - Incorporate some clean up code from Ulrich Drepper Steve Dickson
@ 2005-09-23 15:52 ` Trond Myklebust
2005-09-23 16:56 ` Steve Dickson
0 siblings, 1 reply; 4+ messages in thread
From: Trond Myklebust @ 2005-09-23 15:52 UTC (permalink / raw)
To: Steve Dickson; +Cc: nfs
Hmm... There seems to be a lot of duplicated code snippets here. Things
like
DIR *dir = opendir("/proc/self/fd");
if (dir != NULL) {
int dfd = dirfd(dir);
struct dirent *d;
while ((d = readdir(dir)) != NULL) {
char *endp;
long n = strtol(d->d_name, &endp, 10);
if (*endp == '\0' && n > 2 && n != dfd)
(void) close(n);
}
closedir(dir);
} else {
int fd = sysconf (_SC_OPEN_MAX);
while (--fd > 2)
(void) close(fd);
}
Why not clean that up further by putting it into a simple library
function that takes an argument consisting of the pipes you do not want
it to close?
Cheers,
Trond
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] nfs-utils 2 of 10 - Incorporate some clean up code from Ulrich Drepper
2005-09-23 15:52 ` Trond Myklebust
@ 2005-09-23 16:56 ` Steve Dickson
2005-09-23 18:23 ` Trond Myklebust
0 siblings, 1 reply; 4+ messages in thread
From: Steve Dickson @ 2005-09-23 16:56 UTC (permalink / raw)
To: Trond Myklebust; +Cc: nfs
Trond Myklebust wrote:
> Why not clean that up further by putting it into a simple library
> function that takes an argument consisting of the pipes you do not want
> it to close?
Good point... its just one things that appeared one day (Uli when
nuts and changed a bunch of system daemons) and since everything
seem to still work I never gave it a second thought...
Where would be the best place for this this new routine?
If we put the routine in libnfs.a, then both the
idmapd and svcgssd daemons would have to start
linking it which may or may not cause a problem..
Or maybe a new local library??
steved.
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] nfs-utils 2 of 10 - Incorporate some clean up code from Ulrich Drepper
2005-09-23 16:56 ` Steve Dickson
@ 2005-09-23 18:23 ` Trond Myklebust
0 siblings, 0 replies; 4+ messages in thread
From: Trond Myklebust @ 2005-09-23 18:23 UTC (permalink / raw)
To: Steve Dickson; +Cc: nfs
fr den 23.09.2005 Klokka 12:56 (-0400) skreiv Steve Dickson:
> Where would be the best place for this this new routine?
> If we put the routine in libnfs.a, then both the
> idmapd and svcgssd daemons would have to start
> linking it which may or may not cause a problem..
> Or maybe a new local library??
How about in libmisc?
Cheers,
Trond
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-09-23 18:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-09-23 14:44 [PATCH] nfs-utils 2 of 10 - Incorporate some clean up code from Ulrich Drepper Steve Dickson
2005-09-23 15:52 ` Trond Myklebust
2005-09-23 16:56 ` Steve Dickson
2005-09-23 18:23 ` Trond Myklebust
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.