Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a2f47ca authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

x86: add check for node passed to node_to_cpumask, v3 



  * When CONFIG_DEBUG_PER_CPU_MAPS is set, the node passed to
    node_to_cpumask and node_to_cpumask_ptr should be validated.
    If invalid, then a dump_stack is performed and a zero cpumask
    is returned.

v2: Slightly different version to remove a compiler warning.
v3: Redone to reflect moving setup.c -> setup_percpu.c

Signed-off-by: default avatarMike Travis <travis@sgi.com>
Cc: Vegard Nossum <vegard.nossum@gmail.com>
Cc: "akpm@linux-foundation.org" <akpm@linux-foundation.org>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cd5dce2f

arch/x86/kernel/setup_percpu.c

+23 −3
Original line number Original line Diff line number Diff line
@@ -346,6 +346,10 @@ int early_cpu_to_node(int cpu) 
	return per_cpu(x86_cpu_to_node_map, cpu);

	return per_cpu(x86_cpu_to_node_map, cpu);

}

}







/* empty cpumask */

static const cpumask_t cpu_mask_none;



/*

/*

 * Returns a pointer to the bitmask of CPUs on Node 'node'.

 * Returns a pointer to the bitmask of CPUs on Node 'node'.

 */

 */
@@ -358,13 +362,23 @@ cpumask_t *_node_to_cpumask_ptr(int node) 
		dump_stack();

		dump_stack();

		return &cpu_online_map;

		return &cpu_online_map;

	}

	}

	BUG_ON(node >= nr_node_ids);

	if (node >= nr_node_ids) {

	return &node_to_cpumask_map[node];

		printk(KERN_WARNING

			"_node_to_cpumask_ptr(%d): node > nr_node_ids(%d)\n",

			node, nr_node_ids);

		dump_stack();

		return (cpumask_t *)&cpu_mask_none;

	}

	return (cpumask_t *)&node_to_cpumask_map[node];

}

}

EXPORT_SYMBOL(_node_to_cpumask_ptr);

EXPORT_SYMBOL(_node_to_cpumask_ptr);





/*

/*

 * Returns a bitmask of CPUs on Node 'node'.

 * Returns a bitmask of CPUs on Node 'node'.

 *

 * Side note: this function creates the returned cpumask on the stack

 * so with a high NR_CPUS count, excessive stack space is used.  The

 * node_to_cpumask_ptr function should be used whenever possible.

 */

 */

cpumask_t node_to_cpumask(int node)

cpumask_t node_to_cpumask(int node)

{

{
@@ -374,7 +388,13 @@ cpumask_t node_to_cpumask(int node) 
		dump_stack();

		dump_stack();

		return cpu_online_map;

		return cpu_online_map;

	}

	}

	BUG_ON(node >= nr_node_ids);

	if (node >= nr_node_ids) {

		printk(KERN_WARNING

			"node_to_cpumask(%d): node > nr_node_ids(%d)\n",

			node, nr_node_ids);

		dump_stack();

		return cpu_mask_none;

	}

	return node_to_cpumask_map[node];

	return node_to_cpumask_map[node];

}

}

EXPORT_SYMBOL(node_to_cpumask);

EXPORT_SYMBOL(node_to_cpumask);

include/asm-x86/topology.h

+6 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,12 @@ static inline int cpu_to_node(int cpu) 
}

}

#define early_cpu_to_node(cpu)	cpu_to_node(cpu)

#define early_cpu_to_node(cpu)	cpu_to_node(cpu)





/* Returns a bitmask of CPUs on Node 'node'. */

/* Returns a bitmask of CPUs on Node 'node'.

 *

 * Side note: this function creates the returned cpumask on the stack

 * so with a high NR_CPUS count, excessive stack space is used.  The

 * node_to_cpumask_ptr function should be used whenever possible.

 */

static inline cpumask_t node_to_cpumask(int node)

static inline cpumask_t node_to_cpumask(int node)

{

{

	return node_to_cpumask_map[node];

	return node_to_cpumask_map[node];