refactor: remove UserPtr and UserConstPtr usages by Ticonderoga2017 · Pull Request #107 · Starry-OS/StarryOS

Ticonderoga2017 · 2026-01-01T14:10:18Z

#39

Description

Remove UserPtr/UserConstPtr and their supporting memory validation functions to implement a unified user-space memory access interface.
Introduce primitives like VmPtr/VmMutPtr, vm_read_slice, vm_write_slice, and vm_load_until_nul from starry_vm, covering scenarios such as read/write operations and string loading.
Uniformly adapt system call paths and file I/O interfaces to the axio framework's Read/Write and IoBuf/IoBufMut models, avoiding inconsistencies caused by custom pointer types.

AsakuraMizu · 2026-01-01T14:37:56Z

Good job 👍

AsakuraMizu

Sorry, there were too many files, and I haven't had time to look at a few of them myself.

api/src/socket.rs

api/src/syscall/fs/fd_ops.rs

api/src/syscall/ipc/shm.rs

api/src/syscall/net/socket.rs

api/src/syscall/net/opt.rs

api/src/syscall/net/io.rs

api/src/syscall/net/cmsg.rs

api/src/syscall/net/io.rs

api/src/syscall/net/cmsg.rs

api/src/syscall/net/socket.rs

Copilot

Pull request overview

This pull request refactors the codebase to remove custom UserPtr and UserConstPtr types in favor of a unified memory access interface from starry_vm. The changes introduce VmPtr/VmMutPtr primitives and helper functions like vm_read_slice, vm_write_slice, and vm_load_until_nul for safer user-space memory operations.

Key Changes:

Replaced all UserPtr/UserConstPtr usages with raw pointers and starry_vm primitives
Updated system call signatures to accept raw pointers instead of custom wrapper types
Refactored CMsgBuilder to work with raw pointers and return Result from constructor
Simplified syscall dispatcher by replacing .into() calls with as _ casts

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
api/src/mm.rs	Removed UserPtr/UserConstPtr implementations; kept VmBytes/VmBytesMut wrappers and vm_load_string helper
api/src/vfs/dev/event.rs	Converted event device ioctls to use vm_write_slice and allocate temporary buffers
api/src/syscall/net/socket.rs	Updated socket syscalls to use raw pointers with VmPtr/VmMutPtr traits
api/src/syscall/net/opt.rs	Refactored getsockopt/setsockopt to use vm_read/vm_write with temporary variables
api/src/syscall/net/name.rs	Simplified getsockname/getpeername to use raw pointers
api/src/syscall/net/io.rs	Updated sendmsg/recvmsg to use vm_read_uninit and addr_of_mut for field access
api/src/syscall/net/cmsg.rs	Refactored CMsgBuilder to use raw pointers and made constructor fallible
api/src/syscall/mod.rs	Replaced .into() conversions with as _ casts throughout syscall dispatcher
api/src/syscall/ipc/shm.rs	Updated shmctl to use vm_read/vm_write with nullable pointer handling
api/src/syscall/io_mpx/select.rs	Converted select/pselect6 to read/write local copies and use nullable pattern
api/src/syscall/io_mpx/poll.rs	Updated poll/ppoll to use local Vec buffers with vm_read/vm_write
api/src/syscall/io_mpx/epoll.rs	Converted epoll functions to use temporary buffers and vm_write
api/src/syscall/fs/memfd.rs	Changed memfd_create signature to use raw pointer
api/src/syscall/fs/io.rs	Updated truncate to use vm_load_string
api/src/syscall/fs/fd_ops.rs	Modified fcntl to use vm_read_uninit/vm_write for flock64
api/src/socket.rs	Updated SocketAddrExt trait to use raw pointers; refactored read/write methods

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

api/src/socket.rs

api/src/syscall/io_mpx/poll.rs

Mivik · 2026-02-28T04:26:57Z

api/src/syscall/io_mpx/epoll.rs

