Re: [patch] x86: fix cpumask_of_pcibus() to handle nid of -1

From: Yinghai Lu
Date: Tue Sep 22 2009 - 13:07:59 EST


Suresh Siddha wrote:
> On my two socket NHM-EP system, with CONFIG_DEBUG_PER_CPU_MAPS=y I see:
>
> cpumask_of_node(-1): no node_to_cpumask_map!
> Pid: 5635, comm: irqbalance Not tainted 2.6.31-07068-g43c1266-dirty #145
> Call Trace:
> [<ffffffff81031033>] cpumask_of_node+0x4f/0x58
> [<ffffffff811b5a8c>] local_cpus_show+0x1f/0x48
> [<ffffffff812c3c65>] dev_attr_show+0x20/0x44
> [<ffffffff810fcade>] sysfs_read_file+0xb2/0x131
> [<ffffffff810b2702>] vfs_read+0xab/0x147
> [<ffffffff810b2862>] sys_read+0x47/0x6f
> [<ffffffff8100af6b>] system_call_fastpath+0x16/0x1b
>
> Fix x86 version of cpumask_of_pcibus() to handle node id of "-1"
> (default value indicating that I/O isn't tied to any particular node).
>
> Signed-off-by: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
> ---
>
> diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
> index f76a162..b101e8c 100644
> --- a/arch/x86/include/asm/pci.h
> +++ b/arch/x86/include/asm/pci.h
> @@ -143,7 +143,9 @@ static inline int __pcibus_to_node(const struct pci_bus *bus)
> static inline const struct cpumask *
> cpumask_of_pcibus(const struct pci_bus *bus)
> {
> - return cpumask_of_node(__pcibus_to_node(bus));
> + int node = __pcibus_to_node(bus);
> +
> + return (node == -1) ? cpu_all_mask : cpumask_of_node(node);
> }
> #endif
>
>

cpu_all_mask or cpu_online_mask?

YH
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/