linux-kernel - [PATCH-next]Fix wrong local

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 for Android: free password hash cracker in your pocket

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

Message-ID: <4B332D7C.7050704@np.css.fujitsu.com>
Date:	Thu, 24 Dec 2009 17:59:40 +0900
From:	Jin Dongming <jin.dongming@...css.fujitsu.com>
To:	tglx@...utronix.de
Cc:	mingo@...hat.com, hpa@...or.com, rusty@...tcorp.com.au,
	linux-kernel@...r.kernel.org
Subject: [PATCH-next]Fix wrong local_cpulist displayed

On my machine(Not NUMA), when the CONFIG_NUMA is selected, the value of
local_cpulist is displayed wrong. Because the value of numa_node is -1, so the
wrong address will be returned and the wrong value of local_cpulist is
displayed.

The example on my machine is as following:
Before my patch
        #cd /sys/device/pci0000:00/0000:00:1c.0
        #cat cpulist
                /* nothing */

After my pache
        #cd /sys/device/pci0000:00/0000:00:1c.0
        #cat cpulist
         0-1

I confirmed this patch fixes the above problem.

Signed-off-by: Jin Dongming <jin.dongming@...css.fujitsu.com>
---
 arch/x86/include/asm/topology.h |    2 +-
 arch/x86/mm/numa.c              |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index c5087d7..c63921a 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -99,7 +99,7 @@ extern const struct cpumask *cpumask_of_node(int node);
 /* Returns a pointer to the cpumask of CPUs on Node 'node'. */
 static inline const struct cpumask *cpumask_of_node(int node)
 {
-	return node_to_cpumask_map[node];
+	return node == -1 ? cpu_online_mask : node_to_cpumask_map[node];
 }
 #endif
 
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 550df48..e57a7f5 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -47,6 +47,9 @@ void __init setup_node_to_cpumask_map(void)
  */
 const struct cpumask *cpumask_of_node(int node)
 {
+	if (node == -1)
+		return cpu_online_mask;
+
 	if (node >= nr_node_ids) {
 		printk(KERN_WARNING
 			"cpumask_of_node(%d): node > nr_node_ids(%d)\n",
-- 
1.6.4

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