* [PATCH 1/5] sched, rt: move .switched_from out of the scope of CONFIG_SMP
2013-12-27 11:40 [PATCH 0/5] Sched: Some trivial typo fixes Zhi Yong Wu
@ 2013-12-27 11:41 ` Zhi Yong Wu
2013-12-28 9:19 ` Kirill Tkhai
2013-12-27 11:41 ` [PATCH 2/5] sched, fair: fix the comment of move_tasks() Zhi Yong Wu
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Zhi Yong Wu @ 2013-12-27 11:41 UTC (permalink / raw)
To: mingo, peterz; +Cc: linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
.switched_from shouldn't be initialized in the scope of CONFIG_SMP,
so this patch is trying to move it out.
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
kernel/sched/rt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 1c40655..f34d41b 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2002,9 +2002,9 @@ const struct sched_class rt_sched_class = {
.pre_schedule = pre_schedule_rt,
.post_schedule = post_schedule_rt,
.task_woken = task_woken_rt,
- .switched_from = switched_from_rt,
#endif
+ .switched_from = switched_from_rt,
.set_curr_task = set_curr_task_rt,
.task_tick = task_tick_rt,
--
1.7.6.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 1/5] sched, rt: move .switched_from out of the scope of CONFIG_SMP
2013-12-27 11:41 ` [PATCH 1/5] sched, rt: move .switched_from out of the scope of CONFIG_SMP Zhi Yong Wu
@ 2013-12-28 9:19 ` Kirill Tkhai
2013-12-28 9:37 ` Zhi Yong Wu
0 siblings, 1 reply; 10+ messages in thread
From: Kirill Tkhai @ 2013-12-28 9:19 UTC (permalink / raw)
To: Zhi Yong Wu; +Cc: mingo, peterz, linux-kernel, Zhi Yong Wu
On Пт, дек 27, 2013 at 07:41:00 +0800, Zhi Yong Wu wrote:
> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>
> .switched_from shouldn't be initialized in the scope of CONFIG_SMP,
> so this patch is trying to move it out.
>
> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
> ---
> kernel/sched/rt.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
> index 1c40655..f34d41b 100644
> --- a/kernel/sched/rt.c
> +++ b/kernel/sched/rt.c
> @@ -2002,9 +2002,9 @@ const struct sched_class rt_sched_class = {
> .pre_schedule = pre_schedule_rt,
> .post_schedule = post_schedule_rt,
> .task_woken = task_woken_rt,
> - .switched_from = switched_from_rt,
> #endif
>
> + .switched_from = switched_from_rt,
> .set_curr_task = set_curr_task_rt,
> .task_tick = task_tick_rt,
This will not be compilable in !SMP mode because the body of switched_from_rt()
is still under CONFIG_SMP define.
Kirill
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/5] sched, rt: move .switched_from out of the scope of CONFIG_SMP
2013-12-28 9:19 ` Kirill Tkhai
@ 2013-12-28 9:37 ` Zhi Yong Wu
2013-12-28 9:48 ` Kirill Tkhai
0 siblings, 1 reply; 10+ messages in thread
From: Zhi Yong Wu @ 2013-12-28 9:37 UTC (permalink / raw)
To: Kirill Tkhai; +Cc: mingo, peterz, linux-kernel mlist, Zhi Yong Wu
On Sat, Dec 28, 2013 at 5:19 PM, Kirill Tkhai <tkhai@yandex.ru> wrote:
> On Пт, дек 27, 2013 at 07:41:00 +0800, Zhi Yong Wu wrote:
>> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>>
>> .switched_from shouldn't be initialized in the scope of CONFIG_SMP,
>> so this patch is trying to move it out.
>>
>> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>> ---
>> kernel/sched/rt.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
>> index 1c40655..f34d41b 100644
>> --- a/kernel/sched/rt.c
>> +++ b/kernel/sched/rt.c
>> @@ -2002,9 +2002,9 @@ const struct sched_class rt_sched_class = {
>> .pre_schedule = pre_schedule_rt,
>> .post_schedule = post_schedule_rt,
>> .task_woken = task_woken_rt,
>> - .switched_from = switched_from_rt,
>> #endif
>>
>> + .switched_from = switched_from_rt,
>> .set_curr_task = set_curr_task_rt,
>> .task_tick = task_tick_rt,
>
> This will not be compilable in !SMP mode because the body of switched_from_rt()
> is still under CONFIG_SMP define.
How about also removing its body out?
>
> Kirill
--
Regards,
Zhi Yong Wu
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/5] sched, rt: move .switched_from out of the scope of CONFIG_SMP
2013-12-28 9:37 ` Zhi Yong Wu
@ 2013-12-28 9:48 ` Kirill Tkhai
2013-12-28 9:59 ` Zhi Yong Wu
0 siblings, 1 reply; 10+ messages in thread
From: Kirill Tkhai @ 2013-12-28 9:48 UTC (permalink / raw)
To: Zhi Yong Wu; +Cc: mingo, peterz, linux-kernel mlist, Zhi Yong Wu
On Сб, дек 28, 2013 at 05:37:32 +0800, Zhi Yong Wu wrote:
> On Sat, Dec 28, 2013 at 5:19 PM, Kirill Tkhai <tkhai@yandex.ru> wrote:
> > On Пт, дек 27, 2013 at 07:41:00 +0800, Zhi Yong Wu wrote:
> >> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
> >>
> >> .switched_from shouldn't be initialized in the scope of CONFIG_SMP,
> >> so this patch is trying to move it out.
> >>
> >> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
> >> ---
> >> kernel/sched/rt.c | 2 +-
> >> 1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
> >> index 1c40655..f34d41b 100644
> >> --- a/kernel/sched/rt.c
> >> +++ b/kernel/sched/rt.c
> >> @@ -2002,9 +2002,9 @@ const struct sched_class rt_sched_class = {
> >> .pre_schedule = pre_schedule_rt,
> >> .post_schedule = post_schedule_rt,
> >> .task_woken = task_woken_rt,
> >> - .switched_from = switched_from_rt,
> >> #endif
> >>
> >> + .switched_from = switched_from_rt,
> >> .set_curr_task = set_curr_task_rt,
> >> .task_tick = task_tick_rt,
> >
> > This will not be compilable in !SMP mode because the body of switched_from_rt()
> > is still under CONFIG_SMP define.
> How about also removing its body out?
switched_from_rt() is necessary only in SMP mode, so I think we should
not change anything connected with it here. It's already initialized
properly.
> >
> > Kirill
>
>
>
> --
> Regards,
>
> Zhi Yong Wu
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 1/5] sched, rt: move .switched_from out of the scope of CONFIG_SMP
2013-12-28 9:48 ` Kirill Tkhai
@ 2013-12-28 9:59 ` Zhi Yong Wu
0 siblings, 0 replies; 10+ messages in thread
From: Zhi Yong Wu @ 2013-12-28 9:59 UTC (permalink / raw)
To: Kirill Tkhai; +Cc: mingo, peterz, linux-kernel mlist, Zhi Yong Wu
On Sat, Dec 28, 2013 at 5:48 PM, Kirill Tkhai <tkhai@yandex.ru> wrote:
> On Сб, дек 28, 2013 at 05:37:32 +0800, Zhi Yong Wu wrote:
>> On Sat, Dec 28, 2013 at 5:19 PM, Kirill Tkhai <tkhai@yandex.ru> wrote:
>> > On Пт, дек 27, 2013 at 07:41:00 +0800, Zhi Yong Wu wrote:
>> >> From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>> >>
>> >> .switched_from shouldn't be initialized in the scope of CONFIG_SMP,
>> >> so this patch is trying to move it out.
>> >>
>> >> Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
>> >> ---
>> >> kernel/sched/rt.c | 2 +-
>> >> 1 files changed, 1 insertions(+), 1 deletions(-)
>> >>
>> >> diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
>> >> index 1c40655..f34d41b 100644
>> >> --- a/kernel/sched/rt.c
>> >> +++ b/kernel/sched/rt.c
>> >> @@ -2002,9 +2002,9 @@ const struct sched_class rt_sched_class = {
>> >> .pre_schedule = pre_schedule_rt,
>> >> .post_schedule = post_schedule_rt,
>> >> .task_woken = task_woken_rt,
>> >> - .switched_from = switched_from_rt,
>> >> #endif
>> >>
>> >> + .switched_from = switched_from_rt,
>> >> .set_curr_task = set_curr_task_rt,
>> >> .task_tick = task_tick_rt,
>> >
>> > This will not be compilable in !SMP mode because the body of switched_from_rt()
>> > is still under CONFIG_SMP define.
>> How about also removing its body out?
>
> switched_from_rt() is necessary only in SMP mode, so I think we should
> not change anything connected with it here. It's already initialized
> properly.
pls ignore this patch, thanks.
>
>> >
>> > Kirill
>>
>>
>>
>> --
>> Regards,
>>
>> Zhi Yong Wu
--
Regards,
Zhi Yong Wu
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/5] sched, fair: fix the comment of move_tasks()
2013-12-27 11:40 [PATCH 0/5] Sched: Some trivial typo fixes Zhi Yong Wu
2013-12-27 11:41 ` [PATCH 1/5] sched, rt: move .switched_from out of the scope of CONFIG_SMP Zhi Yong Wu
@ 2013-12-27 11:41 ` Zhi Yong Wu
2013-12-27 11:41 ` [PATCH 3/5] sched, fair: fix the typo in select_idle_sibling() Zhi Yong Wu
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Zhi Yong Wu @ 2013-12-27 11:41 UTC (permalink / raw)
To: mingo, peterz; +Cc: linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
kernel/sched/fair.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index c7395d9..a82ae0a 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4982,7 +4982,7 @@ static const unsigned int sched_nr_migrate_break = 32;
/*
* move_tasks tries to move up to imbalance weighted load from busiest to
* this_rq, as part of a balancing operation within domain "sd".
- * Returns 1 if successful and 0 otherwise.
+ * Returns the number of moved tasks if successful and 0 otherwise.
*
* Called with both runqueues locked.
*/
--
1.7.6.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/5] sched, fair: fix the typo in select_idle_sibling()
2013-12-27 11:40 [PATCH 0/5] Sched: Some trivial typo fixes Zhi Yong Wu
2013-12-27 11:41 ` [PATCH 1/5] sched, rt: move .switched_from out of the scope of CONFIG_SMP Zhi Yong Wu
2013-12-27 11:41 ` [PATCH 2/5] sched, fair: fix the comment of move_tasks() Zhi Yong Wu
@ 2013-12-27 11:41 ` Zhi Yong Wu
2013-12-27 11:41 ` [PATCH 4/5] sched, fair: fix the comment of select_task_rq_fair() Zhi Yong Wu
2013-12-27 11:41 ` [PATCH 5/5] Documentation, sched-arch.txt: fix the incorrect syntax Zhi Yong Wu
4 siblings, 0 replies; 10+ messages in thread
From: Zhi Yong Wu @ 2013-12-27 11:41 UTC (permalink / raw)
To: mingo, peterz; +Cc: linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
kernel/sched/fair.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index a82ae0a..db23d71 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4191,7 +4191,7 @@ static int select_idle_sibling(struct task_struct *p, int target)
return i;
/*
- * Otherwise, iterate the domains and find an elegible idle cpu.
+ * Otherwise, iterate the domains and find an eligible idle cpu.
*/
sd = rcu_dereference(per_cpu(sd_llc, target));
for_each_lower_domain(sd) {
--
1.7.6.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/5] sched, fair: fix the comment of select_task_rq_fair()
2013-12-27 11:40 [PATCH 0/5] Sched: Some trivial typo fixes Zhi Yong Wu
` (2 preceding siblings ...)
2013-12-27 11:41 ` [PATCH 3/5] sched, fair: fix the typo in select_idle_sibling() Zhi Yong Wu
@ 2013-12-27 11:41 ` Zhi Yong Wu
2013-12-27 11:41 ` [PATCH 5/5] Documentation, sched-arch.txt: fix the incorrect syntax Zhi Yong Wu
4 siblings, 0 replies; 10+ messages in thread
From: Zhi Yong Wu @ 2013-12-27 11:41 UTC (permalink / raw)
To: mingo, peterz; +Cc: linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
kernel/sched/fair.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index db23d71..eaa1e91 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4218,7 +4218,7 @@ done:
}
/*
- * sched_balance_self: balance the current task (running on cpu) in domains
+ * select_task_rq_fair: balance the current task (running on cpu) in domains
* that have the 'flag' flag set. In practice, this is SD_BALANCE_FORK and
* SD_BALANCE_EXEC.
*
--
1.7.6.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/5] Documentation, sched-arch.txt: fix the incorrect syntax
2013-12-27 11:40 [PATCH 0/5] Sched: Some trivial typo fixes Zhi Yong Wu
` (3 preceding siblings ...)
2013-12-27 11:41 ` [PATCH 4/5] sched, fair: fix the comment of select_task_rq_fair() Zhi Yong Wu
@ 2013-12-27 11:41 ` Zhi Yong Wu
4 siblings, 0 replies; 10+ messages in thread
From: Zhi Yong Wu @ 2013-12-27 11:41 UTC (permalink / raw)
To: mingo, peterz; +Cc: linux-kernel, Zhi Yong Wu
From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
Documentation/scheduler/sched-arch.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/scheduler/sched-arch.txt b/Documentation/scheduler/sched-arch.txt
index 9290de7..0a7d252 100644
--- a/Documentation/scheduler/sched-arch.txt
+++ b/Documentation/scheduler/sched-arch.txt
@@ -21,7 +21,7 @@ CPU idle
========
Your cpu_idle routines need to obey the following rules:
-1. Preempt should now disabled over idle routines. Should only
+1. Preempt should be now disabled over idle routines. Should only
be enabled to call schedule() then disabled again.
2. need_resched/TIF_NEED_RESCHED is only ever set, and will never
--
1.7.6.5
^ permalink raw reply related [flat|nested] 10+ messages in thread