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>
112 lines
2.9 KiB
C
112 lines
2.9 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General
|
|
* Public License. See the file "COPYING" in the main directory of this
|
|
* archive for more details.
|
|
*
|
|
* Copyright (C) 2000 - 2001 by Kanoj Sarcar (kanoj@sgi.com)
|
|
* Copyright (C) 2000 - 2001 by Silicon Graphics, Inc.
|
|
* Copyright (C) 2000, 2001, 2002 Ralf Baechle
|
|
* Copyright (C) 2000, 2001 Broadcom Corporation
|
|
*/
|
|
#ifndef __ASM_SMP_H
|
|
#define __ASM_SMP_H
|
|
|
|
#include <linux/config.h>
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
#include <linux/bitops.h>
|
|
#include <linux/linkage.h>
|
|
#include <linux/threads.h>
|
|
#include <linux/cpumask.h>
|
|
#include <asm/atomic.h>
|
|
|
|
#define raw_smp_processor_id() (current_thread_info()->cpu)
|
|
|
|
/* Map from cpu id to sequential logical cpu number. This will only
|
|
not be idempotent when cpus failed to come on-line. */
|
|
extern int __cpu_number_map[NR_CPUS];
|
|
#define cpu_number_map(cpu) __cpu_number_map[cpu]
|
|
|
|
/* The reverse map from sequential logical cpu number to cpu id. */
|
|
extern int __cpu_logical_map[NR_CPUS];
|
|
#define cpu_logical_map(cpu) __cpu_logical_map[cpu]
|
|
|
|
#define NO_PROC_ID (-1)
|
|
|
|
struct call_data_struct {
|
|
void (*func)(void *);
|
|
void *info;
|
|
atomic_t started;
|
|
atomic_t finished;
|
|
int wait;
|
|
};
|
|
|
|
extern struct call_data_struct *call_data;
|
|
|
|
#define SMP_RESCHEDULE_YOURSELF 0x1 /* XXX braindead */
|
|
#define SMP_CALL_FUNCTION 0x2
|
|
|
|
extern cpumask_t phys_cpu_present_map;
|
|
extern cpumask_t cpu_online_map;
|
|
#define cpu_possible_map phys_cpu_present_map
|
|
|
|
extern cpumask_t cpu_callout_map;
|
|
/* We don't mark CPUs online until __cpu_up(), so we need another measure */
|
|
static inline int num_booting_cpus(void)
|
|
{
|
|
return cpus_weight(cpu_callout_map);
|
|
}
|
|
|
|
/* These are defined by the board-specific code. */
|
|
|
|
/*
|
|
* Cause the function described by call_data to be executed on the passed
|
|
* cpu. When the function has finished, increment the finished field of
|
|
* call_data.
|
|
*/
|
|
extern void core_send_ipi(int cpu, unsigned int action);
|
|
|
|
/*
|
|
* Firmware CPU startup hook
|
|
*/
|
|
extern void prom_boot_secondary(int cpu, struct task_struct *idle);
|
|
|
|
/*
|
|
* After we've done initial boot, this function is called to allow the
|
|
* board code to clean up state, if needed
|
|
*/
|
|
extern void prom_init_secondary(void);
|
|
|
|
/*
|
|
* Detect available CPUs, populate phys_cpu_present_map before smp_init
|
|
*/
|
|
extern void prom_prepare_cpus(unsigned int max_cpus);
|
|
|
|
/*
|
|
* Last chance for the board code to finish SMP initialization before
|
|
* the CPU is "online".
|
|
*/
|
|
extern void prom_smp_finish(void);
|
|
|
|
/* Hook for after all CPUs are online */
|
|
extern void prom_cpus_done(void);
|
|
|
|
extern void asmlinkage smp_bootstrap(void);
|
|
|
|
/*
|
|
* this function sends a 'reschedule' IPI to another CPU.
|
|
* it goes straight through and wastes no time serializing
|
|
* anything. Worst case is that we lose a reschedule ...
|
|
*/
|
|
static inline void smp_send_reschedule(int cpu)
|
|
{
|
|
core_send_ipi(cpu, SMP_RESCHEDULE_YOURSELF);
|
|
}
|
|
|
|
extern asmlinkage void smp_call_function_interrupt(void);
|
|
|
|
#endif /* CONFIG_SMP */
|
|
|
|
#endif /* __ASM_SMP_H */
|