mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mike Travis <travis@sgi.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 03/11] x86: restore pda nodenumber field
Date: Fri, 25 Apr 2008 17:15:51 -0700	[thread overview]
Message-ID: <20080426001549.458477000@polaris-admin.engr.sgi.com> (raw)
In-Reply-To: <20080426001548.829332000@polaris-admin.engr.sgi.com>

[-- Attachment #1: restore-nodenumber --]
[-- Type: text/plain, Size: 2215 bytes --]

  * Restore the nodenumber field in the x86_64 pda.  This field is slightly
    different than the x86_cpu_to_node_map mainly because it's a static
    indication of which node the cpu is on while the cpu to node map is a
    dyanamic mapping that may get reset if the cpu goes offline.  This also
    simplifies the numa_node_id() macro.

For inclusion into sched-devel/latest tree.

Based on:
	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
    +   sched-devel/latest  .../mingo/linux-2.6-sched-devel.git

Signed-off-by: Mike Travis <travis@sgi.com>
---
 arch/x86/kernel/setup.c    |    4 ++++
 include/asm-x86/pda.h      |    1 +
 include/asm-x86/topology.h |    2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

--- linux-2.6.sched.orig/arch/x86/kernel/setup.c
+++ linux-2.6.sched/arch/x86/kernel/setup.c
@@ -31,6 +31,7 @@ EXPORT_EARLY_PER_CPU_SYMBOL(x86_bios_cpu
 #if defined(CONFIG_NUMA) && defined(CONFIG_X86_64)
 #define	X86_64_NUMA	1
 
+/* 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);
 #endif
@@ -154,6 +155,9 @@ void __cpuinit numa_set_node(int cpu, in
 {
 	int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);
 
+	if (node != NUMA_NO_NODE)
+		cpu_pda(cpu)->nodenumber = node;
+
 	if (cpu_to_node_map)
 		cpu_to_node_map[cpu] = node;
 
--- linux-2.6.sched.orig/include/asm-x86/pda.h
+++ linux-2.6.sched/include/asm-x86/pda.h
@@ -20,6 +20,7 @@ struct x8664_pda {
 					/* gcc-ABI: this canary MUST be at
 					   offset 40!!! */
 	char *irqstackptr;
+	int nodenumber;			/* number of current node */
 	unsigned int __softirq_pending;
 	unsigned int __nmi_count;	/* number of NMI on this CPUs */
 	short mmu_state;
--- linux-2.6.sched.orig/include/asm-x86/topology.h
+++ linux-2.6.sched/include/asm-x86/topology.h
@@ -56,7 +56,7 @@ extern cpumask_t node_to_cpumask_map[];
 DECLARE_EARLY_PER_CPU(int, x86_cpu_to_node_map);
 
 /* Returns the number of the current Node. */
-#define numa_node_id()	(per_cpu(x86_cpu_to_node_map, raw_smp_processor_id()))
+#define numa_node_id()		read_pda(nodenumber)
 
 #ifdef CONFIG_DEBUG_PER_CPU_MAPS
 extern int cpu_to_node(int cpu);

-- 

  parent reply	other threads:[~2008-04-26  0:17 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-26  0:15 [PATCH 00/11] x86: cleanup early per cpu variables/accesses v5-folded Mike Travis
2008-04-26  0:15 ` [PATCH 01/11] x86: Modify Kconfig to allow up to 4096 cpus Mike Travis
2008-04-27 10:39   ` Pavel Machek
2008-04-28 13:38     ` Ingo Molnar
2008-04-28 13:54       ` Pavel Machek
2008-04-28 15:52         ` Ingo Molnar
2008-04-28 17:13         ` H. Peter Anvin
2008-04-26  0:15 ` [PATCH 02/11] x86: cleanup early per cpu variables/accesses v4 Mike Travis
2008-04-26  0:15 ` Mike Travis [this message]
2008-04-26  0:15 ` [PATCH 04/11] x86: remove the static 256k node_to_cpumask_map Mike Travis
2008-04-26  0:15 ` [PATCH 05/11] sched: replace MAX_NUMNODES with nr_node_ids in kernel/sched.c Mike Travis
2008-04-26  0:15 ` [PATCH 06/11] cpu: change some globals to statics in drivers/base/cpu.c v2 Mike Travis
2008-04-26  0:15 ` [PATCH 07/11] x86: remove static boot_cpu_pda array Mike Travis
2008-04-26  0:15 ` [PATCH 08/11] x86: Add performance variants of cpumask operators Mike Travis
2008-04-26  0:15 ` [PATCH 09/11] x86: Use performance variant for_each_cpu_mask_nr Mike Travis
2008-04-26  0:15 ` [PATCH 10/11] x86: Use performance variant next_cpu_nr Mike Travis
2008-04-26  0:15 ` [PATCH 11/11] net: Pass reference to cpumask variable in net/sunrpc/svc.c Mike Travis
2008-04-28 13:42 ` [PATCH 00/11] x86: cleanup early per cpu variables/accesses v5-folded Ingo Molnar
2008-04-28 15:13   ` Ingo Molnar
2008-04-28 16:27     ` Mike Travis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080426001549.458477000@polaris-admin.engr.sgi.com \
    --to=travis@sgi.com \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®