sched: make pushable_tasks CONFIG_SMP dependant.
PATCH 1/1 sched: make pushable_tasks CONFIG_SMP dependant.
As noted by Peter Zijlstra here https://lkml.org/lkml/2010/11/10/391
(while reviewing other stuff, though), tracking pushable tasks only makes sense on SMPs.
--- include/linux/init_task.h | 9 ++++++++- include/linux/sched.h | 2 ++ kernel/sched.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletions(-)
include/linux/init_task.h +8 -1
@@ -12,6 +12,13 @@#include <linux/securebits.h> #include <net/net_namespace.h> +#ifdef CONFIG_SMP +# define INIT_PUSHABLE_TASKS (tsk) \ + .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), +#else +# define INIT_PUSHABLE_TASKS (tsk) +#endif +extern struct files_struct init_files;extern struct fs_struct init_fs;
@@ -137,7 +144,7 @@ extern struct cred init_cred; .nr_cpus_allowed = NR_CPUS, \ }, \ .tasks =LIST_HEAD_INIT (tsk.tasks), \ - .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), \ +INIT_PUSHABLE_TASKS (tsk) \ .ptraced =LIST_HEAD_INIT (tsk.ptraced), \ .ptrace_entry = LIST_HEAD_INIT(tsk.ptrace_entry), \ .real_parent = &tsk, \
include/linux/sched.h +2 -0
@@ -1244,7 +1244,9 @@ struct task_struct {#endif struct list_head tasks; +#ifdef CONFIG_SMP struct plist_node pushable_tasks; +#endif struct mm_struct *mm, *active_mm;#if defined(SPLIT_RSS_COUNTING )
kernel/sched.c +2 -0
@@ -2595,7 +2595,9 @@ void sched_fork(struct task_struct *p, int clone_flags)/* Want to start with kernel preemption disabled. */ task_thread_info (p)->preempt_count =1 ;#endif +#ifdef CONFIG_SMP plist_node_init (&p->pushable_tasks,MAX_PRIO ); +#endif put_cpu (); }
Signature · 8 lines
1.7.2.3 -- <<This happens because I choose it to happen!>> (Raistlin Majere) ---------------------------------------------------------------------- Dario Faggioli, ReTiS Lab, Scuola Superiore Sant'Anna, Pisa (Italy) http://retis.sssup.it/people/faggioli -- [email protected]
Quoted 3 lines · Dario Faggioli
As noted by Peter Zijlstra here https://lkml.org/lkml/2010/11/10/391
(while reviewing other stuff, though), tracking pushable tasks only makes sense on SMPs.
-- Steve
Quoted 66 lines
Signed-off-by Dario Faggioli <[email protected]>--- include/linux/init_task.h | 9 ++++++++- include/linux/sched.h | 2 ++ kernel/sched.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletions(-)include/linux/init_task.h +8
-1@@ -12,6 +12,13 @@#include <linux/securebits.h> #include <net/net_namespace.h> +#ifdef CONFIG_SMP +# define INIT_PUSHABLE_TASKS (tsk) \ + .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), +#else +# define INIT_PUSHABLE_TASKS (tsk) +#endif +extern struct files_struct init_files;extern struct fs_struct init_fs;@@ -137,7 +144,7 @@ extern struct cred init_cred; .nr_cpus_allowed = NR_CPUS, \ }, \ .tasks =LIST_HEAD_INIT (tsk.tasks), \ - .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), \ +INIT_PUSHABLE_TASKS (tsk) \ .ptraced =LIST_HEAD_INIT (tsk.ptraced), \ .ptrace_entry = LIST_HEAD_INIT(tsk.ptrace_entry), \ .real_parent = &tsk, \include/linux/sched.h +2
-0@@ -1244,7 +1244,9 @@ struct task_struct {#endif struct list_head tasks; +#ifdef CONFIG_SMP struct plist_node pushable_tasks; +#endif struct mm_struct *mm, *active_mm;#if defined(SPLIT_RSS_COUNTING )kernel/sched.c +2
-0@@ -2595,7 +2595,9 @@ void sched_fork(struct task_struct *p, int clone_flags)/* Want to start with kernel preemption disabled. */ task_thread_info (p)->preempt_count =1 ;#endif +#ifdef CONFIG_SMP plist_node_init (&p->pushable_tasks,MAX_PRIO ); +#endif put_cpu (); }Signature · 1 line
1.7.2.3
Gregory Haskins
Acked-byQuoted 1 line
Quoted 1 line
Quoted 1 line
On 11/30/2010 at 02:02 PM, in message
<[email protected]>, Steven Rostedt
Quoted 6 lines · <[email protected]> wrote:
Quoted 3 lines · Dario Faggioli
As noted by Peter Zijlstra here https://lkml.org/lkml/2010/11/10/391
(while reviewing other stuff, though), tracking pushable tasks only makes sense on SMPs.Acked-by Steven Rostedt <[email protected]>
Quoted 69 lines
-- Steve
Quoted 66 lines
Signed-off-by Dario Faggioli <[email protected]>--- include/linux/init_task.h | 9 ++++++++- include/linux/sched.h | 2 ++ kernel/sched.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletions(-)include/linux/init_task.h +8
-1@@ -12,6 +12,13 @@#include <linux/securebits.h> #include <net/net_namespace.h> +#ifdef CONFIG_SMP +# define INIT_PUSHABLE_TASKS (tsk) \ + .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), +#else +# define INIT_PUSHABLE_TASKS (tsk) +#endif +extern struct files_struct init_files;extern struct fs_struct init_fs;@@ -137,7 +144,7 @@ extern struct cred init_cred; .nr_cpus_allowed = NR_CPUS, \ }, \ .tasks =LIST_HEAD_INIT (tsk.tasks), \ - .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), \ +INIT_PUSHABLE_TASKS (tsk) \ .ptraced =LIST_HEAD_INIT (tsk.ptraced), \ .ptrace_entry = LIST_HEAD_INIT(tsk.ptrace_entry), \ .real_parent = &tsk, \include/linux/sched.h +2
-0@@ -1244,7 +1244,9 @@ struct task_struct {#endif struct list_head tasks; +#ifdef CONFIG_SMP struct plist_node pushable_tasks; +#endif struct mm_struct *mm, *active_mm;#if defined(SPLIT_RSS_COUNTING )kernel/sched.c +2
-0@@ -2595,7 +2595,9 @@ void sched_fork(struct task_struct *p, int clone_flags)/* Want to start with kernel preemption disabled. */ task_thread_info (p)->preempt_count =1 ;#endif +#ifdef CONFIG_SMP plist_node_init (&p->pushable_tasks,MAX_PRIO ); +#endif put_cpu (); }Signature · 1 line
1.7.2.3
[tip:sched/core] sched: Make pushable_tasks CONFIG_SMP dependant
In reply to Dario FaggioliCommit-ID: 806c09a7db457be3758e14b1f152761135d89af5 Gitweb: http://git.kernel.org/tip/806c09a7db457be3758e14b1f152761135d89af5 Author: Dario Faggioli <[email protected]> AuthorDate: Tue, 30 Nov 2010 19:51:33 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Dec 2010 20:16:00 +0100
sched: Make pushable_tasks CONFIG_SMP dependant
As noted by Peter Zijlstra at https://lkml.org/lkml/2010/11/10/391
(while reviewing other stuff, though), tracking pushable tasks only makes sense on SMP systems.
LKML-Reference: <1291143093.2697.298.camel@Palantir>
--- include/linux/init_task.h | 9 ++++++++- include/linux/sched.h | 2 ++ kernel/sched.c | 2 ++ 3 files changed, 12 insertions(+), 1 deletions(-)
include/linux/init_task.h +8 -1
@@ -12,6 +12,13 @@#include <linux/securebits.h> #include <net/net_namespace.h> +#ifdef CONFIG_SMP +# define INIT_PUSHABLE_TASKS (tsk) \ + .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), +#else +# define INIT_PUSHABLE_TASKS (tsk) +#endif +extern struct files_struct init_files;extern struct fs_struct init_fs;
@@ -137,7 +144,7 @@ extern struct cred init_cred; .nr_cpus_allowed = NR_CPUS, \ }, \ .tasks =LIST_HEAD_INIT (tsk.tasks), \ - .pushable_tasks = PLIST_NODE_INIT(tsk.pushable_tasks, MAX_PRIO), \ +INIT_PUSHABLE_TASKS (tsk) \ .ptraced =LIST_HEAD_INIT (tsk.ptraced), \ .ptrace_entry = LIST_HEAD_INIT(tsk.ptrace_entry), \ .real_parent = &tsk, \
include/linux/sched.h +2 -0
@@ -1240,7 +1240,9 @@ struct task_struct {#endif struct list_head tasks; +#ifdef CONFIG_SMP struct plist_node pushable_tasks; +#endif struct mm_struct *mm, *active_mm;#if defined(SPLIT_RSS_COUNTING )
kernel/sched.c +2 -0
@@ -2595,7 +2595,9 @@ void sched_fork(struct task_struct *p, int clone_flags)/* Want to start with kernel preemption disabled. */ task_thread_info (p)->preempt_count =1 ;#endif +#ifdef CONFIG_SMP plist_node_init (&p->pushable_tasks,MAX_PRIO ); +#endif put_cpu (); }