cea8896bd9
The kvm_riscv_vcpu_timer_pending() checks per-VCPU next_cycles
and per-VCPU software injected VS timer interrupt. This function
returns incorrect value when Sstc is available because the per-VCPU
next_cycles are only updated by kvm_riscv_vcpu_timer_save() called
from kvm_arch_vcpu_put(). As a result, when Sstc is available the
VCPU does not block properly upon WFI traps.
To fix the above issue, we introduce kvm_riscv_vcpu_timer_sync()
which will update per-VCPU next_cycles upon every VM exit instead
of kvm_riscv_vcpu_timer_save().
Fixes: 8f5cb44b1bae ("RISC-V: KVM: Support sstc extension")
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Anup Patel <anup@brainfault.org>
53 lines
1.6 KiB
C
53 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2019 Western Digital Corporation or its affiliates.
|
|
*
|
|
* Authors:
|
|
* Atish Patra <atish.patra@wdc.com>
|
|
*/
|
|
|
|
#ifndef __KVM_VCPU_RISCV_TIMER_H
|
|
#define __KVM_VCPU_RISCV_TIMER_H
|
|
|
|
#include <linux/hrtimer.h>
|
|
|
|
struct kvm_guest_timer {
|
|
/* Mult & Shift values to get nanoseconds from cycles */
|
|
u32 nsec_mult;
|
|
u32 nsec_shift;
|
|
/* Time delta value */
|
|
u64 time_delta;
|
|
};
|
|
|
|
struct kvm_vcpu_timer {
|
|
/* Flag for whether init is done */
|
|
bool init_done;
|
|
/* Flag for whether timer event is configured */
|
|
bool next_set;
|
|
/* Next timer event cycles */
|
|
u64 next_cycles;
|
|
/* Underlying hrtimer instance */
|
|
struct hrtimer hrt;
|
|
|
|
/* Flag to check if sstc is enabled or not */
|
|
bool sstc_enabled;
|
|
/* A function pointer to switch between stimecmp or hrtimer at runtime */
|
|
int (*timer_next_event)(struct kvm_vcpu *vcpu, u64 ncycles);
|
|
};
|
|
|
|
int kvm_riscv_vcpu_timer_next_event(struct kvm_vcpu *vcpu, u64 ncycles);
|
|
int kvm_riscv_vcpu_get_reg_timer(struct kvm_vcpu *vcpu,
|
|
const struct kvm_one_reg *reg);
|
|
int kvm_riscv_vcpu_set_reg_timer(struct kvm_vcpu *vcpu,
|
|
const struct kvm_one_reg *reg);
|
|
int kvm_riscv_vcpu_timer_init(struct kvm_vcpu *vcpu);
|
|
int kvm_riscv_vcpu_timer_deinit(struct kvm_vcpu *vcpu);
|
|
int kvm_riscv_vcpu_timer_reset(struct kvm_vcpu *vcpu);
|
|
void kvm_riscv_vcpu_timer_restore(struct kvm_vcpu *vcpu);
|
|
void kvm_riscv_guest_timer_init(struct kvm *kvm);
|
|
void kvm_riscv_vcpu_timer_sync(struct kvm_vcpu *vcpu);
|
|
void kvm_riscv_vcpu_timer_save(struct kvm_vcpu *vcpu);
|
|
bool kvm_riscv_vcpu_timer_pending(struct kvm_vcpu *vcpu);
|
|
|
|
#endif
|