kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Uninline find_task_by_xxx set of functions

Browse source 
The find_task_by_something is a set of macros are used to find task by pid
depending on what kind of pid is proposed - global or virtual one.  All of
them are wrappers above the most generic one - find_task_by_pid_type_ns() -
and just substitute some args for it.

It turned out, that dereferencing the current->nsproxy->pid_ns construction
and pushing one more argument on the stack inline cause kernel text size to
grow.

This patch moves all this stuff out-of-line into kernel/pid.c.  Together
with the next patch it saves a bit less than 400 bytes from the .text
section.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Paul Menage <menage@google.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Pavel Emelyanov 2007-10-18 23:40:16 -07:00 committed by Linus Torvalds
parent b488893a39
commit 228ebcbe63
12 changed files with 41 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/ioprio.c
View file

@ -94,8 +94,7 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
if (!who)
p = current;
else
p = find_task_by_pid_ns(who,
current->nsproxy->pid_ns);
p = find_task_by_vpid(who);
if (p)
ret = set_task_ioprio(p, ioprio);
break;
@ -182,8 +181,7 @@ asmlinkage long sys_ioprio_get(int which, int who)
if (!who)
p = current;
else
p = find_task_by_pid_ns(who,
current->nsproxy->pid_ns);
p = find_task_by_vpid(who);
if (p)
ret = get_task_ioprio(p);
break;

15
include/linux/sched.h
View file

@ -1523,9 +1523,8 @@ extern struct pid_namespace init_pid_ns;
* type and namespace specified
* find_task_by_pid_ns():
* finds a task by its pid in the specified namespace
* find_task_by_pid_type():
* finds a task by its global id with the specified type, e.g.
* by global session id
* find_task_by_vpid():
* finds a task by its virtual pid
* find_task_by_pid():
* finds a task by its global pid
*
@ -1535,12 +1534,10 @@ extern struct pid_namespace init_pid_ns;
extern struct task_struct *find_task_by_pid_type_ns(int type, int pid,
struct pid_namespace *ns);
#define find_task_by_pid_ns(nr, ns) \
find_task_by_pid_type_ns(PIDTYPE_PID, nr, ns)
#define find_task_by_pid_type(type, nr) \
find_task_by_pid_type_ns(type, nr, &init_pid_ns)
#define find_task_by_pid(nr) \
find_task_by_pid_type(PIDTYPE_PID, nr)
extern struct task_struct *find_task_by_pid(pid_t nr);
extern struct task_struct *find_task_by_vpid(pid_t nr);
extern struct task_struct *find_task_by_pid_ns(pid_t nr,
struct pid_namespace *ns);
extern void __set_special_pids(pid_t session, pid_t pgrp);

6
kernel/capability.c
View file

