diff options
| author | James Morse <james.morse@arm.com> | 2019-01-24 17:32:57 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-02-01 15:10:02 +0100 |
| commit | f7daa9c8fd191724b9ab9580a7be55cd1a67d799 (patch) | |
| tree | 596174a269bafb0bd8977633aa4b9ad2828db324 /arch/arm64/kernel/hibernate.c | |
| parent | arm64: hyp-stub: Forbid kprobing of the hyp-stub (diff) | |
| download | linux-f7daa9c8fd191724b9ab9580a7be55cd1a67d799.tar.xz linux-f7daa9c8fd191724b9ab9580a7be55cd1a67d799.zip | |
arm64: hibernate: Clean the __hyp_text to PoC after resume
During resume hibernate restores all physical memory. Any memory
that is accessed with the MMU disabled needs to be cleaned to the
PoC.
KVMs __hyp_text was previously ommitted as it runs with the MMU
enabled, but now that the hyp-stub is located in this section,
we must clean __hyp_text too.
This ensures secondary CPUs that come online after hibernate
has finished resuming, and load KVM via the freshly written
hyp-stub see the correct instructions.
Signed-off-by: James Morse <james.morse@arm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm64/kernel/hibernate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 29cdc99688f3..9859e1178e6b 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -299,8 +299,10 @@ int swsusp_arch_suspend(void) dcache_clean_range(__idmap_text_start, __idmap_text_end); /* Clean kvm setup code to PoC? */ - if (el2_reset_needed()) + if (el2_reset_needed()) { dcache_clean_range(__hyp_idmap_text_start, __hyp_idmap_text_end); + dcache_clean_range(__hyp_text_start, __hyp_text_end); + } /* make the crash dump kernel image protected again */ crash_post_resume(); |