Skip to contentSkip to conversation

sched,numa: decay wakee_flips instead of zeroing

RFC PATCH In review Rik van Riel 3 participants 6 messages May 16, 2014 – May 22, 2014 Scheduler

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 sched,numa: decay wakee_flips instead of zeroing

Affine wakeups have the potential to interfere with NUMA placement. If a task wakes up too many other tasks, affine wakeups will get disabled.

However, regardless of how many other tasks it wakes up, it gets re-enabled once a second, potentially interfering with NUMA placement of other tasks.

By decaying wakee_wakes in half instead of zeroing it, we can avoid that problem for some workloads.

---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
index 4f01e2f1..0381b11 100644
@@ -4009,7 +4009,7 @@ static void record_wakee(struct task_struct *p)
 	 * about the loss.
 	 */
 	if (jiffies > current->wakee_flip_decay_ts + HZ) {
-		current->wakee_flips = 0;
+		current->wakee_flips >>= 1;
 		current->wakee_flip_decay_ts = jiffies;
 	}
 
#1 lore raw

RFC PATCH 1/1 sched,numa: move tasks to preferred_node at wakeup time

I do not have performance numbers in yet, but with this patch on top of all the previous ones, I see RMA/LMA ratios (as reported by numatop) drop well below 1 for a SPECjbb2013, most of the time.

In other words, we actually manage to run the processes where their memory is most of the time. Sometimes tasks get moved away from their memory for a bit, but I suspect this patch is a move in the right direction.

With luck I will have performance numbers this afternoon (EST).

---8<---

Subject: sched,numa: move tasks to preferred_node at wakeup time

If a task is caught running off-node at wakeup time, check if it can be moved to its preferred node without creating a load imbalance.

This is only done when the system has already decided not to do an affine wakeup.

---
 kernel/sched/fair.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
kernel/sched/fair.c +75 -0
index 0381b11..bb5b048 100644
@@ -4178,6 +4178,79 @@ static int wake_wide(struct task_struct *p)
 	return 0;
 }
 
