mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-09-04 20:19:47 +08:00 
			
		
		
		
	 ede5822242
			
		
	
	
		ede5822242
		
	
	
	
	
		
			
			- A couple a basic fixes for running BE guests on a LE host - A performance improvement for overcommitted VMs (same as the equivalent patch for ARM) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABAgAGBQJSfLSVAAoJECPQ0LrRPXpDMG0QAJrTocErN2BQMDoT9DpcQhh6 yoD6KjbS3O4lWz60wJ0BgJ6gcQFg7JiFrPk6JcyT+ykXYf1UuLymUhAkU7Sw+0lP GVt7sr2SaaQd6ZjGphWyWPXuDbvN1CxyIi7TD4CNe0tTYwSI6Vaf19h2Bkjd+VfJ o2Sf2zHz4mutTCmPJuqnI255MLveTyQr/VZT1xNS79FiJM3/j3+UxCEi1fwgTkkb 4l3AyW9RN2mmTsS4VE6an2iosCi9pqoAC3y88vnaeBpUHIf/O2O57sT0+8o7jM6z 6uZVesMsKNmDtkMUFRQyj4Mps3yIVcccDpFJr4UcZH+ipbM+5nPY8AlYcKqk+4KY T7Zys1hITq7xSEK4HiQt+AJnXDXZF5YZnzqUqVQHZFBn5P1GfB4/Bo9E3+QG68oq AO1ry6SiRRPmTAZVeYqV82DX1YSjbvghvvPXhtPvolNhyzJJooBvhpWfGthVeZds tuazKvvwDv0pFEWSwiFvWyqGW4FHKz3vWSUfuR1MF2P86fIfT5buJ9/StMxiRRH8 tSwoV3Ksut2kX9l5o8MZqmv1UkH88hwxxxd2J2aHGU+XPLlbQaYSWSK0d6hKTLMZ ErZmCK/BARdll9UiTdXZ8h7UjfVDfuhTVeW1PvKQJ7sLGCDeT0VfhcrXnTtr41Je iLWeDea0NJBzQxRZoJHG =s0ny -----END PGP SIGNATURE----- Merge tag 'kvm-arm64/for-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next A handful of fixes for KVM/arm64: - A couple a basic fixes for running BE guests on a LE host - A performance improvement for overcommitted VMs (same as the equivalent patch for ARM) Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Conflicts: arch/arm/include/asm/kvm_emulate.h arch/arm64/include/asm/kvm_emulate.h
		
			
				
	
	
		
			212 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			212 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * 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, write to the Free Software
 | |
|  * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 | |
|  */
 | |
| 
 | |
| #ifndef __ARM_KVM_EMULATE_H__
 | |
| #define __ARM_KVM_EMULATE_H__
 | |
| 
 | |
| #include <linux/kvm_host.h>
 | |
| #include <asm/kvm_asm.h>
 | |
| #include <asm/kvm_mmio.h>
 | |
| #include <asm/kvm_arm.h>
 | |
| 
 | |
| unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num);
 | |
| unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu);
 | |
| 
 | |
| bool kvm_condition_valid(struct kvm_vcpu *vcpu);
 | |
