Revision 3ad33b2436b545cbe8b28e53f3710432cad457ab authored by Lee Schermerhorn on 15 November 2007, 00:59:10 UTC, committed by Linus Torvalds on 15 November 2007, 02:45:38 UTC
We hit the BUG_ON() in mm/rmap.c:vma_address() when trying to migrate via
mbind(MPOL_MF_MOVE) a non-anon region that spans multiple vmas.  For
anon-regions, we just fail to migrate any pages beyond the 1st vma in the
range.

This occurs because do_mbind() collects a list of pages to migrate by
calling check_range().  check_range() walks the task's mm, spanning vmas as
necessary, to collect the migratable pages into a list.  Then, do_mbind()
calls migrate_pages() passing the list of pages, a function to allocate new
pages based on vma policy [new_vma_page()], and a pointer to the first vma
of the range.

For each page in the list, new_vma_page() calls page_address_in_vma()
passing the page and the vma [first in range] to obtain the address to get
for alloc_page_vma().  The page address is needed to get interleaving
policy correct.  If the pages in the list come from multiple vmas,
eventually, new_page_address() will pass that page to page_address_in_vma()
with the incorrect vma.  For !PageAnon pages, this will result in a bug
check in rmap.c:vma_address().  For anon pages, vma_address() will just
return EFAULT and fail the migration.

This patch modifies new_vma_page() to check the return value from
page_address_in_vma().  If the return value is EFAULT, new_vma_page()
searchs forward via vm_next for the vma that maps the page--i.e., that does
not return EFAULT.  This assumes that the pages in the list handed to
migrate_pages() is in address order.  This is currently case.  The patch
documents this assumption in a new comment block for new_vma_page().

If new_vma_page() cannot locate the vma mapping the page in a forward
search in the mm, it will pass a NULL vma to alloc_page_vma().  This will
result in the allocation using the task policy, if any, else system default
policy.  This situation is unlikely, but the patch documents this behavior
with a comment.

Note, this patch results in restarting from the first vma in a multi-vma
range each time new_vma_page() is called.  If this is not acceptable, we
can make the vma argument a pointer, both in new_vma_page() and it's caller
unmap_and_move() so that the value held by the loop in migrate_pages()
always passes down the last vma in which a page was found.  This will
require changes to all new_page_t functions passed to migrate_pages().  Is
this necessary?

For this patch to work, we can't bug check in vma_address() for pages
outside the argument vma.  This patch removes the BUG_ON().  All other
callers [besides new_vma_page()] already check the return status.

Tested on x86_64, 4 node NUMA platform.

Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent e1a1c99
History
File Mode Size
platform-iss
variant-fsf
Kbuild -rw-r--r-- 39 bytes
a.out.h -rw-r--r-- 765 bytes
asmmacro.h -rw-r--r-- 2.7 KB
atomic.h -rw-r--r-- 7.2 KB
auxvec.h -rw-r--r-- 60 bytes
bitops.h -rw-r--r-- 2.8 KB
bootparam.h -rw-r--r-- 1.5 KB
bug.h -rw-r--r-- 400 bytes
bugs.h -rw-r--r-- 451 bytes
byteorder.h -rw-r--r-- 2.4 KB
cache.h -rw-r--r-- 932 bytes
cacheasm.h -rw-r--r-- 3.2 KB
cacheflush.h -rw-r--r-- 4.5 KB
checksum.h -rw-r--r-- 6.0 KB
coprocessor.h -rw-r--r-- 2.5 KB
cpumask.h -rw-r--r-- 381 bytes
cputime.h -rw-r--r-- 118 bytes
current.h -rw-r--r-- 677 bytes
delay.h -rw-r--r-- 1.1 KB
device.h -rw-r--r-- 129 bytes
div64.h -rw-r--r-- 371 bytes
dma-mapping.h -rw-r--r-- 4.2 KB
dma.h -rw-r--r-- 1.8 KB
elf.h -rw-r--r-- 8.6 KB
emergency-restart.h -rw-r--r-- 149 bytes
errno.h -rw-r--r-- 371 bytes
fb.h -rw-r--r-- 205 bytes
fcntl.h -rw-r--r-- 31 bytes
futex.h -rw-r--r-- 31 bytes
hardirq.h -rw-r--r-- 815 bytes
highmem.h -rw-r--r-- 362 bytes
hw_irq.h -rw-r--r-- 320 bytes
ide.h -rw-r--r-- 674 bytes
io.h -rw-r--r-- 5.6 KB
ioctl.h -rw-r--r-- 31 bytes
ioctls.h -rw-r--r-- 4.0 KB
ipcbuf.h -rw-r--r-- 842 bytes
irq.h -rw-r--r-- 641 bytes
irq_regs.h -rw-r--r-- 34 bytes
kdebug.h -rw-r--r-- 32 bytes
kmap_types.h -rw-r--r-- 588 bytes
linkage.h -rw-r--r-- 377 bytes
local.h -rw-r--r-- 371 bytes
mman.h -rw-r--r-- 3.0 KB
mmu.h -rw-r--r-- 406 bytes
mmu_context.h -rw-r--r-- 2.9 KB
module.h -rw-r--r-- 588 bytes
msgbuf.h -rw-r--r-- 1.5 KB
mutex.h -rw-r--r-- 308 bytes
namei.h -rw-r--r-- 589 bytes
page.h -rw-r--r-- 5.0 KB
param.h -rw-r--r-- 720 bytes
pci-bridge.h -rw-r--r-- 2.2 KB
pci.h -rw-r--r-- 2.2 KB
percpu.h -rw-r--r-- 382 bytes
pgalloc.h -rw-r--r-- 1.6 KB
pgtable.h -rw-r--r-- 13.3 KB
platform.h -rw-r--r-- 2.0 KB
poll.h -rw-r--r-- 446 bytes
posix_types.h -rw-r--r-- 3.3 KB
processor.h -rw-r--r-- 5.9 KB
ptrace.h -rw-r--r-- 4.1 KB
regs.h -rw-r--r-- 3.9 KB
resource.h -rw-r--r-- 379 bytes
rmap.h -rw-r--r-- 345 bytes
rwsem.h -rw-r--r-- 3.6 KB
scatterlist.h -rw-r--r-- 984 bytes
sections.h -rw-r--r-- 386 bytes
segment.h -rw-r--r-- 374 bytes
semaphore.h -rw-r--r-- 2.1 KB
sembuf.h -rw-r--r-- 1.2 KB
serial.h -rw-r--r-- 447 bytes
setup.h -rw-r--r-- 348 bytes
shmbuf.h -rw-r--r-- 2.1 KB
shmparam.h -rw-r--r-- 561 bytes
sigcontext.h -rw-r--r-- 646 bytes
siginfo.h -rw-r--r-- 381 bytes
signal.h -rw-r--r-- 3.9 KB
smp.h -rw-r--r-- 601 bytes
socket.h -rw-r--r-- 1.4 KB
sockios.h -rw-r--r-- 800 bytes
spinlock.h -rw-r--r-- 380 bytes
stat.h -rw-r--r-- 1.8 KB
statfs.h -rw-r--r-- 370 bytes
string.h -rw-r--r-- 2.7 KB
syscall.h -rw-r--r-- 1.6 KB
system.h -rw-r--r-- 5.6 KB
termbits.h -rw-r--r-- 4.8 KB
termios.h -rw-r--r-- 2.9 KB
thread_info.h -rw-r--r-- 4.1 KB
timex.h -rw-r--r-- 2.3 KB
tlb.h -rw-r--r-- 1.1 KB
tlbflush.h -rw-r--r-- 4.9 KB
topology.h -rw-r--r-- 386 bytes
types.h -rw-r--r-- 1.4 KB
uaccess.h -rw-r--r-- 13.8 KB
ucontext.h -rw-r--r-- 540 bytes
unaligned.h -rw-r--r-- 767 bytes
unistd.h -rw-r--r-- 21.0 KB
user.h -rw-r--r-- 507 bytes
vga.h -rw-r--r-- 434 bytes
xor.h -rw-r--r-- 341 bytes

back to top