VMI timer patches
Subsystems (2)
PATCH 6/6 VMI timer patches
VMI timer code. It works by taking over the local APIC clock when APIC is configured, which requires a couple hooks into the APIC code. The backend timer code could be commonized into the timer infrastructure, but there are some pieces missing (stolen time, in particular), and the exact semantics of when to do accounting for NO_IDLE need to be shared between different hypervisors as well. So for now, VMI timer is a separate module.
Subject: VMI timer patches
Signed-off-by Zachary Amsden <[email protected]>
arch/i386/Kconfig +9 -0
@@ -1227,3 +1227,12 @@ config KTIME_SCALAR config KTIME_SCALAR bool default y + +config NO_IDLE_HZ + bool + depends on PARAVIRT + default y + help + Switches the regular HZ timer off when the system is going idle. + This helps a hypervisor detect that the Linux system is idle, + reducing the overhead of idle systems.
arch/i386/kernel/Makefile +1 -1
@@ -40,7 +40,7 @@ obj-$(CONFIG_HPET_TIMER) += hpet.o obj-$(CONFIG_HPET_TIMER) += hpet.o obj-$(CONFIG_K8_NB) += k8.o -obj-$(CONFIG_VMI) += vmi.o +obj-$(CONFIG_VMI) += vmi.o vmitime.o # Make sure this is linked after any other paravirt_ops structs: see head.S obj-$(CONFIG_PARAVIRT) += paravirt.o
arch/i386/kernel/apic.c +1 -1
@@ -1395,7 +1395,7 @@ int __init APIC_init_uniprocessor (void)if (!skip_ioapic_setup && nr_ioapics)setup_IO_APIC ();#endif -setup_boot_APIC_clock (); +setup_boot_clock ();return 0 ; }
arch/i386/kernel/entry.S +5 -0
@@ -622,6 +622,11 @@ ENTRY(name) \ /* The include is where all of the SMP etc. interrupts come from */ #include "entry_arch.h" +/* This alternate entry is needed because we hijack the apic LVTT */ +#if defined(CONFIG_VMI) && defined(CONFIG_X86_LOCAL_APIC) +BUILD_INTERRUPT(apic_vmi_timer_interrupt,LOCAL_TIMER_VECTOR) +#endif + KPROBE_ENTRY(page_fault) RING0_EC_FRAME pushl $do_page_fault
arch/i386/kernel/paravirt.c +2 -0
@@ -544,6 +544,8 @@ struct paravirt_ops paravirt_ops = { .apic_write = native_apic_write, .apic_write_atomic = native_apic_write_atomic, .apic_read = native_apic_read, + .setup_boot_clock = setup_boot_APIC_clock, + .setup_secondary_clock = setup_secondary_APIC_clock, #endif .set_lazy_mode = (void *)native_nop,
arch/i386/kernel/smpboot.c +2 -2
@@ -556,7 +556,7 @@ static void __devinit start_secondary(vosmp_callin ();while (!cpu_isset (smp_processor_id (), smp_commenced_mask))rep_nop (); -setup_secondary_APIC_clock (); +setup_secondary_clock ();if (nmi_watchdog ==NMI_IO_APIC ) {disable_8259A_irq (0 );enable_NMI_through_LVT0 (NULL );
@@ -1330,7 +1330,7 @@ static void __init smp_boot_cpus(unsignesmpboot_setup_io_apic (); -setup_boot_APIC_clock (); +setup_boot_clock ();/* * Synchronize the TSC with the AP
arch/i386/kernel/time.c +3 -1
@@ -232,6 +232,7 @@ static void sync_cmos_clock(unsigned lonstatic void sync_cmos_clock (unsigned long dummy); static DEFINE_TIMER(sync_cmos_timer, sync_cmos_clock, 0, 0); +int no_sync_cmos_clock;static void sync_cmos_clock (unsigned long dummy) {
@@ -275,7 +276,8 @@ static void sync_cmos_clock(unsigned lonvoid notify_arch_cmos_timer (void ) { -mod_timer (&sync_cmos_timer, jiffies +1 ); +if (!no_sync_cmos_clock) +mod_timer (&sync_cmos_timer, jiffies +1 ); }static long clock_cmos_diff;
arch/i386/kernel/tsc.c +4 -0
@@ -23,6 +23,7 @@* an extra value to store the TSC freq */ unsigned int tsc_khz; +unsigned long long (*custom_sched_clock)(void );int tsc_disable__cpuinitdata =0 ;
@@ -107,6 +108,9 @@ unsigned long long sched_clock(void) {unsigned long long this_offset; +if (unlikely (custom_sched_clock)) +return (*custom_sched_clock)(); +/* * in the NUMA case we dont use the TSC as they are not * synchronized across all CPUs.
arch/i386/kernel/vmi.c +46 -1
78 lines not on this page · raw message
include/asm-i386/apic.h +2 -0
@@ -43,6 +43,8 @@ extern void generic_apic_probe(void);#define apic_write native_apic_write#define apic_write_atomic native_apic_write_atomic#define apic_read native_apic_read +#define setup_boot_clock setup_boot_APIC_clock +#define setup_secondary_clock setup_secondary_APIC_clock#endif static __inline fastcall void native_apic_write(unsigned long reg,
include/asm-i386/paravirt.h +12 -0
@@ -121,6 +121,8 @@ struct paravirt_ops void (fastcall *apic_write)(unsigned long reg, unsigned long v); void (fastcall *apic_write_atomic)(unsigned long reg, unsigned long v); unsigned long (fastcall *apic_read)(unsigned long reg); +void (*setup_boot_clock)(void ); +void (*setup_secondary_clock)(void );#endif void (fastcall *flush_tlb_user)(void);
@@ -323,6 +325,16 @@ static inline unsigned long apic_read(un {return paravirt_ops.apic_read (reg); } + +static inline void setup_boot_clock (void ) +{ + paravirt_ops.setup_boot_clock (); +} + +static inline void setup_secondary_clock (void ) +{ + paravirt_ops.setup_secondary_clock (); +}#endif #ifdef CONFIG_SMP
include/asm-i386/time.h +1 -0
@@ -30,6 +30,7 @@ static inline int native_set_wallclock(u#ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> +extern unsigned long long native_sched_clock (void );#else /* !CONFIG_PARAVIRT */ #define get_wallclock () native_get_wallclock()
include/asm-i386/timer.h +2 -0
@@ -9,6 +9,8 @@ extern int pit_latch_buggy;extern int pit_latch_buggy;extern int timer_ack;extern int no_timer_check; +extern unsigned long long (*custom_sched_clock)(void ); +extern int no_sync_cmos_clock;extern int recalibrate_cpu_khz (void );#endif
arch/i386/kernel/vmitime.c new file +494 -0
494 lines not on this page · raw message
include/asm-i386/vmi_time.h new file +103 -0
103 lines not on this page · raw message