summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2015-12-10 16:05:36 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-31 11:29:04 -0800
commit8182d4cf11a77f2c2b6afe85366e9328107b6256 (patch)
tree105c65f0e3a914bbef6b4be74b0cfabf658828d7
parentc01afb9239eaee84a93e7b0319e3935f55604361 (diff)
downloadlinux-stable-8182d4cf11a77f2c2b6afe85366e9328107b6256.tar.gz
linux-stable-8182d4cf11a77f2c2b6afe85366e9328107b6256.tar.bz2
linux-stable-8182d4cf11a77f2c2b6afe85366e9328107b6256.zip
arm64: mm: ensure that the zero page is visible to the page table walker
commit 32d6397805d00573ce1fa55f408ce2bca15b0ad3 upstream. In paging_init, we allocate the zero page, memset it to zero and then point TTBR0 to it in order to avoid speculative fetches through the identity mapping. In order to guarantee that the freshly zeroed page is indeed visible to the page table walker, we need to execute a dsb instruction prior to writing the TTBR. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm64/mm/mmu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 873e363048c6..116ad654dd59 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -456,6 +456,9 @@ void __init paging_init(void)
empty_zero_page = virt_to_page(zero_page);
+ /* Ensure the zero page is visible to the page table walker */
+ dsb(ishst);
+
/*
* TTBR0 is only used for the identity mapping at this stage. Make it
* point to zero page to avoid speculatively fetching new entries.