openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Uninline find_pid etc set of functions 

The find_pid/_vpid/_pid_ns functions are used to find the struct pid by its
id, depending on whic id - global or virtual - is used.

The find_vpid() is a macro that pushes the current->nsproxy->pid_ns on the
stack to call another function - find_pid_ns().  It turned out, that this
dereference together with the push itself cause the kernel text size to
grow too much.

Move all these out-of-line.  Together with the previous patch this saves a
bit less that 400 bytes from .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>
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:19 -07:00 committed by Linus Torvalds
parent bac0abd617
commit 8990571eb5
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/pid.h
View File

@ -110,9 +110,8 @@ extern struct pid_namespace init_pid_ns;
* see also find_task_by_pid() set in include/linux/sched.h * see also find_task_by_pid() set in include/linux/sched.h
*/ */
extern struct pid *FASTCALL(find_pid_ns(int nr, struct pid_namespace *ns)); extern struct pid *FASTCALL(find_pid_ns(int nr, struct pid_namespace *ns));
extern struct pid *find_vpid(int nr);
#define find_vpid(pid) find_pid_ns(pid, current->nsproxy->pid_ns) extern struct pid *find_pid(int nr);
#define find_pid(pid) find_pid_ns(pid, &init_pid_ns)
/* /*
* Lookup a PID in the hash table, and return with it's count elevated. * Lookup a PID in the hash table, and return with it's count elevated.

2
kernel/capability.c
View File

@ -96,7 +96,7 @@ static inline int cap_set_pg(int pgrp_nr, kernel_cap_t *effective,
int found = 0; int found = 0;
struct pid *pgrp; struct pid *pgrp;
pgrp = find_pid_ns(pgrp_nr, current->nsproxy->pid_ns); pgrp = find_vpid(pgrp_nr);
do_each_pid_task(pgrp, PIDTYPE_PGID, g) { do_each_pid_task(pgrp, PIDTYPE_PGID, g) {
target = g; target = g;
while_each_thread(g, target) { while_each_thread(g, target) {

12
kernel/pid.c
View File

@ -302,6 +302,18 @@ struct pid * fastcall find_pid_ns(int nr, struct pid_namespace *ns)
} }
EXPORT_SYMBOL_GPL(find_pid_ns); EXPORT_SYMBOL_GPL(find_pid_ns);
struct pid *find_vpid(int nr)
{
return find_pid_ns(nr, current->nsproxy->pid_ns);
}
EXPORT_SYMBOL_GPL(find_vpid);
struct pid *find_pid(int nr)
{
return find_pid_ns(nr, &init_pid_ns);
}
EXPORT_SYMBOL_GPL(find_pid);
/* /*
* attach_pid() must be called with the tasklist_lock write-held. * attach_pid() must be called with the tasklist_lock write-held.
*/ */