Merge pull request #1101 from DragonOS-Community/revert-1097-merge-network-refactor

Revert "Merge Master"

Author: Samuka007

.vscode/settings.json

@@ -144,7 +144,7 @@
     "rust-analyzer.checkOnSave.allTargets": false,
     "rust-analyzer.linkedProjects": [
         "./kernel/Cargo.toml",
-        //"./tools/Cargo.toml",
+        "./tools/Cargo.toml",
 
     ],
     // "rust-analyzer.cargo.target": "riscv64gc-unknown-none-elf",
@@ -154,5 +154,4 @@
         "check",
 
     ],
-    "makefile.configureOnOpen": false,
 }

build-scripts/kernel_build/src/cfiles/arch/x86_64.rs

@@ -31,7 +31,6 @@ impl CFilesArch for X86_64CFilesArch {
         files.insert(PathBuf::from("src/arch/x86_64/asm/head.S"));
         files.insert(PathBuf::from("src/arch/x86_64/asm/entry.S"));
         files.insert(PathBuf::from("src/arch/x86_64/asm/apu_boot.S"));
-        files.insert(PathBuf::from("src/arch/x86_64/vm/vmx/vmenter.S"));
     }
 
     fn setup_global_flags(&self, c: &mut Build) {

kernel/crates/bitmap/src/alloc_bitmap.rs

@@ -4,7 +4,7 @@ use alloc::vec::Vec;
 
 use crate::{bitmap_core::BitMapCore, traits::BitMapOps};
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct AllocBitmap {
     elements: usize,
     data: Vec<usize>,
@@ -26,10 +26,6 @@ impl AllocBitmap {
             self.data[i] &= rhs.data[i];
         }
     }
-
-    pub fn data(&self) -> &[usize] {
-        &self.data
-    }
 }
 
 impl BitMapOps<usize> for AllocBitmap {

kernel/crates/bitmap/src/bitmap_core.rs

@@ -3,7 +3,7 @@ use core::{intrinsics::unlikely, marker::PhantomData};
 use crate::traits::BitOps;
 
 #[derive(Debug, Clone)]
-pub struct BitMapCore<T: BitOps> {
+pub(crate) struct BitMapCore<T: BitOps> {
     phantom: PhantomData<T>,
 }
 
@@ -15,7 +15,7 @@ impl<T: BitOps> BitMapCore<T> {
     }
 
     /// 获取位图中的某一位
-    pub fn get(&self, n: usize, data: &[T], index: usize) -> Option<bool> {
+    pub(crate) fn get(&self, n: usize, data: &[T], index: usize) -> Option<bool> {
         if unlikely(index >= n) {
             return None;
         }
@@ -30,7 +30,7 @@ impl<T: BitOps> BitMapCore<T> {
     }
 
     /// 设置位图中的某一位
-    pub fn set(&self, n: usize, data: &mut [T], index: usize, value: bool) -> Option<bool> {
+    pub(crate) fn set(&self, n: usize, data: &mut [T], index: usize, value: bool) -> Option<bool> {
         if unlikely(index >= n) {
             return None;
         }
@@ -43,7 +43,7 @@ impl<T: BitOps> BitMapCore<T> {
         Some(bit)
     }
 
-    pub fn set_all(&self, n: usize, data: &mut [T], value: bool) {
+    pub(crate) fn set_all(&self, n: usize, data: &mut [T], value: bool) {
         let val = if value { T::max() } else { T::zero() };
         for element in data.iter_mut() {
             *element = val;
@@ -58,7 +58,7 @@ impl<T: BitOps> BitMapCore<T> {
     }
 
     /// 获取位图中第一个为1的位
-    pub fn first_index(&self, data: &[T]) -> Option<usize> {
+    pub(crate) fn first_index(&self, data: &[T]) -> Option<usize> {
         for (i, element) in data.iter().enumerate() {
             let bit = <T as BitOps>::first_index(element);
             if let Some(b) = bit {
@@ -70,7 +70,7 @@ impl<T: BitOps> BitMapCore<T> {
     }
 
     /// 获取位图中第一个为0的位
-    pub fn first_false_index(&self, n: usize, data: &[T]) -> Option<usize> {
+    pub(crate) fn first_false_index(&self, n: usize, data: &[T]) -> Option<usize> {
         for (i, element) in data.iter().enumerate() {
             if let Some(bit) = <T as BitOps>::first_false_index(element) {
                 return self.make_index(n, i * T::bit_size() + bit);
@@ -81,7 +81,7 @@ impl<T: BitOps> BitMapCore<T> {
     }
 
     /// 获取位图中最后一个为1的位
-    pub fn last_index(&self, n: usize, data: &[T]) -> Option<usize> {
+    pub(crate) fn last_index(&self, n: usize, data: &[T]) -> Option<usize> {
         for (i, element) in data.iter().enumerate().rev() {
             if let Some(bit) = <T as BitOps>::last_index(element) {
                 return self.make_index(n, i * T::bit_size() + bit);
@@ -97,7 +97,7 @@ impl<T: BitOps> BitMapCore<T> {
     ///
     /// - `data`：位图数据
     /// - `n`：位图有效位数
-    pub fn last_false_index(&self, n: usize, data: &[T]) -> Option<usize> {
+    pub(crate) fn last_false_index(&self, n: usize, data: &[T]) -> Option<usize> {
         let mut iter = data.iter().rev();
         let mut last_element = *iter.next()?;
 
@@ -123,7 +123,7 @@ impl<T: BitOps> BitMapCore<T> {
     }
 
     /// 获取位图中下一个为1的位
-    pub fn next_index(&self, n: usize, data: &[T], index: usize) -> Option<usize> {
+    pub(crate) fn next_index(&self, n: usize, data: &[T], index: usize) -> Option<usize> {
         if unlikely(index >= n) {
             return None;
         }
@@ -146,7 +146,7 @@ impl<T: BitOps> BitMapCore<T> {
     }
 
     /// 获取位图中下一个为0的位
-    pub fn next_false_index(&self, n: usize, data: &[T], index: usize) -> Option<usize> {
+    pub(crate) fn next_false_index(&self, n: usize, data: &[T], index: usize) -> Option<usize> {
         if unlikely(index >= n) {
             return None;
         }
@@ -169,7 +169,7 @@ impl<T: BitOps> BitMapCore<T> {
     }
 
     /// 获取位图中上一个为1的位
-    pub fn prev_index(&self, n: usize, data: &[T], index: usize) -> Option<usize> {
+    pub(crate) fn prev_index(&self, n: usize, data: &[T], index: usize) -> Option<usize> {
         if unlikely(index >= n) {
             return None;
         }
@@ -190,7 +190,7 @@ impl<T: BitOps> BitMapCore<T> {
         None
     }
 
-    pub fn prev_false_index(&self, n: usize, data: &[T], index: usize) -> Option<usize> {
+    pub(crate) fn prev_false_index(&self, n: usize, data: &[T], index: usize) -> Option<usize> {
         let element_index = index / T::bit_size();
         let bit_index = index % T::bit_size();
 
@@ -208,7 +208,7 @@ impl<T: BitOps> BitMapCore<T> {
         None
     }
 
-    pub fn invert(&self, n: usize, data: &mut [T]) {
+    pub(crate) fn invert(&self, n: usize, data: &mut [T]) {
         for element in data.iter_mut() {
             <T as BitOps>::invert(element);
         }
@@ -222,7 +222,7 @@ impl<T: BitOps> BitMapCore<T> {
         }
     }
 
-    pub fn is_full(&self, n: usize, data: &[T]) -> bool {
+    pub(crate) fn is_full(&self, n: usize, data: &[T]) -> bool {
         let mut iter = data.iter().peekable();
         while let Some(element) = iter.next() {
             if iter.peek().is_none() {
@@ -245,7 +245,7 @@ impl<T: BitOps> BitMapCore<T> {
         return false;
     }
 
-    pub fn is_empty(&self, data: &[T]) -> bool {
+    pub(crate) fn is_empty(&self, data: &[T]) -> bool {
         for element in data.iter() {
             if element != &T::zero() {
                 return false;

kernel/crates/bitmap/src/lib.rs

@@ -13,5 +13,4 @@ mod bitmap_core;
 mod static_bitmap;
 pub mod traits;
 pub use alloc_bitmap::AllocBitmap;
-pub use bitmap_core::BitMapCore;
 pub use static_bitmap::StaticBitmap;

kernel/src/arch/x86_64/kvm/vmx/mmu.rs

@@ -88,7 +88,7 @@ fn tdp_get_cr3(_vcpu: &VmxVcpu) -> u64 {
     return guest_cr3;
 }
 
-pub fn tdp_set_eptp(root_hpa: u64) -> Result<(), SystemError> {
+fn tdp_set_eptp(root_hpa: u64) -> Result<(), SystemError> {
     // 设置权限位，目前是写死的，可读可写可执行
     //  EPT paging-structure memory type: Uncacheable
     let mut eptp = 0x0_u64;

kernel/src/arch/x86_64/kvm/vmx/vcpu.rs

@@ -501,7 +501,7 @@ pub fn get_segment_base(gdt_base: *const u64, gdt_size: u16, segment_selector: u
 // }
 pub fn adjust_vmx_controls(ctl_min: u32, ctl_opt: u32, msr: u32, result: &mut u32) {
     let vmx_msr_low: u32 = unsafe { (msr::rdmsr(msr) & 0x0000_0000_FFFF_FFFF) as u32 };
-    let vmx_msr_high: u32 = unsafe { (msr::rdmsr(msr) >> 32) as u32 };
+    let vmx_msr_high: u32 = unsafe { (msr::rdmsr(msr) << 32) as u32 };
     let mut ctl: u32 = ctl_min | ctl_opt;
     ctl &= vmx_msr_high; /* bit == 0 in high word ==> must be zero */
     ctl |= vmx_msr_low; /* bit == 1 in low word  ==> must be one  */

kernel/src/arch/x86_64/kvm/vmx/vmexit.rs

@@ -264,7 +264,7 @@ extern "C" fn vmexit_handler() {
 }
 
 #[no_mangle]
-pub fn adjust_rip(rip: u64) -> Result<(), SystemError> {
+fn adjust_rip(rip: u64) -> Result<(), SystemError> {
     let instruction_length = vmx_vmread(VmcsFields::VMEXIT_INSTR_LEN as u32)?;
     vmx_vmwrite(VmcsFields::GUEST_RIP as u32, rip + instruction_length)?;
     Ok(())

kernel/src/arch/x86_64/mm/mod.rs

@@ -439,15 +439,6 @@ impl X86_64MMArch {
         // 不支持的原因是，目前好像没有能正确的设置page-level的xd位，会触发page fault
         return true;
     }
-
-    pub unsafe fn read_array<T>(addr: VirtAddr, count: usize) -> Vec<T> {
-        // 实现读取数组逻辑
-        let mut vec = Vec::with_capacity(count);
-        for i in 0..count {
-            vec.push(Self::read(addr + i * core::mem::size_of::<T>()));
-        }
-        vec
-    }
 }
 
 impl VirtAddr {

kernel/src/arch/x86_64/mod.rs

@@ -20,7 +20,6 @@ pub mod sched;
 pub mod smp;
 pub mod syscall;
 pub mod time;
-pub mod vm;
 
 pub use self::pci::pci::X86_64PciArch as PciArch;
 
@@ -41,12 +40,3 @@ pub use crate::arch::elf::X86_64ElfArch as CurrentElfArch;
 pub use crate::arch::smp::X86_64SMPArch as CurrentSMPArch;
 
 pub use crate::arch::sched::X86_64SchedArch as CurrentSchedArch;
-
-pub use crate::arch::vm::KvmArchManager as CurrentKvmManager;
-
-pub use crate::arch::vm::kvm_host::X86KvmArch as KvmArch;
-
-pub use crate::arch::vm::x86_kvm_ops as kvm_arch_ops;
-
-pub use crate::arch::vm::kvm_host::vcpu::X86VcpuArch as VirtCpuArch;
-pub use crate::arch::vm::kvm_host::KvmVcpuStat as VirtCpuStat;