Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] i386: improve sched_clock() on i686

Browse Source 
Clean up sched_clock() on i686: it will use the TSC if available and falls
back to jiffies only if the user asked for it to be disabled via notsc or
the CPU calibration code didnt figure out the right cpu_khz.

This generally makes the scheduler timestamps more finegrained, on all
hardware.  (the current scheduler is pretty resistant against asynchronous
sched_clock() values on different CPUs, it will allow at most up to a jiffy
of jitter.)

Also simplify sched_clock()'s check for TSC availability: propagate the
desire and ability to use the TSC into the tsc_disable flag, previously
this flag only indicated whether the notsc option was passed.  This makes
the rare low-res sched_clock() codepath a single branch off a read-mostly
flag.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Ingo Molnar 2007-02-13 13:26:22 +01:00 committed by Andi Kleen
parent 2ff2d3d747
commit f9690982b8
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/i386/kernel/tsc.c
View File

@ -112,13 +112,10 @@ unsigned long long sched_clock(void)
return (*custom_sched_clock)(); return (*custom_sched_clock)();
/* /*
* in the NUMA case we dont use the TSC as they are not * Fall back to jiffies if there's no TSC available:
* synchronized across all CPUs.
*/ */
#ifndef CONFIG_NUMA if (unlikely(tsc_disable))
if (!cpu_khz || check_tsc_unstable()) /* No locking but a rare wrong value is not a big deal: */
#endif
/* no locking but a rare wrong value is not a big deal */
return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ); return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ);
/* read the Time Stamp Counter: */ /* read the Time Stamp Counter: */
@ -198,13 +195,13 @@ EXPORT_SYMBOL(recalibrate_cpu_khz);
void __init tsc_init(void) void __init tsc_init(void)
{ {
if (!cpu_has_tsc || tsc_disable) if (!cpu_has_tsc || tsc_disable)
return; goto out_no_tsc;
cpu_khz = calculate_cpu_khz(); cpu_khz = calculate_cpu_khz();
tsc_khz = cpu_khz; tsc_khz = cpu_khz;
if (!cpu_khz) if (!cpu_khz)
return; goto out_no_tsc;
printk("Detected %lu.%03lu MHz processor.\n", printk("Detected %lu.%03lu MHz processor.\n",
(unsigned long)cpu_khz / 1000, (unsigned long)cpu_khz / 1000,
@ -212,6 +209,15 @@ void __init tsc_init(void)
set_cyc2ns_scale(cpu_khz); set_cyc2ns_scale(cpu_khz);
use_tsc_delay(); use_tsc_delay();
return;
out_no_tsc:
/*
* Set the tsc_disable flag if there's no TSC support, this
* makes it a fast flag for the kernel to see whether it
* should be using the TSC.
*/
tsc_disable = 1;
} }
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ

2
include/asm-i386/bugs.h
View File

@ -160,7 +160,7 @@ static void __init check_config(void)
* If we configured ourselves for a TSC, we'd better have one! * If we configured ourselves for a TSC, we'd better have one!
*/ */
#ifdef CONFIG_X86_TSC #ifdef CONFIG_X86_TSC
if (!cpu_has_tsc) if (!cpu_has_tsc && !tsc_disable)
panic("Kernel compiled for Pentium+, requires TSC feature!"); panic("Kernel compiled for Pentium+, requires TSC feature!");
#endif #endif