diff --git a/kernel/aster-nix/src/device/null.rs b/kernel/aster-nix/src/device/null.rs
index 07bacc3f..e33c6cdf 100644
--- a/kernel/aster-nix/src/device/null.rs
+++ b/kernel/aster-nix/src/device/null.rs
@@ -27,7 +27,7 @@ impl FileIo for Null {
         Ok(buf.len())
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         let events = IoEvents::IN | IoEvents::OUT;
         events & mask
     }
diff --git a/kernel/aster-nix/src/device/pty/pty.rs b/kernel/aster-nix/src/device/pty/pty.rs
index 32316ce6..2c66e437 100644
--- a/kernel/aster-nix/src/device/pty/pty.rs
+++ b/kernel/aster-nix/src/device/pty/pty.rs
@@ -68,12 +68,12 @@ impl PtyMaster {
         self.update_state(&input);
     }
 
-    pub(super) fn slave_poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub(super) fn slave_poll(&self, mask: IoEvents, mut poller: Option<&mut Poller>) -> IoEvents {
         let mut poll_status = IoEvents::empty();
 
         let poll_in_mask = mask & IoEvents::IN;
         if !poll_in_mask.is_empty() {
-            let poll_in_status = self.output.poll(poll_in_mask, poller);
+            let poll_in_status = self.output.poll(poll_in_mask, poller.as_deref_mut());
             poll_status |= poll_in_status;
         }
 
@@ -106,12 +106,12 @@ impl FileIo for PtyMaster {
             return Ok(0);
         }
 
-        let poller = Poller::new();
+        let mut poller = Poller::new();
         loop {
             let mut input = self.input.lock_irq_disabled();
 
             if input.is_empty() {
-                let events = self.pollee.poll(IoEvents::IN, Some(&poller));
+                let events = self.pollee.poll(IoEvents::IN, Some(&mut poller));
 
                 if events.contains(IoEvents::ERR) {
                     return_errno_with_message!(Errno::EACCES, "unexpected err");
@@ -245,12 +245,12 @@ impl FileIo for PtyMaster {
         }
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, mut poller: Option<&mut Poller>) -> IoEvents {
         let mut poll_status = IoEvents::empty();
 
         let poll_in_mask = mask & IoEvents::IN;
         if !poll_in_mask.is_empty() {
-            let poll_in_status = self.pollee.poll(poll_in_mask, poller);
+            let poll_in_status = self.pollee.poll(poll_in_mask, poller.as_deref_mut());
             poll_status |= poll_in_status;
         }
 
@@ -348,7 +348,7 @@ impl FileIo for PtySlave {
         Ok(buf.len())
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.master().slave_poll(mask, poller)
     }
 
diff --git a/kernel/aster-nix/src/device/random.rs b/kernel/aster-nix/src/device/random.rs
index d41429a4..c9bfa701 100644
--- a/kernel/aster-nix/src/device/random.rs
+++ b/kernel/aster-nix/src/device/random.rs
@@ -42,7 +42,7 @@ impl FileIo for Random {
         Ok(buf.len())
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         let events = IoEvents::IN | IoEvents::OUT;
         events & mask
     }
diff --git a/kernel/aster-nix/src/device/tdxguest/mod.rs b/kernel/aster-nix/src/device/tdxguest/mod.rs
index 4e3c777e..959ddf32 100644
--- a/kernel/aster-nix/src/device/tdxguest/mod.rs
+++ b/kernel/aster-nix/src/device/tdxguest/mod.rs
@@ -74,7 +74,7 @@ impl FileIo for TdxGuest {
         }
     }
 
-    fn poll(&self, mask: IoEvents, _poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, _poller: Option<&mut Poller>) -> IoEvents {
         let events = IoEvents::IN | IoEvents::OUT;
         events & mask
     }
diff --git a/kernel/aster-nix/src/device/tty/device.rs b/kernel/aster-nix/src/device/tty/device.rs
index debcb689..5355a024 100644
--- a/kernel/aster-nix/src/device/tty/device.rs
+++ b/kernel/aster-nix/src/device/tty/device.rs
@@ -49,7 +49,7 @@ impl FileIo for TtyDevice {
         return_errno_with_message!(Errno::EINVAL, "cannot write tty device");
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         IoEvents::empty()
     }
 }
diff --git a/kernel/aster-nix/src/device/tty/line_discipline.rs b/kernel/aster-nix/src/device/tty/line_discipline.rs
index 2bd274a6..1854744e 100644
--- a/kernel/aster-nix/src/device/tty/line_discipline.rs
+++ b/kernel/aster-nix/src/device/tty/line_discipline.rs
@@ -250,9 +250,9 @@ impl LineDiscipline {
                 Ok(len) => return Ok(len),
                 Err(e) if e.error() != Errno::EAGAIN => return Err(e),
                 Err(_) => {
-                    let poller = Some(Poller::new());
-                    if self.poll(IoEvents::IN, poller.as_ref()).is_empty() {
-                        poller.as_ref().unwrap().wait()?
+                    let mut poller = Poller::new();
+                    if self.poll(IoEvents::IN, Some(&mut poller)).is_empty() {
+                        poller.wait()?
                     }
                 }
             }
@@ -288,7 +288,7 @@ impl LineDiscipline {
         Ok(read_len)
     }
 
-    pub fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 
diff --git a/kernel/aster-nix/src/device/tty/mod.rs b/kernel/aster-nix/src/device/tty/mod.rs
index 94afa459..6db59b68 100644
--- a/kernel/aster-nix/src/device/tty/mod.rs
+++ b/kernel/aster-nix/src/device/tty/mod.rs
@@ -87,7 +87,7 @@ impl FileIo for Tty {
         Ok(buf.len())
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.ldisc.poll(mask, poller)
     }
 
diff --git a/kernel/aster-nix/src/device/urandom.rs b/kernel/aster-nix/src/device/urandom.rs
index f8414d14..701701de 100644
--- a/kernel/aster-nix/src/device/urandom.rs
+++ b/kernel/aster-nix/src/device/urandom.rs
@@ -42,7 +42,7 @@ impl FileIo for Urandom {
         Ok(buf.len())
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         let events = IoEvents::IN | IoEvents::OUT;
         events & mask
     }
diff --git a/kernel/aster-nix/src/device/zero.rs b/kernel/aster-nix/src/device/zero.rs
index 3467ed9e..dd279ab7 100644
--- a/kernel/aster-nix/src/device/zero.rs
+++ b/kernel/aster-nix/src/device/zero.rs
@@ -30,7 +30,7 @@ impl FileIo for Zero {
         Ok(buf.len())
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         let events = IoEvents::IN | IoEvents::OUT;
         events & mask
     }
diff --git a/kernel/aster-nix/src/fs/devpts/ptmx.rs b/kernel/aster-nix/src/fs/devpts/ptmx.rs
index 5df4ea1d..bc416960 100644
--- a/kernel/aster-nix/src/fs/devpts/ptmx.rs
+++ b/kernel/aster-nix/src/fs/devpts/ptmx.rs
@@ -186,7 +186,7 @@ impl FileIo for Inner {
         return_errno_with_message!(Errno::EINVAL, "cannot write ptmx");
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         IoEvents::empty()
     }
 }
diff --git a/kernel/aster-nix/src/fs/devpts/slave.rs b/kernel/aster-nix/src/fs/devpts/slave.rs
index 51722db4..c2def550 100644
--- a/kernel/aster-nix/src/fs/devpts/slave.rs
+++ b/kernel/aster-nix/src/fs/devpts/slave.rs
@@ -133,7 +133,7 @@ impl Inode for PtySlaveInode {
         self.device.ioctl(cmd, arg)
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.device.poll(mask, poller)
     }
 
diff --git a/kernel/aster-nix/src/fs/epoll/epoll_file.rs b/kernel/aster-nix/src/fs/epoll/epoll_file.rs
index d1b1ff6c..e888689d 100644
--- a/kernel/aster-nix/src/fs/epoll/epoll_file.rs
+++ b/kernel/aster-nix/src/fs/epoll/epoll_file.rs
@@ -187,7 +187,7 @@ impl EpollFile {
             // If no ready entries for now, wait for them
             if poller.is_none() {
                 poller = Some(Poller::new());
-                let events = self.pollee.poll(IoEvents::IN, poller.as_ref());
+                let events = self.pollee.poll(IoEvents::IN, poller.as_mut());
                 if !events.is_empty() {
                     continue;
                 }
@@ -322,7 +322,7 @@ impl Drop for EpollFile {
 }
 
 impl Pollable for EpollFile {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 }
diff --git a/kernel/aster-nix/src/fs/exfat/inode.rs b/kernel/aster-nix/src/fs/exfat/inode.rs
index 29ed1925..0b437b00 100644
--- a/kernel/aster-nix/src/fs/exfat/inode.rs
+++ b/kernel/aster-nix/src/fs/exfat/inode.rs
@@ -1698,7 +1698,7 @@ impl Inode for ExfatInode {
         Ok(())
     }
 
-    fn poll(&self, mask: IoEvents, _poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, _poller: Option<&mut Poller>) -> IoEvents {
         let events = IoEvents::IN | IoEvents::OUT;
         events & mask
     }
diff --git a/kernel/aster-nix/src/fs/inode_handle/dyn_cap.rs b/kernel/aster-nix/src/fs/inode_handle/dyn_cap.rs
index a55eaa75..b19035e5 100644
--- a/kernel/aster-nix/src/fs/inode_handle/dyn_cap.rs
+++ b/kernel/aster-nix/src/fs/inode_handle/dyn_cap.rs
@@ -81,7 +81,7 @@ impl Clone for InodeHandle<Rights> {
 
 #[inherit_methods(from = "self.0")]
 impl Pollable for InodeHandle<Rights> {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents;
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents;
 }
 
 #[inherit_methods(from = "self.0")]
diff --git a/kernel/aster-nix/src/fs/inode_handle/mod.rs b/kernel/aster-nix/src/fs/inode_handle/mod.rs
index 6cb87609..97ef40a4 100644
--- a/kernel/aster-nix/src/fs/inode_handle/mod.rs
+++ b/kernel/aster-nix/src/fs/inode_handle/mod.rs
@@ -176,7 +176,7 @@ impl InodeHandle_ {
         Ok(read_cnt)
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         if let Some(ref file_io) = self.file_io {
             return file_io.poll(mask, poller);
         }
@@ -228,7 +228,7 @@ pub trait FileIo: Send + Sync + 'static {
 
     fn write(&self, buf: &[u8]) -> Result<usize>;
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents;
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents;
 
     fn ioctl(&self, cmd: IoctlCmd, arg: usize) -> Result<i32> {
         return_errno_with_message!(Errno::EINVAL, "ioctl is not supported");
diff --git a/kernel/aster-nix/src/fs/pipe.rs b/kernel/aster-nix/src/fs/pipe.rs
index 8450a973..b3b01390 100644
--- a/kernel/aster-nix/src/fs/pipe.rs
+++ b/kernel/aster-nix/src/fs/pipe.rs
@@ -27,7 +27,7 @@ impl PipeReader {
 }
 
 impl Pollable for PipeReader {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.consumer.poll(mask, poller)
     }
 }
@@ -96,7 +96,7 @@ impl PipeWriter {
 }
 
 impl Pollable for PipeWriter {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.producer.poll(mask, poller)
     }
 }
diff --git a/kernel/aster-nix/src/fs/ramfs/fs.rs b/kernel/aster-nix/src/fs/ramfs/fs.rs
index 76618627..f1181c2b 100644
--- a/kernel/aster-nix/src/fs/ramfs/fs.rs
+++ b/kernel/aster-nix/src/fs/ramfs/fs.rs
@@ -1092,7 +1092,7 @@ impl Inode for RamInode {
         }
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         if let Some(device) = self.node.read().inner.as_device() {
             device.poll(mask, poller)
         } else {
diff --git a/kernel/aster-nix/src/fs/utils/channel.rs b/kernel/aster-nix/src/fs/utils/channel.rs
index de88e18c..ebf09465 100644
--- a/kernel/aster-nix/src/fs/utils/channel.rs
+++ b/kernel/aster-nix/src/fs/utils/channel.rs
@@ -82,7 +82,7 @@ macro_rules! impl_common_methods_for_channel {
                 .contains(StatusFlags::O_NONBLOCK)
         }
 
-        pub fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+        pub fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
             self.this_end().pollee.poll(mask, poller)
         }
 
@@ -140,7 +140,7 @@ impl<T> Producer<T> {
 }
 
 impl<T> Pollable for Producer<T> {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.poll(mask, poller)
     }
 }
@@ -266,7 +266,7 @@ impl<T> Consumer<T> {
 }
 
 impl<T> Pollable for Consumer<T> {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.poll(mask, poller)
     }
 }
diff --git a/kernel/aster-nix/src/fs/utils/inode.rs b/kernel/aster-nix/src/fs/utils/inode.rs
index c61596fa..868c6d93 100644
--- a/kernel/aster-nix/src/fs/utils/inode.rs
+++ b/kernel/aster-nix/src/fs/utils/inode.rs
@@ -348,7 +348,7 @@ pub trait Inode: Any + Sync + Send {
         Ok(())
     }
 
-    fn poll(&self, mask: IoEvents, _poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, _poller: Option<&mut Poller>) -> IoEvents {
         let events = IoEvents::IN | IoEvents::OUT;
         events & mask
     }
diff --git a/kernel/aster-nix/src/net/socket/ip/datagram/mod.rs b/kernel/aster-nix/src/net/socket/ip/datagram/mod.rs
index 226cba51..1c6d5331 100644
--- a/kernel/aster-nix/src/net/socket/ip/datagram/mod.rs
+++ b/kernel/aster-nix/src/net/socket/ip/datagram/mod.rs
@@ -180,7 +180,7 @@ impl DatagramSocket {
 }
 
 impl Pollable for DatagramSocket {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 }
diff --git a/kernel/aster-nix/src/net/socket/ip/stream/mod.rs b/kernel/aster-nix/src/net/socket/ip/stream/mod.rs
index 878a8158..8c57565e 100644
--- a/kernel/aster-nix/src/net/socket/ip/stream/mod.rs
+++ b/kernel/aster-nix/src/net/socket/ip/stream/mod.rs
@@ -338,7 +338,7 @@ impl StreamSocket {
 }
 
 impl Pollable for StreamSocket {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 }
diff --git a/kernel/aster-nix/src/net/socket/unix/stream/connected.rs b/kernel/aster-nix/src/net/socket/unix/stream/connected.rs
index 44ab5e43..b04044d3 100644
--- a/kernel/aster-nix/src/net/socket/unix/stream/connected.rs
+++ b/kernel/aster-nix/src/net/socket/unix/stream/connected.rs
@@ -45,7 +45,7 @@ impl Connected {
         self.local_endpoint.set_nonblocking(is_nonblocking).unwrap();
     }
 
-    pub(super) fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub(super) fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.local_endpoint.poll(mask, poller)
     }
 }
diff --git a/kernel/aster-nix/src/net/socket/unix/stream/endpoint.rs b/kernel/aster-nix/src/net/socket/unix/stream/endpoint.rs
index 04970935..c048ae47 100644
--- a/kernel/aster-nix/src/net/socket/unix/stream/endpoint.rs
+++ b/kernel/aster-nix/src/net/socket/unix/stream/endpoint.rs
@@ -106,10 +106,10 @@ impl Endpoint {
         self.0.peer.upgrade().is_some()
     }
 
-    pub(super) fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub(super) fn poll(&self, mask: IoEvents, mut poller: Option<&mut Poller>) -> IoEvents {
         let mut events = IoEvents::empty();
         // FIXME: should reader and writer use the same mask?
-        let reader_events = self.0.reader.poll(mask, poller);
+        let reader_events = self.0.reader.poll(mask, poller.as_deref_mut());
         let writer_events = self.0.writer.poll(mask, poller);
 
         if reader_events.contains(IoEvents::HUP) || self.0.reader.is_shutdown() {
diff --git a/kernel/aster-nix/src/net/socket/unix/stream/init.rs b/kernel/aster-nix/src/net/socket/unix/stream/init.rs
index 3f73a886..d89b05e6 100644
--- a/kernel/aster-nix/src/net/socket/unix/stream/init.rs
+++ b/kernel/aster-nix/src/net/socket/unix/stream/init.rs
@@ -79,7 +79,7 @@ impl Init {
         self.is_nonblocking.store(is_nonblocking, Ordering::Release);
     }
 
-    pub(super) fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub(super) fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 }
diff --git a/kernel/aster-nix/src/net/socket/unix/stream/listener.rs b/kernel/aster-nix/src/net/socket/unix/stream/listener.rs
index 0e499140..4b69f22b 100644
--- a/kernel/aster-nix/src/net/socket/unix/stream/listener.rs
+++ b/kernel/aster-nix/src/net/socket/unix/stream/listener.rs
@@ -65,7 +65,7 @@ impl Listener {
         Ok((socket, peer_addr))
     }
 
-    pub(super) fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub(super) fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         let addr = self.addr();
         let backlog = BACKLOG_TABLE.get_backlog(addr).unwrap();
         backlog.poll(mask, poller)
@@ -119,7 +119,7 @@ impl BacklogTable {
     }
 
     fn pop_incoming(&self, nonblocking: bool, addr: &UnixSocketAddrBound) -> Result<Arc<Endpoint>> {
-        let poller = Poller::new();
+        let mut poller = Poller::new();
         loop {
             let backlog = self.get_backlog(addr)?;
 
@@ -133,7 +133,7 @@ impl BacklogTable {
 
             let events = {
                 let mask = IoEvents::IN;
-                backlog.poll(mask, Some(&poller))
+                backlog.poll(mask, Some(&mut poller))
             };
 
             if events.contains(IoEvents::ERR) | events.contains(IoEvents::HUP) {
@@ -202,7 +202,7 @@ impl Backlog {
         endpoint
     }
 
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         // Lock to avoid any events may change pollee state when we poll
         let _lock = self.incoming_endpoints.lock();
         self.pollee.poll(mask, poller)
diff --git a/kernel/aster-nix/src/net/socket/unix/stream/socket.rs b/kernel/aster-nix/src/net/socket/unix/stream/socket.rs
index acf39ce4..f32b5828 100644
--- a/kernel/aster-nix/src/net/socket/unix/stream/socket.rs
+++ b/kernel/aster-nix/src/net/socket/unix/stream/socket.rs
@@ -104,7 +104,7 @@ impl UnixStreamSocket {
 }
 
 impl Pollable for UnixStreamSocket {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         let inner = self.0.read();
         match &*inner {
             State::Init(init) => init.poll(mask, poller),
diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/connected.rs b/kernel/aster-nix/src/net/socket/vsock/stream/connected.rs
index 005f7f0f..851b9b92 100644
--- a/kernel/aster-nix/src/net/socket/vsock/stream/connected.rs
+++ b/kernel/aster-nix/src/net/socket/vsock/stream/connected.rs
@@ -126,7 +126,7 @@ impl Connected {
             .set_peer_requested_shutdown()
     }
 
-    pub fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 
diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/connecting.rs b/kernel/aster-nix/src/net/socket/vsock/stream/connecting.rs
index cb447be6..287ec6b7 100644
--- a/kernel/aster-nix/src/net/socket/vsock/stream/connecting.rs
+++ b/kernel/aster-nix/src/net/socket/vsock/stream/connecting.rs
@@ -45,7 +45,7 @@ impl Connecting {
         self.info.lock_irq_disabled().update_for_event(event)
     }
 
-    pub fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 
diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/init.rs b/kernel/aster-nix/src/net/socket/vsock/stream/init.rs
index 6e65b1d5..1e445e41 100644
--- a/kernel/aster-nix/src/net/socket/vsock/stream/init.rs
+++ b/kernel/aster-nix/src/net/socket/vsock/stream/init.rs
@@ -61,7 +61,7 @@ impl Init {
         *self.bound_addr.lock()
     }
 
-    pub fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 }
diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/listen.rs b/kernel/aster-nix/src/net/socket/vsock/stream/listen.rs
index 2098baab..9317a647 100644
--- a/kernel/aster-nix/src/net/socket/vsock/stream/listen.rs
+++ b/kernel/aster-nix/src/net/socket/vsock/stream/listen.rs
@@ -50,7 +50,7 @@ impl Listen {
         Ok(connection)
     }
 
-    pub fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 
diff --git a/kernel/aster-nix/src/net/socket/vsock/stream/socket.rs b/kernel/aster-nix/src/net/socket/vsock/stream/socket.rs
index dfcc82b5..fa2695bf 100644
--- a/kernel/aster-nix/src/net/socket/vsock/stream/socket.rs
+++ b/kernel/aster-nix/src/net/socket/vsock/stream/socket.rs
@@ -123,7 +123,7 @@ impl VsockStreamSocket {
 }
 
 impl Pollable for VsockStreamSocket {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         match &*self.status.read() {
             Status::Init(init) => init.poll(mask, poller),
             Status::Listen(listen) => listen.poll(mask, poller),
@@ -210,9 +210,9 @@ impl Socket for VsockStreamSocket {
         vsockspace.request(&connecting.info()).unwrap();
         // wait for response from driver
         // TODO: Add timeout
-        let poller = Poller::new();
+        let mut poller = Poller::new();
         if !connecting
-            .poll(IoEvents::IN, Some(&poller))
+            .poll(IoEvents::IN, Some(&mut poller))
             .contains(IoEvents::IN)
         {
             if let Err(e) = poller.wait() {
diff --git a/kernel/aster-nix/src/process/signal/poll.rs b/kernel/aster-nix/src/process/signal/poll.rs
index 1696211b..c35d2c34 100644
--- a/kernel/aster-nix/src/process/signal/poll.rs
+++ b/kernel/aster-nix/src/process/signal/poll.rs
@@ -5,8 +5,6 @@ use core::{
     time::Duration,
 };
 
-use keyable_arc::KeyableWeak;
-
 use crate::{
     events::{IoEvents, Observer, Subject},
     prelude::*,
@@ -47,7 +45,7 @@ impl Pollee {
     ///
     /// This operation is _atomic_ in the sense that either some interesting
     /// events are returned or the poller is registered (if a poller is provided).
-    pub fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    pub fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         let mask = mask | IoEvents::ALWAYS_POLL;
 
         // Fast path: return events immediately
@@ -63,12 +61,12 @@ impl Pollee {
         self.events() & mask
     }
 
-    fn register_poller(&self, poller: &Poller, mask: IoEvents) {
+    fn register_poller(&self, poller: &mut Poller, mask: IoEvents) {
         self.inner
             .subject
             .register_observer(poller.observer(), mask);
-        let mut pollees = poller.inner.pollees.lock();
-        pollees.insert(Arc::downgrade(&self.inner).into(), ());
+
+        poller.pollees.push(Arc::downgrade(&self.inner));
     }
 
     /// Register an IoEvents observer.
@@ -135,14 +133,10 @@ impl Pollee {
 
 /// A poller gets notified when its associated pollees have interesting events.
 pub struct Poller {
-    inner: Arc<PollerInner>,
-}
-
-struct PollerInner {
     // Use event counter to wait or wake up a poller
-    event_counter: EventCounter,
+    event_counter: Arc<EventCounter>,
     // All pollees that are interesting to this poller
-    pollees: Mutex<BTreeMap<KeyableWeak<PolleeInner>, ()>>,
+    pollees: Vec<Weak<PolleeInner>>,
 }
 
 impl Default for Poller {
@@ -154,53 +148,41 @@ impl Default for Poller {
 impl Poller {
     /// Constructs a new `Poller`.
     pub fn new() -> Self {
-        let inner = PollerInner {
-            event_counter: EventCounter::new(),
-            pollees: Mutex::new(BTreeMap::new()),
-        };
         Self {
-            inner: Arc::new(inner),
+            event_counter: Arc::new(EventCounter::new()),
+            pollees: Vec::new(),
         }
     }
 
     /// Wait until there are any interesting events happen since last `wait`. The `wait`
     /// can be interrupted by signal.
     pub fn wait(&self) -> Result<()> {
-        self.inner.event_counter.read(None)?;
+        self.event_counter.read(None)?;
         Ok(())
     }
 
     /// Wait until there are any interesting events happen since last `wait` or a given timeout
     /// is expired. This method can be interrupted by signal.
     pub fn wait_timeout(&self, timeout: &Duration) -> Result<()> {
-        self.inner.event_counter.read(Some(timeout))?;
+        self.event_counter.read(Some(timeout))?;
         Ok(())
     }
 
     fn observer(&self) -> Weak<dyn Observer<IoEvents>> {
-        Arc::downgrade(&self.inner) as _
-    }
-}
-
-impl Observer<IoEvents> for PollerInner {
-    fn on_events(&self, _events: &IoEvents) {
-        self.event_counter.write();
+        Arc::downgrade(&self.event_counter) as _
     }
 }
 
 impl Drop for Poller {
     fn drop(&mut self) {
-        let mut pollees = self.inner.pollees.lock();
-        if pollees.len() == 0 {
-            return;
-        }
+        let observer = self.observer();
 
-        let self_observer = self.observer();
-        for (weak_pollee, _) in pollees.extract_if(|_, _| true) {
-            if let Some(pollee) = weak_pollee.upgrade() {
-                pollee.subject.unregister_observer(&self_observer);
-            }
-        }
+        self.pollees
+            .iter()
+            .filter_map(Weak::upgrade)
+            .for_each(|pollee| {
+                pollee.subject.unregister_observer(&observer);
+            });
     }
 }
 
@@ -243,6 +225,12 @@ impl EventCounter {
     }
 }
 
+impl Observer<IoEvents> for EventCounter {
+    fn on_events(&self, _events: &IoEvents) {
+        self.write();
+    }
+}
+
 /// The `Pollable` trait allows for waiting for events and performing event-based operations.
 ///
 /// Implementors are required to provide a method, [`Pollable::poll`], which is usually implemented
@@ -258,7 +246,7 @@ pub trait Pollable {
     /// none.
     ///
     /// This method has the same semantics as [`Pollee::poll`].
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents;
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents;
 
     /// Waits for events and performs event-based operations.
     ///
@@ -274,7 +262,7 @@ pub trait Pollable {
         Self: Sized,
         F: FnMut() -> Result<R>,
     {
-        let poller = Poller::new();
+        let mut poller = Poller::new();
 
         loop {
             match cond() {
@@ -282,7 +270,7 @@ pub trait Pollable {
                 result => return result,
             };
 
-            let events = self.poll(mask, Some(&poller));
+            let events = self.poll(mask, Some(&mut poller));
             if !events.is_empty() {
                 continue;
             }
diff --git a/kernel/aster-nix/src/syscall/eventfd.rs b/kernel/aster-nix/src/syscall/eventfd.rs
index 37404ed2..751c1efb 100644
--- a/kernel/aster-nix/src/syscall/eventfd.rs
+++ b/kernel/aster-nix/src/syscall/eventfd.rs
@@ -151,7 +151,7 @@ impl EventFile {
 }
 
 impl Pollable for EventFile {
-    fn poll(&self, mask: IoEvents, poller: Option<&Poller>) -> IoEvents {
+    fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
         self.pollee.poll(mask, poller)
     }
 }
@@ -175,8 +175,8 @@ impl FileLike for EventFile {
                 self.update_io_state(&counter);
                 drop(counter);
 
-                let poller = Poller::new();
-                if self.pollee.poll(IoEvents::IN, Some(&poller)).is_empty() {
+                let mut poller = Poller::new();
+                if self.pollee.poll(IoEvents::IN, Some(&mut poller)).is_empty() {
                     poller.wait()?;
                 }
                 continue;
diff --git a/kernel/aster-nix/src/syscall/poll.rs b/kernel/aster-nix/src/syscall/poll.rs
index 3867f14c..ad377819 100644
--- a/kernel/aster-nix/src/syscall/poll.rs
+++ b/kernel/aster-nix/src/syscall/poll.rs
@@ -61,7 +61,7 @@ pub fn sys_poll(fds: Vaddr, nfds: u64, timeout: i32) -> Result<SyscallReturn> {
 
 pub fn do_poll(poll_fds: &[PollFd], timeout: Option<Duration>) -> Result<usize> {
     // The main loop of polling
-    let poller = Poller::new();
+    let mut poller = Poller::new();
     loop {
         let mut num_revents = 0;
 
@@ -79,7 +79,7 @@ pub fn do_poll(poll_fds: &[PollFd], timeout: Option<Duration>) -> Result<usize>
                 file_table.get_file(fd)?.clone()
             };
             let need_poller = if num_revents == 0 {
-                Some(&poller)
+                Some(&mut poller)
             } else {
                 None
             };