Commit b48c1a45 authored by Steven Price's avatar Steven Price Committed by Marc Zyngier
Browse files

KVM: arm64: Implement PV_TIME_FEATURES call 



This provides a mechanism for querying which paravirtualized time
features are available in this hypervisor.

Also add the header file which defines the ABI for the paravirtualized
time features we're about to add.

Signed-off-by: default avatarSteven Price <steven.price@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 55009c6e

arch/arm/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#ifndef __ARM_KVM_HOST_H__

#define __ARM_KVM_HOST_H__



#include <linux/arm-smccc.h>

#include <linux/errno.h>

#include <linux/types.h>

#include <linux/kvm_types.h>
@@ -323,6 +324,11 @@ static inline int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
int kvm_perf_init(void);

int kvm_perf_teardown(void);



static inline long kvm_hypercall_pv_features(struct kvm_vcpu *vcpu)

{

	return SMCCC_RET_NOT_SUPPORTED;

}



void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot);



struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr);

arch/arm64/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -478,6 +478,8 @@ void handle_exit_early(struct kvm_vcpu *vcpu, struct kvm_run *run, 
int kvm_perf_init(void);

int kvm_perf_teardown(void);



long kvm_hypercall_pv_features(struct kvm_vcpu *vcpu);



void kvm_set_sei_esr(struct kvm_vcpu *vcpu, u64 syndrome);



struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr);

arch/arm64/include/asm/pvclock-abi.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (C) 2019 Arm Ltd. */



#ifndef __ASM_PVCLOCK_ABI_H

#define __ASM_PVCLOCK_ABI_H



/* The below structure is defined in ARM DEN0057A */



struct pvclock_vcpu_stolen_time {

	__le32 revision;

	__le32 attributes;

	__le64 stolen_time;

	/* Structure must be 64 byte aligned, pad to that size */

	u8 padding[48];

} __packed;



#endif

arch/arm64/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/e 
kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/psci.o $(KVM)/arm/perf.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hypercalls.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/pvtime.o



kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o regmap.o va_layout.o

kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o

include/linux/arm-smccc.h

+14 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#define ARM_SMCCC_OWNER_SIP		2

#define ARM_SMCCC_OWNER_OEM		3

#define ARM_SMCCC_OWNER_STANDARD	4

#define ARM_SMCCC_OWNER_STANDARD_HYP	5

#define ARM_SMCCC_OWNER_TRUSTED_APP	48

#define ARM_SMCCC_OWNER_TRUSTED_APP_END	49

#define ARM_SMCCC_OWNER_TRUSTED_OS	50
@@ -318,5 +319,18 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, 
#define SMCCC_RET_NOT_SUPPORTED			-1

#define SMCCC_RET_NOT_REQUIRED			-2



/* Paravirtualised time calls (defined by ARM DEN0057A) */

#define ARM_SMCCC_HV_PV_TIME_FEATURES				\

	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,			\

			   ARM_SMCCC_SMC_64,			\

			   ARM_SMCCC_OWNER_STANDARD_HYP,	\

			   0x20)



#define ARM_SMCCC_HV_PV_TIME_ST					\

	ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,			\

			   ARM_SMCCC_SMC_64,			\

			   ARM_SMCCC_OWNER_STANDARD_HYP,	\

			   0x21)



#endif /*__ASSEMBLY__*/

#endif /*__LINUX_ARM_SMCCC_H*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE