39c715b717
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>
70 lines
1.6 KiB
C
70 lines
1.6 KiB
C
#ifndef __ASM_SMP_H
|
|
#define __ASM_SMP_H
|
|
|
|
#include <linux/config.h>
|
|
|
|
#if defined(CONFIG_SMP)
|
|
|
|
/* Page Zero Location PDC will look for the address to branch to when we poke
|
|
** slave CPUs still in "Icache loop".
|
|
*/
|
|
#define PDC_OS_BOOT_RENDEZVOUS 0x10
|
|
#define PDC_OS_BOOT_RENDEZVOUS_HI 0x28
|
|
|
|
#ifndef ASSEMBLY
|
|
#include <linux/bitops.h>
|
|
#include <linux/threads.h> /* for NR_CPUS */
|
|
#include <linux/cpumask.h>
|
|
typedef unsigned long address_t;
|
|
|
|
extern cpumask_t cpu_online_map;
|
|
|
|
|
|
/*
|
|
* Private routines/data
|
|
*
|
|
* physical and logical are equivalent until we support CPU hotplug.
|
|
*/
|
|
#define cpu_number_map(cpu) (cpu)
|
|
#define cpu_logical_map(cpu) (cpu)
|
|
|
|
extern void smp_send_reschedule(int cpu);
|
|
|
|
#endif /* !ASSEMBLY */
|
|
|
|
/*
|
|
* This magic constant controls our willingness to transfer
|
|
* a process across CPUs. Such a transfer incurs cache and tlb
|
|
* misses. The current value is inherited from i386. Still needs
|
|
* to be tuned for parisc.
|
|
*/
|
|
|
|
#define PROC_CHANGE_PENALTY 15 /* Schedule penalty */
|
|
|
|
#undef ENTRY_SYS_CPUS
|
|
#ifdef ENTRY_SYS_CPUS
|
|
#define STATE_RENDEZVOUS 0
|
|
#define STATE_STOPPED 1
|
|
#define STATE_RUNNING 2
|
|
#define STATE_HALTED 3
|
|
#endif
|
|
|
|
extern unsigned long cpu_present_mask;
|
|
|
|
#define raw_smp_processor_id() (current_thread_info()->cpu)
|
|
|
|
#endif /* CONFIG_SMP */
|
|
|
|
#define NO_PROC_ID 0xFF /* No processor magic marker */
|
|
#define ANY_PROC_ID 0xFF /* Any processor magic marker */
|
|
static inline int __cpu_disable (void) {
|
|
return 0;
|
|
}
|
|
static inline void __cpu_die (unsigned int cpu) {
|
|
while(1)
|
|
;
|
|
}
|
|
extern int __cpu_up (unsigned int cpu);
|
|
|
|
#endif /* __ASM_SMP_H */
|