vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use flush_all instead of flush for performance

Browse source
This commit is contained in:
Jeremy Soller 2016-09-13 11:20:55 -06:00
parent 0a2abe0f54
commit 4341a2d725
2 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
kernel/context/memory.rs
View file

@ -39,14 +39,22 @@ impl Memory {
pub fn map(&mut self, flush: bool, clear: bool) { pub fn map(&mut self, flush: bool, clear: bool) {
let mut active_table = unsafe { ActivePageTable::new() }; let mut active_table = unsafe { ActivePageTable::new() };
let mut flush_all = false;
//TODO: Clear pages? //TODO: Clear pages?
for page in self.pages() { for page in self.pages() {
active_table.map(page, self.flags); active_table.map(page, self.flags);
if flush { if flush {
active_table.flush(page); //active_table.flush(page);
flush_all = true;
} }
} }
if flush_all {
active_table.flush_all();
}
if clear { if clear {
assert!(flush); assert!(flush);
unsafe { memset(self.start_address().get() as *mut u8, 0, self.size); } unsafe { memset(self.start_address().get() as *mut u8, 0, self.size); }
@ -56,24 +64,40 @@ impl Memory {
pub fn unmap(&mut self, flush: bool) { pub fn unmap(&mut self, flush: bool) {
let mut active_table = unsafe { ActivePageTable::new() }; let mut active_table = unsafe { ActivePageTable::new() };
let mut flush_all = false;
for page in self.pages() { for page in self.pages() {
active_table.unmap(page); active_table.unmap(page);
if flush { if flush {
active_table.flush(page); //active_table.flush(page);
flush_all = true;
} }
} }
if flush_all {
active_table.flush_all();
}
} }
pub fn remap(&mut self, new_flags: EntryFlags, flush: bool) { pub fn remap(&mut self, new_flags: EntryFlags, flush: bool) {
let mut active_table = unsafe { ActivePageTable::new() }; let mut active_table = unsafe { ActivePageTable::new() };
let mut flush_all = false;
for page in self.pages() { for page in self.pages() {
active_table.remap(page, new_flags); active_table.remap(page, new_flags);
if flush { if flush {
active_table.flush(page); //active_table.flush(page);
flush_all = true;
} }
} }
if flush_all {
active_table.flush_all();
}
self.flags = new_flags; self.flags = new_flags;
} }
@ -82,32 +106,48 @@ impl Memory {
//TODO: Calculate page changes to minimize operations //TODO: Calculate page changes to minimize operations
if new_size > self.size { if new_size > self.size {
let mut flush_all = false;
let start_page = Page::containing_address(VirtualAddress::new(self.start.get() + self.size)); let start_page = Page::containing_address(VirtualAddress::new(self.start.get() + self.size));
let end_page = Page::containing_address(VirtualAddress::new(self.start.get() + new_size - 1)); let end_page = Page::containing_address(VirtualAddress::new(self.start.get() + new_size - 1));
for page in Page::range_inclusive(start_page, end_page) { for page in Page::range_inclusive(start_page, end_page) {
if active_table.translate_page(page).is_none() { if active_table.translate_page(page).is_none() {
active_table.map(page, self.flags); active_table.map(page, self.flags);
if flush { if flush {
active_table.flush(page); //active_table.flush(page);
flush_all = true;
} }
} }
} }
if flush_all {
active_table.flush_all();
}
if clear { if clear {
assert!(flush); assert!(flush);
unsafe { memset((self.start.get() + self.size) as *mut u8, 0, new_size - self.size); } unsafe { memset((self.start.get() + self.size) as *mut u8, 0, new_size - self.size); }
} }
} else if new_size < self.size { } else if new_size < self.size {
let mut flush_all = false;
let start_page = Page::containing_address(VirtualAddress::new(self.start.get() + new_size)); let start_page = Page::containing_address(VirtualAddress::new(self.start.get() + new_size));
let end_page = Page::containing_address(VirtualAddress::new(self.start.get() + self.size - 1)); let end_page = Page::containing_address(VirtualAddress::new(self.start.get() + self.size - 1));
for page in Page::range_inclusive(start_page, end_page) { for page in Page::range_inclusive(start_page, end_page) {
if active_table.translate_page(page).is_some() { if active_table.translate_page(page).is_some() {
active_table.unmap(page); active_table.unmap(page);
if flush { if flush {
active_table.flush(page); //active_table.flush(page);
flush_all = true;
} }
} }
} }
if flush_all {
active_table.flush_all();
}
} }
self.size = new_size; self.size = new_size;

2
kernel/syscall/process.rs
View file

@ -49,7 +49,7 @@ pub fn clone(flags: usize) -> Result<usize> {
pub fn exit(status: usize) -> ! { pub fn exit(status: usize) -> ! {
println!("Exit {}", status); println!("Exit {}", status);
{ {
let contexts = context::contexts(); let contexts = context::contexts();
let context_lock = contexts.current().expect("tried to exit without context"); let context_lock = contexts.current().expect("tried to exit without context");