Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement sys_read && allocate pid and kernel stack dynamically.

Browse source
This commit is contained in:
Yifan Wu 2020-12-08 17:17:28 +08:00
parent a9066d75e5
commit 58dbb3ffa5
7 changed files with 162 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
os/src/mm/memory_set.rs
View file

@ -47,6 +47,9 @@ impl MemorySet {
areas: Vec::new(),
}
}
pub fn dealloc_all_frames(&mut self) {
*self = Self::new_bare();
}
pub fn token(&self) -> usize {
self.page_table.token()
}
@ -59,6 +62,14 @@ impl MemorySet {
permission,
), None);
}
pub fn remove_area_with_start_vpn(&mut self, start_vpn: VirtPageNum) {
if let Some((idx, area)) = self.areas.iter_mut().enumerate()
.find(|(_, area)| area.vpn_range.get_start() == start_vpn) {
area.unmap(&mut self.page_table);
self.areas.remove(idx);
}
panic!("Area not found!");
}
fn push(&mut self, mut map_area: MapArea, data: Option<&[u8]>) {
map_area.map(&mut self.page_table);
if let Some(data) = data {
@ -228,7 +239,6 @@ impl MapArea {
let pte_flags = PTEFlags::from_bits(self.map_perm.bits).unwrap();
page_table.map(vpn, ppn, pte_flags);
}
#[allow(unused)]
pub fn unmap_one(&mut self, page_table: &mut PageTable, vpn: VirtPageNum) {
match self.map_type {
MapType::Framed => {
@ -243,7 +253,6 @@ impl MapArea {
self.map_one(page_table, vpn);
}
}
#[allow(unused)]
pub fn unmap(&mut self, page_table: &mut PageTable) {
for vpn in self.vpn_range {
self.unmap_one(page_table, vpn);

4
os/src/mm/page_table.rs
View file

@ -131,7 +131,7 @@ impl PageTable {
}
}
pub fn translated_byte_buffer(token: usize, ptr: *const u8, len: usize) -> Vec<&'static [u8]> {
pub fn translated_byte_buffer(token: usize, ptr: *const u8, len: usize) -> Vec<&'static mut [u8]> {
let page_table = PageTable::from_token(token);
let mut start = ptr as usize;
let end = start + len;
@ -146,7 +146,7 @@ pub fn translated_byte_buffer(token: usize, ptr: *const u8, len: usize) -> Vec<&
vpn.step();
let mut end_va: VirtAddr = vpn.into();
end_va = end_va.min(VirtAddr::from(end));
v.push(&ppn.get_bytes_array()[start_va.page_offset()..end_va.page_offset()]);
v.push(&mut ppn.get_bytes_array()[start_va.page_offset()..end_va.page_offset()]);
start = end_va.into();
}
v