Skip to content

Add more states for each node #1

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.

Sign up for GitHub

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

Open
lucido-simon wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add more states for each node #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b1127b
feat: add more memory types
lucido-simon Mar 24, 2023
5555cfc
feat: add method to get all flatten nodes
lucido-simon Mar 24, 2023
2d5c1bf
feat: add public getters for inner node
lucido-simon Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 60 additions & 30 deletions src/address_allocator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//! This module implements an allocation strategies for memory slots in an
//! address space (for example MMIO and PIO).

use crate::allocation_engine::IntervalTree;
use crate::allocation_engine::{InnerNode, IntervalTree, NodeState};
use crate::{AllocPolicy, Constraint, Error, RangeInclusive, Result};

// Internal representation of AddressAllocator. Contains the managed address
Expand Down Expand Up @@ -61,16 +61,22 @@ impl AddressAllocator {
size: u64,
alignment: u64,
policy: AllocPolicy,
node_state: NodeState,
) -> Result<RangeInclusive> {
let constraint = Constraint::new(size, alignment, policy)?;
self.interval_tree.allocate(constraint)
self.interval_tree.allocate(constraint, node_state)
}

/// Deletes the specified memory slot or returns `ResourceNotAvailable` if
/// the node was not allocated before.
pub fn free(&mut self, key: &RangeInclusive) -> Result<()> {
self.interval_tree.free(key)
}

/// Get all the allocated memory slots.
pub fn allocated_slots(&self) -> Vec<&InnerNode> {
self.interval_tree.allocated_slots()
}
}

