Commit 0e20f5e2 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm/arm64: Cleanup MMIO handling 



Our MMIO handling is a bit odd, in the sense that it uses an
intermediate per-vcpu structure to store the various decoded
information that describe the access.

But the same information is readily available in the HSR/ESR_EL2
field, and we actually use this field to populate the structure.

Let's simplify the whole thing by getting rid of the superfluous
structure and save a (tiny) bit of space in the vcpu structure.

[32bit fix courtesy of Olof Johansson <olof@lixom.net>]
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 31a9b0b1

arch/arm/include/asm/kvm_emulate.h

+2 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <linux/kvm_host.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>

#include <asm/kvm_arm.h>

#include <asm/cputype.h>
@@ -220,7 +219,7 @@ static inline bool kvm_vcpu_dabt_is_cm(struct kvm_vcpu *vcpu) 
}



/* Get Access Size from a data abort */

static inline int kvm_vcpu_dabt_get_as(struct kvm_vcpu *vcpu)

static inline unsigned int kvm_vcpu_dabt_get_as(struct kvm_vcpu *vcpu)

{

	switch ((kvm_vcpu_get_hsr(vcpu) >> 22) & 0x3) {

	case 0:
@@ -231,7 +230,7 @@ static inline int kvm_vcpu_dabt_get_as(struct kvm_vcpu *vcpu) 
		return 4;

	default:

		kvm_err("Hardware is weird: SAS 0b11 is reserved\n");

		return -EFAULT;

		return 4;

	}

}

arch/arm/include/asm/kvm_host.h

+8 −4
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <asm/cputype.h>

#include <asm/kvm.h>

#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>

#include <asm/fpstate.h>

#include <kvm/arm_arch_timer.h>
@@ -202,9 +201,6 @@ struct kvm_vcpu_arch { 
	 /* Don't run the guest (internal implementation need) */

	bool pause;



	/* IO related fields */

	struct kvm_decode mmio_decode;



	/* Cache some mmu pages needed inside spinlock regions */

	struct kvm_mmu_memory_cache mmu_page_cache;
@@ -300,6 +296,14 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, 
static inline void handle_exit_early(struct kvm_vcpu *vcpu, struct kvm_run *run,

				     int exception_index) {}



/* MMIO helpers */

void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);

unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);



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);



static inline void __cpu_init_hyp_mode(phys_addr_t pgd_ptr,

				       unsigned long hyp_stack_ptr,

				       unsigned long vector_ptr)

arch/arm/include/asm/kvm_hyp.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/compiler.h>

#include <linux/kvm_host.h>

#include <asm/cp15.h>

#include <asm/kvm_arm.h>

#include <asm/vfp.h>



#define __hyp_text __section(.hyp.text) notrace

arch/arm/include/asm/kvm_mmio.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2012 - Virtual Open Systems and Columbia University

 * Author: Christoffer Dall <c.dall@virtualopensystems.com>

 */



#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;

	/* Not used on 32-bit arm */

	bool sixty_four;

};



void kvm_mmio_write_buf(void *buf, unsigned int len, unsigned long data);

unsigned long kvm_mmio_read_buf(const void *buf, unsigned int len);



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/arm64/include/asm/kvm_emulate.h

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <asm/esr.h>

#include <asm/kvm_arm.h>

#include <asm/kvm_hyp.h>

#include <asm/kvm_mmio.h>

#include <asm/ptrace.h>

#include <asm/cputype.h>

#include <asm/virt.h>
@@ -341,7 +340,7 @@ static inline bool kvm_vcpu_dabt_is_cm(const struct kvm_vcpu *vcpu) 
	return !!(kvm_vcpu_get_hsr(vcpu) & ESR_ELx_CM);

}



static inline int kvm_vcpu_dabt_get_as(const struct kvm_vcpu *vcpu)

static inline unsigned 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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE