b9085bcbf5
Common: Optional support for adding a small amount of polling on each HLT instruction executed in the guest (or equivalent for other architectures). This can improve latency up to 50% on some scenarios (e.g. O_DSYNC writes or TCP_RR netperf tests). This also has to be enabled manually for now, but the plan is to auto-tune this in the future. ARM/ARM64: the highlights are support for GICv3 emulation and dirty page tracking s390: several optimizations and bugfixes. Also a first: a feature exposed by KVM (UUID and long guest name in /proc/sysinfo) before it is available in IBM's hypervisor! :) MIPS: Bugfixes. x86: Support for PML (page modification logging, a new feature in Broadwell Xeons that speeds up dirty page tracking), nested virtualization improvements (nested APICv---a nice optimization), usual round of emulation fixes. There is also a new option to reduce latency of the TSC deadline timer in the guest; this needs to be tuned manually. Some commits are common between this pull and Catalin's; I see you have already included his tree. ARM has other conflicts where functions are added in the same place by 3.19-rc and 3.20 patches. These are not large though, and entirely within KVM. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJU28rkAAoJEL/70l94x66DXqQH/1TDOfJIjW7P2kb0Sw7Fy1wi cEX1KO/VFxAqc8R0E/0Wb55CXyPjQJM6xBXuFr5cUDaIjQ8ULSktL4pEwXyyv/s5 DBDkN65mriry2w5VuEaRLVcuX9Wy+tqLQXWNkEySfyb4uhZChWWHvKEcgw5SqCyg NlpeHurYESIoNyov3jWqvBjr4OmaQENyv7t2c6q5ErIgG02V+iCux5QGbphM2IC9 LFtPKxoqhfeB2xFxTOIt8HJiXrZNwflsTejIlCl/NSEiDVLLxxHCxK2tWK/tUXMn JfLD9ytXBWtNMwInvtFm4fPmDouv2VDyR0xnK2db+/axsJZnbxqjGu1um4Dqbak= =7gdx -----END PGP SIGNATURE----- Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Pull KVM update from Paolo Bonzini: "Fairly small update, but there are some interesting new features. Common: Optional support for adding a small amount of polling on each HLT instruction executed in the guest (or equivalent for other architectures). This can improve latency up to 50% on some scenarios (e.g. O_DSYNC writes or TCP_RR netperf tests). This also has to be enabled manually for now, but the plan is to auto-tune this in the future. ARM/ARM64: The highlights are support for GICv3 emulation and dirty page tracking s390: Several optimizations and bugfixes. Also a first: a feature exposed by KVM (UUID and long guest name in /proc/sysinfo) before it is available in IBM's hypervisor! :) MIPS: Bugfixes. x86: Support for PML (page modification logging, a new feature in Broadwell Xeons that speeds up dirty page tracking), nested virtualization improvements (nested APICv---a nice optimization), usual round of emulation fixes. There is also a new option to reduce latency of the TSC deadline timer in the guest; this needs to be tuned manually. Some commits are common between this pull and Catalin's; I see you have already included his tree. Powerpc: Nothing yet. The KVM/PPC changes will come in through the PPC maintainers, because I haven't received them yet and I might end up being offline for some part of next week" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (130 commits) KVM: ia64: drop kvm.h from installed user headers KVM: x86: fix build with !CONFIG_SMP KVM: x86: emulate: correct page fault error code for NoWrite instructions KVM: Disable compat ioctl for s390 KVM: s390: add cpu model support KVM: s390: use facilities and cpu_id per KVM KVM: s390/CPACF: Choose crypto control block format s390/kernel: Update /proc/sysinfo file with Extended Name and UUID KVM: s390: reenable LPP facility KVM: s390: floating irqs: fix user triggerable endless loop kvm: add halt_poll_ns module parameter kvm: remove KVM_MMIO_SIZE KVM: MIPS: Don't leak FPU/DSP to guest KVM: MIPS: Disable HTW while in guest KVM: nVMX: Enable nested posted interrupt processing KVM: nVMX: Enable nested virtual interrupt delivery KVM: nVMX: Enable nested apic register virtualization KVM: nVMX: Make nested control MSRs per-cpu KVM: nVMX: Enable nested virtualize x2apic mode KVM: nVMX: Prepare for using hardware MSR bitmap ...
293 lines
7.3 KiB
C
293 lines
7.3 KiB
C
/*
|
|
* Copyright (C) 2012,2013 - ARM Ltd
|
|
* Author: Marc Zyngier <marc.zyngier@arm.com>
|
|
*
|
|
* Derived from arch/arm/include/kvm_emulate.h
|
|
* Copyright (C) 2012 - Virtual Open Systems and Columbia University
|
|
* Author: Christoffer Dall <c.dall@virtualopensystems.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, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef __ARM64_KVM_EMULATE_H__
|
|
#define __ARM64_KVM_EMULATE_H__
|
|
|
|
#include <linux/kvm_host.h>
|
|
|
|
#include <asm/esr.h>
|
|
#include <asm/kvm_arm.h>
|
|
#include <asm/kvm_asm.h>
|
|
#include <asm/kvm_mmio.h>
|
|
#include <asm/ptrace.h>
|
|
#include <asm/cputype.h>
|
|
|
|
unsigned long *vcpu_reg32(const struct kvm_vcpu *vcpu, u8 reg_num);
|
|
unsigned long *vcpu_spsr32(const struct kvm_vcpu *vcpu);
|
|
|
|
bool kvm_condition_valid32(const struct kvm_vcpu *vcpu);
|
|
void kvm_skip_instr32(struct kvm_vcpu *vcpu, bool is_wide_instr);
|
|
|
|
void kvm_inject_undefined(struct kvm_vcpu *vcpu);
|
|
void kvm_inject_dabt(struct kvm_vcpu *vcpu, unsigned long addr);
|
|
void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr);
|
|
|
|
static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)
|
|
{
|
|
vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;
|
|
if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features))
|
|
vcpu->arch.hcr_el2 &= ~HCR_RW;
|
|
}
|
|
|
|
static inline unsigned long vcpu_get_hcr(struct kvm_vcpu *vcpu)
|
|
{
|
|
return vcpu->arch.hcr_el2;
|
|
}
|
|
|
|
static inline void vcpu_set_hcr(struct kvm_vcpu *vcpu, unsigned long hcr)
|
|
{
|
|
vcpu->arch.hcr_el2 = hcr;
|
|
}
|
|
|
|
static inline unsigned long *vcpu_pc(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return (unsigned long *)&vcpu_gp_regs(vcpu)->regs.pc;
|
|
}
|
|
|
|
static inline unsigned long *vcpu_elr_el1(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return (unsigned long *)&vcpu_gp_regs(vcpu)->elr_el1;
|
|
}
|
|
|
|
static inline unsigned long *vcpu_cpsr(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return (unsigned long *)&vcpu_gp_regs(vcpu)->regs.pstate;
|
|
}
|
|
|
|
static inline bool vcpu_mode_is_32bit(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return !!(*vcpu_cpsr(vcpu) & PSR_MODE32_BIT);
|
|
}
|
|
|
|
static inline bool kvm_condition_valid(const struct kvm_vcpu *vcpu)
|
|
{
|
|
if (vcpu_mode_is_32bit(vcpu))
|
|
return kvm_condition_valid32(vcpu);
|
|
|
|
return true;
|
|
}
|
|
|
|
static inline void kvm_skip_instr(struct kvm_vcpu *vcpu, bool is_wide_instr)
|
|
{
|
|
if (vcpu_mode_is_32bit(vcpu))
|
|
kvm_skip_instr32(vcpu, is_wide_instr);
|
|
else
|
|
*vcpu_pc(vcpu) += 4;
|
|
}
|
|
|
|
static inline void vcpu_set_thumb(struct kvm_vcpu *vcpu)
|
|
{
|
|
*vcpu_cpsr(vcpu) |= COMPAT_PSR_T_BIT;
|
|
}
|
|
|
|
static inline unsigned long *vcpu_reg(const struct kvm_vcpu *vcpu, u8 reg_num)
|
|
{
|
|
if (vcpu_mode_is_32bit(vcpu))
|
|
return vcpu_reg32(vcpu, reg_num);
|
|
|
|
return (unsigned long *)&vcpu_gp_regs(vcpu)->regs.regs[reg_num];
|
|
}
|
|
|
|
/* Get vcpu SPSR for current mode */
|
|
static inline unsigned long *vcpu_spsr(const struct kvm_vcpu *vcpu)
|
|
{
|
|
if (vcpu_mode_is_32bit(vcpu))
|
|
return vcpu_spsr32(vcpu);
|
|
|
|
return (unsigned long *)&vcpu_gp_regs(vcpu)->spsr[KVM_SPSR_EL1];
|
|
}
|
|
|
|
static inline bool vcpu_mode_priv(const struct kvm_vcpu *vcpu)
|
|
{
|
|
u32 mode = *vcpu_cpsr(vcpu) & PSR_MODE_MASK;
|
|
|
|
if (vcpu_mode_is_32bit(vcpu))
|
|
return mode > COMPAT_PSR_MODE_USR;
|
|
|
|
return mode != PSR_MODE_EL0t;
|
|
}
|
|
|
|
static inline u32 kvm_vcpu_get_hsr(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return vcpu->arch.fault.esr_el2;
|
|
}
|
|
|
|
static inline unsigned long kvm_vcpu_get_hfar(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return vcpu->arch.fault.far_el2;
|
|
}
|
|
|
|
static inline phys_addr_t kvm_vcpu_get_fault_ipa(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return ((phys_addr_t)vcpu->arch.fault.hpfar_el2 & HPFAR_MASK) << 8;
|
|
}
|
|
|
|
static inline u32 kvm_vcpu_hvc_get_imm(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return kvm_vcpu_get_hsr(vcpu) & ESR_ELx_xVC_IMM_MASK;
|
|
}
|
|
|
|
static inline bool kvm_vcpu_dabt_isvalid(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_ISV);
|
|
}
|
|
|
|
static inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_WNR);
|
|
}
|
|
|
|
static inline bool kvm_vcpu_dabt_issext(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_SSE);
|
|
}
|
|
|
|
static inline int kvm_vcpu_dabt_get_rd(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return (kvm_vcpu_get_hsr(vcpu) & ESR_ELx_SRT_MASK) >> ESR_ELx_SRT_SHIFT;
|
|
}
|
|
|
|
static inline bool kvm_vcpu_dabt_isextabt(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_EA);
|
|
}
|
|
|
|
static inline bool kvm_vcpu_dabt_iss1tw(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_S1PTW);
|
|
}
|
|
|
|
static inline int kvm_vcpu_dabt_get_as(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return 1 << ((kvm_vcpu_get_hsr(vcpu) & ESR_ELx_SAS) >> ESR_ELx_SAS_SHIFT);
|
|
}
|
|
|
|
/* This one is not specific to Data Abort */
|
|
static inline bool kvm_vcpu_trap_il_is32bit(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_IL);
|
|
}
|
|
|
|
static inline u8 kvm_vcpu_trap_get_class(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return kvm_vcpu_get_hsr(vcpu) >> ESR_ELx_EC_SHIFT;
|
|
}
|
|
|
|
static inline bool kvm_vcpu_trap_is_iabt(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return kvm_vcpu_trap_get_class(vcpu) == ESR_ELx_EC_IABT_LOW;
|
|
}
|
|
|
|
static inline u8 kvm_vcpu_trap_get_fault(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return kvm_vcpu_get_hsr(vcpu) & ESR_ELx_FSC;
|
|
}
|
|
|
|
static inline u8 kvm_vcpu_trap_get_fault_type(const struct kvm_vcpu *vcpu)
|
|
{
|
|
return kvm_vcpu_get_hsr(vcpu) & ESR_ELx_FSC_TYPE;
|
|
}
|
|
|
|
static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)
|
|
{
|
|
return vcpu_sys_reg(vcpu, MPIDR_EL1) & MPIDR_HWID_BITMASK;
|
|
}
|
|
|
|
static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)
|
|
{
|
|
if (vcpu_mode_is_32bit(vcpu))
|
|
*vcpu_cpsr(vcpu) |= COMPAT_PSR_E_BIT;
|
|
else
|
|
vcpu_sys_reg(vcpu, SCTLR_EL1) |= (1 << 25);
|
|
}
|
|
|
|
static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu)
|
|
{
|
|
if (vcpu_mode_is_32bit(vcpu))
|
|
return !!(*vcpu_cpsr(vcpu) & COMPAT_PSR_E_BIT);
|
|
|
|
return !!(vcpu_sys_reg(vcpu, SCTLR_EL1) & (1 << 25));
|
|
}
|
|
|
|
static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,
|
|
unsigned long data,
|
|
unsigned int len)
|
|
{
|
|
if (kvm_vcpu_is_be(vcpu)) {
|
|
switch (len) {
|
|
case 1:
|
|
return data & 0xff;
|
|
case 2:
|
|
return be16_to_cpu(data & 0xffff);
|
|
case 4:
|
|
return be32_to_cpu(data & 0xffffffff);
|
|
default:
|
|
return be64_to_cpu(data);
|
|
}
|
|
} else {
|
|
switch (len) {
|
|
case 1:
|
|
return data & 0xff;
|
|
case 2:
|
|
return le16_to_cpu(data & 0xffff);
|
|
case 4:
|
|
return le32_to_cpu(data & 0xffffffff);
|
|
default:
|
|
return le64_to_cpu(data);
|
|
}
|
|
}
|
|
|
|
return data; /* Leave LE untouched */
|
|
}
|
|
|
|
static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu,
|
|
unsigned long data,
|
|
unsigned int len)
|
|
{
|
|
if (kvm_vcpu_is_be(vcpu)) {
|
|
switch (len) {
|
|
case 1:
|
|
return data & 0xff;
|
|
case 2:
|
|
return cpu_to_be16(data & 0xffff);
|
|
case 4:
|
|
return cpu_to_be32(data & 0xffffffff);
|
|
default:
|
|
return cpu_to_be64(data);
|
|
}
|
|
} else {
|
|
switch (len) {
|
|
case 1:
|
|
return data & 0xff;
|
|
case 2:
|
|
return cpu_to_le16(data & 0xffff);
|
|
case 4:
|
|
return cpu_to_le32(data & 0xffffffff);
|
|
default:
|
|
return cpu_to_le64(data);
|
|
}
|
|
}
|
|
|
|
return data; /* Leave LE untouched */
|
|
}
|
|
|
|
#endif /* __ARM64_KVM_EMULATE_H__ */
|