linux-kernel - Re: [PATCH 14/16] x86: Unify CPU -> NUMA node mapping between 32 and 64bit

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.00.1012281236080.8883@chino.kir.corp.google.com>
Date:	Tue, 28 Dec 2010 12:39:47 -0800 (PST)
From:	David Rientjes <rientjes@...gle.com>
To:	Tejun Heo <tj@...nel.org>
cc:	linux-kernel@...r.kernel.org, Ingo Molnar <mingo@...hat.com>,
	tglx@...utronix.de, "H. Peter Anvin" <hpa@...or.com>,
	x86@...nel.org, eric.dumazet@...il.com, yinghai@...nel.org,
	brgerst@...il.com, gorcunov@...il.com,
	Pekka Enberg <penberg@...nel.org>, shaohui.zheng@...el.com
Subject: Re: [PATCH 14/16] x86: Unify CPU -> NUMA node mapping between 32
 and 64bit

On Tue, 28 Dec 2010, Tejun Heo wrote:

> diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
> index 989f23b..ce33f69 100644
> --- a/arch/x86/mm/numa_64.c
> +++ b/arch/x86/mm/numa_64.c
> @@ -31,12 +31,6 @@ static unsigned long __initdata nodemap_addr;
>  static unsigned long __initdata nodemap_size;
>  
>  /*
> - * Map cpu index to node index
> - */
> -DEFINE_EARLY_PER_CPU(int, x86_cpu_to_node_map, NUMA_NO_NODE);
> -EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_node_map);
> -
> -/*
>   * Given a shift value, try to populate memnodemap[]
>   * Returns :
>   * 1 if OK
> @@ -737,34 +731,6 @@ int __cpuinit numa_cpu_node(int cpu)
>  	return NUMA_NO_NODE;
>  }
>  
> -void __cpuinit numa_set_node(int cpu, int node)
> -{
> -	int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);
> -
> -	/* early setting, no percpu area yet */
> -	if (cpu_to_node_map) {
> -		cpu_to_node_map[cpu] = node;
> -		return;
> -	}
> -
> -#ifdef CONFIG_DEBUG_PER_CPU_MAPS
> -	if (cpu >= nr_cpu_ids || !cpu_possible(cpu)) {
> -		printk(KERN_ERR "numa_set_node: invalid cpu# (%d)\n", cpu);
> -		dump_stack();
> -		return;
> -	}
> -#endif
> -	per_cpu(x86_cpu_to_node_map, cpu) = node;
> -
> -	if (node != NUMA_NO_NODE)
> -		set_cpu_numa_node(cpu, node);
> -}
> -
> -void __cpuinit numa_clear_node(int cpu)
> -{
> -	numa_set_node(cpu, NUMA_NO_NODE);
> -}
> -
>  #ifndef CONFIG_DEBUG_PER_CPU_MAPS
>  
>  void __cpuinit numa_add_cpu(int cpu)

This is also going to conflict with c1c3443c ("x86, numa: Fake 
node-to-cpumask for NUMA emulation") in x86/numa, but it's trival to merge 
because there's no actual implementation change.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/