From 3658940260a4282f4c3559708caf5a1606eb5789 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 25 Dec 2023 23:35:37 +0800 Subject: [PATCH] kernel: add `big-heap` flag for running tests When running Rust tests, a larger heap is needed. Add a kernel flag to support this by default. Signed-off-by: Sean Cross --- kernel/Cargo.toml | 1 + kernel/src/services.rs | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 2d3a2fbd1..4b1497ac1 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -49,6 +49,7 @@ gdb-stub = ["gdbstub", "gdbstub_arch"] print-panics = [] report-memory = ["stats_alloc"] wrap-print = [] +big-heap = [] # Cause heaps to start at 12 MM instead of 512 kB v2p = ["xous-kernel/v2p"] # patches for simulation targets ONLY. Applying these flags will result in totally broken security. diff --git a/kernel/src/services.rs b/kernel/src/services.rs index acd828aed..2042968e5 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -219,7 +219,11 @@ impl Default for ProcessInner { mem_message_last: arch::mem::DEFAULT_MESSAGE_BASE, mem_heap_base: arch::mem::DEFAULT_HEAP_BASE, mem_heap_size: 0, - mem_heap_max: 524_288, + mem_heap_max: if cfg!("big-heap") { + 1024 * 1024 * 12 + } else { + 1024 * 512 + }, connection_map: [None; 32], pid: unsafe { PID::new_unchecked(1) }, _reserved: [0; 1],