NOMMU: Avoiding duplicate icache flushes of shared maps

When working with FDPIC, there are many shared mappings of read-only
code regions between applications (the C library, applet packages like
busybox, etc.), but the current do_mmap_pgoff() function will issue an
icache flush whenever a VMA is added to an MM instead of only doing it
when the map is initially created.

The flush can instead be done when a region is first mmapped PROT_EXEC.
Note that we may not rely on the first mapping of a region being
executable - it's possible for it to be PROT_READ only, so we have to
remember whether we've flushed the region or not, and then flush the
entire region when a bit of it is made executable.

However, this also affects the brk area. That will no longer be
executable. We can mprotect() it to PROT_EXEC on MPU-mode kernels, but
for NOMMU mode kernels, when it increases the brk allocation, making
sys_brk() flush the extra from the icache should suffice. The brk area
probably isn't used by NOMMU programs since the brk area can only use up
the leavings from the stack allocation, where the stack allocation is
larger than requested.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Mike Frysinger and committed by Linus Torvalds cfe79c00 04e4f2b1

+10 -3
+2
include/linux/mm_types.h
··· 123 123 struct file *vm_file; /* the backing file or NULL */ 124 124 125 125 atomic_t vm_usage; /* region usage count */ 126 + bool vm_icache_flushed : 1; /* true if the icache has been flushed for 127 + * this region */ 126 128 }; 127 129 128 130 /*
+8 -3
mm/nommu.c
··· 432 432 /* 433 433 * Ok, looks good - let it rip. 434 434 */ 435 + flush_icache_range(mm->brk, brk); 435 436 return mm->brk = brk; 436 437 } 437 438 ··· 1354 1353 share: 1355 1354 add_vma_to_mm(current->mm, vma); 1356 1355 1357 - up_write(&nommu_region_sem); 1356 + /* we flush the region from the icache only when the first executable 1357 + * mapping of it is made */ 1358 + if (vma->vm_flags & VM_EXEC && !region->vm_icache_flushed) { 1359 + flush_icache_range(region->vm_start, region->vm_end); 1360 + region->vm_icache_flushed = true; 1361 + } 1358 1362 1359 - if (prot & PROT_EXEC) 1360 - flush_icache_range(result, result + len); 1363 + up_write(&nommu_region_sem); 1361 1364 1362 1365 kleave(" = %lx", result); 1363 1366 return result;