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

Jump to bottom

td-shim: use static memory for temp stacks of APs #703

Merged
merged 1 commit into from
May 28, 2024
Merged

td-shim: use static memory for temp stacks of APs #703

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
5 changes: 3 additions & 2 deletions td-shim/src/bin/td-shim/td/tdx_mailbox.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ use crate::asm::{ap_relocated_func_addr, ap_relocated_func_size};
// The maximum size of memory used for AP stacks is 30 KB.
const MAX_WORKING_AP_COUNT: u32 = 15;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I filed #705 for clean up.

const AP_TEMP_STACK_SIZE: usize = 0x800;
const AP_TEMP_STACK_TOTAL_SIZE: usize = MAX_WORKING_AP_COUNT as usize * AP_TEMP_STACK_SIZE;
static AP_TEMP_STACK: [u8; AP_TEMP_STACK_TOTAL_SIZE] = [0; AP_TEMP_STACK_TOTAL_SIZE];

const ACCEPT_CHUNK_SIZE: u64 = 0x2000000;
const ACCEPT_PAGE_SIZE: u64 = 0x200000;
Expand Down Expand Up @@ -250,7 +252,6 @@ pub fn accept_memory_resource_range(mut cpu_num: u32, address: u64, size: u64) {
// Safety:
// BSP is the owner of the mailbox area, and APs cooperate with BSP to access the mailbox area.
let mut mail_box = unsafe { MailBox::new(get_mem_slice_mut(SliceType::MailBox)) };
let mut stacks: Vec<u8> = Vec::with_capacity(AP_TEMP_STACK_SIZE * active_ap_cnt as usize);

// BSP calles the same function parallel_accept_memory to accept memory,
// so set the firmware arguments here.
Expand All @@ -264,7 +265,7 @@ pub fn accept_memory_resource_range(mut cpu_num: u32, address: u64, size: u64) {
// 0 is the bootstrap processor running this code
for i in make_apic_range(active_ap_cnt) {
// rsp should be at the top of the memory allocated for each ap
let stack_top = stacks.as_ptr() as u64 + i as u64 * AP_TEMP_STACK_SIZE as u64;
let stack_top = AP_TEMP_STACK.as_ptr() as u64 + i as u64 * AP_TEMP_STACK_SIZE as u64;
ap_assign_work(i, stack_top, parallel_accept_memory as *const () as u32);
}
}
Expand Down