mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
add nesting depth = 2 for swapper ops
I think that structurally we might never exceed a nesting depth of 2, but there are some specific cases where an alloc can call an alloc in the kernel (e.g., having to create a new superpage in the midst of a routine alloc), therefore, we have to handle some nesting. There's also chance that maybe nesting could be due to race conditions or self-circular behavior in the swapper, but ideally we avoid that entirely because we can't handle non-structural, unbounded nesting of re-entry to the swapper routine.
This commit is contained in:
parent
80f783416e
commit
4f471544bd
1 changed files with 14 additions and 1 deletions
|
|
@ -59,6 +59,7 @@ static mut SWAP: Swap = Swap {
|
||||||
sid: SID::from_u32(0, 0, 0, 0),
|
sid: SID::from_u32(0, 0, 0, 0),
|
||||||
pc: 0,
|
pc: 0,
|
||||||
prev_op: None,
|
prev_op: None,
|
||||||
|
nested_op: None,
|
||||||
swapper_state: 0,
|
swapper_state: 0,
|
||||||
swapper_args: [0usize; 8],
|
swapper_args: [0usize; 8],
|
||||||
alloc_advisories: [AllocAdvice::Uninit, AllocAdvice::Uninit, AllocAdvice::Uninit],
|
alloc_advisories: [AllocAdvice::Uninit, AllocAdvice::Uninit, AllocAdvice::Uninit],
|
||||||
|
|
@ -72,6 +73,10 @@ pub struct Swap {
|
||||||
pc: usize,
|
pc: usize,
|
||||||
/// previous op
|
/// previous op
|
||||||
prev_op: Option<BlockingSwapOp>,
|
prev_op: Option<BlockingSwapOp>,
|
||||||
|
/// previous previous op - I think that structurally, we can only get a nesting of depth = 2, and this
|
||||||
|
/// is due to things like an alloc advisory pulling in a new superpage while handling the advisory...?
|
||||||
|
/// Anyways, there is an assert that checks for the overflow condition of nesting.
|
||||||
|
nested_op: Option<BlockingSwapOp>,
|
||||||
/// state for the swapper. this is a PID-2 local virtual address, passed from the swapper on registration
|
/// state for the swapper. this is a PID-2 local virtual address, passed from the swapper on registration
|
||||||
swapper_state: usize,
|
swapper_state: usize,
|
||||||
/// storage for args
|
/// storage for args
|
||||||
|
|
@ -218,6 +223,10 @@ impl Swap {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if let Some(op) = self.prev_op.take() {
|
||||||
|
assert!(self.nested_op.is_none(), "Nesting depth of 2 exceeded!");
|
||||||
|
self.nested_op = Some(op);
|
||||||
|
}
|
||||||
self.prev_op = Some(op);
|
self.prev_op = Some(op);
|
||||||
let swapper_pid: PID = PID::new(xous_kernel::SWAPPER_PID).unwrap();
|
let swapper_pid: PID = PID::new(xous_kernel::SWAPPER_PID).unwrap();
|
||||||
|
|
||||||
|
|
@ -245,7 +254,7 @@ impl Swap {
|
||||||
///
|
///
|
||||||
/// Safety: this call must only be invoked in the swapper's memory context
|
/// Safety: this call must only be invoked in the swapper's memory context
|
||||||
pub unsafe fn exit_blocking_call(&mut self) -> Result<xous_kernel::Result, xous_kernel::Error> {
|
pub unsafe fn exit_blocking_call(&mut self) -> Result<xous_kernel::Result, xous_kernel::Error> {
|
||||||
match self.prev_op.take() {
|
let result = match self.prev_op.take() {
|
||||||
Some(BlockingSwapOp::WriteToSwap(pid, addr, _virt_addr)) => {
|
Some(BlockingSwapOp::WriteToSwap(pid, addr, _virt_addr)) => {
|
||||||
// update the RPT: mark the physical memory as free. The physical page is
|
// update the RPT: mark the physical memory as free. The physical page is
|
||||||
// in the swapper's context at this point, so free it there (it's already been
|
// in the swapper's context at this point, so free it there (it's already been
|
||||||
|
|
@ -343,7 +352,11 @@ impl Swap {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => panic!("No previous swap op was set"),
|
None => panic!("No previous swap op was set"),
|
||||||
|
};
|
||||||
|
if let Some(op) = self.nested_op {
|
||||||
|
self.prev_op = Some(op);
|
||||||
}
|
}
|
||||||
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn evict_page(&mut self, target_pid: usize, vaddr: usize) -> SysCallResult {
|
pub fn evict_page(&mut self, target_pid: usize, vaddr: usize) -> SysCallResult {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue