github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-14 06:16:38 +00:00
Code Issues Projects Releases Wiki Activity

hv: define a MACRO to indicate maximum memory size

Browse Source 
~0UL is widely used to specify the maximum memory size
 when calling e820_alloc_memory(), this patch to define
 a MACRO for it to avoid using this magic number.

Tracked-On: #8502
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Yonghua Huang 2023-08-17 07:43:31 +08:00 committed by acrnsi-robot
parent a4a73b5aac
commit 791019edc5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hypervisor/arch/x86/guest/ept.c
View File

@ -86,7 +86,7 @@ static void reserve_ept_bitmap(void)
bitmap_size = (get_ept_page_num() * CONFIG_MAX_VM_NUM) / 8; bitmap_size = (get_ept_page_num() * CONFIG_MAX_VM_NUM) / 8;
bitmap_offset = get_ept_page_num() / 8; bitmap_offset = get_ept_page_num() / 8;
bitmap_base = e820_alloc_memory(bitmap_size, ~0UL); bitmap_base = e820_alloc_memory(bitmap_size, MEM_SIZE_MAX);
set_paging_supervisor(bitmap_base, bitmap_size); set_paging_supervisor(bitmap_base, bitmap_size);
for(i = 0; i < CONFIG_MAX_VM_NUM; i++){ for(i = 0; i < CONFIG_MAX_VM_NUM; i++){
@ -103,7 +103,7 @@ void reserve_buffer_for_ept_pages(void)
uint16_t vm_id; uint16_t vm_id;
uint32_t offset = 0U; uint32_t offset = 0U;
page_base = e820_alloc_memory(get_total_ept_4k_pages_size(), ~0UL); page_base = e820_alloc_memory(get_total_ept_4k_pages_size(), MEM_SIZE_MAX);
set_paging_supervisor(page_base, get_total_ept_4k_pages_size()); set_paging_supervisor(page_base, get_total_ept_4k_pages_size());
for (vm_id = 0U; vm_id < CONFIG_MAX_VM_NUM; vm_id++) { for (vm_id = 0U; vm_id < CONFIG_MAX_VM_NUM; vm_id++) {
ept_pages[vm_id] = (struct page *)(void *)(page_base + offset); ept_pages[vm_id] = (struct page *)(void *)(page_base + offset);

4
hypervisor/arch/x86/guest/vept.c
View File

@ -51,12 +51,12 @@ static void init_vept_pool(void)
{ {
uint64_t page_base; uint64_t page_base;
page_base = e820_alloc_memory(calc_sept_size(), ~0UL); page_base = e820_alloc_memory(calc_sept_size(), MEM_SIZE_MAX);
set_paging_supervisor(page_base, calc_sept_size()); set_paging_supervisor(page_base, calc_sept_size());
sept_pages = (struct page *)page_base; sept_pages = (struct page *)page_base;
sept_page_bitmap = (uint64_t*)e820_alloc_memory((calc_sept_page_num() / 64U), ~0UL); sept_page_bitmap = (uint64_t *)e820_alloc_memory((calc_sept_page_num() / 64U), MEM_SIZE_MAX);
} }
static bool is_present_ept_entry(uint64_t ept_entry) static bool is_present_ept_entry(uint64_t ept_entry)

2
hypervisor/include/arch/x86/asm/e820.h
View File

@ -18,6 +18,8 @@
#define E820_MAX_ENTRIES 64U #define E820_MAX_ENTRIES 64U
#define MEM_SIZE_MAX (~0UL)
/** Defines a single entry in an E820 memory map. */ /** Defines a single entry in an E820 memory map. */
struct e820_entry { struct e820_entry {
/** The base address of the memory range. */ /** The base address of the memory range. */