Update dependencies and fix memory statistics.

Author: veluca93

pixie-uefi/Cargo.lock

@@ -16,16 +16,16 @@ coverage = ["dep:minicov"]
 anstyle = { version = "1.0.13", default-features = false }
 blake3 = { version = "1.8.2", default-features = false, features = ["prefer_intrinsics", "no_avx512", "pure"] }
 core_detect = "1.0.0"
-futures = { version = "0.3.29", default-features = false, features = ["alloc", "async-await"] }
+futures = { version = "0.3.31", default-features = false, features = ["alloc", "async-await"] }
 gpt_disk_io = "0.16.2"
 log = "0.4.28"
-lz4_flex = { version = "0.11.5", default-features = false }
+lz4_flex = { version = "0.12.0", default-features = false }
 managed = { version = "0.8.0", default-features = false, features = ["alloc"] }
 minicov = { version = "0.3.7", optional = true }
 postcard = { version = "1.1.3", default-features = false, features = ["alloc"] }
 smoltcp = { version = "0.12.0", default-features = false, features = ["alloc", "proto-ipv4", "medium-ethernet", "socket-udp", "socket-tcp", "socket-dhcpv4", "async", "socket-tcp-cubic"] }
 thingbuf = { version = "0.1.6", default-features = false, features = ["alloc"] }
-uefi = { version = "0.33.0", features = ["alloc", "global_allocator", "panic_handler"] }
+uefi = { version = "0.36.1", features = ["alloc", "global_allocator", "panic_handler"] }
 
 [dependencies.pixie-shared]
 path = "../pixie-shared"

pixie-uefi/Cargo.toml

@@ -1,7 +1,7 @@
 use crate::{
     os::{
         error::{Error, Result},
-        TcpStream, UefiOS, PACKET_SIZE,
+        memory, TcpStream, UefiOS, PACKET_SIZE,
     },
     MIN_MEMORY,
 };
@@ -167,11 +167,11 @@ pub async fn flash(os: UefiOS, server_addr: SocketAddrV4) -> Result<()> {
     let task1 = async {
         let tx = tx;
         let mut last_seen = Vec::new();
-        let total_mem = os.get_total_mem();
-        let max_chunks = (total_mem.saturating_sub(MIN_MEMORY) as usize / MAX_CHUNK_SIZE).max(128);
+        let free_mem = memory::stats().free;
+        let max_chunks = (free_mem.saturating_sub(MIN_MEMORY) as usize / MAX_CHUNK_SIZE).max(128);
         log::debug!(
-            "Total memory: {}. Max chunks in memory: {max_chunks}",
-            BytesFmt(total_mem)
+            "Free memory: {}. Max chunks in memory: {max_chunks}",
+            BytesFmt(free_mem)
         );
         while !chunks_info.is_empty() {
             let recv = Box::pin(socket.recv(&mut buf));

pixie-uefi/src/flash.rs

@@ -31,7 +31,8 @@ mod store;
 #[cfg(feature = "coverage")]
 mod export_cov;
 
-const MIN_MEMORY: u64 = 500 << 20;
+// Memory to keep free for non-chunk storage.
+const MIN_MEMORY: u64 = 32 << 20;
 
 async fn server_discover(os: UefiOS) -> Result<SocketAddrV4> {
     let socket = os.udp_bind(None).await?;

pixie-uefi/src/main.rs

@@ -0,0 +1,35 @@
+use uefi::{boot::MemoryType, mem::memory_map::MemoryMap};
+
+#[derive(Debug)]
+pub struct MemoryStats {
+    pub used: u64,
+    pub free: u64,
+    pub other: u64,
+}
+
+pub fn stats() -> MemoryStats {
+    let mut stats = MemoryStats {
+        used: 0,
+        free: 0,
+        other: 0,
+    };
+    const PAGE_SIZE: u64 = 4096;
+    uefi::boot::memory_map(MemoryType::LOADER_DATA)
+        .expect("Failed to get memory map")
+        .entries()
+        .for_each(|entry| {
+            let sz = entry.page_count * PAGE_SIZE;
+            match entry.ty {
+                MemoryType::LOADER_DATA | MemoryType::LOADER_CODE => {
+                    stats.used += sz;
+                }
+                MemoryType::CONVENTIONAL => {
+                    stats.free += sz;
+                }
+                _ => {
+                    stats.other += sz;
+                }
+            }
+        });
+    stats
+}

pixie-uefi/src/os/memory.rs

@@ -25,8 +25,7 @@ use core::{
 };
 use pixie_shared::util::BytesFmt;
 use uefi::{
-    boot::{EventType, MemoryType, ScopedProtocol, TimerTrigger, Tpl},
-    mem::memory_map::MemoryMap,
+    boot::{EventType, ScopedProtocol, TimerTrigger, Tpl},
     proto::{
         console::{
             serial::Serial,
@@ -47,6 +46,7 @@ mod boot_options;
 pub mod disk;
 pub mod error;
 mod executor;
+pub mod memory;
 mod net;
 mod sync;
 mod timer;
@@ -539,14 +539,6 @@ impl UefiOS {
     pub fn shutdown(&self) -> ! {
         uefi::runtime::reset(uefi::runtime::ResetType::SHUTDOWN, Status::SUCCESS, None)
     }
-
-    pub fn get_total_mem(&self) -> u64 {
-        uefi::boot::memory_map(MemoryType::LOADER_DATA)
-            .expect("Failed to get memory map")
-            .entries()
-            .map(|entry| entry.page_count * 4096)
-            .sum()
-    }
 }
 
 impl log::Log for UefiOS {