-        nullable!(sigmask.get_as_ref())?.copied(),
-        || match block_on(future::timeout(
+    let mut buf = vec![epoll_event { events: 0, data: 0 }; maxevents as usize];
+    let sig = match sigmask.nullable() {


Use Option::map?

Mivik · 2026-02-28T04:29:34Z

api/src/syscall/io_mpx/epoll.rs

-    )
+        }
+    })?;
+    for (i, ev) in buf.iter().take(n as usize).enumerate() {


Use vm_write_slice

Mivik · 2026-02-28T04:39:19Z

api/src/syscall/io_mpx/poll.rs

    };
-    do_poll(fds, timeout, None)
+    let ret = do_poll(&mut local, timeout, None)?;
+    for (i, it) in local.iter().enumerate() {


Use vm_write_slice. Please apply the same fix to other instances.

Mivik · 2026-02-28T04:39:56Z

api/src/syscall/io_mpx/select.rs

+    let sigmask = match sigmask.nullable() {
+        Some(p) => {
+            let sig = unsafe { p.vm_read_uninit()?.assume_init() };
+            check_sigset_size(sig.sigsetsize)?;


Check before reading

Mivik · 2026-02-28T04:41:22Z

api/src/syscall/io_mpx/select.rs

+        Some(p) => {
+            let sig = unsafe { p.vm_read_uninit()?.assume_init() };
+            check_sigset_size(sig.sigsetsize)?;
+            match sig.set.nullable() {


Use Option::map. Please apply the same fix to other instances.

Mivik · 2026-02-28T04:57:06Z

api/src/vfs/dev/event.rs

+        let mut bits = vec![0u8; size];
        if ty == 0 {
-            Ok(copy_bytes(self.ev_bits.as_bytes(), bits))
+            let written = copy_bytes(self.ev_bits.as_bytes(), &mut bits);


Maybe we can use vm_write_slice instead to avoid extra copy?

Mivik · 2026-02-28T04:57:29Z

api/src/vfs/dev/event.rs

+                                let mut bits = vec![0u8; size];
+                                let n =
+                                    copy_bytes(self.inner.lock().key_state.as_bytes(), &mut bits);
+                                vm_write_slice(arg as *mut u8, &bits[..n])?;


Mivik · 2026-02-28T04:57:37Z

api/src/vfs/dev/event.rs

            }
-            Ok(bits.len().min(ty.bits_count().div_ceil(8)))
+            let written = bits.len().min(ty.bits_count().div_ceil(8));
+            vm_write_slice(arg as *mut u8, &bits[..written])?;


Ticonderoga2017 force-pushed the main branch from 9ea3868 to ff1426a Compare January 1, 2026 14:41

AsakuraMizu requested changes Jan 2, 2026

View reviewed changes

Ticonderoga2017 force-pushed the main branch from ff1426a to 2b250b9 Compare January 5, 2026 09:03

AsakuraMizu requested a review from Copilot January 8, 2026 06:14

Copilot started reviewing on behalf of AsakuraMizu January 8, 2026 06:15 View session

AsakuraMizu reviewed Jan 8, 2026

View reviewed changes

api/src/syscall/net/socket.rs Outdated Show resolved Hide resolved

Copilot AI reviewed Jan 8, 2026

View reviewed changes

api/src/socket.rs Outdated Show resolved Hide resolved

api/src/syscall/io_mpx/poll.rs Outdated Show resolved Hide resolved

refactor: remove UserPtr and UserConstPtr usages

238cc39

Ticonderoga2017 force-pushed the main branch from 9c2785a to 238cc39 Compare January 14, 2026 03:08

Mivik reviewed Feb 28, 2026

View reviewed changes

Conversation

Ticonderoga2017 commented Jan 1, 2026

Description

Uh oh!

AsakuraMizu commented Jan 1, 2026

Uh oh!

AsakuraMizu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants