![Jintack Lim](/assets/img/avatar_default.png)
Current KVM world switch code is unintentionally setting wrong bits to CNTHCTL_EL2 when E2H == 1, which may allow guest OS to access physical timer. Bit positions of CNTHCTL_EL2 are changing depending on HCR_EL2.E2H bit. EL1PCEN and EL1PCTEN are 1st and 0th bits when E2H is not set, but they are 11th and 10th bits respectively when E2H is set. In fact, on VHE we only need to set those bits once, not for every world switch. This is because the host kernel runs in EL2 with HCR_EL2.TGE == 1, which makes those bits have no effect for the host kernel execution. So we just set those bits once for guests, and that's it. Signed-off-by: Jintack Lim <jintack@cs.columbia.edu> Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
81 lines
2.3 KiB
C
81 lines
2.3 KiB
C
/*
|
|
* Copyright (C) 2012 ARM Ltd.
|
|
* Author: Marc Zyngier <marc.zyngier@arm.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#ifndef __ASM_ARM_KVM_ARCH_TIMER_H
|
|
#define __ASM_ARM_KVM_ARCH_TIMER_H
|
|
|
|
#include <linux/clocksource.h>
|
|
#include <linux/hrtimer.h>
|
|
#include <linux/workqueue.h>
|
|
|
|
struct arch_timer_kvm {
|
|
/* Virtual offset */
|
|
u64 cntvoff;
|
|
};
|
|
|
|
struct arch_timer_cpu {
|
|
/* Registers: control register, timer value */
|
|
u32 cntv_ctl; /* Saved/restored */
|
|
u64 cntv_cval; /* Saved/restored */
|
|
|
|
/*
|
|
* Anything that is not used directly from assembly code goes
|
|
* here.
|
|
*/
|
|
|
|
/* Background timer used when the guest is not running */
|
|
struct hrtimer timer;
|
|
|
|
/* Work queued with the above timer expires */
|
|
struct work_struct expired;
|
|
|
|
/* Background timer active */
|
|
bool armed;
|
|
|
|
/* Timer IRQ */
|
|
struct kvm_irq_level irq;
|
|
|
|
/* Active IRQ state caching */
|
|
bool active_cleared_last;
|
|
|
|
/* Is the timer enabled */
|
|
bool enabled;
|
|
};
|
|
|
|
int kvm_timer_hyp_init(void);
|
|
int kvm_timer_enable(struct kvm_vcpu *vcpu);
|
|
void kvm_timer_init(struct kvm *kvm);
|
|
int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu,
|
|
const struct kvm_irq_level *irq);
|
|
void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu);
|
|
void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu);
|
|
void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu);
|
|
void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu);
|
|
|
|
u64 kvm_arm_timer_get_reg(struct kvm_vcpu *, u64 regid);
|
|
int kvm_arm_timer_set_reg(struct kvm_vcpu *, u64 regid, u64 value);
|
|
|
|
bool kvm_timer_should_fire(struct kvm_vcpu *vcpu);
|
|
void kvm_timer_schedule(struct kvm_vcpu *vcpu);
|
|
void kvm_timer_unschedule(struct kvm_vcpu *vcpu);
|
|
|
|
void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu);
|
|
|
|
void kvm_timer_init_vhe(void);
|
|
#endif
|