leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IA64-SGI] SN topology fix for large systems

Browse Source 
There is an SN bug in sn_hwperf.c that affects systems with 1024n or 1024p.
The bug manifests itself 2 ways: IO interrupts are not always
targeted to the nearest node, and 2) the "cat /proc/sgi_sn/sn_topology"
commands fails with "cannot allocate memory".

The code is using the wrong macros for validating node numbers.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Jack Steiner 2006-05-31 08:58:08 -05:00 committed by Tony Luck
parent 5eb1d63f5f
commit a1d7057727
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
arch/ia64/sn/kernel/sn2/sn_hwperf.c
View File

@ -51,6 +51,8 @@ static nasid_t sn_hwperf_master_nasid = INVALID_NASID;
static int sn_hwperf_init(void); static int sn_hwperf_init(void);
static DECLARE_MUTEX(sn_hwperf_init_mutex); static DECLARE_MUTEX(sn_hwperf_init_mutex);
#define cnode_possible(n) ((n) < num_cnodes)
static int sn_hwperf_enum_objects(int *nobj, struct sn_hwperf_object_info **ret) static int sn_hwperf_enum_objects(int *nobj, struct sn_hwperf_object_info **ret)
{ {
int e; int e;
@ -127,14 +129,14 @@ static int sn_hwperf_geoid_to_cnode(char *location)
} }
} }
return node_possible(cnode) ? cnode : -1; return cnode_possible(cnode) ? cnode : -1;
} }
static int sn_hwperf_obj_to_cnode(struct sn_hwperf_object_info * obj) static int sn_hwperf_obj_to_cnode(struct sn_hwperf_object_info * obj)
{ {
if (!SN_HWPERF_IS_NODE(obj) && !SN_HWPERF_IS_IONODE(obj)) if (!SN_HWPERF_IS_NODE(obj) && !SN_HWPERF_IS_IONODE(obj))
BUG(); BUG();
if (!obj->sn_hwp_this_part) if (SN_HWPERF_FOREIGN(obj))
return -1; return -1;
return sn_hwperf_geoid_to_cnode(obj->location); return sn_hwperf_geoid_to_cnode(obj->location);
} }
@ -199,12 +201,12 @@ static void print_pci_topology(struct seq_file *s)
static inline int sn_hwperf_has_cpus(cnodeid_t node) static inline int sn_hwperf_has_cpus(cnodeid_t node)
{ {
return node_online(node) && nr_cpus_node(node); return node < MAX_NUMNODES && node_online(node) && nr_cpus_node(node);
} }
static inline int sn_hwperf_has_mem(cnodeid_t node) static inline int sn_hwperf_has_mem(cnodeid_t node)
{ {
return node_online(node) && NODE_DATA(node)->node_present_pages; return node < MAX_NUMNODES && node_online(node) && NODE_DATA(node)->node_present_pages;
} }
static struct sn_hwperf_object_info * static struct sn_hwperf_object_info *
@ -237,7 +239,7 @@ static int sn_hwperf_get_nearest_node_objdata(struct sn_hwperf_object_info *objb
int found_mem = 0; int found_mem = 0;
int found_cpu = 0; int found_cpu = 0;
if (!node_possible(node)) if (!cnode_possible(node))
return -EINVAL; return -EINVAL;
if (sn_hwperf_has_cpus(node)) { if (sn_hwperf_has_cpus(node)) {
@ -442,7 +444,7 @@ static int sn_topology_show(struct seq_file *s, void *d)
seq_printf(s, "%s %d %s %s asic %s", slabname, ordinal, obj->location, seq_printf(s, "%s %d %s %s asic %s", slabname, ordinal, obj->location,
obj->sn_hwp_this_part ? "local" : "shared", obj->name); obj->sn_hwp_this_part ? "local" : "shared", obj->name);
if (!SN_HWPERF_IS_NODE(obj) && !SN_HWPERF_IS_IONODE(obj)) if (ordinal < 0 || (!SN_HWPERF_IS_NODE(obj) && !SN_HWPERF_IS_IONODE(obj)))
seq_putc(s, '\n'); seq_putc(s, '\n');
else { else {
cnodeid_t near_mem = -1; cnodeid_t near_mem = -1;
@ -468,22 +470,24 @@ static int sn_topology_show(struct seq_file *s, void *d)
/* /*
* CPUs on this node, if any * CPUs on this node, if any
*/ */
cpumask = node_to_cpumask(ordinal); if (!SN_HWPERF_IS_IONODE(obj)) {
for_each_online_cpu(i) { cpumask = node_to_cpumask(ordinal);
if (cpu_isset(i, cpumask)) { for_each_online_cpu(i) {
slice = 'a' + cpuid_to_slice(i); if (cpu_isset(i, cpumask)) {
c = cpu_data(i); slice = 'a' + cpuid_to_slice(i);
seq_printf(s, "cpu %d %s%c local" c = cpu_data(i);
" freq %luMHz, arch ia64", seq_printf(s, "cpu %d %s%c local"
i, obj->location, slice, " freq %luMHz, arch ia64",
c->proc_freq / 1000000); i, obj->location, slice,
for_each_online_cpu(j) { c->proc_freq / 1000000);
seq_printf(s, j ? ":%d" : ", dist %d", for_each_online_cpu(j) {
node_distance( seq_printf(s, j ? ":%d" : ", dist %d",
cpu_to_node(i), node_distance(
cpu_to_node(j))); cpu_to_node(i),
cpu_to_node(j)));
}
seq_putc(s, '\n');
} }
seq_putc(s, '\n');
} }
} }
} }
@ -523,7 +527,7 @@ static int sn_topology_show(struct seq_file *s, void *d)
if (obj->sn_hwp_this_part && p->sn_hwp_this_part) if (obj->sn_hwp_this_part && p->sn_hwp_this_part)
/* both ends local to this partition */ /* both ends local to this partition */
seq_puts(s, " local"); seq_puts(s, " local");
else if (!obj->sn_hwp_this_part && !p->sn_hwp_this_part) else if (SN_HWPERF_FOREIGN(p))
/* both ends of the link in foreign partiton */ /* both ends of the link in foreign partiton */
seq_puts(s, " foreign"); seq_puts(s, " foreign");
else else
@ -776,7 +780,7 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)
case SN_HWPERF_GET_NODE_NASID: case SN_HWPERF_GET_NODE_NASID:
if (a.sz != sizeof(u64) || if (a.sz != sizeof(u64) ||
(node = a.arg) < 0 || !node_possible(node)) { (node = a.arg) < 0 || !cnode_possible(node)) {
r = -EINVAL; r = -EINVAL;
goto error; goto error;
} }