Skip to content

Commit

Permalink
hv: cpuid: expose CPUID.EAX=07H subleaf to VMs
Browse files Browse the repository at this point in the history 
Per SDM, VPDPBUSD/VPDPBUSDS/VPDPWSSD/VPDPWSSDS instructions depend on
CPUID Feature Flag 'AVX-VNNI, AVX512_VNNI, AVX512VL'. 'AVX512_VNNI' and
'AVX512VL' are already exposed to any VM.

'AVX-VNNI' is in CPUID.(EAX=07H,ECX=1):EAX.AVX-VNNI[bit 4]. This patch
is to expose all the CPUID.EAX=07H subleaf features to VMs.

Mask corresponding bits if want to disable some features in the future.

Tracked-On: #8710
Reviewed-by: Fei Li <[email protected]>
Signed-off-by: Haiwei Li <[email protected]>
  • Loading branch information
@haiwei-li @acrnsi-robot
haiwei-li authored and acrnsi-robot committed Sep 9, 2024
1 parent 1571a6d commit 17c4ce7
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 78 deletions.
165 changes: 88 additions & 77 deletions hypervisor/arch/x86/guest/vcpuid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,66 +120,6 @@ static void init_vcpuid_entry(uint32_t leaf, uint32_t subleaf,
entry->flags = flags;

switch (leaf) {
case 0x07U:
if (subleaf == 0U) {
uint64_t cr4_reserved_mask = get_cr4_reserved_bits();

cpuid_subleaf(leaf, subleaf, &entry->eax, &entry->ebx, &entry->ecx, &entry->edx);

entry->ebx &= ~(CPUID_EBX_PQM | CPUID_EBX_PQE);

/* mask LA57 */
entry->ecx &= ~CPUID_ECX_LA57;

/* mask SGX and SGX_LC */
entry->ebx &= ~CPUID_EBX_SGX;
entry->ecx &= ~CPUID_ECX_SGX_LC;

/* mask MPX */
entry->ebx &= ~CPUID_EBX_MPX;

/* mask Intel Processor Trace, since 14h is disabled */
entry->ebx &= ~CPUID_EBX_PROC_TRC;

/* mask CET shadow stack and indirect branch tracking */
entry->ecx &= ~CPUID_ECX_CET_SS;
entry->edx &= ~CPUID_EDX_CET_IBT;

if ((cr4_reserved_mask & CR4_FSGSBASE) != 0UL) {
entry->ebx &= ~CPUID_EBX_FSGSBASE;
}

if ((cr4_reserved_mask & CR4_SMEP) != 0UL) {
entry->ebx &= ~CPUID_EBX_SMEP;
}

if ((cr4_reserved_mask & CR4_SMAP) != 0UL) {
entry->ebx &= ~CPUID_EBX_SMAP;
}

if ((cr4_reserved_mask & CR4_UMIP) != 0UL) {
entry->ecx &= ~CPUID_ECX_UMIP;
}

if ((cr4_reserved_mask & CR4_PKE) != 0UL) {
entry->ecx &= ~CPUID_ECX_PKE;
}

if ((cr4_reserved_mask & CR4_LA57) != 0UL) {
entry->ecx &= ~CPUID_ECX_LA57;
}

if ((cr4_reserved_mask & CR4_PKS) != 0UL) {
entry->ecx &= ~CPUID_ECX_PKS;
}
} else {
entry->eax = 0U;
entry->ebx = 0U;
entry->ecx = 0U;
entry->edx = 0U;
}
break;

case 0x16U:
cpu_info = get_pcpu_info();
if (cpu_info->cpuid_level >= 0x16U) {
Expand Down Expand Up @@ -480,6 +420,93 @@ static int32_t set_vcpuid_cache(struct acrn_vm *vm)
return result;
}

static int32_t set_vcpuid_extfeat(struct acrn_vm *vm)
{
uint64_t cr4_reserved_mask = get_cr4_reserved_bits();
int32_t result = 0;
struct vcpuid_entry entry;
uint32_t i, sub_leaves;

/* cpuid.07h.0h */
cpuid_subleaf(CPUID_EXTEND_FEATURE, 0U, &entry.eax, &entry.ebx, &entry.ecx, &entry.edx);

entry.ebx &= ~(CPUID_EBX_PQM | CPUID_EBX_PQE);
if (is_vsgx_supported(vm->vm_id)) {
entry.ebx |= CPUID_EBX_SGX;
}

#ifdef CONFIG_VCAT_ENABLED
if (is_vcat_configured(vm)) {
/* Bit 15: Supports Intel Resource Director Technology (Intel RDT) Allocation capability if 1 */
entry.ebx |= CPUID_EBX_PQE;
}
#endif
/* mask LA57 */
entry.ecx &= ~CPUID_ECX_LA57;

/* mask SGX and SGX_LC */
entry.ebx &= ~CPUID_EBX_SGX;
entry.ecx &= ~CPUID_ECX_SGX_LC;

/* mask MPX */
entry.ebx &= ~CPUID_EBX_MPX;

/* mask Intel Processor Trace, since 14h is disabled */
entry.ebx &= ~CPUID_EBX_PROC_TRC;

/* mask CET shadow stack and indirect branch tracking */
entry.ecx &= ~CPUID_ECX_CET_SS;
entry.edx &= ~CPUID_EDX_CET_IBT;

/* mask WAITPKG */
entry.ecx &= ~CPUID_ECX_WAITPKG;

if ((cr4_reserved_mask & CR4_FSGSBASE) != 0UL) {
entry.ebx &= ~CPUID_EBX_FSGSBASE;
}

if ((cr4_reserved_mask & CR4_SMEP) != 0UL) {
entry.ebx &= ~CPUID_EBX_SMEP;
}

if ((cr4_reserved_mask & CR4_SMAP) != 0UL) {
entry.ebx &= ~CPUID_EBX_SMAP;
}

if ((cr4_reserved_mask & CR4_UMIP) != 0UL) {
entry.ecx &= ~CPUID_ECX_UMIP;
}

if ((cr4_reserved_mask & CR4_PKE) != 0UL) {
entry.ecx &= ~CPUID_ECX_PKE;
}

if ((cr4_reserved_mask & CR4_LA57) != 0UL) {
entry.ecx &= ~CPUID_ECX_LA57;
}

if ((cr4_reserved_mask & CR4_PKS) != 0UL) {
entry.ecx &= ~CPUID_ECX_PKS;
}

entry.leaf = CPUID_EXTEND_FEATURE;
entry.subleaf = 0U;
entry.flags = CPUID_CHECK_SUBLEAF;
result = set_vcpuid_entry(vm, &entry);
if (result == 0) {
sub_leaves = entry.eax;
for (i = 1U; i <= sub_leaves; i++) {
cpuid_subleaf(CPUID_EXTEND_FEATURE, i, &entry.eax, &entry.ebx, &entry.ecx, &entry.edx);
entry.subleaf = i;
result = set_vcpuid_entry(vm, &entry);
if (result != 0) {
break;
}
}
}
return result;
}

static void guest_cpuid_06h(struct acrn_vm *vm, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
{
cpuid_subleaf(CPUID_THERMAL_POWER, *ecx, eax, ebx, ecx, edx);
Expand Down Expand Up @@ -644,23 +671,7 @@ int32_t set_vcpuid_entries(struct acrn_vm *vm)
break;
/* 0x07U */
case CPUID_EXTEND_FEATURE:
init_vcpuid_entry(i, 0U, CPUID_CHECK_SUBLEAF, &entry);
if (entry.eax != 0U) {
pr_warn("vcpuid: only support subleaf 0 for cpu leaf 07h");
entry.eax = 0U;
}
if (is_vsgx_supported(vm->vm_id)) {
entry.ebx |= CPUID_EBX_SGX;
}
entry.ecx &= ~CPUID_ECX_WAITPKG;

#ifdef CONFIG_VCAT_ENABLED
if (is_vcat_configured(vm)) {
/* Bit 15: Supports Intel Resource Director Technology (Intel RDT) Allocation capability if 1 */
entry.ebx |= CPUID_EBX_PQE;
}
#endif
result = set_vcpuid_entry(vm, &entry);
result = set_vcpuid_extfeat(vm);
break;
/* 0x12U */
case CPUID_SGX_CAP:
Expand Down
2 changes: 1 addition & 1 deletion hypervisor/include/arch/x86/asm/cpuid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
/* CPUID.07H:ECX.PKE */
#define CPUID_ECX_PKE (1U<<3U)
/* CPUID.07H:ECX.WAITPKG */
#define CPUID_ECX_WAITPKG (1U<<5U)
#define CPUID_ECX_WAITPKG (1U<<5U)
/* CPUID.07H:ECX.CET_SS */
#define CPUID_ECX_CET_SS (1U<<7U)
/* CPUID.07H:ECX.LA57 */
Expand Down

0 comments on commit 17c4ce7

Please sign in to comment.