From: Ravikiran G Thirumalai <kiran@scalex86.org>
To: Andi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org, discuss@x86-64.org,
shai@scalex86.org
Subject: [patch 3/3] x86_64: Node local PDA -- allocate node local memory for pda
Date: Fri, 2 Dec 2005 00:23:09 -0800 [thread overview]
Message-ID: <20051202082309.GC5312@localhost.localdomain> (raw)
In-Reply-To: <20051202081028.GA5312@localhost.localdomain>
Patch uses a static PDA array early at boot and reallocates processor PDA
with node local memory when kmalloc is ready, just before pda_init.
The boot_cpu_pda is needed sice the cpu_pda is used even before pda_init for
that cpu is called (to set the static per-cpu areas offset table etc)
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Shai Fultheim <shai@scalex86.org>
Index: linux-2.6.15-rc3/arch/x86_64/kernel/head64.c
===================================================================
--- linux-2.6.15-rc3.orig/arch/x86_64/kernel/head64.c 2005-11-30 17:01:18.000000000 -0800
+++ linux-2.6.15-rc3/arch/x86_64/kernel/head64.c 2005-11-30 17:07:14.000000000 -0800
@@ -80,6 +80,7 @@
{
char *s;
int i;
+ extern struct x8664_pda boot_cpu_pda[];
for (i = 0; i < 256; i++)
set_intr_gate(i, early_idt_handler);
@@ -92,6 +93,9 @@
memcpy(init_level4_pgt, boot_level4_pgt, PTRS_PER_PGD*sizeof(pgd_t));
asm volatile("movq %0,%%cr3" :: "r" (__pa_symbol(&init_level4_pgt)));
+ for (i = 0; i < NR_CPUS; i++)
+ cpu_pda(i) = &boot_cpu_pda[i];
+
pda_init(0);
copy_bootdata(real_mode_data);
#ifdef CONFIG_SMP
Index: linux-2.6.15-rc3/arch/x86_64/kernel/setup64.c
===================================================================
--- linux-2.6.15-rc3.orig/arch/x86_64/kernel/setup64.c 2005-11-30 17:01:18.000000000 -0800
+++ linux-2.6.15-rc3/arch/x86_64/kernel/setup64.c 2005-12-01 13:18:21.000000000 -0800
@@ -30,7 +30,8 @@
cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;
-struct x8664_pda _cpu_pda[NR_CPUS] __cacheline_aligned;
+struct x8664_pda *_cpu_pda[NR_CPUS] __read_mostly;
+struct x8664_pda boot_cpu_pda[NR_CPUS] __cacheline_aligned;
struct desc_ptr idt_descr = { 256 * 16, (unsigned long) idt_table };
@@ -119,6 +120,23 @@
{
struct x8664_pda *pda = cpu_pda(cpu);
+ /* Allocate node local memory for AP pdas */
+ if (cpu) {
+ struct x8664_pda *newpda;
+ newpda = kmalloc_node(sizeof (struct x8664_pda), GFP_ATOMIC,
+ cpu_to_node(cpu));
+ if (newpda) {
+ printk("Allocating node local PDA for cpu %d at 0x%lx\n",
+ cpu, (unsigned long) newpda);
+ memcpy(newpda, pda, sizeof (struct x8664_pda));
+ pda = newpda;
+ cpu_pda(cpu) = pda;
+ }
+ else
+ printk("Could not allocate node local PDA for cpu %d\n",
+ cpu);
+ }
+
/* Setup up data that may be needed in __get_free_pages early */
asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0));
wrmsrl(MSR_GS_BASE, pda);
Index: linux-2.6.15-rc3/include/asm-x86_64/pda.h
===================================================================
--- linux-2.6.15-rc3.orig/include/asm-x86_64/pda.h 2005-11-30 17:01:18.000000000 -0800
+++ linux-2.6.15-rc3/include/asm-x86_64/pda.h 2005-11-30 17:07:14.000000000 -0800
@@ -27,9 +27,9 @@
#define IRQSTACK_ORDER 2
#define IRQSTACKSIZE (PAGE_SIZE << IRQSTACK_ORDER)
-extern struct x8664_pda _cpu_pda[];
+extern struct x8664_pda *_cpu_pda[];
-#define cpu_pda(i) (&_cpu_pda[i])
+#define cpu_pda(i) (_cpu_pda[i])
/*
* There is no fast way to get the base address of the PDA, all the accesses
next prev parent reply other threads:[~2005-12-02 8:23 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-02 8:10 [patch 1/3] x86_64: Node local PDA -- early cpu_to_node Ravikiran G Thirumalai
2005-12-02 8:16 ` [patch 2/3] x86_64: Node local PDA -- Use macros to access cpu_pda Ravikiran G Thirumalai
2005-12-02 8:23 ` Ravikiran G Thirumalai [this message]
2005-12-02 8:54 ` [patch 3/3] x86_64: Node local PDA -- allocate node local memory for pda Eric Dumazet
2005-12-02 18:24 ` [discuss] " Ravikiran G Thirumalai
2005-12-02 9:05 ` Andrew Morton
2005-12-02 10:36 ` [RFC] NUMA aware kthread_create() ? Eric Dumazet
2005-12-02 12:32 ` [discuss] " Andi Kleen
2005-12-02 11:47 ` [patch 3/3] x86_64: Node local PDA -- allocate node local memory for pda Andi Kleen
2005-12-02 20:02 ` Ravikiran G Thirumalai
2005-12-02 22:41 ` Andi Kleen
2005-12-02 11:43 ` [patch 1/3] x86_64: Node local PDA -- early cpu_to_node Andi Kleen
2005-12-02 22:51 ` [discuss] " Ravikiran G Thirumalai
2005-12-02 23:02 ` Andi Kleen
2005-12-02 23:43 ` Ravikiran G Thirumalai
2005-12-02 23:48 ` Andi Kleen
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=20051202082309.GC5312@localhost.localdomain \
--to=kiran@scalex86.org \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=discuss@x86-64.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shai@scalex86.org \
/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
Powered by JetHome