mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] sched: make pushable_tasks CONFIG_SMP dependant.
@ 2010-11-30 18:51 Dario Faggioli
  2010-11-30 19:02 ` Steven Rostedt
  2010-12-08 20:41 ` [tip:sched/core] sched: Make " tip-bot for Dario Faggioli
  0 siblings, 2 replies; 4+ messages in thread
From: Dario Faggioli @ 2010-11-30 18:51 UTC (permalink / raw)
  To: Peter Zijlstra
  Cc: Ingo Molnar, Steven Rostedt, Thomas Gleixner, Gregory Haskins,
	Nick Piggin, linux-kernel, Andrew Morton

[-- Attachment #1: Type: text/plain, Size: 2377 bytes --]

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.

Signed-off-by: Dario Faggioli <raistlin@linux.it>
---
 include/linux/init_task.h |    9 ++++++++-
 include/linux/sched.h     |    2 ++
 kernel/sched.c            |    2 ++
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 1f8c06c..6ed8812 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -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,						\
diff --git a/include/linux/sched.h b/include/linux/sched.h
index b0fc8ee..eae4131 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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)
diff --git a/kernel/sched.c b/kernel/sched.c
index 0debad9..166f9f8 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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();
 }
-- 
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 -- dario.faggioli@jabber.org

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] sched: make pushable_tasks CONFIG_SMP dependant.
  2010-11-30 18:51 [PATCH] sched: make pushable_tasks CONFIG_SMP dependant Dario Faggioli
@ 2010-11-30 19:02 ` Steven Rostedt
  2010-11-30 21:01   ` Gregory Haskins
  2010-12-08 20:41 ` [tip:sched/core] sched: Make " tip-bot for Dario Faggioli
  1 sibling, 1 reply; 4+ messages in thread
From: Steven Rostedt @ 2010-11-30 19:02 UTC (permalink / raw)
  To: Dario Faggioli
  Cc: Peter Zijlstra, Ingo Molnar, Thomas Gleixner, Gregory Haskins,
	Nick Piggin, linux-kernel, Andrew Morton

On Tue, 2010-11-30 at 19:51 +0100, Dario Faggioli wrote:
> 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 <rostedt@goodmis.org>

-- Steve

> 
> Signed-off-by: Dario Faggioli <raistlin@linux.it>
> ---
>  include/linux/init_task.h |    9 ++++++++-
>  include/linux/sched.h     |    2 ++
>  kernel/sched.c            |    2 ++
>  3 files changed, 12 insertions(+), 1 deletions(-)
> 
> diff --git a/include/linux/init_task.h b/include/linux/init_task.h
> index 1f8c06c..6ed8812 100644
> --- a/include/linux/init_task.h
> +++ b/include/linux/init_task.h
> @@ -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,						\
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index b0fc8ee..eae4131 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -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)
> diff --git a/kernel/sched.c b/kernel/sched.c
> index 0debad9..166f9f8 100644
> --- a/kernel/sched.c
> +++ b/kernel/sched.c
> @@ -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();
>  }
> -- 
> 1.7.2.3
> 



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] sched: make pushable_tasks CONFIG_SMP dependant.
  2010-11-30 19:02 ` Steven Rostedt
@ 2010-11-30 21:01   ` Gregory Haskins
  0 siblings, 0 replies; 4+ messages in thread
From: Gregory Haskins @ 2010-11-30 21:01 UTC (permalink / raw)
  To: Steven Rostedt, Dario Faggioli
  Cc: Peter Zijlstra, Ingo Molnar, Thomas Gleixner, Andrew Morton,
	linux-kernel, Nick Piggin

>>> On 11/30/2010 at 02:02 PM, in message
<1291143732.27486.36.camel@gandalf.stny.rr.com>, Steven Rostedt
<rostedt@goodmis.org> wrote: 
> On Tue, 2010-11-30 at 19:51 +0100, Dario Faggioli wrote:
>> 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 <rostedt@goodmis.org>

Acked-by: Gregory Haskins <ghaskins@novell.com>

> 
> -- Steve
> 
>> 
>> Signed-off-by: Dario Faggioli <raistlin@linux.it>
>> ---
>>  include/linux/init_task.h |    9 ++++++++-
>>  include/linux/sched.h     |    2 ++
>>  kernel/sched.c            |    2 ++
>>  3 files changed, 12 insertions(+), 1 deletions(-)
>> 
>> diff --git a/include/linux/init_task.h b/include/linux/init_task.h
>> index 1f8c06c..6ed8812 100644
>> --- a/include/linux/init_task.h
>> +++ b/include/linux/init_task.h
>> @@ -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,						\
>> diff --git a/include/linux/sched.h b/include/linux/sched.h
>> index b0fc8ee..eae4131 100644
>> --- a/include/linux/sched.h
>> +++ b/include/linux/sched.h
>> @@ -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)
>> diff --git a/kernel/sched.c b/kernel/sched.c
>> index 0debad9..166f9f8 100644
>> --- a/kernel/sched.c
>> +++ b/kernel/sched.c
>> @@ -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();
>>  }
>> -- 
>> 1.7.2.3
>> 




^ permalink raw reply	[flat|nested] 4+ messages in thread

* [tip:sched/core] sched: Make pushable_tasks CONFIG_SMP dependant
  2010-11-30 18:51 [PATCH] sched: make pushable_tasks CONFIG_SMP dependant Dario Faggioli
  2010-11-30 19:02 ` Steven Rostedt
@ 2010-12-08 20:41 ` tip-bot for Dario Faggioli
  1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Dario Faggioli @ 2010-12-08 20:41 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: linux-kernel, hpa, mingo, a.p.zijlstra, raistlin, rostedt, tglx,
	ghaskins, mingo

Commit-ID:  806c09a7db457be3758e14b1f152761135d89af5
Gitweb:     http://git.kernel.org/tip/806c09a7db457be3758e14b1f152761135d89af5
Author:     Dario Faggioli <raistlin@linux.it>
AuthorDate: Tue, 30 Nov 2010 19:51:33 +0100
Committer:  Ingo Molnar <mingo@elte.hu>
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.

Signed-off-by: Dario Faggioli <raistlin@linux.it>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Gregory Haskins <ghaskins@novell.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1291143093.2697.298.camel@Palantir>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 include/linux/init_task.h |    9 ++++++++-
 include/linux/sched.h     |    2 ++
 kernel/sched.c            |    2 ++
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 1f8c06c..6ed8812 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -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,						\
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 9c2d46d..4f92a23 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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)
diff --git a/kernel/sched.c b/kernel/sched.c
index b646dad..3925a1b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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();
 }

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-12-08 20:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-30 18:51 [PATCH] sched: make pushable_tasks CONFIG_SMP dependant Dario Faggioli
2010-11-30 19:02 ` Steven Rostedt
2010-11-30 21:01   ` Gregory Haskins
2010-12-08 20:41 ` [tip:sched/core] sched: Make " tip-bot for Dario Faggioli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome