On 04/16/2010 02:30 AM, Lee Schermerhorn wrote:
> +#ifdef CONFIG_HAVE_MEMORYLESS_NODES
> +
> +DECLARE_PER_CPU(int, numa_mem);
> +
> +#ifndef set_numa_mem
> +#define set_numa_mem(__node) percpu_write(numa_mem, __node)
> +#endif
> +
> +#else /* !CONFIG_HAVE_MEMORYLESS_NODES */
> +
> +#define numa_mem numa_node
Please make it a macro which takes arguments or an inline function.
Name substitutions like this can easily lead to pretty strange
problems when they end up substituting local variable names.
> +static inline void set_numa_mem(int node) {}
and maybe it's a good idea to make the above one emit warning if the
given node id doesn't match the cpu's numa node id? Also, in general,
setting numa id (cpu or mem) isn't a hot path and it would be better
to take both cpu and the node id arguments. ie,
set_numa_mem(unsigned int cpu, int node).
> +#endif /* [!]CONFIG_HAVE_MEMORYLESS_NODES */
> +
> +#ifndef numa_mem_id
> +/* Returns the number of the nearest Node with memory */
> +#define numa_mem_id() __this_cpu_read(numa_mem)
> +#endif
> +
> +#ifndef cpu_to_mem
> +#define cpu_to_mem(__cpu) per_cpu(numa_mem, (__cpu))
> +#endif
Isn't cpu_to_mem() too generic? Maybe it's a good idea to put 'numa'
or 'node' in the name?
> +#ifdef CONFIG_HAVE_MEMORYLESS_NODES
> + /*
> + * We now know the "local memory node" for each node--
> + * i.e., the node of the first zone in the generic zonelist.
> + * Set up numa_mem percpu variable for on-line cpus. During
> + * boot, only the boot cpu should be on-line; we'll init the
> + * secondary cpus' numa_mem as they come on-line. During
> + * node/memory hotplug, we'll fixup all on-line cpus.
> + */
> + if (cpu_online(cpu))
> + cpu_to_mem(cpu) = local_memory_node(cpu_to_node(cpu));
Please make cpu_to_node() evaluate to a rvalue and use set_numa_mem()
to set node. The above is a bit too easy to get wrong when archs
override the macro.
> +#ifdef CONFIG_HAVE_MEMORYLESS_NODES
> +int local_memory_node(int node_id);
> +#else
> +static inline int local_memory_node(int node_id) { return node_id; };
> +#endif
Hmmm... can there be local_memory_node() users when MEMORYLESS_NODES
is not enabled?
Thanks.
--
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-numa" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
