Skip to content

Commit

Permalink
Merge pull request #152 from 00xc/clippy
Browse files Browse the repository at this point in the history 
Fix nightly clippy warnings
  • Loading branch information
@joergroedel
joergroedel authored Nov 20, 2023
2 parents 7aa8bd2 + bfac135 commit 3d7c9f7
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 58 deletions.
4 changes: 2 additions & 2 deletions src/cpu/percpu.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,8 @@ impl PerCpu {

vmsa_ref.tr = self.vmsa_tr_segment();
vmsa_ref.rip = start_rip;
vmsa_ref.rsp = self.get_top_of_stack().try_into().unwrap();
vmsa_ref.cr3 = self.get_pgtable().cr3_value().try_into().unwrap();
vmsa_ref.rsp = self.get_top_of_stack().into();
vmsa_ref.cr3 = self.get_pgtable().cr3_value().into();
}

pub fn unmap_guest_vmsa(&self) {
Expand Down
14 changes: 7 additions & 7 deletions src/elf/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,11 @@ impl<'a> Elf64File<'a> {

// Verify that the program header table is within the file bounds.
let phdrs_off = usize::try_from(elf_hdr.e_phoff).map_err(|_| ElfError::FileTooShort)?;
let phdr_size = usize::try_from(elf_hdr.e_phentsize).unwrap();
let phdr_size = usize::from(elf_hdr.e_phentsize);
if phdr_size < 56 {
return Err(ElfError::InvalidPhdrSize);
}
let phdrs_num = usize::try_from(elf_hdr.e_phnum).unwrap();
let phdrs_num = usize::from(elf_hdr.e_phnum);
let phdrs_size = phdrs_num
.checked_mul(phdr_size)
.ok_or(ElfError::FileTooShort)?;
Expand All @@ -407,7 +407,7 @@ impl<'a> Elf64File<'a> {
}

// Verify that the section header table is within the file bounds.
let shdr_size = usize::try_from(elf_hdr.e_shentsize).unwrap();
let shdr_size = usize::from(elf_hdr.e_shentsize);
if shdr_size < 64 {
return Err(ElfError::InvalidShdrSize);
}
Expand Down Expand Up @@ -515,8 +515,8 @@ impl<'a> Elf64File<'a> {
/// The ELF Program Header (Phdr) at the specified index.
fn read_phdr_from_file(elf_file_buf: &'a [u8], elf_hdr: &Elf64Hdr, i: Elf64Half) -> Elf64Phdr {
let phdrs_off = usize::try_from(elf_hdr.e_phoff).unwrap();
let phdr_size = usize::try_from(elf_hdr.e_phentsize).unwrap();
let i = usize::try_from(i).unwrap();
let phdr_size = usize::from(elf_hdr.e_phentsize);
let i = usize::from(i);
let phdr_off = phdrs_off + i * phdr_size;
let phdr_buf = &elf_file_buf[phdr_off..(phdr_off + phdr_size)];
Elf64Phdr::read(phdr_buf)
Expand Down Expand Up @@ -588,7 +588,7 @@ impl<'a> Elf64File<'a> {
) -> Result<(), ElfError> {
// Verify that the section header table is within the file bounds.
let shdrs_off = usize::try_from(elf_hdr.e_shoff).map_err(|_| ElfError::FileTooShort)?;
let shdr_size = usize::try_from(elf_hdr.e_shentsize).unwrap();
let shdr_size = usize::from(elf_hdr.e_shentsize);
let shdrs_num = usize::try_from(elf_hdr.e_shnum).unwrap();
let shdrs_size = shdrs_num
.checked_mul(shdr_size)
Expand Down Expand Up @@ -618,7 +618,7 @@ impl<'a> Elf64File<'a> {
/// The ELF Section Header (Shdr) at the specified index.
fn read_shdr_from_file(elf_file_buf: &'a [u8], elf_hdr: &Elf64Hdr, i: Elf64Word) -> Elf64Shdr {
let shdrs_off = usize::try_from(elf_hdr.e_shoff).unwrap();
let shdr_size = usize::try_from(elf_hdr.e_shentsize).unwrap();
let shdr_size = usize::from(elf_hdr.e_shentsize);
let i = usize::try_from(i).unwrap();
let shdr_off = shdrs_off + i * shdr_size;
let shdr_buf = &elf_file_buf[shdr_off..(shdr_off + shdr_size)];
Expand Down
94 changes: 47 additions & 47 deletions src/mm/alloc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,24 +191,24 @@ impl FileInfo {
}
}

enum Page {
enum PageInfo {
Free(FreeInfo),
Allocated(AllocatedInfo),
SlabPage(SlabPageInfo),
CompoundPage(CompoundInfo),
FilePage(FileInfo),
Slab(SlabPageInfo),
Compound(CompoundInfo),
File(FileInfo),
Reserved(ReservedInfo),
}

impl Page {
impl PageInfo {
fn to_mem(&self) -> PageStorageType {
match self {
Page::Free(fi) => fi.encode(),
Page::Allocated(ai) => ai.encode(),
Page::SlabPage(si) => si.encode(),
Page::CompoundPage(ci) => ci.encode(),
Page::FilePage(fi) => fi.encode(),
Page::Reserved(ri) => ri.encode(),
Self::Free(fi) => fi.encode(),
Self::Allocated(ai) => ai.encode(),
Self::Slab(si) => si.encode(),
Self::Compound(ci) => ci.encode(),
Self::File(fi) => fi.encode(),
Self::Reserved(ri) => ri.encode(),
}
}

Expand All @@ -220,9 +220,9 @@ impl Page {
match page_type {
PageType::Free => Self::Free(FreeInfo::decode(mem)),
PageType::Allocated => Self::Allocated(AllocatedInfo::decode(mem)),
PageType::SlabPage => Self::SlabPage(SlabPageInfo::decode(mem)),
PageType::Compound => Self::CompoundPage(CompoundInfo::decode(mem)),
PageType::File => Self::FilePage(FileInfo::decode(mem)),
PageType::SlabPage => Self::Slab(SlabPageInfo::decode(mem)),
PageType::Compound => Self::Compound(CompoundInfo::decode(mem)),
PageType::File => Self::File(FileInfo::decode(mem)),
PageType::Reserved => Self::Reserved(ReservedInfo::decode(mem)),
}
}
Expand Down Expand Up @@ -306,7 +306,7 @@ impl MemoryRegion {
vaddr >= start && vaddr < end
}

fn write_page_info(&self, pfn: usize, pi: Page) {
fn write_page_info(&self, pfn: usize, pi: PageInfo) {
self.check_pfn(pfn);

let info: PageStorageType = pi.to_mem();
Expand All @@ -318,16 +318,16 @@ impl MemoryRegion {
}
}

fn read_page_info(&self, pfn: usize) -> Page {
fn read_page_info(&self, pfn: usize) -> PageInfo {
self.check_pfn(pfn);

let virt = self.page_info_virt_addr(pfn).as_ptr::<u64>();
let info = unsafe { PageStorageType(*virt) };

Page::from_mem(info)
PageInfo::from_mem(info)
}

fn get_page_info(&self, vaddr: VirtAddr) -> Result<Page, SvsmError> {
fn get_page_info(&self, vaddr: VirtAddr) -> Result<PageInfo, SvsmError> {
if vaddr.is_null() || !self.check_virt_addr(vaddr) {
return Err(SvsmError::Mem);
}
Expand All @@ -347,7 +347,7 @@ impl MemoryRegion {
let pg = self.read_page_info(pfn);

let new_next = match pg {
Page::Free(fi) => fi.next_page,
PageInfo::Free(fi) => fi.next_page,
_ => panic!("Unexpected page type in MemoryRegion::get_next_page()"),
};

Expand All @@ -361,14 +361,14 @@ impl MemoryRegion {
fn init_compound_page(&mut self, pfn: usize, order: usize, next_pfn: usize) {
let nr_pages: usize = 1 << order;

let head = Page::Free(FreeInfo {
let head = PageInfo::Free(FreeInfo {
next_page: next_pfn,
order,
});
self.write_page_info(pfn, head);

for i in 1..nr_pages {
let compound = Page::CompoundPage(CompoundInfo { order });
let compound = PageInfo::Compound(CompoundInfo { order });
self.write_page_info(pfn + i, compound);
}
}
Expand Down Expand Up @@ -414,7 +414,7 @@ impl MemoryRegion {
fn allocate_pages(&mut self, order: usize) -> Result<VirtAddr, SvsmError> {
self.refill_page_list(order)?;
let pfn = self.get_next_page(order)?;
let pg = Page::Allocated(AllocatedInfo { order });
let pg = PageInfo::Allocated(AllocatedInfo { order });
self.write_page_info(pfn, pg);
Ok(self.start_virt + (pfn * PAGE_SIZE))
}
Expand All @@ -435,15 +435,15 @@ impl MemoryRegion {
self.refill_page_list(0)?;

let pfn = self.get_next_page(0)?;
let pg = Page::SlabPage(SlabPageInfo);
let pg = PageInfo::Slab(SlabPageInfo);
self.write_page_info(pfn, pg);
Ok(self.start_virt + (pfn * PAGE_SIZE))
}

fn allocate_file_page(&mut self) -> Result<VirtAddr, SvsmError> {
self.refill_page_list(0)?;
let pfn = self.get_next_page(0)?;
let pg = Page::FilePage(FileInfo::new(1));
let pg = PageInfo::File(FileInfo::new(1));
self.write_page_info(pfn, pg);
Ok(self.start_virt + (pfn * PAGE_SIZE))
}
Expand All @@ -452,11 +452,11 @@ impl MemoryRegion {
let page = self.get_page_info(vaddr)?;

match page {
Page::FilePage(mut fi) => {
PageInfo::File(mut fi) => {
let pfn = (vaddr - self.start_virt) / PAGE_SIZE;
assert!(fi.ref_count > 0);
fi.ref_count += 1;
self.write_page_info(pfn, Page::FilePage(fi));
self.write_page_info(pfn, PageInfo::File(fi));
Ok(())
}
_ => Err(SvsmError::Mem),
Expand All @@ -467,14 +467,14 @@ impl MemoryRegion {
let page = self.get_page_info(vaddr)?;

match page {
Page::FilePage(mut fi) => {
PageInfo::File(mut fi) => {
let pfn = (vaddr - self.start_virt) / PAGE_SIZE;
fi.ref_count = fi
.ref_count
.checked_sub(1)
.expect("page refcount underflow");
if fi.ref_count > 0 {
self.write_page_info(pfn, Page::FilePage(fi));
self.write_page_info(pfn, PageInfo::File(fi));
} else {
self.free_page(vaddr)
}
Expand Down Expand Up @@ -507,12 +507,12 @@ impl MemoryRegion {
let pfn = if pfn1 < pfn2 { pfn1 } else { pfn2 };

// Write new compound head
let pg = Page::Allocated(AllocatedInfo { order: order + 1 });
let pg = PageInfo::Allocated(AllocatedInfo { order: order + 1 });
self.write_page_info(pfn, pg);

// Write compound pages
for i in 1..nr_pages {
let pg = Page::CompoundPage(CompoundInfo { order: order + 1 });
let pg = PageInfo::Compound(CompoundInfo { order: order + 1 });
self.write_page_info(pfn + i, pg);
}

Expand All @@ -527,7 +527,7 @@ impl MemoryRegion {
fn next_free_pfn(&self, pfn: usize, order: usize) -> usize {
let page = self.read_page_info(pfn);
match page {
Page::Free(fi) => fi.next_page,
PageInfo::Free(fi) => fi.next_page,
_ => {
panic!("Unexpected page type in free-list for order {}", order);
}
Expand Down Expand Up @@ -555,13 +555,13 @@ impl MemoryRegion {
break;
} else if current_pfn == pfn {
let next_pfn = self.next_free_pfn(current_pfn, order);
let pg = Page::Free(FreeInfo {
let pg = PageInfo::Free(FreeInfo {
next_page: next_pfn,
order,
});
self.write_page_info(old_pfn, pg);

let pg = Page::Allocated(AllocatedInfo { order });
let pg = PageInfo::Allocated(AllocatedInfo { order });
self.write_page_info(current_pfn, pg);

self.free_pages[order] -= 1;
Expand All @@ -577,7 +577,7 @@ impl MemoryRegion {

fn free_page_raw(&mut self, pfn: usize, order: usize) {
let old_next = self.next_page[order];
let pg = Page::Free(FreeInfo {
let pg = PageInfo::Free(FreeInfo {
next_page: old_next,
order,
});
Expand All @@ -592,7 +592,7 @@ impl MemoryRegion {
let neighbor_pfn = self.compound_neighbor(pfn, order)?;
let neighbor_page = self.read_page_info(neighbor_pfn);

if let Page::Free(fi) = neighbor_page {
if let PageInfo::Free(fi) = neighbor_page {
if fi.order != order {
return Err(SvsmError::Mem);
}
Expand Down Expand Up @@ -626,18 +626,18 @@ impl MemoryRegion {
let pfn = (vaddr - self.start_virt) / PAGE_SIZE;

match res {
Page::Allocated(ai) => {
PageInfo::Allocated(ai) => {
self.free_page_order(pfn, ai.order);
}
Page::SlabPage(_si) => {
PageInfo::Slab(_si) => {
self.free_page_order(pfn, 0);
}
Page::CompoundPage(ci) => {
PageInfo::Compound(ci) => {
let mask = (1usize << ci.order) - 1;
let start_pfn = pfn & !mask;
self.free_page_order(start_pfn, ci.order);
}
Page::FilePage(_) => {
PageInfo::File(_) => {
self.free_page_order(pfn, 0);
}
_ => {
Expand All @@ -659,15 +659,15 @@ impl MemoryRegion {

/* Mark page storage as reserved */
for i in 0..meta_pages {
let pg: Page = Page::Reserved(ReservedInfo {});
let pg = PageInfo::Reserved(ReservedInfo {});
self.write_page_info(i, pg);
}

self.nr_pages[0] = self.page_count - meta_pages;

/* Mark all pages as allocated */
for i in meta_pages..self.page_count {
let pg = Page::Allocated(AllocatedInfo { order: 0 });
let pg = PageInfo::Allocated(AllocatedInfo { order: 0 });
self.write_page_info(i, pg);
}

Expand Down Expand Up @@ -1240,10 +1240,10 @@ unsafe impl GlobalAlloc for SvsmAllocator {
.expect("Freeing unknown memory");

match info {
Page::Allocated(_ai) => {
PageInfo::Allocated(_ai) => {
free_page(virt_addr);
}
Page::SlabPage(_si) => {
PageInfo::Slab(_si) => {
let slab = self.get_slab(size).expect("Invalid page info");
slab.lock().deallocate(virt_addr);
}
Expand Down Expand Up @@ -1468,25 +1468,25 @@ fn test_page_file() {
let vaddr = root_mem.allocate_file_page().unwrap();
let info = root_mem.get_page_info(vaddr).unwrap();

assert!(matches!(info, Page::FilePage(ref fi) if fi.ref_count == 1));
assert!(matches!(info, PageInfo::File(ref fi) if fi.ref_count == 1));

// Get another reference and check ref-count
root_mem.get_file_page(vaddr).expect("Not a file page");
let info = root_mem.get_page_info(vaddr).unwrap();

assert!(matches!(info, Page::FilePage(ref fi) if fi.ref_count == 2));
assert!(matches!(info, PageInfo::File(ref fi) if fi.ref_count == 2));

// Drop reference and check ref-count
root_mem.put_file_page(vaddr).expect("Not a file page");
let info = root_mem.get_page_info(vaddr).unwrap();

assert!(matches!(info, Page::FilePage(ref fi) if fi.ref_count == 1));
assert!(matches!(info, PageInfo::File(ref fi) if fi.ref_count == 1));

// Drop last reference and check if page is released
root_mem.put_file_page(vaddr).expect("Not a file page");
let info = root_mem.get_page_info(vaddr).unwrap();

assert!(matches!(info, Page::Free { .. }));
assert!(matches!(info, PageInfo::Free { .. }));
}

#[cfg(test)]
Expand Down
4 changes: 2 additions & 2 deletions src/svsm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@ pub extern "C" fn svsm_start(li: &KernelLaunchInfo, vb_addr: usize) {
mapping_info_init(&launch_info);

init_valid_bitmap_ptr(
launch_info.kernel_region_phys_start.try_into().unwrap(),
launch_info.kernel_region_phys_end.try_into().unwrap(),
launch_info.kernel_region_phys_start.into(),
launch_info.kernel_region_phys_end.into(),
vb_ptr,
);

Expand Down

0 comments on commit 3d7c9f7

Please sign in to comment.