[patch] x86, tsc: reduce the TSC sync check time for core-siblings

* [patch] x86, tsc: reduce the TSC sync check time for core-siblings
@ 2012-02-07  2:32 Suresh Siddha
  2012-02-22 16:09 ` [tip:timers/core] x86/tsc: Reduce " tip-bot for Suresh Siddha
  0 siblings, 1 reply; 2+ messages in thread
From: Suresh Siddha @ 2012-02-07  2:32 UTC (permalink / raw)
  To: H. Peter Anvin, Ingo Molnar, Thomas Gleixner
  Cc: Arjan van de Ven, linux-kernel, Jack Steiner, venki

For each logical CPU that is coming online, we spend 20msec for checking
the TSC synchronization. And as this is done sequentially for each logical CPU
boot, this time gets added up depending on the number of logical CPU's
supported by the platform.

Minimize this by using the socket topology information.

If the target CPU coming online doesn't have any of its core-siblings
online, a timeout of 20msec will be used for the TSC-warp measurement
loop. Otherwise a smaller timeout of 2msec will be used, as we have some
information about this socket already (and this information grows as we
have more and more logical-siblings in that socket).

Ideally we should be able to skip the TSC sync check on the other
core-siblings, if the first logical CPU in a socket passed the sync test.
But as the TSC is per-logical CPU and can potentially be modified wrongly
by the bios before the OS boot, TSC sync test for smaller duration should
be able to catch such errors. Also this will catch the condition where all the
cores in the socket doesn't get reset at the same time.

For example, with this modification, time spent in TSC sync checks on a
4 socket 10-core with HT system gets reduced from 1580msec to 212msec.

Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
---
 arch/x86/kernel/tsc_sync.c |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index 9eba29b..cbf0b0f 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -42,7 +42,7 @@ static __cpuinitdata int nr_warps;
 /*
  * TSC-warp measurement loop running on both CPUs:
  */
-static __cpuinit void check_tsc_warp(void)
+static __cpuinit void check_tsc_warp(unsigned int timeout)
 {
 	cycles_t start, now, prev, end;
 	int i;
@@ -51,9 +51,9 @@ static __cpuinit void check_tsc_warp(void)
 	start = get_cycles();
 	rdtsc_barrier();
 	/*
-	 * The measurement runs for 20 msecs:
+	 * The measurement runs for 'timeout' msecs:
 	 */
-	end = start + tsc_khz * 20ULL;
+	end = start + (cycles_t) tsc_khz * timeout;
 	now = start;
 
 	for (i = 0; ; i++) {
@@ -99,6 +99,25 @@ static __cpuinit void check_tsc_warp(void)
 }
 
 /*
+ * If the target CPU coming online doesn't have any of its core-siblings
+ * online, a timeout of 20msec will be used for the TSC-warp measurement
+ * loop. Otherwise a smaller timeout of 2msec will be used, as we have some
+ * information about this socket already (and this information grows as we
+ * have more and more logical-siblings in that socket).
+ *
+ * Ideally we should be able to skip the TSC sync check on the other
+ * core-siblings, if the first logical CPU in a socket passed the sync test.
+ * But as the TSC is per-logical CPU and can potentially be modified wrongly
+ * by the bios, TSC sync test for smaller duration should be able
+ * to catch such errors. Also this will catch the condition where all the
+ * cores in the socket doesn't get reset at the same time.
+ */
+static inline unsigned int loop_timeout(int cpu)
+{
+	return (cpumask_weight(cpu_core_mask(cpu)) > 1) ? 2 : 20;
+}
+
+/*
  * Source CPU calls into this - it waits for the freshly booted
  * target CPU to arrive and then starts the measurement:
  */
@@ -135,7 +154,7 @@ void __cpuinit check_tsc_sync_source(int cpu)
 	 */
 	atomic_inc(&start_count);
 
-	check_tsc_warp();
+	check_tsc_warp(loop_timeout(cpu));
 
 	while (atomic_read(&stop_count) != cpus-1)
 		cpu_relax();
@@ -183,7 +202,7 @@ void __cpuinit check_tsc_sync_target(void)
 	while (atomic_read(&start_count) != cpus)
 		cpu_relax();
 
-	check_tsc_warp();
+	check_tsc_warp(loop_timeout(smp_processor_id()));
 
 	/*
 	 * Ok, we are done:



^ permalink raw reply related	[flat|nested] 2+ messages in thread