isolation: 1Hz residual tick offloading v5
Subsystems (4)
Frederic Weisbecker
maintainercover isolation: 1Hz residual tick offloading v5
This series should address most reviews from Peterz in v4:
* Check that the remote tick doesn't come way too late. For that we track the last time we called update_curr() with checking tsk->se.exec_start which doesn't only account for ticks but also queue and dequeue events.
* Add comment to explain why we use HZ as a delay
* Feed changelog with explanation about correctness assumptions on calling rq::task_tick() remotely.
The last element is to enforce unbound workqueues to queue a work on a CPU of the same node when the enqueuer is outside the unbound mask. This will be sorted out seperately.
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
sched/0hz-v5
HEAD: 62711eb7856882d443615f0ef0ba9518977b7abd
Thanks,
Frederic
---
Frederic Weisbecker (6):
sched: Rename init_rq_hrtick to hrtick_rq_init
nohz: Allow to check if remote CPU tick is stopped sched/isolation: Isolate workqueues when "nohz_full=" is set sched/isolation: Residual 1Hz scheduler tick offload sched/nohz: Remove the 1 Hz tick code sched/isolation: Tick offload documentation
Documentation/admin-guide/kernel-parameters.txt | 6 +- include/linux/sched/isolation.h | 1 + include/linux/sched/nohz.h | 4 - include/linux/tick.h | 2 + kernel/sched/core.c | 116 ++++++++++++++++++------ kernel/sched/idle_task.c | 1 - kernel/sched/isolation.c | 8 +- kernel/sched/sched.h | 13 +-- kernel/time/tick-sched.c | 13 +-- kernel/workqueue.c | 3 +- 10 files changed, 115 insertions(+), 52 deletions(-)
Frederic Weisbecker
maintainerPATCH 1/6 sched: Rename init_rq_hrtick to hrtick_rq_init
Do that rename in order to normalize the hrtick namespace.
--- kernel/sched/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/core.c +3 -3
@@ -333,7 +333,7 @@ void hrtick_start(struct rq *rq, u64 delay) }#endif /* CONFIG_SMP */ -static void init_rq_hrtick (struct rq *rq) +static void hrtick_rq_init (struct rq *rq) {#ifdef CONFIG_SMP rq->hrtick_csd_pending =0 ;
@@ -351,7 +351,7 @@ static inline void hrtick_clear(struct rq *rq) { } -static inline void init_rq_hrtick (struct rq *rq) +static inline void hrtick_rq_init (struct rq *rq) { }#endif /* CONFIG_SCHED_HRTICK */
@@ -6023,7 +6023,7 @@ void __init sched_init(void) rq->last_sched_tick =0 ;#endif #endif /* CONFIG_SMP */ -init_rq_hrtick (rq); +hrtick_rq_init (rq);atomic_set (&rq->nr_iowait,0 ); }
Signature · 1 line
2.7.4
Ingo Molnar
maintainerRe: [PATCH 1/6] sched: Rename init_rq_hrtick to hrtick_rq_init
Quoted 22 lines · Frederic Weisbecker
Do that rename in order to normalize the hrtick namespace.
Signed-off-by Frederic Weisbecker <[email protected]>Cc Chris Metcalf <[email protected]>Cc Christoph Lameter <[email protected]>Cc Luiz Capitulino <[email protected]>Cc Mike Galbraith <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Rik van Riel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Wanpeng Li <[email protected]>Cc Ingo Molnar <[email protected]>--- kernel/sched/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)kernel/sched/core.c +0
-0
kernel/sched/core.c void hrtick_start(struct rq *rq, u64 delay) · line 336
Quoted 5 lines
kernel/sched/core.c +1
-1@@ -333,7 +333,7 @@ void hrtick_start(struct rq *rq, u64 delay) }#endif /* CONFIG_SMP */ -static void init_rq_hrtick (struct rq *rq) +static void hrtick_rq_init (struct rq *rq)
On a related note, I think we should also do:
s/start_hrtick_dl
/sched_dl_hrtick_start
or such. (In a separate patch)
Thanks,
Ingo
Frederic Weisbecker
maintainerPATCH 2/6 nohz: Allow to check if remote CPU tick is stopped
In reply to Frederic WeisbeckerThis check is racy but provides a good heuristic to determine whether a CPU may need a remote tick or not.
--- include/linux/tick.h | 2 ++ kernel/time/tick-sched.c | 7 +++++++ 2 files changed, 9 insertions(+)
include/linux/tick.h +2 -0
@@ -114,6 +114,7 @@ enum tick_dep_bits {#ifdef CONFIG_NO_HZ_COMMON extern bool tick_nohz_enabled;extern int tick_nohz_tick_stopped (void ); +extern int tick_nohz_tick_stopped_cpu (int cpu);extern void tick_nohz_idle_enter (void );extern void tick_nohz_idle_exit (void );extern void tick_nohz_irq_exit (void );
@@ -125,6 +126,7 @@ extern u64 get_cpu_iowait_time_us(int cpu, u64 *last_update_time);#else /* !CONFIG_NO_HZ_COMMON */ #define tick_nohz_enabled (0)static inline int tick_nohz_tick_stopped (void ) {return 0 ; } +static inline int tick_nohz_tick_stopped_cpu (int cpu) {return 0 ; }static inline void tick_nohz_idle_enter (void ) { }static inline void tick_nohz_idle_exit (void ) { }
kernel/time/tick-sched.c +7 -0
@@ -486,6 +486,13 @@ int tick_nohz_tick_stopped(void)return __this_cpu_read (tick_cpu_sched.tick_stopped); } +int tick_nohz_tick_stopped_cpu (int cpu) +{ +struct tick_sched *ts =per_cpu_ptr (&tick_cpu_sched, cpu); + +return ts->tick_stopped; +} +/** * tick_nohz_update_jiffies - update jiffies when idle was interrupted *
Signature · 1 line
2.7.4
Frederic Weisbecker
maintainerPATCH 3/6 sched/isolation: Isolate workqueues when "nohz_full=" is set
In reply to Frederic WeisbeckerAs we prepare for offloading the residual 1hz scheduler ticks to workqueue, let's affine those to housekeepers so that they don't interrupt the CPUs that don't want to be disturbed.
--- include/linux/sched/isolation.h | 1 + kernel/sched/isolation.c | 4 +++- kernel/workqueue.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-)
include/linux/sched/isolation.h +1 -0
@@ -12,6 +12,7 @@ enum hk_flags {HK_FLAG_SCHED = (1 <<3 ),HK_FLAG_TICK = (1 <<4 ),HK_FLAG_DOMAIN = (1 <<5 ), + HK_FLAG_WQ = (1 << 6), };#ifdef CONFIG_CPU_ISOLATION
kernel/sched/isolation.c +3 -1
@@ -3,6 +3,7 @@* any CPU: unbound workqueues, timers, kthreads and any offloadable work. * * Copyright (C) 2017 Red Hat, Inc., Frederic Weisbecker +* Copyright (C) 2017-2018 SUSE, Frederic Weisbecker * */
@@ -119,7 +120,8 @@ static int __init housekeeping_nohz_full_setup(char *str) {unsigned int flags; - flags =HK_FLAG_TICK |HK_FLAG_TIMER |HK_FLAG_RCU |HK_FLAG_MISC ; + flags =HK_FLAG_TICK |HK_FLAG_WQ |HK_FLAG_TIMER | +HK_FLAG_RCU |HK_FLAG_MISC ;return housekeeping_setup (str, flags); }
kernel/workqueue.c +2 -1
@@ -5570,7 +5570,8 @@ int __init workqueue_init_early(void)WARN_ON (__alignof__(struct pool_workqueue ) < __alignof__(long long ));BUG_ON (!alloc_cpumask_var (&wq_unbound_cpumask,GFP_KERNEL )); -cpumask_copy (wq_unbound_cpumask,housekeeping_cpumask (HK_FLAG_DOMAIN )); +cpumask_copy (wq_unbound_cpumask, +housekeeping_cpumask (HK_FLAG_DOMAIN |HK_FLAG_WQ )); pwq_cache =KMEM_CACHE (pool_workqueue,SLAB_PANIC );
Signature · 1 line
2.7.4
Ingo Molnar
maintainerRe: [PATCH 3/6] sched/isolation: Isolate workqueues when "nohz_full=" is set
kernel/sched/isolation.c static int __init housekeeping_nohz_full_setup(char *str)
Quoted 7 lines · Frederic Weisbecker
kernel/sched/isolation.c +4
-2- flags =HK_FLAG_TICK |HK_FLAG_TIMER |HK_FLAG_RCU |HK_FLAG_MISC ; + flags =HK_FLAG_TICK |HK_FLAG_WQ |HK_FLAG_TIMER | +HK_FLAG_RCU |HK_FLAG_MISC ; -cpumask_copy (wq_unbound_cpumask,housekeeping_cpumask (HK_FLAG_DOMAIN )); +cpumask_copy (wq_unbound_cpumask, +housekeeping_cpumask (HK_FLAG_DOMAIN |HK_FLAG_WQ ));
LGTM, but _please_ don't do these ugly line-breaks, just keep it slightly over col80.
Thanks,
Ingo
Frederic Weisbecker
maintainerRe: [PATCH 3/6] sched/isolation: Isolate workqueues when "nohz_full=" is set
Quoted 7 lines · Ingo Molnar
Quoted 3 lines · Frederic Weisbecker
kernel/sched/isolation.c +2
-1- flags =HK_FLAG_TICK |HK_FLAG_TIMER |HK_FLAG_RCU |HK_FLAG_MISC ; + flags =HK_FLAG_TICK |HK_FLAG_WQ |HK_FLAG_TIMER | +HK_FLAG_RCU |HK_FLAG_MISC ;
Quoted 6 lines
kernel/workqueue.c int __init workqueue_init_early(void) · line 5574
Quoted 3 lines
kernel/workqueue.c +2
-1-cpumask_copy (wq_unbound_cpumask,housekeeping_cpumask (HK_FLAG_DOMAIN )); +cpumask_copy (wq_unbound_cpumask, +housekeeping_cpumask (HK_FLAG_DOMAIN |HK_FLAG_WQ ));LGTM, but _please_ don't do these ugly line-breaks, just keep it slightly over col80.
Works for me, I'll fix.
Thanks.
Frederic Weisbecker
maintainerPATCH 4/6 sched/isolation: Residual 1Hz scheduler tick offload
In reply to Frederic WeisbeckerWhen a CPU runs in full dynticks mode, a 1Hz tick remains in order to keep the scheduler stats alive. However this residual tick is a burden for bare metal tasks that can't stand any interruption at all, or want to minimize them.
The usual boot parameters "nohz_full=" or "isolcpus=nohz" will now outsource these scheduler ticks to the global workqueue so that a housekeeping CPU handles those remotely. The sched_class::task_tick() implementations have been audited and look safe to be called remotely as the target runqueue and its current task are passed in parameter and don't seem to be accessed locally.
Note that in the case of using isolcpus, it's still up to the user to affine the global workqueues to the housekeeping CPUs through /sys/devices/virtual/workqueue/cpumask or domains isolation "isolcpus=nohz,domain".
--- kernel/sched/core.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- kernel/sched/isolation.c | 4 +++ kernel/sched/sched.h | 2 ++ 3 files changed, 96 insertions(+), 1 deletion(-)
kernel/sched/core.c +90 -1
@@ -3120,7 +3120,94 @@ u64 scheduler_tick_max_deferment(void)return jiffies_to_nsecs (next - now); } -#endif + +struct tick_work { +int cpu; +struct delayed_work work; +}; + +static struct tick_work __percpu *tick_work_cpu; + +static void sched_tick_remote (struct work_struct *work) +{ +struct delayed_work *dwork =to_delayed_work (work); + struct tick_work *twork = container_of(dwork, struct tick_work, work); +int cpu = twork->cpu; +struct rq *rq =cpu_rq (cpu); +struct rq_flags rf; + +/* +* Handle the tick only if it appears the remote CPU is running +* in full dynticks mode. The check is racy by nature, but +* missing a tick or having one too much is no big deal. +*/ +if (!idle_cpu (cpu) &&tick_nohz_tick_stopped_cpu (cpu)) { +struct task_struct *curr; +u64 delta; + +rq_lock_irq (rq, &rf); +update_rq_clock (rq); + curr = rq->curr; + delta =rq_clock_task (rq) - curr->se.exec_start; +/* Make sure we tick in a reasonable amount of time */ +WARN_ON_ONCE (delta > (u64 )NSEC_PER_SEC *3 ); + curr->sched_class->task_tick (rq, curr,0 ); +rq_unlock_irq (rq, &rf); + } + +/* +* Perform remote tick every second. The arbitrary frequence is +* large enough to avoid overload and short enough to keep sched +* internal stats alive. +*/ +queue_delayed_work (system_unbound_wq, dwork,HZ ); +} + +static void sched_tick_start (int cpu) +{ +struct tick_work *twork; + +if (housekeeping_cpu (cpu,HK_FLAG_TICK )) +return ; + +WARN_ON_ONCE (!tick_work_cpu); + + twork =per_cpu_ptr (tick_work_cpu, cpu); + twork->cpu = cpu; +INIT_DELAYED_WORK (&twork->work, sched_tick_remote); +queue_delayed_work (system_unbound_wq, &twork->work,HZ ); +} + +#ifdef CONFIG_HOTPLUG_CPU +static void sched_tick_stop (int cpu) +{ +struct tick_work *twork; + +if (housekeeping_cpu (cpu,HK_FLAG_TICK )) +return ; + +WARN_ON_ONCE (!tick_work_cpu); + + twork =per_cpu_ptr (tick_work_cpu, cpu); +cancel_delayed_work_sync (&twork->work); +} +#endif /* CONFIG_HOTPLUG_CPU */ + +int __init sched_tick_offload_init (void ) +{ + tick_work_cpu = alloc_percpu(struct tick_work); +if (!tick_work_cpu) { +pr_err ("Can't allocate remote tick struct\n" ); +return -ENOMEM ; + } + +return 0 ; +} + +#else +static void sched_tick_start (int cpu) { } +static void sched_tick_stop (int cpu) { } +#endif /* CONFIG_NO_HZ_FULL */ #if defined(CONFIG_PREEMPT ) && (defined(CONFIG_DEBUG_PREEMPT ) || \ defined(CONFIG_PREEMPT_TRACER ))
@@ -5781,6 +5868,7 @@ int sched_cpu_starting(unsigned int cpu) {set_cpu_rq_start_time (cpu);sched_rq_cpu_starting (cpu); +sched_tick_start (cpu);return 0 ; }
@@ -5792,6 +5880,7 @@ int sched_cpu_dying(unsigned int cpu)/* Handle pending wakeups and then migrate everything off */ sched_ttwu_pending (); +sched_tick_stop (cpu);rq_lock_irqsave (rq, &rf);if (rq->rd) {
kernel/sched/isolation.c +4 -0
@@ -13,6 +13,7 @@#include <linux/kernel.h> #include <linux/static_key.h> #include <linux/ctype.h> +#include "sched.h" DEFINE_STATIC_KEY_FALSE (housekeeping_overriden);EXPORT_SYMBOL_GPL (housekeeping_overriden);
@@ -61,6 +62,9 @@ void __init housekeeping_init(void)static_branch_enable (&housekeeping_overriden); +if (housekeeping_flags &HK_FLAG_TICK ) +sched_tick_offload_init (); +/* We need at least one CPU to handle housekeeping work */ WARN_ON_ONCE (cpumask_empty (housekeeping_mask)); }
kernel/sched/sched.h +2 -0
@@ -1574,6 +1574,7 @@ extern void post_init_entity_util_avg(struct sched_entity *se);#ifdef CONFIG_NO_HZ_FULL extern bool sched_can_stop_tick (struct rq *rq); +extern int __init sched_tick_offload_init (void );/* * Tick may be needed by tasks in the runqueue depending on their policy and
@@ -1598,6 +1599,7 @@ static inline void sched_update_tick_dependency(struct rq *rq) tick_nohz_dep_set_cpu(cpu, TICK_DEP_BIT_SCHED); }#else +static inline int sched_tick_offload_init (void ) {return 0 ; }static inline void sched_update_tick_dependency (struct rq *rq) { }#endif
Signature · 1 line
2.7.4
Ingo Molnar
maintainerRe: [PATCH 4/6] sched/isolation: Residual 1Hz scheduler tick offload
Quoted 53 lines · Frederic Weisbecker
When a CPU runs in full dynticks mode, a 1Hz tick remains in order to keep the scheduler stats alive. However this residual tick is a burden for bare metal tasks that can't stand any interruption at all, or want to minimize them.
The usual boot parameters "nohz_full=" or "isolcpus=nohz" will now outsource these scheduler ticks to the global workqueue so that a housekeeping CPU handles those remotely. The
sched_class::task_tick()implementations have been audited and look safe to be called remotely as the target runqueue and its current task are passed in parameter and don't seem to be accessed locally.Note that in the case of using isolcpus, it's still up to the user to affine the global workqueues to the housekeeping CPUs through
/sys/devices/virtual/workqueue/cpumaskor domains isolation "isolcpus=nohz,domain".Signed-off-by Frederic Weisbecker <[email protected]>Cc Chris Metcalf <[email protected]>Cc Christoph Lameter <[email protected]>Cc Luiz Capitulino <[email protected]>Cc Mike Galbraith <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Rik van Riel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Wanpeng Li <[email protected]>Cc Ingo Molnar <[email protected]>--- kernel/sched/core.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- kernel/sched/isolation.c | 4 +++ kernel/sched/sched.h | 2 ++ 3 files changed, 96 insertions(+), 1 deletion(-)kernel/sched/core.c +10
-1@@ -3120,7 +3120,94 @@ u64 scheduler_tick_max_deferment(void)return jiffies_to_nsecs (next - now); } -#endif + +struct tick_work { +int cpu; +struct delayed_work work; +}; + +static struct tick_work __percpu *tick_work_cpu; + +static void sched_tick_remote (struct work_struct *work) +{
kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3142
Quoted 10 lines
kernel/sched/core.c +10
-0+struct delayed_work *dwork =to_delayed_work (work); + struct tick_work *twork = container_of(dwork, struct tick_work, work); +int cpu = twork->cpu; +struct rq *rq =cpu_rq (cpu); +struct rq_flags rf; + +/* +* Handle the tick only if it appears the remote CPU is running +* in full dynticks mode. The check is racy by nature, but +* missing a tick or having one too much is no big deal.
I'd suggest pointing out why it's no big deal:
* missing a tick or having one too much is no big deal,
* because the scheduler tick updates statistics and checks
* timeslices in a time-independent way, regardless of when
* exactly it is running.
kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3153
Quoted 11 lines
kernel/sched/core.c +11
-0+*/ +if (!idle_cpu (cpu) &&tick_nohz_tick_stopped_cpu (cpu)) { +struct task_struct *curr; +u64 delta; + +rq_lock_irq (rq, &rf); +update_rq_clock (rq); + curr = rq->curr; + delta =rq_clock_task (rq) - curr->se.exec_start; +/* Make sure we tick in a reasonable amount of time */ +WARN_ON_ONCE (delta > (u64 )NSEC_PER_SEC *3 );
Please add a newline before the comment, and I'd also suggest this wording:
/* Make sure the next tick runs within a reasonable amount of time: */
kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3164
Quoted 7 lines
kernel/sched/core.c +7
-0+/* +* Perform remote tick every second. The arbitrary frequence is +* large enough to avoid overload and short enough to keep sched +* internal stats alive. +*/ +queue_delayed_work (system_unbound_wq, dwork,HZ ); +}
Typo. I'd also suggest somewhat clearer wording:
/*
* Run the remote tick once per second (1Hz). This arbitrary
* frequency is large enough to avoid overload but short enough
* to keep scheduler internal stats reasonably up to date. */
Quoted 11 lines
kernel/sched/core.c +11
-0+#ifdef CONFIG_HOTPLUG_CPU +static void sched_tick_stop (int cpu) +{ +struct tick_work *twork; + +if (housekeeping_cpu (cpu,HK_FLAG_TICK )) +return ; + +WARN_ON_ONCE (!tick_work_cpu); + + twork =per_cpu_ptr (tick_work_cpu, cpu);
kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3201
Quoted 10 lines
kernel/sched/core.c +10
-0+cancel_delayed_work_sync (&twork->work); +} +#endif /* CONFIG_HOTPLUG_CPU */ + +int __init sched_tick_offload_init (void ) +{ + tick_work_cpu = alloc_percpu(struct tick_work); +if (!tick_work_cpu) { +pr_err ("Can't allocate remote tick struct\n" ); +return -ENOMEM ;
Printing a warning is not enough. If tick_work_cpu ends up being NULL, then the tick will crash AFAICS, due to:
kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3183
Quoted 2 lines
kernel/sched/core.c +2
-0+ twork =per_cpu_ptr (tick_work_cpu, cpu); +cancel_delayed_work_sync (&twork->work);
... it's much better to crash straight away - i.e. we should use panic().
kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3210
Quoted 4 lines
kernel/sched/core.c +4
-0+#else +static void sched_tick_start (int cpu) { } +static void sched_tick_stop (int cpu) { } +#endif /* CONFIG_NO_HZ_FULL */
So if we are using #if/else/endif markers, please use them in the #else branch when it's so short, where they are actually useful:
kernel/sched/core.c u64 scheduler_tick_max_deferment(void)
Quoted 4 lines
kernel/sched/core.c +4
-0+#else /* !CONFIG_NO_HZ_FULL: */ +static void sched_tick_start (int cpu) { } +static void sched_tick_stop (int cpu) { } +#endif
(also note the inversion)
Thanks,
Ingo
Frederic Weisbecker
maintainerRe: [PATCH 4/6] sched/isolation: Residual 1Hz scheduler tick offload
Quoted 145 lines · Ingo Molnar
Quoted 53 lines · Frederic Weisbecker
When a CPU runs in full dynticks mode, a 1Hz tick remains in order to keep the scheduler stats alive. However this residual tick is a burden for bare metal tasks that can't stand any interruption at all, or want to minimize them.
The usual boot parameters "nohz_full=" or "isolcpus=nohz" will now outsource these scheduler ticks to the global workqueue so that a housekeeping CPU handles those remotely. The
sched_class::task_tick()implementations have been audited and look safe to be called remotely as the target runqueue and its current task are passed in parameter and don't seem to be accessed locally.Note that in the case of using isolcpus, it's still up to the user to affine the global workqueues to the housekeeping CPUs through
/sys/devices/virtual/workqueue/cpumaskor domains isolation "isolcpus=nohz,domain".Signed-off-by Frederic Weisbecker <[email protected]>Cc Chris Metcalf <[email protected]>Cc Christoph Lameter <[email protected]>Cc Luiz Capitulino <[email protected]>Cc Mike Galbraith <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Rik van Riel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Wanpeng Li <[email protected]>Cc Ingo Molnar <[email protected]>--- kernel/sched/core.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- kernel/sched/isolation.c | 4 +++ kernel/sched/sched.h | 2 ++ 3 files changed, 96 insertions(+), 1 deletion(-)kernel/sched/core.c +10
-1@@ -3120,7 +3120,94 @@ u64 scheduler_tick_max_deferment(void)return jiffies_to_nsecs (next - now); } -#endif + +struct tick_work { +int cpu; +struct delayed_work work; +}; + +static struct tick_work __percpu *tick_work_cpu; + +static void sched_tick_remote (struct work_struct *work) +{kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3142
Quoted 10 lines
kernel/sched/core.c +10
-0+struct delayed_work *dwork =to_delayed_work (work); + struct tick_work *twork = container_of(dwork, struct tick_work, work); +int cpu = twork->cpu; +struct rq *rq =cpu_rq (cpu); +struct rq_flags rf; + +/* +* Handle the tick only if it appears the remote CPU is running +* in full dynticks mode. The check is racy by nature, but +* missing a tick or having one too much is no big deal. I'd suggest pointing out why it's no big deal:
* missing a tick or having one too much is no big deal,
* because the scheduler tick updates statistics and checks
* timeslices in a time-independent way, regardless of when
* exactly it is running.kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3153
Quoted 11 lines
kernel/sched/core.c +11
-0+*/ +if (!idle_cpu (cpu) &&tick_nohz_tick_stopped_cpu (cpu)) { +struct task_struct *curr; +u64 delta; + +rq_lock_irq (rq, &rf); +update_rq_clock (rq); + curr = rq->curr; + delta =rq_clock_task (rq) - curr->se.exec_start; +/* Make sure we tick in a reasonable amount of time */ +WARN_ON_ONCE (delta > (u64 )NSEC_PER_SEC *3 );Please add a newline before the comment, and I'd also suggest this wording:
/* Make sure the next tick runs within a reasonable amount of time: */kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3164
Quoted 7 lines
kernel/sched/core.c +7
-0+/* +* Perform remote tick every second. The arbitrary frequence is +* large enough to avoid overload and short enough to keep sched +* internal stats alive. +*/ +queue_delayed_work (system_unbound_wq, dwork,HZ ); +}Typo. I'd also suggest somewhat clearer wording:
/*
* Run the remote tick once per second (1Hz). This arbitrary
* frequency is large enough to avoid overload but short enough
* to keep scheduler internal stats reasonably up to date. */Quoted 11 lines
kernel/sched/core.c +11
-0+#ifdef CONFIG_HOTPLUG_CPU +static void sched_tick_stop (int cpu) +{ +struct tick_work *twork; + +if (housekeeping_cpu (cpu,HK_FLAG_TICK )) +return ; + +WARN_ON_ONCE (!tick_work_cpu); + + twork =per_cpu_ptr (tick_work_cpu, cpu);kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3201
Quoted 10 lines
kernel/sched/core.c +10
-0+cancel_delayed_work_sync (&twork->work); +} +#endif /* CONFIG_HOTPLUG_CPU */ + +int __init sched_tick_offload_init (void ) +{ + tick_work_cpu = alloc_percpu(struct tick_work); +if (!tick_work_cpu) { +pr_err ("Can't allocate remote tick struct\n" ); +return -ENOMEM ;Printing a warning is not enough. If
tick_work_cpuends up being NULL, then the tick will crash AFAICS, due to:kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3183
Quoted 2 lines
kernel/sched/core.c +2
-0+ twork =per_cpu_ptr (tick_work_cpu, cpu); +cancel_delayed_work_sync (&twork->work);... it's much better to crash straight away - i.e. we should use
panic().kernel/sched/core.c u64 scheduler_tick_max_deferment(void) · line 3210
Quoted 4 lines
kernel/sched/core.c +4
-0+#else +static void sched_tick_start (int cpu) { } +static void sched_tick_stop (int cpu) { } +#endif /* CONFIG_NO_HZ_FULL */ So if we are using #if/else/endif markers, please use them in the #else branch when it's so short, where they are actually useful:
Quoted 6 lines
kernel/sched/core.c u64 scheduler_tick_max_deferment(void)
Quoted 4 lines
kernel/sched/core.c +4
-0+#else /* !CONFIG_NO_HZ_FULL: */ +static void sched_tick_start (int cpu) { } +static void sched_tick_stop (int cpu) { } +#endif (also note the inversion)
Ok for everything there, I'll fix.
Thanks!
Frederic Weisbecker
maintainerPATCH 5/6 sched/nohz: Remove the 1 Hz tick code
In reply to Frederic WeisbeckerNow that the 1Hz tick is offloaded to workqueues, we can safely remove the residual code that used to handle it locally.
--- include/linux/sched/nohz.h | 4 ---- kernel/sched/core.c | 29 ----------------------------- kernel/sched/idle_task.c | 1 - kernel/sched/sched.h | 11 +---------- kernel/time/tick-sched.c | 6 ------ 5 files changed, 1 insertion(+), 50 deletions(-)
include/linux/sched/nohz.h +0 -4
@@ -37,8 +37,4 @@ extern void wake_up_nohz_cpu(int cpu);static inline void wake_up_nohz_cpu (int cpu) { }#endif -#ifdef CONFIG_NO_HZ_FULL -extern u64 scheduler_tick_max_deferment (void ); -#endif -#endif /* _LINUX_SCHED_NOHZ_H */
kernel/sched/core.c +0 -29
@@ -3091,35 +3091,9 @@ void scheduler_tick(void) rq->idle_balance =idle_cpu (cpu);trigger_load_balance (rq);#endif -rq_last_tick_reset (rq); } #ifdef CONFIG_NO_HZ_FULL -/** - * scheduler_tick_max_deferment - * - * Keep at least one tick per second when a single - * active task is running because the scheduler doesn't - * yet completely support full dynticks environment. - * - * This makes sure that uptime, CFS vruntime, load - * balancing, etc... continue to move forward, even - * with a very low granularity. - * - * Return: Maximum deferment in nanoseconds. - */ -u64 scheduler_tick_max_deferment(void) -{ - struct rq *rq = this_rq(); - unsigned long next, now = READ_ONCE(jiffies); - - next = rq->last_sched_tick + HZ; - - if (time_before_eq(next, now)) - return 0; - - return jiffies_to_nsecs(next - now); -} struct tick_work { int cpu;
@@ -6108,9 +6082,6 @@ void __init sched_init(void) rq->last_load_update_tick = jiffies; rq->nohz_flags =0 ;#endif -#ifdef CONFIG_NO_HZ_FULL - rq->last_sched_tick =0 ; -#endif #endif /* CONFIG_SMP */ hrtick_rq_init (rq);atomic_set (&rq->nr_iowait,0 );
kernel/sched/idle_task.c +0 -1
@@ -48,7 +48,6 @@ dequeue_task_idle(struct rq *rq, struct task_struct *p, int flags)static void put_prev_task_idle (struct rq *rq,struct task_struct *prev) { -rq_last_tick_reset (rq); }static void task_tick_idle (struct rq *rq,struct task_struct *curr,int queued)
kernel/sched/sched.h +1 -10
@@ -727,9 +727,7 @@ struct rq {#endif /* CONFIG_SMP */ unsigned long nohz_flags;#endif /* CONFIG_NO_HZ_COMMON */ -#ifdef CONFIG_NO_HZ_FULL -unsigned long last_sched_tick; -#endif +/* capture load from *all* tasks on this cpu: */ struct load_weight load;unsigned long nr_load_updates;
@@ -1626,13 +1624,6 @@ static inline void sub_nr_running(struct rq *rq, unsigned count)sched_update_tick_dependency (rq); } -static inline void rq_last_tick_reset (struct rq *rq) -{ -#ifdef CONFIG_NO_HZ_FULL - rq->last_sched_tick = jiffies; -#endif -} -extern void update_rq_clock (struct rq *rq);extern void activate_task (struct rq *rq,struct task_struct *p,int flags);
kernel/time/tick-sched.c +0 -6
@@ -748,12 +748,6 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts, delta =KTIME_MAX ; } -#ifdef CONFIG_NO_HZ_FULL -/* Limit the tick delta to the maximum scheduler deferment */ -if (!ts->inidle) - delta =min (delta,scheduler_tick_max_deferment ()); -#endif -/* Calculate the next expiry time */ if (delta < (KTIME_MAX - basemono)) expires = basemono + delta;
Signature · 1 line
2.7.4
Frederic Weisbecker
maintainerPATCH 6/6 sched/isolation: Tick offload documentation
In reply to Frederic WeisbeckerUpdate the documentation to reflect the 1Hz tick offload changes.
--- Documentation/admin-guide/kernel-parameters.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Documentation/admin-guide/kernel-parameters.txt +5 -1
@@ -1762,7 +1762,11 @@ specified in the flag list (default: domain): nohz - Disable the tick when a single task runs. + Disable the tick when a single task runs. A residual 1Hz + tick is offloaded to workqueues that you need to affine + to housekeeping through the sysfs file + /sys/devices/virtual/workqueue/cpumask or using the below + domain flag. domain Isolate from the general SMP balancing and scheduling algorithms. Note that performing domain isolation this way
Signature · 1 line
2.7.4
Ingo Molnar
maintainerRe: [PATCH 6/6] sched/isolation: Tick offload documentation
Quoted 22 lines · Frederic Weisbecker
Update the documentation to reflect the 1Hz tick offload changes.
Signed-off-by Frederic Weisbecker <[email protected]>Cc Chris Metcalf <[email protected]>Cc Christoph Lameter <[email protected]>Cc Luiz Capitulino <[email protected]>Cc Mike Galbraith <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Rik van Riel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Wanpeng Li <[email protected]>Cc Ingo Molnar <[email protected]>--- Documentation/admin-guide/kernel-parameters.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)Documentation/admin-guide/kernel-parameters.txt +0
-0
Documentation/admin-guide/kernel-parameters.txt line 1769
Quoted 9 lines
Documentation/admin-guide/kernel-parameters.txt +5
-1@@ -1762,7 +1762,11 @@ specified in the flag list (default: domain): nohz - Disable the tick when a single task runs. + Disable the tick when a single task runs. A residual 1Hz + tick is offloaded to workqueues that you need to affine + to housekeeping through the sysfs file + /sys/devices/virtual/workqueue/cpumask or using the below + domain flag.
This is pretty ambiguous and somewhat confusing, I'd suggest something like:
nohz
Disable the tick when a single task runs.
A residual 1Hz tick is offloaded to workqueues, which you need to affine to housekeeping through the global workqueue's affinity configured via the /sys/devices/virtual/workqueue/cpumask sysfs file, or by using the 'domain' flag described below.
NOTE: by default the global workqueue runs on all CPUs, so to protect individual CPUs the 'cpumask' file has to be configured manually after bootup.
Assuming what I wrote is correct - the CPU isolation config space is pretty confusing all around and should be made a lot more human friendly ...
Thanks,
Ingo
Frederic Weisbecker
maintainerRe: [PATCH 6/6] sched/isolation: Tick offload documentation
Quoted 46 lines · Ingo Molnar
Quoted 22 lines · Frederic Weisbecker
Update the documentation to reflect the 1Hz tick offload changes.
Signed-off-by Frederic Weisbecker <[email protected]>Cc Chris Metcalf <[email protected]>Cc Christoph Lameter <[email protected]>Cc Luiz Capitulino <[email protected]>Cc Mike Galbraith <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Rik van Riel <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Wanpeng Li <[email protected]>Cc Ingo Molnar <[email protected]>--- Documentation/admin-guide/kernel-parameters.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)Documentation/admin-guide/kernel-parameters.txt +0
-0Documentation/admin-guide/kernel-parameters.txt line 1769
Quoted 9 lines
Documentation/admin-guide/kernel-parameters.txt +5
-1@@ -1762,7 +1762,11 @@ specified in the flag list (default: domain): nohz - Disable the tick when a single task runs. + Disable the tick when a single task runs. A residual 1Hz + tick is offloaded to workqueues that you need to affine + to housekeeping through the sysfs file + /sys/devices/virtual/workqueue/cpumask or using the below + domain flag.This is pretty ambiguous and somewhat confusing, I'd suggest something like:
nohz
Disable the tick when a single task runs.A residual 1Hz tick is offloaded to workqueues, which you need to affine to housekeeping through the global workqueue's affinity configured via the
/sys/devices/virtual/workqueue/cpumasksysfs file, or by using the 'domain' flag described below.
Quoted 6 lines
NOTE: by default the global workqueue runs on all CPUs, so to protect individual CPUs the 'cpumask' file has to be configured manually after bootup.
Assuming what I wrote is correct - the CPU isolation config space is pretty confusing all around and should be made a lot more human friendly ...
That's right. In fact "nohz_full=" affines the workqueues and it involves much
more: unbound timers affinity, RCU threads, etc...
So "nohz_full=" is the friendly interface as it does all in one.
Now the use of "isolcpus=" is supposed to be more finegrained and allow for more control. Ideally I would like to have an "unbound" flag which affines all these unbound works. And why not a "per_cpu" flag to disable or offload per cpu work such as watchdog.
So we would only need to do:
isolcpus=nohz,unbound,per_cpu
Or even just:
isolcpus=all
But before extending further isolcpus=, I would like to make sure I can make it mutable later through cpusets. So this is work in progress.
Thanks.
Ingo Molnar
maintainerQuoted 2 lines · Frederic Weisbecker
sched/isolation: Residual 1Hz scheduler tick offload sched/isolation: Tick offload documentation
Please try to start each title with a verb.
[ ... and preferably not by prepending 'do' ;-) ]
Beyond making changelogs more consistent, this will actually also add real information to the title, because, for example, any of these possible variants:
sched/isolation: Fix tick offload documentation sched/isolation: Update tick offload documentation sched/isolation: Add tick offload documentation sched/isolation: Remove tick offload documentation
sched/isolation: Fix residual 1Hz scheduler tick offload sched/isolation: Update residual 1Hz scheduler tick offload sched/isolation: Introduce residual 1Hz scheduler tick offload sched/isolation: Remove residual 1Hz scheduler tick offload
will tell us _a lot more_ about the nature of the changes from the shortlog alone!
Thanks,
Ingo
Frederic Weisbecker
maintainerQuoted 18 lines · Ingo Molnar
Quoted 2 lines · Frederic Weisbecker
sched/isolation: Residual 1Hz scheduler tick offload sched/isolation: Tick offload documentation
Please try to start each title with a verb.
[ ... and preferably not by prepending 'do' ;-) ]
Beyond making changelogs more consistent, this will actually also add real information to the title, because, for example, any of these possible variants:
sched/isolation: Fix tick offload documentation sched/isolation: Update tick offload documentation sched/isolation: Add tick offload documentation sched/isolation: Remove tick offload documentation
Quoted 6 lines
sched/isolation: Fix residual 1Hz scheduler tick offload sched/isolation: Update residual 1Hz scheduler tick offload sched/isolation: Introduce residual 1Hz scheduler tick offload sched/isolation: Remove residual 1Hz scheduler tick offload
will tell us _a lot
more_about the nature of the changes from the shortlog alone!
Good point, I get strange habits over the years.
Thanks.