Skip to contentSkip to conversation

cpumask: powerpc: Introduce cpumask_of_{node,pcibus} to replace {node,pcibus}_to_cpumask

PATCH In review Rusty Russell 2 participants 2 messages Nov 21, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 5/8 cpumask: powerpc: Introduce cpumask_of_{node,pcibus} to replace {node,pcibus}_to_cpumask

Impact: New APIs

The old node_to_cpumask/node_to_pcibus returned a cpumask_t: these return a pointer to a struct cpumask. Part of removing cpumasks from the stack.

(Also replaces powerpc internal uses of node_to_cpumask).

Cc Benjamin Herrenschmidt <[email protected]>
---
 arch/powerpc/include/asm/topology.h          |   10 +++++++---
 arch/powerpc/platforms/cell/spu_priv1_mmio.c |    6 +++---
 arch/powerpc/platforms/cell/spufs/sched.c    |    4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)
arch/powerpc/include/asm/topology.h +7 -3
@@ -22,11 +22,11 @@ static inline cpumask_t node_to_cpumask(
 	return numa_cpumask_lookup_table[node];
 }
 
+#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node])
+
 static inline int node_to_first_cpu(int node)
 {
-	cpumask_t tmp;
-	tmp = node_to_cpumask(node);
-	return first_cpu(tmp);
+	return cpumask_first(cpumask_of_node(node));
 }
 
 int of_node_to_nid(struct device_node *device);
@@ -45,6 +45,10 @@ static inline int pcibus_to_node(struct 
 					CPU_MASK_ALL : \
 					node_to_cpumask(pcibus_to_node(bus)) \
 				)
+
+#define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\
+				 cpu_all_mask :				\
+				 cpumask_of_node(pcibus_to_node(bus)))
 
 /* sched_domains SD_NODE_INIT for PPC64 machines */
 #define SD_NODE_INIT (struct sched_domain) {		\
arch/powerpc/platforms/cell/spu_priv1_mmio.c +3 -3
@@ -80,10 +80,10 @@ static void cpu_affinity_set(struct spu 
 	u64 route;
 
 	if (nr_cpus_node(spu->node)) {
-		cpumask_t spumask = node_to_cpumask(spu->node);
-		cpumask_t cpumask = node_to_cpumask(cpu_to_node(cpu));
+		const struct cpumask *spumask = cpumask_of_node(spu->node),
+			*cpumask = cpumask_of_node(cpu_to_node(cpu));
 
-		if (!cpus_intersects(spumask, cpumask))
+		if (!cpumask_intersects(spumask, cpumask))
 			return;
 	}
 
arch/powerpc/platforms/cell/spufs/sched.c +2 -2
@@ -166,9 +166,9 @@ static int __node_allowed(struct spu_con
 static int __node_allowed(struct spu_context *ctx, int node)
 {
 	if (nr_cpus_node(node)) {
-		cpumask_t mask = node_to_cpumask(node);
+		const struct cpumask *mask = cpumask_of_node(node);
 
-		if (cpus_intersects(mask, ctx->cpus_allowed))
+		if (cpumask_intersects(mask, &ctx->cpus_allowed))
 			return 1;
 	}
 
#1 lore raw

Hi Rusty,

Quoted 11 lines · On Fri, 21 Nov 2008 21:12:13 +1030 Rusty Russell <[email protected]> wrote:

Impact: New APIs

The old node_to_cpumask/node_to_pcibus returned a cpumask_t: these return a pointer to a struct cpumask. Part of removing cpumasks from the stack.

(Also replaces powerpc internal uses of node_to_cpumask).

Cc Benjamin Herrenschmidt <[email protected]>

Sending powerpc patches to [email protected] and [email protected] is a good idea (the first because it gets put into patchwork (and so doesn't get lost) and the second because Paul and Ben are currently juggling the maintainership between them.

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/