refactor: use a more decent physical memory map

[lunaix-os.git] / lunaix-os / kernel / process / process.c

diff --git a/lunaix-os/kernel/process/process.c b/lunaix-os/kernel/process/process.c
index f500cbed01890dab04a01f739f9e0b4f70837de0..370a5425c8636f21f3a6d05ce8491dc840433b29 100644 (file)
--- a/lunaix-os/kernel/process/process.c
+++ b/lunaix-os/kernel/process/process.c
@@ -1,6 +1,5 @@
 #include <klibc/string.h>
 #include <lunaix/clock.h>
 #include <klibc/string.h>
 #include <lunaix/clock.h>

-#include <lunaix/common.h>

 #include <lunaix/mm/mmap.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/region.h>
 #include <lunaix/mm/mmap.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/region.h>


@@ -11,7 +10,9 @@
 #include <lunaix/status.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>
 #include <lunaix/status.h>
 #include <lunaix/syscall.h>
 #include <lunaix/syslog.h>

+

 #include <sys/abi.h>
 #include <sys/abi.h>

+#include <sys/mm/mempart.h>

 
 LOG_MODULE("PROC")
 
 
 LOG_MODULE("PROC")
 


@@ -24,7 +25,7 @@ __dup_pagetable(pid_t pid, ptr_t mount_point)
     x86_page_table* ptd = (x86_page_table*)PG_MOUNT_1;
     x86_page_table* pptd = (x86_page_table*)(mount_point | (0x3FF << 12));
 
     x86_page_table* ptd = (x86_page_table*)PG_MOUNT_1;
     x86_page_table* pptd = (x86_page_table*)(mount_point | (0x3FF << 12));
 

-    size_t kspace_l1inx = L1_INDEX(KERNEL_MM_BASE);
+    size_t kspace_l1inx = L1_INDEX(KERNEL_EXEC);

 
     for (size_t i = 0; i < PG_MAX_ENTRIES - 1; i++) {
 
 
     for (size_t i = 0; i < PG_MAX_ENTRIES - 1; i++) {
 


@@ -63,7 +64,7 @@ __del_pagetable(pid_t pid, ptr_t mount_point)
     x86_page_table* pptd = (x86_page_table*)(mount_point | (0x3FF << 12));
 
     // only remove user address space
     x86_page_table* pptd = (x86_page_table*)(mount_point | (0x3FF << 12));
 
     // only remove user address space

-    for (size_t i = 0; i < L1_INDEX(KERNEL_MM_BASE); i++) {
+    for (size_t i = 0; i < L1_INDEX(KERNEL_EXEC); i++) {

         x86_pte_t ptde = pptd->entry[i];
         if (!ptde || !(ptde & PG_PRESENT)) {
             continue;
         x86_pte_t ptde = pptd->entry[i];
         if (!ptde || !(ptde & PG_PRESENT)) {
             continue;


@@ -152,13 +153,13 @@ init_proc_user_space(struct proc_info* pcb)
     struct mm_region* mapped;
     struct mmap_param param = { .vms_mnt = VMS_MOUNT_1,
                                 .pvms = &pcb->mm,
     struct mm_region* mapped;
     struct mmap_param param = { .vms_mnt = VMS_MOUNT_1,
                                 .pvms = &pcb->mm,

-                                .mlen = USTACK_SIZE,
+                                .mlen = USR_STACK_SIZE,

                                 .proct = PROT_READ | PROT_WRITE,
                                 .flags = MAP_ANON | MAP_PRIVATE | MAP_FIXED,
                                 .type = REGION_TYPE_STACK };
 
     int status = 0;
                                 .proct = PROT_READ | PROT_WRITE,
                                 .flags = MAP_ANON | MAP_PRIVATE | MAP_FIXED,
                                 .type = REGION_TYPE_STACK };
 
     int status = 0;

-    if ((status = mem_map(NULL, &mapped, USTACK_END, NULL, &param))) {
+    if ((status = mem_map(NULL, &mapped, USR_STACK, NULL, &param))) {

         kprint_panic("fail to alloc user stack: %d", status);
     }
 
         kprint_panic("fail to alloc user stack: %d", status);
     }
 


@@ -249,7 +250,7 @@ dup_proc()
     return pcb->pid;
 }
 
     return pcb->pid;
 }
 

-extern void __kernel_end;
+extern void __kexec_end;

 
 void
 copy_kernel_stack(struct proc_info* proc, ptr_t usedMnt)
 
 void
 copy_kernel_stack(struct proc_info* proc, ptr_t usedMnt)


@@ -261,7 +262,7 @@ copy_kernel_stack(struct proc_info* proc, ptr_t usedMnt)
     vmm_mount_pd(VMS_MOUNT_1, pt_copy); // 将新进程的页表挂载到挂载点#2
 
     // copy the kernel stack
     vmm_mount_pd(VMS_MOUNT_1, pt_copy); // 将新进程的页表挂载到挂载点#2
 
     // copy the kernel stack

-    for (size_t i = KSTACK_START >> 12; i <= KSTACK_TOP >> 12; i++) {
+    for (size_t i = KERNEL_STACK >> 12; i <= KERNEL_STACK_END >> 12; i++) {

         volatile x86_pte_t* ppte = &PTE_MOUNTED(VMS_MOUNT_1, i);
 
         /*
         volatile x86_pte_t* ppte = &PTE_MOUNTED(VMS_MOUNT_1, i);
 
         /*