mini-os: correct memory access rights for pvh mode
PATCH 1/1 mini-os: correct memory access rights for pvh mode
When running as a PVH guest the memory access rights are not set
correctly: _PAGE_USER should not be set and CR0.WP should be set. Especially CR0.WP is important in order to let the allocate on demand feature work, as it requires a page fault when writing to a read-only page.
--- arch/x86/x86_hvm.S | 2 +- include/x86/arch_mm.h | 18 ++++++++++++------ include/x86/os.h | 1 + 3 files changed, 14 insertions(+), 7 deletions(-)
arch/x86/x86_hvm.S +1 -1
@@ -20,7 +20,7 @@ _start: #endif /* __x86_64__ */ mov %cr0, %eax - or $X86_CR0_PG, %eax + or $(X86_CR0_PG | X86_CR0_WP), %eax mov %eax, %cr0 lgdt gdt_ptr
include/x86/arch_mm.h +12 -6
@@ -171,17 +171,23 @@ typedef unsigned long pgentry_t;#define _PAGE_PSE CONST(0x080)#define _PAGE_GLOBAL CONST(0x100) +#ifdef CONFIG_PARAVIRT +#define PAGE_USER _PAGE_USER +#else +#define PAGE_USER CONST(0) +#endif +#if defined(__i386__)#define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED)#define L1_PROT_RO (_PAGE_PRESENT|_PAGE_ACCESSED) -#define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY |_PAGE_USER) +#define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY |PAGE_USER)#define L3_PROT (_PAGE_PRESENT)#elif defined(__x86_64__) -#define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_USER) -#define L1_PROT_RO (_PAGE_PRESENT|_PAGE_ACCESSED|_PAGE_USER) -#define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_USER) -#define L3_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_USER) -#define L4_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_USER) +#define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|PAGE_USER) +#define L1_PROT_RO (_PAGE_PRESENT|_PAGE_ACCESSED|PAGE_USER) +#define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|PAGE_USER) +#define L3_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|PAGE_USER) +#define L4_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|PAGE_USER)#endif /* __i386__ || __x86_64__ */ /* flags for ioremap */
include/x86/os.h +1 -0
@@ -27,6 +27,7 @@#define MSR_EFER 0xc0000080#define _EFER_LME 8/* Long mode enable */ +#define X86_CR0_WP 0x00010000/* Write protect */ #define X86_CR0_PG 0x80000000/* Paging */ #define X86_CR4_PAE 0x00000020/* enable physical address extensions */ #define X86_CR4_OSFXSR 0x00000200/* enable fast FPU save and restore */
Signature · 1 line
2.26.2
Juergen Gross, le sam. 15 août 2020 13:15:57 +0200, a ecrit:
Quoted 7 lines
When running as a PVH guest the memory access rights are not set
correctly:_PAGE_USERshould not be set and CR0.WP should be set. Especially CR0.WP is important in order to let the allocate on demand feature work, as it requires a page fault when writing to a read-only page.Signed-off-by Juergen Gross <[email protected]>
Quoted 68 lines
--- arch/x86/x86_hvm.S | 2 +- include/x86/arch_mm.h | 18 ++++++++++++------ include/x86/os.h | 1 + 3 files changed, 14 insertions(+), 7 deletions(-)arch/x86/x86_hvm.S +1
-1@@ -20,7 +20,7 @@ _start: #endif /* __x86_64__ */ mov %cr0, %eax - or $X86_CR0_PG, %eax + or $(X86_CR0_PG | X86_CR0_WP), %eax mov %eax, %cr0 lgdt gdt_ptrinclude/x86/arch_mm.h +12
-6@@ -171,17 +171,23 @@ typedef unsigned long pgentry_t;#define _PAGE_PSE CONST(0x080)#define _PAGE_GLOBAL CONST(0x100) +#ifdef CONFIG_PARAVIRT +#define PAGE_USER _PAGE_USER +#else +#define PAGE_USER CONST(0) +#endif +#if defined(__i386__)#define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED)#define L1_PROT_RO (_PAGE_PRESENT|_PAGE_ACCESSED) -#define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY |_PAGE_USER) +#define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY |PAGE_USER)#define L3_PROT (_PAGE_PRESENT)#elif defined(__x86_64__) -#define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_USER) -#define L1_PROT_RO (_PAGE_PRESENT|_PAGE_ACCESSED|_PAGE_USER) -#define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_USER) -#define L3_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_USER) -#define L4_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_USER) +#define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|PAGE_USER) +#define L1_PROT_RO (_PAGE_PRESENT|_PAGE_ACCESSED|PAGE_USER) +#define L2_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|PAGE_USER) +#define L3_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|PAGE_USER) +#define L4_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_DIRTY|PAGE_USER)#endif /* __i386__ || __x86_64__ */ /* flags for ioremap */ include/x86/os.h +1
-0@@ -27,6 +27,7 @@#define MSR_EFER 0xc0000080#define _EFER_LME 8/* Long mode enable */ +#define X86_CR0_WP 0x00010000/* Write protect */ #define X86_CR0_PG 0x80000000/* Paging */ #define X86_CR4_PAE 0x00000020/* enable physical address extensions */ #define X86_CR4_OSFXSR 0x00000200/* enable fast FPU save and restore */ Signature · 1 line
2.26.2
Signature · 2 lines
Samuel <y> la vraie vie, c'est quand le prompt passe de $ à #
Wei Liu
AppliedQuoted 10 lines · Samuel Thibault
Juergen Gross, le sam. 15 août 2020 13:15:57 +0200, a ecrit:
Quoted 7 lines
When running as a PVH guest the memory access rights are not set
correctly:_PAGE_USERshould not be set and CR0.WP should be set. Especially CR0.WP is important in order to let the allocate on demand feature work, as it requires a page fault when writing to a read-only page.Signed-off-by Juergen Gross <[email protected]>Reviewed-by Samuel Thibault <[email protected]>
Applied.