de_thread: Use tsk not current.
Subsystems (2)
PATCH 1/1 de_thread: Use tsk not current.
Ingo Oeser pointed out that because current expands to an inline function it is more space efficient and somewhat faster to simply keep a cached copy of current in another variable. This patch implements that for the de_thread function.
--- fs/exec.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-)
fs/exec.c +23 -23
@@ -597,7 +597,7 @@ static int de_thread(struct task_structif (!newsighand)return -ENOMEM ; -if (thread_group_empty (current)) +if (thread_group_empty (tsk)) goto no_thread_group;/*
@@ -622,17 +622,17 @@ static int de_thread(struct task_struct* Reparenting needs write_lock on tasklist_lock, * so it is safe to do it under read_lock. */ -if (unlikely (current->group_leader == child_reaper)) - child_reaper = current; +if (unlikely (tsk->group_leader == child_reaper)) + child_reaper = tsk; -zap_other_threads (current); +zap_other_threads (tsk);read_unlock (&tasklist_lock);/* * Account for the thread group leader hanging around: */ count =1 ; -if (!thread_group_leader (current)) { +if (!thread_group_leader (tsk)) { count =2 ;/* * The SIGALRM timer survives the exec, but needs to point
@@ -641,14 +641,14 @@ static int de_thread(struct task_struct* synchronize with any firing (by calling del_timer_sync) * before we can safely let the old group leader die. */ - sig->tsk = current; + sig->tsk = tsk;spin_unlock_irq (lock);if (hrtimer_cancel (&sig->real_timer))hrtimer_restart (&sig->real_timer);spin_lock_irq (lock); }while (atomic_read (&sig->count) > count) { - sig->group_exit_task = current; + sig->group_exit_task = tsk; sig->notify_count = count;__set_current_state (TASK_UNINTERRUPTIBLE );spin_unlock_irq (lock);
@@ -664,13 +664,13 @@ static int de_thread(struct task_struct* do is to wait for the thread group leader to become inactive, * and to assume its PID: */ -if (!thread_group_leader (current)) { +if (!thread_group_leader (tsk)) {/* * Wait for the thread group leader to be a zombie. * It should already be zombie at this point, most * of the time. */ - leader = current->group_leader; + leader = tsk->group_leader;while (leader->exit_state !=EXIT_ZOMBIE )yield ();
@@ -684,12 +684,12 @@ static int de_thread(struct task_struct* When we take on its identity by switching to its PID, we * also take its birthdate (always earlier than our own). */ - current->start_time = leader->start_time; + tsk->start_time = leader->start_time;write_lock_irq (&tasklist_lock); -BUG_ON (leader->tgid != current->tgid); -BUG_ON (current->pid == current->tgid); +BUG_ON (leader->tgid != tsk->tgid); +BUG_ON (tsk->pid == tsk->tgid);/* * An exec() starts a new thread group with the * TGID of the previous thread group. Rehash the
@@ -702,17 +702,17 @@ static int de_thread(struct task_struct* Note: The old leader also uses this pid until release_task * is called. Odd but simple and correct. */ -detach_pid (current,PIDTYPE_PID ); - current->pid = leader->pid; -attach_pid (current,PIDTYPE_PID , current->pid); -transfer_pid (leader, current,PIDTYPE_PGID ); -transfer_pid (leader, current,PIDTYPE_SID ); -list_replace_rcu (&leader->tasks, ¤t->tasks); +detach_pid (tsk,PIDTYPE_PID ); + tsk->pid = leader->pid; +attach_pid (tsk,PIDTYPE_PID , tsk->pid); +transfer_pid (leader, tsk,PIDTYPE_PGID ); +transfer_pid (leader, tsk,PIDTYPE_SID ); +list_replace_rcu (&leader->tasks, &tsk->tasks); - current->group_leader = current; - leader->group_leader = current; + tsk->group_leader = tsk; + leader->group_leader = tsk; - current->exit_signal =SIGCHLD ; + tsk->exit_signal =SIGCHLD ;BUG_ON (leader->exit_state !=EXIT_ZOMBIE ); leader->exit_state =EXIT_DEAD ;
@@ -752,7 +752,7 @@ no_thread_group:spin_lock (&oldsighand->siglock);spin_lock (&newsighand->siglock); -rcu_assign_pointer (current->sighand, newsighand); +rcu_assign_pointer (tsk->sighand, newsighand);recalc_sigpending ();spin_unlock (&newsighand->siglock);
@@ -763,7 +763,7 @@ no_thread_group:kmem_cache_free (sighand_cachep, oldsighand); } -BUG_ON (!thread_group_leader (current)); +BUG_ON (!thread_group_leader (tsk));return 0 ; }
Signature · 1 line
1.4.1.gac83a
Quoted 6 lines · On Mon, 10 Jul 2006 22:42:25 -0600 [email protected] (Eric W. Biederman)…
Ingo Oeser pointed out that because current expands to an inline function it is more space efficient and somewhat faster to simply keep a cached copy of current in another variable. This patch implements that for the
de_threadfunction.
fs/exec.c static int de_thread(struct task_struct · line 629
Quoted 10 lines
fs/exec.c +4
-4-if (thread_group_empty (current)) +if (thread_group_empty (tsk)) -if (unlikely (current->group_leader == child_reaper)) - child_reaper = current; +if (unlikely (tsk->group_leader == child_reaper)) + child_reaper = tsk; -zap_other_threads (current); +zap_other_threads (tsk);read_unlock (&tasklist_lock);
This saves nearly 100 bytes of text on gcc-4.1.0/i686.
Quoted 9 lines · Andrew Morton
Quoted 5 lines · On Mon, 10 Jul 2006 22:42:25 -0600 [email protected] (Eric W. Biederman)…
Ingo Oeser pointed out that because current expands to an inline function it is more space efficient and somewhat faster to simply keep a cached copy of current in another variable. This patch implements that for the
de_threadfunction.
Quoted 13 lines
Quoted 10 lines
fs/exec.c +4
-4-if (thread_group_empty (current)) +if (thread_group_empty (tsk)) -if (unlikely (current->group_leader == child_reaper)) - child_reaper = current; +if (unlikely (tsk->group_leader == child_reaper)) + child_reaper = tsk; -zap_other_threads (current); +zap_other_threads (tsk);read_unlock(&tasklist_lock);...
This saves nearly 100 bytes of text on gcc-4.1.0/i686.
Why can't current be a pure function, I wonder?
Signature · 2 lines
SUSE Labs, Novell Inc. Send instant messages to your online friends http://au.messenger.yahoo.com
Hi,
Quoted 27 lines · Nick Piggin
Quoted 12 lines · Andrew Morton
Quoted 8 lines · On Mon, 10 Jul 2006 22:42:25 -0600 [email protected] (Eric W. Biederman)…
Ingo Oeser pointed out that because current expands to an inline function it
is more space efficient and somewhat faster to simply keep a cached copy of
current in another variable. This patch implements that for thede_thread
function.Quoted 13 lines
Quoted 10 lines
fs/exec.c +4
-4-if (thread_group_empty (current)) +if (thread_group_empty (tsk)) -if (unlikely (current->group_leader == child_reaper)) - child_reaper = current; +if (unlikely (tsk->group_leader == child_reaper)) + child_reaper = tsk; -zap_other_threads (current); +zap_other_threads (tsk);read_unlock(&tasklist_lock);...
This saves nearly 100 bytes of text on gcc-4.1.0/i686.
Quoted 1 line
Why can't current be a pure function, I wonder?
Most likely due to compiler issues:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17972
(which turns out to deal with current_thread_info() specifically!)
http://www.cs.helsinki.fi/linux/linux-kernel/2003-22/0265.html
However as I've been interested in this issue since I noticed
AGI stalls (pipeline stalls) in oprofile output on x86 recently
due to very non-parallel "mov %esp,%eax; and $0xffffe000,%eax"
sequence (but couldn't think of a way to get rid of this),
I'm going to verify what adding pure does with my >= 4.0.0 gcc on my x86 box.
I'm expecting quite some *general* performance improvement in the low percentage range here...
(since this would be much more than simply merging multiple "current" into a local stack variable, since *every* current_thread_info() call would benefit from this and current_tread_info() is used all over the place in high-profile call sites)
If this works for >= 4.0.0, then I'll try to add conditional support for pure etc. in our compiler version dependent infrastructure headers.
Plus, we also access current_thread_info() related things within loops in some cases; would be much better then to store it in a stack variable outside, methinks. Or could this conflict with aggressive preemption???
Andreas Mohr