2005-09-08 04:59:48 +08:00
|
|
|
#ifndef _ASM_POWERPC_TOPOLOGY_H
|
|
|
|
#define _ASM_POWERPC_TOPOLOGY_H
|
2005-12-17 05:43:46 +08:00
|
|
|
#ifdef __KERNEL__
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
2006-05-02 03:16:12 +08:00
|
|
|
struct sys_device;
|
|
|
|
struct device_node;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
|
2005-09-08 04:59:48 +08:00
|
|
|
#include <asm/mmzone.h>
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static inline int cpu_to_node(int cpu)
|
|
|
|
{
|
2005-11-11 11:22:35 +08:00
|
|
|
return numa_cpu_lookup_table[cpu];
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#define parent_node(node) (node)
|
|
|
|
|
|
|
|
static inline cpumask_t node_to_cpumask(int node)
|
|
|
|
{
|
|
|
|
return numa_cpumask_lookup_table[node];
|
|
|
|
}
|
|
|
|
|
2008-12-26 19:53:39 +08:00
|
|
|
#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node])
|
|
|
|
|
2006-05-02 03:16:12 +08:00
|
|
|
int of_node_to_nid(struct device_node *device);
|
|
|
|
|
2006-06-10 18:53:06 +08:00
|
|
|
struct pci_bus;
|
2006-11-28 02:19:00 +08:00
|
|
|
#ifdef CONFIG_PCI
|
2006-06-10 18:53:06 +08:00
|
|
|
extern int pcibus_to_node(struct pci_bus *bus);
|
2006-11-28 02:19:00 +08:00
|
|
|
#else
|
|
|
|
static inline int pcibus_to_node(struct pci_bus *bus)
|
|
|
|
{
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif
|
2006-06-10 18:53:06 +08:00
|
|
|
|
|
|
|
#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \
|
|
|
|
CPU_MASK_ALL : \
|
|
|
|
node_to_cpumask(pcibus_to_node(bus)) \
|
|
|
|
)
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-12-26 19:53:39 +08:00
|
|
|
#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \
|
|
|
|
cpu_all_mask : \
|
|
|
|
cpumask_of_node(pcibus_to_node(bus)))
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* sched_domains SD_NODE_INIT for PPC64 machines */
|
|
|
|
#define SD_NODE_INIT (struct sched_domain) { \
|
|
|
|
.parent = NULL, \
|
2006-10-03 16:14:08 +08:00
|
|
|
.child = NULL, \
|
2005-04-17 06:20:36 +08:00
|
|
|
.groups = NULL, \
|
|
|
|
.min_interval = 8, \
|
|
|
|
.max_interval = 32, \
|
|
|
|
.busy_factor = 32, \
|
|
|
|
.imbalance_pct = 125, \
|
|
|
|
.cache_nice_tries = 1, \
|
2005-11-16 20:37:53 +08:00
|
|
|
.busy_idx = 3, \
|
2005-11-17 17:34:35 +08:00
|
|
|
.idle_idx = 1, \
|
2005-11-16 20:37:53 +08:00
|
|
|
.newidle_idx = 2, \
|
|
|
|
.wake_idx = 1, \
|
2005-04-17 06:20:36 +08:00
|
|
|
.flags = SD_LOAD_BALANCE \
|
|
|
|
| SD_BALANCE_EXEC \
|
|
|
|
| SD_BALANCE_NEWIDLE \
|
sched: Merge select_task_rq_fair() and sched_balance_self()
The problem with wake_idle() is that is doesn't respect things like
cpu_power, which means it doesn't deal well with SMT nor the recent
RT interaction.
To cure this, it needs to do what sched_balance_self() does, which
leads to the possibility of merging select_task_rq_fair() and
sched_balance_self().
Modify sched_balance_self() to:
- update_shares() when walking up the domain tree,
(it only called it for the top domain, but it should
have done this anyway), which allows us to remove
this ugly bit from try_to_wake_up().
- do wake_affine() on the smallest domain that contains
both this (the waking) and the prev (the wakee) cpu for
WAKE invocations.
Then use the top-down balance steps it had to replace wake_idle().
This leads to the dissapearance of SD_WAKE_BALANCE and
SD_WAKE_IDLE_FAR, with SD_WAKE_IDLE replaced with SD_BALANCE_WAKE.
SD_WAKE_AFFINE needs SD_BALANCE_WAKE to be effective.
Touch all topology bits to replace the old with new SD flags --
platforms might need re-tuning, enabling SD_BALANCE_WAKE
conditionally on a NUMA distance seems like a good additional
feature, magny-core and small nehalem systems would want this
enabled, systems with slow interconnects would not.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-09-10 19:50:02 +08:00
|
|
|
| SD_BALANCE_WAKE \
|
|
|
|
| SD_SERIALIZE, \
|
2005-04-17 06:20:36 +08:00
|
|
|
.last_balance = jiffies, \
|
|
|
|
.balance_interval = 1, \
|
|
|
|
.nr_balance_failed = 0, \
|
|
|
|
}
|
|
|
|
|
2005-12-13 03:56:47 +08:00
|
|
|
extern void __init dump_numa_cpu_topology(void);
|
|
|
|
|
2006-05-02 03:16:12 +08:00
|
|
|
extern int sysfs_add_device_to_node(struct sys_device *dev, int nid);
|
|
|
|
extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid);
|
|
|
|
|
2005-08-02 12:11:46 +08:00
|
|
|
#else
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-05-02 03:16:12 +08:00
|
|
|
static inline int of_node_to_nid(struct device_node *device)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-12-13 03:56:47 +08:00
|
|
|
static inline void dump_numa_cpu_topology(void) {}
|
|
|
|
|
2006-05-02 03:16:12 +08:00
|
|
|
static inline int sysfs_add_device_to_node(struct sys_device *dev, int nid)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void sysfs_remove_device_from_node(struct sys_device *dev,
|
|
|
|
int nid)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2008-03-31 23:41:55 +08:00
|
|
|
#endif /* CONFIG_NUMA */
|
2006-05-02 03:16:12 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm-generic/topology.h>
|
|
|
|
|
2006-06-27 17:54:42 +08:00
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
#include <asm/cputable.h>
|
2006-11-13 11:51:46 +08:00
|
|
|
#define smt_capable() (cpu_has_feature(CPU_FTR_SMT))
|
|
|
|
|
|
|
|
#ifdef CONFIG_PPC64
|
|
|
|
#include <asm/smp.h>
|
|
|
|
|
2007-10-16 16:24:05 +08:00
|
|
|
#define topology_thread_siblings(cpu) (per_cpu(cpu_sibling_map, cpu))
|
2008-07-27 13:24:53 +08:00
|
|
|
#define topology_core_siblings(cpu) (per_cpu(cpu_core_map, cpu))
|
2009-01-01 07:42:21 +08:00
|
|
|
#define topology_thread_cpumask(cpu) (&per_cpu(cpu_sibling_map, cpu))
|
|
|
|
#define topology_core_cpumask(cpu) (&per_cpu(cpu_core_map, cpu))
|
2008-07-27 13:24:54 +08:00
|
|
|
#define topology_core_id(cpu) (cpu_to_core_id(cpu))
|
2006-11-13 11:51:46 +08:00
|
|
|
#endif
|
2006-06-27 17:54:42 +08:00
|
|
|
#endif
|
|
|
|
|
2005-12-17 05:43:46 +08:00
|
|
|
#endif /* __KERNEL__ */
|
2005-09-08 04:59:48 +08:00
|
|
|
#endif /* _ASM_POWERPC_TOPOLOGY_H */
|