arm64: Do not synchronise I and D caches for special ptes
authorCatalin Marinas <catalin.marinas@arm.com>
Wed, 12 Mar 2014 16:28:09 +0000 (16:28 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Thu, 13 Mar 2014 11:22:29 +0000 (11:22 +0000)
Special pte mappings are not intended to be executable and do not even
have an associated struct page. This patch ensures that we do not call
__sync_icache_dcache() on such ptes.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reported-by: Steve Capper <Steve.Capper@arm.com>
Tested-by: Laura Abbott <lauraa@codeaurora.org>
Tested-by: Bharat Bhushan <Bharat.Bhushan@freescale.com>
Cc: <stable@vger.kernel.org>
arch/arm64/include/asm/pgtable.h

index 2d3cede..72c9ac3 100644 (file)
@@ -199,7 +199,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
                              pte_t *ptep, pte_t pte)
 {
        if (pte_valid_user(pte)) {
-               if (pte_exec(pte))
+               if (!pte_special(pte) && pte_exec(pte))
                        __sync_icache_dcache(pte, addr);
                if (pte_dirty(pte) && pte_write(pte))
                        pte_val(pte) &= ~PTE_RDONLY;