Skip to contentSkip to conversation

nohz: A few improvements v3

PATCH In review Frederic Weisbecker 2 participants 8 messages Apr 24, 2015 – Apr 25, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover nohz: A few improvements v3

Since v2, this set only changes
"context_tracking: Inherit TIF_NOHZ through forks instead of context switches" which now warns when tasklist is populated earlier than expected as per Peterz suggestion.

Simpler.

git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
nohz/core

HEAD: 3c2b3b78a1cca2865a932d0265690997db9706b1

Thanks,
Frederic
---

Chris Metcalf (2):
nohz: Add tick_nohz_full_add_cpus_to() API
nohz: Set isolcpus when nohz_full is set

Frederic Weisbecker (2):
context_tracking: Protect against recursion
context_tracking: Inherit TIF_NOHZ through forks instead of context switches

 include/linux/context_tracking.h       | 10 -----
 include/linux/context_tracking_state.h |  1 +
 include/linux/sched.h                  |  3 ++
 include/linux/tick.h                   |  7 ++++
 kernel/context_tracking.c              | 69 +++++++++++++++++++++++-----------
 kernel/sched/core.c                    |  4 +-
 6 files changed, 61 insertions(+), 33 deletions(-)
#1 lore raw

PATCH 1/4 context_tracking: Protect against recursion

Context tracking recursion can happen when an exception triggers in the middle of a call to a context tracking probe.

This special case can be caused by vmalloc faults. If an access to a memory area allocated by vmalloc happens in the middle of context_tracking_enter(), we may run into an endless fault loop because the exception in turn calls context_tracking_enter() which faults on the same vmalloc'ed memory, triggering an exception again, etc...

Some rare crashes have been reported so lets protect against this with a recursion counter.

---
 include/linux/context_tracking_state.h |  1 +
 kernel/context_tracking.c              | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
include/linux/context_tracking_state.h +1 -0
index 6b7b96a..678ecdf 100644
@@ -12,6 +12,7 @@ struct context_tracking {
 	 * may be further optimized using static keys.
 	 */
 	bool active;
+	int recursion;
 	enum ctx_state {
 		CONTEXT_KERNEL = 0,
 		CONTEXT_USER,
kernel/context_tracking.c +30 -0
index 72d59a1..b9e0b4f 100644
@@ -38,6 +38,25 @@ void context_tracking_cpu_set(int cpu)
 	}
 }
 
+static bool context_tracking_recursion_enter(void)
+{
+	int recursion;
+
+	recursion = __this_cpu_inc_return(context_tracking.recursion);
+	if (recursion == 1)
+		return true;
+
+	WARN_ONCE((recursion < 1), "Invalid context tracking recursion value %d\n", recursion);
+	__this_cpu_dec(context_tracking.recursion);
+
+	return false;
+}
+
+static void context_tracking_recursion_exit(void)
+{
+	__this_cpu_dec(context_tracking.recursion);
+}
+
 /**
  * context_tracking_enter - Inform the context tracking that the CPU is going
  *                          enter user or guest space mode.
@@ -75,6 +94,11 @@ void context_tracking_enter(enum ctx_state state)
 	WARN_ON_ONCE(!current->mm);
 
 	local_irq_save(flags);
+	if (!context_tracking_recursion_enter()) {
+		local_irq_restore(flags);
+		return;
+	}
+
 	if ( __this_cpu_read(context_tracking.state) != state) {
 		if (__this_cpu_read(context_tracking.active)) {
 			/*
@@ -105,6 +129,7 @@ void context_tracking_enter(enum ctx_state state)
 		 */
 		__this_cpu_write(context_tracking.state, state);
 	}
+	context_tracking_recursion_exit();
 	local_irq_restore(flags);
 }
 NOKPROBE_SYMBOL(context_tracking_enter);
@@ -139,6 +164,10 @@ void context_tracking_exit(enum ctx_state state)
 		return;
 
 	local_irq_save(flags);
+	if (!context_tracking_recursion_enter()) {
+		local_irq_restore(flags);
+		return;
+	}
 	if (__this_cpu_read(context_tracking.state) == state) {
 		if (__this_cpu_read(context_tracking.active)) {
 			/*
@@ -153,6 +182,7 @@ void context_tracking_exit(enum ctx_state state)
 		}
 		__this_cpu_write(context_tracking.state, CONTEXT_KERNEL);
 	}
+	context_tracking_recursion_exit();
 	local_irq_restore(flags);
 }
 NOKPROBE_SYMBOL(context_tracking_exit);
Signature · 1 line
2.1.4
#2 lore raw

PATCH 2/4 context_tracking: Inherit TIF_NOHZ through forks instead of context switches

In reply to Frederic Weisbecker

TIF_NOHZ is used by context_tracking to force syscall slow-path on every task in order to track userspace roundtrips. As such, it must be set on all running tasks.

It's currently explicitly inherited through context switches. There is no need to do it on this fast-path though. The flag could be simply set once for all on all tasks, whether they are running or not.

Lets do this by setting the flag to init task on early boot and let it propagate through fork inheritance.

While at it mark context_tracking_cpu_set() as init code, we only need it at early boot time.

Cc Thomas Gleixner <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Rik van Riel <[email protected]>
Cc Paul E. McKenney <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Dave Jones <[email protected]>
Cc Oleg Nesterov <[email protected]>
---
 include/linux/context_tracking.h | 10 ---------
 include/linux/sched.h            |  3 +++
 kernel/context_tracking.c        | 45 ++++++++++++++++++----------------------
 kernel/sched/core.c              |  1 -
 4 files changed, 23 insertions(+), 36 deletions(-)
include/linux/context_tracking.h +0 -10
index 2821838..b96bd29 100644
@@ -14,8 +14,6 @@ extern void context_tracking_enter(enum ctx_state state);
 extern void context_tracking_exit(enum ctx_state state);
 extern void context_tracking_user_enter(void);
 extern void context_tracking_user_exit(void);
-extern void __context_tracking_task_switch(struct task_struct *prev,
-					   struct task_struct *next);
 
 static inline void user_enter(void)
 {
@@ -51,19 +49,11 @@ static inline void exception_exit(enum ctx_state prev_ctx)
 	}
 }
 
-static inline void context_tracking_task_switch(struct task_struct *prev,
-						struct task_struct *next)
-{
-	if (context_tracking_is_enabled())
-		__context_tracking_task_switch(prev, next);
-}
 #else
 static inline void user_enter(void) { }
 static inline void user_exit(void) { }
 static inline enum ctx_state exception_enter(void) { return 0; }
 static inline void exception_exit(enum ctx_state prev_ctx) { }
-static inline void context_tracking_task_switch(struct task_struct *prev,
-						struct task_struct *next) { }
 #endif /* !CONFIG_CONTEXT_TRACKING */
 
 
include/linux/sched.h +3 -0
index 8222ae4..f5d4f9e 100644
@@ -2540,6 +2540,9 @@ static inline unsigned long wait_task_inactive(struct task_struct *p,
 }
 #endif
 
+#define tasklist_empty() \
+	list_empty(&init_task.tasks)
+
 #define next_task(p) \
 	list_entry_rcu((p)->tasks.next, struct task_struct, tasks)
 
kernel/context_tracking.c +20 -25

58 lines not on this page · raw message

kernel/sched/core.c +0 -1
index d8a6196..6f149f8 100644
@@ -2338,7 +2338,6 @@ context_switch(struct rq *rq, struct task_struct *prev,
 	 */
 	spin_release(&rq->lock.dep_map, 1, _THIS_IP_);
 
-	context_tracking_task_switch(prev, next);
 	/* Here we just switch the register state and the stack. */
 	switch_to(prev, next, prev);
 	barrier();
Signature · 1 line
2.1.4
#3 lore raw

PATCH 3/4 nohz: Add tick_nohz_full_add_cpus_to() API

In reply to Frederic Weisbecker

From: Chris Metcalf <[email protected]>

This API is useful to modify a cpumask indicating some special nohz-type functionality so that the nohz cores are automatically added to that set.

---
 include/linux/tick.h | 7 +++++++
 1 file changed, 7 insertions(+)
include/linux/tick.h +7 -0
index f8492da5..4191b56 100644
@@ -134,6 +134,12 @@ static inline bool tick_nohz_full_cpu(int cpu)
 	return cpumask_test_cpu(cpu, tick_nohz_full_mask);
 }
 
+static inline void tick_nohz_full_add_cpus_to(struct cpumask *mask)
+{
+	if (tick_nohz_full_enabled())
+		cpumask_or(mask, mask, tick_nohz_full_mask);
+}
+
 extern void __tick_nohz_full_check(void);
 extern void tick_nohz_full_kick(void);
 extern void tick_nohz_full_kick_cpu(int cpu);
@@ -142,6 +148,7 @@ extern void __tick_nohz_task_switch(struct task_struct *tsk);
 #else
 static inline bool tick_nohz_full_enabled(void) { return false; }
 static inline bool tick_nohz_full_cpu(int cpu) { return false; }
+static inline void tick_nohz_full_add_cpus_to(struct cpumask *mask) { }
 static inline void __tick_nohz_full_check(void) { }
 static inline void tick_nohz_full_kick_cpu(int cpu) { }
 static inline void tick_nohz_full_kick(void) { }
Signature · 1 line
2.1.4
#4 lore raw

PATCH 4/4 nohz: Set isolcpus when nohz_full is set

In reply to Frederic Weisbecker

From: Chris Metcalf <[email protected]>

nohz_full is only useful with isolcpus also set, since otherwise the scheduler has to run periodically to try to determine whether to steal work from other cores.

Accordingly, when booting with nohz_full=xxx on the command line, we should act as if isolcpus=xxx was also set, and set (or extend) the isolcpus set to include the nohz_full cpus.

---
 kernel/sched/core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/sched/core.c +3 -0
index 6f149f8..e95b4d8 100644
@@ -7042,6 +7042,9 @@ void __init sched_init_smp(void)
 	alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);
 	alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
 
+	/* nohz_full won't take effect without isolating the cpus. */
+	tick_nohz_full_add_cpus_to(cpu_isolated_map);
+
 	sched_init_numa();
 
 	/*
Signature · 1 line
2.1.4
#5 lore raw

Re: [PATCH 4/4] nohz: Set isolcpus when nohz_full is set

Quoted 10 lines · On Friday 24 April 2015 11:58:31 Frederic Weisbecker wrote:

From: Chris Metcalf <[email protected]>

nohz_full is only useful with isolcpus also set, since otherwise the scheduler has to run periodically to try to determine whether to steal work from other cores.

Accordingly, when booting with nohz_full=xxx on the command line, we should act as if isolcpus=xxx was also set, and set (or extend) the isolcpus set to include the nohz_full cpus.

Quoted 12 lines

As a user of LinuxCNC, we expect the core(s) so isolated by the isolcpus argument at bootup time to remain undisturbed in order to preserve the I/O updates heartbeat latency at the absolute minimum that board and cpu combo can accomplish.

If this patch changes that behaviour such that the isolated core is grabbed for another job while the RTAI bits and pieces are loaded and running machinery, causing the machinery to lose this steady, possibly as little as a 20 microsecond period repeating operation heartbeat, this will quite effectively destroy our ability to run this software on linux without farming that whole operation out to intelligent I/O cards.

Please keep this in mind. I don't read the patch well enough to determine this myself.

Quoted 9 lines
---
 kernel/sched/core.c | 3 +++
 1 file changed, 3 insertions(+)
kernel/sched/core.c +0 -0
index 6f149f8..e95b4d8 100644

kernel/sched/core.c void __init sched_init_smp(void) · line 7050

Quoted 9 lines
kernel/sched/core.c +3 -0
@@ -7042,6 +7042,9 @@ void __init sched_init_smp(void)
 	alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);
 	alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
 
+	/* nohz_full won't take effect without isolating the cpus. */
+	tick_nohz_full_add_cpus_to(cpu_isolated_map);
+
 	sched_init_numa();
 
 	/*

Cheers, Gene Heskett

Signature · 4 lines
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
Genes Web page <http://geneslinuxbox.net:6309/gene>
#6 lore raw

Re: [PATCH 4/4] nohz: Set isolcpus when nohz_full is set

Quoted 36 lines · Gene Heskett
Quoted 10 lines · On Friday 24 April 2015 11:58:31 Frederic Weisbecker wrote:

From: Chris Metcalf <[email protected]>

nohz_full is only useful with isolcpus also set, since otherwise the scheduler has to run periodically to try to determine whether to steal work from other cores.

Accordingly, when booting with nohz_full=xxx on the command line, we should act as if isolcpus=xxx was also set, and set (or extend) the isolcpus set to include the nohz_full cpus.

Quoted 12 lines

As a user of LinuxCNC, we expect the core(s) so isolated by the isolcpus argument at bootup time to remain undisturbed in order to preserve the I/O updates heartbeat latency at the absolute minimum that board and cpu combo can accomplish.

If this patch changes that behaviour such that the isolated core is grabbed for another job while the RTAI bits and pieces are loaded and running machinery, causing the machinery to lose this steady, possibly as little as a 20 microsecond period repeating operation heartbeat, this will quite effectively destroy our ability to run this software on linux without farming that whole operation out to intelligent I/O cards.

Quoted 2 lines

Please keep this in mind. I don't read the patch well enough to determine this myself.

I think it's not a problem. This patch isn't adding any work or noise to isolcpus, it's actually setting CPUs that run tickless in userspace to be part of the isolcpus set, because we need userspace-tickless CPUs to not be disturbed at all. You shouldn't be concerned if you don't use full dynticks.

If you happen to use full dynticks in your usecase one day, you'll use it on your isolcpus anyway.

#7 lore raw

Re: [PATCH 4/4] nohz: Set isolcpus when nohz_full is set

Quoted 41 lines · On Saturday 25 April 2015 19:13:10 Frederic Weisbecker wrote:
Quoted 37 lines · Gene Heskett
Quoted 10 lines · On Friday 24 April 2015 11:58:31 Frederic Weisbecker wrote:

From: Chris Metcalf <[email protected]>

nohz_full is only useful with isolcpus also set, since otherwise the scheduler has to run periodically to try to determine whether to steal work from other cores.

Accordingly, when booting with nohz_full=xxx on the command line, we should act as if isolcpus=xxx was also set, and set (or extend) the isolcpus set to include the nohz_full cpus.

Quoted 12 lines

As a user of LinuxCNC, we expect the core(s) so isolated by the isolcpus argument at bootup time to remain undisturbed in order to preserve the I/O updates heartbeat latency at the absolute minimum that board and cpu combo can accomplish.

If this patch changes that behaviour such that the isolated core is grabbed for another job while the RTAI bits and pieces are loaded and running machinery, causing the machinery to lose this steady, possibly as little as a 20 microsecond period repeating operation heartbeat, this will quite effectively destroy our ability to run this software on linux without farming that whole operation out to intelligent I/O cards.

Quoted 2 lines

Please keep this in mind. I don't read the patch well enough to determine this myself.

Quoted 8 lines

I think it's not a problem. This patch isn't adding any work or noise to isolcpus, it's actually setting CPUs that run tickless in userspace to be part of the isolcpus set, because we need userspace-tickless CPUs to not be disturbed at all. You shouldn't be concerned if you don't use full dynticks.

If you happen to use full dynticks in your usecase one day, you'll use it on your isolcpus anyway.

TBT I am probably too paranoid for my own good, but I did want to be heard from the far corner of the cheap seats in the bleachers. I write my stuff in bash, but there are, I expect, some guys in our group who could given enough time, run down anything that breaks it for us and patch it back out. We are the guys who generally run an RTAI patched kernel anyway.

Some of the machinery driven by LinuxCNC is pretty good sized stuff, like a 5 axis milling machine in Cincinnati that may be the biggest one Cincinnati ever made, bed is 26 feet long, nearly 6 feet wide. The whole thing is a bit over 200k lbs. Bad controller, controller company gone, sold at scrap cheap. Adapted it to be run by LinuxCNC. After commissioning it, he turned his shop machinists loose to use it. First job was a locomotive axle bearing seat in a multi-ton truck casting, needed .001" tolerance for a shrink fitted bearing. Measured when done, it was off .0002" worst case. It has been detected by the seismographs at the UNI across town. :) My biggest machine is less than 200 lbs. Toy's IOW.

Thank you for taking the time to reply, Frederick. Its appreciated.

Cheers, Gene Heskett

Signature · 4 lines
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
Genes Web page <http://geneslinuxbox.net:6309/gene>