general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two cpuid bugs

Browse Source 
1. >> has higher precedence than &. Use parentheses to conduct & first;
2. In the latest Intel software developer's manual, cpuid leaf 06H EDX
is related to the logical processor.
This commit is contained in:
He Sun 2020-11-11 17:18:30 +08:00 committed by Tate, Hongliang Tian
parent 328b203817
commit 4260a8defc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libos/src/exception/cpuid.rs
View File

@ -81,7 +81,7 @@ impl CpuIdCache {
// EDX Bit 00: Reserved. // EDX Bit 00: Reserved.
// Bit 01: Supports L3 Cache Intel RDT Monitoring if 1. // Bit 01: Supports L3 Cache Intel RDT Monitoring if 1.
// Bits 31 - 02: Reserved. // Bits 31 - 02: Reserved.
0xF => cpuid_result.edx & 0x0000_0002 >> 1, 0xF => (cpuid_result.edx & 0x0000_0002) >> 1,
// Reports valid ResID starting at bit position 1 of EBX. // Reports valid ResID starting at bit position 1 of EBX.
// EBX Bit 00: Reserved. // EBX Bit 00: Reserved.
// Bit 01: Supports L3 Cache Allocation Technology if 1. // Bit 01: Supports L3 Cache Allocation Technology if 1.

4
test/cpuid/main.c
View File

@ -35,8 +35,8 @@ static bool is_cpuidinfo_equal(int leaf, t_cpuid_t *cpu, t_cpuid_t *cpu_sgx) {
(cpu->ecx == cpu_sgx->ecx) && (cpu->ecx == cpu_sgx->ecx) &&
(cpu->edx == cpu_sgx->edx)); (cpu->edx == cpu_sgx->edx));
} }
/* Leaf 0BH CPUID.EDX is related with logical processor. */ /* Leaf 0BH and 06H CPUID.EDX is related with logical processor. */
if (leaf == 0xB) { if (leaf == 0xB || leaf == 0x6) {
return ((cpu->eax == cpu_sgx->eax) && return ((cpu->eax == cpu_sgx->eax) &&
(cpu->ebx == cpu_sgx->ebx) && (cpu->ebx == cpu_sgx->ebx) &&
(cpu->ecx == cpu_sgx->ecx)); (cpu->ecx == cpu_sgx->ecx));