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

hv: move invvpid and invept helper code from mmu.c to mmu.h

Browse Source 
moving invvpid and invept helper code from mmu.c to mmu.h, so that they
can be accessed by the nested virtualization code.

No logical changes.

Tracked-On: #5923
Signed-off-by: Zide Chen <zide.chen@intel.com>
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Zide Chen 2021-04-23 10:04:23 -07:00 committed by wenlingz
parent 873ed752d4
commit dd90eccc25
2 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hypervisor/arch/x86/mmu.c
View File

@ -102,41 +102,6 @@ static const struct pgtable ppt_pgtable = {
.recover_exe_right = ppt_nop_recover_exe_right, .recover_exe_right = ppt_nop_recover_exe_right,
}; };
#define INVEPT_TYPE_SINGLE_CONTEXT 1UL
#define INVEPT_TYPE_ALL_CONTEXTS 2UL
#define VMFAIL_INVALID_EPT_VPID \
" jnc 1f\n" \
" mov $1, %0\n" /* CF: error = 1 */ \
" jmp 3f\n" \
"1: jnz 2f\n" \
" mov $2, %0\n" /* ZF: error = 2 */ \
" jmp 3f\n" \
"2: mov $0, %0\n" \
"3:"
struct invvpid_operand {
uint32_t vpid : 16;
uint32_t rsvd1 : 16;
uint32_t rsvd2 : 32;
uint64_t gva;
};
struct invept_desc {
uint64_t eptp;
uint64_t res;
};
static inline int32_t asm_invvpid(const struct invvpid_operand operand, uint64_t type)
{
int32_t error;
asm volatile ("invvpid %1, %2\n"
VMFAIL_INVALID_EPT_VPID
: "=r" (error)
: "m" (operand), "r" (type)
: "memory");
return error;
}
/* /*
* @pre: the combined type and vpid is correct * @pre: the combined type and vpid is correct
*/ */
@ -149,17 +114,6 @@ static inline void local_invvpid(uint64_t type, uint16_t vpid, uint64_t gva)
} }
} }
static inline int32_t asm_invept(uint64_t type, struct invept_desc desc)
{
int32_t error;
asm volatile ("invept %1, %2\n"
VMFAIL_INVALID_EPT_VPID
: "=r" (error)
: "m" (desc), "r" (type)
: "memory");
return error;
}
/* /*
* @pre: the combined type and EPTP is correct * @pre: the combined type and EPTP is correct
*/ */

45
hypervisor/include/arch/x86/asm/mmu.h
View File

@ -55,6 +55,51 @@
/* IA32E Paging constants */ /* IA32E Paging constants */
#define IA32E_REF_MASK ((get_pcpu_info())->physical_address_mask) #define IA32E_REF_MASK ((get_pcpu_info())->physical_address_mask)
#define INVEPT_TYPE_SINGLE_CONTEXT 1UL
#define INVEPT_TYPE_ALL_CONTEXTS 2UL
#define VMFAIL_INVALID_EPT_VPID \
" jnc 1f\n" \
" mov $1, %0\n" /* CF: error = 1 */ \
" jmp 3f\n" \
"1: jnz 2f\n" \
" mov $2, %0\n" /* ZF: error = 2 */ \
" jmp 3f\n" \
"2: mov $0, %0\n" \
"3:"
struct invvpid_operand {
uint32_t vpid : 16;
uint32_t rsvd1 : 16;
uint32_t rsvd2 : 32;
uint64_t gva;
};
static inline int32_t asm_invvpid(const struct invvpid_operand operand, uint64_t type)
{
int32_t error;
asm volatile ("invvpid %1, %2\n"
VMFAIL_INVALID_EPT_VPID
: "=r" (error)
: "m" (operand), "r" (type)
: "memory");
return error;
}
struct invept_desc {
uint64_t eptp;
uint64_t res;
};
static inline int32_t asm_invept(uint64_t type, struct invept_desc desc)
{
int32_t error;
asm volatile ("invept %1, %2\n"
VMFAIL_INVALID_EPT_VPID
: "=r" (error)
: "m" (desc), "r" (type)
: "memory");
return error;
}
struct acrn_vcpu; struct acrn_vcpu;
static inline uint64_t round_page_up(uint64_t addr) static inline uint64_t round_page_up(uint64_t addr)