i386: Introduce X86CPUCacheCPUID struct
cover i386: Introduce X86CPUCacheCPUID struct
The new struct will let us declare the existing legacy CPU topology info in a static constant, instead of defining it inside x86_cpu_realizefn(). While doing it, make the CPU cache declarations all constants.
This will help us represent the model-specific cache info as QOM properties in the future. Currently X86CPUDefinition::cache_info (which is being renamed to X86CPUDefinition::cache_cpuid) is the only CPU model field that can't be represented as a QOM property value.
Eduardo Habkost (2):
i386: make cache structs const-safe
i386: Introduce X86CPUCacheCPUID struct
target/i386/cpu.h | 15 +++--- target/i386/cpu.c | 134 +++++++++++++++++++++++++++------------------- 2 files changed, 84 insertions(+), 65 deletions(-)
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
PATCH 1/2 i386: make cache structs const-safe
This code will be refactored and it will be useful to make it const-safe to catch mistakes.
--- target/i386/cpu.h | 8 ++++---- target/i386/cpu.c | 36 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-)
target/i386/cpu.h +4 -4
@@ -1109,10 +1109,10 @@ typedef struct CPUCacheInfo {typedef struct CPUCaches { -CPUCacheInfo *l1d_cache; -CPUCacheInfo *l1i_cache; -CPUCacheInfo *l2_cache; -CPUCacheInfo *l3_cache; +const CPUCacheInfo *l1d_cache; +const CPUCacheInfo *l1i_cache; +const CPUCacheInfo *l2_cache; +const CPUCacheInfo *l3_cache; }CPUCaches ; typedef struct CPUX86State {
target/i386/cpu.c +18 -18
@@ -205,7 +205,7 @@ struct CPUID2CacheDescriptorInfo cpuid2_cache_descriptors[] = {* Return a CPUID 2 cache descriptor for a given cache. * If no known descriptor is found, return CACHE_DESCRIPTOR_UNAVAILABLE */ -static uint8_t cpuid2_cache_descriptor (CPUCacheInfo *cache) +static uint8_t cpuid2_cache_descriptor (const CPUCacheInfo *cache) {int i;
@@ -249,7 +249,7 @@ static uint8_t cpuid2_cache_descriptor(CPUCacheInfo *cache)/* Encode cache info for CPUID[4] */ -static void encode_cache_cpuid4 (CPUCacheInfo *cache, +static void encode_cache_cpuid4 (const CPUCacheInfo *cache,int num_apic_ids,int num_cores,uint32_t *eax,uint32_t *ebx,uint32_t *ecx,uint32_t *edx)
@@ -282,7 +282,7 @@ static void encode_cache_cpuid4(CPUCacheInfo *cache, }/* Encode cache info for CPUID[0x80000005].ECX or CPUID[0x80000005].EDX */ -static uint32_t encode_cache_cpuid80000005 (CPUCacheInfo *cache) +static uint32_t encode_cache_cpuid80000005 (const CPUCacheInfo *cache) {assert (cache->size %1024 ==0 );assert (cache->lines_per_tag >0 );
@@ -312,8 +312,8 @@ static uint32_t encode_cache_cpuid80000005(CPUCacheInfo *cache)* Encode cache info for CPUID[0x80000006].ECX and CPUID[0x80000006].EDX * @l3 can be NULL. */ -static void encode_cache_cpuid80000006 (CPUCacheInfo *l2, -CPUCacheInfo *l3, +static void encode_cache_cpuid80000006 (const CPUCacheInfo *l2, +const CPUCacheInfo *l3,uint32_t *ecx,uint32_t *edx) {assert (l2->size %1024 ==0 );
@@ -394,9 +394,9 @@ static int cores_in_core_complex(int nr_cores) }/* Encode cache info for CPUID[8000001D] */ -static void encode_cache_cpuid8000001d(CPUCacheInfo *cache, CPUState *cs, - uint32_t *eax, uint32_t *ebx, - uint32_t *ecx, uint32_t *edx) +static void encode_cache_cpuid8000001d(const CPUCacheInfo *cache, CPUState *cs, + uint32_t *eax, uint32_t *ebx, + uint32_t *ecx, uint32_t *edx) { uint32_t l3_cores; assert(cache->size == cache->line_size * cache->associativity *
@@ -541,7 +541,7 @@ static void encode_topo_cpuid8000001e(CPUState *cs, X86CPU *cpu,*/ /* L1 data cache: */ -static CPUCacheInfo legacy_l1d_cache = { +static const CPUCacheInfo legacy_l1d_cache = { .type =DATA_CACHE , .level =1 , .size =32 * KiB,
@@ -554,7 +554,7 @@ static CPUCacheInfo legacy_l1d_cache = { };/*FIXME: CPUID leaf 0x80000005 is inconsistent with leaves 2 & 4 */ -static CPUCacheInfo legacy_l1d_cache_amd = { +static const CPUCacheInfo legacy_l1d_cache_amd = { .type =DATA_CACHE , .level =1 , .size =64 * KiB,
@@ -568,7 +568,7 @@ static CPUCacheInfo legacy_l1d_cache_amd = { };/* L1 instruction cache: */ -static CPUCacheInfo legacy_l1i_cache = { +static const CPUCacheInfo legacy_l1i_cache = { .type =INSTRUCTION_CACHE , .level =1 , .size =32 * KiB,
@@ -581,7 +581,7 @@ static CPUCacheInfo legacy_l1i_cache = { };/*FIXME: CPUID leaf 0x80000005 is inconsistent with leaves 2 & 4 */ -static CPUCacheInfo legacy_l1i_cache_amd = { +static const CPUCacheInfo legacy_l1i_cache_amd = { .type =INSTRUCTION_CACHE , .level =1 , .size =64 * KiB,
@@ -595,7 +595,7 @@ static CPUCacheInfo legacy_l1i_cache_amd = { };/* Level 2 unified cache: */ -static CPUCacheInfo legacy_l2_cache = { +static const CPUCacheInfo legacy_l2_cache = { .type =UNIFIED_CACHE , .level =2 , .size =4 * MiB,
@@ -608,7 +608,7 @@ static CPUCacheInfo legacy_l2_cache = { };/*FIXME: CPUID leaf 2 descriptor is inconsistent with CPUID leaf 4 */ -static CPUCacheInfo legacy_l2_cache_cpuid2 = { +static const CPUCacheInfo legacy_l2_cache_cpuid2 = { .type =UNIFIED_CACHE , .level =2 , .size =2 * MiB,
@@ -618,7 +618,7 @@ static CPUCacheInfo legacy_l2_cache_cpuid2 = {/*FIXME: CPUID leaf 0x80000006 is inconsistent with leaves 2 & 4 */ -static CPUCacheInfo legacy_l2_cache_amd = { +static const CPUCacheInfo legacy_l2_cache_amd = { .type =UNIFIED_CACHE , .level =2 , .size =512 * KiB,
@@ -630,7 +630,7 @@ static CPUCacheInfo legacy_l2_cache_amd = { };/* Level 3 unified cache: */ -static CPUCacheInfo legacy_l3_cache = { +static const CPUCacheInfo legacy_l3_cache = { .type =UNIFIED_CACHE , .level =3 , .size =16 * MiB,
@@ -1423,10 +1423,10 @@ struct X86CPUDefinition {int stepping;FeatureWordArray features;const char *model_id; -CPUCaches *cache_info; +const CPUCaches *cache_info; }; -static CPUCaches epyc_cache_info = { +static const CPUCaches epyc_cache_info = { .l1d_cache = &(CPUCacheInfo ) { .type =DATA_CACHE , .level =1 ,
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
PATCH 2/2 i386: Introduce X86CPUCacheCPUID struct
In reply to Eduardo HabkostThe new struct will be used to simplify the code that deals with legacy cache information.
--- target/i386/cpu.h | 7 +--- target/i386/cpu.c | 100 ++++++++++++++++++++++++++++------------------ 2 files changed, 63 insertions(+), 44 deletions(-)
target/i386/cpu.h +2 -5
@@ -1306,11 +1306,8 @@ typedef struct CPUX86State {/* Features that were explicitly enabled/disabled */ FeatureWordArray user_features;uint32_t cpuid_model[12 ]; -/* Cache information for CPUID. When legacy-cache=on, the cache data -* on each CPUID leaf will be different, because we keep compatibility -* with old QEMU versions. -*/ -CPUCaches cache_info_cpuid2, cache_info_cpuid4, cache_info_amd; +/* Cache information for CPUID */ +const struct X86CPUCacheCPUID *caches;/* MTRRs */ uint64_t mtrr_fixed[11 ];
target/i386/cpu.c +61 -39
210 lines not on this page · raw message
Signature · 1 line
2.18.0.rc1.1.g3f1ff2140
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the asan build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-fedora V=1 NETWORK=1
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1 === TEST SCRIPT END ===
CC x86_64-softmmu/target/i386/svm_helper.o CC x86_64-softmmu/target/i386/machine.o CC x86_64-softmmu/target/i386/arch_memory_mapping.o
/tmp/qemu-test/src/target/i386/cpu.c:1484:15: error: initializer element is not a compile-time constant
.cpuid2 = epyc_cache_info,
^~~~~~~~~~~~~~~
1 error generated.
The full log is available at
http://patchew.org/logs/[email protected]/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]