Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 228ebcbe authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Linus Torvalds
Browse files

Uninline find_task_by_xxx set of functions 



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: default avatarPavel 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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b488893a

fs/ioprio.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

include/linux/sched.h

+6 −9
Original line number Diff line number Diff line
@@ -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);

kernel/capability.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

kernel/futex.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

kernel/futex_compat.c

+1 −2
Original line number Diff line number Diff line
@@ -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;