Oleg Nesterov <[email protected]> writes:
> On 12/09, Eric W. Biederman wrote:
>>
>> Oleg below is my proof of concept patch, which really needs to be
>> broken up into a whole patch series, so the changes are small
>> enough we can do a thorough audit on them. Anyway take a look
>> and see what you think.
>
> Amazing ;)
>
> This patch certainly needs a time for understanding, so far I have
> read only the small subset, a couple of random questions.
Well I think it succeeds as a proof of concept and totally fails
as a production patch at this point.
>> * pgrp and session fields are deprecated.
>> @@ -1034,8 +1035,9 @@ struct task_struct {
>> struct list_head sibling; /* linkage in my parent's children list */
>> struct task_struct *group_leader; /* threadgroup leader */
>>
>> + struct pid *tid;
>> /* PID/PID hash table linkage. */
>> - struct pid_link pids[PIDTYPE_MAX];
>> + struct hlist_node pids[PIDTYPE_ARRAY_MAX];
>
> OK. It certainly makes sense to move PIDTYPE_PGID/SID pids from task_struct
> to signal struct.
>
> But can't we go a bit further? With this patch pid->tasks[].first still "points"
> to leader's task_struct. Suppose we replace pid->tasks[] with pid->signals[],
> so that pid->signals[].first points to signal_struct. Then we can find the task
> (group_leader) via signal->tgid.
>
> This means we can remove task_struct->pids, and kill transfer_pid().
We need a way to sill implement do_each_pid_task, but otherwise that should
work and be a nice clean up all on it's own.
>> static inline struct pid *task_tgid(struct task_struct *task)
>> {
>> - return task->group_leader->pids[PIDTYPE_PID].pid;
>> + struct signal_struct *sig = rcu_dereference(task->signal);
>> + struct pid *pid = NULL;
>> + if (sig)
>> + pid = sig->tgid;
>> + return pid;
>> }
>
> Hmm. This is fixable, but note that task->signal is not RCU protected,
> only ->sighand.
Yes. I realized that after I had sent the patch out. We do run
those functions with just rcu protection sometimes so something would
need to be resolved there.
>> static inline int pid_alive(struct task_struct *p)
>> {
>> - return p->pids[PIDTYPE_PID].pid != NULL;
>> + return p->signal != NULL;
>> }
>
> (this change btw is imho good regardless, because pid_alive() currently
> means "the task is not unhashed yet" anyway).
Yes.
>> static void __unhash_process(struct task_struct *p)
>> {
>> nr_threads--;
>> - detach_pid(p, PIDTYPE_PID);
>> if (thread_group_leader(p)) {
>> detach_pid(p, PIDTYPE_PGID);
>> detach_pid(p, PIDTYPE_SID);
>> @@ -65,6 +64,7 @@ static void __unhash_process(struct task_struct *p)
>> list_del_rcu(&p->tasks);
>> __get_cpu_var(process_counts)--;
>> }
>> + detach_pid(p, PIDTYPE_PID);
>
> Not sure why this change is needed... To prevent the premature
> detach_pid()->free_pid() ? But this doesn't looks possible, if
> the task is leader, p->tid->tsk == p, and detach_pid() does
This is a bit of a relic of how my patch developed.
I had the "if (task->tid != tsk->signal->tgid)" check in there
and was assuming the thread group id as my pid so I could clean
things up properly. And it worked out nicer if the detach_pid
was for PIDTYPE_PID came later as I could reuse the same logic
as in de_thread.
>
> if (pid->tsk) // still used, don't free.
> return;
>
>> @@ -946,6 +920,48 @@ fastcall NORET_TYPE void do_exit(long code)
>> }
>>
>> tsk->flags |= PF_EXITING;
>> + /* Transfer thread group leadership */
>> + if (thread_group_leader(tsk) && !thread_group_empty(tsk)) {
>
> Ah, this is racy without tasklist_lock. Suppose that the current
> ->group_leader exits right now and elects us as a new leader.
Hmm. I thought I was redoing that test inside of the lock.
Anyway this hunk probably needs the most work as it is brand new code.
>> + struct task_struct *new_leader, *t;
>> + write_lock_irq(&tasklist_lock);
>> + for (t = next_thread(tsk); t != tsk; t = next_thread(t)) {
>> + if (!(t->flags & PF_EXITING))
>> + break;
>> + }
>> + if (t != tsk) {
>> + new_leader = t;
>> +
>> + new_leader->start_time = tsk->start_time;
>> + task_pid(tsk)->tsk = new_leader;
>
> So this pid won't be freed when current does detach_pid(PIDTYPE_PID), from
> now current->tid->tsk != current, so detach_pid() doesn't clear pid->tsk.
>
> But when it will be freed then?
When new_leader does detach_pid on it.
>> + transfer_pid(tsk, new_leader, PIDTYPE_PGID);
>> + transfer_pid(tsk, new_leader, PIDTYPE_SID);
>> + list_replace_rcu(&tsk->tasks, &new_leader->tasks);
>> +
>> + /* Update group_leader on all of the threads... */
>> + new_leader->group_leader = new_leader;
>> + tsk->group_leader = new_leader;
>
> This is one of the most questionable changes. Now current can't "trust" its
> ->group_leader without tasklist.
>
> As a random example, let's look at sys_setpgid(). When we take tasklist_lock
> group_leader can point to the already freed/reused memory.
>
>> + } else {
>> + write_unlock_irq(&tasklist_lock);
>> + /* Wait for the other threads to exit before continuing */
>> + for (;;) {
>> + read_lock(&tasklist_lock);
>> + if (thread_group_empty(tsk))
>> + break;
>> + __set_current_state(TASK_UNINTERRUPTIBLE);
>> + read_unlock(&tasklist_lock);
>> + schedule();
>> + }
>
> I don't get this... Who will wake us?
Oh. Duh. I totally spaced that you need a wakeup in cases like this.
> Hmm, deadlock with coredump? The coredumping thread may be waiting for us,
> but we didn't do exit_mm() yet.
Yes. That part is pretty ugly.
>
>> @@ -1440,8 +1460,11 @@ static int wait_task_continued(struct task_struct *p,
> int noreap,
>> if (!noreap)
>> p->signal->flags &= ~SIGNAL_STOP_CONTINUED;
>> spin_unlock_irq(&p->sighand->siglock);
>> -
>> - pid = task_pid_nr_ns(p, current->nsproxy->pid_ns);
>> + if (p->ptrace && same_thread_group(current, p->parent))
>> + pid = task_pid(p);
>> + else
>> + pid = task_tgid(p);
>
> Why do we need "&& same_thread_group()" above? Ptracer needs per-thread
> pid in any case.
It isn't easy to tell if our real parent or the ptracer is waiting
for us. My thinking was to detect the ptrace waiter by doing
current == p->parent, and then generalizing that to same_thread_group.
I now see that has a problem if the real parent and the ptracer
are the same.
I guess I need to use the state information and simply not tell the
real parent that we have stopped for a ptrace stop, or visa versa.
>> @@ -1501,12 +1487,15 @@ static void do_notify_parent_cldstop(struct
> task_struct *tsk, int why)
>> unsigned long flags;
>> struct task_struct *parent;
>> struct sighand_struct *sighand;
>> + struct pid *pid;
>>
>> - if (tsk->ptrace & PT_PTRACED)
>> + if (tsk->ptrace & PT_PTRACED) {
>> parent = tsk->parent;
>> - else {
>> + pid = task_pid(tsk);
>> + } else {
>> tsk = tsk->group_leader;
>> parent = tsk->real_parent;
>> + pid = task_tgid(tsk);
>
> Hmm, yes... With this patch task_pid(p->leader) != task_tgid(p).
Not necessarily no, and that is a pain.
> Will continue tomorrow.
Thanks
Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
