Fix up tests

Author: hunhoffe

kernel/tests/s06_rackscale_tests.rs

@@ -562,9 +562,6 @@ fn s06_rackscale_shmem_request_core_remote_test() {
             output += p
                 .exp_string("Client finished processing core work request")?
                 .as_str();
-            output += p.exp_string("Client received no work.")?.as_str();
-            output += p.exp_string("Client received no work.")?.as_str();
-            output += p.exp_string("Client received no work.")?.as_str();
             p.process.exit()
         };
 
@@ -604,130 +601,3 @@ fn s06_rackscale_shmem_request_core_remote_test() {
 
     let _ignore = remove_file(SHMEM_PATH);
 }
-
-#[cfg(not(feature = "baremetal"))]
-#[test]
-fn s06_rackscale_spawn_test() {
-    use std::fs::remove_file;
-    use std::sync::Arc;
-    use std::thread::sleep;
-    use std::time::Duration;
-
-    // Setup ivshmem file
-    setup_shmem(SHMEM_PATH, SHMEM_SIZE);
-
-    setup_network(3);
-    let timeout = 30_000;
-
-    const TOTAL_CLIENT_CORES: usize = 3;
-
-    // Create build for both controller and client
-    let build = Arc::new(
-        BuildArgs::default()
-            .module("init")
-            .user_feature("test-scheduler-smp")
-            .kernel_feature("shmem")
-            .kernel_feature("ethernet")
-            .kernel_feature("rackscale")
-            .release()
-            .build(),
-    );
-
-    // Run DCM and controller in separate thread
-    let controller_build = build.clone();
-    let controller = std::thread::spawn(move || {
-        let cmdline_controller = RunnerArgs::new_with_build("userspace-smp", &controller_build)
-            .timeout(timeout)
-            .cmd("mode=controller transport=shmem")
-            .shmem_size(SHMEM_SIZE as usize)
-            .shmem_path(SHMEM_PATH)
-            .tap("tap0")
-            .no_network_setup()
-            .workers(3)
-            .use_vmxnet3();
-
-        let mut output = String::new();
-        let mut qemu_run = || -> Result<WaitStatus> {
-            let mut dcm = spawn_dcm(1, timeout)?;
-            let mut p = spawn_nrk(&cmdline_controller)?;
-
-            output += p.exp_eof()?.as_str();
-
-            dcm.send_control('c')?;
-            p.process.exit()
-        };
-
-        let _ignore = qemu_run();
-    });
-
-    sleep(Duration::from_millis(5_000));
-
-    // Run client in separate thead. Wait a bit to make sure DCM and controller started
-    let client1_build = build.clone();
-    let client = std::thread::spawn(move || {
-        let cmdline_client = RunnerArgs::new_with_build("userspace-smp", &client1_build)
-            .timeout(timeout)
-            .cmd("mode=client transport=shmem")
-            .shmem_size(SHMEM_SIZE as usize)
-            .shmem_path(SHMEM_PATH)
-            .tap("tap2")
-            .no_network_setup()
-            .workers(3)
-            .cores(2)
-            .memory(4096)
-            .use_vmxnet3();
-
-        let mut output = String::new();
-        let mut qemu_run = || -> Result<WaitStatus> {
-            let mut p = spawn_nrk(&cmdline_client)?;
-
-            // should get two requests for two cores
-            output += p
-                .exp_string("Client finished processing core work request")?
-                .as_str();
-            output += p
-                .exp_string("Client finished processing core work request")?
-                .as_str();
-
-            p.process.exit()
-        };
-        sleep(Duration::from_millis(10_000));
-
-        let _ignore = qemu_run();
-    });
-
-    // Run client in separate thead. Wait a bit to make sure DCM and controller started
-    let client2_build = build.clone();
-    let client2 = std::thread::spawn(move || {
-        let cmdline_client = RunnerArgs::new_with_build("userspace-smp", &client2_build)
-            .timeout(timeout)
-            .cmd("mode=client transport=shmem")
-            .shmem_size(SHMEM_SIZE as usize)
-            .shmem_path(SHMEM_PATH)
-            .tap("tap4")
-            .no_network_setup()
-            .workers(3)
-            .nobuild() // Use build from previous client for consistency
-            .use_vmxnet3();
-
-        let mut output = String::new();
-        let mut qemu_run = || -> Result<WaitStatus> {
-            let mut p = spawn_nrk(&cmdline_client)?;
-
-            for _i in 0..TOTAL_CLIENT_CORES {
-                let r = p.exp_regex(r#"init: Hello from core (\d+)"#)?;
-                output += r.0.as_str();
-                output += r.1.as_str();
-            }
-            p.process.kill(SIGTERM)
-        };
-
-        check_for_successful_exit(&cmdline_client, qemu_run(), output);
-    });
-
-    controller.join().unwrap();
-    client.join().unwrap();
-    client2.join().unwrap();
-
-    let _ignore = remove_file(SHMEM_PATH);
-}

usr/init/src/init.rs

@@ -150,54 +150,34 @@ fn request_core_remote_test() {
     let s = &vibrio::upcalls::PROCESS_SCHEDULER;
 
     let threads = vibrio::syscalls::System::threads().expect("Can't get system topology");
-    info!("Threads are: {:?}", threads);
 
-    /*
-    for thread in threads.iter() {
-        if thread.id != 0 {
-            let r = vibrio::syscalls::Process::request_core(
-                thread.id,
-                VAddr::from(vibrio::upcalls::upcall_while_enabled as *const fn() as u64),
-            );
-            match r {
-                Ok(ctoken) => {
-                    info!("Spawned core on {:?} <-> {}", ctoken, thread.id);
-                }
-                Err(_e) => {
-                    panic!("Failed to spawn to core {}", thread.id);
-                }
+    // Only ask for more cores on the machine with only 1 core
+    if threads.len() == 1 {
+        let HW_THREAD_ID = 1;
+        match vibrio::syscalls::Process::request_core(
+            HW_THREAD_ID,
+            VAddr::from(vibrio::upcalls::upcall_while_enabled as *const fn() as u64),
+        ) {
+            Ok(_) => {
+                info!("request_core_remote_test OK");
+            }
+            Err(e) => {
+                error!("Can't spawn on {:?}: {:?}", HW_THREAD_ID, e);
             }
         }
+    } else {
+        // Run scheduler on core 0
+        let scb: SchedulerControlBlock = SchedulerControlBlock::new(0);
+        loop {
+            s.run(&scb);
+        }
     }
-
-    for thread in threads {
-        s.spawn(
-            32 * 4096,
-            move |_| {
-                info!(
-                    "Hello from core {}",
-                    lineup::tls2::Environment::scheduler().core_id
-                );
-            },
-            ptr::null_mut(),
-            thread.id,
-            None,
-        );
-    }
-
-    // Run scheduler on core 0
-    let scb: SchedulerControlBlock = SchedulerControlBlock::new(0);
-    loop {
-        s.run(&scb);
-    }
-    */
 }
 
 fn scheduler_smp_test() {
     let s = &vibrio::upcalls::PROCESS_SCHEDULER;
 
     let threads = vibrio::syscalls::System::threads().expect("Can't get system topology");
-    info!("Threads are: {:?}", threads);
 
     for thread in threads.iter() {
         if thread.id != 0 {