Commit 1f66f124 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/6.6/misc into kvmarm-master/next 



* kvm-arm64/6.6/misc:
  : .
  : Misc KVM/arm64 updates for 6.6:
  :
  : - Don't unnecessary align non-stack allocations in the EL2 VA space
  :
  : - Drop HCR_VIRT_EXCP_MASK, which was never used...
  :
  : - Don't use smp_processor_id() in kvm_arch_vcpu_load(),
  :   but the cpu parameter instead
  :
  : - Drop redundant call to kvm_set_pfn_accessed() in user_mem_abort()
  :
  : - Remove prototypes without implementations
  : .
  KVM: arm64: Remove size-order align in the nVHE hyp private VA range
  KVM: arm64: Remove unused declarations
  KVM: arm64: Remove redundant kvm_set_pfn_accessed() from user_mem_abort()
  KVM: arm64: Drop HCR_VIRT_EXCP_MASK
  KVM: arm64: Use the known cpu id instead of smp_processor_id()

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 50a40ff7 f156a7d1

arch/arm64/include/asm/kvm_arm.h

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ 
			 HCR_BSU_IS | HCR_FB | HCR_TACR | \

			 HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \

			 HCR_FMO | HCR_IMO | HCR_PTW | HCR_TID3)

#define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF)

#define HCR_HOST_NVHE_FLAGS (HCR_RW | HCR_API | HCR_APK | HCR_ATA)

#define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC)

#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H)

arch/arm64/include/asm/kvm_host.h

+0 −6
Original line number Diff line number Diff line
@@ -974,8 +974,6 @@ void kvm_arm_resume_guest(struct kvm *kvm); 
#define kvm_call_hyp_nvhe(f, ...) f(__VA_ARGS__)

#endif /* __KVM_NVHE_HYPERVISOR__ */



void force_vm_exit(const cpumask_t *mask);



int handle_exit(struct kvm_vcpu *vcpu, int exception_index);

void handle_exit_early(struct kvm_vcpu *vcpu, int exception_index);
@@ -1057,8 +1055,6 @@ static inline bool kvm_system_needs_idmapped_vectors(void) 
	return cpus_have_const_cap(ARM64_SPECTRE_V3A);

}



void kvm_arm_vcpu_ptrauth_trap(struct kvm_vcpu *vcpu);



static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}
@@ -1130,8 +1126,6 @@ static inline bool kvm_vm_is_protected(struct kvm *kvm) 
	return false;

}



void kvm_init_protected_traps(struct kvm_vcpu *vcpu);



int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature);

bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu);

arch/arm64/include/asm/kvm_mmu.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ int create_hyp_io_mappings(phys_addr_t phys_addr, size_t size, 
			   void __iomem **haddr);

int create_hyp_exec_mappings(phys_addr_t phys_addr, size_t size,

			     void **haddr);

int create_hyp_stack(phys_addr_t phys_addr, unsigned long *haddr);

void __init free_hyp_pgds(void);



void stage2_unmap_vm(struct kvm *kvm);

arch/arm64/kvm/arm.c

+2 −26
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
		vcpu_ptrauth_disable(vcpu);

	kvm_arch_vcpu_load_debug_state_flags(vcpu);



	if (!cpumask_test_cpu(smp_processor_id(), vcpu->kvm->arch.supported_cpus))

	if (!cpumask_test_cpu(cpu, vcpu->kvm->arch.supported_cpus))

		vcpu_set_on_unsupported_cpu(vcpu);

}
@@ -2282,30 +2282,8 @@ static int __init init_hyp_mode(void) 
	for_each_possible_cpu(cpu) {

		struct kvm_nvhe_init_params *params = per_cpu_ptr_nvhe_sym(kvm_init_params, cpu);

		char *stack_page = (char *)per_cpu(kvm_arm_hyp_stack_page, cpu);

		unsigned long hyp_addr;



		/*

		 * Allocate a contiguous HYP private VA range for the stack

		 * and guard page. The allocation is also aligned based on

		 * the order of its size.

		 */

		err = hyp_alloc_private_va_range(PAGE_SIZE * 2, &hyp_addr);

		if (err) {

			kvm_err("Cannot allocate hyp stack guard page\n");

			goto out_err;

		}



		/*

		 * Since the stack grows downwards, map the stack to the page

		 * at the higher address and leave the lower guard page

		 * unbacked.

		 *

		 * Any valid stack address now has the PAGE_SHIFT bit as 1

		 * and addresses corresponding to the guard page have the

		 * PAGE_SHIFT bit as 0 - this is used for overflow detection.

		 */

		err = __create_hyp_mappings(hyp_addr + PAGE_SIZE, PAGE_SIZE,

					    __pa(stack_page), PAGE_HYP);

		err = create_hyp_stack(__pa(stack_page), &params->stack_hyp_va);

		if (err) {

			kvm_err("Cannot map hyp stack\n");

			goto out_err;
@@ -2318,8 +2296,6 @@ static int __init init_hyp_mode(void) 
		 * has been mapped in the flexible private VA space.

		 */

		params->stack_pa = __pa(stack_page);



		params->stack_hyp_va = hyp_addr + (2 * PAGE_SIZE);

	}



	for_each_possible_cpu(cpu) {

arch/arm64/kvm/hyp/include/nvhe/mm.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ int pkvm_create_mappings_locked(void *from, void *to, enum kvm_pgtable_prot prot 
int __pkvm_create_private_mapping(phys_addr_t phys, size_t size,

				  enum kvm_pgtable_prot prot,

				  unsigned long *haddr);

int pkvm_create_stack(phys_addr_t phys, unsigned long *haddr);

int pkvm_alloc_private_va_range(size_t size, unsigned long *haddr);



#endif /* __KVM_HYP_MM_H */