* [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled
@ 2020-08-04 6:10 Wanpeng Li
2020-08-04 6:10 ` [PATCH 2/2] KVM: LAPIC: Guarantee the timer is in tsc-deadline mode when setting Wanpeng Li
2020-08-04 21:19 ` [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled Sean Christopherson
0 siblings, 2 replies; 5+ messages in thread
From: Wanpeng Li @ 2020-08-04 6:10 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: Paolo Bonzini, Sean Christopherson, Vitaly Kuznetsov, Wanpeng Li,
Jim Mattson, Joerg Roedel
From: Wanpeng Li <wanpengli@tencent.com>
Return 0 when getting the tscdeadline timer if the lapic is hw disabled
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
---
arch/x86/kvm/lapic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index cfb8504..d89ab48 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -2182,7 +2182,7 @@ u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu)
{
struct kvm_lapic *apic = vcpu->arch.apic;
- if (!lapic_in_kernel(vcpu) ||
+ if (!kvm_apic_present(vcpu) ||
!apic_lvtt_tscdeadline(apic))
return 0;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] KVM: LAPIC: Guarantee the timer is in tsc-deadline mode when setting
2020-08-04 6:10 [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled Wanpeng Li
@ 2020-08-04 6:10 ` Wanpeng Li
2020-08-04 21:19 ` Sean Christopherson
2020-08-04 21:19 ` [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled Sean Christopherson
1 sibling, 1 reply; 5+ messages in thread
From: Wanpeng Li @ 2020-08-04 6:10 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: Paolo Bonzini, Sean Christopherson, Vitaly Kuznetsov, Wanpeng Li,
Jim Mattson, Joerg Roedel
From: Wanpeng Li <wanpengli@tencent.com>
Check apic_lvtt_tscdeadline() mode directly instead of apic_lvtt_oneshot()
and apic_lvtt_period() to guarantee the timer is in tsc-deadline mode when
wrmsr MSR_IA32_TSCDEADLINE.
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
---
arch/x86/kvm/lapic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index d89ab48..7b11fa8 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -2193,8 +2193,8 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data)
{
struct kvm_lapic *apic = vcpu->arch.apic;
- if (!kvm_apic_present(vcpu) || apic_lvtt_oneshot(apic) ||
- apic_lvtt_period(apic))
+ if (!kvm_apic_present(vcpu) ||
+ !apic_lvtt_tscdeadline(apic))
return;
hrtimer_cancel(&apic->lapic_timer.timer);
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] KVM: LAPIC: Guarantee the timer is in tsc-deadline mode when setting
2020-08-04 6:10 ` [PATCH 2/2] KVM: LAPIC: Guarantee the timer is in tsc-deadline mode when setting Wanpeng Li
@ 2020-08-04 21:19 ` Sean Christopherson
0 siblings, 0 replies; 5+ messages in thread
From: Sean Christopherson @ 2020-08-04 21:19 UTC (permalink / raw)
To: Wanpeng Li
Cc: linux-kernel, kvm, Paolo Bonzini, Vitaly Kuznetsov, Wanpeng Li,
Jim Mattson, Joerg Roedel
On Tue, Aug 04, 2020 at 02:10:48PM +0800, Wanpeng Li wrote:
> From: Wanpeng Li <wanpengli@tencent.com>
>
> Check apic_lvtt_tscdeadline() mode directly instead of apic_lvtt_oneshot()
> and apic_lvtt_period() to guarantee the timer is in tsc-deadline mode when
> wrmsr MSR_IA32_TSCDEADLINE.
>
> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> ---
> arch/x86/kvm/lapic.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index d89ab48..7b11fa8 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -2193,8 +2193,8 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data)
> {
> struct kvm_lapic *apic = vcpu->arch.apic;
>
> - if (!kvm_apic_present(vcpu) || apic_lvtt_oneshot(apic) ||
> - apic_lvtt_period(apic))
> + if (!kvm_apic_present(vcpu) ||
> + !apic_lvtt_tscdeadline(apic))
Definitely prefer to fix the indentation here since both lines are touched
anyways.
> return;
>
> hrtimer_cancel(&apic->lapic_timer.timer);
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled
2020-08-04 6:10 [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled Wanpeng Li
2020-08-04 6:10 ` [PATCH 2/2] KVM: LAPIC: Guarantee the timer is in tsc-deadline mode when setting Wanpeng Li
@ 2020-08-04 21:19 ` Sean Christopherson
2020-08-10 9:09 ` Wanpeng Li
1 sibling, 1 reply; 5+ messages in thread
From: Sean Christopherson @ 2020-08-04 21:19 UTC (permalink / raw)
To: Wanpeng Li
Cc: linux-kernel, kvm, Paolo Bonzini, Vitaly Kuznetsov, Wanpeng Li,
Jim Mattson, Joerg Roedel
On Tue, Aug 04, 2020 at 02:10:47PM +0800, Wanpeng Li wrote:
> From: Wanpeng Li <wanpengli@tencent.com>
>
> Return 0 when getting the tscdeadline timer if the lapic is hw disabled
>
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> ---
> arch/x86/kvm/lapic.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index cfb8504..d89ab48 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -2182,7 +2182,7 @@ u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu)
> {
> struct kvm_lapic *apic = vcpu->arch.apic;
>
> - if (!lapic_in_kernel(vcpu) ||
> + if (!kvm_apic_present(vcpu) ||
> !apic_lvtt_tscdeadline(apic))
Paolo, want want to fix up the indentation when applying?
if (!kvm_apic_present(vcpu) || !apic_lvtt_tscdeadline(apic)
> return 0;
>
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled
2020-08-04 21:19 ` [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled Sean Christopherson
@ 2020-08-10 9:09 ` Wanpeng Li
0 siblings, 0 replies; 5+ messages in thread
From: Wanpeng Li @ 2020-08-10 9:09 UTC (permalink / raw)
To: Sean Christopherson
Cc: LKML, kvm, Paolo Bonzini, Vitaly Kuznetsov, Wanpeng Li,
Jim Mattson, Joerg Roedel
On Wed, 5 Aug 2020 at 05:19, Sean Christopherson
<sean.j.christopherson@intel.com> wrote:
>
> On Tue, Aug 04, 2020 at 02:10:47PM +0800, Wanpeng Li wrote:
> > From: Wanpeng Li <wanpengli@tencent.com>
> >
> > Return 0 when getting the tscdeadline timer if the lapic is hw disabled
> >
> > Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> > Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> > ---
> > arch/x86/kvm/lapic.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> > index cfb8504..d89ab48 100644
> > --- a/arch/x86/kvm/lapic.c
> > +++ b/arch/x86/kvm/lapic.c
> > @@ -2182,7 +2182,7 @@ u64 kvm_get_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu)
> > {
> > struct kvm_lapic *apic = vcpu->arch.apic;
> >
> > - if (!lapic_in_kernel(vcpu) ||
> > + if (!kvm_apic_present(vcpu) ||
> > !apic_lvtt_tscdeadline(apic))
>
> Paolo, want want to fix up the indentation when applying?
>
> if (!kvm_apic_present(vcpu) || !apic_lvtt_tscdeadline(apic)
Agreed, Paolo do you need I send another version or you can fix up
when applying?
Wanpeng
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-10 9:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-04 6:10 [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled Wanpeng Li
2020-08-04 6:10 ` [PATCH 2/2] KVM: LAPIC: Guarantee the timer is in tsc-deadline mode when setting Wanpeng Li
2020-08-04 21:19 ` Sean Christopherson
2020-08-04 21:19 ` [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled Sean Christopherson
2020-08-10 9:09 ` Wanpeng Li
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.