Commit d86f4ccd authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds

[PATCH] getppid-2.5.50-A3

This changes sys_getppid() to be more POSIX-threading conformant.

sys_getppid() needs to return the PID of the "process' parent" (ie.  the
tgid of the parent thread), not the thread parent's PID.  The patch has
no effect on non-CLONE_THREAD users, for them current->group_leader ==
current.  The effect on CLONE_THREAD threads is that getppid() does not
return any PID within the thread group anymore.  Plus if a threaded
application starts up a (non-thread) child then the child sees the
process PID of the parent process, not the thread PID of the parent
thread.

in theory we could introduce the getttid() variant to get to the TID of
the parent thread, but i doubt it would be of any use.  (and we can add
it if the need arises.)

The lockless algorithm is still safe because the ->group_leader pointer
never changes asynchronously.  (the ->real_parent pointer might still
change asynchronously so the SMP checks are still needed.)

I've also updated the comments (they referenced the nonexistent p_ooptr
field.), plus i've changed the mb() to rmb() - we need to order the
reads, we dont do any global writes that need some predictable ordering.
parent 79cd7c1c
...@@ -862,8 +862,8 @@ asmlinkage long sys_getpid(void) ...@@ -862,8 +862,8 @@ asmlinkage long sys_getpid(void)
} }
/* /*
* This is not strictly SMP safe: p_opptr could change * Accessing ->group_leader->real_parent is not SMP-safe, it could
* from under us. However, rather than getting any lock * change from under us. However, rather than getting any lock
* we can use an optimistic algorithm: get the parent * we can use an optimistic algorithm: get the parent
* pid, and go back and check that the parent is still * pid, and go back and check that the parent is still
* the same. If it has changed (which is extremely unlikely * the same. If it has changed (which is extremely unlikely
...@@ -871,33 +871,31 @@ asmlinkage long sys_getpid(void) ...@@ -871,33 +871,31 @@ asmlinkage long sys_getpid(void)
* *
* NOTE! This depends on the fact that even if we _do_ * NOTE! This depends on the fact that even if we _do_
* get an old value of "parent", we can happily dereference * get an old value of "parent", we can happily dereference
* the pointer: we just can't necessarily trust the result * the pointer (it was and remains a dereferencable kernel pointer
* no matter what): we just can't necessarily trust the result
* until we know that the parent pointer is valid. * until we know that the parent pointer is valid.
* *
* The "mb()" macro is a memory barrier - a synchronizing * NOTE2: ->group_leader never changes from under us.
* event. It also makes sure that gcc doesn't optimize
* away the necessary memory references.. The barrier doesn't
* have to have all that strong semantics: on x86 we don't
* really require a synchronizing instruction, for example.
* The barrier is more important for code generation than
* for any real memory ordering semantics (even if there is
* a small window for a race, using the old pointer is
* harmless for a while).
*/ */
asmlinkage long sys_getppid(void) asmlinkage long sys_getppid(void)
{ {
int pid; int pid;
struct task_struct * me = current; struct task_struct *me = current;
struct task_struct * parent; struct task_struct *parent;
parent = me->real_parent; parent = me->group_leader->real_parent;
for (;;) { for (;;) {
pid = parent->pid; pid = parent->tgid;
#if CONFIG_SMP #if CONFIG_SMP
{ {
struct task_struct *old = parent; struct task_struct *old = parent;
mb();
parent = me->real_parent; /*
* Make sure we read the pid before re-reading the
* parent pointer:
*/
rmb();
parent = me->group_leader->real_parent;
if (old != parent) if (old != parent)
continue; continue;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment