* [Qemu-devel] [PATCH] AMD Processor Topology Information
@ 2017-11-03 17:30 Stanislav Lanci
2017-11-08 12:44 ` Philippe Mathieu-Daudé
2018-01-25 21:56 ` Babu Moger
0 siblings, 2 replies; 6+ messages in thread
From: Stanislav Lanci @ 2017-11-03 17:30 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stanislav Lanci
V2:
Adds information about cache size and topology on leaf 0x8000001D for family 17h
Without the added cache topology guest with SMT suffers latency problems
Add CPUID 0x8000001E for describing AMD Processor Topology Information
Disables warning about smt for 17h family of AMD CPUs
Signed-off-by: Stanislav Lanci <pixo@polepetko.eu>
---
target/i386/cpu.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
target/i386/kvm.c | 28 +++++++++++++++--
2 files changed, 117 insertions(+), 4 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ddc45abd70..1545e3fe31 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -113,7 +113,9 @@
/* L1 instruction cache: */
#define L1I_LINE_SIZE 64
#define L1I_ASSOCIATIVITY 8
+#define L1I_ASSOC_AMD_ZEN 4
#define L1I_SETS 64
+#define L1I_SETS_AMD_ZEN 256
#define L1I_PARTITIONS 1
/* Size = LINE_SIZE*ASSOCIATIVITY*SETS*PARTITIONS = 32KiB */
#define L1I_DESCRIPTOR CPUID_2_L1I_32KB_8WAY_64B
@@ -125,7 +127,9 @@
/* Level 2 unified cache: */
#define L2_LINE_SIZE 64
#define L2_ASSOCIATIVITY 16
+#define L2_ASSOC_AMD_ZEN 8
#define L2_SETS 4096
+#define L2_SETS_AMD_ZEN 1024
#define L2_PARTITIONS 1
/* Size = LINE_SIZE*ASSOCIATIVITY*SETS*PARTITIONS = 4MiB */
/*FIXME: CPUID leaf 2 descriptor is inconsistent with CPUID leaf 4 */
@@ -142,6 +146,7 @@
#define L3_N_LINE_SIZE 64
#define L3_N_ASSOCIATIVITY 16
#define L3_N_SETS 16384
+#define L3_N_SETS_AMD_ZEN 4096
#define L3_N_PARTITIONS 1
#define L3_N_DESCRIPTOR CPUID_2_L3_16MB_16WAY_64B
#define L3_N_LINES_PER_TAG 1
@@ -3072,6 +3077,91 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*edx = 0;
}
break;
+ case 0x8000001D: /* AMD TOPOEXT cache info for ZEN */
+ if (cpu->cache_info_passthrough) {
+ host_cpuid(index, count, eax, ebx, ecx, edx);
+ break;
+ } else if ((env->cpuid_version & 0xFF00F00) == 0x800F00) {
+ *eax = 0;
+ switch (count) {
+ case 0: /* L1 dcache info */
+ *eax |= CPUID_4_TYPE_DCACHE | \
+ CPUID_4_LEVEL(1) | \
+ CPUID_4_SELF_INIT_LEVEL | \
+ ((cs->nr_threads - 1) << 14);
+ *ebx = (L1D_LINE_SIZE - 1) | \
+ ((L1D_PARTITIONS - 1) << 12) | \
+ ((L1D_ASSOCIATIVITY - 1) << 22);
+ *ecx = L1D_SETS - 1;
+ *edx = 0;
+ break;
+ case 1: /* L1 icache info */
+ *eax |= CPUID_4_TYPE_ICACHE | \
+ CPUID_4_LEVEL(1) | \
+ CPUID_4_SELF_INIT_LEVEL | \
+ ((cs->nr_threads - 1) << 14);
+ *ebx = (L1I_LINE_SIZE - 1) | \
+ ((L1I_PARTITIONS - 1) << 12) | \
+ ((L1I_ASSOC_AMD_ZEN - 1) << 22);
+ *ecx = L1I_SETS_AMD_ZEN - 1;
+ *edx = 0;
+ break;
+ case 2: /* L2 cache info */
+ *eax |= CPUID_4_TYPE_UNIFIED | \
+ CPUID_4_LEVEL(2) | \
+ CPUID_4_SELF_INIT_LEVEL | \
+ ((cs->nr_threads - 1) << 14);
+ *ebx = (L2_LINE_SIZE - 1) | \
+ ((L2_PARTITIONS - 1) << 12) | \
+ ((L2_ASSOC_AMD_ZEN - 1) << 22);
+ *ecx = L2_SETS_AMD_ZEN - 1;
+ *edx = CPUID_4_INCLUSIVE;
+ break;
+ case 3: /* L3 cache info */
+ if (!cpu->enable_l3_cache) {
+ *eax = 0;
+ *ebx = 0;
+ *ecx = 0;
+ *edx = 0;
+ break;
+ }
+ *eax |= CPUID_4_TYPE_UNIFIED | \
+ CPUID_4_LEVEL(3) | \
+ CPUID_4_SELF_INIT_LEVEL | \
+ ((cs->nr_cores * cs->nr_threads - 1) << 14);
+ *ebx = (L3_N_LINE_SIZE - 1) | \
+ ((L3_N_PARTITIONS - 1) << 12) | \
+ ((L3_N_ASSOCIATIVITY - 1) << 22);
+ *ecx = L3_N_SETS_AMD_ZEN - 1;
+ *edx = CPUID_4_NO_INVD_SHARING;
+ break;
+ default: /* end of info */
+ *eax = 0;
+ *ebx = 0;
+ *ecx = 0;
+ *edx = 0;
+ break;
+ }
+ } else {
+ *eax = 0;
+ *ebx = 0;
+ *ecx = 0;
+ *edx = 0;
+ }
+ break;
+ case 0x8000001E: /* AMD TOPOEXT cpu topology info for ZEN */
+ if ((env->cpuid_version & 0xFF00F00) == 0x800F00) {
+ *eax = cpu->apic_id;
+ *ebx = (cs->nr_threads - 1) << 8 | cpu->core_id;
+ *ecx = cpu->socket_id;
+ *edx = 0;
+ } else {
+ *eax = 0;
+ *ebx = 0;
+ *ecx = 0;
+ *edx = 0;
+ }
+ break;
case 0xC0000000:
*eax = env->cpuid_xlevel2;
*ebx = 0;
@@ -3742,7 +3832,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
* NOTE: the following code has to follow qemu_init_vcpu(). Otherwise
* cs->nr_threads hasn't be populated yet and the checking is incorrect.
*/
- if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned) {
+ if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned && \
+ (env->cpuid_version & 0xFF00F00) != 0x800F00) {
error_report("AMD CPU doesn't support hyperthreading. Please configure"
" -smp options properly.");
ht_warned = true;
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 6db7783edc..d6b4e1ae74 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -869,9 +869,31 @@ int kvm_arch_init_vcpu(CPUState *cs)
}
c = &cpuid_data.entries[cpuid_i++];
- c->function = i;
- c->flags = 0;
- cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx);
+ switch (i) {
+ case 0x8000001d:
+ for (j = 0; ; j++) {
+ c->function = i;
+ c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX;
+ c->index = j;
+ cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->edx);
+
+ if (c->eax == 0) {
+ break;
+ }
+ if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
+ fprintf(stderr, "cpuid_data is full, no space for "
+ "cpuid(eax:0x%x,ecx:0x%x)\n", i, j);
+ abort();
+ }
+ c = &cpuid_data.entries[cpuid_i++];
+ }
+ break;
+ default:
+ c->function = i;
+ c->flags = 0;
+ cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx);
+ break;
+ }
}
/* Call Centaur's CPUID instructions they are supported. */
--
2.15.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] AMD Processor Topology Information
2017-11-03 17:30 [Qemu-devel] [PATCH] AMD Processor Topology Information Stanislav Lanci
@ 2017-11-08 12:44 ` Philippe Mathieu-Daudé
2017-11-09 16:04 ` pixo
2018-01-25 21:56 ` Babu Moger
1 sibling, 1 reply; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-11-08 12:44 UTC (permalink / raw)
To: Stanislav Lanci, Andre Przywara, Eduardo Habkost,
Daniel P. Berrange, Longpeng(Mike),
Michael S. Tsirkin, Richard Henderson, Andreas Färber,
Benoît Canet, Paolo Bonzini
Cc: qemu-devel, qemu-trivial
Hi Stanislav,
This does not seem so trivial ;)
Cc'ing more reviewers.
On 11/03/2017 02:30 PM, Stanislav Lanci wrote:
> V2:
> Adds information about cache size and topology on leaf 0x8000001D for family 17h
> Without the added cache topology guest with SMT suffers latency problems
>
> Add CPUID 0x8000001E for describing AMD Processor Topology Information
> Disables warning about smt for 17h family of AMD CPUs
>
> Signed-off-by: Stanislav Lanci <pixo@polepetko.eu>
> ---
> target/i386/cpu.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> target/i386/kvm.c | 28 +++++++++++++++--
> 2 files changed, 117 insertions(+), 4 deletions(-)
>
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index ddc45abd70..1545e3fe31 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -113,7 +113,9 @@
> /* L1 instruction cache: */
> #define L1I_LINE_SIZE 64
> #define L1I_ASSOCIATIVITY 8
> +#define L1I_ASSOC_AMD_ZEN 4
> #define L1I_SETS 64
> +#define L1I_SETS_AMD_ZEN 256
> #define L1I_PARTITIONS 1
> /* Size = LINE_SIZE*ASSOCIATIVITY*SETS*PARTITIONS = 32KiB */
> #define L1I_DESCRIPTOR CPUID_2_L1I_32KB_8WAY_64B
> @@ -125,7 +127,9 @@
> /* Level 2 unified cache: */
> #define L2_LINE_SIZE 64
> #define L2_ASSOCIATIVITY 16
> +#define L2_ASSOC_AMD_ZEN 8
> #define L2_SETS 4096
> +#define L2_SETS_AMD_ZEN 1024
> #define L2_PARTITIONS 1
> /* Size = LINE_SIZE*ASSOCIATIVITY*SETS*PARTITIONS = 4MiB */
> /*FIXME: CPUID leaf 2 descriptor is inconsistent with CPUID leaf 4 */
> @@ -142,6 +146,7 @@
> #define L3_N_LINE_SIZE 64
> #define L3_N_ASSOCIATIVITY 16
> #define L3_N_SETS 16384
> +#define L3_N_SETS_AMD_ZEN 4096
> #define L3_N_PARTITIONS 1
> #define L3_N_DESCRIPTOR CPUID_2_L3_16MB_16WAY_64B
> #define L3_N_LINES_PER_TAG 1
> @@ -3072,6 +3077,91 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
> *edx = 0;
> }
> break;
> + case 0x8000001D: /* AMD TOPOEXT cache info for ZEN */
> + if (cpu->cache_info_passthrough) {
> + host_cpuid(index, count, eax, ebx, ecx, edx);
> + break;
> + } else if ((env->cpuid_version & 0xFF00F00) == 0x800F00) {
> + *eax = 0;
> + switch (count) {
> + case 0: /* L1 dcache info */
> + *eax |= CPUID_4_TYPE_DCACHE | \
> + CPUID_4_LEVEL(1) | \
> + CPUID_4_SELF_INIT_LEVEL | \
> + ((cs->nr_threads - 1) << 14);
> + *ebx = (L1D_LINE_SIZE - 1) | \
> + ((L1D_PARTITIONS - 1) << 12) | \
> + ((L1D_ASSOCIATIVITY - 1) << 22);
> + *ecx = L1D_SETS - 1;
> + *edx = 0;
> + break;
> + case 1: /* L1 icache info */
> + *eax |= CPUID_4_TYPE_ICACHE | \
> + CPUID_4_LEVEL(1) | \
> + CPUID_4_SELF_INIT_LEVEL | \
> + ((cs->nr_threads - 1) << 14);
> + *ebx = (L1I_LINE_SIZE - 1) | \
> + ((L1I_PARTITIONS - 1) << 12) | \
> + ((L1I_ASSOC_AMD_ZEN - 1) << 22);
> + *ecx = L1I_SETS_AMD_ZEN - 1;
> + *edx = 0;
> + break;
> + case 2: /* L2 cache info */
> + *eax |= CPUID_4_TYPE_UNIFIED | \
> + CPUID_4_LEVEL(2) | \
> + CPUID_4_SELF_INIT_LEVEL | \
> + ((cs->nr_threads - 1) << 14);
> + *ebx = (L2_LINE_SIZE - 1) | \
> + ((L2_PARTITIONS - 1) << 12) | \
> + ((L2_ASSOC_AMD_ZEN - 1) << 22);
> + *ecx = L2_SETS_AMD_ZEN - 1;
> + *edx = CPUID_4_INCLUSIVE;
> + break;
> + case 3: /* L3 cache info */
> + if (!cpu->enable_l3_cache) {
> + *eax = 0;
> + *ebx = 0;
> + *ecx = 0;
> + *edx = 0;
> + break;
> + }
> + *eax |= CPUID_4_TYPE_UNIFIED | \
> + CPUID_4_LEVEL(3) | \
> + CPUID_4_SELF_INIT_LEVEL | \
> + ((cs->nr_cores * cs->nr_threads - 1) << 14);
> + *ebx = (L3_N_LINE_SIZE - 1) | \
> + ((L3_N_PARTITIONS - 1) << 12) | \
> + ((L3_N_ASSOCIATIVITY - 1) << 22);
> + *ecx = L3_N_SETS_AMD_ZEN - 1;
> + *edx = CPUID_4_NO_INVD_SHARING;
> + break;
> + default: /* end of info */
> + *eax = 0;
> + *ebx = 0;
> + *ecx = 0;
> + *edx = 0;
> + break;
> + }
> + } else {
> + *eax = 0;
> + *ebx = 0;
> + *ecx = 0;
> + *edx = 0;
> + }
> + break;
> + case 0x8000001E: /* AMD TOPOEXT cpu topology info for ZEN */
> + if ((env->cpuid_version & 0xFF00F00) == 0x800F00) {
> + *eax = cpu->apic_id;
> + *ebx = (cs->nr_threads - 1) << 8 | cpu->core_id;
> + *ecx = cpu->socket_id;
> + *edx = 0;
> + } else {
> + *eax = 0;
> + *ebx = 0;
> + *ecx = 0;
> + *edx = 0;
> + }
> + break;
> case 0xC0000000:
> *eax = env->cpuid_xlevel2;
> *ebx = 0;
> @@ -3742,7 +3832,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
> * NOTE: the following code has to follow qemu_init_vcpu(). Otherwise
> * cs->nr_threads hasn't be populated yet and the checking is incorrect.
> */
> - if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned) {
> + if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned && \
> + (env->cpuid_version & 0xFF00F00) != 0x800F00) {
> error_report("AMD CPU doesn't support hyperthreading. Please configure"
> " -smp options properly.");
> ht_warned = true;
> diff --git a/target/i386/kvm.c b/target/i386/kvm.c
> index 6db7783edc..d6b4e1ae74 100644
> --- a/target/i386/kvm.c
> +++ b/target/i386/kvm.c
> @@ -869,9 +869,31 @@ int kvm_arch_init_vcpu(CPUState *cs)
> }
> c = &cpuid_data.entries[cpuid_i++];
>
> - c->function = i;
> - c->flags = 0;
> - cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx);
> + switch (i) {
> + case 0x8000001d:
> + for (j = 0; ; j++) {
> + c->function = i;
> + c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX;
> + c->index = j;
> + cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->edx);
> +
> + if (c->eax == 0) {
> + break;
> + }
> + if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
> + fprintf(stderr, "cpuid_data is full, no space for "
> + "cpuid(eax:0x%x,ecx:0x%x)\n", i, j);
> + abort();
> + }
> + c = &cpuid_data.entries[cpuid_i++];
> + }
> + break;
> + default:
> + c->function = i;
> + c->flags = 0;
> + cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx);
> + break;
> + }
> }
>
> /* Call Centaur's CPUID instructions they are supported. */
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] AMD Processor Topology Information
2017-11-08 12:44 ` Philippe Mathieu-Daudé
@ 2017-11-09 16:04 ` pixo
0 siblings, 0 replies; 6+ messages in thread
From: pixo @ 2017-11-09 16:04 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Andre Przywara, Eduardo Habkost, Daniel P. Berrange,
Longpeng(Mike),
Michael S. Tsirkin, Richard Henderson, Andreas Färber,
Benoît Canet, Paolo Bonzini, qemu-devel, qemu-trivial,
Philippe Mathieu-Daudé
Hi Philippe,
Most of the code for 'case 0x8000001E:' is a copy of 'case 4:' of the
same procedure in both cpu.c and kvm.c
Values were changes for AMD Zen architecture.
The only new code is 'case 0x8000001D:' which defines core topology.
Hope this info helps wit review.
On 2017-11-08 13:44, Philippe Mathieu-Daudé wrote:
> Hi Stanislav,
>
> This does not seem so trivial ;)
>
> Cc'ing more reviewers.
>
> On 11/03/2017 02:30 PM, Stanislav Lanci wrote:
>> V2:
>> Adds information about cache size and topology on leaf 0x8000001D for
>> family 17h
>> Without the added cache topology guest with SMT suffers latency
>> problems
>>
>> Add CPUID 0x8000001E for describing AMD Processor Topology Information
>> Disables warning about smt for 17h family of AMD CPUs
>>
>> Signed-off-by: Stanislav Lanci <pixo@polepetko.eu>
>> ---
>> target/i386/cpu.c | 93
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
>> target/i386/kvm.c | 28 +++++++++++++++--
>> 2 files changed, 117 insertions(+), 4 deletions(-)
>>
>> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
>> index ddc45abd70..1545e3fe31 100644
>> --- a/target/i386/cpu.c
>> +++ b/target/i386/cpu.c
>> @@ -113,7 +113,9 @@
>> /* L1 instruction cache: */
>> #define L1I_LINE_SIZE 64
>> #define L1I_ASSOCIATIVITY 8
>> +#define L1I_ASSOC_AMD_ZEN 4
>> #define L1I_SETS 64
>> +#define L1I_SETS_AMD_ZEN 256
>> #define L1I_PARTITIONS 1
>> /* Size = LINE_SIZE*ASSOCIATIVITY*SETS*PARTITIONS = 32KiB */
>> #define L1I_DESCRIPTOR CPUID_2_L1I_32KB_8WAY_64B
>> @@ -125,7 +127,9 @@
>> /* Level 2 unified cache: */
>> #define L2_LINE_SIZE 64
>> #define L2_ASSOCIATIVITY 16
>> +#define L2_ASSOC_AMD_ZEN 8
>> #define L2_SETS 4096
>> +#define L2_SETS_AMD_ZEN 1024
>> #define L2_PARTITIONS 1
>> /* Size = LINE_SIZE*ASSOCIATIVITY*SETS*PARTITIONS = 4MiB */
>> /*FIXME: CPUID leaf 2 descriptor is inconsistent with CPUID leaf 4 */
>> @@ -142,6 +146,7 @@
>> #define L3_N_LINE_SIZE 64
>> #define L3_N_ASSOCIATIVITY 16
>> #define L3_N_SETS 16384
>> +#define L3_N_SETS_AMD_ZEN 4096
>> #define L3_N_PARTITIONS 1
>> #define L3_N_DESCRIPTOR CPUID_2_L3_16MB_16WAY_64B
>> #define L3_N_LINES_PER_TAG 1
>> @@ -3072,6 +3077,91 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t
>> index, uint32_t count,
>> *edx = 0;
>> }
>> break;
>> + case 0x8000001D: /* AMD TOPOEXT cache info for ZEN */
>> + if (cpu->cache_info_passthrough) {
>> + host_cpuid(index, count, eax, ebx, ecx, edx);
>> + break;
>> + } else if ((env->cpuid_version & 0xFF00F00) == 0x800F00) {
>> + *eax = 0;
>> + switch (count) {
>> + case 0: /* L1 dcache info */
>> + *eax |= CPUID_4_TYPE_DCACHE | \
>> + CPUID_4_LEVEL(1) | \
>> + CPUID_4_SELF_INIT_LEVEL | \
>> + ((cs->nr_threads - 1) << 14);
>> + *ebx = (L1D_LINE_SIZE - 1) | \
>> + ((L1D_PARTITIONS - 1) << 12) | \
>> + ((L1D_ASSOCIATIVITY - 1) << 22);
>> + *ecx = L1D_SETS - 1;
>> + *edx = 0;
>> + break;
>> + case 1: /* L1 icache info */
>> + *eax |= CPUID_4_TYPE_ICACHE | \
>> + CPUID_4_LEVEL(1) | \
>> + CPUID_4_SELF_INIT_LEVEL | \
>> + ((cs->nr_threads - 1) << 14);
>> + *ebx = (L1I_LINE_SIZE - 1) | \
>> + ((L1I_PARTITIONS - 1) << 12) | \
>> + ((L1I_ASSOC_AMD_ZEN - 1) << 22);
>> + *ecx = L1I_SETS_AMD_ZEN - 1;
>> + *edx = 0;
>> + break;
>> + case 2: /* L2 cache info */
>> + *eax |= CPUID_4_TYPE_UNIFIED | \
>> + CPUID_4_LEVEL(2) | \
>> + CPUID_4_SELF_INIT_LEVEL | \
>> + ((cs->nr_threads - 1) << 14);
>> + *ebx = (L2_LINE_SIZE - 1) | \
>> + ((L2_PARTITIONS - 1) << 12) | \
>> + ((L2_ASSOC_AMD_ZEN - 1) << 22);
>> + *ecx = L2_SETS_AMD_ZEN - 1;
>> + *edx = CPUID_4_INCLUSIVE;
>> + break;
>> + case 3: /* L3 cache info */
>> + if (!cpu->enable_l3_cache) {
>> + *eax = 0;
>> + *ebx = 0;
>> + *ecx = 0;
>> + *edx = 0;
>> + break;
>> + }
>> + *eax |= CPUID_4_TYPE_UNIFIED | \
>> + CPUID_4_LEVEL(3) | \
>> + CPUID_4_SELF_INIT_LEVEL | \
>> + ((cs->nr_cores * cs->nr_threads - 1) << 14);
>> + *ebx = (L3_N_LINE_SIZE - 1) | \
>> + ((L3_N_PARTITIONS - 1) << 12) | \
>> + ((L3_N_ASSOCIATIVITY - 1) << 22);
>> + *ecx = L3_N_SETS_AMD_ZEN - 1;
>> + *edx = CPUID_4_NO_INVD_SHARING;
>> + break;
>> + default: /* end of info */
>> + *eax = 0;
>> + *ebx = 0;
>> + *ecx = 0;
>> + *edx = 0;
>> + break;
>> + }
>> + } else {
>> + *eax = 0;
>> + *ebx = 0;
>> + *ecx = 0;
>> + *edx = 0;
>> + }
>> + break;
>> + case 0x8000001E: /* AMD TOPOEXT cpu topology info for ZEN */
>> + if ((env->cpuid_version & 0xFF00F00) == 0x800F00) {
>> + *eax = cpu->apic_id;
>> + *ebx = (cs->nr_threads - 1) << 8 | cpu->core_id;
>> + *ecx = cpu->socket_id;
>> + *edx = 0;
>> + } else {
>> + *eax = 0;
>> + *ebx = 0;
>> + *ecx = 0;
>> + *edx = 0;
>> + }
>> + break;
>> case 0xC0000000:
>> *eax = env->cpuid_xlevel2;
>> *ebx = 0;
>> @@ -3742,7 +3832,8 @@ static void x86_cpu_realizefn(DeviceState *dev,
>> Error **errp)
>> * NOTE: the following code has to follow qemu_init_vcpu().
>> Otherwise
>> * cs->nr_threads hasn't be populated yet and the checking is
>> incorrect.
>> */
>> - if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned) {
>> + if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned && \
>> + (env->cpuid_version & 0xFF00F00) != 0x800F00) {
>> error_report("AMD CPU doesn't support hyperthreading. Please
>> configure"
>> " -smp options properly.");
>> ht_warned = true;
>> diff --git a/target/i386/kvm.c b/target/i386/kvm.c
>> index 6db7783edc..d6b4e1ae74 100644
>> --- a/target/i386/kvm.c
>> +++ b/target/i386/kvm.c
>> @@ -869,9 +869,31 @@ int kvm_arch_init_vcpu(CPUState *cs)
>> }
>> c = &cpuid_data.entries[cpuid_i++];
>>
>> - c->function = i;
>> - c->flags = 0;
>> - cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx);
>> + switch (i) {
>> + case 0x8000001d:
>> + for (j = 0; ; j++) {
>> + c->function = i;
>> + c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX;
>> + c->index = j;
>> + cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx,
>> &c->edx);
>> +
>> + if (c->eax == 0) {
>> + break;
>> + }
>> + if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
>> + fprintf(stderr, "cpuid_data is full, no space for
>> "
>> + "cpuid(eax:0x%x,ecx:0x%x)\n", i, j);
>> + abort();
>> + }
>> + c = &cpuid_data.entries[cpuid_i++];
>> + }
>> + break;
>> + default:
>> + c->function = i;
>> + c->flags = 0;
>> + cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx,
>> &c->edx);
>> + break;
>> + }
>> }
>>
>> /* Call Centaur's CPUID instructions they are supported. */
>>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] AMD Processor Topology Information
2017-11-03 17:30 [Qemu-devel] [PATCH] AMD Processor Topology Information Stanislav Lanci
2017-11-08 12:44 ` Philippe Mathieu-Daudé
@ 2018-01-25 21:56 ` Babu Moger
1 sibling, 0 replies; 6+ messages in thread
From: Babu Moger @ 2018-01-25 21:56 UTC (permalink / raw)
To: pixo, qemu-devel; +Cc: qemu-trivial, babu.moger
Hi Stanislav,
I am working on to support hyperthreading feature on kvm/qemu guests for
AMD EPYC family of processors. I saw your patch series
https://patchwork.ozlabs.org/patch/834022/.
I am planning to refresh these patches with few changes. Let me know
if it is fine with you.
Thanks
Babu
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] AMD Processor Topology Information
2017-10-29 21:22 Stanislav Lanci
@ 2017-10-29 22:14 ` no-reply
0 siblings, 0 replies; 6+ messages in thread
From: no-reply @ 2017-10-29 22:14 UTC (permalink / raw)
To: pixo; +Cc: famz, qemu-devel
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [Qemu-devel] [PATCH] AMD Processor Topology Information
Type: series
Message-id: 20171029212224.2777-1-pixo@polepetko.eu
=== TEST SCRIPT BEGIN ===
#!/bin/bash
BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0
git config --local diff.renamelimit 0
git config --local diff.renames True
commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
failed=1
echo
fi
n=$((n+1))
done
exit $failed
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/20171029212224.2777-1-pixo@polepetko.eu -> patchew/20171029212224.2777-1-pixo@polepetko.eu
Switched to a new branch 'test'
b10ea7470d AMD Processor Topology Information
=== OUTPUT BEGIN ===
Checking PATCH 1/1: AMD Processor Topology Information...
ERROR: space prohibited before that close parenthesis ')'
#26: FILE: target/i386/cpu.c:3119:
+ *ebx = (cs->nr_threads - 1 ) << 8 | cpu->core_id;
ERROR: line over 90 characters
#44: FILE: target/i386/cpu.c:3796:
+ if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned && (env->cpuid_version & 0xFF00F00) != 0x800F00) {
total: 2 errors, 0 warnings, 30 lines checked
Your patch has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH] AMD Processor Topology Information
@ 2017-10-29 21:22 Stanislav Lanci
2017-10-29 22:14 ` no-reply
0 siblings, 1 reply; 6+ messages in thread
From: Stanislav Lanci @ 2017-10-29 21:22 UTC (permalink / raw)
To: qemu-devel; +Cc: Stanislav Lanci
Add CPUID 0x8000001E for describing AMD Processor Topology Information
Disables warning about smt for 17h family of AMD CPUs
Signed-off-by: Stanislav Lanci <pixo@polepetko.eu>
---
target/i386/cpu.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ddc45abd70..5885b2dd9e 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -3072,6 +3072,22 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*edx = 0;
}
break;
+ case 0x8000001E:
+ /* AMD CPU Topology */
+ if (env->cpuid_vendor1 != CPUID_VENDOR_INTEL_1 ||
+ env->cpuid_vendor2 != CPUID_VENDOR_INTEL_2 ||
+ env->cpuid_vendor3 != CPUID_VENDOR_INTEL_3) {
+ *eax = cpu->apic_id;
+ *ebx = (cs->nr_threads - 1 ) << 8 | cpu->core_id;
+ *ecx = cpu->socket_id;
+ *edx = 0;
+ } else {
+ *eax = 0;
+ *ebx = 0;
+ *ecx = 0;
+ *edx = 0;
+ }
+ break;
case 0xC0000000:
*eax = env->cpuid_xlevel2;
*ebx = 0;
@@ -3742,7 +3758,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
* NOTE: the following code has to follow qemu_init_vcpu(). Otherwise
* cs->nr_threads hasn't be populated yet and the checking is incorrect.
*/
- if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned) {
+ if (!IS_INTEL_CPU(env) && cs->nr_threads > 1 && !ht_warned && (env->cpuid_version & 0xFF00F00) != 0x800F00) {
error_report("AMD CPU doesn't support hyperthreading. Please configure"
" -smp options properly.");
ht_warned = true;
--
2.14.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-01-25 21:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-03 17:30 [Qemu-devel] [PATCH] AMD Processor Topology Information Stanislav Lanci
2017-11-08 12:44 ` Philippe Mathieu-Daudé
2017-11-09 16:04 ` pixo
2018-01-25 21:56 ` Babu Moger
-- strict thread matches above, loose matches on Subject: below --
2017-10-29 21:22 Stanislav Lanci
2017-10-29 22:14 ` no-reply
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.