oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set global flag for kernel pages, so tlb entries for kernel aren't thrown

Browse Source 
away on cr3 reload. minor optimization.
This commit is contained in:
Ben Gras 2009-04-23 15:11:16 +00:00
parent e9e1ae1cfc
commit ef8a741301
5 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/arch/i386/klib386.s
View File

@ -38,6 +38,8 @@
.define _write_cr3 ! write cr3
.define _last_cr3
.define _write_cr0 ! write a value in cr0
.define _read_cr4
.define _write_cr4
.define _kernel_cr3
@ -606,6 +608,31 @@ _write_cr0:
pop ebp
ret
!*===========================================================================*
!* read_cr4 *
!*===========================================================================*
! PUBLIC unsigned long read_cr4(void);
_read_cr4:
push ebp
mov ebp, esp
.data1 0x0f, 0x20, 0xe0 ! mov eax, cr4
pop ebp
ret
!*===========================================================================*
!* write_cr4 *
!*===========================================================================*
! PUBLIC void write_cr4(unsigned long value);
_write_cr4:
push ebp
mov ebp, esp
mov eax, 8(ebp)
.data1 0x0f, 0x22, 0xe0 ! mov cr4, eax
jmp 0f
0:
pop ebp
ret
!*===========================================================================*
!* write_cr3 *
!*===========================================================================*

20
kernel/arch/i386/memory.c
View File

@ -149,10 +149,28 @@ PRIVATE void set_cr3()
PRIVATE void vm_enable_paging(void)
{
u32_t cr0;
u32_t cr0, cr4;
cr0= read_cr0();
cr4= read_cr4();
/* First clear PG and PGE flag, as PGE must be enabled after PG. */
write_cr0(cr0 & ~I386_CR0_PG);
write_cr4(cr4 & ~I386_CR4_PGE);
cr0= read_cr0();
cr4= read_cr4();
/* First enable paging, then enable global page flag. */
write_cr0(cr0 | I386_CR0_PG);
write_cr4(cr4 | I386_CR4_PGE);
{
u32_t cr4v;
cr4v = read_cr4();
kprintf("cr4 = 0x%lx\n", cr4v);
}
}
PUBLIC vir_bytes alloc_remote_segment(u32_t *selector,

2
kernel/arch/i386/proto.h
View File

@ -62,6 +62,8 @@ _PROTOTYPE( void reset, (void) );
_PROTOTYPE( void int86, (void) );
_PROTOTYPE( unsigned long read_cr0, (void) );
_PROTOTYPE( void write_cr0, (unsigned long value) );
_PROTOTYPE( unsigned long read_cr4, (void) );
_PROTOTYPE( void write_cr4, (unsigned long value) );
_PROTOTYPE( void write_cr3, (unsigned long value) );
_PROTOTYPE( unsigned long read_cpu_flags, (void) );
_PROTOTYPE( void phys_insb, (U16_t port, phys_bytes buf, size_t count) );

4
servers/vm/i386/pagetable.c
View File

@ -785,12 +785,12 @@ PUBLIC int pt_mapkernel(pt_t *pt)
/* Map in text. flags: don't write, supervisor only */
if((r=pt_writemap(pt, KERNEL_TEXT, KERNEL_TEXT, KERNEL_TEXT_LEN,
I386_VM_PRESENT, 0)) != OK)
I386_VM_PRESENT|I386_VM_GLOBAL, 0)) != OK)
return r;
/* Map in data. flags: read-write, supervisor only */
if((r=pt_writemap(pt, KERNEL_DATA, KERNEL_DATA, KERNEL_DATA_LEN,
I386_VM_PRESENT|I386_VM_WRITE, 0)) != OK)
I386_VM_PRESENT|I386_VM_WRITE|I386_VM_GLOBAL, 0)) != OK)
return r;
return OK;

3
servers/vm/i386/pagetable.h
View File

@ -26,12 +26,13 @@ typedef struct {
#define PTF_WRITE I386_VM_WRITE
#define PTF_PRESENT I386_VM_PRESENT
#define PTF_USER I386_VM_USER
#define PTF_GLOBAL I386_VM_GLOBAL
#define PTF_MAPALLOC I386_VM_PTAVAIL1 /* Page allocated by pt code. */
/* For arch-specific PT routines to check if no bits outside
* the regular flags are set.
*/
#define PTF_ALLFLAGS (PTF_WRITE|PTF_PRESENT|PTF_USER)
#define PTF_ALLFLAGS (PTF_WRITE|PTF_PRESENT|PTF_USER|PTF_GLOBAL)
#endif