Commit a3bb9c3a authored by David Brazdil's avatar David Brazdil Committed by Marc Zyngier
Browse files

kvm: arm64: Remove unnecessary hyp mappings 



With all nVHE per-CPU variables being part of the hyp per-CPU region,
mapping them individual is not necessary any longer. They are mapped to hyp
as part of the overall per-CPU region.

Signed-off-by: default avatarDavid Brazdil <dbrazdil@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarAndrew Scull <ascull@google.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200922204910.7265-11-dbrazdil@google.com
parent 30c95391

arch/arm64/include/asm/kvm_mmu.h

+0 −20
Original line number Diff line number Diff line
@@ -531,21 +531,6 @@ static inline int kvm_map_vectors(void) 
DECLARE_PER_CPU_READ_MOSTLY(u64, arm64_ssbd_callback_required);

DECLARE_KVM_NVHE_PER_CPU(u64, arm64_ssbd_callback_required);



static inline int hyp_map_aux_data(void)

{

	int cpu, err;



	for_each_possible_cpu(cpu) {

		u64 *ptr;



		ptr = per_cpu_ptr_nvhe_sym(arm64_ssbd_callback_required, cpu);

		err = create_hyp_mappings(ptr, ptr + 1, PAGE_HYP);

		if (err)

			return err;

	}

	return 0;

}



static inline void hyp_init_aux_data(void)

{

	u64 *ptr;
@@ -555,11 +540,6 @@ static inline void hyp_init_aux_data(void) 
	*ptr = __this_cpu_read(arm64_ssbd_callback_required);

}

#else

static inline int hyp_map_aux_data(void)

{

	return 0;

}



static inline void hyp_init_aux_data(void) {}

#endif

arch/arm64/kvm/arm.c

+0 −16
Original line number Diff line number Diff line
@@ -1588,22 +1588,6 @@ static int init_hyp_mode(void) 
		}

	}



	for_each_possible_cpu(cpu) {

		kvm_host_data_t *cpu_data;



		cpu_data = per_cpu_ptr_hyp_sym(kvm_host_data, cpu);

		err = create_hyp_mappings(cpu_data, cpu_data + 1, PAGE_HYP);



		if (err) {

			kvm_err("Cannot map host CPU state: %d\n", err);

			goto out_err;

		}

	}



	err = hyp_map_aux_data();

	if (err)

		kvm_err("Cannot map host auxiliary data: %d\n", err);



	return 0;



out_err:

CRA Git | Maintained and supported by SUSTech CRA and CCSE