From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TnrJA-0002Cl-7J for qemu-devel@nongnu.org; Wed, 26 Dec 2012 08:46:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TnrJ7-0003DJ-ON for qemu-devel@nongnu.org; Wed, 26 Dec 2012 08:46:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TnrJ7-0003D6-GV for qemu-devel@nongnu.org; Wed, 26 Dec 2012 08:46:05 -0500 From: Gleb Natapov Date: Wed, 26 Dec 2012 15:45:49 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/2] target-i386: Enabling IA32_TSC_ADJUST for QEMU KVM guest VMs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org From: Will Auld CPUID.7.0.EBX[1]=3D1 indicates IA32_TSC_ADJUST MSR 0x3b is supported Basic design is to emulate the MSR by allowing reads and writes to the hypervisor vcpu specific locations to store the value of the emulated MSR= s. In this way the IA32_TSC_ADJUST value will be included in all reads to the TSC MSR whether through rdmsr or rdtsc. As this is a new MSR that the guest may access and modify its value needs to be migrated along with the other MRSs. The changes here are specifical= ly for recognizing when IA32_TSC_ADJUST is enabled in CPUID and code added for migrating its value. Signed-off-by: Will Auld Reviewed-by: Andreas F=C3=A4rber Signed-off-by: Marcelo Tosatti --- target-i386/cpu.h | 2 ++ target-i386/kvm.c | 14 ++++++++++++++ target-i386/machine.c | 21 +++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 386c4f6..477da33 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -295,6 +295,7 @@ #define MSR_IA32_APICBASE_BSP (1<<8) #define MSR_IA32_APICBASE_ENABLE (1<<11) #define MSR_IA32_APICBASE_BASE (0xfffff<<12) +#define MSR_TSC_ADJUST 0x0000003b #define MSR_IA32_TSCDEADLINE 0x6e0 =20 #define MSR_MTRRcap 0xfe @@ -774,6 +775,7 @@ typedef struct CPUX86State { uint64_t pv_eoi_en_msr; =20 uint64_t tsc; + uint64_t tsc_adjust; uint64_t tsc_deadline; =20 uint64_t mcg_status; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index f669281..ae6ce1f 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -62,6 +62,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[= ] =3D { =20 static bool has_msr_star; static bool has_msr_hsave_pa; +static bool has_msr_tsc_adjust; static bool has_msr_tsc_deadline; static bool has_msr_async_pf_en; static bool has_msr_pv_eoi_en; @@ -676,6 +677,10 @@ static int kvm_get_supported_msrs(KVMState *s) has_msr_hsave_pa =3D true; continue; } + if (kvm_msr_list->indices[i] =3D=3D MSR_TSC_ADJUST) { + has_msr_tsc_adjust =3D true; + continue; + } if (kvm_msr_list->indices[i] =3D=3D MSR_IA32_TSCDEADLINE= ) { has_msr_tsc_deadline =3D true; continue; @@ -1013,6 +1018,9 @@ static int kvm_put_msrs(CPUX86State *env, int level= ) if (has_msr_hsave_pa) { kvm_msr_entry_set(&msrs[n++], MSR_VM_HSAVE_PA, env->vm_hsave); } + if (has_msr_tsc_adjust) { + kvm_msr_entry_set(&msrs[n++], MSR_TSC_ADJUST, env->tsc_adjust); + } if (has_msr_tsc_deadline) { kvm_msr_entry_set(&msrs[n++], MSR_IA32_TSCDEADLINE, env->tsc_dea= dline); } @@ -1273,6 +1281,9 @@ static int kvm_get_msrs(CPUX86State *env) if (has_msr_hsave_pa) { msrs[n++].index =3D MSR_VM_HSAVE_PA; } + if (has_msr_tsc_adjust) { + msrs[n++].index =3D MSR_TSC_ADJUST; + } if (has_msr_tsc_deadline) { msrs[n++].index =3D MSR_IA32_TSCDEADLINE; } @@ -1350,6 +1361,9 @@ static int kvm_get_msrs(CPUX86State *env) case MSR_IA32_TSC: env->tsc =3D msrs[i].data; break; + case MSR_TSC_ADJUST: + env->tsc_adjust =3D msrs[i].data; + break; case MSR_IA32_TSCDEADLINE: env->tsc_deadline =3D msrs[i].data; break; diff --git a/target-i386/machine.c b/target-i386/machine.c index 4771508..4229dde 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -328,6 +328,24 @@ static const VMStateDescription vmstate_fpop_ip_dp =3D= { } }; =20 +static bool tsc_adjust_needed(void *opaque) +{ + CPUX86State *env =3D opaque; + + return env->tsc_adjust !=3D 0; +} + +static const VMStateDescription vmstate_msr_tsc_adjust =3D { + .name =3D "cpu/msr_tsc_adjust", + .version_id =3D 1, + .minimum_version_id =3D 1, + .minimum_version_id_old =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT64(tsc_adjust, CPUX86State), + VMSTATE_END_OF_LIST() + } +}; + static bool tscdeadline_needed(void *opaque) { CPUX86State *env =3D opaque; @@ -478,6 +496,9 @@ static const VMStateDescription vmstate_cpu =3D { .vmsd =3D &vmstate_fpop_ip_dp, .needed =3D fpop_ip_dp_needed, }, { + .vmsd =3D &vmstate_msr_tsc_adjust, + .needed =3D tsc_adjust_needed, + }, { .vmsd =3D &vmstate_msr_tscdeadline, .needed =3D tscdeadline_needed, }, { --=20 1.7.10.4