Skip to content
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

nitro-cli: Update enclave boot timeout based on allocated memory #633

Merged
merged 1 commit into from
Jul 17, 2024
Merged

nitro-cli: Update enclave boot timeout based on allocated memory #633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 36 additions & 9 deletions src/enclave_proc/resource_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ impl EnclaveHandle {
.len();

// Update the poll timeout based on the eif size or allocated memory
let poll_timeout = calculate_necessary_timeout(eif_size);
let poll_timeout = calculate_necessary_timeout(eif_size, self.allocated_memory_mib * MiB);

enclave_ready(listener, poll_timeout).map_err(|err| {
let err_msg = format!("Waiting on enclave to boot failed with error {:?}", err);
Expand Down Expand Up @@ -1188,21 +1188,26 @@ pub fn between_packets_delay() -> Option<Duration> {
/// # Arguments
///
/// * `eif_size` - The EIF size in bytes
/// * `allocated_memory` - The memory size in bytes
///
/// # Examples
///
/// ```
/// use nitro_cli::enclave_proc::resource_manager::calculate_necessary_timeout;
/// use nitro_cli::enclave_proc::utils::GiB;
/// // Returns the timeout based on the 8GiB EIF size
/// let timeout = calculate_necessary_timeout(8 * GiB);
/// // Returns the timeout based on the 8GiB EIF size and 32GiB of allocated memory
/// let timeout = calculate_necessary_timeout(8 * GiB, 32 * GiB);
/// ```
pub fn calculate_necessary_timeout(eif_size: u64) -> c_int {
pub fn calculate_necessary_timeout(eif_size: u64, allocated_memory: u64) -> c_int {
// in case we have a valid eif_size give TIMEOUT_MINUTE_MS ms for each 6GiB
let poll_timeout: c_int =
let eif_size_timeout: c_int =
((1 + (eif_size - 1) / (6 * GiB)) as i32).saturating_mul(TIMEOUT_MINUTE_MS);

poll_timeout
// Update the poll timeout to be TIMEOUT_MINUTE_MS per 100 GiB of enclave memory.
let allocated_memory_timeout: c_int =
((1 + (allocated_memory - 1) / (100 * GiB)) as i32).saturating_mul(TIMEOUT_MINUTE_MS);

eif_size_timeout + allocated_memory_timeout
}

#[cfg(test)]
Expand All @@ -1213,8 +1218,30 @@ mod tests {

#[test]
fn test_timeout_calculation() {
assert_eq!(calculate_necessary_timeout(2 * GiB), TIMEOUT_MINUTE_MS);
assert_eq!(calculate_necessary_timeout(6 * GiB), TIMEOUT_MINUTE_MS);
assert_eq!(calculate_necessary_timeout(10 * GiB), 2 * TIMEOUT_MINUTE_MS);
assert_eq!(
calculate_necessary_timeout(2 * GiB, 32 * GiB),
2 * TIMEOUT_MINUTE_MS
);
assert_eq!(
calculate_necessary_timeout(6 * GiB, 32 * GiB),
2 * TIMEOUT_MINUTE_MS
);
assert_eq!(
calculate_necessary_timeout(10 * GiB, 32 * GiB),
3 * TIMEOUT_MINUTE_MS
);

assert_eq!(
calculate_necessary_timeout(2 * GiB, 128 * GiB),
3 * TIMEOUT_MINUTE_MS
);
assert_eq!(
calculate_necessary_timeout(6 * GiB, 128 * GiB),
3 * TIMEOUT_MINUTE_MS
);
assert_eq!(
calculate_necessary_timeout(10 * GiB, 128 * GiB),
4 * TIMEOUT_MINUTE_MS
);
}
}