From: Zhao Liu <zhao1.liu@linux.intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Eduardo Habkost <eduardo@habkost.net>,
"Michael S . Tsirkin" <mst@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Tim Wiederhake <twiederh@redhat.com>
Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org,
Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH for-9.1 4/7] target/i386/kvm: Save/load MSRs of new kvmclock (KVM_FEATURE_CLOCKSOURCE2)
Date: Fri, 29 Mar 2024 18:19:51 +0800 [thread overview]
Message-ID: <20240329101954.3954987-5-zhao1.liu@linux.intel.com> (raw)
In-Reply-To: <20240329101954.3954987-1-zhao1.liu@linux.intel.com>
From: Zhao Liu <zhao1.liu@intel.com>
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 b1b8d11cb0fe..b339f9ce454f 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 498580d60c3b..4a6bf0581859 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -3323,6 +3323,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_FEAT_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_FEAT_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, env->async_pf_int_msr);
}
@@ -3790,6 +3796,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_FEAT_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_FEAT_KVM_ASYNCPF_INT) {
kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_INT, 0);
}
@@ -4029,6 +4039,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
next prev parent reply other threads:[~2024-03-29 10:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 10:19 [PATCH for-9.1 0/7] target/i386/kvm: Cleanup the kvmclock feature name Zhao Liu
2024-03-29 10:19 ` [PATCH for-9.1 1/7] target/i386/kvm: Add feature bit definitions for KVM CPUID Zhao Liu
2024-04-24 11:25 ` Xiaoyao Li
2024-03-29 10:19 ` [PATCH for-9.1 2/7] target/i386/kvm: Remove local MSR_KVM_WALL_CLOCK and MSR_KVM_SYSTEM_TIME definitions Zhao Liu
2024-04-24 15:11 ` Xiaoyao Li
2024-03-29 10:19 ` [PATCH for-9.1 3/7] target/i386/kvm: Only Save/load kvmclock MSRs when kvmclock enabled Zhao Liu
2024-03-29 10:19 ` Zhao Liu [this message]
2024-03-29 10:19 ` [PATCH for-9.1 5/7] target/i386/kvm: Add legacy_kvmclock cpu property Zhao Liu
2024-03-29 10:19 ` [PATCH for-9.1 6/7] target/i386: Fix duplicated kvmclock name in FEAT_KVM Zhao Liu
2024-03-29 10:19 ` [PATCH for-9.1 7/7] target/i386/kvm: Update comment in kvm_cpu_realizefn() Zhao Liu
2024-04-24 10:33 ` [PATCH for-9.1 0/7] target/i386/kvm: Cleanup the kvmclock feature name Zhao Liu
2024-04-24 15:57 ` Xiaoyao Li
2024-04-25 7:17 ` Zhao Liu
2024-04-25 8:40 ` Xiaoyao Li
2024-04-25 10:29 ` Zhao Liu
2024-04-25 12:04 ` Xiaoyao Li
2024-04-25 13:36 ` Zhao Liu
2024-05-29 13:58 ` Zhao Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240329101954.3954987-5-zhao1.liu@linux.intel.com \
--to=zhao1.liu@linux.intel.com \
--cc=eduardo@habkost.net \
--cc=imammedo@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=twiederh@redhat.com \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).