[PATCH] MIPS: Fix COW D-cache aliasing on fork

Provide a custom copy_user_highpage() to deal with aliasing issues on
MIPS. It uses kmap_coherent() to map an user page for kernel with same
color. Rewrite copy_to_user_page() and copy_from_user_page() with the
new interfaces to avoid extra cache flushing.

The main part of this patch was originally written by Ralf Baechle;
Atushi Nemoto did the the debugging.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Atsushi Nemoto and committed by Linus Torvalds bcd02280 9de455b2

+31 -10
+25
arch/mips/mm/init.c
··· 203 203 preempt_check_resched(); 204 204 } 205 205 206 + void copy_user_highpage(struct page *to, struct page *from, 207 + unsigned long vaddr, struct vm_area_struct *vma) 208 + { 209 + void *vfrom, *vto; 210 + 211 + vto = kmap_atomic(to, KM_USER1); 212 + if (cpu_has_dc_aliases) { 213 + vfrom = kmap_coherent(from, vaddr); 214 + copy_page(vto, vfrom); 215 + kunmap_coherent(from); 216 + } else { 217 + vfrom = kmap_atomic(from, KM_USER0); 218 + copy_page(vto, vfrom); 219 + kunmap_atomic(vfrom, KM_USER0); 220 + } 221 + if (((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) || 222 + pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK)) 223 + flush_data_cache_page((unsigned long)vto); 224 + kunmap_atomic(vto, KM_USER1); 225 + /* Make sure this page is cleared on other CPU's too before using it */ 226 + smp_wmb(); 227 + } 228 + 229 + EXPORT_SYMBOL(copy_user_highpage); 230 + 206 231 void copy_to_user_page(struct vm_area_struct *vma, 207 232 struct page *page, unsigned long vaddr, void *dst, const void *src, 208 233 unsigned long len)
+6 -10
include/asm-mips/page.h
··· 35 35 #ifndef __ASSEMBLY__ 36 36 37 37 #include <linux/pfn.h> 38 - #include <asm/cpu-features.h> 39 38 #include <asm/io.h> 40 39 41 40 extern void clear_page(void * page); ··· 60 61 flush_data_cache_page((unsigned long)addr); 61 62 } 62 63 63 - static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr, 64 - struct page *to) 65 - { 66 - extern void (*flush_data_cache_page)(unsigned long addr); 64 + extern void copy_user_page(void *vto, void *vfrom, unsigned long vaddr, 65 + struct page *to); 66 + struct vm_area_struct; 67 + extern void copy_user_highpage(struct page *to, struct page *from, 68 + unsigned long vaddr, struct vm_area_struct *vma); 67 69 68 - copy_page(vto, vfrom); 69 - if (!cpu_has_ic_fills_f_dc || 70 - pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK)) 71 - flush_data_cache_page((unsigned long)vto); 72 - } 70 + #define __HAVE_ARCH_COPY_USER_HIGHPAGE 73 71 74 72 /* 75 73 * These are used to make use of C type-checking..