From 0c3542ff51e253c5bc316ecc2c254f01506fcc5d Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 10 Aug 2021 20:46:30 -0600
Subject: [PATCH] Store funmap data with the context's grants
---
src/context/memory.rs | 5 ++++-
src/scheme/user.rs | 26 +++++++++++++++++++++-----
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/context/memory.rs b/src/context/memory.rs
index ddd47016..75c5421b 100644
--- a/src/context/memory.rs
+++ b/src/context/memory.rs
@@ -1,4 +1,4 @@
-use alloc::collections::{BTreeSet, VecDeque};
+use alloc::collections::{BTreeMap, BTreeSet, VecDeque};
use alloc::sync::{Arc, Weak};
use core::borrow::Borrow;
use core::cmp::{self, Eq, Ordering, PartialEq, PartialOrd};
@@ -39,7 +39,10 @@ pub fn page_flags(flags: MapFlags) -> PageFlags<RmmA> {
#[derive(Debug, Default)]
pub struct UserGrants {
pub inner: BTreeSet<Grant>,
+ //TODO: technically VirtualAddress is from a scheme's context!
+ pub funmap: BTreeMap<Region, VirtualAddress>,
}
+
impl UserGrants {
/// Returns the grant, if any, which occupies the specified address
pub fn contains(&self, address: VirtualAddress) -> Option<&Grant> {
diff --git a/src/scheme/user.rs b/src/scheme/user.rs
index 2dd6713a..1bbbcf28 100644
--- a/src/scheme/user.rs
+++ b/src/scheme/user.rs
@@ -30,7 +30,6 @@ pub struct UserInner {
context: Weak<RwLock<Context>>,
todo: WaitQueue<Packet>,
fmap: Mutex<BTreeMap<u64, (Weak<RwLock<Context>>, FileDescriptor, Map)>>,
- funmap: Mutex<BTreeMap<Region, VirtualAddress>>,
done: WaitMap<u64, usize>,
unmounting: AtomicBool,
}
@@ -47,7 +46,6 @@ impl UserInner {
context,
todo: WaitQueue::new(),
fmap: Mutex::new(BTreeMap::new()),
- funmap: Mutex::new(BTreeMap::new()),
done: WaitMap::new(),
unmounting: AtomicBool::new(false),
}
@@ -245,7 +243,17 @@ impl UserInner {
}
let res = UserInner::capture_inner(&context_weak, map.address, address, map.size, map.flags, Some(desc));
if let Ok(grant_address) = res {
- self.funmap.lock().insert(Region::new(grant_address, map.size), VirtualAddress::new(address));
+ if let Some(context_lock) = context_weak.upgrade() {
+ let context = context_lock.read();
+ let mut grants = context.grants.write();
+ grants.funmap.insert(
+ Region::new(grant_address, map.size),
+ VirtualAddress::new(address)
+ );
+ } else {
+ //TODO: packet.pid is an assumption
+ println!("UserInner::write: failed to find context {} for fmap", packet.pid);
+ }
}
packet.a = Error::mux(res.map(|addr| addr.data()));
} else {
@@ -479,7 +487,11 @@ impl Scheme for UserScheme {
fn funmap_old(&self, grant_address: usize) -> Result<usize> {
let inner = self.inner.upgrade().ok_or(Error::new(ENODEV))?;
let address_opt = {
- let mut funmap = inner.funmap.lock();
+ let contexts = context::contexts();
+ let context_lock = contexts.current().ok_or(Error::new(ESRCH))?;
+ let context = context_lock.read();
+ let mut grants = context.grants.write();
+ let mut funmap = &mut grants.funmap;
let entry = funmap.range(..=Region::byte(VirtualAddress::new(grant_address))).next_back();
let grant_address = VirtualAddress::new(grant_address);
@@ -505,7 +517,11 @@ impl Scheme for UserScheme {
fn funmap(&self, grant_address: usize, size: usize) -> Result<usize> {
let inner = self.inner.upgrade().ok_or(Error::new(ENODEV))?;
let address_opt = {
- let mut funmap = inner.funmap.lock();
+ let contexts = context::contexts();
+ let context_lock = contexts.current().ok_or(Error::new(ESRCH))?;
+ let context = context_lock.read();
+ let mut grants = context.grants.write();
+ let mut funmap = &mut grants.funmap;
let entry = funmap.range(..=Region::byte(VirtualAddress::new(grant_address))).next_back();
let grant_address = VirtualAddress::new(grant_address);
--
GitLab