Patch feat robust futex #682

1037827920 · 2024-04-01T11:56:47Z

No description provided.

dragonosbot · 2024-04-01T11:56:53Z

@1037827920: no appropriate reviewer found, use r? to override

yuyi2439 · 2024-04-01T14:55:10Z

user/apps/test-for-robustfutex/target/.rustc_info.json

@@ -0,0 +1 @@
+{"rustc_fingerprint":4791525129410595491,"outputs":{"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/hmt/.rustup/toolchains/nightly-2023-08-15-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\noverflow_checks\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_thread_local\ntarget_vendor=\"unknown\"\nunix\n","stderr":""},"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.73.0-nightly (180dffba1 2023-08-14)\nbinary: rustc\ncommit-hash: 180dffba142c47240ca0d93096ce90b9fd97c8d7\ncommit-date: 2023-08-14\nhost: x86_64-unknown-linux-gnu\nrelease: 1.73.0-nightly\nLLVM version: 17.0.0\n","stderr":""},"551431409088304268":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.a\nlib___.so\n/home/hmt/.rustup/toolchains/nightly-2023-08-15-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\noverflow_checks\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"musl\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_thread_local\ntarget_vendor=\"unknown\"\nunix\n","stderr":"warning: dropping unsupported crate type `dylib` for target `x86_64-unknown-linux-musl`\n\nwarning: dropping unsupported crate type `cdylib` for target `x86_64-unknown-linux-musl`\n\nwarning: 2 warnings emitted\n\n"}},"successes":{}}


这测试项目没加.gitignore

这些错误提交进来的东西要删掉。并且在测试项目里面添加ignore

除了license还有其他错误提交的文件吗？

yuyi2439 · 2024-04-01T14:56:29Z

user/apps/test-for-robustfutex/README.md

@@ -0,0 +1,14 @@
+# DragonOS Rust-Application Template


README需要改

yuyi2439 · 2024-04-01T14:57:02Z

user/apps/test-for-robustfutex/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License


我记得LICENSE也是不要的

fslongjin · 2024-04-01T17:12:08Z

@dragonosbot author

fslongjin

请先删除多余的文件。

1037827920 · 2024-04-02T02:51:40Z

@dragonosbot review

fslongjin

应该要把整个target文件夹都删掉,并且把整个文件夹加到Ignore

fslongjin · 2024-04-02T02:57:24Z

@dragonosbot author

1037827920 · 2024-04-02T03:28:02Z

@dragonosbot review

yuyi2439 · 2024-04-02T03:48:58Z

user/apps/test-for-robustfutex/Cargo.lock

@@ -0,0 +1,16 @@
+# This file is automatically @generated by Cargo.


Cargo.lock还没删

yuyi2439 · 2024-04-02T03:49:59Z

LICENSE

@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE


不是要把DragonOS的LICENSE删了

fslongjin · 2024-04-02T14:31:53Z

r? @chiichen

fslongjin · 2024-04-02T15:41:39Z

kernel/src/libs/futex/futex.rs

