forked from fjall-rs/lsm-tree
-
Notifications
You must be signed in to change notification settings - Fork 1
perf(fs): O_DIRECT foundation — AlignedBuf + FsOpenOptions::direct_io (#133 phase 2) #310
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
dcdb482
feat(fs): add AlignedBuf primitive for O_DIRECT I/O
polaz 12e2cd5
feat(fs): add FsOpenOptions::direct_io flag + wire O_DIRECT into StdF…
polaz 38b65f5
docs(fs): clarify AlignedBuf invariant + direct_io arch gating
polaz 4da075d
Merge branch 'main' into perf/#133-direct-io
polaz a752eff
refactor(fs): extract O_DIRECT flag application + sharpen AlignedBuf …
polaz 1157c00
refactor(fs): rename AlignedBuf::spare_capacity_mut → as_capacity_mut
polaz f64b24a
docs(fs): explain std-only status of direct_io module
polaz 2a0b4c3
docs(fs): cross-reference direct_io std-only rationale at declaration…
polaz 218bbd9
refactor(fs): non_exhaustive FsOpenOptions + strict-provenance ptr + …
polaz 16ffee2
Merge branch 'main' into perf/#133-direct-io
polaz e1eedf9
refactor(fs): make aligned_buf module private
polaz b6b98c3
Merge branch 'main' into perf/#133-direct-io
polaz d085229
Merge branch 'main' into perf/#133-direct-io
polaz acbc393
docs(fs): explain non_exhaustive choice on FsOpenOptions inline
polaz a745ec1
refactor(fs): gate direct_io submodule behind feature = "std"
polaz b3d5fef
docs(fs): align direct_io std-gate rationale with current state
polaz 57018b3
docs(fs): disambiguate FsOpenOptions::direct_io intra-doc links to th…
polaz a07a07a
Merge branch 'main' into perf/#133-direct-io
polaz 163c665
refactor(fs): gate apply_direct_io_flag call sites to match direct_io…
polaz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,396 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // Copyright (c) 2026-present, Structured World Foundation | ||
|
|
||
| //! Heap-allocated byte buffer with caller-specified alignment. | ||
| //! | ||
| //! `AlignedBuf` exists for the `O_DIRECT` I/O path: Linux requires | ||
| //! both the file offset and the userspace buffer to be aligned to | ||
| //! the filesystem's logical block size (typically 512 B on legacy | ||
| //! disks, 4 KiB on Advanced Format SSDs). A `Vec<u8>` is aligned | ||
| //! to `align_of::<u8>() = 1`, so an unaligned write to an | ||
| //! `O_DIRECT` file errors with `EINVAL`. | ||
| //! | ||
| //! This wrapper exists exclusively for the `O_DIRECT` pairing | ||
| //! (#133 Phase 2). Normal cached I/O has no alignment requirement | ||
| //! and should keep using `Vec<u8>` / `BytesMut` — using | ||
| //! `AlignedBuf` there would waste the extra alignment slack with | ||
| //! no benefit. | ||
|
|
||
| use core::alloc::Layout; | ||
| use core::ptr::NonNull; | ||
| use core::slice; | ||
|
|
||
| /// A heap-allocated byte buffer aligned to a caller-specified | ||
| /// boundary. | ||
| /// | ||
| /// Used for the `O_DIRECT` I/O path where kernel alignment | ||
| /// requirements (typically 4 KiB) exceed `Vec<u8>`'s default | ||
| /// `align_of::<u8>() = 1`. | ||
| /// | ||
| /// # Invariants | ||
| /// | ||
| /// - `ptr` is always non-null. When `capacity > 0`, it points to a | ||
| /// region of at least `capacity` bytes allocated via the global | ||
| /// allocator with `Layout::from_size_align(capacity, alignment)`. | ||
| /// When `capacity == 0`, it is a non-dereferenceable dangling | ||
| /// sentinel synthesised from the requested alignment (see | ||
| /// `new_zeroed` for the special-case path) — `len == 0` always | ||
| /// holds in that case, so the sentinel is never dereferenced. | ||
| /// - `len <= capacity`. | ||
| /// - `alignment` is a power of two ≥ 1 and ≤ `isize::MAX as usize` | ||
| /// (enforced at construction). | ||
| /// - `capacity` is an integer multiple of `alignment` (rounded up | ||
| /// at construction from the caller's requested size). The | ||
| /// multiplier itself is NOT required to be a power of two — e.g. | ||
| /// `new_zeroed(9000, 4096)` yields `capacity = 12288 = 3 × 4096`. | ||
| /// | ||
| /// # `Send` + `Sync` | ||
| /// | ||
| /// The raw pointer doesn't carry any cross-thread state; the | ||
| /// buffer's bytes are owned, immobile until `Drop`, and only | ||
| /// reachable via `&self` / `&mut self`. So `Send` + `Sync` are | ||
| /// both safe. | ||
| pub struct AlignedBuf { | ||
| /// Non-null pointer to the start of the aligned allocation. | ||
| ptr: NonNull<u8>, | ||
| /// Number of bytes currently written (`<= capacity`). | ||
| len: usize, | ||
| /// Number of bytes allocated. | ||
| capacity: usize, | ||
| /// Alignment boundary the allocation satisfies (power of two). | ||
| alignment: usize, | ||
| } | ||
|
|
||
| // SAFETY: AlignedBuf owns its allocation; the raw pointer doesn't | ||
| // alias anything else and is only reachable through &self / &mut | ||
| // self. Sending the buffer to another thread is sound; concurrent | ||
| // shared access through &self is sound (the bytes are immutable | ||
| // behind a shared reference). | ||
| #[expect( | ||
| unsafe_code, | ||
| reason = "raw-pointer wrapper; Send/Sync soundness justified" | ||
| )] | ||
| unsafe impl Send for AlignedBuf {} | ||
| #[expect( | ||
| unsafe_code, | ||
| reason = "raw-pointer wrapper; Send/Sync soundness justified" | ||
| )] | ||
| unsafe impl Sync for AlignedBuf {} | ||
|
|
||
| impl AlignedBuf { | ||
| /// Allocates a zero-initialised buffer of `capacity` bytes | ||
| /// aligned to `alignment`. `capacity` is rounded up to the | ||
| /// next multiple of `alignment` so the trailing slack is | ||
| /// large enough for aligned writes that consume the whole | ||
| /// buffer. | ||
| /// | ||
| /// # Errors | ||
| /// | ||
| /// Returns `None` if: | ||
| /// - `alignment` is not a power of two, OR | ||
| /// - `alignment > isize::MAX as usize`, OR | ||
| /// - the rounded-up capacity overflows `isize::MAX as usize`, OR | ||
| /// - the global allocator fails (returns null). | ||
| /// | ||
| /// # Examples | ||
| /// | ||
| /// ``` | ||
| /// use lsm_tree::fs::AlignedBuf; | ||
| /// let buf = AlignedBuf::new_zeroed(8192, 4096).unwrap(); | ||
| /// assert_eq!(buf.capacity(), 8192); | ||
| /// assert_eq!(buf.as_ptr().addr() % 4096, 0); | ||
| /// ``` | ||
| #[must_use] | ||
| pub fn new_zeroed(capacity: usize, alignment: usize) -> Option<Self> { | ||
| if !alignment.is_power_of_two() { | ||
| return None; | ||
| } | ||
| if alignment > (isize::MAX as usize) { | ||
| return None; | ||
| } | ||
| // Round up so the trailing slack is large enough for an | ||
| // aligned write that consumes the whole capacity. | ||
| let rounded = capacity.checked_add(alignment - 1)? & !(alignment - 1); | ||
| if rounded > (isize::MAX as usize) { | ||
| return None; | ||
| } | ||
| // `alloc::alloc::alloc(layout)` requires `layout.size() > 0` | ||
| // — calling it with a zero-size layout is UB per the trait | ||
| // docs (Layout itself accepts size==0, but the allocator | ||
| // call does not). Std handles this for `Vec<T>` etc. by | ||
| // using `NonNull::dangling()` internally; we do the same | ||
| // here but synthesise the sentinel from the caller's | ||
| // requested alignment so `as_ptr().addr() % alignment == 0` | ||
| // still holds for zero-capacity buffers. The sentinel is | ||
| // never dereferenced — every read/write path is bounded by | ||
| // `len`, which is 0 here. | ||
| if rounded == 0 { | ||
| // SAFETY: alignment is a power of two ≥ 1, so the | ||
| // resulting pointer is non-null and properly aligned. | ||
| // `without_provenance_mut` constructs an address-only | ||
| // pointer (no provenance, no associated allocation) — | ||
| // exactly right for a sentinel that must never be | ||
| // dereferenced. We never deref past `len = 0`. Strict- | ||
| // provenance-friendly: avoids the integer-to-pointer | ||
| // cast lint by using the canonical exposed-address API. | ||
| let dangling = { | ||
| #[expect(unsafe_code, reason = "non-null dangling for 0-cap buffer")] | ||
| unsafe { | ||
| NonNull::new_unchecked(core::ptr::without_provenance_mut::<u8>(alignment)) | ||
| } | ||
|
polaz marked this conversation as resolved.
|
||
| }; | ||
| return Some(Self { | ||
| ptr: dangling, | ||
| len: 0, | ||
| capacity: 0, | ||
| alignment, | ||
| }); | ||
| } | ||
| let layout = Layout::from_size_align(rounded, alignment).ok()?; | ||
| // SAFETY: layout was just validated; alloc_zeroed is safe to | ||
| // call for any valid non-zero layout. Returns null on OOM, | ||
| // which we surface as None. | ||
| #[expect(unsafe_code, reason = "global allocator call with validated layout")] | ||
| let raw = unsafe { alloc::alloc::alloc_zeroed(layout) }; | ||
| let ptr = NonNull::new(raw)?; | ||
| Some(Self { | ||
| ptr, | ||
| len: 0, | ||
| capacity: rounded, | ||
| alignment, | ||
| }) | ||
| } | ||
|
|
||
| /// Number of bytes currently written. | ||
| #[must_use] | ||
| pub const fn len(&self) -> usize { | ||
| self.len | ||
| } | ||
|
|
||
| /// Buffer capacity in bytes (`>= len`, rounded up to a | ||
| /// multiple of `alignment` at construction time). | ||
| #[must_use] | ||
| pub const fn capacity(&self) -> usize { | ||
| self.capacity | ||
| } | ||
|
|
||
| /// Alignment the allocation was constructed with (power of two). | ||
| #[must_use] | ||
| pub const fn alignment(&self) -> usize { | ||
| self.alignment | ||
| } | ||
|
|
||
| /// `true` when `len == 0`. | ||
| #[must_use] | ||
| pub const fn is_empty(&self) -> bool { | ||
| self.len == 0 | ||
| } | ||
|
|
||
| /// Raw const pointer to the buffer's first byte. Stable across | ||
| /// the lifetime of `self` (no reallocation). Valid for reads | ||
| /// of `len` bytes. | ||
| #[must_use] | ||
| pub const fn as_ptr(&self) -> *const u8 { | ||
| self.ptr.as_ptr().cast_const() | ||
| } | ||
|
|
||
| /// Raw mut pointer to the buffer's first byte. Valid for | ||
| /// writes of `capacity` bytes. | ||
| #[must_use] | ||
| pub const fn as_mut_ptr(&mut self) -> *mut u8 { | ||
| self.ptr.as_ptr() | ||
| } | ||
|
|
||
| /// Shared slice over the currently-written `len` bytes. | ||
| #[must_use] | ||
| pub const fn as_slice(&self) -> &[u8] { | ||
| // SAFETY: `ptr` is valid for reads of `capacity >= len` | ||
| // bytes by invariant; the lifetime is tied to `&self`. | ||
| #[expect(unsafe_code, reason = "slice over owned aligned allocation")] | ||
| unsafe { | ||
| slice::from_raw_parts(self.ptr.as_ptr(), self.len) | ||
| } | ||
| } | ||
|
|
||
| /// Mut slice over the FULL `capacity` — including bytes already | ||
| /// in the `0..len` written region. | ||
| /// | ||
| /// Named `as_capacity_mut` (not `spare_capacity_mut`) because | ||
| /// `spare_capacity` in `Vec` / `BytesMut` means the tail | ||
| /// `len..capacity` only. This method intentionally exposes the | ||
| /// entire allocation: `O_DIRECT` kernel reads need to overwrite | ||
| /// already-buffered bytes when refilling a recycled buffer, so | ||
| /// the right primitive is "full buffer", not "tail beyond len". | ||
| /// | ||
| /// Caller is responsible for updating `len` via | ||
| /// [`Self::set_len`] after writing. | ||
| #[must_use] | ||
| pub const fn as_capacity_mut(&mut self) -> &mut [u8] { | ||
| // SAFETY: `ptr` is valid for writes of `capacity` bytes by | ||
| // invariant; the lifetime is tied to `&mut self`. | ||
| #[expect(unsafe_code, reason = "mut slice over owned aligned allocation")] | ||
| unsafe { | ||
| slice::from_raw_parts_mut(self.ptr.as_ptr(), self.capacity) | ||
| } | ||
| } | ||
|
|
||
| /// Updates the written-bytes count. | ||
| /// | ||
| /// # Panics | ||
| /// | ||
| /// Panics if `new_len > capacity`. | ||
| pub const fn set_len(&mut self, new_len: usize) { | ||
| assert!( | ||
| new_len <= self.capacity, | ||
| "AlignedBuf::set_len exceeds capacity", | ||
| ); | ||
| self.len = new_len; | ||
| } | ||
|
|
||
| /// Resets `len` to 0 without touching the allocation. | ||
| pub const fn clear(&mut self) { | ||
| self.len = 0; | ||
| } | ||
| } | ||
|
|
||
| impl Drop for AlignedBuf { | ||
| fn drop(&mut self) { | ||
| if self.capacity == 0 { | ||
| // Dangling sentinel from `new_zeroed(0, _)`; nothing to | ||
| // free. | ||
| return; | ||
| } | ||
| // SAFETY: layout reproduces the one used at allocation; | ||
| // `ptr` was obtained from the global allocator with that | ||
| // exact layout and hasn't been freed yet (Drop runs once). | ||
| // The unwrap_or_else fast-paths the impossible case | ||
| // (Layout was valid at construction; we never mutate | ||
| // capacity / alignment after) without panicking — Drop | ||
| // panics during unwinding would abort the process. | ||
| let Ok(layout) = Layout::from_size_align(self.capacity, self.alignment) else { | ||
| // Unreachable: invariants enforced at construction | ||
| // guarantee Layout::from_size_align succeeds here. | ||
| // Skipping dealloc leaks `capacity` bytes — preferable | ||
| // to aborting if the invariant ever drifts. | ||
| return; | ||
| }; | ||
| #[expect(unsafe_code, reason = "matched dealloc for owned allocation")] | ||
| unsafe { | ||
| alloc::alloc::dealloc(self.ptr.as_ptr(), layout); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| #[expect(clippy::unwrap_used, reason = "test assertions")] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| #[test] | ||
| fn new_zeroed_4k_aligned() { | ||
| let buf = AlignedBuf::new_zeroed(8192, 4096).unwrap(); | ||
| assert_eq!(buf.capacity(), 8192); | ||
| assert_eq!(buf.len(), 0); | ||
| assert_eq!(buf.alignment(), 4096); | ||
| assert_eq!(buf.as_ptr().addr() % 4096, 0, "pointer not 4 KiB aligned"); | ||
| assert!(buf.is_empty()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn new_zeroed_rounds_capacity_up_to_alignment() { | ||
| // 5000 bytes requested at 4 KiB alignment → rounded to 8 KiB. | ||
| let buf = AlignedBuf::new_zeroed(5000, 4096).unwrap(); | ||
| assert_eq!(buf.capacity(), 8192); | ||
| // Already a multiple → no rounding. | ||
| let buf = AlignedBuf::new_zeroed(8192, 4096).unwrap(); | ||
| assert_eq!(buf.capacity(), 8192); | ||
| } | ||
|
|
||
| #[test] | ||
| fn new_zeroed_returns_zeroed_memory() { | ||
| let mut buf = AlignedBuf::new_zeroed(4096, 4096).unwrap(); | ||
| // `as_capacity_mut` covers the full capacity — safe API, | ||
| // no need for raw-pointer slicing in tests. | ||
| let cap = buf.as_capacity_mut(); | ||
| assert!(cap.iter().all(|&b| b == 0)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn new_zeroed_rejects_non_power_of_two_alignment() { | ||
| assert!(AlignedBuf::new_zeroed(4096, 3000).is_none()); | ||
| assert!(AlignedBuf::new_zeroed(4096, 0).is_none()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn new_zeroed_rejects_excessive_alignment() { | ||
| // isize::MAX + 1 is a power of two but exceeds the cap. | ||
| assert!(AlignedBuf::new_zeroed(4096, (isize::MAX as usize) + 1).is_none()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn new_zeroed_zero_capacity_returns_dangling() { | ||
| // Zero-byte AlignedBuf is allowed and never touches the | ||
| // allocator; the dangling sentinel must still satisfy the | ||
| // alignment promise so callers that pass it to FFI don't | ||
| // surprise the kernel. | ||
| let buf = AlignedBuf::new_zeroed(0, 4096).unwrap(); | ||
| assert_eq!(buf.capacity(), 0); | ||
| assert_eq!(buf.as_ptr().addr() % 4096, 0); | ||
| assert!(buf.as_slice().is_empty()); | ||
| } | ||
|
|
||
| #[test] | ||
| fn set_len_grows_visible_slice() { | ||
| let mut buf = AlignedBuf::new_zeroed(4096, 4096).unwrap(); | ||
| assert_eq!(buf.as_slice().len(), 0); | ||
| buf.set_len(1024); | ||
| assert_eq!(buf.as_slice().len(), 1024); | ||
| assert_eq!(buf.len(), 1024); | ||
| } | ||
|
|
||
| #[test] | ||
| #[should_panic(expected = "AlignedBuf::set_len exceeds capacity")] | ||
| fn set_len_panics_past_capacity() { | ||
| let mut buf = AlignedBuf::new_zeroed(4096, 4096).unwrap(); | ||
| buf.set_len(buf.capacity() + 1); | ||
| } | ||
|
|
||
| #[test] | ||
| fn clear_resets_len_but_preserves_capacity() { | ||
| let mut buf = AlignedBuf::new_zeroed(4096, 4096).unwrap(); | ||
| buf.set_len(2048); | ||
| buf.clear(); | ||
| assert_eq!(buf.len(), 0); | ||
| assert_eq!(buf.capacity(), 4096); | ||
| } | ||
|
|
||
| #[test] | ||
| fn as_capacity_mut_covers_full_capacity() { | ||
| let mut buf = AlignedBuf::new_zeroed(4096, 4096).unwrap(); | ||
| let cap = buf.as_capacity_mut(); | ||
| assert_eq!(cap.len(), 4096); | ||
| *cap.first_mut().unwrap() = 0xAB; | ||
| *cap.last_mut().unwrap() = 0xCD; | ||
| buf.set_len(4096); | ||
| let slice = buf.as_slice(); | ||
| assert_eq!(slice.first().copied(), Some(0xAB)); | ||
| assert_eq!(slice.last().copied(), Some(0xCD)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn send_sync_compile_check() { | ||
| fn assert_send_sync<T: Send + Sync>() {} | ||
| assert_send_sync::<AlignedBuf>(); | ||
| } | ||
|
|
||
| #[test] | ||
| fn pointer_stays_stable_across_writes() { | ||
| let mut buf = AlignedBuf::new_zeroed(4096, 4096).unwrap(); | ||
| let initial = buf.as_ptr(); | ||
| // Write some content + set_len; pointer must not move | ||
| // (no reallocation: AlignedBuf has no growth API). | ||
| *buf.as_capacity_mut().first_mut().unwrap() = 1; | ||
| buf.set_len(1); | ||
| assert_eq!(buf.as_ptr(), initial); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.