diff options
| author | Shaokun Zhang <zhangshaokun@hisilicon.com> | 2016-06-21 15:32:57 +0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-12 08:46:57 -0400 |
| commit | 0868e8dd6384e454c4de80dad9167d48a9ca2987 (patch) | |
| tree | 6e4cccbbb324205b5f00d98b40701028725338f9 | |
| parent | 673a67b97ccc29cd7c34aded3b832387eb40d71e (diff) | |
| download | linux-stable-0868e8dd6384e454c4de80dad9167d48a9ca2987.tar.gz linux-stable-0868e8dd6384e454c4de80dad9167d48a9ca2987.tar.bz2 linux-stable-0868e8dd6384e454c4de80dad9167d48a9ca2987.zip | |
arm64: mm: remove page_mapping check in __sync_icache_dcache
[ Upstream commit 20c27a4270c775d7ed661491af8ac03264d60fc6 ]
__sync_icache_dcache unconditionally skips the cache maintenance for
anonymous pages, under the assumption that flushing is only required in
the presence of D-side aliases [see 7249b79f6b4cc ("arm64: Do not flush
the D-cache for anonymous pages")].
Unfortunately, this breaks migration of anonymous pages holding
self-modifying code, where userspace cannot be reasonably expected to
reissue maintenance instructions in response to a migration.
This patch fixes the problem by removing the broken page_mapping(page)
check from the cache syncing code, otherwise we may end up fetching and
executing stale instructions from the PoU.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: <stable@vger.kernel.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | arch/arm64/mm/flush.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c index b6f14e8d2121..bfb8eb168f2d 100644 --- a/arch/arm64/mm/flush.c +++ b/arch/arm64/mm/flush.c @@ -74,10 +74,6 @@ void __sync_icache_dcache(pte_t pte, unsigned long addr) { struct page *page = pte_page(pte); - /* no flushing needed for anonymous pages */ - if (!page_mapping(page)) - return; - if (!test_and_set_bit(PG_dcache_clean, &page->flags)) { __flush_dcache_area(page_address(page), PAGE_SIZE << compound_order(page)); |