linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch 4/6] mips: cpumask_of_node() should handle -1 as a node
       [not found] <20100106045509.245662398@samba.org>
@ 2010-01-06  4:55 ` Anton Blanchard
  2010-01-06  4:55   ` Anton Blanchard
  2010-01-11 10:42   ` Ralf Baechle
  0 siblings, 2 replies; 3+ messages in thread
From: Anton Blanchard @ 2010-01-06  4:55 UTC (permalink / raw)
  To: anton, Ralf Baechle
  Cc: linux-mips, linux-kernel, Rusty Russell, Andrew Morton

pcibus_to_node can return -1 if we cannot determine which node a pci bus
is on. If passed -1, cpumask_of_node will negatively index the lookup array
and pull in random data:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
00000000,00000003,00000000,00000000
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
64-65

Change cpumask_of_node to check for -1 and return cpu_all_mask in this
case:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
ffffffff,ffffffff,ffffffff,ffffffff
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
0-127

Signed-off-by: Anton Blanchard <anton@samba.org>
---

Index: linux-cpumask/arch/mips/include/asm/mach-ip27/topology.h
===================================================================
--- linux-cpumask.orig/arch/mips/include/asm/mach-ip27/topology.h	2010-01-06 15:20:22.872583883 +1100
+++ linux-cpumask/arch/mips/include/asm/mach-ip27/topology.h	2010-01-06 15:20:47.310083709 +1100
@@ -24,7 +24,9 @@ extern struct cpuinfo_ip27 sn_cpu_info[N
 
 #define cpu_to_node(cpu)	(sn_cpu_info[(cpu)].p_nodeid)
 #define parent_node(node)	(node)
-#define cpumask_of_node(node)	(&hub_data(node)->h_cpus)
+#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 *);
 

-- 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [patch 4/6] mips: cpumask_of_node() should handle -1 as a node
  2010-01-06  4:55 ` [patch 4/6] mips: cpumask_of_node() should handle -1 as a node Anton Blanchard
@ 2010-01-06  4:55   ` Anton Blanchard
  2010-01-11 10:42   ` Ralf Baechle
  1 sibling, 0 replies; 3+ messages in thread
From: Anton Blanchard @ 2010-01-06  4:55 UTC (permalink / raw)
  To: Ralf Baechle; +Cc: linux-mips, linux-kernel, Rusty Russell, Andrew Morton

pcibus_to_node can return -1 if we cannot determine which node a pci bus
is on. If passed -1, cpumask_of_node will negatively index the lookup array
and pull in random data:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
00000000,00000003,00000000,00000000
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
64-65

Change cpumask_of_node to check for -1 and return cpu_all_mask in this
case:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
ffffffff,ffffffff,ffffffff,ffffffff
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
0-127

Signed-off-by: Anton Blanchard <anton@samba.org>
---

Index: linux-cpumask/arch/mips/include/asm/mach-ip27/topology.h
===================================================================
--- linux-cpumask.orig/arch/mips/include/asm/mach-ip27/topology.h	2010-01-06 15:20:22.872583883 +1100
+++ linux-cpumask/arch/mips/include/asm/mach-ip27/topology.h	2010-01-06 15:20:47.310083709 +1100
@@ -24,7 +24,9 @@ extern struct cpuinfo_ip27 sn_cpu_info[N
 
 #define cpu_to_node(cpu)	(sn_cpu_info[(cpu)].p_nodeid)
 #define parent_node(node)	(node)
-#define cpumask_of_node(node)	(&hub_data(node)->h_cpus)
+#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 *);
 

-- 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [patch 4/6] mips: cpumask_of_node() should handle -1 as a node
  2010-01-06  4:55 ` [patch 4/6] mips: cpumask_of_node() should handle -1 as a node Anton Blanchard
  2010-01-06  4:55   ` Anton Blanchard
@ 2010-01-11 10:42   ` Ralf Baechle
  1 sibling, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2010-01-11 10:42 UTC (permalink / raw)
  To: Anton Blanchard; +Cc: linux-mips, linux-kernel, Rusty Russell, Andrew Morton

On Wed, Jan 06, 2010 at 03:55:13PM +1100, Anton Blanchard wrote:

> Subject: [patch 4/6] mips: cpumask_of_node() should handle -1 as a node

Thanks, applied!

  Ralf

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-01-11 10:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20100106045509.245662398@samba.org>
2010-01-06  4:55 ` [patch 4/6] mips: cpumask_of_node() should handle -1 as a node Anton Blanchard
2010-01-06  4:55   ` Anton Blanchard
2010-01-11 10:42   ` Ralf Baechle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).