+        }
+
+        //获取当前线程的robust list head 和 长度
+        let robust_list_head = match *pcb.get_robust_list() {


这里用ok_or方法比较好，所有这种match某个option的，都应该用OK_or

fslongjin · 2024-04-02T15:44:30Z

kernel/src/libs/futex/futex.rs

+            .ok()
+            {
+                Some(ubr) => ubr,
+                None => return None,


这种地方直接打？就行了。不清楚为什么clippy没报错？

fslongjin · 2024-04-02T15:45:10Z

kernel/src/syscall/mod.rs

+                let len = args[1];
+
+                //判断用户空间地址的合法性
+                verify_area(head_uaddr, core::mem::size_of::<u32>())?;


这个校验应该在里面那个函数那里做

futex这个系统调用校验用户空间地址也在syscall/mod.rs里面校验，要不要顺便改了。https://code.dragonos.org.cn/xref/DragonOS/kernel/src/syscall/mod.rs?r=9b96c5b547c337502db7ec820312f119f95eece1#689

fslongjin · 2024-04-02T15:45:56Z

@dragonosbot author

fslongjin · 2024-04-04T04:59:59Z

user/apps/test-for-robustfutex/src/main.rs

+    PROT_READ, PROT_WRITE,
+};
+
+const SYS_FUTEX: i64 = 202;


这些数字不要这么定义，而是应该使用sc库或者nix？系统调用号是跟架构相关的，将来我们移植到riscv，这些数值都会不一样。

fslongjin

得先改一下测试程序的那个comment（刚才手滑点错了approve）

1037827920 added 2 commits April 1, 2024 19:51

feat: 实现robust lock机制

d7ed5b9

前面更改vscode,修改回来

dbc0d80

dragonosbot added the S-等待审查 Status: 等待assignee以及相关方的审查。 label Apr 1, 2024

修改dadk的路径

12c3065

yuyi2439 reviewed Apr 1, 2024

View reviewed changes

user/apps/test-for-robustfutex/README.md Outdated

@@ -0,0 +1,14 @@

# DragonOS Rust-Application Template

Copy link

Contributor

yuyi2439 Apr 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

README需要改

yuyi2439 reviewed Apr 1, 2024

View reviewed changes

user/apps/test-for-robustfutex/LICENSE Outdated

@@ -0,0 +1,201 @@

Apache License

Copy link

Contributor

yuyi2439 Apr 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我记得LICENSE也是不要的

1037827920 added 2 commits April 1, 2024 23:05

提交.gitnore和.cargo，删除LICENSE，修改README

3b0f95e

修改一个warn

b1cac16

dragonosbot added S-等待作者修改 Status: 这正在等待作者的一些操作（例如代码更改或更多信息）。 and removed S-等待审查 Status: 等待assignee以及相关方的审查。 labels Apr 1, 2024

fslongjin requested changes Apr 1, 2024

View reviewed changes

删除.rustc_info.json

a5dd153

dragonosbot added S-等待审查 Status: 等待assignee以及相关方的审查。 and removed S-等待作者修改 Status: 这正在等待作者的一些操作（例如代码更改或更多信息）。 labels Apr 2, 2024

fslongjin requested changes Apr 2, 2024

View reviewed changes

dragonosbot added S-等待作者修改 Status: 这正在等待作者的一些操作（例如代码更改或更多信息）。 and removed S-等待审查 Status: 等待assignee以及相关方的审查。 labels Apr 2, 2024

删除target文件夹

10af38b

dragonosbot added S-等待审查 Status: 等待assignee以及相关方的审查。 and removed S-等待作者修改 Status: 这正在等待作者的一些操作（例如代码更改或更多信息）。 labels Apr 2, 2024

yuyi2439 reviewed Apr 2, 2024

View reviewed changes

LICENSE Outdated

@@ -1,339 +0,0 @@

GNU GENERAL PUBLIC LICENSE

Copy link

Contributor

yuyi2439 Apr 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不是要把DragonOS的LICENSE删了

恢复DragonOS的LICENSE，删除Cargo.lock

9bf9e9f

dragonosbot assigned chiichen Apr 2, 2024

chiichen approved these changes Apr 2, 2024

View reviewed changes

fslongjin reviewed Apr 2, 2024

View reviewed changes

dragonosbot added S-等待作者修改 Status: 这正在等待作者的一些操作（例如代码更改或更多信息）。 and removed S-等待审查 Status: 等待assignee以及相关方的审查。 labels Apr 2, 2024

1037827920 added 2 commits April 4, 2024 12:40

将校验用户空间地址的代码写入函数内；将部分match分支用ok_or代替

4dbc6e1

Merge branch 'master' into patch-feat-robust_futex

83ead70

fslongjin reviewed Apr 4, 2024

View reviewed changes

fslongjin approved these changes Apr 4, 2024

View reviewed changes

fslongjin mentioned this pull request Apr 4, 2024

【任务发布】实现Robust futex #584

Closed

fslongjin approved these changes Apr 4, 2024

View reviewed changes

fslongjin requested changes Apr 4, 2024

View reviewed changes

合并并解决冲突

a11669c

fslongjin mentioned this pull request Apr 6, 2024

sys_alarm系统调用初步实现 #698

Closed

1037827920 added 3 commits April 6, 2024 21:15

修改wakeup函数获取running queue时unwrap一个None值发生panic

ae03d11

测试程序使用syscalls库进行系统调用

c8b1c06

Merge branch 'master' into patch-feat-robust_futex

92807d9

fslongjin merged commit 06560af into DragonOS-Community:master Apr 6, 2024

1037827920 mentioned this pull request May 31, 2024

REQUEST: New membership for 1037827920 DragonOS-Community/teams_data#15

Closed

		@@ -0,0 +1 @@
		{"rustc_fingerprint":4791525129410595491,"outputs":{"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/hmt/.rustup/toolchains/nightly-2023-08-15-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\noverflow_checks\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_thread_local\ntarget_vendor=\"unknown\"\nunix\n","stderr":""},"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.73.0-nightly (180dffba1 2023-08-14)\nbinary: rustc\ncommit-hash: 180dffba142c47240ca0d93096ce90b9fd97c8d7\ncommit-date: 2023-08-14\nhost: x86_64-unknown-linux-gnu\nrelease: 1.73.0-nightly\nLLVM version: 17.0.0\n","stderr":""},"551431409088304268":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.a\nlib___.so\n/home/hmt/.rustup/toolchains/nightly-2023-08-15-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\noverflow_checks\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"musl\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_thread_local\ntarget_vendor=\"unknown\"\nunix\n","stderr":"warning: dropping unsupported crate type `dylib` for target `x86_64-unknown-linux-musl`\n\nwarning: dropping unsupported crate type `cdylib` for target `x86_64-unknown-linux-musl`\n\nwarning: 2 warnings emitted\n\n"}},"successes":{}}

		@@ -0,0 +1,16 @@
		# This file is automatically @generated by Cargo.

Uh oh!

Patch feat robust futex #682

Patch feat robust futex #682

Uh oh!

Conversation

1037827920 commented Apr 1, 2024

Uh oh!

dragonosbot commented Apr 1, 2024

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 commented Apr 1, 2024

Uh oh!

fslongjin left a comment

Choose a reason for hiding this comment

Uh oh!

1037827920 commented Apr 2, 2024

Uh oh!

fslongjin left a comment

Choose a reason for hiding this comment

Uh oh!

fslongjin commented Apr 2, 2024

Uh oh!

1037827920 commented Apr 2, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fslongjin commented Apr 2, 2024

Uh oh!

fslongjin Apr 2, 2024 • 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!

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 commented Apr 2, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fslongjin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

fslongjin Apr 2, 2024 •

edited

Loading