vasilito
34360e1e4f
P0-P2: Barrier SMP, sigmask/pthread_kill races, robust mutexes, RT scheduling, POSIX sched API P3: PerCpuSched struct, per-CPU wiring, work stealing, load balancing, initial placement P4: 64-shard futex table, REQUEUE, PI futexes (LOCK_PI/UNLOCK_PI/TRYLOCK_PI), robust futexes, vruntime tracking, min-vruntime SCHED_OTHER selection P5: setpriority/getpriority, pthread_setaffinity_np, pthread_setname_np, pthread_setschedparam (Redox) P6: Cache-affine scheduling (last_cpu + vruntime bonus), NUMA topology kernel hints + numad userspace daemon Stability fixes: make_consistent stores 0 (dead TID fix), cond.rs error propagation, SPIN_COUNT adaptive spinning, Sys::open &str fix, PI futex CAS race, proc.rs lock ordering, barrier destroy Patches: 33 kernel + 58 relibc patches, all tracked in recipes Docs: KERNEL-SCHEDULER-MULTITHREAD-IMPROVEMENT-PLAN.md updated, SCHEDULER-REVIEW-FINAL.md created Architecture: NUMA topology parsing stays userspace (numad daemon), kernel stores lightweight NumaTopology hints
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
diff --git a/src/scheme/proc.rs b/src/scheme/proc.rs
|
|
--- a/src/scheme/proc.rs
|
|
+++ b/src/scheme/proc.rs
|
|
@@ -450,6 +450,7 @@ impl KernelScheme for ProcScheme {
|
|
}
|
|
|
|
fn close(&self, id: usize, token: &mut CleanLockToken) -> Result<()> {
|
|
+ let mut inner_token = unsafe { CleanLockToken::new() };
|
|
let handle = HANDLES
|
|
.write(token.token())
|
|
.remove(&id)
|
|
@@ -478,9 +479,7 @@ impl KernelScheme for ProcScheme {
|
|
))]
|
|
regs.set_arg1(arg1);
|
|
|
|
- // TODO: Lock ordering violation
|
|
- let mut token = unsafe { CleanLockToken::new() };
|
|
- Ok(context.set_addr_space(Some(new), token.downgrade()))
|
|
+ Ok(context.set_addr_space(Some(new), inner_token.downgrade()))
|
|
})?;
|
|
if let Some(old_ctx) = old_ctx
|
|
&& let Some(addrspace) = Arc::into_inner(old_ctx)
|
|
@@ -518,6 +517,7 @@ impl KernelScheme for ProcScheme {
|
|
consume: bool,
|
|
token: &mut CleanLockToken,
|
|
) -> Result<usize> {
|
|
+ let mut inner_token = unsafe { CleanLockToken::new() };
|
|
let handle = HANDLES
|
|
.read(token.token())
|
|
.get(&id)
|
|
@@ -609,9 +609,7 @@ impl KernelScheme for ProcScheme {
|
|
};
|
|
// TODO: Allocated or AllocatedShared?
|
|
let addrsp = AddrSpace::current()?;
|
|
- // TODO: Lock ordering violation
|
|
- let mut token = unsafe { CleanLockToken::new() };
|
|
- let page = addrsp.acquire_write(token.downgrade()).mmap_anywhere(
|
|
+ let page = addrsp.acquire_write(inner_token.downgrade()).mmap_anywhere(
|
|
&addrsp,
|
|
NonZeroUsize::new(1).unwrap(),
|
|
MapFlags::PROT_READ | MapFlags::PROT_WRITE,
|