添加thread和futex机制 by GnoCiYeH · Pull Request #411 · DragonOS-Community/DragonOS

GnoCiYeH · 2023-10-26T07:25:33Z

主要

实现线程机制，主要是体现在clone系统调用和arch_prctl系统调用的实现
初步实现futex机制，因为目前优先级以及共享内存机制未实现，futex只做了一个初步版本，其中对于arch的部分代码可能有问题

次要

为了适配musl，实现了一下几个系统调用

get_random：与linux语义不一致，属于是暴力实现，因为我们没有其他的随机源
stat：即为fstat改写
set_tid_address

BUG修复

修改一些内存对齐计算上的错误
修改出现内存已映射的问题（边界条件）

…h-thread

fslongjin · 2023-10-26T11:13:31Z

kernel/src/futex/constant.rs

+
+#[allow(dead_code)]
+pub mod define {
+    pub const FUTEX_WAIT: u32 = 0;


这些要分开

fslongjin · 2023-10-26T11:16:18Z

kernel/src/arch/x86_64/rand.rs

+}
+
+bitflags! {
+    pub struct GRandFlags: u8{


这个与arch无关

fslongjin · 2023-10-26T11:18:39Z

kernel/src/filesystem/vfs/syscall.rs


+    fn do_stat(path: &str) -> Result<PosixKstat, SystemError> {
+        // 文件名过长
+        if path.len() > MAX_PATHLEN as usize {


这里先open再用fstat的，然后再close

fslongjin · 2023-10-26T11:20:51Z

kernel/src/arch/x86_64/process/mod.rs

+                child_trapframe.rbp = usp.data() as u64 + 11 * core::mem::size_of::<usize>() as u64;
+                child_trapframe.rsp = usp.data() as u64;


这为啥是11

fslongjin · 2023-10-26T11:25:31Z

kernel/src/arch/x86_64/process/syscall.rs

+        arg2: usize,
+        from_user: bool,
+    ) -> Result<usize, SystemError> {
+        let mut arch_info = pcb.arch_info();


这里要irq save

fslongjin · 2023-10-26T11:35:33Z

kernel/src/syscall/mod.rs

+                let uaddr2 = args[4] as *const u32;
+                let val3 = args[5] as u32;
+
+                let mut timespec: *mut TimeSpec = core::ptr::null::<TimeSpec>() as *mut TimeSpec;


这里有内存越界问题，应当写成

let mut timespec = TimeSpec::default();

这样才有充足的空间。

另外，这里的所有裸指针最好都进行检验，能够拷贝的小的参数都先拷贝了。

fslongjin · 2023-10-26T11:36:26Z

kernel/src/mm/ucontext.rs

 }

+#[derive(Debug)]
+pub enum Provider {


这个需要加注释，不然下回就不知道是啥了

fslongjin · 2023-10-26T11:42:40Z

kernel/src/process/fork.rs

+
+        // TODO: 处理CLONE_PARENT 与 SIGNAL_UNKILLABLE的情况
+
+        // 如果新进程使用不同的 pid 或用户名空间，


fslongjin · 2023-10-26T11:59:04Z

kernel/src/syscall/mod.rs

+                unimplemented!()
+            }
+
+            SYS_POLL => Ok(0),


这些都加warning

fslongjin · 2023-10-26T12:00:17Z

kernel/src/time/timer.rs

    fn run(&self) {
-        let r = self.0.lock().timer_func.run();
+        let mut timer = self.0.lock();
+        timer.timeout = true;


改为triggered更直观

fslongjin · 2023-10-26T12:02:39Z

kernel/src/futex/futex.rs

+        let mut address = uaddr as u64;
+
+        // 计算相对页的偏移量
+        let offset = address % MMArch::PAGE_SIZE as u64;


改为位运算address & (MMArch::PAGE_SIZE -1)

fslongjin · 2023-10-26T12:04:59Z

kernel/src/futex/futex.rs

+use super::constant::*;
+
+lazy_static! {
+    pub(super) static ref FUTEX_DATA: SpinLock<HashMap<FutexKey, LockedFutexHashBucket>> =


用了全局锁的话，里面LockedFutexHashBucket就不需要lock的了，因为它不是多进程/线程共享

fslongjin · 2023-10-26T12:25:00Z

kernel/src/time/timer.rs

+    pub fn cancel(&self) -> bool {
+        TIMER_LIST
+            .lock()
+            .drain_filter(|x| Arc::<Timer>::as_ptr(&x) == self as *const Timer);


用Arc::ptr_eq(this, other)

fslongjin · 2023-10-29T18:28:26Z

kernel/src/process/mod.rs

+        // 将user_tid_addr置0
+        if thread.clear_child_tid.is_some() {
+            let _ =
+                unsafe { clear_user(thread.clear_child_tid.unwrap(), core::mem::size_of::<i32>()) };


这个应该是要在线程的exit的地方执行，而不是这个drop函数

Suggested change

unsafe { clear_user(thread.clear_child_tid.unwrap(), core::mem::size_of::<i32>()) };

unsafe { clear_user(thread.clear_child_tid.unwrap(), core::mem::size_of::<i32>()) };

* 添加rust重构版本的HPET驱动和tsc驱动,并使用HPET校准tsc频率和cpu总线频率 * 把hpet.c移动到arch文件夹下

* 测试RESET * 测试RESET * 基于轮询的实现 * 规范化部分unsafe的使用 * 完成中断处理函数，同时去除了不必要的内存拷贝行为，准备编写napi机制 * 实现现有协议栈下的部分napi机制；修复了内存泄漏的问题；添加了一部分代码注释 * 去除部分无用代码 * 去除一些无用代码 * 适配新的驱动模型 * 完成msi中断测试 * 去除一些无用代码 * 格式化代码 * 增加了一些注释，提高代码可读性 * 去除无关文件 * 优化了读取mac地址的方式，提高可读性

GnoCiYeH added 13 commits October 12, 2023 08:10

初步实现clone系统调用

19ab0b0

futex部分实现

01c5806

thread

9379b96

Merge branch 'patch-thread' of github.com:GnoCiYeH/DragonOS into patc…

b53ac80

…h-thread

Merge remote-tracking branch 'heyicong/patch-futex' into patch-thread

9ad296b

Merge remote-tracking branch 'origin/master' into patch-thread

4e2655f

实现了线程，初步实现futex机制，添加了几个小的系统调用

b6e9442

fmt

1139b44

update

f3e9caa

update

3746edd

update

6401b91

删除有问题的汇编

a7a84b5

fmt

6a18f75

fslongjin reviewed Oct 26, 2023

View reviewed changes

fslongjin requested changes Oct 26, 2023

View reviewed changes

GnoCiYeH and others added 4 commits October 28, 2023 02:47

update

b835f25

更改pcb引用计数问题

45eece6

解决general_protection问题

00c3dd0

weak

d0a4f05

fslongjin reviewed Oct 29, 2023

View reviewed changes

fslongjin and others added 6 commits October 29, 2023 18:29

能跑

24edab3

修改futex_wait失败的问题

758d54f

fmt

80cb928

释放futexkey,消除日志

a2e7a43

warning

1b70349

添加rust重构版本的HPET驱动和tsc驱动,并使用HPET校准tsc频率和cpu总线频率 (DragonOS-Community#412)

e8db16b

* 添加rust重构版本的HPET驱动和tsc驱动,并使用HPET校准tsc频率和cpu总线频率 * 把hpet.c移动到arch文件夹下

fslongjin force-pushed the patch-thread branch from 7cb7d23 to e8db16b Compare October 31, 2023 06:56

Hdksg10 and others added 2 commits October 31, 2023 15:19

解决死锁bug

65f4be9

GnoCiYeH and others added 3 commits October 31, 2023 21:10

解决warning

5e5a104

Merge remote-tracking branch 'origin/master' into patch-thread

16137fa

1

14c2478

fslongjin approved these changes Nov 1, 2023

View reviewed changes

fslongjin merged commit 971462b into DragonOS-Community:master Nov 1, 2023

		child_trapframe.rbp = usp.data() as u64 + 11 * core::mem::size_of::<usize>() as u64;
		child_trapframe.rsp = usp.data() as u64;


		// TODO: 处理CLONE_PARENT 与 SIGNAL_UNKILLABLE的情况

		// 如果新进程使用不同的 pid 或用户名空间，

	unsafe { clear_user(thread.clear_child_tid.unwrap(), core::mem::size_of::<i32>()) };
	unsafe { clear_user(thread.clear_child_tid.unwrap(), core::mem::size_of::<i32>()) };

Uh oh!

Conversation

GnoCiYeH commented Oct 26, 2023

主要

次要

为了适配musl，实现了一下几个系统调用

BUG修复

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fslongjin Oct 29, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fslongjin Oct 29, 2023 •

edited

Loading