| void kvm_skip_instr(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 bool vcpu_mode_is_32bit(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return 1;
 | |
| }
 | |
| 
 | |
| static inline unsigned long *vcpu_pc(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return &vcpu->arch.regs.usr_regs.ARM_pc;
 | |
| }
 | |
| 
 | |
| static inline unsigned long *vcpu_cpsr(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return &vcpu->arch.regs.usr_regs.ARM_cpsr;
 | |
| }
 | |
| 
 | |
| static inline void vcpu_set_thumb(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	*vcpu_cpsr(vcpu) |= PSR_T_BIT;
 | |
| }
 | |
| 
 | |
| static inline bool mode_has_spsr(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	unsigned long cpsr_mode = vcpu->arch.regs.usr_regs.ARM_cpsr & MODE_MASK;
 | |
| 	return (cpsr_mode > USR_MODE && cpsr_mode < SYSTEM_MODE);
 | |
| }
 | |
| 
 | |
| static inline bool vcpu_mode_priv(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	unsigned long cpsr_mode = vcpu->arch.regs.usr_regs.ARM_cpsr & MODE_MASK;
 | |
| 	return cpsr_mode > USR_MODE;;
 | |
| }
 | |
| 
 | |
| static inline u32 kvm_vcpu_get_hsr(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return vcpu->arch.fault.hsr;
 | |
| }
 | |
| 
 | |
| static inline unsigned long kvm_vcpu_get_hfar(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return vcpu->arch.fault.hxfar;
 | |
| }
 | |
| 
 | |
| static inline phys_addr_t kvm_vcpu_get_fault_ipa(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return ((phys_addr_t)vcpu->arch.fault.hpfar & HPFAR_MASK) << 8;
 | |
| }
 | |
| 
 | |
| static inline unsigned long kvm_vcpu_get_hyp_pc(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return vcpu->arch.fault.hyp_pc;
 | |
| }
 | |
| 
 | |
| static inline bool kvm_vcpu_dabt_isvalid(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_get_hsr(vcpu) & HSR_ISV;
 | |
| }
 | |
| 
 | |
| static inline bool kvm_vcpu_dabt_iswrite(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_get_hsr(vcpu) & HSR_WNR;
 | |
| }
 | |
| 
 | |
| static inline bool kvm_vcpu_dabt_issext(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_get_hsr(vcpu) & HSR_SSE;
 | |
| }
 | |
| 
 | |
| static inline int kvm_vcpu_dabt_get_rd(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return (kvm_vcpu_get_hsr(vcpu) & HSR_SRT_MASK) >> HSR_SRT_SHIFT;
 | |
| }
 | |
| 
 | |
| static inline bool kvm_vcpu_dabt_isextabt(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_get_hsr(vcpu) & HSR_DABT_EA;
 | |
| }
 | |
| 
 | |
| static inline bool kvm_vcpu_dabt_iss1tw(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_get_hsr(vcpu) & HSR_DABT_S1PTW;
 | |
| }
 | |
| 
 | |
| /* Get Access Size from a data abort */
 | |
| static inline int kvm_vcpu_dabt_get_as(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	switch ((kvm_vcpu_get_hsr(vcpu) >> 22) & 0x3) {
 | |
| 	case 0:
 | |
| 		return 1;
 | |
| 	case 1:
 | |
| 		return 2;
 | |
| 	case 2:
 | |
| 		return 4;
 | |
| 	default:
 | |
| 		kvm_err("Hardware is weird: SAS 0b11 is reserved\n");
 | |
| 		return -EFAULT;
 | |
| 	}
 | |
| }
 | |
| 
 | |
| /* This one is not specific to Data Abort */
 | |
| static inline bool kvm_vcpu_trap_il_is32bit(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_get_hsr(vcpu) & HSR_IL;
 | |
| }
 | |
| 
 | |
| static inline u8 kvm_vcpu_trap_get_class(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_get_hsr(vcpu) >> HSR_EC_SHIFT;
 | |
| }
 | |
| 
 | |
| static inline bool kvm_vcpu_trap_is_iabt(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_trap_get_class(vcpu) == HSR_EC_IABT;
 | |
| }
 | |
| 
 | |
| static inline u8 kvm_vcpu_trap_get_fault(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE;
 | |
| }
 | |
| 
 | |
| static inline u32 kvm_vcpu_hvc_get_imm(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return kvm_vcpu_get_hsr(vcpu) & HSR_HVC_IMM_MASK;
 | |
| }
 | |
| 
 | |
| static inline unsigned long kvm_vcpu_get_mpidr(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return vcpu->arch.cp15[c0_MPIDR];
 | |
| }
 | |
| 
 | |
| static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	*vcpu_cpsr(vcpu) |= PSR_E_BIT;
 | |
| }
 | |
| 
 | |
| static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu)
 | |
| {
 | |
| 	return !!(*vcpu_cpsr(vcpu) & PSR_E_BIT);
 | |
| }
 | |
| 
 | |
| 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);
 | |
| 		default:
 | |
| 			return be32_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);
 | |
| 		default:
 | |
| 			return cpu_to_be32(data);
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return data;		/* Leave LE untouched */
 | |
| }
 | |
| 
 | |
| #endif /* __ARM_KVM_EMULATE_H__ */
 |