pvmfw: Integrate buddy_system_allocator
Add support for heap allocation.
Test: atest MicrodroidTestApp
Change-Id: I6b4df790b3cd86fe29db87dd312d5c671548e607
diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index b644905..71bac72 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -9,6 +9,7 @@
srcs: ["src/main.rs"],
edition: "2021",
rustlibs: [
+ "libbuddy_system_allocator",
"liblog_rust_nostd",
"libpvmfw_embedded_key",
"libvmbase",
diff --git a/pvmfw/src/entry.rs b/pvmfw/src/entry.rs
index 1ea95bc..dc2087d 100644
--- a/pvmfw/src/entry.rs
+++ b/pvmfw/src/entry.rs
@@ -14,6 +14,7 @@
//! Low-level entry and exit points of pvmfw.
+use crate::heap;
use crate::helpers;
use crate::mmio_guard;
use core::arch::asm;
@@ -52,6 +53,10 @@
// - only access MMIO once (and while) it has been mapped and configured
// - only perform logging once the logger has been initialized
// - only access non-pvmfw memory once (and while) it has been mapped
+
+ // SAFETY - This function should and will only be called once, here.
+ unsafe { heap::init() };
+
logger::init(LevelFilter::Info).map_err(|_| RebootReason::InternalError)?;
const FDT_MAX_SIZE: usize = helpers::SIZE_2MB;
diff --git a/pvmfw/src/heap.rs b/pvmfw/src/heap.rs
new file mode 100644
index 0000000..bfa8320
--- /dev/null
+++ b/pvmfw/src/heap.rs
@@ -0,0 +1,26 @@
+// Copyright 2022, The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Heap implementation.
+
+use buddy_system_allocator::LockedHeap;
+
+#[global_allocator]
+static HEAP_ALLOCATOR: LockedHeap<32> = LockedHeap::<32>::new();
+
+static mut HEAP: [u8; 65536] = [0; 65536];
+
+pub unsafe fn init() {
+ HEAP_ALLOCATOR.lock().init(HEAP.as_mut_ptr() as usize, HEAP.len());
+}
diff --git a/pvmfw/src/main.rs b/pvmfw/src/main.rs
index 870172d..c0bb263 100644
--- a/pvmfw/src/main.rs
+++ b/pvmfw/src/main.rs
@@ -16,10 +16,12 @@
#![no_main]
#![no_std]
+#![feature(default_alloc_error_handler)]
mod avb;
mod entry;
mod exceptions;
+mod heap;
mod helpers;
mod mmio_guard;
mod smccc;