Pin PhysBorrowed head/tail UserScheme grants too.

This commit is contained in:
4lDO2
2023-07-04 12:29:52 +02:00
parent 329d60848c
commit ba62c0606e
3 changed files with 26 additions and 17 deletions
+3
View File
@@ -97,6 +97,8 @@ impl MemoryScheme {
_ => (),
}
let is_pinned = false;
Grant::physmap(
Frame::containing_address(PhysicalAddress::new(physical_address)),
PageSpan::new(
@@ -106,6 +108,7 @@ impl MemoryScheme {
page_flags,
dst_mapper,
dst_flusher,
is_pinned,
)
}).map(|page| page.start_address().data())
+6 -3
View File
@@ -145,7 +145,8 @@ impl UserInner {
let src_page = Page::containing_address(VirtualAddress::new(tail.buf_mut().as_ptr() as usize));
let dst_page = dst_addr_space.write().mmap(None, ONE, PROT_READ, |dst_page, flags, mapper, flusher| Ok(Grant::physmap(tail_frame, PageSpan::new(dst_page, 1), flags, mapper, flusher)?))?;
let is_pinned = true;
let dst_page = dst_addr_space.write().mmap(None, ONE, PROT_READ, |dst_page, flags, mapper, flusher| Ok(Grant::physmap(tail_frame, PageSpan::new(dst_page, 1), flags, mapper, flusher, is_pinned)?))?;
Ok(CaptureGuard {
destroyed: false,
@@ -240,7 +241,8 @@ impl UserInner {
}
dst_space.mmap(Some(free_span.base), ONE, map_flags, move |dst_page, page_flags, mapper, flusher| {
Ok(Grant::physmap(frame, PageSpan::new(dst_page, 1), page_flags, mapper, flusher)?)
let is_pinned = true;
Ok(Grant::physmap(frame, PageSpan::new(dst_page, 1), page_flags, mapper, flusher, is_pinned)?)
})?;
let head = CopyInfo {
@@ -303,7 +305,8 @@ impl UserInner {
}
dst_space.mmap(Some(tail_dst_page), ONE, map_flags, move |dst_page, page_flags, mapper, flusher| {
Ok(Grant::physmap(frame, PageSpan::new(dst_page, 1), page_flags, mapper, flusher)?)
let is_pinned = true;
Ok(Grant::physmap(frame, PageSpan::new(dst_page, 1), page_flags, mapper, flusher, is_pinned)?)
})?;
CopyInfo {