lkml.org 
[lkml]   [2019]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 1/5] KVM: LAPIC: Make lapic timer unpinned
    Date
    From: Wanpeng Li <wanpengli@tencent.com>

    Make lapic timer unpinned when timer is injected by posted-interrupt,
    the emulated timer can be offload to the housekeeping cpus, kick after
    setting the pending timer request as alternative to commit 61abdbe0bcc.

    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Radim Krčmář <rkrcmar@redhat.com>
    Cc: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
    ---
    arch/x86/kvm/lapic.c | 8 ++++----
    arch/x86/kvm/x86.c | 6 +-----
    2 files changed, 5 insertions(+), 9 deletions(-)

    diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
    index e82a18c..87ecb56 100644
    --- a/arch/x86/kvm/lapic.c
    +++ b/arch/x86/kvm/lapic.c
    @@ -1578,7 +1578,7 @@ static void start_sw_tscdeadline(struct kvm_lapic *apic)
    likely(ns > apic->lapic_timer.timer_advance_ns)) {
    expire = ktime_add_ns(now, ns);
    expire = ktime_sub_ns(expire, ktimer->timer_advance_ns);
    - hrtimer_start(&ktimer->timer, expire, HRTIMER_MODE_ABS_PINNED);
    + hrtimer_start(&ktimer->timer, expire, HRTIMER_MODE_ABS);
    } else
    apic_timer_expired(apic);

    @@ -1680,7 +1680,7 @@ static void start_sw_period(struct kvm_lapic *apic)

    hrtimer_start(&apic->lapic_timer.timer,
    apic->lapic_timer.target_expiration,
    - HRTIMER_MODE_ABS_PINNED);
    + HRTIMER_MODE_ABS);
    }

    bool kvm_lapic_hv_timer_in_use(struct kvm_vcpu *vcpu)
    @@ -2317,7 +2317,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu, int timer_advance_ns)
    apic->vcpu = vcpu;

    hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
    - HRTIMER_MODE_ABS_PINNED);
    + HRTIMER_MODE_ABS);
    apic->lapic_timer.timer.function = apic_timer_fn;
    if (timer_advance_ns == -1) {
    apic->lapic_timer.timer_advance_ns = 1000;
    @@ -2506,7 +2506,7 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu)

    timer = &vcpu->arch.apic->lapic_timer.timer;
    if (hrtimer_cancel(timer))
    - hrtimer_start_expires(timer, HRTIMER_MODE_ABS_PINNED);
    + hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
    }

    /*
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index 0a05a4e..9450a16 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -1437,12 +1437,8 @@ static void update_pvclock_gtod(struct timekeeper *tk)

    void kvm_set_pending_timer(struct kvm_vcpu *vcpu)
    {
    - /*
    - * Note: KVM_REQ_PENDING_TIMER is implicitly checked in
    - * vcpu_enter_guest. This function is only called from
    - * the physical CPU that is running vcpu.
    - */
    kvm_make_request(KVM_REQ_PENDING_TIMER, vcpu);
    + kvm_vcpu_kick(vcpu);
    }

    static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
    --
    2.7.4
    \
     
     \ /
      Last update: 2019-06-17 13:25    [W:2.794 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site