Merge pull request #907 from devsnek/smp-event

add event to smp

Author: nicholasbishop

CHANGELOG.md

@@ -13,6 +13,8 @@
   members now have upper-case names.
 - `FileSystem::try_exists` now returns `FileSystemResult<bool>`.
 - `FileSystem::copy` is now more efficient for large files.
+- `MpService::startup_all_aps` and `MpService::startup_this_ap` now accept an
+    optional `event` parameter to allow non-blocking operation.
 
 ## uefi-macros - [Unreleased]
 

uefi-test-runner/src/proto/pi/mp.rs

@@ -84,7 +84,7 @@ fn test_startup_all_aps(mps: &MpServices, bt: &BootServices) {
     // Ensure that APs start up
     let counter = AtomicUsize::new(0);
     let counter_ptr: *mut c_void = &counter as *const _ as *mut _;
-    mps.startup_all_aps(false, proc_increment_atomic, counter_ptr, None)
+    mps.startup_all_aps(false, proc_increment_atomic, counter_ptr, None, None)
         .unwrap();
     assert_eq!(counter.load(Ordering::Relaxed), NUM_CPUS - 1);
 
@@ -94,6 +94,7 @@ fn test_startup_all_aps(mps: &MpServices, bt: &BootServices) {
         false,
         proc_wait_100ms,
         bt_ptr,
+        None,
         Some(Duration::from_millis(50)),
     );
     assert_eq!(ret.map_err(|err| err.status()), Err(Status::TIMEOUT));
@@ -104,15 +105,21 @@ fn test_startup_this_ap(mps: &MpServices, bt: &BootServices) {
     let counter = AtomicUsize::new(0);
     let counter_ptr: *mut c_void = &counter as *const _ as *mut _;
     for i in 1..NUM_CPUS {
-        mps.startup_this_ap(i, proc_increment_atomic, counter_ptr, None)
+        mps.startup_this_ap(i, proc_increment_atomic, counter_ptr, None, None)
             .unwrap();
     }
     assert_eq!(counter.load(Ordering::Relaxed), NUM_CPUS - 1);
 
     // Make sure that timeout works for each AP
     let bt_ptr: *mut c_void = bt as *const _ as *mut _;
     for i in 1..NUM_CPUS {
-        let ret = mps.startup_this_ap(i, proc_wait_100ms, bt_ptr, Some(Duration::from_millis(50)));
+        let ret = mps.startup_this_ap(
+            i,
+            proc_wait_100ms,
+            bt_ptr,
+            None,
+            Some(Duration::from_millis(50)),
+        );
         assert_eq!(ret.map_err(|err| err.status()), Err(Status::TIMEOUT));
     }
 }

uefi/src/proto/pi/mp.rs

@@ -12,7 +12,7 @@
 //! * maintaining MP-related processor status
 
 use crate::proto::unsafe_protocol;
-use crate::{Result, Status, StatusExt};
+use crate::{data_types::Event, Result, Status, StatusExt};
 use bitflags::bitflags;
 use core::ffi::c_void;
 use core::ptr;
@@ -153,24 +153,30 @@ impl MpServices {
         (self.get_processor_info)(self, processor_number, &mut pi).to_result_with_val(|| pi)
     }
 
-    /// Executes provided function on all APs in blocking mode.
+    /// Executes provided function on all APs.
     pub fn startup_all_aps(
         &self,
         single_thread: bool,
         procedure: Procedure,
         procedure_argument: *mut c_void,
+        event: Option<Event>,
         timeout: Option<Duration>,
     ) -> Result {
         let timeout_arg = match timeout {
             Some(timeout) => timeout.as_micros().try_into().unwrap(),
             None => 0,
         };
 
+        let event_arg = match event {
+            Some(event) => event.as_ptr(),
+            None => ptr::null_mut(),
+        };
+
         (self.startup_all_aps)(
             self,
             procedure,
             single_thread,
-            ptr::null_mut(),
+            event_arg,
             timeout_arg,
             procedure_argument,
             ptr::null_mut(),
@@ -184,18 +190,24 @@ impl MpServices {
         processor_number: usize,
         procedure: Procedure,
         procedure_argument: *mut c_void,
+        event: Option<Event>,
         timeout: Option<Duration>,
     ) -> Result {
         let timeout_arg = match timeout {
             Some(timeout) => timeout.as_micros().try_into().unwrap(),
             None => 0,
         };
 
+        let event_arg = match event {
+            Some(event) => event.as_ptr(),
+            None => ptr::null_mut(),
+        };
+
         (self.startup_this_ap)(
             self,
             procedure,
             processor_number,
-            ptr::null_mut(),
+            event_arg,
             timeout_arg,
             procedure_argument,
             ptr::null_mut(),