Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-10 05:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lock releasing of fcntl

Browse Source
This commit is contained in:
Fabing Li 2024-08-29 10:17:44 +08:00 committed by Tate, Hongliang Tian
parent be8cc24544
commit 6ce25dc38b
2 changed files with 29 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
kernel/src/fs/file_table.rs
View File

@ -9,6 +9,7 @@ use aster_util::slot_vec::SlotVec;
use super::{ use super::{
file_handle::FileLike, file_handle::FileLike,
fs_resolver::{FsPath, FsResolver, AT_FDCWD}, fs_resolver::{FsPath, FsResolver, AT_FDCWD},
inode_handle::InodeHandle,
utils::{AccessMode, InodeMode}, utils::{AccessMode, InodeMode},
}; };
use crate::{ use crate::{
@ -116,52 +117,55 @@ impl FileTable {
} }
pub fn close_file(&mut self, fd: FileDesc) -> Option<Arc<dyn FileLike>> { pub fn close_file(&mut self, fd: FileDesc) -> Option<Arc<dyn FileLike>> {
let entry = self.table.remove(fd as usize); let removed_entry = self.table.remove(fd as usize)?;
if entry.is_some() {
let events = FdEvents::Close(fd); let events = FdEvents::Close(fd);
self.notify_fd_events(&events); self.notify_fd_events(&events);
entry.as_ref().unwrap().notify_fd_events(&events); removed_entry.notify_fd_events(&events);
let closed_file = removed_entry.file;
if let Some(closed_inode_file) = closed_file.downcast_ref::<InodeHandle>() {
closed_inode_file.release_range_locks();
} }
entry.map(|e| e.file) Some(closed_file)
} }
pub fn close_all(&mut self) -> Vec<Arc<dyn FileLike>> { pub fn close_all(&mut self) -> Vec<Arc<dyn FileLike>> {
let mut closed_files = Vec::new(); self.close_files(|_, _| true)
let closed_fds: Vec<FileDesc> = self
.table
.idxes_and_items()
.map(|(idx, _)| idx as FileDesc)
.collect();
for fd in closed_fds {
let entry = self.table.remove(fd as usize).unwrap();
let events = FdEvents::Close(fd);
self.notify_fd_events(&events);
entry.notify_fd_events(&events);
closed_files.push(entry.file);
}
closed_files
} }
pub fn close_files_on_exec(&mut self) -> Vec<Arc<dyn FileLike>> { pub fn close_files_on_exec(&mut self) -> Vec<Arc<dyn FileLike>> {
self.close_files(|_, entry| entry.flags().contains(FdFlags::CLOEXEC))
}
fn close_files<F>(&mut self, should_close: F) -> Vec<Arc<dyn FileLike>>
where
F: Fn(FileDesc, &FileTableEntry) -> bool,
{
let mut closed_files = Vec::new(); let mut closed_files = Vec::new();
let closed_fds: Vec<FileDesc> = self let closed_fds: Vec<FileDesc> = self
.table .table
.idxes_and_items() .idxes_and_items()
.filter_map(|(idx, entry)| { .filter_map(|(idx, entry)| {
if entry.flags().contains(FdFlags::CLOEXEC) { if should_close(idx as FileDesc, entry) {
Some(idx as FileDesc) Some(idx as FileDesc)
} else { } else {
None None
} }
}) })
.collect(); .collect();
for fd in closed_fds { for fd in closed_fds {
let entry = self.table.remove(fd as usize).unwrap(); let removed_entry = self.table.remove(fd as usize).unwrap();
let events = FdEvents::Close(fd); let events = FdEvents::Close(fd);
self.notify_fd_events(&events); self.notify_fd_events(&events);
entry.notify_fd_events(&events); removed_entry.notify_fd_events(&events);
closed_files.push(entry.file); closed_files.push(removed_entry.file.clone());
if let Some(inode_file) = removed_entry.file.downcast_ref::<InodeHandle>() {
inode_file.release_range_locks();
}
} }
closed_files closed_files
} }

16
test/syscall_test/blocklists/fcntl_test
View File

@ -25,21 +25,7 @@ FcntlTest.GetO_ASYNC
FcntlTest.SetFlO_ASYNC FcntlTest.SetFlO_ASYNC
FcntlTest.SetFdO_ASYNC FcntlTest.SetFdO_ASYNC
FcntlTest.DupAfterO_ASYNC FcntlTest.DupAfterO_ASYNC
FcntlLockTest.SetLockSymlink FcntlLockTest.SetLockSymlink
FcntlLockTest.SetLockProc FcntlLockTest.SetLockProc
FcntlLockTest.SetLockPipe FcntlLockTest.SetLockPipe
FcntlLockTest.SetLockSocket FcntlLockTest.SetLockSocket
FcntlLockTest.SetReadLockMultiProc
FcntlLockTest.SetReadThenWriteLockMultiProc
FcntlLockTest.SetWriteThenReadLockMultiProc
FcntlLockTest.SetWriteLockMultiProc
FcntlLockTest.SetLockIsRegional
FcntlLockTest.SetLockUpgradeDowngrade
FcntlLockTest.SetLockDroppedOnClose
FcntlLockTest.SetLockUnlock
FcntlLockTest.SetLockAcrossRename
FcntlLockTest.SetWriteLockThenBlockingWriteLock
FcntlLockTest.SetReadLockThenBlockingWriteLock
FcntlLockTest.SetWriteLockThenBlockingReadLock
FcntlLockTest.SetReadLockThenBlockingReadLock