Dipankar Sarma <dipankar@in.ibm.com> wrote in message
news:<linux.kernel.20020809020036.A5949@in.ibm.com>...
> Hi Ingo,
>
> I have been maintaining and using a 2.5 port of your smptimers A0
> and over a period of time have added/subtracted a few things.
>
> 1. I extended it to all architectures by calling run_local_timers()
> from the arch local timer interrupt handler. Anton has used it
> in ppc64, so atleast one non-x86 arch work.
> 2. I have removed TIMER_BH completely. To retain old BH locking
> symantics, I use a per-CPU tasklet which can be rescheduled
> if locking fails. This also makes sure that timers are strictly
> per-CPU.
> 3. Removal of TIMER_BH breaks sparc gettimeofday code since
> it checks TIMER_BH to adjust the clock offset and I have no
> idea how to fix this. There seems to be no maintainer for sparc.
> 4. To make old protocol code that assumes NET_BH style locking,
> I exported the net_bh_lock and used it to prevent timer from
> racing with old NET_BH code. A quick search shows the following
> code that may need cleanup -
>
> 802/psnap.c
> appletalk/ddp.c
> ax25/af_ax25.c
> core/ext8022.c
> econet/af_econet.c
> irda/irsyms.c
> x25/af_x25.c
>
> I have tested this patch with LTP and tiobench in a 4CPU PIII
> box and seems stable. Earlier versions of the same patch has
> been tested by wli and several others and used for performance
> measurement. However, I am not sure if I really got everything right.
>
> wli, X1 means apply it and keep your fingers crossed ;-)
>
> Comments/suggestions ?
>
> Thanks
> --
> Dipankar Sarma <dipankar@in.ibm.com> http://lse.sourceforge.net
> Linux Technology Center, IBM Software Lab, Bangalore, India.
>
>
> smptimers_X1-2.5.30-1.patch
> ---------------------------
>
> diff -urN linux-2.5.30-base/arch/alpha/kernel/smp.c
linux-2.5.30-smptimers_X1/arch/alpha/kernel/smp.c
> --- linux-2.5.30-base/arch/alpha/kernel/smp.c Fri Aug 2 02:46:16 2002
> +++ linux-2.5.30-smptimers_X1/arch/alpha/kernel/smp.c Thu Aug 8
17:00:08 2002
> @@ -24,6 +24,7 @@
> #include <linux/spinlock.h>
> #include <linux/irq.h>
> #include <linux/cache.h>
> +#include <linux/timer.h>
>
> #include <asm/hwrpb.h>
> #include <asm/ptrace.h>
> @@ -654,6 +655,7 @@
> if (softirq_pending(cpu))
> do_softirq();
> }
> + run_local_timers();
> }
>
> int __init
> diff -urN linux-2.5.30-base/arch/i386/kernel/apic.c
linux-2.5.30-smptimers_X1/arch/i386/kernel/apic.c
> --- linux-2.5.30-base/arch/i386/kernel/apic.c Fri Aug 2 02:46:25 2002
> +++ linux-2.5.30-smptimers_X1/arch/i386/kernel/apic.c Thu Aug 8
17:03:48 2002
> @@ -23,6 +23,7 @@
> #include <linux/interrupt.h>
> #include <linux/mc146818rtc.h>
> #include <linux/kernel_stat.h>
> +#include <linux/timer.h>
>
> #include <asm/atomic.h>
> #include <asm/smp.h>
> @@ -1089,6 +1090,7 @@
> irq_enter();
> smp_local_timer_interrupt(®s);
> irq_exit();
> + run_local_timers();
> }
>
> /*
> diff -urN linux-2.5.30-base/arch/i386/mm/fault.c
linux-2.5.30-smptimers_X1/arch/i386/mm/fault.c
> --- linux-2.5.30-base/arch/i386/mm/fault.c Fri Aug 2 02:46:01 2002
> +++ linux-2.5.30-smptimers_X1/arch/i386/mm/fault.c Thu Aug 8 17:05:12
2002
> @@ -99,18 +99,14 @@
> goto bad_area;
> }
>
> -extern spinlock_t timerlist_lock;
> -
> /*
> * Unlock any spinlocks which will prevent us from getting the
> - * message out (timerlist_lock is acquired through the
> - * console unblank code)
> + * message out
> */
> void bust_spinlocks(int yes)
> {
> int loglevel_save = console_loglevel;
>
> - spin_lock_init(&timerlist_lock);
> if (yes) {
> oops_in_progress = 1;
> return;
> diff -urN linux-2.5.30-base/arch/ia64/kernel/smp.c
linux-2.5.30-smptimers_X1/arch/ia64/kernel/smp.c
> --- linux-2.5.30-base/arch/ia64/kernel/smp.c Fri Aug 2 02:46:45 2002
> +++ linux-2.5.30-smptimers_X1/arch/ia64/kernel/smp.c Thu Aug 8
17:00:08 2002
> @@ -32,6 +32,7 @@
> #include <linux/cache.h>
> #include <linux/delay.h>
> #include <linux/cache.h>
> +#include <linux/timer.h>
>
> #include <asm/atomic.h>
> #include <asm/bitops.h>
> @@ -331,6 +332,7 @@
> local_cpu_data->prof_counter = local_cpu_data->prof_multiplier;
> update_process_times(user);
> }
> + run_local_timers();
> }
>
> /*
> diff -urN linux-2.5.30-base/arch/ia64/kernel/traps.c
linux-2.5.30-smptimers_X1/arch/ia64/kernel/traps.c
> --- linux-2.5.30-base/arch/ia64/kernel/traps.c Fri Aug 2 02:46:40
2002
> +++ linux-2.5.30-smptimers_X1/arch/ia64/kernel/traps.c Thu Aug 8
17:00:08 2002
> @@ -42,7 +42,6 @@
>
> #include <asm/fpswa.h>
>
> -extern spinlock_t timerlist_lock;
>
> static fpswa_interface_t *fpswa_interface;
>
> @@ -56,13 +55,12 @@
> }
>
> /*
> - * Unlock any spinlocks which will prevent us from getting the message
out (timerlist_lock
> + * Unlock any spinlocks which will prevent us from getting the message
out
> * is acquired through the console unblank code)
> */
> void
> bust_spinlocks (int yes)
> {
> - spin_lock_init(&timerlist_lock);
> if (yes) {
> oops_in_progress = 1;
> #ifdef CONFIG_SMP
> diff -urN linux-2.5.30-base/arch/mips64/mm/fault.c
linux-2.5.30-smptimers_X1/arch/mips64/mm/fault.c
> --- linux-2.5.30-base/arch/mips64/mm/fault.c Fri Aug 2 02:46:28 2002
> +++ linux-2.5.30-smptimers_X1/arch/mips64/mm/fault.c Thu Aug 8
17:00:08 2002
> @@ -58,16 +58,13 @@
> printk("Got exception 0x%lx at 0x%lx\n", retaddr, regs.cp0_epc);
> }
>
> -extern spinlock_t timerlist_lock;
>
> /*
> * Unlock any spinlocks which will prevent us from getting the
> - * message out (timerlist_lock is acquired through the
> - * console unblank code)
> + * message out
> */
> void bust_spinlocks(int yes)
> {
> - spin_lock_init(&timerlist_lock);
> if (yes) {
> oops_in_progress = 1;
> } else {
> diff -urN linux-2.5.30-base/arch/mips64/sgi-ip27/ip27-timer.c
linux-2.5.30-smptimers_X1/arch/mips64/sgi-ip27/ip27-timer.c
> --- linux-2.5.30-base/arch/mips64/sgi-ip27/ip27-timer.c Fri Aug 2
02:46:20 2002
> +++ linux-2.5.30-smptimers_X1/arch/mips64/sgi-ip27/ip27-timer.c Thu Aug
8 17:00:08 2002
> @@ -11,6 +11,7 @@
> #include <linux/param.h>
> #include <linux/timex.h>
> #include <linux/mm.h>
> +#include <linux/timer.h>
>
> #include <asm/pgtable.h>
> #include <asm/sgialib.h>
> @@ -123,6 +124,7 @@
> irq_exit(cpu, 0);
> }
> #endif /* CONFIG_SMP */
> + run_local_timers();
>
> /*
> * If we have an externally synchronized Linux clock, then update
> diff -urN linux-2.5.30-base/arch/ppc/kernel/time.c
linux-2.5.30-smptimers_X1/arch/ppc/kernel/time.c
> --- linux-2.5.30-base/arch/ppc/kernel/time.c Fri Aug 2 02:46:13 2002
> +++ linux-2.5.30-smptimers_X1/arch/ppc/kernel/time.c Thu Aug 8
17:09:23 2002
> @@ -59,6 +59,7 @@
> #include <linux/mc146818rtc.h>
> #include <linux/time.h>
> #include <linux/init.h>
> +#include <linux/timer.h>
>
> #include <asm/segment.h>
> #include <asm/io.h>
> @@ -215,6 +216,7 @@
> ppc_md.heartbeat();
>
> irq_exit();
> + run_local_timers();
> }
> #endif /* CONFIG_PPC_ISERIES */
>
> diff -urN linux-2.5.30-base/arch/ppc64/kernel/time.c
linux-2.5.30-smptimers_X1/arch/ppc64/kernel/time.c
> --- linux-2.5.30-base/arch/ppc64/kernel/time.c Fri Aug 2 02:46:35
2002
> +++ linux-2.5.30-smptimers_X1/arch/ppc64/kernel/time.c Thu Aug 8
17:00:08 2002
> @@ -46,6 +46,7 @@
> #include <linux/mc146818rtc.h>
> #include <linux/time.h>
> #include <linux/init.h>
> +#include <linux/timer.h>
>
> #include <asm/segment.h>
> #include <asm/io.h>
> @@ -293,6 +294,7 @@
>
> irq_exit();
>
> + run_local_timers();
> if (softirq_pending(cpu))
> do_softirq();
>
> diff -urN linux-2.5.30-base/arch/s390/kernel/time.c
linux-2.5.30-smptimers_X1/arch/s390/kernel/time.c
> --- linux-2.5.30-base/arch/s390/kernel/time.c Fri Aug 2 02:46:02 2002
> +++ linux-2.5.30-smptimers_X1/arch/s390/kernel/time.c Thu Aug 8
17:00:08 2002
> @@ -23,6 +23,7 @@
> #include <linux/init.h>
> #include <linux/smp.h>
> #include <linux/types.h>
> +#include <linux/timer.h>
>
> #include <asm/uaccess.h>
> #include <asm/delay.h>
> @@ -175,6 +176,7 @@
> #endif
>
> irq_exit(cpu, 0);
> + run_local_timers();
> }
>
> /*
> diff -urN linux-2.5.30-base/arch/s390/mm/fault.c
linux-2.5.30-smptimers_X1/arch/s390/mm/fault.c
> --- linux-2.5.30-base/arch/s390/mm/fault.c Fri Aug 2 02:46:33 2002
> +++ linux-2.5.30-smptimers_X1/arch/s390/mm/fault.c Thu Aug 8 17:00:08
2002
> @@ -37,16 +37,13 @@
>
> extern void die(const char *,struct pt_regs *,long);
>
> -extern spinlock_t timerlist_lock;
>
> /*
> * Unlock any spinlocks which will prevent us from getting the
> - * message out (timerlist_lock is acquired through the
> - * console unblank code)
> + * message out
> */
> void bust_spinlocks(int yes)
> {
> - spin_lock_init(&timerlist_lock);
> if (yes) {
> oops_in_progress = 1;
> } else {
> diff -urN linux-2.5.30-base/arch/s390x/kernel/time.c
linux-2.5.30-smptimers_X1/arch/s390x/kernel/time.c
> --- linux-2.5.30-base/arch/s390x/kernel/time.c Fri Aug 2 02:46:16
2002
> +++ linux-2.5.30-smptimers_X1/arch/s390x/kernel/time.c Thu Aug 8
17:00:08 2002
> @@ -23,6 +23,7 @@
> #include <linux/init.h>
> #include <linux/smp.h>
> #include <linux/types.h>
> +#include <linux/timer.h>
>
> #include <asm/uaccess.h>
> #include <asm/delay.h>
> @@ -148,6 +149,7 @@
> #endif
>
> irq_exit(cpu, 0);
> + run_local_timers();
> }
>
> /*
> diff -urN linux-2.5.30-base/arch/s390x/mm/fault.c
linux-2.5.30-smptimers_X1/arch/s390x/mm/fault.c
> --- linux-2.5.30-base/arch/s390x/mm/fault.c Fri Aug 2 02:46:18 2002
> +++ linux-2.5.30-smptimers_X1/arch/s390x/mm/fault.c Thu Aug 8 17:00:08
2002
> @@ -36,16 +36,13 @@
>
> extern void die(const char *,struct pt_regs *,long);
>
> -extern spinlock_t timerlist_lock;
>
> /*
> * Unlock any spinlocks which will prevent us from getting the
> - * message out (timerlist_lock is acquired through the
> - * console unblank code)
> + * message out
> */
> void bust_spinlocks(int yes)
> {
> - spin_lock_init(&timerlist_lock);
> if (yes) {
> oops_in_progress = 1;
> } else {
> diff -urN linux-2.5.30-base/arch/sparc/kernel/irq.c
linux-2.5.30-smptimers_X1/arch/sparc/kernel/irq.c
> --- linux-2.5.30-base/arch/sparc/kernel/irq.c Fri Aug 2 02:46:04 2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc/kernel/irq.c Thu Aug 8
17:00:08 2002
> @@ -73,7 +73,7 @@
> prom_halt();
> }
>
> -void (*init_timers)(void (*)(int, void *,struct pt_regs *)) =
> +void (*sparc_init_timers)(void (*)(int, void *,struct pt_regs *)) =
> (void (*)(void (*)(int, void *,struct pt_regs *))) irq_panic;
>
> /*
> diff -urN linux-2.5.30-base/arch/sparc/kernel/sun4c_irq.c
linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4c_irq.c
> --- linux-2.5.30-base/arch/sparc/kernel/sun4c_irq.c Fri Aug 2 02:46:06
2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4c_irq.c Thu Aug
8 17:00:08 2002
> @@ -143,7 +143,7 @@
> /* Errm.. not sure how to do this.. */
> }
>
> -static void __init sun4c_init_timers(void (*counter_fn)(int, void *,
struct pt_regs *))
> +static void __init sun4c_sparc_init_timers(void (*counter_fn)(int, void
*, struct pt_regs *))
> {
> int irq;
>
> @@ -221,7 +221,7 @@
> BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq,
BTFIXUPCALL_NOP);
> BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq,
BTFIXUPCALL_NOP);
> BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);
> - init_timers = sun4c_init_timers;
> + sparc_init_timers = sun4c_sparc_init_timers;
> #ifdef CONFIG_SMP
> BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);
> BTFIXUPSET_CALL(clear_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);
> diff -urN linux-2.5.30-base/arch/sparc/kernel/sun4d_irq.c
linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4d_irq.c
> --- linux-2.5.30-base/arch/sparc/kernel/sun4d_irq.c Fri Aug 2 02:46:00
2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4d_irq.c Thu Aug
8 17:00:08 2002
> @@ -436,7 +436,7 @@
> bw_set_prof_limit(cpu, limit);
> }
>
> -static void __init sun4d_init_timers(void (*counter_fn)(int, void *,
struct pt_regs *))
> +static void __init sun4d_sparc_init_timers(void (*counter_fn)(int, void
*, struct pt_regs *))
> {
> int irq;
> extern struct prom_cpuinfo linux_cpus[NR_CPUS];
> @@ -547,7 +547,7 @@
> BTFIXUPSET_CALL(clear_profile_irq, sun4d_clear_profile_irq,
BTFIXUPCALL_NORM);
> BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq,
BTFIXUPCALL_NORM);
> BTFIXUPSET_CALL(__irq_itoa, sun4d_irq_itoa, BTFIXUPCALL_NORM);
> - init_timers = sun4d_init_timers;
> + sparc_init_timers = sun4d_sparc_init_timers;
> #ifdef CONFIG_SMP
> BTFIXUPSET_CALL(set_cpu_int, sun4d_set_cpu_int, BTFIXUPCALL_NORM);
> BTFIXUPSET_CALL(clear_cpu_int, sun4d_clear_ipi, BTFIXUPCALL_NOP);
> diff -urN linux-2.5.30-base/arch/sparc/kernel/sun4d_smp.c
linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4d_smp.c
> --- linux-2.5.30-base/arch/sparc/kernel/sun4d_smp.c Fri Aug 2 02:46:07
2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4d_smp.c Thu Aug
8 17:00:08 2002
> @@ -18,6 +18,7 @@
> #include <linux/init.h>
> #include <linux/spinlock.h>
> #include <linux/mm.h>
> +#include <linux/timer.h>
>
> #include <asm/ptrace.h>
> #include <asm/atomic.h>
> @@ -465,6 +466,7 @@
>
> prof_counter[cpu] = prof_multiplier[cpu];
> }
> + run_local_timers();
> }
>
> extern unsigned int lvl14_resolution;
> diff -urN linux-2.5.30-base/arch/sparc/kernel/sun4m_irq.c
linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4m_irq.c
> --- linux-2.5.30-base/arch/sparc/kernel/sun4m_irq.c Fri Aug 2 02:46:27
2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4m_irq.c Thu Aug
8 17:00:08 2002
> @@ -223,7 +223,7 @@
> return buff;
> }
>
> -static void __init sun4m_init_timers(void (*counter_fn)(int, void *,
struct pt_regs *))
> +static void __init sun4m_sparc_init_timers(void (*counter_fn)(int, void
*, struct pt_regs *))
> {
> int reg_count, irq, cpu;
> struct linux_prom_registers cnt_regs[PROMREG_MAX];
> @@ -374,7 +374,7 @@
> BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq,
BTFIXUPCALL_NORM);
> BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq,
BTFIXUPCALL_NORM);
> BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);
> - init_timers = sun4m_init_timers;
> + sparc_init_timers = sun4m_sparc_init_timers;
> #ifdef CONFIG_SMP
> BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM);
> BTFIXUPSET_CALL(clear_cpu_int, sun4m_clear_ipi, BTFIXUPCALL_NORM);
> diff -urN linux-2.5.30-base/arch/sparc/kernel/sun4m_smp.c
linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4m_smp.c
> --- linux-2.5.30-base/arch/sparc/kernel/sun4m_smp.c Fri Aug 2 02:46:34
2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc/kernel/sun4m_smp.c Thu Aug
8 17:00:08 2002
> @@ -15,6 +15,7 @@
> #include <linux/init.h>
> #include <linux/spinlock.h>
> #include <linux/mm.h>
> +#include <linux/timer.h>
>
> #include <asm/ptrace.h>
> #include <asm/atomic.h>
> @@ -452,6 +453,7 @@
>
> prof_counter[cpu] = prof_multiplier[cpu];
> }
> + run_local_timers();
> }
>
> extern unsigned int lvl14_resolution;
> diff -urN linux-2.5.30-base/arch/sparc/kernel/time.c
linux-2.5.30-smptimers_X1/arch/sparc/kernel/time.c
> --- linux-2.5.30-base/arch/sparc/kernel/time.c Fri Aug 2 02:46:28
2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc/kernel/time.c Thu Aug 8
17:00:08 2002
> @@ -381,7 +381,7 @@
> else
> clock_probe();
>
> - init_timers(timer_interrupt);
> + sparc_init_timers(timer_interrupt);
>
> #ifdef CONFIG_SUN4
> if(idprom->id_machtype == (SM_SUN4 | SM_4_330)) {
> diff -urN linux-2.5.30-base/arch/sparc64/kernel/irq.c
linux-2.5.30-smptimers_X1/arch/sparc64/kernel/irq.c
> --- linux-2.5.30-base/arch/sparc64/kernel/irq.c Fri Aug 2 02:46:20
2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc64/kernel/irq.c Thu Aug 8
17:00:08 2002
> @@ -1032,7 +1032,7 @@
> }
>
> /* This is gets the master TICK_INT timer going. */
> -void init_timers(void (*cfunc)(int, void *, struct pt_regs *),
> +void sparc_init_timers(void (*cfunc)(int, void *, struct pt_regs *),
> unsigned long *clock)
> {
> unsigned long pstate;
> diff -urN linux-2.5.30-base/arch/sparc64/kernel/smp.c
linux-2.5.30-smptimers_X1/arch/sparc64/kernel/smp.c
> --- linux-2.5.30-base/arch/sparc64/kernel/smp.c Fri Aug 2 02:46:00
2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc64/kernel/smp.c Thu Aug 8
17:00:08 2002
> @@ -1061,6 +1061,7 @@
>
> prof_counter(cpu) = prof_multiplier(cpu);
> }
> + run_local_timers();
>
> /* Guarentee that the following sequences execute
> * uninterrupted.
> diff -urN linux-2.5.30-base/arch/sparc64/kernel/time.c
linux-2.5.30-smptimers_X1/arch/sparc64/kernel/time.c
> --- linux-2.5.30-base/arch/sparc64/kernel/time.c Fri Aug 2 02:46:26
2002
> +++ linux-2.5.30-smptimers_X1/arch/sparc64/kernel/time.c Thu Aug 8
17:00:08 2002
> @@ -613,7 +613,7 @@
> local_irq_restore(flags);
> }
>
> -extern void init_timers(void (*func)(int, void *, struct pt_regs *),
> +extern void sparc_init_timers(void (*func)(int, void *, struct pt_regs
*),
> unsigned long *);
>
> void __init time_init(void)
> @@ -624,7 +624,7 @@
> */
> unsigned long clock;
>
> - init_timers(timer_interrupt, &clock);
> + sparc_init_timers(timer_interrupt, &clock);
> timer_ticks_per_usec_quotient = ((1UL<<32) / (clock / 1000020));
> }
>
> diff -urN linux-2.5.30-base/arch/x86_64/kernel/apic.c
linux-2.5.30-smptimers_X1/arch/x86_64/kernel/apic.c
> --- linux-2.5.30-base/arch/x86_64/kernel/apic.c Fri Aug 2 02:46:09
2002
> +++ linux-2.5.30-smptimers_X1/arch/x86_64/kernel/apic.c Thu Aug 8
17:00:08 2002
> @@ -23,6 +23,7 @@
> #include <linux/interrupt.h>
> #include <linux/mc146818rtc.h>
> #include <linux/kernel_stat.h>
> +#include <linux/timer.h>
>
> #include <asm/atomic.h>
> #include <asm/smp.h>
> @@ -1069,6 +1070,7 @@
> smp_local_timer_interrupt(regs);
> irq_exit(cpu, 0);
>
> + run_local_timers();
> if (softirq_pending(cpu))
> do_softirq();
> }
> diff -urN linux-2.5.30-base/arch/x86_64/mm/fault.c
linux-2.5.30-smptimers_X1/arch/x86_64/mm/fault.c
> --- linux-2.5.30-base/arch/x86_64/mm/fault.c Fri Aug 2 02:46:02 2002
> +++ linux-2.5.30-smptimers_X1/arch/x86_64/mm/fault.c Thu Aug 8
17:00:08 2002
> @@ -32,11 +32,10 @@
>
> extern void die(const char *,struct pt_regs *,long);
>
> -extern spinlock_t console_lock, timerlist_lock;
> +extern spinlock_t console_lock;
>
> void bust_spinlocks(int yes)
> {
> - spin_lock_init(&timerlist_lock);
> if (yes) {
> oops_in_progress = 1;
> #ifdef CONFIG_SMP
> diff -urN linux-2.5.30-base/drivers/net/eepro100.c
linux-2.5.30-smptimers_X1/drivers/net/eepro100.c
> --- linux-2.5.30-base/drivers/net/eepro100.c Fri Aug 2 02:46:29 2002
> +++ linux-2.5.30-smptimers_X1/drivers/net/eepro100.c Thu Aug 8
17:00:08 2002
> @@ -1167,9 +1167,6 @@
> /* We must continue to monitor the media. */
> sp->timer.expires = RUN_AT(2*HZ); /* 2.0 sec. */
> add_timer(&sp->timer);
> -#if defined(timer_exit)
> - timer_exit(&sp->timer);
> -#endif
> }
>
> static void speedo_show_state(struct net_device *dev)
> diff -urN linux-2.5.30-base/include/asm-sparc/irq.h
linux-2.5.30-smptimers_X1/include/asm-sparc/irq.h
> --- linux-2.5.30-base/include/asm-sparc/irq.h Fri Aug 2 02:46:02 2002
> +++ linux-2.5.30-smptimers_X1/include/asm-sparc/irq.h Thu Aug 8
17:00:08 2002
> @@ -45,7 +45,7 @@
> #define clear_profile_irq(cpu) BTFIXUP_CALL(clear_profile_irq)(cpu)
> #define load_profile_irq(cpu,limit)
BTFIXUP_CALL(load_profile_irq)(cpu,limit)
>
> -extern void (*init_timers)(void (*lvl10_irq)(int, void *, struct pt_regs
*));
> +extern void (*sparc_init_timers)(void (*lvl10_irq)(int, void *, struct
pt_regs *));
> extern void claim_ticker14(void (*irq_handler)(int, void *, struct
pt_regs *),
> int irq,
> unsigned int timeout);
> diff -urN linux-2.5.30-base/include/asm-sparc64/irq.h
linux-2.5.30-smptimers_X1/include/asm-sparc64/irq.h
> --- linux-2.5.30-base/include/asm-sparc64/irq.h Fri Aug 2 02:46:27
2002
> +++ linux-2.5.30-smptimers_X1/include/asm-sparc64/irq.h Thu Aug 8
17:00:08 2002
> @@ -114,7 +114,7 @@
> extern void disable_irq(unsigned int);
> #define disable_irq_nosync disable_irq
> extern void enable_irq(unsigned int);
> -extern void init_timers(void (*lvl10_irq)(int, void *, struct pt_regs
*),
> +extern void sparc_init_timers(void (*lvl10_irq)(int, void *, struct
pt_regs *),
> unsigned long *);
> extern unsigned int build_irq(int pil, int inofixup, unsigned long iclr,
unsigned long imap);
> extern unsigned int sbus_build_irq(void *sbus, unsigned int ino);
> diff -urN linux-2.5.30-base/include/linux/interrupt.h
linux-2.5.30-smptimers_X1/include/linux/interrupt.h
> --- linux-2.5.30-base/include/linux/interrupt.h Fri Aug 2 02:46:01
2002
> +++ linux-2.5.30-smptimers_X1/include/linux/interrupt.h Thu Aug 8
18:39:47 2002
> @@ -27,7 +27,6 @@
> should come first */
>
> enum {
> - TIMER_BH = 0,
> TQUEUE_BH = 1,
> DIGI_BH = 2,
> SERIAL_BH = 3,
> @@ -225,6 +224,7 @@
>
> /* It is exported _ONLY_ for wait_on_irq(). */
> extern spinlock_t global_bh_lock;
> +extern spinlock_t net_bh_lock;
>
> static inline void mark_bh(int nr)
> {
> diff -urN linux-2.5.30-base/include/linux/timer.h
linux-2.5.30-smptimers_X1/include/linux/timer.h
> --- linux-2.5.30-base/include/linux/timer.h Fri Aug 2 02:46:10 2002
> +++ linux-2.5.30-smptimers_X1/include/linux/timer.h Thu Aug 8 17:11:20
2002
> @@ -2,8 +2,48 @@
> #define _LINUX_TIMER_H
>
> #include <linux/config.h>
> +#include <linux/smp.h>
> #include <linux/stddef.h>
> #include <linux/list.h>
> +#include <linux/spinlock.h>
> +#include <linux/cache.h>
> +
> +/*
> + * Event timer code
> + */
> +#define TVN_BITS 6
> +#define TVR_BITS 8
> +#define TVN_SIZE (1 << TVN_BITS)
> +#define TVR_SIZE (1 << TVR_BITS)
> +#define TVN_MASK (TVN_SIZE - 1)
> +#define TVR_MASK (TVR_SIZE - 1)
> +
> +typedef struct tvec_s {
> + int index;
> + struct list_head vec[TVN_SIZE];
> +} tvec_t;
> +
> +typedef struct tvec_root_s {
> + int index;
> + struct list_head vec[TVR_SIZE];
> +} tvec_root_t;
> +
> +#define NOOF_TVECS 5
> +
> +typedef struct timer_list timer_t;
> +
> +struct tvec_t_base_s {
> + spinlock_t lock;
> + unsigned long timer_jiffies;
> + volatile timer_t * volatile running_timer;
> + tvec_root_t tv1;
> + tvec_t tv2;
> + tvec_t tv3;
> + tvec_t tv4;
> + tvec_t tv5;
> +} ____cacheline_aligned_in_smp;
> +
> +typedef struct tvec_t_base_s tvec_base_t;
>
> /*
> * In Linux 2.4, static timers have been removed from the kernel.
> @@ -19,17 +59,26 @@
> unsigned long expires;
> unsigned long data;
> void (*function)(unsigned long);
> + tvec_base_t *base;
> };
>
> -extern void add_timer(struct timer_list * timer);
> -extern int del_timer(struct timer_list * timer);
> -
> +extern void add_timer(timer_t * timer);
> +extern int del_timer(timer_t * timer);
> +
> #ifdef CONFIG_SMP
> -extern int del_timer_sync(struct timer_list * timer);
> +extern int del_timer_sync(timer_t * timer);
> +extern void sync_timers(void);
> +#define timer_enter(base, t) do { base->running_timer = t; mb(); } while
(0)
> +#define timer_exit(base) do { base->running_timer = NULL; } while (0)
> +#define timer_is_running(base,t) (base->running_timer == t)
> +#define timer_synchronize(base,t) while (timer_is_running(base,t))
barrier()
> #else
> #define del_timer_sync(t) del_timer(t)
> +#define sync_timers() do { } while (0)
> +#define timer_enter(base,t) do { } while (0)
> +#define timer_exit(base) do { } while (0)
> #endif
> -
> +
> /*
> * mod_timer is a more efficient way to update the expire field of an
> * active timer (if the timer is inactive it will be activated)
> @@ -37,17 +86,38 @@
> * If the timer is known to be not pending (ie, in the handler),
mod_timer
> * is less efficient than a->expires = b; add_timer(a).
> */
> -int mod_timer(struct timer_list *timer, unsigned long expires);
> +int mod_timer(timer_t *timer, unsigned long expires);
>
> extern void it_real_fn(unsigned long);
>
> -static inline void init_timer(struct timer_list * timer)
> +extern void init_timers(void);
> +
> +#ifdef CONFIG_SMP
> +extern void run_local_timers(void);
> +#else
> +#define run_local_timers() do {} while(0)
> +#endif
> +
> +extern tvec_base_t tvec_bases[NR_CPUS];
> +
> +static inline void init_timer(timer_t * timer)
> {
> timer->list.next = timer->list.prev = NULL;
> + timer->base = tvec_bases + 0;
> }
>
> -static inline int timer_pending (const struct timer_list * timer)
> +#define TIMER_DEBUG 0
> +#if TIMER_DEBUG
> +# define CHECK_BASE(base) \
> + if (base && ((base < tvec_bases) || (base >= tvec_bases + NR_CPUS)))
\
> + BUG()
> +#else
> +# define CHECK_BASE(base)
> +#endif
> +
> +static inline int timer_pending(const timer_t * timer)
> {
> + CHECK_BASE(timer->base);
> return timer->list.next != NULL;
> }
>
> diff -urN linux-2.5.30-base/kernel/ksyms.c
linux-2.5.30-smptimers_X1/kernel/ksyms.c
> --- linux-2.5.30-base/kernel/ksyms.c Fri Aug 2 02:46:02 2002
> +++ linux-2.5.30-smptimers_X1/kernel/ksyms.c Thu Aug 8 17:00:08 2002
> @@ -409,6 +409,7 @@
> EXPORT_SYMBOL(del_timer_sync);
> #endif
> EXPORT_SYMBOL(mod_timer);
> +EXPORT_SYMBOL(tvec_bases);
> EXPORT_SYMBOL(tq_timer);
> EXPORT_SYMBOL(tq_immediate);
>
> diff -urN linux-2.5.30-base/kernel/sched.c
linux-2.5.30-smptimers_X1/kernel/sched.c
> --- linux-2.5.30-base/kernel/sched.c Fri Aug 2 02:46:15 2002
> +++ linux-2.5.30-smptimers_X1/kernel/sched.c Thu Aug 8 17:00:08 2002
> @@ -2071,7 +2071,7 @@
>
> #endif
>
> -extern void init_timervecs(void);
> +extern void init_timers(void);
> extern void timer_bh(void);
> extern void tqueue_bh(void);
> extern void immediate_bh(void);
> @@ -2110,8 +2110,7 @@
> set_task_cpu(current, smp_processor_id());
> wake_up_process(current);
>
> - init_timervecs();
> - init_bh(TIMER_BH, timer_bh);
> + init_timers();
> init_bh(TQUEUE_BH, tqueue_bh);
> init_bh(IMMEDIATE_BH, immediate_bh);
>
> diff -urN linux-2.5.30-base/kernel/softirq.c
linux-2.5.30-smptimers_X1/kernel/softirq.c
> --- linux-2.5.30-base/kernel/softirq.c Fri Aug 2 02:46:14 2002
> +++ linux-2.5.30-smptimers_X1/kernel/softirq.c Thu Aug 8 17:00:08
2002
> @@ -41,6 +41,12 @@
> irq_cpustat_t irq_stat[NR_CPUS];
>
> static struct softirq_action softirq_vec[32] __cacheline_aligned_in_smp;
> +/*
> + * This is required only to support single threaded network protocol
> + * code. (see net/core/dev.c) This should GO AWAY when those protocols
> + * are fixed.
> + */
> +spinlock_t net_bh_lock = SPIN_LOCK_UNLOCKED;
>
> /*
> * we cannot loop indefinitely here to avoid userspace starvation,
> diff -urN linux-2.5.30-base/kernel/timer.c
linux-2.5.30-smptimers_X1/kernel/timer.c
> --- linux-2.5.30-base/kernel/timer.c Fri Aug 2 02:46:16 2002
> +++ linux-2.5.30-smptimers_X1/kernel/timer.c Thu Aug 8 22:16:44 2002
> @@ -14,9 +14,13 @@
> * Copyright (C) 1998 Andrea Arcangeli
> * 1999-03-10 Improved NTP compatibility by Ulrich Windl
> * 2002-05-31 Move sys_sysinfo here and make its locking sane, Robert
Love
> + * 2000-10-05 Implemented scalable SMP per-CPU timer handling.
> + * Copyright (C) 2000 Ingo Molnar
> + * Designed by David S. Miller, Alexey Kuznetsov and Ingo
Molnar
> */
>
> #include <linux/config.h>
> +#include <linux/init.h>
> #include <linux/mm.h>
> #include <linux/timex.h>
> #include <linux/delay.h>
> @@ -24,6 +28,7 @@
> #include <linux/interrupt.h>
> #include <linux/tqueue.h>
> #include <linux/kernel_stat.h>
> +#include <linux/percpu.h>
>
> #include <asm/uaccess.h>
>
> @@ -80,83 +85,44 @@
> unsigned long prof_len;
> unsigned long prof_shift;
>
> -/*
> - * Event timer code
> - */
> -#define TVN_BITS 6
> -#define TVR_BITS 8
> -#define TVN_SIZE (1 << TVN_BITS)
> -#define TVR_SIZE (1 << TVR_BITS)
> -#define TVN_MASK (TVN_SIZE - 1)
> -#define TVR_MASK (TVR_SIZE - 1)
> -
> -struct timer_vec {
> - int index;
> - struct list_head vec[TVN_SIZE];
> -};
> -
> -struct timer_vec_root {
> - int index;
> - struct list_head vec[TVR_SIZE];
> -};
> -
> -static struct timer_vec tv5;
> -static struct timer_vec tv4;
> -static struct timer_vec tv3;
> -static struct timer_vec tv2;
> -static struct timer_vec_root tv1;
> -
> -static struct timer_vec * const tvecs[] = {
> - (struct timer_vec *)&tv1, &tv2, &tv3, &tv4, &tv5
> -};
> -
> -#define NOOF_TVECS (sizeof(tvecs) / sizeof(tvecs[0]))
> -
> -void init_timervecs (void)
> -{
> - int i;
> -
> - for (i = 0; i < TVN_SIZE; i++) {
> - INIT_LIST_HEAD(tv5.vec + i);
> - INIT_LIST_HEAD(tv4.vec + i);
> - INIT_LIST_HEAD(tv3.vec + i);
> - INIT_LIST_HEAD(tv2.vec + i);
> - }
> - for (i = 0; i < TVR_SIZE; i++)
> - INIT_LIST_HEAD(tv1.vec + i);
> -}
> +tvec_base_t tvec_bases[NR_CPUS] __cacheline_aligned;
>
> -static unsigned long timer_jiffies;
> +/* Fake initialization needed to avoid compiler breakage */
> +static struct tasklet_struct timer_tasklet __per_cpu_data = {NULL};
>
> -static inline void internal_add_timer(struct timer_list *timer)
> +/*
> + * This is the 'global' timer BH. This gets called only if one of
> + * the local timer interrupts couldnt run timers.
> + */
> +static inline void internal_add_timer(tvec_base_t *base, timer_t *timer)
> {
> /*
> * must be cli-ed when calling this
> */
> unsigned long expires = timer->expires;
> - unsigned long idx = expires - timer_jiffies;
> + unsigned long idx = expires - base->timer_jiffies;
> struct list_head * vec;
>
> if (idx < TVR_SIZE) {
> int i = expires & TVR_MASK;
> - vec = tv1.vec + i;
> + vec = base->tv1.vec + i;
> } else if (idx < 1 << (TVR_BITS + TVN_BITS)) {
> int i = (expires >> TVR_BITS) & TVN_MASK;
> - vec = tv2.vec + i;
> + vec = base->tv2.vec + i;
> } else if (idx < 1 << (TVR_BITS + 2 * TVN_BITS)) {
> int i = (expires >> (TVR_BITS + TVN_BITS)) & TVN_MASK;
> - vec = tv3.vec + i;
> + vec = base->tv3.vec + i;
> } else if (idx < 1 << (TVR_BITS + 3 * TVN_BITS)) {
> int i = (expires >> (TVR_BITS + 2 * TVN_BITS)) & TVN_MASK;
> - vec = tv4.vec + i;
> + vec = base->tv4.vec + i;
> } else if ((signed long) idx < 0) {
> /* can happen if you add a timer with expires == jiffies,
> * or you set a timer to go off in the past
> */
> - vec = tv1.vec + tv1.index;
> + vec = base->tv1.vec + base->tv1.index;
> } else if (idx <= 0xffffffffUL) {
> int i = (expires >> (TVR_BITS + 3 * TVN_BITS)) & TVN_MASK;
> - vec = tv5.vec + i;
> + vec = base->tv5.vec + i;
> } else {
> /* Can only get here on architectures with 64-bit jiffies */
> INIT_LIST_HEAD(&timer->list);
> @@ -168,36 +134,26 @@
> list_add(&timer->list, vec->prev);
> }
>
> -/* Initialize both explicitly - let's try to have them in the same cache
line */
> -spinlock_t timerlist_lock ____cacheline_aligned_in_smp =
SPIN_LOCK_UNLOCKED;
> -
> -#ifdef CONFIG_SMP
> -volatile struct timer_list * volatile running_timer;
> -#define timer_enter(t) do { running_timer = t; mb(); } while (0)
> -#define timer_exit() do { running_timer = NULL; } while (0)
> -#define timer_is_running(t) (running_timer == t)
> -#define timer_synchronize(t) while (timer_is_running(t)) barrier()
> -#else
> -#define timer_enter(t) do { } while (0)
> -#define timer_exit() do { } while (0)
> -#endif
> -
> -void add_timer(struct timer_list *timer)
> +void add_timer(timer_t *timer)
> {
> - unsigned long flags;
> -
> - spin_lock_irqsave(&timerlist_lock, flags);
> - if (unlikely(timer_pending(timer)))
> - goto bug;
> - internal_add_timer(timer);
> - spin_unlock_irqrestore(&timerlist_lock, flags);
> - return;
> + tvec_base_t * base = tvec_bases + smp_processor_id();
> + unsigned long flags;
> +
> + CHECK_BASE(base);
> + CHECK_BASE(timer->base);
> + spin_lock_irqsave(&base->lock, flags);
> + if (unlikely(timer_pending(timer)))
> + goto bug;
> + internal_add_timer(base, timer);
> + timer->base = base;
> + spin_unlock_irqrestore(&base->lock, flags);
> + return;
> bug:
> - spin_unlock_irqrestore(&timerlist_lock, flags);
> - printk("bug: kernel timer added twice at %p.\n",
> - __builtin_return_address(0));
> + spin_unlock_irqrestore(&base->lock, flags);
> + printk("bug: kernel timer added twice at %p.\n",
> + __builtin_return_address(0));
> }
> -
> +
> static inline int detach_timer (struct timer_list *timer)
> {
> if (!timer_pending(timer))
> @@ -206,28 +162,80 @@
> return 1;
> }
>
> -int mod_timer(struct timer_list *timer, unsigned long expires)
> +/*
> + * mod_timer() has subtle locking semantics because parallel
> + * calls to it must happen serialized.
> + */
> +int mod_timer(timer_t *timer, unsigned long expires)
> {
> - int ret;
> + tvec_base_t *old_base, *new_base;
> unsigned long flags;
> + int ret;
> +
> + new_base = tvec_bases + smp_processor_id();
> + CHECK_BASE(new_base);
> +
> + local_irq_save(flags);
> +repeat:
> + old_base = timer->base;
> + CHECK_BASE(old_base);
> +
> + /*
> + * Prevent deadlocks via ordering by old_base < new_base.
> + */
> + if (old_base && (new_base != old_base)) {
> + if (old_base < new_base) {
> + spin_lock(&new_base->lock);
> + spin_lock(&old_base->lock);
> + } else {
> + spin_lock(&old_base->lock);
> + spin_lock(&new_base->lock);
> + }
> + /*
> + * Subtle, we rely on timer->base being always
> + * valid and being updated atomically.
> + */
> + if (timer->base != old_base) {
> + spin_unlock(&new_base->lock);
> + spin_unlock(&old_base->lock);
> + goto repeat;
> + }
> + } else
> + spin_lock(&new_base->lock);
>
> - spin_lock_irqsave(&timerlist_lock, flags);
> timer->expires = expires;
> ret = detach_timer(timer);
> - internal_add_timer(timer);
> - spin_unlock_irqrestore(&timerlist_lock, flags);
> + internal_add_timer(new_base, timer);
> + timer->base = new_base;
> +
> +
> + if (old_base && (new_base != old_base))
> + spin_unlock(&old_base->lock);
> + spin_unlock_irqrestore(&new_base->lock, flags);
> +
> return ret;
> }
>
> -int del_timer(struct timer_list * timer)
> +int del_timer(timer_t * timer)
> {
> - int ret;
> unsigned long flags;
> + tvec_base_t * base;
> + int ret;
>
> - spin_lock_irqsave(&timerlist_lock, flags);
> + CHECK_BASE(timer->base);
> + if (!timer->base)
> + return 0;
> +repeat:
> + base = timer->base;
> + spin_lock_irqsave(&base->lock, flags);
> + if (base != timer->base) {
> + spin_unlock_irqrestore(&base->lock, flags);
> + goto repeat;
> + }
> ret = detach_timer(timer);
> timer->list.next = timer->list.prev = NULL;
> - spin_unlock_irqrestore(&timerlist_lock, flags);
> + spin_unlock_irqrestore(&base->lock, flags);
> +
> return ret;
> }
>
> @@ -240,24 +248,34 @@
> * (for reference counting).
> */
>
> -int del_timer_sync(struct timer_list * timer)
> +int del_timer_sync(timer_t * timer)
> {
> + tvec_base_t * base;
> int ret = 0;
>
> + CHECK_BASE(timer->base);
> + if (!timer->base)
> + return 0;
> for (;;) {
> unsigned long flags;
> int running;
>
> - spin_lock_irqsave(&timerlist_lock, flags);
> +repeat:
> + base = timer->base;
> + spin_lock_irqsave(&base->lock, flags);
> + if (base != timer->base) {
> + spin_unlock_irqrestore(&base->lock, flags);
> + goto repeat;
> + }
> ret += detach_timer(timer);
> timer->list.next = timer->list.prev = 0;
> - running = timer_is_running(timer);
> - spin_unlock_irqrestore(&timerlist_lock, flags);
> + running = timer_is_running(base, timer);
> + spin_unlock_irqrestore(&base->lock, flags);
>
> if (!running)
> break;
>
> - timer_synchronize(timer);
> + timer_synchronize(base, timer);
> }
>
> return ret;
> @@ -265,7 +283,7 @@
> #endif
>
>
> -static inline void cascade_timers(struct timer_vec *tv)
> +static void cascade(tvec_base_t *base, tvec_t *tv)
> {
> /* cascade all the timers from tv up one level */
> struct list_head *head, *curr, *next;
> @@ -277,54 +295,68 @@
> * detach them individually, just clear the list afterwards.
> */
> while (curr != head) {
> - struct timer_list *tmp;
> + timer_t *tmp;
>
> - tmp = list_entry(curr, struct timer_list, list);
> + tmp = list_entry(curr, timer_t, list);
> + CHECK_BASE(tmp->base);
> + if (tmp->base != base)
> + BUG();
> next = curr->next;
> list_del(curr); // not needed
> - internal_add_timer(tmp);
> + internal_add_timer(base, tmp);
> curr = next;
> }
> INIT_LIST_HEAD(head);
> tv->index = (tv->index + 1) & TVN_MASK;
> }
>
> -static inline void run_timer_list(void)
> +static void __run_timers(tvec_base_t *base)
> {
> - spin_lock_irq(&timerlist_lock);
> - while ((long)(jiffies - timer_jiffies) >= 0) {
> + unsigned long flags;
> +
> + spin_lock_irqsave(&base->lock, flags);
> + while ((long)(jiffies - base->timer_jiffies) >= 0) {
> struct list_head *head, *curr;
> - if (!tv1.index) {
> - int n = 1;
> - do {
> - cascade_timers(tvecs[n]);
> - } while (tvecs[n]->index == 1 && ++n < NOOF_TVECS);
> +
> + /*
> + * Cascade timers:
> + */
> + if (!base->tv1.index) {
> + cascade(base, &base->tv2);
> + if (base->tv2.index == 1) {
> + cascade(base, &base->tv3);
> + if (base->tv3.index == 1) {
> + cascade(base, &base->tv4);
> + if (base->tv4.index == 1)
> + cascade(base, &base->tv5);
> + }
> + }
> }
> repeat:
> - head = tv1.vec + tv1.index;
> + head = base->tv1.vec + base->tv1.index;
> curr = head->next;
> if (curr != head) {
> - struct timer_list *timer;
> void (*fn)(unsigned long);
> unsigned long data;
> + timer_t *timer;
>
> - timer = list_entry(curr, struct timer_list, list);
> + timer = list_entry(curr, timer_t, list);
> fn = timer->function;
> - data= timer->data;
> + data = timer->data;
>
> detach_timer(timer);
> timer->list.next = timer->list.prev = NULL;
> - timer_enter(timer);
> - spin_unlock_irq(&timerlist_lock);
> + timer_enter(base, timer);
> + spin_unlock_irq(&base->lock);
> fn(data);
> - spin_lock_irq(&timerlist_lock);
> - timer_exit();
> + spin_lock_irq(&base->lock);
> + timer_exit(base);
> goto repeat;
> }
> - ++timer_jiffies;
> - tv1.index = (tv1.index + 1) & TVR_MASK;
> + ++base->timer_jiffies;
> + base->tv1.index = (base->tv1.index + 1) & TVR_MASK;
> }
> - spin_unlock_irq(&timerlist_lock);
> + spin_unlock_irqrestore(&base->lock, flags);
> }
>
> spinlock_t tqueue_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
> @@ -636,17 +668,61 @@
> rwlock_t xtime_lock __cacheline_aligned_in_smp = RW_LOCK_UNLOCKED;
> unsigned long last_time_offset;
>
> +#ifdef CONFIG_SMP
> +
> +/*
> + * This function has to do all sorts of locking to make legacy
> + * BH-disablers work. If locking doesnt succeed
> + * now then we reschedule the tasklet.
> + */
> +static void run_timer_tasklet(unsigned long data)
> +{
> + int cpu = smp_processor_id();
> + tvec_base_t *base = tvec_bases + cpu;
> +
> + if (!spin_trylock(&global_bh_lock))
> + goto resched;
> +
> + if (!spin_trylock(&net_bh_lock))
> + goto resched_unlock;
> +
> + if ((long)(jiffies - base->timer_jiffies) >= 0)
> + __run_timers(base);
> +
> + spin_unlock(&net_bh_lock);
> + spin_unlock(&global_bh_lock);
> + return;
> +resched_unlock:
> + spin_unlock(&global_bh_lock);
> +resched:
> + tasklet_hi_schedule(&per_cpu(timer_tasklet, cpu));
> +}
> +
> +/*
> + * Called by the local, per-CPU timer interrupt on SMP.
> + *
> + */
> +void run_local_timers(void)
> +{
> + tasklet_hi_schedule(&this_cpu(timer_tasklet));
> +}
> +#else
> +static void run_timer_tasklet(unsigned long data)
> +{
> + tvec_base_t *base = tvec_bases + smp_processor_id();
> + if ((long)(jiffies - base->timer_jiffies) >= 0)
> + __run_timers(base);
> +}
> +#endif
> +
> +/*
> + * Called by the timer interrupt. xtime_lock must already be taken
> + * by the timer IRQ!
> + */
> static inline void update_times(void)
> {
> unsigned long ticks;
>
> - /*
> - * update_times() is run from the raw timer_bh handler so we
> - * just know that the irqs are locally enabled and so we don't
> - * need to save/restore the flags of the local CPU here. -arca
> - */
> - write_lock_irq(&xtime_lock);
> -
> ticks = jiffies - wall_jiffies;
> if (ticks) {
> wall_jiffies += ticks;
> @@ -654,15 +730,8 @@
> }
> last_time_offset = 0;
> calc_load(ticks);
> - write_unlock_irq(&xtime_lock);
> }
> -
> -void timer_bh(void)
> -{
> - update_times();
> - run_timer_list();
> -}
> -
> +
> void do_timer(struct pt_regs *regs)
> {
> jiffies_64++;
> @@ -670,8 +739,9 @@
> /* SMP process accounting uses the local APIC timer */
>
> update_process_times(user_mode(regs));
> + tasklet_hi_schedule(&this_cpu(timer_tasklet));
> #endif
> - mark_bh(TIMER_BH);
> + update_times();
> if (TQ_ACTIVE(tq_timer))
> mark_bh(TQUEUE_BH);
> }
> @@ -986,3 +1056,23 @@
>
> return 0;
> }
> +
> +void __init init_timers(void)
> +{
> + int i, j;
> +
> + for (i = 0; i < NR_CPUS; i++) {
> + tvec_base_t *base = tvec_bases + i;
> +
> + spin_lock_init(&base->lock);
> + for (j = 0; j < TVN_SIZE; j++) {
> + INIT_LIST_HEAD(base->tv5.vec + j);
> + INIT_LIST_HEAD(base->tv4.vec + j);
> + INIT_LIST_HEAD(base->tv3.vec + j);
> + INIT_LIST_HEAD(base->tv2.vec + j);
> + }
> + for (j = 0; j < TVR_SIZE; j++)
> + INIT_LIST_HEAD(base->tv1.vec + j);
> + tasklet_init(&per_cpu(timer_tasklet, i), run_timer_tasklet, 0);
> + }
> +}
> diff -urN linux-2.5.30-base/lib/bust_spinlocks.c
linux-2.5.30-smptimers_X1/lib/bust_spinlocks.c
> --- linux-2.5.30-base/lib/bust_spinlocks.c Fri Aug 2 02:46:13 2002
> +++ linux-2.5.30-smptimers_X1/lib/bust_spinlocks.c Thu Aug 8 17:00:08
2002
> @@ -14,11 +14,9 @@
> #include <linux/wait.h>
> #include <linux/vt_kern.h>
>
> -extern spinlock_t timerlist_lock;
>
> void bust_spinlocks(int yes)
> {
> - spin_lock_init(&timerlist_lock);
> if (yes) {
> oops_in_progress = 1;
> } else {
> diff -urN linux-2.5.30-base/net/core/dev.c
linux-2.5.30-smptimers_X1/net/core/dev.c
> --- linux-2.5.30-base/net/core/dev.c Fri Aug 2 02:46:26 2002
> +++ linux-2.5.30-smptimers_X1/net/core/dev.c Thu Aug 8 17:00:08 2002
> @@ -1293,7 +1293,6 @@
> static int deliver_to_old_ones(struct packet_type *pt,
> struct sk_buff *skb, int last)
> {
> - static spinlock_t net_bh_lock = SPIN_LOCK_UNLOCKED;
> int ret = NET_RX_DROP;
>
> if (!last) {
> @@ -1310,13 +1309,7 @@
>
> /* Emulate NET_BH with special spinlock */
> spin_lock(&net_bh_lock);
> -
> - /* Disable timers and wait for all timers completion */
> - tasklet_disable(bh_task_vec+TIMER_BH);
> -
> ret = pt->func(skb, skb->dev, pt);
> -
> - tasklet_hi_enable(bh_task_vec+TIMER_BH);
> spin_unlock(&net_bh_lock);
> out:
> return ret;
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel"
in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
An earlier port of this patch to 2.5.25 was tested for performance
using VolanoMark benchmark. The tests were run on a 8 way
system three times with and without smptimers patch and the
best of the three numbers was chosen for each case. The
results are as follows:
System Configuration:
Netfinity 8500R Intel Pentium III Xeon
700 MHz CPU, 1MB L2 Cache, 8 GB Memory
IBM Java J2RE 1.3.1 IBM build cxia-32131-20020302
256MB Heap size
VolanoMark 2.1.2 Loopback test, 1000 messages
For the 2.5.25 baseline, the thoughput was 51724 msg/sec;
the benchmark spent 39.05% of the time in user space,
and 54.16 % in the system space. The convergence of the test
was 0.492%.
For the 2.5.25 plus the 2.5.25 smptimers patch, the throughput
was 52564 msg/sec; the benchmark spent 40.16% of the time
in user space and 54.16% of the time in system space. The
convergence of the test was 0.468%
The smptimers patch improved throughput by 1.6%.
Efforts are underway to measure the performance impact on
2.5.30 and as soon as the results are available, I will share
it with the Open Source Community.
Partha
-------------------------------------------------------------------------------
Partha Narayanan
Linux Technology & Solutions Centre - Performance
(Tel) 512-838-8893 T/L 678-8893
email: partha@us.ibm.com
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Aug 15 2002 - 22:00:40 EST