x86_64: make use of limine SMP feature

Now that we have switched to the limine boot protocol. We can make use
of the limine SMP feature to boot the APs for us. This means that we can
get rid of our SMP trampoline (this should make build times a bit
faster) and removes unwanted mess from the kernel which should be in the
bootloader (if a bootloader is responsible to boot the BSP then it
should be for the other APs as-well). We also remove the conventional
memory reservation (1st page which was before used to boot up the APs).

Limine ❤️!

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

aero.py

@@ -509,7 +509,7 @@ def run_in_emulator(args, iso_path):
     qemu_args = ['-cdrom', iso_path,
                  '-M', 'q35',
                  '-m', '9800M',
-                 '-smp', '5',
+                 '-smp', '1',
                  '-serial', 'stdio']
 
     if args.bios == 'uefi':

src/Cargo.lock

@@ -33,7 +33,7 @@ bit_field = "0.10.1"
 log = "0.4.14"
 raw-cpuid = "10.0.0"
 xmas-elf = "0.8.0"
-hashbrown = { version = "0.12.3" }
+hashbrown = "0.11.2"
 rustc-demangle = "0.1.20"
 intrusive-collections = "0.9.2"
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }

src/aero_kernel/Cargo.toml

@@ -23,7 +23,6 @@ use std::error::Error;
 use std::ffi::OsString;
 use std::fs::DirEntry;
 use std::path::Path;
-use std::process::Command;
 
 //this is all magic, yes dont ever let anyone see this shit
 
@@ -55,23 +54,6 @@ fn main() -> Result<(), Box<dyn Error>> {
         let path = entry.path();
 
         match path.extension() {
-            Some(ext) if ext.eq(&OsString::from("real")) => {
-                let object_os = path.file_name().expect("Failed to get file name");
-                let object_file = object_os.to_str().expect("Invalid UTF-8 for file name");
-
-                let success = Command::new("nasm")
-                    .arg("-f")
-                    .arg("bin")
-                    .arg("-o")
-                    .arg(format!("../target/{}.bin", object_file))
-                    .arg(format!("{}", path.display()))
-                    .status()
-                    .expect("Failed to assemble real source file")
-                    .success();
-
-                assert!(success);
-            }
-
             Some(ext) if ext.eq(&OsString::from("inc")) => {
                 let path = path
                     .to_str()

src/aero_kernel/build.rs

@@ -17,37 +17,17 @@
  * along with Aero. If not, see <https://www.gnu.org/licenses/>.
  */
 
-use core::alloc::Layout;
 use core::mem;
 
-use core::sync::atomic::Ordering;
-
-use alloc::alloc::alloc_zeroed;
-
 use alloc::vec::Vec;
-use bit_field::BitField;
 use spin::RwLock;
 
-use crate::apic;
-use crate::apic::ApicType;
-use crate::arch::controlregs;
-use crate::arch::interrupts;
-
 use crate::apic::IoApicHeader;
-use crate::apic::CPU_COUNT;
-use crate::mem::paging;
-use crate::utils::io;
 
 use super::sdt::Sdt;
 
 pub(super) const SIGNATURE: &str = "APIC";
 
-extern "C" {
-    fn smp_prepare_trampoline() -> u16;
-    fn smp_prepare_launch(page_table: u64, stack_top: u64, ap_id: u64, mode: u32);
-    fn smp_check_ap_flag() -> bool;
-}
-
 pub static IO_APICS: RwLock<Vec<&'static IoApicHeader>> = RwLock::new(Vec::new());
 pub static ISOS: RwLock<Vec<&'static MadtIntSrcOverride>> = RwLock::new(Vec::new());
 
@@ -60,106 +40,15 @@ pub struct Madt {
 
 impl Madt {
     pub(super) fn init(&'static self) {
-        return;
-        log::debug!("storing AP trampoline at 0x1000");
+        // log::debug!("storing AP trampoline at 0x1000");
 
-        let page_index = unsafe { smp_prepare_trampoline() };
+        // let page_index = unsafe { smp_prepare_trampoline() };
 
         for entry in self.iter() {
             match entry {
-                MadtEntry::LocalApic(local_apic) => {
-                    // Make sure that we can actually start the application processor.
-                    if (!((local_apic.flags & 1) ^ ((local_apic.flags >> 1) & 1))) == 1 {
-                        log::warn!("Unable to start AP{}", local_apic.apic_id);
-                        continue;
-                    }
-
-                    // Increase the CPU count.
-                    CPU_COUNT.fetch_add(1, Ordering::SeqCst);
-
-                    // Do not restart the BSP.
-                    if local_apic.apic_id == apic::get_bsp_id() as u8 {
-                        continue;
-                    }
-
-                    let page_table = controlregs::read_cr3_raw();
-                    let stack_top = unsafe {
-                        let layout = Layout::from_size_align_unchecked(4096 * 16, 4096);
-                        let raw = alloc_zeroed(layout);
-
-                        raw.add(layout.size())
-                    };
-
-                    let mode = if paging::level_5_paging_enabled() {
-                        1 << 1
-                    } else {
-                        0 << 1
-                    };
-
-                    unsafe {
-                        smp_prepare_launch(
-                            page_table,
-                            stack_top as u64,
-                            local_apic.apic_id as u64,
-                            mode,
-                        );
-                    }
-
-                    apic::mark_ap_ready(false);
-
-                    let mut bsp = apic::get_local_apic();
-
-                    // Send the init IPI.
-                    unsafe {
-                        if bsp.apic_type() == ApicType::X2apic {
-                            bsp.set_icr(((local_apic.apic_id as u64) << 32) | 0x4500);
-                        } else {
-                            let mut value = 0u64;
-
-                            value.set_bits(..32, (local_apic.apic_id as u64) << 24);
-                            value.set_bits(32.., 0x4500);
-
-                            bsp.set_icr(value);
-                        }
-                    }
-
-                    io::delay(5000);
-
-                    // Send the startup IPI.
-                    unsafe {
-                        if bsp.apic_type() == ApicType::X2apic {
-                            bsp.set_icr(
-                                ((local_apic.apic_id as u64) << 32) | (page_index | 0x4600) as u64,
-                            );
-                        } else {
-                            let mut value = 0u64;
-
-                            value.set_bits(..32, (local_apic.apic_id as u64) << 24);
-                            value.set_bits(32.., (page_index | 0x4600) as u64);
-
-                            bsp.set_icr(value);
-                        }
-                    }
-
-                    unsafe {
-                        // Wait for the AP to be ready.
-                        for _ in 0..100 {
-                            if smp_check_ap_flag() {
-                                break;
-                            }
-
-                            io::delay(10000)
-                        }
-                    }
-
-                    // Wait for the trampoline to be ready.
-                    while !apic::ap_ready() {
-                        interrupts::pause();
-                    }
-                }
-
                 MadtEntry::IoApic(e) => IO_APICS.write().push(e),
                 MadtEntry::IntSrcOverride(e) => ISOS.write().push(e),
+                _ => {}
             }
         }
     }