diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-03-30 17:55:55 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-03-30 17:55:55 +0200 |
| commit | 80972f1e0e6b6d409cc4d86202608c22e5ee3e5a (patch) | |
| tree | 3465f890980bdcb8b296cadb8d0aa0fc4c0cace4 | |
| parent | 754bb802ba377c19be97d092c4b2afe542de20b5 (diff) | |
executor,sync: add support for turbo-wakers.
This is a `core` patch to make wakers 1 word (the task pointer) instead of 2 (task pointer + vtable). It allows having the "waker optimization" we had a while back on `WakerRegistration/AtomicWaker`, but EVERYWHERE, without patching all crates.
Advantages:
- Less memory usage.
- Faster.
- `AtomicWaker` can actually use atomics to load/store the waker, No critical section needed.
- No `dyn` call, which means `cargo-call-stack` can now see through wakes.
Disadvantages:
- You have to patch `core`...
- Breaks all executors and other things that create wakers, unless they opt in to using the new `from_ptr` API.
How to use:
- Run this shell script to patch `core`. https://gist.github.com/Dirbaio/c67da7cf318515181539122c9d32b395
- Enable `build-std`
- Enable `build-std-features = core/turbowakers`
- Enable feature `turbowakers` in `embassy-executor`, `embassy-sync`.
- Make sure you have no other crate creating wakers other than `embassy-executor`. These will panic at runtime.
Note that the patched `core` is equivalent to the unpached one when the `turbowakers` feature is not enabled, so it should be fine to leave it there.
| -rw-r--r-- | embassy-executor/Cargo.toml | 2 | ||||
| -rw-r--r-- | embassy-executor/src/raw/mod.rs | 1 | ||||
| -rw-r--r-- | embassy-executor/src/raw/waker_turbo.rs | 34 | ||||
| -rw-r--r-- | embassy-sync/Cargo.toml | 1 | ||||
| -rw-r--r-- | embassy-sync/src/waitqueue/atomic_waker.rs | 41 | ||||
| -rw-r--r-- | embassy-sync/src/waitqueue/atomic_waker_turbo.rs | 30 | ||||
| -rw-r--r-- | embassy-sync/src/waitqueue/mod.rs | 8 | ||||
| -rw-r--r-- | embassy-sync/src/waitqueue/waker_registration.rs (renamed from embassy-sync/src/waitqueue/waker.rs) | 40 |
8 files changed, 115 insertions, 42 deletions
diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml index c2868eb98..8ad3fd698 100644 --- a/embassy-executor/Cargo.toml +++ b/embassy-executor/Cargo.toml | |||
| @@ -38,6 +38,8 @@ wasm = ["dep:wasm-bindgen", "dep:js-sys"] | |||
| 38 | # Enable nightly-only features | 38 | # Enable nightly-only features |
| 39 | nightly = [] | 39 | nightly = [] |
| 40 | 40 | ||
| 41 | turbowakers = [] | ||
| 42 | |||
| 41 | integrated-timers = ["dep:embassy-time"] | 43 | integrated-timers = ["dep:embassy-time"] |
| 42 | 44 | ||
| 43 | # Trace interrupt invocations with rtos-trace. | 45 | # Trace interrupt invocations with rtos-trace. |
diff --git a/embassy-executor/src/raw/mod.rs b/embassy-executor/src/raw/mod.rs index 15ff18fc8..72c367c33 100644 --- a/embassy-executor/src/raw/mod.rs +++ b/embassy-executor/src/raw/mod.rs | |||
| @@ -11,6 +11,7 @@ mod run_queue; | |||
| 11 | #[cfg(feature = "integrated-timers")] | 11 | #[cfg(feature = "integrated-timers")] |
| 12 | mod timer_queue; | 12 | mod timer_queue; |
| 13 | pub(crate) mod util; | 13 | pub(crate) mod util; |
| 14 | #[cfg_attr(feature = "turbowakers", path = "waker_turbo.rs")] | ||
| 14 | mod waker; | 15 | mod waker; |
| 15 | 16 | ||
| 16 | use core::future::Future; | 17 | use core::future::Future; |
diff --git a/embassy-executor/src/raw/waker_turbo.rs b/embassy-executor/src/raw/waker_turbo.rs new file mode 100644 index 000000000..435a0ff7e --- /dev/null +++ b/embassy-executor/src/raw/waker_turbo.rs | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | use core::ptr::NonNull; | ||
| 2 | use core::task::Waker; | ||
| 3 | |||
| 4 | use super::{wake_task, TaskHeader, TaskRef}; | ||
| 5 | |||
| 6 | pub(crate) unsafe fn from_task(p: TaskRef) -> Waker { | ||
| 7 | Waker::from_turbo_ptr(NonNull::new_unchecked(p.as_ptr() as _)) | ||
| 8 | } | ||
| 9 | |||
| 10 | /// Get a task pointer from a waker. | ||
| 11 | /// | ||
| 12 | /// This can be used as an optimization in wait queues to store task pointers | ||
| 13 | /// (1 word) instead of full Wakers (2 words). This saves a bit of RAM and helps | ||
| 14 | /// avoid dynamic dispatch. | ||
| 15 | /// | ||
| 16 | /// You can use the returned task pointer to wake the task with [`wake_task`](super::wake_task). | ||
| 17 | /// | ||
| 18 | /// # Panics | ||
| 19 | /// | ||
| 20 | /// Panics if the waker is not created by the Embassy executor. | ||
| 21 | pub fn task_from_waker(waker: &Waker) -> TaskRef { | ||
| 22 | let ptr = waker.as_turbo_ptr().as_ptr(); | ||
| 23 | |||
| 24 | // safety: our wakers are always created with `TaskRef::as_ptr` | ||
| 25 | unsafe { TaskRef::from_ptr(ptr as *const TaskHeader) } | ||
| 26 | } | ||
| 27 | |||
| 28 | #[inline(never)] | ||
| 29 | #[no_mangle] | ||
| 30 | fn _turbo_wake(ptr: NonNull<()>) { | ||
| 31 | // safety: our wakers are always created with `TaskRef::as_ptr` | ||
| 32 | let task = unsafe { TaskRef::from_ptr(ptr.as_ptr() as *const TaskHeader) }; | ||
| 33 | wake_task(task) | ||
| 34 | } | ||
diff --git a/embassy-sync/Cargo.toml b/embassy-sync/Cargo.toml index 7b5d3ce48..e4871e718 100644 --- a/embassy-sync/Cargo.toml +++ b/embassy-sync/Cargo.toml | |||
| @@ -25,6 +25,7 @@ features = ["nightly"] | |||
| 25 | [features] | 25 | [features] |
| 26 | nightly = ["embedded-io/async"] | 26 | nightly = ["embedded-io/async"] |
| 27 | std = [] | 27 | std = [] |
| 28 | turbowakers = [] | ||
| 28 | 29 | ||
| 29 | [dependencies] | 30 | [dependencies] |
| 30 | defmt = { version = "0.3", optional = true } | 31 | defmt = { version = "0.3", optional = true } |
diff --git a/embassy-sync/src/waitqueue/atomic_waker.rs b/embassy-sync/src/waitqueue/atomic_waker.rs new file mode 100644 index 000000000..63fe04a6e --- /dev/null +++ b/embassy-sync/src/waitqueue/atomic_waker.rs | |||
| @@ -0,0 +1,41 @@ | |||
| 1 | use core::cell::Cell; | ||
| 2 | use core::task::Waker; | ||
| 3 | |||
| 4 | use crate::blocking_mutex::raw::CriticalSectionRawMutex; | ||
| 5 | use crate::blocking_mutex::Mutex; | ||
| 6 | |||
| 7 | /// Utility struct to register and wake a waker. | ||
| 8 | pub struct AtomicWaker { | ||
| 9 | waker: Mutex<CriticalSectionRawMutex, Cell<Option<Waker>>>, | ||
| 10 | } | ||
| 11 | |||
| 12 | impl AtomicWaker { | ||
| 13 | /// Create a new `AtomicWaker`. | ||
| 14 | pub const fn new() -> Self { | ||
| 15 | Self { | ||
| 16 | waker: Mutex::const_new(CriticalSectionRawMutex::new(), Cell::new(None)), | ||
| 17 | } | ||
| 18 | } | ||
| 19 | |||
| 20 | /// Register a waker. Overwrites the previous waker, if any. | ||
| 21 | pub fn register(&self, w: &Waker) { | ||
| 22 | critical_section::with(|cs| { | ||
| 23 | let cell = self.waker.borrow(cs); | ||
| 24 | cell.set(match cell.replace(None) { | ||
| 25 | Some(w2) if (w2.will_wake(w)) => Some(w2), | ||
| 26 | _ => Some(w.clone()), | ||
| 27 | }) | ||
| 28 | }) | ||
| 29 | } | ||
| 30 | |||
| 31 | /// Wake the registered waker, if any. | ||
| 32 | pub fn wake(&self) { | ||
| 33 | critical_section::with(|cs| { | ||
| 34 | let cell = self.waker.borrow(cs); | ||
| 35 | if let Some(w) = cell.replace(None) { | ||
| 36 | w.wake_by_ref(); | ||
| 37 | cell.set(Some(w)); | ||
| 38 | } | ||
| 39 | }) | ||
| 40 | } | ||
| 41 | } | ||
diff --git a/embassy-sync/src/waitqueue/atomic_waker_turbo.rs b/embassy-sync/src/waitqueue/atomic_waker_turbo.rs new file mode 100644 index 000000000..5c6a96ec8 --- /dev/null +++ b/embassy-sync/src/waitqueue/atomic_waker_turbo.rs | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | use core::ptr; | ||
| 2 | use core::ptr::NonNull; | ||
| 3 | use core::sync::atomic::{AtomicPtr, Ordering}; | ||
| 4 | use core::task::Waker; | ||
| 5 | |||
| 6 | /// Utility struct to register and wake a waker. | ||
| 7 | pub struct AtomicWaker { | ||
| 8 | waker: AtomicPtr<()>, | ||
| 9 | } | ||
| 10 | |||
| 11 | impl AtomicWaker { | ||
| 12 | /// Create a new `AtomicWaker`. | ||
| 13 | pub const fn new() -> Self { | ||
| 14 | Self { | ||
| 15 | waker: AtomicPtr::new(ptr::null_mut()), | ||
| 16 | } | ||
| 17 | } | ||
| 18 | |||
| 19 | /// Register a waker. Overwrites the previous waker, if any. | ||
| 20 | pub fn register(&self, w: &Waker) { | ||
| 21 | self.waker.store(w.as_turbo_ptr().as_ptr() as _, Ordering::Release); | ||
| 22 | } | ||
| 23 | |||
| 24 | /// Wake the registered waker, if any. | ||
| 25 | pub fn wake(&self) { | ||
| 26 | if let Some(ptr) = NonNull::new(self.waker.load(Ordering::Acquire)) { | ||
| 27 | unsafe { Waker::from_turbo_ptr(ptr) }.wake(); | ||
| 28 | } | ||
| 29 | } | ||
| 30 | } | ||
diff --git a/embassy-sync/src/waitqueue/mod.rs b/embassy-sync/src/waitqueue/mod.rs index 6661a6b61..6b0b0c64e 100644 --- a/embassy-sync/src/waitqueue/mod.rs +++ b/embassy-sync/src/waitqueue/mod.rs | |||
| @@ -1,7 +1,11 @@ | |||
| 1 | //! Async low-level wait queues | 1 | //! Async low-level wait queues |
| 2 | 2 | ||
| 3 | mod waker; | 3 | #[cfg_attr(feature = "turbowakers", path = "atomic_waker_turbo.rs")] |
| 4 | pub use waker::*; | 4 | mod atomic_waker; |
| 5 | pub use atomic_waker::*; | ||
| 6 | |||
| 7 | mod waker_registration; | ||
| 8 | pub use waker_registration::*; | ||
| 5 | 9 | ||
| 6 | mod multi_waker; | 10 | mod multi_waker; |
| 7 | pub use multi_waker::*; | 11 | pub use multi_waker::*; |
diff --git a/embassy-sync/src/waitqueue/waker.rs b/embassy-sync/src/waitqueue/waker_registration.rs index 9ce94a089..9b666e7c4 100644 --- a/embassy-sync/src/waitqueue/waker.rs +++ b/embassy-sync/src/waitqueue/waker_registration.rs | |||
| @@ -1,10 +1,6 @@ | |||
| 1 | use core::cell::Cell; | ||
| 2 | use core::mem; | 1 | use core::mem; |
| 3 | use core::task::Waker; | 2 | use core::task::Waker; |
| 4 | 3 | ||
| 5 | use crate::blocking_mutex::raw::CriticalSectionRawMutex; | ||
| 6 | use crate::blocking_mutex::Mutex; | ||
| 7 | |||
| 8 | /// Utility struct to register and wake a waker. | 4 | /// Utility struct to register and wake a waker. |
| 9 | #[derive(Debug, Default)] | 5 | #[derive(Debug, Default)] |
| 10 | pub struct WakerRegistration { | 6 | pub struct WakerRegistration { |
| @@ -54,39 +50,3 @@ impl WakerRegistration { | |||
| 54 | self.waker.is_some() | 50 | self.waker.is_some() |
| 55 | } | 51 | } |
| 56 | } | 52 | } |
| 57 | |||
| 58 | /// Utility struct to register and wake a waker. | ||
| 59 | pub struct AtomicWaker { | ||
| 60 | waker: Mutex<CriticalSectionRawMutex, Cell<Option<Waker>>>, | ||
| 61 | } | ||
| 62 | |||
| 63 | impl AtomicWaker { | ||
| 64 | /// Create a new `AtomicWaker`. | ||
| 65 | pub const fn new() -> Self { | ||
| 66 | Self { | ||
| 67 | waker: Mutex::const_new(CriticalSectionRawMutex::new(), Cell::new(None)), | ||
| 68 | } | ||
| 69 | } | ||
| 70 | |||
| 71 | /// Register a waker. Overwrites the previous waker, if any. | ||
| 72 | pub fn register(&self, w: &Waker) { | ||
| 73 | critical_section::with(|cs| { | ||
| 74 | let cell = self.waker.borrow(cs); | ||
| 75 | cell.set(match cell.replace(None) { | ||
| 76 | Some(w2) if (w2.will_wake(w)) => Some(w2), | ||
| 77 | _ => Some(w.clone()), | ||
| 78 | }) | ||
| 79 | }) | ||
| 80 | } | ||
| 81 | |||
| 82 | /// Wake the registered waker, if any. | ||
| 83 | pub fn wake(&self) { | ||
| 84 | critical_section::with(|cs| { | ||
| 85 | let cell = self.waker.borrow(cs); | ||
| 86 | if let Some(w) = cell.replace(None) { | ||
| 87 | w.wake_by_ref(); | ||
| 88 | cell.set(Some(w)); | ||
| 89 | } | ||
| 90 | }) | ||
| 91 | } | ||
| 92 | } | ||
