---

yaml
---
r: 158367
b: refs/heads/master
c: a52bfd7
h: refs/heads/master
i:
  158365: 19a29a5
  158363: 80438ca
  158359: 56a37c3
  158351: 8d5e933
  158335: 5d36b2e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc9fba7d7672fa3ed58d9d9ecb6c45b1351c29a6
+refs/heads/master: a52bfd73589eaf88d9c95ad2c1de0b38a6b27972

trunk/include/linux/sched.h

@@ -921,6 +921,7 @@ struct sched_domain {
 	unsigned int newidle_idx;
 	unsigned int wake_idx;
 	unsigned int forkexec_idx;
+	unsigned int smt_gain;
 	int flags;			/* See SD_* */
 	enum sched_domain_level level;
 

trunk/include/linux/topology.h

@@ -99,6 +99,7 @@ int arch_update_cpu_topology(void);
 				| SD_SHARE_CPUPOWER,	\
 	.last_balance		= jiffies,		\
 	.balance_interval	= 1,			\
+	.smt_gain		= 1178,	/* 15% */	\
 }
 #endif
 #endif /* CONFIG_SCHED_SMT */

trunk/kernel/sched.c

@@ -8523,9 +8523,15 @@ static void init_sched_groups_power(int cpu, struct sched_domain *sd)
 		weight = cpumask_weight(sched_domain_span(sd));
 		/*
 		 * SMT siblings share the power of a single core.
+		 * Usually multiple threads get a better yield out of
+		 * that one core than a single thread would have,
+		 * reflect that in sd->smt_gain.
 		 */
-		if ((sd->flags & SD_SHARE_CPUPOWER) && weight > 1)
+		if ((sd->flags & SD_SHARE_CPUPOWER) && weight > 1) {
+			power *= sd->smt_gain;
 			power /= weight;
+			power >>= SCHED_LOAD_SHIFT;
+		}
 		sg_inc_cpu_power(sd->groups, power);
 		return;
 	}