#[cfg(test)]
Expand All @@ -81,21 +87,26 @@ mod tests {
fn test_regression_exact_match_length_check() {
let mut pool = AddressAllocator::new(0x0, 0x2000).unwrap();
let res = pool
.allocate(0x1000, 0x1000, AllocPolicy::ExactMatch(0x1000))
.allocate(
0x1000,
0x1000,
AllocPolicy::ExactMatch(0x1000),
NodeState::Ram,
)
.unwrap();
assert_eq!(
pool.allocate(0x0, 0x1000, AllocPolicy::FirstMatch)
pool.allocate(0x0, 0x1000, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap_err(),
Error::InvalidSize(0x0)
);
assert_eq!(
pool.allocate(0x1000, 0x1000, AllocPolicy::ExactMatch(0x3))
pool.allocate(0x1000, 0x1000, AllocPolicy::ExactMatch(0x3), NodeState::Ram)
.unwrap_err(),
Error::UnalignedAddress
);
assert_eq!(res, RangeInclusive::new(0x1000, 0x1FFF).unwrap());
let res = pool
.allocate(0x1000, 0x1000, AllocPolicy::ExactMatch(0x0))
.allocate(0x1000, 0x1000, AllocPolicy::ExactMatch(0x0), NodeState::Ram)
.unwrap();
assert_eq!(res, RangeInclusive::new(0x0, 0x0FFF).unwrap());
}
Expand All @@ -120,7 +131,7 @@ mod tests {
fn test_allocate_fails_alignment_zero() {
let mut pool = AddressAllocator::new(0x1000, 0x10000).unwrap();
assert_eq!(
pool.allocate(0x100, 0, AllocPolicy::FirstMatch)
pool.allocate(0x100, 0, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap_err(),
Error::InvalidAlignment
);
Expand All @@ -130,7 +141,7 @@ mod tests {
fn test_allocate_fails_alignment_non_power_of_two() {
let mut pool = AddressAllocator::new(0x1000, 0x10000).unwrap();
assert_eq!(
pool.allocate(0x100, 200, AllocPolicy::FirstMatch)
pool.allocate(0x100, 200, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap_err(),
Error::InvalidAlignment
);
Expand All @@ -140,16 +151,17 @@ mod tests {
fn test_allocate_fails_not_enough_space() {
let mut pool = AddressAllocator::new(0x1000, 0x1000).unwrap();
assert_eq!(
pool.allocate(0x800, 0x100, AllocPolicy::LastMatch).unwrap(),
pool.allocate(0x800, 0x100, AllocPolicy::LastMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x1800, 0x1FFF).unwrap()
);
assert_eq!(
pool.allocate(0x900, 0x100, AllocPolicy::FirstMatch)
pool.allocate(0x900, 0x100, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap_err(),
Error::ResourceNotAvailable
);
assert_eq!(
pool.allocate(0x400, 0x100, AllocPolicy::FirstMatch)
pool.allocate(0x400, 0x100, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x1000, 0x13FF).unwrap()
);
Expand All @@ -159,17 +171,18 @@ mod tests {
fn test_allocate_with_alignment_first_ok() {
let mut pool = AddressAllocator::new(0x1000, 0x1000).unwrap();
assert_eq!(
pool.allocate(0x110, 0x100, AllocPolicy::FirstMatch)
pool.allocate(0x110, 0x100, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x1000, 0x110F).unwrap()
);
assert_eq!(
pool.allocate(0x100, 0x100, AllocPolicy::FirstMatch)
pool.allocate(0x100, 0x100, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x1200, 0x12FF).unwrap()
);
assert_eq!(
pool.allocate(0x10, 0x100, AllocPolicy::FirstMatch).unwrap(),
pool.allocate(0x10, 0x100, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x1300, 0x130F).unwrap()
);
}
Expand All @@ -179,19 +192,19 @@ mod tests {
let mut pool_reverse = AddressAllocator::new(0x1000, 0x10000).unwrap();
assert_eq!(
pool_reverse
.allocate(0x110, 0x100, AllocPolicy::LastMatch)
.allocate(0x110, 0x100, AllocPolicy::LastMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x10E00, 0x10F0F).unwrap()
);
assert_eq!(
pool_reverse
.allocate(0x100, 0x100, AllocPolicy::LastMatch)
.allocate(0x100, 0x100, AllocPolicy::LastMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x10D00, 0x10DFF).unwrap()
);
assert_eq!(
pool_reverse
.allocate(0x10, 0x100, AllocPolicy::LastMatch)
.allocate(0x10, 0x100, AllocPolicy::LastMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x10C00, 0x10C0F).unwrap()
);
Expand All @@ -202,27 +215,42 @@ mod tests {
let mut pool = AddressAllocator::new(0x1000, 0x1000).unwrap();
// First range is [0x1000:0x17FF]
assert_eq!(
pool.allocate(0x800, 0x100, AllocPolicy::FirstMatch)
pool.allocate(0x800, 0x100, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x1000, 0x17FF).unwrap()
);
// Second range is [0x1A00:0x1BFF]
assert_eq!(
pool.allocate(0x200, 0x100, AllocPolicy::ExactMatch(0x1A00))
.unwrap(),
pool.allocate(
0x200,
0x100,
AllocPolicy::ExactMatch(0x1A00),
NodeState::Ram
)
.unwrap(),
RangeInclusive::new(0x1A00, 0x1BFF).unwrap()
);
// There is 0x200 between the first 2 ranges.
// We ask for an available address but the range is too big
assert_eq!(
pool.allocate(0x800, 0x100, AllocPolicy::ExactMatch(0x1800))
.unwrap_err(),
pool.allocate(
0x800,
0x100,
AllocPolicy::ExactMatch(0x1800),
NodeState::Ram
)
.unwrap_err(),
Error::ResourceNotAvailable
);
// We ask for an available address, with a small enough range
assert_eq!(
pool.allocate(0x100, 0x100, AllocPolicy::ExactMatch(0x1800))
.unwrap(),
pool.allocate(
0x100,
0x100,
AllocPolicy::ExactMatch(0x1800),
NodeState::Ram
)
.unwrap(),
RangeInclusive::new(0x1800, 0x18FF).unwrap()
);
}
Expand All @@ -231,14 +259,14 @@ mod tests {
fn test_tree_allocate_address_free_and_realloc() {
let mut pool = AddressAllocator::new(0x1000, 0x1000).unwrap();
assert_eq!(
pool.allocate(0x800, 0x100, AllocPolicy::FirstMatch)
pool.allocate(0x800, 0x100, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x1000, 0x17FF).unwrap()
);

let _ = pool.free(&RangeInclusive::new(0x1000, 0x17FF).unwrap());
assert_eq!(
pool.allocate(0x800, 0x100, AllocPolicy::FirstMatch)
pool.allocate(0x800, 0x100, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x1000, 0x17FF).unwrap()
);
Expand All @@ -248,11 +276,13 @@ mod tests {
fn test_allow_range_size_one_left() {
let mut pool = AddressAllocator::new(1, 1000).unwrap();
assert_eq!(
pool.allocate(10, 2, AllocPolicy::FirstMatch).unwrap(),
pool.allocate(10, 2, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(2, 11).unwrap()
);
assert_eq!(
pool.allocate(1, 1, AllocPolicy::FirstMatch).unwrap(),
pool.allocate(1, 1, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap(),
RangeInclusive::new(1, 1).unwrap()
);
}
Expand All @@ -262,7 +292,7 @@ mod tests {
let mut pool = AddressAllocator::new(0x0, 0x1000).unwrap();
//First allocation fails
assert_eq!(
pool.allocate(0x2000, 0x100, AllocPolicy::FirstMatch)
pool.allocate(0x2000, 0x100, AllocPolicy::FirstMatch, NodeState::Ram)
.unwrap_err(),
Error::ResourceNotAvailable
);
Expand All @@ -274,7 +304,7 @@ mod tests {
);
// Now we try an allocation that should succeed.
assert_eq!(
pool.allocate(0x4FE, 0x100, AllocPolicy::ExactMatch(0x500))
pool.allocate(0x4FE, 0x100, AllocPolicy::ExactMatch(0x500), NodeState::Ram)
.unwrap(),
RangeInclusive::new(0x500, 0x9FD).unwrap()
);
Expand Down
Loading