move some code to fdt

Author: szy

src/vmm/config.rs

@@ -17,12 +17,7 @@ use fdt_parser::Fdt;
 #[cfg(target_arch = "aarch64")]
 use alloc::vec::Vec;
 
-use alloc::collections::BTreeMap;
 use alloc::sync::Arc;
-use lazyinit::LazyInit;
-use spin::Mutex;
-
-pub static GENERATED_DTB_CACHE: LazyInit<Mutex<BTreeMap<usize, Arc<[u8]>>>> = LazyInit::new();
 
 #[allow(clippy::module_inception)]
 pub mod config {
@@ -121,11 +116,13 @@ pub fn get_developer_provided_dtb(
     None
 }
 
-pub fn get_vm_dtb_arc(vm_cfg: &AxVMConfig) -> Option<Arc<[u8]>> {
-    if let Some(cache) = GENERATED_DTB_CACHE.get() {
-        let cache_lock = cache.lock();
-        if let Some(dtb) = cache_lock.get(&vm_cfg.id()) {
-            return Some(dtb.clone());
+pub fn get_vm_dtb_arc(_vm_cfg: &AxVMConfig) -> Option<Arc<[u8]>> {
+    #[cfg(target_arch = "aarch64")]
+    {
+        let cache_lock = dtb_cache().lock();
+        if let Some(dtb) = cache_lock.get(&_vm_cfg.id()) {
+            // Convert Vec<u8> to Arc<[u8]>
+            return Some(Arc::from(dtb.as_slice()));
         }
     }
     None
@@ -165,7 +162,11 @@ fn handle_fdt_operations(vm_config: &mut AxVMConfig, vm_create_config: &AxVMCrat
 }
 
 pub fn init_guest_vms() {
-    GENERATED_DTB_CACHE.init_once(Mutex::new(BTreeMap::new()));
+    // Initialize the DTB cache in the fdt module
+    #[cfg(target_arch = "aarch64")]
+    {
+        init_dtb_cache();
+    }
 
     // First try to get configs from filesystem if fs feature is enabled
     let mut gvm_raw_configs = config::filesystem_vm_configs();

src/vmm/fdt/create.rs

@@ -1,6 +1,5 @@
 use alloc::{
     string::{String, ToString},
-    sync::Arc,
     vec::Vec,
 };
 use core::ptr::NonNull;
@@ -99,17 +98,7 @@ pub fn crate_guest_fdt(
     fdt_writer.finish().unwrap()
 }
 
-/// Generate guest FDT cache the result
-/// # Return Value
-/// Returns the generated DTB data and stores it in the global cache
-pub fn crate_guest_fdt_with_cache(dtb_data: Vec<u8>, crate_config: &AxVMCrateConfig) {
-    // Store data in global cache
-    if let Some(cache) = crate::vmm::config::GENERATED_DTB_CACHE.get() {
-        let mut cache_lock = cache.lock();
-        let dtb_arc: Arc<[u8]> = Arc::from(dtb_data);
-        cache_lock.insert(crate_config.base.id, dtb_arc);
-    }
-}
+// 移除了 crate_guest_fdt_with_cache 函数，因为它现在在 mod.rs 中实现
 
 /// Node processing action enumeration
 enum NodeAction {

src/vmm/fdt/mod.rs

@@ -8,8 +8,36 @@ mod device;
 mod parser;
 mod print;
 
+use alloc::collections::BTreeMap;
+use alloc::vec::Vec;
+use axvm::config::AxVMCrateConfig;
+use lazyinit::LazyInit;
+use spin::Mutex;
+
 // Re-export public functions
 pub use parser::*;
 // pub use print::print_fdt;
 pub use create::*;
 pub use device::build_node_path;
+
+// DTB cache for generated device trees
+static GENERATED_DTB_CACHE: LazyInit<Mutex<BTreeMap<usize, Vec<u8>>>> = LazyInit::new();
+
+/// Initialize the DTB cache
+pub fn init_dtb_cache() {
+    GENERATED_DTB_CACHE.init_once(Mutex::new(BTreeMap::new()));
+}
+
+/// Get reference to the DTB cache
+pub fn dtb_cache() -> &'static Mutex<BTreeMap<usize, Vec<u8>>> {
+    GENERATED_DTB_CACHE.get().unwrap()
+}
+
+/// Generate guest FDT cache the result
+/// # Return Value
+/// Returns the generated DTB data and stores it in the global cache
+pub fn crate_guest_fdt_with_cache(dtb_data: Vec<u8>, crate_config: &AxVMCrateConfig) {
+    // Store data in global cache
+    let mut cache_lock = dtb_cache().lock();
+    cache_lock.insert(crate_config.base.id, dtb_data);
+}

src/vmm/fdt/parser.rs

@@ -4,6 +4,7 @@ use alloc::{string::ToString, vec::Vec};
 use axvm::config::{AxVMConfig, AxVMCrateConfig, PassThroughDeviceConfig};
 use fdt_parser::{Fdt, FdtHeader, PciRange, PciSpace};
 
+use crate::vmm::fdt::crate_guest_fdt_with_cache;
 use crate::vmm::fdt::create::update_cpu_node;
 
 pub fn get_host_fdt() -> &'static [u8] {
@@ -40,7 +41,8 @@ pub fn setup_guest_fdt_from_vmm(
     let passthrough_device_names = super::device::find_all_passthrough_devices(vm_cfg, &fdt);
 
     let dtb_data = super::create::crate_guest_fdt(&fdt, &passthrough_device_names, crate_config);
-    super::create::crate_guest_fdt_with_cache(dtb_data, crate_config);
+    // 调用新的 crate_guest_fdt_with_cache 函数
+    crate_guest_fdt_with_cache(dtb_data, crate_config);
 }
 
 pub fn set_phys_cpu_sets(vm_cfg: &mut AxVMConfig, fdt: &Fdt, crate_config: &AxVMCrateConfig) {
@@ -375,5 +377,5 @@ pub fn update_provided_fdt(provided_dtb: &[u8], host_dtb: &[u8], crate_config: &
     let host_fdt = Fdt::from_bytes(host_dtb)
         .expect("Failed to parse DTB image, perhaps the DTB is invalid or corrupted");
     let provided_dtb_data = update_cpu_node(&provided_fdt, &host_fdt, crate_config);
-    super::create::crate_guest_fdt_with_cache(provided_dtb_data, crate_config);
+    crate_guest_fdt_with_cache(provided_dtb_data, crate_config);
 }