Skip to content

fix(futex): 修复futex系统调用参数处理逻辑 #1321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fslongjin merged 1 commit into from
Oct 10, 2025
Merged

fix(futex): 修复futex系统调用参数处理逻辑 #1321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 40 additions & 12 deletions kernel/src/libs/futex/syscall/sys_futex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,39 @@ impl Syscall for SysFutexHandle {
let uaddr = Self::uaddr(args);
let operation = Self::operation(args)?;
let val = Self::val(args);
let utime = Self::utime(args);
// 第4个参数：不同操作下语义不同（可能是 timeout 指针、val2、op 等）
let arg4 = Self::utime(args);
let uaddr2 = Self::uaddr2(args);
let val3 = Self::val3(args);

let mut timespec = None;
if utime != 0 {
let reader = UserBufferReader::new(
utime as *const PosixTimeSpec,
core::mem::size_of::<PosixTimeSpec>(),
frame.is_from_user(),
)?;
// 决定是否将第4参解释为超时指针（WAIT* 系列）或数值 val2（REQUEUE/WAKE_OP 等）
Copy link

Copilot AI Oct 10, 2025

Choose a reason for hiding this comment

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

[nitpick] The comment uses inconsistent terminology '第4参' - should use consistent terminology like '第4个参数' for clarity.

Suggested change
// 决定是否将第4参解释为超时指针（WAIT* 系列）或数值 val2（REQUEUE/WAKE_OP 等）
// 决定是否将第4个参数解释为超时指针（WAIT* 系列）或数值 val2（REQUEUE/WAKE_OP 等）

Copilot uses AI. Check for mistakes.
let cmd = FutexArg::from_bits(operation.bits() & FutexFlag::FUTEX_CMD_MASK.bits())
.ok_or(SystemError::ENOSYS)?;

timespec = Some(*reader.read_one_from_user::<PosixTimeSpec>(0)?);
}
let (timespec, val2): (Option<PosixTimeSpec>, u32) = match cmd {
// 与 Linux 语义一致：WAIT 使用相对超时；WAIT_BITSET/LOCK_PI2/WAIT_REQUEUE_PI 使用绝对时间（若带 CLOCKRT）
Copy link

Copilot AI Oct 10, 2025

Choose a reason for hiding this comment

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

Corrected spelling of 'CLOCKRT' comment - should clarify the actual clock type being referenced.

Suggested change
// 与 Linux 语义一致：WAIT 使用相对超时；WAIT_BITSET/LOCK_PI2/WAIT_REQUEUE_PI 使用绝对时间（若带 CLOCKRT）
// 与 Linux 语义一致：WAIT 使用相对超时；WAIT_BITSET/LOCK_PI2/WAIT_REQUEUE_PI 使用绝对时间（若带 CLOCK_REALTIME，即绝对时钟）

Copilot uses AI. Check for mistakes.
FutexArg::FUTEX_WAIT
| FutexArg::FUTEX_WAIT_BITSET
| FutexArg::FUTEX_WAIT_REQUEUE_PI
| FutexArg::FUTEX_LOCK_PI2 => {
if arg4 != 0 {
let reader = UserBufferReader::new(
arg4 as *const PosixTimeSpec,
core::mem::size_of::<PosixTimeSpec>(),
frame.is_from_user(),
)?;
(Some(*reader.read_one_from_user::<PosixTimeSpec>(0)?), 0)
} else {
(None, 0)
}
}
_ => {
// 其他操作中，第4参为数值（如 REQUEUE 的 nr_requeue、WAKE_OP 的 nr_wake2 等）
Copy link

Copilot AI Oct 10, 2025

Choose a reason for hiding this comment

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

[nitpick] The comment uses inconsistent terminology '第4参' - should use consistent terminology like '第4个参数' for clarity.

Suggested change
// 其他操作中，第4参为数值（如 REQUEUE 的 nr_requeue、WAKE_OP 的 nr_wake2 等）
// 其他操作中，第4个参数为数值（如 REQUEUE 的 nr_requeue、WAKE_OP 的 nr_wake2 等）

Copilot uses AI. Check for mistakes.
(None, arg4 as u32)
}
};

do_futex(uaddr, operation, val, timespec, uaddr2, utime as u32, val3)
do_futex(uaddr, operation, val, timespec, uaddr2, val2, val3)
}

/// Formats the syscall parameters for display/debug purposes
Expand Down Expand Up @@ -133,10 +150,21 @@ pub(super) fn do_futex(
val3: u32,
) -> Result<usize, SystemError> {
verify_area(uaddr, core::mem::size_of::<u32>())?;
verify_area(uaddr2, core::mem::size_of::<u32>())?;
let cmd = FutexArg::from_bits(operation.bits() & FutexFlag::FUTEX_CMD_MASK.bits())
.ok_or(SystemError::ENOSYS)?;

// 仅在需要 uaddr2 的操作中校验它
match cmd {
FutexArg::FUTEX_REQUEUE
| FutexArg::FUTEX_CMP_REQUEUE
| FutexArg::FUTEX_WAKE_OP
| FutexArg::FUTEX_WAIT_REQUEUE_PI
| FutexArg::FUTEX_CMP_REQUEUE_PI => {
verify_area(uaddr2, core::mem::size_of::<u32>())?;
}
_ => {}
}

let mut flags = FutexFlag::FLAGS_MATCH_NONE;

if !operation.contains(FutexFlag::FUTEX_PRIVATE_FLAG) {
Expand Down