lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 103/849] KVM: PPC: Tick accounting should defer vtime accounting til after IRQ handling
    Date
    From: Laurent Vivier <lvivier@redhat.com>

    commit 235cee162459d96153d63651ce7ff51752528c96 upstream.

    Commit 112665286d08 ("KVM: PPC: Book3S HV: Context tracking exit guest
    context before enabling irqs") moved guest_exit() into the interrupt
    protected area to avoid wrong context warning (or worse). The problem is
    that tick-based time accounting has not yet been updated at this point
    (because it depends on the timer interrupt firing), so the guest time
    gets incorrectly accounted to system time.

    To fix the problem, follow the x86 fix in commit 160457140187 ("Defer
    vtime accounting 'til after IRQ handling"), and allow host IRQs to run
    before accounting the guest exit time.

    In the case vtime accounting is enabled, this is not required because TB
    is used directly for accounting.

    Before this patch, with CONFIG_TICK_CPU_ACCOUNTING=y in the host and a
    guest running a kernel compile, the 'guest' fields of /proc/stat are
    stuck at zero. With the patch they can be observed increasing roughly as
    expected.

    Fixes: e233d54d4d97 ("KVM: booke: use __kvm_guest_exit")
    Fixes: 112665286d08 ("KVM: PPC: Book3S HV: Context tracking exit guest context before enabling irqs")
    Cc: stable@vger.kernel.org # 5.12+
    Signed-off-by: Laurent Vivier <lvivier@redhat.com>
    [np: only required for tick accounting, add Book3E fix, tweak changelog]
    Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20211027142150.3711582-1-npiggin@gmail.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/powerpc/kvm/book3s_hv.c | 30 ++++++++++++++++++++++++++++--
    arch/powerpc/kvm/booke.c | 16 +++++++++++++++-
    2 files changed, 43 insertions(+), 3 deletions(-)

    --- a/arch/powerpc/kvm/book3s_hv.c
    +++ b/arch/powerpc/kvm/book3s_hv.c
    @@ -3687,7 +3687,20 @@ static noinline void kvmppc_run_core(str

    kvmppc_set_host_core(pcpu);

    - guest_exit_irqoff();
    + context_tracking_guest_exit();
    + if (!vtime_accounting_enabled_this_cpu()) {
    + local_irq_enable();
    + /*
    + * Service IRQs here before vtime_account_guest_exit() so any
    + * ticks that occurred while running the guest are accounted to
    + * the guest. If vtime accounting is enabled, accounting uses
    + * TB rather than ticks, so it can be done without enabling
    + * interrupts here, which has the problem that it accounts
    + * interrupt processing overhead to the host.
    + */
    + local_irq_disable();
    + }
    + vtime_account_guest_exit();

    local_irq_enable();

    @@ -4462,7 +4475,20 @@ int kvmhv_run_single_vcpu(struct kvm_vcp

    kvmppc_set_host_core(pcpu);

    - guest_exit_irqoff();
    + context_tracking_guest_exit();
    + if (!vtime_accounting_enabled_this_cpu()) {
    + local_irq_enable();
    + /*
    + * Service IRQs here before vtime_account_guest_exit() so any
    + * ticks that occurred while running the guest are accounted to
    + * the guest. If vtime accounting is enabled, accounting uses
    + * TB rather than ticks, so it can be done without enabling
    + * interrupts here, which has the problem that it accounts
    + * interrupt processing overhead to the host.
    + */
    + local_irq_disable();
    + }
    + vtime_account_guest_exit();

    local_irq_enable();

    --- a/arch/powerpc/kvm/booke.c
    +++ b/arch/powerpc/kvm/booke.c
    @@ -1047,7 +1047,21 @@ int kvmppc_handle_exit(struct kvm_vcpu *
    }

    trace_kvm_exit(exit_nr, vcpu);
    - guest_exit_irqoff();
    +
    + context_tracking_guest_exit();
    + if (!vtime_accounting_enabled_this_cpu()) {
    + local_irq_enable();
    + /*
    + * Service IRQs here before vtime_account_guest_exit() so any
    + * ticks that occurred while running the guest are accounted to
    + * the guest. If vtime accounting is enabled, accounting uses
    + * TB rather than ticks, so it can be done without enabling
    + * interrupts here, which has the problem that it accounts
    + * interrupt processing overhead to the host.
    + */
    + local_irq_disable();
    + }
    + vtime_account_guest_exit();

    local_irq_enable();


    \
     
     \ /
      Last update: 2021-11-15 22:50    [W:2.953 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site