under paravirt, read cr2 cannot be issued directly anymore. So wrap it in a macro, defined to the operation itself in case paravirt is off, but to something else if we have paravirt in the game Signed-off-by: Glauber de Oliveira Costa <[email protected]> Signed-off-by: Steven Rostedt <[email protected]> --- arch/x86_64/kernel/head.S | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S index e89abcd..1bb6c55 100644 --- a/arch/x86_64/kernel/head.S +++ b/arch/x86_64/kernel/head.S @@ -18,6 +18,12 @@ #include <asm/page.h> #include <asm/msr.h> #include <asm/cache.h> +#ifdef CONFIG_PARAVIRT +#include <asm/asm-offsets.h> +#include <asm/paravirt.h> +#else +#define GET_CR2_INTO_RCX mov %cr2, %rcx +#endif /* we are not able to switch in one step to the final KERNEL ADRESS SPACE * because we need identity-mapped pages. @@ -267,7 +273,9 @@ ENTRY(early_idt_handler) xorl %eax,%eax movq 8(%rsp),%rsi # get rip movq (%rsp),%rdx - movq %cr2,%rcx + /* When PARAVIRT is on, this operation may clobber rax. It is + something safe to do, because we've just zeroed rax. */ + GET_CR2_INTO_RCX leaq early_idt_msg(%rip),%rdi call early_printk cmpl $2,early_recursion_flag(%rip) -- 1.4.4.2 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- [PATCH 23/25 -v2] provide paravirt patching function
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 23/25 -v2] provide paravirt patching function
- References:
- [PATCH 0/25 -v2] paravirt_ops for x86_64, second round
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 1/25 -v2] header file move
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 2/25 -v2] tlb flushing routines
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 3/25 -v2] irq_flags / halt routines
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 4/25 -v2] Add debugreg/load_rsp native hooks
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 5/25 -v2] native versions for system.h functions
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 6/25 -v2] add native_apic read and write functions, as well as boot clocks ones
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 7/25 -v2] interrupt related native paravirt functions.
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 8/25 -v2] use macro for sti/cli in spinlock definitions
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 9/25 -v2] report ring kernel is running without paravirt
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 10/25 -v2] export math_state_restore
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 11/25 -v2] native versions for set pagetables
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 12/25 -v2] turn msr.h functions into native versions
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 13/25 -v2] add native functions for descriptors handling
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 14/25 -v2] get rid of inline asm for load_cr3
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 15/25 -v2] introducing paravirt_activate_mm
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 16/25 -v2] turn page operations into native versions
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 17/25 -v2] introduce paravirt_release_pgd()
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 18/25 -v2] turn priviled operations into macros in entry.S
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 20/25 -v2] replace syscall_init
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 21/25 -v2] export cpu_gdt_descr
- From: Glauber de Oliveira Costa <[email protected]>
- [PATCH 0/25 -v2] paravirt_ops for x86_64, second round
- Prev by Date: [PATCH 23/25 -v2] provide paravirt patching function
- Next by Date: [PATCH 17/25 -v2] introduce paravirt_release_pgd()
- Previous by thread: [PATCH 21/25 -v2] export cpu_gdt_descr
- Next by thread: [PATCH 23/25 -v2] provide paravirt patching function
- Index(es):
 |