Re: [PATCH 1/1] i383 numa: fix numaq/summit apicid conflict

[Andy Whitcroft]

keith mannthey wrote:
> From: Keith Mannthey <kmannth@xxxxxxxxxx> 
> 
>   This patch allows numaq to properly align cpus to their given node
> during boot. Pass logical apicid to apicid_to_node and allow the summit
> sub-arch to use physical apicid (hard_smp_processor_id()). 
>   Tested against numaq and summit based systems with no issues. against
> 2.6.18-git18. 
> 
> Signed-off-by: Keith Mannthey  <kmannth@xxxxxxxxxx>
> ---
>  arch/i386/kernel/smpboot.c               |    2 +-
>  include/asm-i386/mach-summit/mach_apic.h |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff -urN linux-2.6.18/arch/i386/kernel/smpboot.c linux-2.6.18-git18/arch/i386/kernel/smpboot.c
> --- linux-2.6.18/arch/i386/kernel/smpboot.c	2006-10-02 02:59:49.000000000 -0700
> +++ linux-2.6.18-git18/arch/i386/kernel/smpboot.c	2006-10-02 00:36:52.000000000 -0700
> @@ -648,7 +648,7 @@
>  {
>  	int cpu = smp_processor_id();
>  	int apicid = logical_smp_processor_id();
> -	int node = apicid_to_node(hard_smp_processor_id());
> +	int node = apicid_to_node(apicid);
>  
>  	if (!node_online(node))
>  		node = first_online_node;
> diff -urN linux-2.6.18/include/asm-i386/mach-summit/mach_apic.h linux-2.6.18-git18/include/asm-i386/mach-summit/mach_apic.h
> --- linux-2.6.18/include/asm-i386/mach-summit/mach_apic.h	2006-10-02 02:59:54.000000000 -0700
> +++ linux-2.6.18-git18/include/asm-i386/mach-summit/mach_apic.h	2006-10-02 00:51:24.000000000 -0700
> @@ -88,7 +88,7 @@
>  
>  static inline int apicid_to_node(int logical_apicid)
>  {
> -	return apicid_2_node[logical_apicid];
> +	return apicid_2_node[hard_smp_processor_id()];
>  }
>  
>  /* Mapping from cpu number to logical apicid */

My worry here is that we might have users who are calling this about
other cpus.  As you have effectivly ignored the parameter on summit here.

Can we not just map the hard_smp_processor_id to its logical apic id
when filling in the apicid_2_node array on summit?  Such that it really
does have the logical id in there?

-apw
-
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/