1 From f7daa9c8fd191724b9ab9580a7be55cd1a67d799 Mon Sep 17 00:00:00 2001
2 From: James Morse <james.morse@arm.com>
3 Date: Thu, 24 Jan 2019 16:32:57 +0000
4 Subject: arm64: hibernate: Clean the __hyp_text to PoC after resume
6 From: James Morse <james.morse@arm.com>
8 commit f7daa9c8fd191724b9ab9580a7be55cd1a67d799 upstream.
10 During resume hibernate restores all physical memory. Any memory
11 that is accessed with the MMU disabled needs to be cleaned to the
14 KVMs __hyp_text was previously ommitted as it runs with the MMU
15 enabled, but now that the hyp-stub is located in this section,
16 we must clean __hyp_text too.
18 This ensures secondary CPUs that come online after hibernate
19 has finished resuming, and load KVM via the freshly written
20 hyp-stub see the correct instructions.
22 Signed-off-by: James Morse <james.morse@arm.com>
23 Cc: stable@vger.kernel.org
24 Signed-off-by: Will Deacon <will.deacon@arm.com>
25 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
28 arch/arm64/kernel/hibernate.c | 4 +++-
29 1 file changed, 3 insertions(+), 1 deletion(-)
31 --- a/arch/arm64/kernel/hibernate.c
32 +++ b/arch/arm64/kernel/hibernate.c
33 @@ -299,8 +299,10 @@ int swsusp_arch_suspend(void)
34 dcache_clean_range(__idmap_text_start, __idmap_text_end);
36 /* Clean kvm setup code to PoC? */
37 - if (el2_reset_needed())
38 + if (el2_reset_needed()) {
39 dcache_clean_range(__hyp_idmap_text_start, __hyp_idmap_text_end);
40 + dcache_clean_range(__hyp_text_start, __hyp_text_end);
43 /* make the crash dump kernel image protected again */