From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754800AbcBVSKV (ORCPT ); Mon, 22 Feb 2016 13:10:21 -0500 Received: from mailapp01.imgtec.com ([195.59.15.196]:48084 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753717AbcBVSKT (ORCPT ); Mon, 22 Feb 2016 13:10:19 -0500 From: Paul Burton To: , Ralf Baechle CC: Paul Burton , Lars Persson , , Andrew Morton , Jerome Marchand , "Kirill A. Shutemov" Subject: [PATCH 2/2] MIPS: Flush highmem pages from dcache in __flush_icache_page Date: Mon, 22 Feb 2016 18:09:45 +0000 Message-ID: <1456164585-26910-2-git-send-email-paul.burton@imgtec.com> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456164585-26910-1-git-send-email-paul.burton@imgtec.com> References: <1456164585-26910-1-git-send-email-paul.burton@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.100.200.218] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When a page is to be mapped executable for userspace, we can presume that the icache doesn't contain anything valid for its address range but we cannot be sure that its content has been written back from the dcache to L2 or memory further out. If the icache fills from those memories, ie. does not fill from the dcache, then we need to ensure that content has been flushed from the dcache. This was being done for lowmem pages but not for highmem pages. Fix this by mapping the page & flushing its content from the dcache in __flush_icache_page, before the page is provided to userland. Signed-off-by: Paul Burton --- arch/mips/mm/cache.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 3f159ca..734cb2f 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c @@ -16,6 +16,7 @@ #include #include +#include #include #include #include @@ -124,10 +125,14 @@ void __flush_icache_page(struct vm_area_struct *vma, struct page *page) unsigned long addr; if (PageHighMem(page)) - return; + addr = (unsigned long)kmap_atomic(page); + else + addr = (unsigned long)page_address(page); - addr = (unsigned long) page_address(page); flush_data_cache_page(addr); + + if (PageHighMem(page)) + __kunmap_atomic((void *)addr); } EXPORT_SYMBOL_GPL(__flush_icache_page); -- 2.7.1