+#ifdef CONFIG_NUMA_BALANCING
+static int numa_balance_on_wake(struct task_struct *p, int prev_cpu)
+{
+	long load, src_load, dst_load;
+	int cur_node = cpu_to_node(prev_cpu);
+	struct numa_group *numa_group = ACCESS_ONCE(p->numa_group);
+	struct sched_domain *sd;
+	struct task_numa_env env = {
+		.p = p,
+		.best_task = NULL,
+		.best_imp = 0,
+		.best_cpu = -1
+	};
+
+	if (!sched_feat(NUMA))
+		return prev_cpu;
+
+	if (p->numa_preferred_nid == -1)
+		return prev_cpu;
+
+	if (p->numa_preferred_nid == cur_node);
+		return prev_cpu;
+
+	if (numa_group && node_isset(cur_node, numa_group->active_nodes))
+		return prev_cpu;
+
+	sd = rcu_dereference(per_cpu(sd_numa, env.src_cpu));
+	if (sd)
+		env.imbalance_pct = 100 + (sd->imbalance_pct - 100) / 2;
+
+	/*
+	 * Cpusets can break the scheduler domain tree into smaller
+	 * balance domains, some of which do not cross NUMA boundaries.
+	 * Tasks that are "trapped" in such domains cannot be migrated
+	 * elsewhere, so there is no point in (re)trying.
+	 */
+	if (unlikely(!sd)) {
+		p->numa_preferred_nid = cur_node;
+		return prev_cpu;
+	}
+
+	/*
+	 * Only allow p to move back to its preferred nid if
+	 * that does not create an imbalance that would cause
+	 * the load balancer to move a task around later.
+	 */
+	env.src_nid = cur_node;
+	env.dst_nid = p->numa_preferred_nid;
+
+	update_numa_stats(&env.src_stats, env.src_nid);
+	update_numa_stats(&env.dst_stats, env.dst_nid);
+
+	dst_load = env.dst_stats.load;
+	src_load = env.src_stats.load;
+
+	/* XXX missing power terms */
+	load = task_h_load(p);
+	dst_load += load;
+	src_load -= load;
+
+	if (load_too_imbalanced(env.src_stats.load, env.dst_stats.load,
+				src_load, dst_load, &env))
+		return prev_cpu;
+
+	return cpumask_first(cpumask_of_node(p->numa_preferred_nid));
+}
+#else
+static int numa_balance_on_wake(struct task_struct *p, int prev_cpu)
+{
+	return prev_cpu;
+}
+#endif
+
 static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)
 {
 	s64 this_load, load;
@@ -4440,6 +4513,8 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
 
 	if (affine_sd && cpu != prev_cpu && wake_affine(affine_sd, p, sync))
 		prev_cpu = cpu;
+	else if (sd_flag & SD_WAKE_AFFINE)
+		prev_cpu = numa_balance_on_wake(p, prev_cpu);
 
 	if (sd_flag & SD_BALANCE_WAKE) {
 		new_cpu = select_idle_sibling(p, prev_cpu);
maintainer
#2 lore raw

Re: [PATCH RFC] sched,numa: move tasks to preferred_node at wakeup time

Quoted 4 lines · Rik van Riel
kernel/sched/fair.c +4 -0
+#ifdef CONFIG_NUMA_BALANCING
+static int numa_balance_on_wake(struct task_struct *p, int prev_cpu)
+{
+	long load, src_load, dst_load;

kernel/sched/fair.c static int wake_wide(struct task_struct *p) · line 4193

Quoted 10 lines
kernel/sched/fair.c +9 -0
 
+	int cur_node = cpu_to_node(prev_cpu);
+	struct numa_group *numa_group = ACCESS_ONCE(p->numa_group);
+	struct sched_domain *sd;
+	struct task_numa_env env = {
+		.p = p,
+		.best_task = NULL,
+		.best_imp = 0,
+		.best_cpu = -1
+	};

That's all code, ideally you'd move that after we're done checking the reasons to not do work, say somehere like...

kernel/sched/fair.c static int wake_wide(struct task_struct *p) · line 4196

Quoted 3 lines
kernel/sched/fair.c +3 -0
+
+	if (!sched_feat(NUMA))
+		return prev_cpu;

Yah.. :-( I think some people changed that to numabalancing_enabled.

Fixing that is still on the todo list somewhere.

Quoted 11 lines
kernel/sched/fair.c +11 -0
+
+	if (p->numa_preferred_nid == -1)
+		return prev_cpu;
+
+	if (p->numa_preferred_nid == cur_node);
+		return prev_cpu;
+
+	if (numa_group && node_isset(cur_node, numa_group->active_nodes))
+		return prev_cpu;
+
+	sd = rcu_dereference(per_cpu(sd_numa, env.src_cpu));

kernel/sched/fair.c static int wake_wide(struct task_struct *p) · line 4217

Quoted 10 lines
kernel/sched/fair.c +10 -0
+	if (sd)
+		env.imbalance_pct = 100 + (sd->imbalance_pct - 100) / 2;
+
+	/*
+	 * Cpusets can break the scheduler domain tree into smaller
+	 * balance domains, some of which do not cross NUMA boundaries.
+	 * Tasks that are "trapped" in such domains cannot be migrated
+	 * elsewhere, so there is no point in (re)trying.
+	 */
+	if (unlikely(!sd)) {

How about you bail early, and then have the above test evaporate?

kernel/sched/fair.c static int wake_wide(struct task_struct *p) · line 4220

Quoted 3 lines
kernel/sched/fair.c +3 -0
+		p->numa_preferred_nid = cur_node;
+		return prev_cpu;
+	}

.. here.

Quoted 13 lines
kernel/sched/fair.c +13 -0
+
+	/*
+	 * Only allow p to move back to its preferred nid if
+	 * that does not create an imbalance that would cause
+	 * the load balancer to move a task around later.
+	 */
+	env.src_nid = cur_node;
+	env.dst_nid = p->numa_preferred_nid;
+
+	update_numa_stats(&env.src_stats, env.src_nid);
+	update_numa_stats(&env.dst_stats, env.dst_nid);
+
+	dst_load = env.dst_stats.load;

kernel/sched/fair.c static int wake_wide(struct task_struct *p) · line 4243

Quoted 10 lines
kernel/sched/fair.c +10 -0
+	src_load = env.src_stats.load;
+
+	/* XXX missing power terms */
+	load = task_h_load(p);
+	dst_load += load;
+	src_load -= load;
+
+	if (load_too_imbalanced(env.src_stats.load, env.dst_stats.load,
+				src_load, dst_load, &env))
+		return prev_cpu;

So I'm thinking that load_too_imbalanced() is from another patch I haven't yet seen, lemme go see if you did send it and I missed it.

Quoted 3 lines
kernel/sched/fair.c +3 -0
+
+	return cpumask_first(cpumask_of_node(p->numa_preferred_nid));
+}
maintainer
#3 lore raw
In reply to Rik van Riel
Quoted 10 lines · Rik van Riel

Affine wakeups have the potential to interfere with NUMA placement. If a task wakes up too many other tasks, affine wakeups will get disabled.

However, regardless of how many other tasks it wakes up, it gets re-enabled once a second, potentially interfering with NUMA placement of other tasks.

By decaying wakee_wakes in half instead of zeroing it, we can avoid that problem for some workloads.

See https://lkml.org/lkml/2013/7/2/110 and further

Quoted 10 lines
---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +0 -0
index 4f01e2f1..0381b11 100644

kernel/sched/fair.c static void record_wakee(struct task_struct *p) · line 4014

Quoted 7 lines
kernel/sched/fair.c +1 -1
@@ -4009,7 +4009,7 @@ static void record_wakee(struct task_struct *p)
 	 * about the loss.
 	 */
 	if (jiffies > current->wakee_flip_decay_ts + HZ) {
-		current->wakee_flips = 0;
+		current->wakee_flips >>= 1;
 		current->wakee_flip_decay_ts = jiffies;
 	}

Would it make sense to do something like:

	now = jiffies;
	while (current->wakee_flips && now > current->wakee_flip_decay_ts + HZ) {
		current->wakee_flips >>= 1;
		current->wakee_flip_decay_ts += HZ;
	}
	if (unlikely(now > current->wakee_flip_decay_ts + HZ))
		current->wakee_flip_decay_ts = now;

Or is that over engineering things?

#4 lore raw

[tip:sched/core] sched,numa: Decay wakee_flips instead of zeroing

In reply to Rik van Riel
sched,numa: Decay wakee_flips instead of zeroing
Commit-ID:  5658b4f43e63f8c7b4a27995dcb2cf43a52ee398
Gitweb:     http://git.kernel.org/tip/5658b4f43e63f8c7b4a27995dcb2cf43a52ee398
Author:     Rik van Riel <[email protected]>
AuthorDate: Fri, 16 May 2014 00:13:32 -0400
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 19 May 2014 22:02:43 +0900

sched,numa: Decay wakee_flips instead of zeroing

Affine wakeups have the potential to interfere with NUMA placement. If a task wakes up too many other tasks, affine wakeups will get disabled.

However, regardless of how many other tasks it wakes up, it gets re-enabled once a second, potentially interfering with NUMA placement of other tasks.

By decaying wakee_wakes in half instead of zeroing it, we can avoid that problem for some workloads.

---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
index 503f750..c9617b7 100644
@@ -4065,7 +4065,7 @@ static void record_wakee(struct task_struct *p)
 	 * about the loss.
 	 */
 	if (jiffies > current->wakee_flip_decay_ts + HZ) {
-		current->wakee_flips = 0;
+		current->wakee_flips >>= 1;
 		current->wakee_flip_decay_ts = jiffies;
 	}
 
#5 lore raw

[tip:sched/core] sched/numa: Decay -> wakee_flips instead of zeroing

In reply to Rik van Riel
sched/numa: Decay ->wakee_flips instead of zeroing
Commit-ID:  096aa33863a5e48de52d2ff30e0801b7487944f4
Gitweb:     http://git.kernel.org/tip/096aa33863a5e48de52d2ff30e0801b7487944f4
Author:     Rik van Riel <[email protected]>
AuthorDate: Fri, 16 May 2014 00:13:32 -0400
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 22 May 2014 11:16:41 +0200

sched/numa: Decay ->wakee_flips instead of zeroing

Affine wakeups have the potential to interfere with NUMA placement. If a task wakes up too many other tasks, affine wakeups will get disabled.

However, regardless of how many other tasks it wakes up, it gets re-enabled once a second, potentially interfering with NUMA placement of other tasks.

By decaying wakee_wakes in half instead of zeroing it, we can avoid that problem for some workloads.

---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/fair.c +1 -1
index 503f750..c9617b7 100644
@@ -4065,7 +4065,7 @@ static void record_wakee(struct task_struct *p)
 	 * about the loss.
 	 */
 	if (jiffies > current->wakee_flip_decay_ts + HZ) {
-		current->wakee_flips = 0;
+		current->wakee_flips >>= 1;
 		current->wakee_flip_decay_ts = jiffies;
 	}