2020-08-04 06:11:27

by Wanpeng Li

Subject: [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled

From: Wanpeng Li <[email protected]>

Return 0 when getting the tscdeadline timer if the lapic is hw disabled

Suggested-by: Paolo Bonzini <[email protected]>
Signed-off-by: Wanpeng Li <[email protected]>
---
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

2020-08-04 06:11:48

by Wanpeng Li

Subject: [PATCH 2/2] KVM: LAPIC: Guarantee the timer is in tsc-deadline mode when setting

From: Wanpeng Li <[email protected]>

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 <[email protected]>
---
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

2020-08-04 21:20:40

by Sean Christopherson

Subject: Re: [PATCH 2/2] KVM: LAPIC: Guarantee the timer is in tsc-deadline mode when setting

On Tue, Aug 04, 2020 at 02:10:48PM +0800, Wanpeng Li wrote:
> From: Wanpeng Li <[email protected]>
>
> 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 <[email protected]>
> ---
> 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
>

2020-08-04 21:22:53

by Sean Christopherson

Subject: Re: [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled

On Tue, Aug 04, 2020 at 02:10:47PM +0800, Wanpeng Li wrote:
> From: Wanpeng Li <[email protected]>
>
> Return 0 when getting the tscdeadline timer if the lapic is hw disabled
>
> Suggested-by: Paolo Bonzini <[email protected]>
> Signed-off-by: Wanpeng Li <[email protected]>
> ---
> 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
>

2020-08-10 09:11:01

by Wanpeng Li

Subject: Re: [PATCH 1/2] KVM: LAPIC: Return 0 when getting the tscdeadline timer if the lapic is hw disabled

On Wed, 5 Aug 2020 at 05:19, Sean Christopherson
<[email protected]> wrote:
>
> On Tue, Aug 04, 2020 at 02:10:47PM +0800, Wanpeng Li wrote:
> > From: Wanpeng Li <[email protected]>
> >
> > Return 0 when getting the tscdeadline timer if the lapic is hw disabled
> >
> > Suggested-by: Paolo Bonzini <[email protected]>
> > Signed-off-by: Wanpeng Li <[email protected]>
> > ---
> > 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