2005-11-07 16:58:51 +08:00
|
|
|
/*
|
2008-02-05 14:31:10 +08:00
|
|
|
* Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
2005-04-17 06:20:36 +08:00
|
|
|
* Licensed under the GPL
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <sched.h>
|
2008-06-06 13:46:14 +08:00
|
|
|
#include <linux/limits.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2007-10-16 16:27:11 +08:00
|
|
|
#include <sys/socket.h>
|
2008-02-05 14:31:10 +08:00
|
|
|
#include <sys/wait.h>
|
|
|
|
#include "kern_constants.h"
|
2005-04-17 06:20:36 +08:00
|
|
|
#include "kern_util.h"
|
|
|
|
#include "os.h"
|
2006-11-26 03:09:39 +08:00
|
|
|
#include "um_malloc.h"
|
2008-02-05 14:31:10 +08:00
|
|
|
#include "user.h"
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
struct helper_data {
|
|
|
|
void (*pre_exec)(void*);
|
|
|
|
void *pre_data;
|
|
|
|
char **argv;
|
|
|
|
int fd;
|
2006-11-26 03:09:39 +08:00
|
|
|
char *buf;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static int helper_child(void *arg)
|
|
|
|
{
|
|
|
|
struct helper_data *data = arg;
|
|
|
|
char **argv = data->argv;
|
2008-02-05 14:31:10 +08:00
|
|
|
int err;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-10-20 14:28:21 +08:00
|
|
|
if (data->pre_exec != NULL)
|
2005-04-17 06:20:36 +08:00
|
|
|
(*data->pre_exec)(data->pre_data);
|
2008-02-05 14:31:10 +08:00
|
|
|
err = execvp_noalloc(data->buf, argv[0], argv);
|
|
|
|
|
|
|
|
/* If the exec succeeds, we don't get here */
|
|
|
|
write(data->fd, &err, sizeof(err));
|
|
|
|
|
2006-10-20 14:28:21 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-02-05 14:31:10 +08:00
|
|
|
/* Returns either the pid of the child process we run or -E* on failure. */
|
2007-07-16 14:38:56 +08:00
|
|
|
int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct helper_data data;
|
|
|
|
unsigned long stack, sp;
|
|
|
|
int pid, fds[2], ret, n;
|
|
|
|
|
2007-07-16 14:38:56 +08:00
|
|
|
stack = alloc_stack(0, __cant_sleep());
|
2006-10-20 14:28:21 +08:00
|
|
|
if (stack == 0)
|
2006-09-26 14:33:02 +08:00
|
|
|
return -ENOMEM;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-10-16 16:27:11 +08:00
|
|
|
ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
|
2006-10-20 14:28:21 +08:00
|
|
|
if (ret < 0) {
|
2007-10-16 16:27:11 +08:00
|
|
|
ret = -errno;
|
2008-02-05 14:31:10 +08:00
|
|
|
printk(UM_KERN_ERR "run_helper : pipe failed, errno = %d\n",
|
|
|
|
errno);
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
|
2007-10-16 16:27:11 +08:00
|
|
|
ret = os_set_exec_close(fds[1]);
|
2006-10-20 14:28:21 +08:00
|
|
|
if (ret < 0) {
|
2008-02-05 14:31:10 +08:00
|
|
|
printk(UM_KERN_ERR "run_helper : setting FD_CLOEXEC failed, "
|
|
|
|
"ret = %d\n", -ret);
|
2005-04-17 06:20:36 +08:00
|
|
|
goto out_close;
|
|
|
|
}
|
|
|
|
|
2007-05-07 05:51:22 +08:00
|
|
|
sp = stack + UM_KERN_PAGE_SIZE - sizeof(void *);
|
2005-04-17 06:20:36 +08:00
|
|
|
data.pre_exec = pre_exec;
|
|
|
|
data.pre_data = pre_data;
|
|
|
|
data.argv = argv;
|
|
|
|
data.fd = fds[1];
|
2008-05-13 05:01:52 +08:00
|
|
|
data.buf = __cant_sleep() ? uml_kmalloc(PATH_MAX, UM_GFP_ATOMIC) :
|
|
|
|
uml_kmalloc(PATH_MAX, UM_GFP_KERNEL);
|
2007-12-18 08:19:46 +08:00
|
|
|
pid = clone(helper_child, (void *) sp, CLONE_VM, &data);
|
2006-10-20 14:28:21 +08:00
|
|
|
if (pid < 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
ret = -errno;
|
2008-02-05 14:31:10 +08:00
|
|
|
printk(UM_KERN_ERR "run_helper : clone failed, errno = %d\n",
|
|
|
|
errno);
|
2006-11-26 03:09:39 +08:00
|
|
|
goto out_free2;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2005-11-07 16:58:51 +08:00
|
|
|
close(fds[1]);
|
2005-04-17 06:20:36 +08:00
|
|
|
fds[1] = -1;
|
|
|
|
|
2007-05-07 05:51:33 +08:00
|
|
|
/*
|
|
|
|
* Read the errno value from the child, if the exec failed, or get 0 if
|
|
|
|
* the exec succeeded because the pipe fd was set as close-on-exec.
|
|
|
|
*/
|
2007-05-07 05:51:35 +08:00
|
|
|
n = read(fds[0], &ret, sizeof(ret));
|
2006-10-20 14:28:21 +08:00
|
|
|
if (n == 0) {
|
2005-04-17 06:20:36 +08:00
|
|
|
ret = pid;
|
2006-10-20 14:28:21 +08:00
|
|
|
} else {
|
|
|
|
if (n < 0) {
|
2007-05-07 05:51:35 +08:00
|
|
|
n = -errno;
|
2008-02-05 14:31:10 +08:00
|
|
|
printk(UM_KERN_ERR "run_helper : read on pipe failed, "
|
|
|
|
"ret = %d\n", -n);
|
2006-09-26 14:33:02 +08:00
|
|
|
ret = n;
|
|
|
|
}
|
2007-12-18 08:19:46 +08:00
|
|
|
CATCH_EINTR(waitpid(pid, NULL, __WCLONE));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2006-11-26 03:09:39 +08:00
|
|
|
out_free2:
|
|
|
|
kfree(data.buf);
|
2005-04-17 06:20:36 +08:00
|
|
|
out_close:
|
|
|
|
if (fds[1] != -1)
|
2005-11-07 16:58:51 +08:00
|
|
|
close(fds[1]);
|
|
|
|
close(fds[0]);
|
2005-04-17 06:20:36 +08:00
|
|
|
out_free:
|
2007-07-16 14:38:56 +08:00
|
|
|
free_stack(stack, 0);
|
2006-10-20 14:28:21 +08:00
|
|
|
return ret;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2005-11-07 16:58:51 +08:00
|
|
|
int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
|
2007-07-16 14:38:56 +08:00
|
|
|
unsigned long *stack_out)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
unsigned long stack, sp;
|
[PATCH] uml: preserve errno in error paths
The poster child for this patch is the third tuntap_user hunk. When an ioctl
fails, it properly closes the opened file descriptor and returns. However,
the close resets errno to 0, and the 'return errno' that follows returns 0
rather than the value that ioctl set. This caused the caller to believe that
the device open succeeded and had opened file descriptor 0, which caused no
end of interesting behavior.
The rest of this patch is a pass through the UML sources looking for places
where errno could be reset before being passed back out. A common culprit is
printk, which could call write, being called before errno is returned.
In some cases, where the code ends up being much smaller, I just deleted the
printk.
There was another case where a caller of run_helper looked at errno after a
failure, rather than the return value of run_helper, which was the errno value
that it wanted.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-17 10:27:49 +08:00
|
|
|
int pid, status, err;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-16 14:38:56 +08:00
|
|
|
stack = alloc_stack(0, __cant_sleep());
|
2006-10-20 14:28:21 +08:00
|
|
|
if (stack == 0)
|
|
|
|
return -ENOMEM;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-07-16 14:38:56 +08:00
|
|
|
sp = stack + UM_KERN_PAGE_SIZE - sizeof(void *);
|
2007-12-18 08:19:46 +08:00
|
|
|
pid = clone(proc, (void *) sp, flags, arg);
|
2006-10-20 14:28:21 +08:00
|
|
|
if (pid < 0) {
|
[PATCH] uml: preserve errno in error paths
The poster child for this patch is the third tuntap_user hunk. When an ioctl
fails, it properly closes the opened file descriptor and returns. However,
the close resets errno to 0, and the 'return errno' that follows returns 0
rather than the value that ioctl set. This caused the caller to believe that
the device open succeeded and had opened file descriptor 0, which caused no
end of interesting behavior.
The rest of this patch is a pass through the UML sources looking for places
where errno could be reset before being passed back out. A common culprit is
printk, which could call write, being called before errno is returned.
In some cases, where the code ends up being much smaller, I just deleted the
printk.
There was another case where a caller of run_helper looked at errno after a
failure, rather than the return value of run_helper, which was the errno value
that it wanted.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-17 10:27:49 +08:00
|
|
|
err = -errno;
|
2008-02-05 14:31:10 +08:00
|
|
|
printk(UM_KERN_ERR "run_helper_thread : clone failed, "
|
|
|
|
"errno = %d\n", errno);
|
[PATCH] uml: preserve errno in error paths
The poster child for this patch is the third tuntap_user hunk. When an ioctl
fails, it properly closes the opened file descriptor and returns. However,
the close resets errno to 0, and the 'return errno' that follows returns 0
rather than the value that ioctl set. This caused the caller to believe that
the device open succeeded and had opened file descriptor 0, which caused no
end of interesting behavior.
The rest of this patch is a pass through the UML sources looking for places
where errno could be reset before being passed back out. A common culprit is
printk, which could call write, being called before errno is returned.
In some cases, where the code ends up being much smaller, I just deleted the
printk.
There was another case where a caller of run_helper looked at errno after a
failure, rather than the return value of run_helper, which was the errno value
that it wanted.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-17 10:27:49 +08:00
|
|
|
return err;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-10-20 14:28:21 +08:00
|
|
|
if (stack_out == NULL) {
|
2007-12-18 08:19:46 +08:00
|
|
|
CATCH_EINTR(pid = waitpid(pid, &status, __WCLONE));
|
2006-10-20 14:28:21 +08:00
|
|
|
if (pid < 0) {
|
[PATCH] uml: preserve errno in error paths
The poster child for this patch is the third tuntap_user hunk. When an ioctl
fails, it properly closes the opened file descriptor and returns. However,
the close resets errno to 0, and the 'return errno' that follows returns 0
rather than the value that ioctl set. This caused the caller to believe that
the device open succeeded and had opened file descriptor 0, which caused no
end of interesting behavior.
The rest of this patch is a pass through the UML sources looking for places
where errno could be reset before being passed back out. A common culprit is
printk, which could call write, being called before errno is returned.
In some cases, where the code ends up being much smaller, I just deleted the
printk.
There was another case where a caller of run_helper looked at errno after a
failure, rather than the return value of run_helper, which was the errno value
that it wanted.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-17 10:27:49 +08:00
|
|
|
err = -errno;
|
2008-02-05 14:31:10 +08:00
|
|
|
printk(UM_KERN_ERR "run_helper_thread - wait failed, "
|
|
|
|
"errno = %d\n", errno);
|
[PATCH] uml: preserve errno in error paths
The poster child for this patch is the third tuntap_user hunk. When an ioctl
fails, it properly closes the opened file descriptor and returns. However,
the close resets errno to 0, and the 'return errno' that follows returns 0
rather than the value that ioctl set. This caused the caller to believe that
the device open succeeded and had opened file descriptor 0, which caused no
end of interesting behavior.
The rest of this patch is a pass through the UML sources looking for places
where errno could be reset before being passed back out. A common culprit is
printk, which could call write, being called before errno is returned.
In some cases, where the code ends up being much smaller, I just deleted the
printk.
There was another case where a caller of run_helper looked at errno after a
failure, rather than the return value of run_helper, which was the errno value
that it wanted.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-09-17 10:27:49 +08:00
|
|
|
pid = err;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2006-10-20 14:28:21 +08:00
|
|
|
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
|
2008-02-05 14:31:10 +08:00
|
|
|
printk(UM_KERN_ERR "run_helper_thread - thread "
|
|
|
|
"returned status 0x%x\n", status);
|
2007-07-16 14:38:56 +08:00
|
|
|
free_stack(stack, 0);
|
2006-10-20 14:28:21 +08:00
|
|
|
} else
|
|
|
|
*stack_out = stack;
|
|
|
|
return pid;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2008-02-05 14:31:10 +08:00
|
|
|
int helper_wait(int pid)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2007-12-18 08:19:46 +08:00
|
|
|
int ret, status;
|
|
|
|
int wflags = __WCLONE;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-12-18 08:19:46 +08:00
|
|
|
CATCH_EINTR(ret = waitpid(pid, &status, wflags));
|
2006-10-20 14:28:21 +08:00
|
|
|
if (ret < 0) {
|
2008-02-05 14:31:10 +08:00
|
|
|
printk(UM_KERN_ERR "helper_wait : waitpid process %d failed, "
|
|
|
|
"errno = %d\n", pid, errno);
|
2007-12-18 08:19:46 +08:00
|
|
|
return -errno;
|
|
|
|
} else if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
|
2008-02-05 14:31:10 +08:00
|
|
|
printk(UM_KERN_ERR "helper_wait : process %d exited with "
|
|
|
|
"status 0x%x\n", pid, status);
|
2007-12-18 08:19:46 +08:00
|
|
|
return -ECHILD;
|
|
|
|
} else
|
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|