UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xen/PVH: Make GDT selectors PVH-specific 

We don't need to share PVH GDT layout with other GDTs, especially
since we now have a PVH-speciific entry (for stack canary segment).

Define PVH's own selectors.

(As a side effect of this change we are also fixing improper
reference to __KERNEL_CS)

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
Boris Ostrovsky 2018-05-08 20:25:54 -04:00 committed by Juergen Gross
parent 9801406832
commit 7f47e1c52d
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/x86/xen/xen-pvh.S
View File

@ -54,7 +54,11 @@
* charge of setting up it's own stack, GDT and IDT. * charge of setting up it's own stack, GDT and IDT.
*/ */
#define PVH_GDT_ENTRY_CANARY 4 #define PVH_GDT_ENTRY_CS 1
#define PVH_GDT_ENTRY_DS 2
#define PVH_GDT_ENTRY_CANARY 3
#define PVH_CS_SEL (PVH_GDT_ENTRY_CS * 8)
#define PVH_DS_SEL (PVH_GDT_ENTRY_DS * 8)
#define PVH_CANARY_SEL (PVH_GDT_ENTRY_CANARY * 8) #define PVH_CANARY_SEL (PVH_GDT_ENTRY_CANARY * 8)
ENTRY(pvh_start_xen) ENTRY(pvh_start_xen)
@ -62,7 +66,7 @@ ENTRY(pvh_start_xen)
lgdt (_pa(gdt)) lgdt (_pa(gdt))
mov $(__BOOT_DS),%eax mov $PVH_DS_SEL,%eax
mov %eax,%ds mov %eax,%ds
mov %eax,%es mov %eax,%es
mov %eax,%ss mov %eax,%ss
@ -96,7 +100,7 @@ ENTRY(pvh_start_xen)
mov %eax, %cr0 mov %eax, %cr0
/* Jump to 64-bit mode. */ /* Jump to 64-bit mode. */
ljmp $__KERNEL_CS, $_pa(1f) ljmp $PVH_CS_SEL, $_pa(1f)
/* 64-bit entry point. */ /* 64-bit entry point. */
.code64 .code64
@ -136,13 +140,13 @@ ENTRY(pvh_start_xen)
or $(X86_CR0_PG | X86_CR0_PE), %eax or $(X86_CR0_PG | X86_CR0_PE), %eax
mov %eax, %cr0 mov %eax, %cr0
ljmp $__BOOT_CS, $1f ljmp $PVH_CS_SEL, $1f
1: 1:
call xen_prepare_pvh call xen_prepare_pvh
mov $_pa(pvh_bootparams), %esi mov $_pa(pvh_bootparams), %esi
/* startup_32 doesn't expect paging and PAE to be on. */ /* startup_32 doesn't expect paging and PAE to be on. */
ljmp $__BOOT_CS, $_pa(2f) ljmp $PVH_CS_SEL, $_pa(2f)
2: 2:
mov %cr0, %eax mov %cr0, %eax
and $~X86_CR0_PG, %eax and $~X86_CR0_PG, %eax
@ -151,7 +155,7 @@ ENTRY(pvh_start_xen)
and $~X86_CR4_PAE, %eax and $~X86_CR4_PAE, %eax
mov %eax, %cr4 mov %eax, %cr4
ljmp $__BOOT_CS, $_pa(startup_32) ljmp $PVH_CS_SEL, $_pa(startup_32)
#endif #endif
END(pvh_start_xen) END(pvh_start_xen)
@ -163,13 +167,12 @@ gdt:
.word 0 .word 0
gdt_start: gdt_start:
.quad 0x0000000000000000 /* NULL descriptor */ .quad 0x0000000000000000 /* NULL descriptor */
.quad 0x0000000000000000 /* reserved */
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
.quad GDT_ENTRY(0xa09a, 0, 0xfffff) /* __KERNEL_CS */ .quad GDT_ENTRY(0xa09a, 0, 0xfffff) /* PVH_CS_SEL */
#else #else
.quad GDT_ENTRY(0xc09a, 0, 0xfffff) /* __KERNEL_CS */ .quad GDT_ENTRY(0xc09a, 0, 0xfffff) /* PVH_CS_SEL */
#endif #endif
.quad GDT_ENTRY(0xc092, 0, 0xfffff) /* __KERNEL_DS */ .quad GDT_ENTRY(0xc092, 0, 0xfffff) /* PVH_DS_SEL */
.quad GDT_ENTRY(0x4090, 0, 0x18) /* PVH_CANARY_SEL */ .quad GDT_ENTRY(0x4090, 0, 0x18) /* PVH_CANARY_SEL */
gdt_end: gdt_end: