UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: David Brazdil <dbrazdil@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: Andrew Scull <ascull@google.com>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200922204910.7265-11-dbrazdil@google.com
This commit is contained in:
David Brazdil 2020-09-22 21:49:10 +01:00 committed by Marc Zyngier
parent 30c953911c
commit a3bb9c3a00
2 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm64/include/asm/kvm_mmu.h
View File

@ -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

16
arch/arm64/kvm/arm.c
View File

@ -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: