From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH RFC 5/9] x86/traps: Functional prep work Date: Thu, 15 May 2014 10:48:15 +0100 Message-ID: <1400147299-31772-6-git-send-email-andrew.cooper3@citrix.com> References: <1400147299-31772-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1400147299-31772-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Keir Fraser , Jan Beulich , Tim Deegan List-Id: xen-devel@lists.xenproject.org * Promote certain actions to earlier in __start_xen(). * Declare double_fault and early_page_fault as standard trap handlers. Signed-off-by: Andrew Cooper CC: Keir Fraser CC: Jan Beulich CC: Tim Deegan --- It would be nice if the linker could sort the exception tables, and the Xen check could be one for sanity. --- xen/arch/x86/setup.c | 11 ++++++----- xen/arch/x86/x86_64/traps.c | 1 - xen/include/asm-x86/processor.h | 2 ++ xen/include/asm-x86/setup.h | 1 - 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index a864b9f..a69e25e 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -558,6 +558,12 @@ void __init noreturn __start_xen(unsigned long mbi_p) .stop_bits = 1 }; + set_processor_id(0); + set_current((struct vcpu *)0xfffff000); /* debug sanity */ + this_cpu(curr_vcpu) = idle_vcpu[0] = current; + + sort_exception_tables(); + percpu_init_areas(); set_intr_gate(TRAP_page_fault, &early_page_fault); @@ -588,9 +594,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) parse_video_info(); - set_current((struct vcpu *)0xfffff000); /* debug sanity */ - idle_vcpu[0] = current; - set_processor_id(0); /* needed early, for smp_processor_id() */ if ( cpu_has_efer ) rdmsrl(MSR_EFER, this_cpu(efer)); asm volatile ( "mov %%cr4,%0" : "=r" (this_cpu(cr4)) ); @@ -1212,8 +1215,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( opt_watchdog ) nmi_watchdog = NMI_LOCAL_APIC; - sort_exception_tables(); - find_smp_config(); dmi_scan_machine(); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index e1c7b3b..e6c66a0 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -223,7 +223,6 @@ void show_page_walk(unsigned long addr) l1_table_offset(addr), l1e_get_intpte(l1e), pfn); } -void double_fault(void); void do_double_fault(struct cpu_user_regs *regs) { unsigned int cpu; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 35b2433..c9051be 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -500,12 +500,14 @@ DECLARE_TRAP_HANDLER(overflow); DECLARE_TRAP_HANDLER(bounds); DECLARE_TRAP_HANDLER(invalid_op); DECLARE_TRAP_HANDLER(device_not_available); +DECLARE_TRAP_HANDLER(double_fault); DECLARE_TRAP_HANDLER(coprocessor_segment_overrun); DECLARE_TRAP_HANDLER(invalid_TSS); DECLARE_TRAP_HANDLER(segment_not_present); DECLARE_TRAP_HANDLER(stack_segment); DECLARE_TRAP_HANDLER(general_protection); DECLARE_TRAP_HANDLER(page_fault); +DECLARE_TRAP_HANDLER(early_page_fault); DECLARE_TRAP_HANDLER(coprocessor_error); DECLARE_TRAP_HANDLER(simd_coprocessor_error); DECLARE_TRAP_HANDLER(machine_check); diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index 3039e1b..8f8c6f3 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -7,7 +7,6 @@ extern unsigned long xenheap_initial_phys_start; void early_cpu_init(void); void early_time_init(void); -void early_page_fault(void); int intel_cpu_init(void); int amd_init_cpu(void); -- 1.7.10.4