Commit 45e96ea6 authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: ARM: Handle I/O aborts 



When the guest accesses I/O memory this will create data abort
exceptions and they are handled by decoding the HSR information
(physical address, read/write, length, register) and forwarding reads
and writes to QEMU which performs the device emulation.

Certain classes of load/store operations do not support the syndrome
information provided in the HSR.  We don't support decoding these (patches
are available elsewhere), so we report an error to user space in this case.

This requires changing the general flow somewhat since new calls to run
the VCPU must check if there's a pending MMIO load and perform the write
after userspace has made the data available.

Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Reviewed-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <c.dall@virtualopensystems.com>
parent 94f8e641

arch/arm/include/asm/kvm_arm.h

+3 −0
Original line number Diff line number Diff line
@@ -173,8 +173,11 @@ 
#define HSR_ISS		(HSR_IL - 1)

#define HSR_ISV_SHIFT	(24)

#define HSR_ISV		(1U << HSR_ISV_SHIFT)

#define HSR_SRT_SHIFT	(16)

#define HSR_SRT_MASK	(0xf << HSR_SRT_SHIFT)

#define HSR_FSC		(0x3f)

#define HSR_FSC_TYPE	(0x3c)

#define HSR_SSE		(1 << 21)

#define HSR_WNR		(1 << 6)

#define HSR_CV_SHIFT	(24)

#define HSR_CV		(1U << HSR_CV_SHIFT)

arch/arm/include/asm/kvm_emulate.h

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <linux/kvm_host.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>



u32 *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num);

u32 *vcpu_spsr(struct kvm_vcpu *vcpu);
@@ -53,4 +54,9 @@ static inline bool vcpu_mode_priv(struct kvm_vcpu *vcpu) 
	return cpsr_mode > USR_MODE;;

}



static inline bool kvm_vcpu_reg_is_pc(struct kvm_vcpu *vcpu, int reg)

{

	return reg == 15;

}



#endif /* __ARM_KVM_EMULATE_H__ */

arch/arm/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


#include <asm/kvm.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>

#include <asm/fpstate.h>



#define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS
@@ -99,6 +100,9 @@ struct kvm_vcpu_arch { 
	int last_pcpu;

	cpumask_t require_dcache_flush;



	/* IO related fields */

	struct kvm_decode mmio_decode;



	/* Interrupt related fields */

	u32 irq_lines;		/* IRQ and FIQ levels */

arch/arm/include/asm/kvm_mmio.h

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 * 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_MMIO_H__

#define __ARM_KVM_MMIO_H__



#include <linux/kvm_host.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_arm.h>



struct kvm_decode {

	unsigned long rt;

	bool sign_extend;

};



/*

 * The in-kernel MMIO emulation code wants to use a copy of run->mmio,

 * which is an anonymous type. Use our own type instead.

 */

struct kvm_exit_mmio {

	phys_addr_t	phys_addr;

	u8		data[8];

	u32		len;

	bool		is_write;

};



static inline void kvm_prepare_mmio(struct kvm_run *run,

				    struct kvm_exit_mmio *mmio)

{

	run->mmio.phys_addr	= mmio->phys_addr;

	run->mmio.len		= mmio->len;

	run->mmio.is_write	= mmio->is_write;

	memcpy(run->mmio.data, mmio->data, mmio->len);

	run->exit_reason	= KVM_EXIT_MMIO;

}



int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,

		 phys_addr_t fault_ipa);



#endif	/* __ARM_KVM_MMIO_H__ */

arch/arm/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ kvm-arm-y = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o) 


obj-y += kvm-arm.o init.o interrupts.o

obj-y += arm.o guest.o mmu.o emulate.o reset.o

obj-y += coproc.o coproc_a15.o
 
obj-y += coproc.o coproc_a15.o mmio.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE