1+ // Copyright © 2020, Oracle and/or its affiliates.
2+ //
13// Copyright (c) 2019 Intel Corporation. All rights reserved.
24// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
35//
@@ -36,6 +38,13 @@ use vm_memory::{Address, Bytes, GuestAddress, GuestMemory, GuestUsize};
3638#[ allow( missing_docs) ]
3739#[ cfg_attr( feature = "cargo-clippy" , allow( clippy:: all) ) ]
3840pub mod bootparam;
41+
42+ #[ cfg( feature = "elf" ) ]
43+ #[ cfg( any( target_arch = "x86" , target_arch = "x86_64" ) ) ]
44+ #[ allow( missing_docs) ]
45+ #[ cfg_attr( feature = "cargo-clippy" , allow( clippy:: all) ) ]
46+ pub mod start_info;
47+
3948#[ allow( dead_code) ]
4049#[ allow( non_camel_case_types) ]
4150#[ allow( non_snake_case) ]
@@ -93,6 +102,12 @@ pub enum Error {
93102 SeekBzImageHeader ,
94103 /// Unable to seek to bzImage compressed kernel.
95104 SeekBzImageCompressedKernel ,
105+ /// Unable to seek to note header.
106+ SeekNoteHeader ,
107+ /// Unable to read note header.
108+ ReadNoteHeader ,
109+ /// Invalid PVH note.
110+ InvalidPvhNote ,
96111}
97112
98113/// A specialized `Result` type for the kernel loader.
@@ -125,6 +140,9 @@ impl error::Error for Error {
125140 Error :: SeekBzImageEnd => "Unable to seek bzImage end" ,
126141 Error :: SeekBzImageHeader => "Unable to seek bzImage header" ,
127142 Error :: SeekBzImageCompressedKernel => "Unable to seek bzImage compressed kernel" ,
143+ Error :: SeekNoteHeader => "Unable to seek to note header" ,
144+ Error :: ReadNoteHeader => "Unable to read note header" ,
145+ Error :: InvalidPvhNote => "Invalid PVH note header" ,
128146 }
129147 }
130148}
@@ -150,6 +168,10 @@ pub struct KernelLoaderResult {
150168 /// This field is only for bzImage following https://www.kernel.org/doc/Documentation/x86/boot.txt
151169 /// VMM should make use of it to fill zero page for bzImage direct boot.
152170 pub setup_header : Option < bootparam:: setup_header > ,
171+ /// This field optionally holds the address of a PVH entry point, indicating that
172+ /// the kernel supports the PVH boot protocol as described in:
173+ /// https://xenbits.xen.org/docs/unstable/misc/pvh.html
174+ pub pvh_entry_addr : Option < GuestAddress > ,
153175}
154176
155177/// A kernel image loading support must implement the KernelLoader trait.
@@ -247,6 +269,10 @@ impl KernelLoader for Elf {
247269 // Read in each section pointed to by the program headers.
248270 for phdr in & phdrs {
249271 if phdr. p_type != elf:: PT_LOAD || phdr. p_filesz == 0 {
272+ if phdr. p_type == elf:: PT_NOTE {
273+ // This segment describes a Note, check if PVH entry point is encoded.
274+ loader_result. pvh_entry_addr = parse_elf_note ( phdr, kernel_image) ?;
275+ }
250276 continue ;
251277 }
252278
@@ -280,6 +306,75 @@ impl KernelLoader for Elf {
280306 }
281307}
282308
309+ #[ cfg( feature = "elf" ) ]
310+ #[ cfg( any( target_arch = "x86" , target_arch = "x86_64" ) ) ]
311+ fn parse_elf_note < F > ( phdr : & elf:: Elf64_Phdr , kernel_image : & mut F ) -> Result < Option < GuestAddress > >
312+ where
313+ F : Read + Seek ,
314+ {
315+ let n_align = phdr. p_align ;
316+
317+ // Seek to the beginning of the note segment
318+ kernel_image
319+ . seek ( SeekFrom :: Start ( phdr. p_offset ) )
320+ . map_err ( |_| Error :: SeekNoteHeader ) ?;
321+
322+ // Now that the segment has been found, we must locate an ELF note with the
323+ // correct type that encodes the PVH entry point if there is one.
324+ let mut nhdr: elf:: Elf64_Nhdr = Default :: default ( ) ;
325+ let mut read_size: usize = 0 ;
326+
327+ while read_size < phdr. p_filesz as usize {
328+ unsafe {
329+ // read_struct is safe when reading a POD struct.
330+ // It can be used and dropped without issue.
331+ struct_util:: read_struct ( kernel_image, & mut nhdr) . map_err ( |_| Error :: ReadNoteHeader ) ?;
332+ }
333+ // If the note header found is not the desired one, keep reading until
334+ // the end of the segment
335+ if nhdr. n_type == elf:: XEN_ELFNOTE_PHYS32_ENTRY {
336+ break ;
337+ }
338+ // Skip the note header plus the size of its fields (with alignment)
339+ read_size += mem:: size_of :: < elf:: Elf64_Nhdr > ( )
340+ + align_up ( u64:: from ( nhdr. n_namesz ) , n_align)
341+ + align_up ( u64:: from ( nhdr. n_descsz ) , n_align) ;
342+
343+ kernel_image
344+ . seek ( SeekFrom :: Start ( phdr. p_offset + read_size as u64 ) )
345+ . map_err ( |_| Error :: SeekNoteHeader ) ?;
346+ }
347+
348+ if read_size >= phdr. p_filesz as usize {
349+ return Ok ( None ) ; // PVH ELF note not found, nothing else to do.
350+ }
351+ // Otherwise the correct note type was found.
352+ // The note header struct has already been read, so we can seek from the
353+ // current position and just skip the name field contents.
354+ kernel_image
355+ . seek ( SeekFrom :: Current (
356+ align_up ( u64:: from ( nhdr. n_namesz ) , n_align) as i64 ,
357+ ) )
358+ . map_err ( |_| Error :: SeekNoteHeader ) ?;
359+
360+ // The PVH entry point is a 32-bit address, so the descriptor field
361+ // must be capable of storing all such addresses.
362+ if ( nhdr. n_descsz as usize ) < mem:: size_of :: < u32 > ( ) {
363+ return Err ( Error :: InvalidPvhNote ) ;
364+ }
365+
366+ let mut pvh_addr_bytes = [ 0 ; mem:: size_of :: < u32 > ( ) ] ;
367+
368+ // Read 32-bit address stored in the PVH note descriptor field.
369+ kernel_image
370+ . read_exact ( & mut pvh_addr_bytes)
371+ . map_err ( |_| Error :: ReadNoteHeader ) ?;
372+
373+ Ok ( Some ( GuestAddress (
374+ u32:: from_le_bytes ( pvh_addr_bytes) . into ( ) ,
375+ ) ) )
376+ }
377+
283378#[ cfg( feature = "bzimage" ) ]
284379#[ cfg( any( target_arch = "x86" , target_arch = "x86_64" ) ) ]
285380/// Big zImage (bzImage) kernel image support.
@@ -409,6 +504,23 @@ pub fn load_cmdline<M: GuestMemory>(
409504 Ok ( ( ) )
410505}
411506
507+ /// Align address upwards. Taken from x86_64 crate:
508+ /// https://docs.rs/x86_64/latest/x86_64/fn.align_up.html
509+ ///
510+ /// Returns the smallest x with alignment `align` so that x >= addr. The alignment must be
511+ /// a power of 2.
512+ #[ cfg( feature = "elf" ) ]
513+ #[ cfg( any( target_arch = "x86" , target_arch = "x86_64" ) ) ]
514+ fn align_up ( addr : u64 , align : u64 ) -> usize {
515+ assert ! ( align. is_power_of_two( ) , "`align` must be a power of two" ) ;
516+ let align_mask = align - 1 ;
517+ if addr & align_mask == 0 {
518+ addr as usize // already aligned
519+ } else {
520+ ( ( addr | align_mask) + 1 ) as usize
521+ }
522+ }
523+
412524#[ cfg( test) ]
413525mod test {
414526 use super :: * ;
0 commit comments