From f06ed2d886008ce912391e8674e80069f498c65a Mon Sep 17 00:00:00 2001 From: fslongjin Date: Mon, 1 Aug 2022 21:42:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BFprocess=E6=A8=A1=E5=9D=97=E8=83=BD?= =?UTF-8?q?=E4=BB=A5O3=E4=BC=98=E5=8C=96=E4=B8=8B=E8=BF=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- kernel/Makefile | 2 +- kernel/common/glib.h | 4 +++ kernel/process/process.c | 55 +++++++++++++++++++++++++++++++++------- kernel/process/process.h | 14 ++++++---- kernel/sched/sched.c | 5 +--- kernel/sched/sched.h | 3 --- 7 files changed, 62 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 12f516e2..1a87b4c1 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ export ARCH=__x86_64__ export ROOT_PATH=$(shell pwd) export DEBUG=DEBUG -export GLOBAL_CFLAGS := -mcmodel=large -fno-builtin -m64 -fno-stack-protector -D $(ARCH) +export GLOBAL_CFLAGS := -mcmodel=large -fno-builtin -m64 -fno-stack-protector -D $(ARCH) -O1 ifeq ($(DEBUG), DEBUG) GLOBAL_CFLAGS += -g diff --git a/kernel/Makefile b/kernel/Makefile index 5d2deb0b..c813e863 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -10,7 +10,7 @@ LIB_FILES := $(foreach DIR,$(DIR_LIB),$(addprefix $(DIR)/,$(lib_patterns))) # 控制操作系统使用的中断控制器 _INTR_8259A_ _INTR_APIC_ PIC := _INTR_APIC_ -CFLAGS = $(GLOBAL_CFLAGS) -D $(PIC) -I $(shell pwd) -O1 +CFLAGS = $(GLOBAL_CFLAGS) -D $(PIC) -I $(shell pwd) export ASFLAGS := --64 diff --git a/kernel/common/glib.h b/kernel/common/glib.h index 10ee3f69..1a79076f 100644 --- a/kernel/common/glib.h +++ b/kernel/common/glib.h @@ -93,6 +93,7 @@ struct List static inline void list_init(struct List *list) { list->next = list; + io_mfence(); list->prev = list; } @@ -106,8 +107,11 @@ static inline void list_add(struct List *entry, struct List *node) { node->next = entry->next; + barrier(); node->prev = entry; + barrier(); node->next->prev = node; + barrier(); entry->next = node; } diff --git a/kernel/process/process.c b/kernel/process/process.c index 37cdcd7c..60fe0041 100644 --- a/kernel/process/process.c +++ b/kernel/process/process.c @@ -21,8 +21,8 @@ #include -#pragma GCC push_options -#pragma GCC optimize("O0") +// #pragma GCC push_options +// #pragma GCC optimize("O0") spinlock_t process_global_pid_write_lock; // 增加pid的写锁 long process_global_pid = 1; // 系统中最大的pid @@ -103,6 +103,7 @@ uint64_t process_exit_mm(struct process_control_block *pcb); uint64_t process_copy_thread(uint64_t clone_flags, struct process_control_block *pcb, uint64_t stack_start, uint64_t stack_size, struct pt_regs *current_regs); void process_exit_thread(struct process_control_block *pcb); + /** * @brief 切换进程 * @@ -111,6 +112,8 @@ void process_exit_thread(struct process_control_block *pcb); * 由于程序在进入内核的时候已经保存了寄存器，因此这里不需要保存寄存器。 * 这里切换fs和gs寄存器 */ +#pragma GCC push_options +#pragma GCC optimize("O0") void __switch_to(struct process_control_block *prev, struct process_control_block *next) { initial_tss[proc_current_cpu_id].rsp0 = next->thread->rbp; @@ -126,6 +129,7 @@ void __switch_to(struct process_control_block *prev, struct process_control_bloc __asm__ __volatile__("movq %0, %%fs \n\t" ::"a"(next->thread->fs)); __asm__ __volatile__("movq %0, %%gs \n\t" ::"a"(next->thread->gs)); } +#pragma GCC pop_options /** * @brief 打开要执行的程序文件 @@ -301,6 +305,8 @@ load_elf_failed:; * @param envp 环境变量 * @return ul 错误码 */ +#pragma GCC push_options +#pragma GCC optimize("O0") ul do_execve(struct pt_regs *regs, char *path, char *argv[], char *envp[]) { @@ -405,6 +411,7 @@ ul do_execve(struct pt_regs *regs, char *path, char *argv[], char *envp[]) exec_failed:; process_do_exit(tmp); } +#pragma GCC pop_options /** * @brief 内核init进程 @@ -412,6 +419,8 @@ exec_failed:; * @param arg * @return ul 参数 */ +#pragma GCC push_options +#pragma GCC optimize("O0") ul initial_kernel_thread(ul arg) { // kinfo("initial proc running...\targ:%#018lx", arg); @@ -448,6 +457,7 @@ ul initial_kernel_thread(ul arg) current_pcb->thread->rip = (ul)ret_from_system_call; current_pcb->thread->rsp = (ul)current_pcb + STACK_SIZE - sizeof(struct pt_regs); current_pcb->thread->fs = USER_DS | 0x3; + barrier(); current_pcb->thread->gs = USER_DS | 0x3; // 主动放弃内核线程身份 @@ -469,7 +479,7 @@ ul initial_kernel_thread(ul arg) return 1; } - +#pragma GCC pop_options /** * @brief 当子进程退出后向父进程发送通知 * @@ -519,23 +529,29 @@ ul process_do_exit(ul code) int kernel_thread(unsigned long (*fn)(unsigned long), unsigned long arg, unsigned long flags) { struct pt_regs regs; + barrier(); memset(®s, 0, sizeof(regs)); - + barrier(); // 在rbx寄存器中保存进程的入口地址 regs.rbx = (ul)fn; // 在rdx寄存器中保存传入的参数 regs.rdx = (ul)arg; - + barrier(); regs.ds = KERNEL_DS; + barrier(); regs.es = KERNEL_DS; + barrier(); regs.cs = KERNEL_CS; + barrier(); regs.ss = KERNEL_DS; + barrier(); // 置位中断使能标志位 regs.rflags = (1 << 9); - + barrier(); // rip寄存器指向内核线程的引导程序 regs.rip = (ul)kernel_thread_func; + barrier(); // kdebug("kernel_thread_func=%#018lx", kernel_thread_func); // kdebug("&kernel_thread_func=%#018lx", &kernel_thread_func); // kdebug("1111\tregs.rip = %#018lx", regs.rip); @@ -579,23 +595,34 @@ void process_init() for (int i = 256; i < 512; ++i) { uint64_t *tmp = idle_pml4t_vaddr + i; + barrier(); if (*tmp == 0) { void *pdpt = kmalloc(PAGE_4K_SIZE, 0); + barrier(); memset(pdpt, 0, PAGE_4K_SIZE); + barrier(); set_pml4t(tmp, mk_pml4t(virt_2_phys(pdpt), PAGE_KERNEL_PGT)); } } + barrier(); + + flush_tlb(); /* kdebug("initial_thread.rbp=%#018lx", initial_thread.rbp); kdebug("initial_tss[0].rsp1=%#018lx", initial_tss[0].rsp1); kdebug("initial_tss[0].ist1=%#018lx", initial_tss[0].ist1); */ // 初始化pid的写锁 + spin_init(&process_global_pid_write_lock); + // 初始化进程的循环链表 list_init(&initial_proc_union.pcb.list); + barrier(); kernel_thread(initial_kernel_thread, 10, CLONE_FS | CLONE_SIGNAL); // 初始化内核线程 + barrier(); + initial_proc_union.pcb.state = PROC_RUNNING; initial_proc_union.pcb.preempt_count = 0; initial_proc_union.pcb.cpu_id = 0; @@ -619,6 +646,7 @@ unsigned long do_fork(struct pt_regs *regs, unsigned long clone_flags, unsigned // 为新的进程分配栈空间，并将pcb放置在底部 tsk = (struct process_control_block *)kmalloc(STACK_SIZE, 0); + barrier(); if (tsk == NULL) { @@ -626,13 +654,17 @@ unsigned long do_fork(struct pt_regs *regs, unsigned long clone_flags, unsigned return retval; } + barrier(); memset(tsk, 0, sizeof(struct process_control_block)); + io_mfence(); // 将当前进程的pcb复制到新的pcb内 memcpy(tsk, current_pcb, sizeof(struct process_control_block)); + io_mfence(); // 初始化进程的循环链表结点 list_init(&tsk->list); + io_mfence(); // 判断是否为内核态调用fork if (current_pcb->flags & PF_KTHREAD && stack_start != 0) tsk->flags |= PF_KFORK; @@ -643,11 +675,14 @@ unsigned long do_fork(struct pt_regs *regs, unsigned long clone_flags, unsigned // 增加全局的pid并赋值给新进程的pid spin_lock(&process_global_pid_write_lock); tsk->pid = process_global_pid++; - + barrier(); // 加入到进程链表中 tsk->next_pcb = initial_proc_union.pcb.next_pcb; + barrier(); initial_proc_union.pcb.next_pcb = tsk; + barrier(); tsk->parent_pcb = current_pcb; + barrier(); spin_unlock(&process_global_pid_write_lock); @@ -656,7 +691,7 @@ unsigned long do_fork(struct pt_regs *regs, unsigned long clone_flags, unsigned tsk->parent_pcb = current_pcb; wait_queue_init(&tsk->wait_child_proc_exit, NULL); - + barrier(); list_init(&tsk->list); retval = -ENOMEM; @@ -1049,6 +1084,7 @@ uint64_t process_copy_thread(uint64_t clone_flags, struct process_control_block child_regs = (struct pt_regs *)(((uint64_t)pcb) + STACK_SIZE - size); memcpy(child_regs, (void *)current_regs, size); + barrier(); // 然后重写新的栈中，每个栈帧的rbp值 process_rewrite_rbp(child_regs, pcb); } @@ -1056,6 +1092,7 @@ uint64_t process_copy_thread(uint64_t clone_flags, struct process_control_block { child_regs = (struct pt_regs *)((uint64_t)pcb + STACK_SIZE - sizeof(struct pt_regs)); memcpy(child_regs, current_regs, sizeof(struct pt_regs)); + barrier(); child_regs->rsp = stack_start; } @@ -1091,4 +1128,4 @@ void process_exit_thread(struct process_control_block *pcb) { } -#pragma GCC pop_options \ No newline at end of file +// #pragma GCC pop_options \ No newline at end of file diff --git a/kernel/process/process.h b/kernel/process/process.h index b259e02d..f757dba2 100644 --- a/kernel/process/process.h +++ b/kernel/process/process.h @@ -18,8 +18,9 @@ #include #include -#pragma GCC push_options -#pragma GCC optimize("O0") +// #pragma GCC push_options +// #pragma GCC optimize("O0") + // 进程最大可拥有的文件描述符数量 #define PROC_MAX_FD_NUM 16 @@ -214,17 +215,21 @@ struct tss_struct .io_map_base_addr = 0 \ } +#pragma GCC push_options +#pragma GCC optimize("O0") // 获取当前的pcb struct process_control_block *get_current_pcb() { struct process_control_block *current = NULL; // 利用了当前pcb和栈空间总大小为32k大小对齐，将rsp低15位清空，即可获得pcb的起始地址 + barrier(); __asm__ __volatile__("andq %%rsp, %0 \n\t" : "=r"(current) : "0"(~32767UL)); + barrier(); return current; }; - +#pragma GCC pop_options #define current_pcb get_current_pcb() #define GET_CURRENT_PCB \ @@ -351,7 +356,7 @@ int kernel_thread(unsigned long (*fn)(unsigned long), unsigned long arg, unsigne asm volatile("movq %0, %%cr3 \n\t" ::"r"(next_pcb->mm->pgd) \ : "memory"); \ } while (0) -// flush_tlb(); \ +// flush_tlb(); // 获取当前cpu id #define proc_current_cpu_id (current_pcb->cpu_id) @@ -365,4 +370,3 @@ extern struct mm_struct initial_mm; extern struct thread_struct initial_thread; extern union proc_union initial_proc_union; extern struct process_control_block *initial_proc[MAX_CPU_NUM]; -#pragma GCC pop_options \ No newline at end of file diff --git a/kernel/sched/sched.c b/kernel/sched/sched.c index 33f307b1..ce28b508 100644 --- a/kernel/sched/sched.c +++ b/kernel/sched/sched.c @@ -3,8 +3,6 @@ #include #include -#pragma GCC push_options -#pragma GCC optimize("O0") struct sched_queue_t sched_cfs_ready_queue[MAX_CPU_NUM]; // 就绪队列 @@ -160,5 +158,4 @@ void sched_init() sched_cfs_ready_queue[i].cpu_exec_proc_jiffies = 5; sched_cfs_ready_queue[i].proc_queue.virtual_runtime = 0x7fffffffffffffff; } -} -#pragma GCC pop_options \ No newline at end of file +} \ No newline at end of file diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 1e55dcd1..371ba820 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3,8 +3,6 @@ #include #include -#pragma GCC push_options -#pragma GCC optimize("O0") // @todo: 用红黑树重写cfs的队列 struct sched_queue_t { @@ -49,4 +47,3 @@ void sched_init(); */ void sched_update_jiffies(); -#pragma GCC pop_options \ No newline at end of file