Commit c3e35409 authored Dec 02, 2019 by Shannon Zhao Committed by Marc Zyngier Jan 19, 2020

KVM: ARM: Call hyp_cpu_pm_exit at the right place

It doesn't needs to call hyp_cpu_pm_exit() in init_hyp_mode() when some
error occurs. hyp_cpu_pm_exit() only needs to be called in
kvm_arch_init() if init_subsystems() fails. So move hyp_cpu_pm_exit()
out from teardown_hyp_mode() and call it directly in kvm_arch_init().

Signed-off-by: Shannon Zhao <shannon.zhao@linux.alibaba.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/1575272531-3204-1-git-send-email-shannon.zhao@linux.alibaba.com

parent f5523423

virt/kvm/arm/arm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1537,7 +1537,6 @@ static void teardown_hyp_mode(void)
		free_hyp_pgds();
		for_each_possible_cpu(cpu)
		free_page(per_cpu(kvm_arm_hyp_stack_page, cpu));
		hyp_cpu_pm_exit();
		}

		/**
		@@ -1751,6 +1750,7 @@ int kvm_arch_init(void *opaque)
		return 0;

		out_hyp:
		hyp_cpu_pm_exit();
		if (!in_hyp_mode)
		teardown_hyp_mode();
		out_err: