mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-20 14:16:02 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
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>
343 lines
8.6 KiB
C
343 lines
8.6 KiB
C
/*
|
|
* Conversion between 32-bit and 64-bit native system calls.
|
|
*
|
|
* Copyright (C) 2000 Silicon Graphics, Inc.
|
|
* Written by Ulf Carlsson (ulfc@engr.sgi.com)
|
|
* sys32_execve from ia64/ia32 code, Feb 2000, Kanoj Sarcar (kanoj@sgi.com)
|
|
*/
|
|
#include <linux/compiler.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/file.h>
|
|
#include <linux/highuid.h>
|
|
#include <linux/resource.h>
|
|
#include <linux/highmem.h>
|
|
#include <linux/time.h>
|
|
#include <linux/times.h>
|
|
#include <linux/poll.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/filter.h>
|
|
#include <linux/shm.h>
|
|
#include <linux/sem.h>
|
|
#include <linux/msg.h>
|
|
#include <linux/icmpv6.h>
|
|
#include <linux/syscalls.h>
|
|
#include <linux/sysctl.h>
|
|
#include <linux/utime.h>
|
|
#include <linux/utsname.h>
|
|
#include <linux/personality.h>
|
|
#include <linux/dnotify.h>
|
|
#include <linux/module.h>
|
|
#include <linux/binfmts.h>
|
|
#include <linux/security.h>
|
|
#include <linux/compat.h>
|
|
#include <linux/vfs.h>
|
|
#include <linux/ipc.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <net/sock.h>
|
|
#include <net/scm.h>
|
|
|
|
#include <asm/compat-signal.h>
|
|
#include <asm/sim.h>
|
|
#include <asm/uaccess.h>
|
|
#include <asm/mmu_context.h>
|
|
#include <asm/mman.h>
|
|
|
|
/* Use this to get at 32-bit user passed pointers. */
|
|
/* A() macro should be used for places where you e.g.
|
|
have some internal variable u32 and just want to get
|
|
rid of a compiler warning. AA() has to be used in
|
|
places where you want to convert a function argument
|
|
to 32bit pointer or when you e.g. access pt_regs
|
|
structure and want to consider 32bit registers only.
|
|
*/
|
|
#define A(__x) ((unsigned long)(__x))
|
|
#define AA(__x) ((unsigned long)((int)__x))
|
|
|
|
#ifdef __MIPSEB__
|
|
#define merge_64(r1, r2) ((((r1) & 0xffffffffUL) << 32) + ((r2) & 0xffffffffUL))
|
|
#endif
|
|
#ifdef __MIPSEL__
|
|
#define merge_64(r1, r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL))
|
|
#endif
|
|
|
|
SYSCALL_DEFINE6(32_mmap2, unsigned long, addr, unsigned long, len,
|
|
unsigned long, prot, unsigned long, flags, unsigned long, fd,
|
|
unsigned long, pgoff)
|
|
{
|
|
unsigned long error;
|
|
|
|
error = -EINVAL;
|
|
if (pgoff & (~PAGE_MASK >> 12))
|
|
goto out;
|
|
error = sys_mmap_pgoff(addr, len, prot, flags, fd,
|
|
pgoff >> (PAGE_SHIFT-12));
|
|
out:
|
|
return error;
|
|
}
|
|
|
|
/*
|
|
* sys_execve() executes a new program.
|
|
*/
|
|
asmlinkage int sys32_execve(nabi_no_regargs struct pt_regs regs)
|
|
{
|
|
int error;
|
|
char * filename;
|
|
|
|
filename = getname(compat_ptr(regs.regs[4]));
|
|
error = PTR_ERR(filename);
|
|
if (IS_ERR(filename))
|
|
goto out;
|
|
error = compat_do_execve(filename, compat_ptr(regs.regs[5]),
|
|
compat_ptr(regs.regs[6]), ®s);
|
|
putname(filename);
|
|
|
|
out:
|
|
return error;
|
|
}
|
|
|
|
#define RLIM_INFINITY32 0x7fffffff
|
|
#define RESOURCE32(x) ((x > RLIM_INFINITY32) ? RLIM_INFINITY32 : x)
|
|
|
|
struct rlimit32 {
|
|
int rlim_cur;
|
|
int rlim_max;
|
|
};
|
|
|
|
SYSCALL_DEFINE4(32_truncate64, const char __user *, path,
|
|
unsigned long, __dummy, unsigned long, a2, unsigned long, a3)
|
|
{
|
|
return sys_truncate(path, merge_64(a2, a3));
|
|
}
|
|
|
|
SYSCALL_DEFINE4(32_ftruncate64, unsigned long, fd, unsigned long, __dummy,
|
|
unsigned long, a2, unsigned long, a3)
|
|
{
|
|
return sys_ftruncate(fd, merge_64(a2, a3));
|
|
}
|
|
|
|
SYSCALL_DEFINE5(32_llseek, unsigned int, fd, unsigned int, offset_high,
|
|
unsigned int, offset_low, loff_t __user *, result,
|
|
unsigned int, origin)
|
|
{
|
|
return sys_llseek(fd, offset_high, offset_low, result, origin);
|
|
}
|
|
|
|
/* From the Single Unix Spec: pread & pwrite act like lseek to pos + op +
|
|
lseek back to original location. They fail just like lseek does on
|
|
non-seekable files. */
|
|
|
|
SYSCALL_DEFINE6(32_pread, unsigned long, fd, char __user *, buf, size_t, count,
|
|
unsigned long, unused, unsigned long, a4, unsigned long, a5)
|
|
{
|
|
return sys_pread64(fd, buf, count, merge_64(a4, a5));
|
|
}
|
|
|
|
SYSCALL_DEFINE6(32_pwrite, unsigned int, fd, const char __user *, buf,
|
|
size_t, count, u32, unused, u64, a4, u64, a5)
|
|
{
|
|
return sys_pwrite64(fd, buf, count, merge_64(a4, a5));
|
|
}
|
|
|
|
SYSCALL_DEFINE2(32_sched_rr_get_interval, compat_pid_t, pid,
|
|
struct compat_timespec __user *, interval)
|
|
{
|
|
struct timespec t;
|
|
int ret;
|
|
mm_segment_t old_fs = get_fs();
|
|
|
|
set_fs(KERNEL_DS);
|
|
ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
|
|
set_fs(old_fs);
|
|
if (put_user (t.tv_sec, &interval->tv_sec) ||
|
|
__put_user(t.tv_nsec, &interval->tv_nsec))
|
|
return -EFAULT;
|
|
return ret;
|
|
}
|
|
|
|
#ifdef CONFIG_SYSVIPC
|
|
|
|
SYSCALL_DEFINE6(32_ipc, u32, call, long, first, long, second, long, third,
|
|
unsigned long, ptr, unsigned long, fifth)
|
|
{
|
|
int version, err;
|
|
|
|
version = call >> 16; /* hack for backward compatibility */
|
|
call &= 0xffff;
|
|
|
|
switch (call) {
|
|
case SEMOP:
|
|
/* struct sembuf is the same on 32 and 64bit :)) */
|
|
err = sys_semtimedop(first, compat_ptr(ptr), second, NULL);
|
|
break;
|
|
case SEMTIMEDOP:
|
|
err = compat_sys_semtimedop(first, compat_ptr(ptr), second,
|
|
compat_ptr(fifth));
|
|
break;
|
|
case SEMGET:
|
|
err = sys_semget(first, second, third);
|
|
break;
|
|
case SEMCTL:
|
|
err = compat_sys_semctl(first, second, third, compat_ptr(ptr));
|
|
break;
|
|
case MSGSND:
|
|
err = compat_sys_msgsnd(first, second, third, compat_ptr(ptr));
|
|
break;
|
|
case MSGRCV:
|
|
err = compat_sys_msgrcv(first, second, fifth, third,
|
|
version, compat_ptr(ptr));
|
|
break;
|
|
case MSGGET:
|
|
err = sys_msgget((key_t) first, second);
|
|
break;
|
|
case MSGCTL:
|
|
err = compat_sys_msgctl(first, second, compat_ptr(ptr));
|
|
break;
|
|
case SHMAT:
|
|
err = compat_sys_shmat(first, second, third, version,
|
|
compat_ptr(ptr));
|
|
break;
|
|
case SHMDT:
|
|
err = sys_shmdt(compat_ptr(ptr));
|
|
break;
|
|
case SHMGET:
|
|
err = sys_shmget(first, (unsigned)second, third);
|
|
break;
|
|
case SHMCTL:
|
|
err = compat_sys_shmctl(first, second, compat_ptr(ptr));
|
|
break;
|
|
default:
|
|
err = -EINVAL;
|
|
break;
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
#else
|
|
|
|
SYSCALL_DEFINE6(32_ipc, u32, call, int, first, int, second, int, third,
|
|
u32, ptr, u32, fifth)
|
|
{
|
|
return -ENOSYS;
|
|
}
|
|
|
|
#endif /* CONFIG_SYSVIPC */
|
|
|
|
#ifdef CONFIG_MIPS32_N32
|
|
SYSCALL_DEFINE4(n32_semctl, int, semid, int, semnum, int, cmd, u32, arg)
|
|
{
|
|
/* compat_sys_semctl expects a pointer to union semun */
|
|
u32 __user *uptr = compat_alloc_user_space(sizeof(u32));
|
|
if (put_user(arg, uptr))
|
|
return -EFAULT;
|
|
return compat_sys_semctl(semid, semnum, cmd, uptr);
|
|
}
|
|
|
|
SYSCALL_DEFINE4(n32_msgsnd, int, msqid, u32, msgp, unsigned int, msgsz,
|
|
int, msgflg)
|
|
{
|
|
return compat_sys_msgsnd(msqid, msgsz, msgflg, compat_ptr(msgp));
|
|
}
|
|
|
|
SYSCALL_DEFINE5(n32_msgrcv, int, msqid, u32, msgp, size_t, msgsz,
|
|
int, msgtyp, int, msgflg)
|
|
{
|
|
return compat_sys_msgrcv(msqid, msgsz, msgtyp, msgflg, IPC_64,
|
|
compat_ptr(msgp));
|
|
}
|
|
#endif
|
|
|
|
SYSCALL_DEFINE1(32_personality, unsigned long, personality)
|
|
{
|
|
int ret;
|
|
personality &= 0xffffffff;
|
|
if (personality(current->personality) == PER_LINUX32 &&
|
|
personality == PER_LINUX)
|
|
personality = PER_LINUX32;
|
|
ret = sys_personality(personality);
|
|
if (ret == PER_LINUX32)
|
|
ret = PER_LINUX;
|
|
return ret;
|
|
}
|
|
|
|
SYSCALL_DEFINE4(32_sendfile, long, out_fd, long, in_fd,
|
|
compat_off_t __user *, offset, s32, count)
|
|
{
|
|
mm_segment_t old_fs = get_fs();
|
|
int ret;
|
|
off_t of;
|
|
|
|
if (offset && get_user(of, offset))
|
|
return -EFAULT;
|
|
|
|
set_fs(KERNEL_DS);
|
|
ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL, count);
|
|
set_fs(old_fs);
|
|
|
|
if (offset && put_user(of, offset))
|
|
return -EFAULT;
|
|
|
|
return ret;
|
|
}
|
|
|
|
asmlinkage ssize_t sys32_readahead(int fd, u32 pad0, u64 a2, u64 a3,
|
|
size_t count)
|
|
{
|
|
return sys_readahead(fd, merge_64(a2, a3), count);
|
|
}
|
|
|
|
asmlinkage long sys32_sync_file_range(int fd, int __pad,
|
|
unsigned long a2, unsigned long a3,
|
|
unsigned long a4, unsigned long a5,
|
|
int flags)
|
|
{
|
|
return sys_sync_file_range(fd,
|
|
merge_64(a2, a3), merge_64(a4, a5),
|
|
flags);
|
|
}
|
|
|
|
asmlinkage long sys32_fadvise64_64(int fd, int __pad,
|
|
unsigned long a2, unsigned long a3,
|
|
unsigned long a4, unsigned long a5,
|
|
int flags)
|
|
{
|
|
return sys_fadvise64_64(fd,
|
|
merge_64(a2, a3), merge_64(a4, a5),
|
|
flags);
|
|
}
|
|
|
|
asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_a2,
|
|
unsigned offset_a3, unsigned len_a4, unsigned len_a5)
|
|
{
|
|
return sys_fallocate(fd, mode, merge_64(offset_a2, offset_a3),
|
|
merge_64(len_a4, len_a5));
|
|
}
|
|
|
|
save_static_function(sys32_clone);
|
|
static int noinline __used
|
|
_sys32_clone(nabi_no_regargs struct pt_regs regs)
|
|
{
|
|
unsigned long clone_flags;
|
|
unsigned long newsp;
|
|
int __user *parent_tidptr, *child_tidptr;
|
|
|
|
clone_flags = regs.regs[4];
|
|
newsp = regs.regs[5];
|
|
if (!newsp)
|
|
newsp = regs.regs[29];
|
|
parent_tidptr = (int __user *) regs.regs[6];
|
|
|
|
/* Use __dummy4 instead of getting it off the stack, so that
|
|
syscall() works. */
|
|
child_tidptr = (int __user *) __dummy4;
|
|
return do_fork(clone_flags, newsp, ®s, 0,
|
|
parent_tidptr, child_tidptr);
|
|
}
|
|
|
|
asmlinkage long sys32_lookup_dcookie(u32 a0, u32 a1, char __user *buf,
|
|
size_t len)
|
|
{
|
|
return sys_lookup_dcookie(merge_64(a0, a1), buf, len);
|
|
}
|