Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 09:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lost wakeup in range_lock caused by waiting on an outdated waitqueue

Browse Source
This commit is contained in:
Ruize Tang
2024-10-17 17:27:05 +08:00
committed by Tate, Hongliang Tian
parent e5fd8e7477
commit 968389f550
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/src/fs/utils/range_lock/mod.rs
View File

@ -2,7 +2,7 @@
use core::fmt;
use ostd::sync::{RwMutexWriteGuard, WaitQueue};
use ostd::sync::{RwMutexWriteGuard, WaitQueue, Waiter};
use self::range::FileRangeChange;
pub use self::{
@ -229,7 +229,7 @@ impl RangeLockList {
req_lock, is_nonblocking
);
loop {
let conflict_lock;
let (waiter, waker);
{
let mut list = self.inner.write();
@ -237,22 +237,15 @@ impl RangeLockList {
if is_nonblocking {
return_errno_with_message!(Errno::EAGAIN, "the file is locked");
}
conflict_lock = existing_lock.clone();
(waiter, waker) = Waiter::new_pair();
existing_lock.waitqueue.enqueue(waker);
} else {
Self::insert_lock_into_list(&mut list, req_lock);
return Ok(());
}
}
conflict_lock.wait_until(|| {
let list = self.inner.read();
if list.iter().any(|l| req_lock.conflict_with(l)) {
None
} else {
Some(())
}
});
waiter.wait();
}
}