From 494bcc18111421affb80e2329b8911c3e888ab80 Mon Sep 17 00:00:00 2001 From: fslongjin Date: Tue, 26 Jul 2022 15:44:01 +0800 Subject: [PATCH] =?UTF-8?q?bitree=E7=9A=84=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BB=A5=E5=8F=8Abug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/common/bitree.c | 14 ++-- kernel/common/bitree.h | 6 +- kernel/driver/usb/xhci/xhci.c | 11 ++- kernel/ktest/test-bitree.c | 132 ++++++++++++++++++++++++++++++++++ kernel/mm/mm.c | 2 +- kernel/process/process.c | 10 +-- kernel/process/process.h | 11 +++ 7 files changed, 167 insertions(+), 19 deletions(-) create mode 100644 kernel/ktest/test-bitree.c diff --git a/kernel/common/bitree.c b/kernel/common/bitree.c index e3273814..224c6b51 100644 --- a/kernel/common/bitree.c +++ b/kernel/common/bitree.c @@ -3,9 +3,9 @@ #include #include -#define smaller(root, a, b) (root->cmp(a, b) == -1) -#define equal(root, a, b) (root->cmp(a, b) == 0) -#define greater(root, a, b) (root->cmp(a, b) == 1) +#define smaller(root, a, b) (root->cmp((a)->value, (b)->value) == -1) +#define equal(root, a, b) (root->cmp((a)->value, (b)->value) == 0) +#define greater(root, a, b) (root->cmp((a)->value, (b)->value) == 1) /** * @brief 创建二叉搜索树 @@ -15,7 +15,7 @@ * @param release 用来释放结点的value的函数 * @return struct bt_root_t* 树根结构体 */ -struct bt_root_t *bt_create_tree(struct bt_node_t *node, int (*cmp)(struct bt_node_t *a, struct bt_node_t *b), int (*release)(void *value)) +struct bt_root_t *bt_create_tree(struct bt_node_t *node, int (*cmp)(void *a, void *b), int (*release)(void *value)) { if (node == NULL || cmp == NULL) return -EINVAL; @@ -109,6 +109,10 @@ int bt_query(struct bt_root_t *root, void *value, uint64_t *ret_addr) struct bt_node_t tmp_node = {0}; tmp_node.value = value; + // 如果返回地址为0 + if (ret_addr == NULL) + return -EINVAL; + while (this_node != NULL && !equal(root, this_node, &tmp_node)) { if (smaller(root, &tmp_node, this_node)) @@ -117,7 +121,7 @@ int bt_query(struct bt_root_t *root, void *value, uint64_t *ret_addr) this_node = this_node->right; } - if (equal(root, this_node, &tmp_node)) + if (this_node != NULL && equal(root, this_node, &tmp_node)) { *ret_addr = (uint64_t)this_node; return 0; diff --git a/kernel/common/bitree.h b/kernel/common/bitree.h index ef6565a0..0d98b337 100644 --- a/kernel/common/bitree.h +++ b/kernel/common/bitree.h @@ -13,8 +13,8 @@ struct bt_node_t struct bt_root_t { struct bt_node_t *bt_node; - int32_t size; // 树中的元素个数 - int (*cmp)(struct bt_node_t *a, struct bt_node_t *b); // 比较函数 a>b 返回1， a==b返回0, ab 返回1， a==b返回0, a #include -spinlock_t xhci_controller_init_lock; // xhci控制器初始化锁(在usb_init中被初始化) +spinlock_t xhci_controller_init_lock = {0}; // xhci控制器初始化锁(在usb_init中被初始化) static int xhci_ctrl_count = 0; // xhci控制器计数 @@ -123,7 +123,6 @@ hardware_intr_controller xhci_hc_intr_controller = ptr->cycle = 1; \ } while (0) - // Common TRB types enum { @@ -381,7 +380,7 @@ static int xhci_hc_pair_ports(int id) uint32_t next_off = xhci_hc[id].ext_caps_off; uint32_t offset, cnt; - uint16_t protocol_flags; + uint16_t protocol_flags = 0; // 寻找所有的usb2端口 while (next_off) @@ -554,12 +553,12 @@ uint64_t xhci_hc_irq_install(uint64_t irq_num, void *arg) struct msi_desc_t msi_desc; memset(&msi_desc, 0, sizeof(struct msi_desc_t)); - msi_desc.pci_dev = (struct pci_device_structure_header_t*)xhci_hc[cid].pci_dev_hdr; + msi_desc.pci_dev = (struct pci_device_structure_header_t *)xhci_hc[cid].pci_dev_hdr; msi_desc.assert = info->assert; msi_desc.edge_trigger = info->edge_trigger; msi_desc.processor = info->processor; msi_desc.pci.msi_attribute.is_64 = 1; - // todo: QEMU是使用msix的，因此要先在pci中实现msix + // todo: QEMU是使用msix的，因此要先在pci中实现msix int retval = pci_enable_msi(&msi_desc); kdebug("pci retval = %d", retval); kdebug("xhci irq %d installed.", irq_num); @@ -637,7 +636,7 @@ static int xhci_reset_port(const int id, const int port) break; else if (val & (1 << 21)) break; - + --timeout; usleep(500); } diff --git a/kernel/ktest/test-bitree.c b/kernel/ktest/test-bitree.c new file mode 100644 index 00000000..84d83a74 --- /dev/null +++ b/kernel/ktest/test-bitree.c @@ -0,0 +1,132 @@ +#include "ktest.h" +#include + +#include +#include +#include +#include + +#include + +struct test_value_t +{ + uint64_t tv; +}; +static int compare(void *a, void *b) +{ + if (((struct test_value_t *)a)->tv > ((struct test_value_t *)b)->tv) + return 1; + else if (((struct test_value_t *)a)->tv == ((struct test_value_t *)b)->tv) + return 0; + else + return -1; +} + +static int release(void *value) +{ + // kdebug("release"); +} + +/** + * @brief 测试创建二叉树 + * + * @return int + */ +static long ktest_bitree_case1(uint64_t arg0, uint64_t arg1) +{ + int val; + // ========== 测试创建树 + struct test_value_t *tv1 = (struct test_value_t *)kmalloc(sizeof(struct test_value_t), 0); + tv1->tv = 20; + struct bt_node_t *rn = bt_create_node(NULL, NULL, NULL, tv1); + + assert(rn != NULL); + assert((int64_t)rn != (-EINVAL)); + assert(rn->value == tv1); + + struct bt_root_t *tree = bt_create_tree(rn, compare, release); + assert(tree != NULL); + assert(tree->bt_node == rn); + assert(tree->cmp == compare); + assert(tree->release == release); + assert(tree->size == 1); + + // ========= 向树中插入数据10、30 + struct test_value_t *tv2 = (struct test_value_t *)kmalloc(sizeof(struct test_value_t), 0); + assert(tv2 != NULL); + tv2->tv = 10; + { + int last_size = tree->size; + val = bt_insert(tree, tv2); + assert(val == 0); + assert(last_size + 1 == tree->size); + } + struct test_value_t *tv3 = (struct test_value_t *)kmalloc(sizeof(struct test_value_t), 0); + assert(tv3 != NULL); + tv3->tv = 30; + { + int last_size = tree->size; + val = bt_insert(tree, tv3); + assert(val == 0); + assert(last_size + 1 == tree->size); + } + + // 检测树的形状 + assert(((struct test_value_t *)tree->bt_node->left->value)->tv == tv2->tv); + assert(((struct test_value_t *)tree->bt_node->right->value)->tv == tv3->tv); + + // ========= 查询结点 + // 查询值为tv2的结点 + struct bt_node_t *node2; + assert(bt_query(tree, tv2, (uint64_t*)(&node2)) == 0); + assert(node2 != NULL); + assert(node2->value == tv2); + + // ========= 插入第4个结点：15 + struct test_value_t *tv4 = (struct test_value_t *)kmalloc(sizeof(struct test_value_t), 0); + assert(tv4 != NULL); + tv4->tv = 15; + { + int last_size = tree->size; + val = bt_insert(tree, tv4); + assert(val == 0); + assert(last_size + 1 == tree->size); + } + + assert(((struct test_value_t *)node2->right->value)->tv == tv4->tv); + + // ======= 查询不存在的值 + struct bt_node_t *node_not_exists; + struct test_value_t *tv_not_exists = (struct test_value_t *)kmalloc(sizeof(struct test_value_t), 0); + assert(tv_not_exists != NULL); + tv_not_exists->tv = 100; + assert(bt_query(tree, tv_not_exists, (uint64_t*)(&node_not_exists)) == -1); + // kdebug("node_not_exists.val=%d", ((struct test_value_t*)node_not_exists->value)->tv); + assert(node_not_exists == NULL); + + // 删除根节点 + assert(bt_delete(tree, rn->value) == 0); + assert(((struct test_value_t *)tree->bt_node->value)->tv != 20); + assert(tree->bt_node->right == NULL); + + // 删除树 + assert(bt_destroy_tree(tree) == 0); + + return 0; +} + +static ktest_case_table kt_bitree_func_table[] = { + ktest_bitree_case1, +}; + +uint64_t ktest_test_bitree(uint64_t arg) +{ + kTEST("Testing bitree..."); + for (int i = 0; i < sizeof(kt_bitree_func_table) / sizeof(ktest_case_table); ++i) + { + kTEST("Testing case %d", i); + kt_bitree_func_table[i](0, 0); + } + kdebug("bitree Test done."); + return 0; +} \ No newline at end of file diff --git a/kernel/mm/mm.c b/kernel/mm/mm.c index a487729c..a3d4cf6a 100644 --- a/kernel/mm/mm.c +++ b/kernel/mm/mm.c @@ -641,7 +641,7 @@ int mm_map_proc_page_table(ul proc_page_table_addr, bool is_phys, ul virt_addr_s { if (unlikely(*pde_ptr != 0 && user)) { - kwarn("page already mapped!"); + // kwarn("page already mapped!"); // 如果是用户态可访问的页，则释放当前新获取的物理页 if (likely(((ul)phys_addr_start + length_mapped) < total_2M_pages)) // 校验是否为内存中的物理页 free_pages(Phy_to_2M_Page((ul)phys_addr_start + length_mapped), 1); diff --git a/kernel/process/process.c b/kernel/process/process.c index 89d9b767..205565b4 100644 --- a/kernel/process/process.c +++ b/kernel/process/process.c @@ -15,6 +15,7 @@ #include #include +#include spinlock_t process_global_pid_write_lock; // 增加pid的写锁 long process_global_pid = 1; // 系统中最大的pid @@ -385,7 +386,7 @@ ul do_execve(struct pt_regs *regs, char *path, char *argv[], char *envp[]) regs->rdi = argc; regs->rsi = (uint64_t)dst_argv; } - kdebug("execve ok"); + // kdebug("execve ok"); regs->cs = USER_CS | 3; regs->ds = USER_DS | 3; @@ -413,7 +414,8 @@ ul initial_kernel_thread(ul arg) fat32_init(); usb_init(); - + pid_t test_thread_pid = kernel_thread(ktest_test_bitree, 1, 0); + kdebug("test_thread_pid=%d", test_thread_pid); // 准备切换到用户态 struct pt_regs *regs; @@ -569,7 +571,7 @@ void process_init() spin_init(&process_global_pid_write_lock); // 初始化进程的循环链表 list_init(&initial_proc_union.pcb.list); - kernel_thread(initial_kernel_thread, 10, CLONE_FS | CLONE_SIGNAL); // 初始化内核进程 + kernel_thread(initial_kernel_thread, 10, CLONE_FS | CLONE_SIGNAL); // 初始化内核线程 initial_proc_union.pcb.state = PROC_RUNNING; initial_proc_union.pcb.preempt_count = 0; initial_proc_union.pcb.cpu_id = 0; @@ -586,7 +588,6 @@ void process_init() * @param stack_size 堆栈大小 * @return unsigned long */ - unsigned long do_fork(struct pt_regs *regs, unsigned long clone_flags, unsigned long stack_start, unsigned long stack_size) { int retval = 0; @@ -642,6 +643,7 @@ unsigned long do_fork(struct pt_regs *regs, unsigned long clone_flags, unsigned if (process_copy_flags(clone_flags, tsk)) goto copy_flags_failed; + kdebug("before copy mm"); // 拷贝内存空间分布结构体 if (process_copy_mm(clone_flags, tsk)) goto copy_mm_failed; diff --git a/kernel/process/process.h b/kernel/process/process.h index 61b2f13a..61f7f110 100644 --- a/kernel/process/process.h +++ b/kernel/process/process.h @@ -326,6 +326,17 @@ ul process_do_exit(ul code); */ void process_exit_notify(); +/** + * @brief 初始化内核进程 + * + * @param fn 目标程序的地址 + * @param arg 向目标程序传入的参数 + * @param flags + * @return int + */ + +int kernel_thread(unsigned long (*fn)(unsigned long), unsigned long arg, unsigned long flags); + /** * @brief 切换页表 * @param prev 前一个进程的pcb