* [PATCH 1/6] target/i386/kvm: Add feature bit definitions for KVM CPUID
2024-04-26 10:07 [PATCH 0/6] target/i386: Misc cleanup on KVM PV defs and outdated comments Zhao Liu
@ 2024-04-26 10:07 ` Zhao Liu
2024-04-26 17:23 ` Chen, Zide
2024-04-26 10:07 ` [PATCH 2/6] target/i386/kvm: Remove local MSR_KVM_WALL_CLOCK and MSR_KVM_SYSTEM_TIME definitions Zhao Liu
` (5 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Zhao Liu @ 2024-04-26 10:07 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: Xiaoyao Li, qemu-devel, kvm, Zhao Liu
Add feature definiations for KVM_CPUID_FEATURES in CPUID (
CPUID[4000_0001].EAX and CPUID[4000_0001].EDX), to get rid of lots of
offset calculations.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
v2: Changed the prefix from CPUID_FEAT_KVM_* to CPUID_KVM_*. (Xiaoyao)
---
hw/i386/kvm/clock.c | 5 ++---
target/i386/cpu.h | 23 +++++++++++++++++++++++
target/i386/kvm/kvm.c | 28 ++++++++++++++--------------
3 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 40aa9a32c32c..ce416c05a3d0 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -27,7 +27,6 @@
#include "qapi/error.h"
#include <linux/kvm.h>
-#include "standard-headers/asm-x86/kvm_para.h"
#include "qom/object.h"
#define TYPE_KVM_CLOCK "kvmclock"
@@ -334,8 +333,8 @@ void kvmclock_create(bool create_always)
assert(kvm_enabled());
if (create_always ||
- cpu->env.features[FEAT_KVM] & ((1ULL << KVM_FEATURE_CLOCKSOURCE) |
- (1ULL << KVM_FEATURE_CLOCKSOURCE2))) {
+ cpu->env.features[FEAT_KVM] & (CPUID_KVM_CLOCK |
+ CPUID_KVM_CLOCK2)) {
sysbus_create_simple(TYPE_KVM_CLOCK, -1, NULL);
}
}
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 6112e27bfd5c..caa32a91346b 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -27,6 +27,7 @@
#include "qapi/qapi-types-common.h"
#include "qemu/cpu-float.h"
#include "qemu/timer.h"
+#include "standard-headers/asm-x86/kvm_para.h"
#define XEN_NR_VIRQS 24
@@ -951,6 +952,28 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,
/* Packets which contain IP payload have LIP values */
#define CPUID_14_0_ECX_LIP (1U << 31)
+/* (Old) KVM paravirtualized clocksource */
+#define CPUID_KVM_CLOCK (1U << KVM_FEATURE_CLOCKSOURCE)
+/* (New) KVM specific paravirtualized clocksource */
+#define CPUID_KVM_CLOCK2 (1U << KVM_FEATURE_CLOCKSOURCE2)
+/* KVM asynchronous page fault */
+#define CPUID_KVM_ASYNCPF (1U << KVM_FEATURE_ASYNC_PF)
+/* KVM stolen (when guest vCPU is not running) time accounting */
+#define CPUID_KVM_STEAL_TIME (1U << KVM_FEATURE_STEAL_TIME)
+/* KVM paravirtualized end-of-interrupt signaling */
+#define CPUID_KVM_PV_EOI (1U << KVM_FEATURE_PV_EOI)
+/* KVM paravirtualized spinlocks support */
+#define CPUID_KVM_PV_UNHALT (1U << KVM_FEATURE_PV_UNHALT)
+/* KVM host-side polling on HLT control from the guest */
+#define CPUID_KVM_POLL_CONTROL (1U << KVM_FEATURE_POLL_CONTROL)
+/* KVM interrupt based asynchronous page fault*/
+#define CPUID_KVM_ASYNCPF_INT (1U << KVM_FEATURE_ASYNC_PF_INT)
+/* KVM 'Extended Destination ID' support for external interrupts */
+#define CPUID_KVM_MSI_EXT_DEST_ID (1U << KVM_FEATURE_MSI_EXT_DEST_ID)
+
+/* Hint to KVM that vCPUs expect never preempted for an unlimited time */
+#define CPUID_KVM_HINTS_REALTIME (1U << KVM_HINTS_REALTIME)
+
/* CLZERO instruction */
#define CPUID_8000_0008_EBX_CLZERO (1U << 0)
/* Always save/restore FP error pointers */
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index c5943605ee3a..d9e03891113f 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -527,13 +527,13 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
* be enabled without the in-kernel irqchip
*/
if (!kvm_irqchip_in_kernel()) {
- ret &= ~(1U << KVM_FEATURE_PV_UNHALT);
+ ret &= ~CPUID_KVM_PV_UNHALT;
}
if (kvm_irqchip_is_split()) {
- ret |= 1U << KVM_FEATURE_MSI_EXT_DEST_ID;
+ ret |= CPUID_KVM_MSI_EXT_DEST_ID;
}
} else if (function == KVM_CPUID_FEATURES && reg == R_EDX) {
- ret |= 1U << KVM_HINTS_REALTIME;
+ ret |= CPUID_KVM_HINTS_REALTIME;
}
return ret;
@@ -3377,20 +3377,20 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
kvm_msr_entry_add(cpu, MSR_IA32_TSC, env->tsc);
kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, env->system_time_msr);
kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_ASYNC_PF_INT)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, env->async_pf_int_msr);
}
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_ASYNC_PF)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_EN, env->async_pf_en_msr);
}
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_PV_EOI)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_PV_EOI) {
kvm_msr_entry_add(cpu, MSR_KVM_PV_EOI_EN, env->pv_eoi_en_msr);
}
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_STEAL_TIME)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_STEAL_TIME) {
kvm_msr_entry_add(cpu, MSR_KVM_STEAL_TIME, env->steal_time_msr);
}
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_POLL_CONTROL)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_POLL_CONTROL) {
kvm_msr_entry_add(cpu, MSR_KVM_POLL_CONTROL, env->poll_control_msr);
}
@@ -3842,19 +3842,19 @@ static int kvm_get_msrs(X86CPU *cpu)
#endif
kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, 0);
kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, 0);
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_ASYNC_PF_INT)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, 0);
}
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_ASYNC_PF)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_EN, 0);
}
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_PV_EOI)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_PV_EOI) {
kvm_msr_entry_add(cpu, MSR_KVM_PV_EOI_EN, 0);
}
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_STEAL_TIME)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_STEAL_TIME) {
kvm_msr_entry_add(cpu, MSR_KVM_STEAL_TIME, 0);
}
- if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_POLL_CONTROL)) {
+ if (env->features[FEAT_KVM] & CPUID_KVM_POLL_CONTROL) {
kvm_msr_entry_add(cpu, MSR_KVM_POLL_CONTROL, 1);
}
if (has_architectural_pmu_version > 0) {
@@ -5487,7 +5487,7 @@ uint64_t kvm_swizzle_msi_ext_dest_id(uint64_t address)
return address;
}
env = &X86_CPU(first_cpu)->env;
- if (!(env->features[FEAT_KVM] & (1 << KVM_FEATURE_MSI_EXT_DEST_ID))) {
+ if (!(env->features[FEAT_KVM] & CPUID_KVM_MSI_EXT_DEST_ID)) {
return address;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/6] target/i386/kvm: Add feature bit definitions for KVM CPUID
2024-04-26 10:07 ` [PATCH 1/6] target/i386/kvm: Add feature bit definitions for KVM CPUID Zhao Liu
@ 2024-04-26 17:23 ` Chen, Zide
2024-05-06 2:54 ` Zhao Liu
0 siblings, 1 reply; 13+ messages in thread
From: Chen, Zide @ 2024-04-26 17:23 UTC (permalink / raw)
To: Zhao Liu, Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: Xiaoyao Li, qemu-devel, kvm
On 4/26/2024 3:07 AM, Zhao Liu wrote:
> Add feature definiations for KVM_CPUID_FEATURES in CPUID (
> CPUID[4000_0001].EAX and CPUID[4000_0001].EDX), to get rid of lots of
> offset calculations.
>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
> v2: Changed the prefix from CPUID_FEAT_KVM_* to CPUID_KVM_*. (Xiaoyao)
> ---
> hw/i386/kvm/clock.c | 5 ++---
> target/i386/cpu.h | 23 +++++++++++++++++++++++
> target/i386/kvm/kvm.c | 28 ++++++++++++++--------------
> 3 files changed, 39 insertions(+), 17 deletions(-)
>
> diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
> index 40aa9a32c32c..ce416c05a3d0 100644
> --- a/hw/i386/kvm/clock.c
> +++ b/hw/i386/kvm/clock.c
> @@ -27,7 +27,6 @@
> #include "qapi/error.h"
>
> #include <linux/kvm.h>
> -#include "standard-headers/asm-x86/kvm_para.h"
> #include "qom/object.h"
>
> #define TYPE_KVM_CLOCK "kvmclock"
> @@ -334,8 +333,8 @@ void kvmclock_create(bool create_always)
>
> assert(kvm_enabled());
> if (create_always ||
> - cpu->env.features[FEAT_KVM] & ((1ULL << KVM_FEATURE_CLOCKSOURCE) |
> - (1ULL << KVM_FEATURE_CLOCKSOURCE2))) {
> + cpu->env.features[FEAT_KVM] & (CPUID_KVM_CLOCK |
> + CPUID_KVM_CLOCK2)) {
To achieve this purpose, how about doing the alternative to define an
API similar to KVM's guest_pv_has()?
xxxx_has() is simpler and clearer than "features[] & CPUID_xxxxx",
additionally, this helps to keep the definitions identical to KVM, more
readable and easier for future maintenance.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/6] target/i386/kvm: Add feature bit definitions for KVM CPUID
2024-04-26 17:23 ` Chen, Zide
@ 2024-05-06 2:54 ` Zhao Liu
0 siblings, 0 replies; 13+ messages in thread
From: Zhao Liu @ 2024-05-06 2:54 UTC (permalink / raw)
To: Chen, Zide
Cc: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti,
Xiaoyao Li, qemu-devel, kvm
Hi Zide,
On Fri, Apr 26, 2024 at 10:23:27AM -0700, Chen, Zide wrote:
> Date: Fri, 26 Apr 2024 10:23:27 -0700
> From: "Chen, Zide" <zide.chen@intel.com>
> Subject: Re: [PATCH 1/6] target/i386/kvm: Add feature bit definitions for
> KVM CPUID
>
> On 4/26/2024 3:07 AM, Zhao Liu wrote:
> > Add feature definiations for KVM_CPUID_FEATURES in CPUID (
> > CPUID[4000_0001].EAX and CPUID[4000_0001].EDX), to get rid of lots of
> > offset calculations.
> >
> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> > ---
> > v2: Changed the prefix from CPUID_FEAT_KVM_* to CPUID_KVM_*. (Xiaoyao)
> > ---
> > hw/i386/kvm/clock.c | 5 ++---
> > target/i386/cpu.h | 23 +++++++++++++++++++++++
> > target/i386/kvm/kvm.c | 28 ++++++++++++++--------------
> > 3 files changed, 39 insertions(+), 17 deletions(-)
> >
> > diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
> > index 40aa9a32c32c..ce416c05a3d0 100644
> > --- a/hw/i386/kvm/clock.c
> > +++ b/hw/i386/kvm/clock.c
> > @@ -27,7 +27,6 @@
> > #include "qapi/error.h"
> >
> > #include <linux/kvm.h>
> > -#include "standard-headers/asm-x86/kvm_para.h"
> > #include "qom/object.h"
> >
> > #define TYPE_KVM_CLOCK "kvmclock"
> > @@ -334,8 +333,8 @@ void kvmclock_create(bool create_always)
> >
> > assert(kvm_enabled());
> > if (create_always ||
> > - cpu->env.features[FEAT_KVM] & ((1ULL << KVM_FEATURE_CLOCKSOURCE) |
> > - (1ULL << KVM_FEATURE_CLOCKSOURCE2))) {
> > + cpu->env.features[FEAT_KVM] & (CPUID_KVM_CLOCK |
> > + CPUID_KVM_CLOCK2)) {
>
> To achieve this purpose, how about doing the alternative to define an
> API similar to KVM's guest_pv_has()?
>
> xxxx_has() is simpler and clearer than "features[] & CPUID_xxxxx",
> additionally, this helps to keep the definitions identical to KVM, more
> readable and easier for future maintenance.
Yes, it's a clearer way! I can explore the xxxx_has() pattern in another
series and try to expand it to more CPUID leaves.
Thanks,
Zhao
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/6] target/i386/kvm: Remove local MSR_KVM_WALL_CLOCK and MSR_KVM_SYSTEM_TIME definitions
2024-04-26 10:07 [PATCH 0/6] target/i386: Misc cleanup on KVM PV defs and outdated comments Zhao Liu
2024-04-26 10:07 ` [PATCH 1/6] target/i386/kvm: Add feature bit definitions for KVM CPUID Zhao Liu
@ 2024-04-26 10:07 ` Zhao Liu
2024-04-26 10:07 ` [PATCH 3/6] target/i386/kvm: Only Save/load kvmclock MSRs when kvmclock enabled Zhao Liu
` (4 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Zhao Liu @ 2024-04-26 10:07 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: Xiaoyao Li, qemu-devel, kvm, Zhao Liu
These 2 MSRs have been already defined in the kvm_para header
(standard-headers/asm-x86/kvm_para.h).
Remove QEMU local definitions to avoid duplication.
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
target/i386/kvm/kvm.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index d9e03891113f..b2c52ec9561f 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -79,9 +79,6 @@
#define KVM_APIC_BUS_CYCLE_NS 1
#define KVM_APIC_BUS_FREQUENCY (1000000000ULL / KVM_APIC_BUS_CYCLE_NS)
-#define MSR_KVM_WALL_CLOCK 0x11
-#define MSR_KVM_SYSTEM_TIME 0x12
-
/* A 4096-byte buffer can hold the 8-byte kvm_msrs header, plus
* 255 kvm_msr_entry structs */
#define MSR_BUF_SIZE 4096
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 3/6] target/i386/kvm: Only Save/load kvmclock MSRs when kvmclock enabled
2024-04-26 10:07 [PATCH 0/6] target/i386: Misc cleanup on KVM PV defs and outdated comments Zhao Liu
2024-04-26 10:07 ` [PATCH 1/6] target/i386/kvm: Add feature bit definitions for KVM CPUID Zhao Liu
2024-04-26 10:07 ` [PATCH 2/6] target/i386/kvm: Remove local MSR_KVM_WALL_CLOCK and MSR_KVM_SYSTEM_TIME definitions Zhao Liu
@ 2024-04-26 10:07 ` Zhao Liu
2024-04-26 10:07 ` [PATCH 4/6] target/i386/kvm: Save/load MSRs of kvmclock2 (KVM_FEATURE_CLOCKSOURCE2) Zhao Liu
` (3 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Zhao Liu @ 2024-04-26 10:07 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: Xiaoyao Li, qemu-devel, kvm, Zhao Liu
MSR_KVM_SYSTEM_TIME and MSR_KVM_WALL_CLOCK are attached with the (old)
kvmclock feature (KVM_FEATURE_CLOCKSOURCE).
So, just save/load them only when kvmclock (KVM_FEATURE_CLOCKSOURCE) is
enabled.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
target/i386/kvm/kvm.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index b2c52ec9561f..75d2091c4f8c 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -3372,8 +3372,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
*/
if (level >= KVM_PUT_RESET_STATE) {
kvm_msr_entry_add(cpu, MSR_IA32_TSC, env->tsc);
- kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, env->system_time_msr);
- kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
+ if (env->features[FEAT_KVM] & CPUID_KVM_CLOCK) {
+ kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, env->system_time_msr);
+ kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
+ }
if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, env->async_pf_int_msr);
}
@@ -3837,8 +3839,10 @@ static int kvm_get_msrs(X86CPU *cpu)
kvm_msr_entry_add(cpu, MSR_LSTAR, 0);
}
#endif
- kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, 0);
- kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, 0);
+ if (env->features[FEAT_KVM] & CPUID_KVM_CLOCK) {
+ kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, 0);
+ kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, 0);
+ }
if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, 0);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/6] target/i386/kvm: Save/load MSRs of kvmclock2 (KVM_FEATURE_CLOCKSOURCE2)
2024-04-26 10:07 [PATCH 0/6] target/i386: Misc cleanup on KVM PV defs and outdated comments Zhao Liu
` (2 preceding siblings ...)
2024-04-26 10:07 ` [PATCH 3/6] target/i386/kvm: Only Save/load kvmclock MSRs when kvmclock enabled Zhao Liu
@ 2024-04-26 10:07 ` Zhao Liu
2024-04-26 10:07 ` [PATCH 4/6] target/i386/kvm: Save/load MSRs of new kvmclock (KVM_FEATURE_CLOCKSOURCE2) Zhao Liu
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Zhao Liu @ 2024-04-26 10:07 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: Xiaoyao Li, qemu-devel, kvm, Zhao Liu
MSR_KVM_SYSTEM_TIME_NEW and MSR_KVM_WALL_CLOCK_NEW are bound to
kvmclock2 (KVM_FEATURE_CLOCKSOURCE2).
Add the save/load support for these 2 MSR just like kvmclock MSRs.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
target/i386/cpu.h | 2 ++
target/i386/kvm/kvm.c | 16 ++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index caa32a91346b..c5cf7734b202 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1741,6 +1741,8 @@ typedef struct CPUArchState {
uint64_t system_time_msr;
uint64_t wall_clock_msr;
+ uint64_t system_time_new_msr;
+ uint64_t wall_clock_new_msr;
uint64_t steal_time_msr;
uint64_t async_pf_en_msr;
uint64_t async_pf_int_msr;
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 75d2091c4f8c..ee0767e8f501 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -3376,6 +3376,12 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, env->system_time_msr);
kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
}
+ if (env->features[FEAT_KVM] & CPUID_KVM_CLOCK2) {
+ kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME_NEW,
+ env->system_time_new_msr);
+ kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK_NEW,
+ env->wall_clock_new_msr);
+ }
if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, env->async_pf_int_msr);
}
@@ -3843,6 +3849,10 @@ static int kvm_get_msrs(X86CPU *cpu)
kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, 0);
kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, 0);
}
+ if (env->features[FEAT_KVM] & CPUID_KVM_CLOCK2) {
+ kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME_NEW, 0);
+ kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK_NEW, 0);
+ }
if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, 0);
}
@@ -4082,6 +4092,12 @@ static int kvm_get_msrs(X86CPU *cpu)
case MSR_KVM_WALL_CLOCK:
env->wall_clock_msr = msrs[i].data;
break;
+ case MSR_KVM_SYSTEM_TIME_NEW:
+ env->system_time_new_msr = msrs[i].data;
+ break;
+ case MSR_KVM_WALL_CLOCK_NEW:
+ env->wall_clock_new_msr = msrs[i].data;
+ break;
case MSR_MCG_STATUS:
env->mcg_status = msrs[i].data;
break;
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 4/6] target/i386/kvm: Save/load MSRs of new kvmclock (KVM_FEATURE_CLOCKSOURCE2)
2024-04-26 10:07 [PATCH 0/6] target/i386: Misc cleanup on KVM PV defs and outdated comments Zhao Liu
` (3 preceding siblings ...)
2024-04-26 10:07 ` [PATCH 4/6] target/i386/kvm: Save/load MSRs of kvmclock2 (KVM_FEATURE_CLOCKSOURCE2) Zhao Liu
@ 2024-04-26 10:07 ` Zhao Liu
2024-04-26 10:07 ` [PATCH 5/6] target/i386/kvm: Drop workaround for KVM_X86_DISABLE_EXITS_HTL typo Zhao Liu
2024-04-26 10:07 ` [PATCH 6/6] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type() Zhao Liu
6 siblings, 0 replies; 13+ messages in thread
From: Zhao Liu @ 2024-04-26 10:07 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: Xiaoyao Li, qemu-devel, kvm, Zhao Liu
MSR_KVM_SYSTEM_TIME_NEW and MSR_KVM_WALL_CLOCK_NEW are bound to new
kvmclock (KVM_FEATURE_CLOCKSOURCE2).
Add the save/load support for these 2 MSRs.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
target/i386/cpu.h | 2 ++
target/i386/kvm/kvm.c | 16 ++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index caa32a91346b..c5cf7734b202 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1741,6 +1741,8 @@ typedef struct CPUArchState {
uint64_t system_time_msr;
uint64_t wall_clock_msr;
+ uint64_t system_time_new_msr;
+ uint64_t wall_clock_new_msr;
uint64_t steal_time_msr;
uint64_t async_pf_en_msr;
uint64_t async_pf_int_msr;
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 75d2091c4f8c..ee0767e8f501 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -3376,6 +3376,12 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, env->system_time_msr);
kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
}
+ if (env->features[FEAT_KVM] & CPUID_KVM_CLOCK2) {
+ kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME_NEW,
+ env->system_time_new_msr);
+ kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK_NEW,
+ env->wall_clock_new_msr);
+ }
if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, env->async_pf_int_msr);
}
@@ -3843,6 +3849,10 @@ static int kvm_get_msrs(X86CPU *cpu)
kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, 0);
kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, 0);
}
+ if (env->features[FEAT_KVM] & CPUID_KVM_CLOCK2) {
+ kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME_NEW, 0);
+ kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK_NEW, 0);
+ }
if (env->features[FEAT_KVM] & CPUID_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, 0);
}
@@ -4082,6 +4092,12 @@ static int kvm_get_msrs(X86CPU *cpu)
case MSR_KVM_WALL_CLOCK:
env->wall_clock_msr = msrs[i].data;
break;
+ case MSR_KVM_SYSTEM_TIME_NEW:
+ env->system_time_new_msr = msrs[i].data;
+ break;
+ case MSR_KVM_WALL_CLOCK_NEW:
+ env->wall_clock_new_msr = msrs[i].data;
+ break;
case MSR_MCG_STATUS:
env->mcg_status = msrs[i].data;
break;
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 5/6] target/i386/kvm: Drop workaround for KVM_X86_DISABLE_EXITS_HTL typo
2024-04-26 10:07 [PATCH 0/6] target/i386: Misc cleanup on KVM PV defs and outdated comments Zhao Liu
` (4 preceding siblings ...)
2024-04-26 10:07 ` [PATCH 4/6] target/i386/kvm: Save/load MSRs of new kvmclock (KVM_FEATURE_CLOCKSOURCE2) Zhao Liu
@ 2024-04-26 10:07 ` Zhao Liu
2024-04-26 10:07 ` [PATCH 6/6] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type() Zhao Liu
6 siblings, 0 replies; 13+ messages in thread
From: Zhao Liu @ 2024-04-26 10:07 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: Xiaoyao Li, qemu-devel, kvm, Zhao Liu
The KVM_X86_DISABLE_EXITS_HTL typo has been fixed in commit
77d361b13c19 ("linux-headers: Update to kernel mainline commit
b357bf602").
Drop the related workaround.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
target/i386/kvm/kvm.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index ee0767e8f501..b3ce7da37947 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -2692,10 +2692,6 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
if (enable_cpu_pm) {
int disable_exits = kvm_check_extension(s, KVM_CAP_X86_DISABLE_EXITS);
-/* Work around for kernel header with a typo. TODO: fix header and drop. */
-#if defined(KVM_X86_DISABLE_EXITS_HTL) && !defined(KVM_X86_DISABLE_EXITS_HLT)
-#define KVM_X86_DISABLE_EXITS_HLT KVM_X86_DISABLE_EXITS_HTL
-#endif
if (disable_exits) {
disable_exits &= (KVM_X86_DISABLE_EXITS_MWAIT |
KVM_X86_DISABLE_EXITS_HLT |
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 6/6] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type()
2024-04-26 10:07 [PATCH 0/6] target/i386: Misc cleanup on KVM PV defs and outdated comments Zhao Liu
` (5 preceding siblings ...)
2024-04-26 10:07 ` [PATCH 5/6] target/i386/kvm: Drop workaround for KVM_X86_DISABLE_EXITS_HTL typo Zhao Liu
@ 2024-04-26 10:07 ` Zhao Liu
2024-04-26 11:56 ` Gupta, Pankaj
2024-04-26 23:05 ` Xiaoyao Li
6 siblings, 2 replies; 13+ messages in thread
From: Zhao Liu @ 2024-04-26 10:07 UTC (permalink / raw)
To: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: Xiaoyao Li, qemu-devel, kvm, Zhao Liu
Update the comment to match the X86ConfidentialGuestClass
implementation.
Suggested-by: Xiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
target/i386/confidential-guest.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/i386/confidential-guest.h b/target/i386/confidential-guest.h
index 532e172a60b6..06d54a120227 100644
--- a/target/i386/confidential-guest.h
+++ b/target/i386/confidential-guest.h
@@ -44,7 +44,7 @@ struct X86ConfidentialGuestClass {
/**
* x86_confidential_guest_kvm_type:
*
- * Calls #X86ConfidentialGuestClass.unplug callback of @plug_handler.
+ * Calls #X86ConfidentialGuestClass.kvm_type() callback.
*/
static inline int x86_confidential_guest_kvm_type(X86ConfidentialGuest *cg)
{
--
2.34.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 6/6] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type()
2024-04-26 10:07 ` [PATCH 6/6] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type() Zhao Liu
@ 2024-04-26 11:56 ` Gupta, Pankaj
2024-04-26 23:05 ` Xiaoyao Li
1 sibling, 0 replies; 13+ messages in thread
From: Gupta, Pankaj @ 2024-04-26 11:56 UTC (permalink / raw)
To: Zhao Liu, Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: Xiaoyao Li, qemu-devel, kvm
> Update the comment to match the X86ConfidentialGuestClass
> implementation.
>
> Suggested-by: Xiaoyao Li <xiaoyao.li@intel.com>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
> target/i386/confidential-guest.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/i386/confidential-guest.h b/target/i386/confidential-guest.h
> index 532e172a60b6..06d54a120227 100644
> --- a/target/i386/confidential-guest.h
> +++ b/target/i386/confidential-guest.h
> @@ -44,7 +44,7 @@ struct X86ConfidentialGuestClass {
> /**
> * x86_confidential_guest_kvm_type:
> *
> - * Calls #X86ConfidentialGuestClass.unplug callback of @plug_handler.
> + * Calls #X86ConfidentialGuestClass.kvm_type() callback.
> */
> static inline int x86_confidential_guest_kvm_type(X86ConfidentialGuest *cg)
> {
Reviewed-by: Pankaj Gupta <pankaj.gupta@amd.com>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 6/6] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type()
2024-04-26 10:07 ` [PATCH 6/6] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type() Zhao Liu
2024-04-26 11:56 ` Gupta, Pankaj
@ 2024-04-26 23:05 ` Xiaoyao Li
2024-05-06 2:57 ` Zhao Liu
1 sibling, 1 reply; 13+ messages in thread
From: Xiaoyao Li @ 2024-04-26 23:05 UTC (permalink / raw)
To: Zhao Liu, Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti
Cc: qemu-devel, kvm
On 4/26/2024 6:07 PM, Zhao Liu wrote:
> Update the comment to match the X86ConfidentialGuestClass
> implementation.
>
> Suggested-by: Xiaoyao Li <xiaoyao.li@intel.com>
I think it should be "Reported-by"
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
> target/i386/confidential-guest.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/i386/confidential-guest.h b/target/i386/confidential-guest.h
> index 532e172a60b6..06d54a120227 100644
> --- a/target/i386/confidential-guest.h
> +++ b/target/i386/confidential-guest.h
> @@ -44,7 +44,7 @@ struct X86ConfidentialGuestClass {
> /**
> * x86_confidential_guest_kvm_type:
> *
> - * Calls #X86ConfidentialGuestClass.unplug callback of @plug_handler.
> + * Calls #X86ConfidentialGuestClass.kvm_type() callback.
> */
> static inline int x86_confidential_guest_kvm_type(X86ConfidentialGuest *cg)
> {
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 6/6] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type()
2024-04-26 23:05 ` Xiaoyao Li
@ 2024-05-06 2:57 ` Zhao Liu
0 siblings, 0 replies; 13+ messages in thread
From: Zhao Liu @ 2024-05-06 2:57 UTC (permalink / raw)
To: Xiaoyao Li
Cc: Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Michael S . Tsirkin, Marcel Apfelbaum, Marcelo Tosatti,
qemu-devel, kvm
Hi Xiaoyao,
On Sat, Apr 27, 2024 at 07:05:41AM +0800, Xiaoyao Li wrote:
> Date: Sat, 27 Apr 2024 07:05:41 +0800
> From: Xiaoyao Li <xiaoyao.li@intel.com>
> Subject: Re: [PATCH 6/6] target/i386/confidential-guest: Fix comment of
> x86_confidential_guest_kvm_type()
>
> On 4/26/2024 6:07 PM, Zhao Liu wrote:
> > Update the comment to match the X86ConfidentialGuestClass
> > implementation.
> >
> > Suggested-by: Xiaoyao Li <xiaoyao.li@intel.com>
>
> I think it should be "Reported-by"
>
Right, let me fix and respin it.
Thanks,
Zhao
^ permalink raw reply [flat|nested] 13+ messages in thread