cb83b629ba
The current code groups up to 16 nodes in a level and then puts an ALLNODES domain spanning the entire tree on top of that. This doesn't reflect the numa topology and esp for the smaller not-fully-connected machines out there today this might make a difference. Therefore, build a proper numa topology based on node_distance(). Since there's no fixed numa layers anymore, the static SD_NODE_INIT and SD_ALLNODES_INIT aren't usable anymore, the new code tries to construct something similar and scales some values either on the number of cpus in the domain and/or the node_distance() ratio. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Anton Blanchard <anton@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Chris Metcalf <cmetcalf@tilera.com> Cc: David Howells <dhowells@redhat.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: linux-alpha@vger.kernel.org Cc: linux-ia64@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-sh@vger.kernel.org Cc: Matt Turner <mattst88@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Richard Henderson <rth@twiddle.net> Cc: sparclinux@vger.kernel.org Cc: Tony Luck <tony.luck@intel.com> Cc: x86@kernel.org Cc: Dimitri Sivanich <sivanich@sgi.com> Cc: Greg Pearson <greg.pearson@hp.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: bob.picco@oracle.com Cc: chris.mason@oracle.com Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Link: http://lkml.kernel.org/n/tip-r74n3n8hhuc2ynbrnp3vt954@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
41 lines
1.1 KiB
C
41 lines
1.1 KiB
C
#ifndef _ASM_MACH_TOPOLOGY_H
|
|
#define _ASM_MACH_TOPOLOGY_H 1
|
|
|
|
#include <asm/sn/hub.h>
|
|
#include <asm/sn/types.h>
|
|
#include <asm/mmzone.h>
|
|
|
|
struct cpuinfo_ip27 {
|
|
// cpuid_t p_cpuid; /* PROM assigned cpuid */
|
|
cnodeid_t p_nodeid; /* my node ID in compact-id-space */
|
|
nasid_t p_nasid; /* my node ID in numa-as-id-space */
|
|
unsigned char p_slice; /* Physical position on node board */
|
|
#if 0
|
|
unsigned long loops_per_sec;
|
|
unsigned long ipi_count;
|
|
unsigned long irq_attempt[NR_IRQS];
|
|
unsigned long smp_local_irq_count;
|
|
unsigned long prof_multiplier;
|
|
unsigned long prof_counter;
|
|
#endif
|
|
};
|
|
|
|
extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];
|
|
|
|
#define cpu_to_node(cpu) (sn_cpu_info[(cpu)].p_nodeid)
|
|
#define parent_node(node) (node)
|
|
#define cpumask_of_node(node) ((node) == -1 ? \
|
|
cpu_all_mask : \
|
|
&hub_data(node)->h_cpus)
|
|
struct pci_bus;
|
|
extern int pcibus_to_node(struct pci_bus *);
|
|
|
|
#define cpumask_of_pcibus(bus) (cpu_online_mask)
|
|
|
|
extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES];
|
|
|
|
#define node_distance(from, to) (__node_distances[(from)][(to)])
|
|
|
|
#include <asm-generic/topology.h>
|
|
|
|
#endif /* _ASM_MACH_TOPOLOGY_H */
|