OSDN Git Service

KVM: arm64: Move kern_hyp_va() usage in __load_guest_stage2() into the callers
authorMarc Zyngier <maz@kernel.org>
Fri, 6 Aug 2021 11:31:06 +0000 (12:31 +0100)
committerMarc Zyngier <maz@kernel.org>
Fri, 20 Aug 2021 08:03:42 +0000 (09:03 +0100)
commit923a547d71b967c808a596968cf8022102f8b5b2
treea7b6e196d7b966e8bda0e7c35a9df5b703140bbb
parentc500bee1c5b2f1d59b1081ac879d73268ab0ff17
KVM: arm64: Move kern_hyp_va() usage in __load_guest_stage2() into the callers

It is a bit awkward to use kern_hyp_va() in __load_guest_stage2(),
specially as the helper is shared between VHE and nVHE.

Instead, move the use of kern_hyp_va() in the nVHE code, and
pass a pointer to the kvm->arch structure instead. Although
this may look a bit awkward, it allows for some further simplification.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Jade Alglave <jade.alglave@arm.com>
Cc: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210806113109.2475-4-will@kernel.org
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/kvm/hyp/nvhe/switch.c
arch/arm64/kvm/hyp/nvhe/tlb.c
arch/arm64/kvm/hyp/vhe/switch.c
arch/arm64/kvm/hyp/vhe/tlb.c