[PATCH] smp_processor_id() cleanup (39c715b7) · Commits · 戴 / test

This patch implements a number of smp_processor_id() cleanup ideas that Arjan van de Ven and I came up with. The previous __smp_processor_id/_smp_processor_id/smp_processor_id API spaghetti was hard to follow both on the implementational and on the usage side. Some of the complexity arose from picking wrong names, some of the complexity comes from the fact that not all architectures defined __smp_processor_id. In the new code, there are two externally visible symbols: - smp_processor_id(): debug variant. - raw_smp_processor_id(): nondebug variant. Replaces all existing uses of _smp_processor_id() and __smp_processor_id(). Defined by every SMP architecture in include/asm-*/smp.h. There is one new internal symbol, dependent on DEBUG_PREEMPT: - debug_smp_processor_id(): internal debug variant, mapped to smp_processor_id(). Also, i moved debug_smp_processor_id() from lib/kernel_lock.c into a new lib/smp_processor_id.c file. All related comments got updated and/or clarified. I have build/boot tested the following 8 .config combinations on x86: {SMP,UP} x {PREEMPT,!PREEMPT} x {DEBUG_PREEMPT,!DEBUG_PREEMPT} I have also build/boot tested x64 on UP/PREEMPT/DEBUG_PREEMPT. (Other architectures are untested, but should work just fine.) Signed-off-by:

Ingo Molnar <mingo@elte.hu> Signed-off-by:

Arjan van de Ven <arjan@infradead.org> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

arch/i386/kernel/traps.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -306,7 +306,7 @@ void die(const char * str, struct pt_regs * regs, long err)
		};
		static int die_counter;

		if (die.lock_owner != _smp_processor_id()) {
		if (die.lock_owner != raw_smp_processor_id()) {
		console_verbose();
		spin_lock_irq(&die.lock);
		die.lock_owner = smp_processor_id();

arch/i386/lib/delay.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ inline void __const_udelay(unsigned long xloops)
		xloops *= 4;
		__asm__("mull %0"
		:"=d" (xloops), "=&a" (d0)
		:"1" (xloops),"0" (cpu_data[_smp_processor_id()].loops_per_jiffy * (HZ/4)));
		:"1" (xloops),"0" (cpu_data[raw_smp_processor_id()].loops_per_jiffy * (HZ/4)));
		__delay(++xloops);
		}

arch/ppc/lib/locks.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ void _raw_read_lock(rwlock_t *rw)
		while (!read_can_lock(rw)) {
		if (--stuck == 0) {
		printk("_read_lock(%p) CPU#%d lock %d\n",
		rw, _smp_processor_id(), rw->lock);
		rw, raw_smp_processor_id(), rw->lock);
		stuck = INIT_STUCK;
		}
		}
		@@ -158,7 +158,7 @@ void _raw_write_lock(rwlock_t *rw)
		while (!write_can_lock(rw)) {
		if (--stuck == 0) {
		printk("write_lock(%p) CPU#%d lock %d)\n",
		rw, _smp_processor_id(), rw->lock);
		rw, raw_smp_processor_id(), rw->lock);
		stuck = INIT_STUCK;
		}
		}

arch/ppc64/kernel/idle.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -292,7 +292,7 @@ static int native_idle(void)
		if (need_resched())
		schedule();

		if (cpu_is_offline(_smp_processor_id()) &&
		if (cpu_is_offline(raw_smp_processor_id()) &&
		system_state == SYSTEM_RUNNING)
		cpu_die();
		}

arch/sh/lib/delay.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ inline void __const_udelay(unsigned long xloops)
		__asm__("dmulu.l %0, %2\n\t"
		"sts mach, %0"
		: "=r" (xloops)
		: "0" (xloops), "r" (cpu_data[_smp_processor_id()].loops_per_jiffy)
		: "0" (xloops), "r" (cpu_data[raw_smp_processor_id()].loops_per_jiffy)
		: "macl", "mach");
		__delay(xloops * HZ);
		}

Admin message