xen: setup percpu data pointers
Subsystems (2)
PATCH 1/3 xen: setup percpu data pointers
We need to access percpu data fairly early, so set up the percpu registers as soon as possible. We only need to load the appropriate segment register. We already have a GDT, but its hard to change it early because we need to manipulate the pagetable to do so, and that hasn't been set up yet.
Also, set the kernel stack when bringing up secondary CPUs. If we don't they all end up sharing the same stack...
---
arch/x86/xen/enlighten.c | 16 ++++++++++++++++ arch/x86/xen/smp.c | 7 ++++++- arch/x86/xen/xen-ops.h | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-)
arch/x86/xen/enlighten.c +0 -0
@@ -66,6 +66,8 @@
struct shared_info xen_dummy_shared_info;
+void *xen_initial_gdt;
+
/*
* Point at some empty memory to start with. We map the real shared_info
* page as soon as fixmap is up and running.
@@ -917,8 +919,19 @@
have_vcpu_info_placement = 0;
#endif
- /* setup percpu state */
+#ifdef CONFIG_X86_64
+ /*
+ * Setup percpu state. We only need to do this for 64-bit
+ * because 32-bit already has %fs set properly.
+ */
load_percpu_segment(0);
+#endif
+ /*
+ * The only reliable way to retain the initial address of the
+ * percpu gdt_page is to remember it here, so we can go and
+ * mark it RW later, when the initial percpu area is freed.
+ */
+ xen_initial_gdt = &per_cpu(gdt_page, 0);
xen_smp_init();
arch/x86/xen/smp.c +0 -0
@@ -170,8 +170,7 @@
/* We've switched to the "real" per-cpu gdt, so make sure the old memory can be recycled */
- make_lowmem_page_readwrite(__per_cpu_load +
- (unsigned long)&per_cpu_var(gdt_page));
+ make_lowmem_page_readwrite(xen_initial_gdt);
xen_setup_vcpu_info_placement(); } @@ -287,6 +286,9 @@ irq_ctx_init(cpu); #else clear_tsk_thread_flag(idle, TIF_FORK); + per_cpu(kernel_stack, cpu) = + (unsigned long)task_stack_page(idle) - + KERNEL_STACK_OFFSET + THREAD_SIZE; #endif xen_setup_timer(cpu); xen_init_lock_cpu(cpu);
arch/x86/xen/xen-ops.h +0 -0
@@ -10,6 +10,8 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
+extern void *xen_initial_gdt;
+
struct trap_info;
void xen_copy_trap_info(struct trap_info *traps);
Quoted 9 lines · Jeremy Fitzhardinge
We need to access percpu data fairly early, so set up the percpu registers as soon as possible. We only need to load the appropriate segment register. We already have a GDT, but its hard to change it early because we need to manipulate the pagetable to do so, and that hasn't been set up yet.
Also, set the kernel stack when bringing up secondary CPUs. If we don't they all end up sharing the same stack...
Quoted 6 lines
Signed-off-by Jeremy Fitzhardinge <[email protected]>---
arch/x86/xen/enlighten.c | 16 ++++++++++++++++ arch/x86/xen/smp.c | 7 ++++++- arch/x86/xen/xen-ops.h | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-)
Applied 1-3 to #tj-percpu with trivial modification on #2 (will reply to the message).
Thanks.
Signature · 1 line
tejun
Quoted 2 lines · Tejun Heo
Applied 1-3 to #tj-percpu with trivial modification on #2 (will reply to the message).
Oh... hpa already merged them into x86/paravirt. I'll just pull x86/paravirt into core/percpu because the first patch needs to be in core/percpu to keep xen working.
hpa, can you please take the other xen patch[1] into x86/paravirt too? So that I can receive it via you?
Thanks.
Signature · 3 lines
tejun [1] [PATCH] xen: fix 32-bit build resulting from mmu move
Quoted 6 lines · Tejun Heo
Quoted 3 lines · Tejun Heo
Applied 1-3 to #tj-percpu with trivial modification on #2 (will reply to the message).
Quoted 6 lines
Oh... hpa already merged them into x86/paravirt. I'll just pull x86/paravirt into core/percpu because the first patch needs to be in core/percpu to keep xen working.
hpa, can you please take the other xen patch[1] into x86/paravirt too? So that I can receive it via you?
Looks like its already there.
J
Quoted 7 lines · Jeremy Fitzhardinge
Quoted 6 lines · Tejun Heo
Quoted 3 lines · Tejun Heo
Applied 1-3 to #tj-percpu with trivial modification on #2 (will reply to the message).
Quoted 8 lines
Quoted 6 lines
Oh... hpa already merged them into x86/paravirt. I'll just pull x86/paravirt into core/percpu because the first patch needs to be in core/percpu to keep xen working.
hpa, can you please take the other xen patch[1] into x86/paravirt too? So that I can receive it via you?
Looks like its already there.
Yes, right, which means tj-percpu == x86/paravirt for the time being. Ingo, please pull from the following to fast forward core/percpu to x86/paravirt (or you can just do it yourself :-)
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git tj-percpu
Thanks.
Signature · 1 line
tejun
Quoted 15 lines · Tejun Heo
Quoted 14 lines · Jeremy Fitzhardinge
Quoted 12 lines · Tejun Heo
Quoted 3 lines · Tejun Heo
Applied 1-3 to #tj-percpu with trivial modification on #2 (will reply to the message).
Oh... hpa already merged them into x86/paravirt. I'll just pull x86/paravirt into core/percpu because the first patch needs to be in core/percpu to keep xen working.
hpa, can you please take the other xen patch[1] into x86/paravirt too? So that I can receive it via you?
Quoted 7 lines
Quoted 1 line
Looks like its already there.
Yes, right, which means tj-percpu == x86/paravirt for the time being. Ingo, please pull from the following to fast forward core/percpu to x86/paravirt (or you can just do it yourself :-)
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.gittj-percpu
done, thanks Tejun. Testing results look good so far.
Ingo