@ -63,8 +63,7 @@ asmlinkage long sys_capget(cap_user_header_t header, cap_user_data_t dataptr)
read_lock(&tasklist_lock);
if (pid && pid != task_pid_vnr(current)) {
target = find_task_by_pid_ns(pid,
current->nsproxy->pid_ns);
target = find_task_by_vpid(pid);
if (!target) {
ret = -ESRCH;
goto out;
@ -198,8 +197,7 @@ asmlinkage long sys_capset(cap_user_header_t header, const cap_user_data_t data)
read_lock(&tasklist_lock);
if (pid > 0 && pid != task_pid_vnr(current)) {
target = find_task_by_pid_ns(pid,
current->nsproxy->pid_ns);
target = find_task_by_vpid(pid);
if (!target) {
ret = -ESRCH;
goto out;

7
kernel/futex.c
View file

@ -446,9 +446,7 @@ static struct task_struct * futex_find_get_task(pid_t pid)
struct task_struct *p;
rcu_read_lock();
p = find_task_by_pid_ns(pid,
current->nsproxy->pid_ns);
p = find_task_by_vpid(pid);
if (!p || ((current->euid != p->euid) && (current->euid != p->uid)))
p = ERR_PTR(-ESRCH);
else
@ -1858,8 +1856,7 @@ sys_get_robust_list(int pid, struct robust_list_head __user * __user *head_ptr,
ret = -ESRCH;
rcu_read_lock();
p = find_task_by_pid_ns(pid,
current->nsproxy->pid_ns);
p = find_task_by_vpid(pid);
if (!p)
goto err_unlock;
ret = -EPERM;

3
kernel/futex_compat.c
View file

@ -125,8 +125,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
ret = -ESRCH;
read_lock(&tasklist_lock);
p = find_task_by_pid_ns(pid,
current->nsproxy->pid_ns);
p = find_task_by_vpid(pid);
if (!p)
goto err_unlock;
ret = -EPERM;

19
kernel/pid.c
View file

@ -369,6 +369,25 @@ struct task_struct *find_task_by_pid_type_ns(int type, int nr,
EXPORT_SYMBOL(find_task_by_pid_type_ns);
struct task_struct *find_task_by_pid(pid_t nr)
{
return find_task_by_pid_type_ns(PIDTYPE_PID, nr, &init_pid_ns);
}
EXPORT_SYMBOL(find_task_by_pid);
struct task_struct *find_task_by_vpid(pid_t vnr)
{
return find_task_by_pid_type_ns(PIDTYPE_PID, vnr,
current->nsproxy->pid_ns);
}
EXPORT_SYMBOL(find_task_by_vpid);
struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
{
return find_task_by_pid_type_ns(PIDTYPE_PID, nr, ns);
}
EXPORT_SYMBOL(find_task_by_pid_ns);
struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
{
struct pid *pid;

3
kernel/ptrace.c
View file

@ -444,8 +444,7 @@ struct task_struct *ptrace_get_task_struct(pid_t pid)
return ERR_PTR(-EPERM);
read_lock(&tasklist_lock);
child = find_task_by_pid_ns(pid,
current->nsproxy->pid_ns);
child = find_task_by_vpid(pid);
if (child)
get_task_struct(child);

3
kernel/sched.c
View file

@ -4168,8 +4168,7 @@ struct task_struct *idle_task(int cpu)
*/
static struct task_struct *find_process_by_pid(pid_t pid)
{
return pid ?
find_task_by_pid_ns(pid, current->nsproxy->pid_ns) : current;
return pid ? find_task_by_vpid(pid) : current;
}
/* Actually do priority change: must hold rq lock. */

2
kernel/signal.c
View file

@ -2237,7 +2237,7 @@ static int do_tkill(int tgid, int pid, int sig)
info.si_uid = current->uid;
read_lock(&tasklist_lock);
p = find_task_by_pid_ns(pid, current->nsproxy->pid_ns);
p = find_task_by_vpid(pid);
if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
error = check_kill_permission(sig, &info, p);
/*

9
kernel/sys.c
View file

@ -152,8 +152,7 @@ asmlinkage long sys_setpriority(int which, int who, int niceval)
switch (which) {
case PRIO_PROCESS:
if (who)
p = find_task_by_pid_ns(who,
current->nsproxy->pid_ns);
p = find_task_by_vpid(who);
else
p = current;
if (p)
@ -210,8 +209,7 @@ asmlinkage long sys_getpriority(int which, int who)
switch (which) {
case PRIO_PROCESS:
if (who)
p = find_task_by_pid_ns(who,
current->nsproxy->pid_ns);
p = find_task_by_vpid(who);
else
p = current;
if (p) {
@ -1067,7 +1065,8 @@ asmlinkage long sys_setsid(void)
* session id and so the check will always fail and make it so
* init cannot successfully call setsid.
*/
if (session > 1 && find_task_by_pid_type(PIDTYPE_PGID, session))
if (session > 1 && find_task_by_pid_type_ns(PIDTYPE_PGID,
session, &init_pid_ns))
goto out;
group_leader->signal->leader = 1;

3
mm/mempolicy.c
View file

@ -941,8 +941,7 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
/* Find the mm_struct */
read_lock(&tasklist_lock);
task = pid ?
find_task_by_pid_ns(pid, current->nsproxy->pid_ns) : current;
task = pid ? find_task_by_vpid(pid) : current;
if (!task) {
read_unlock(&tasklist_lock);
return -ESRCH;

3
mm/migrate.c
View file

@ -925,8 +925,7 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages,
/* Find the mm_struct */
read_lock(&tasklist_lock);
task = pid ?
find_task_by_pid_ns(pid, current->nsproxy->pid_ns) : current;
task = pid ? find_task_by_vpid(pid) : current;
if (!task) {
read_unlock(&tasklist_lock);
return -ESRCH;