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
Kbuild -rw-r--r-- 130 bytes
a.out.h -rw-r--r-- 188 bytes
atomic.h -rw-r--r-- 7.1 KB
auxvec.h -rw-r--r-- 54 bytes
ax88796.h -rw-r--r-- 751 bytes
bitops.h -rw-r--r-- 7.1 KB
bug.h -rw-r--r-- 1.3 KB
bugs.h -rw-r--r-- 445 bytes
busctl-regs.h -rw-r--r-- 2.0 KB
byteorder.h -rw-r--r-- 290 bytes
cache.h -rw-r--r-- 727 bytes
cacheflush.h -rw-r--r-- 3.0 KB
checksum.h -rw-r--r-- 4.6 KB
cpu-irqs.h -rw-r--r-- 2.6 KB
cpumask.h -rw-r--r-- 109 bytes
cputime.h -rw-r--r-- 109 bytes
current.h -rw-r--r-- 685 bytes
delay.h -rw-r--r-- 1.3 KB
device.h -rw-r--r-- 129 bytes
div64.h -rw-r--r-- 31 bytes
dm9000.h -rw-r--r-- 1.1 KB
dma-mapping.h -rw-r--r-- 5.1 KB
dma.h -rw-r--r-- 3.6 KB
elf.h -rw-r--r-- 5.3 KB
emergency-restart.h -rw-r--r-- 149 bytes
errno.h -rw-r--r-- 102 bytes
fb.h -rw-r--r-- 205 bytes
fcntl.h -rw-r--r-- 31 bytes
fpu.h -rw-r--r-- 222 bytes
futex.h -rw-r--r-- 334 bytes
gdb-stub.h -rw-r--r-- 4.4 KB
gpio-regs.h -rw-r--r-- 3.6 KB
hardirq.h -rw-r--r-- 901 bytes
highmem.h -rw-r--r-- 5.2 KB
hw_irq.h -rw-r--r-- 484 bytes
ide.h -rw-r--r-- 1.2 KB
init.h -rw-r--r-- 340 bytes
io.h -rw-r--r-- 9.1 KB
ioctl.h -rw-r--r-- 31 bytes
ioctls.h -rw-r--r-- 2.4 KB
ipcbuf.h -rw-r--r-- 629 bytes
irc-regs.h -rw-r--r-- 1.8 KB
irq.h -rw-r--r-- 760 bytes
irq_regs.h -rw-r--r-- 764 bytes
kdebug.h -rw-r--r-- 32 bytes
kmap_types.h -rw-r--r-- 641 bytes
linkage.h -rw-r--r-- 114 bytes
local.h -rw-r--r-- 101 bytes
math-emu.h -rw-r--r-- 6.3 KB
mb-regs.h -rw-r--r-- 6.9 KB
mb86943a.h -rw-r--r-- 1.8 KB
mb93091-fpga-irqs.h -rw-r--r-- 1.1 KB
mb93093-fpga-irqs.h -rw-r--r-- 789 bytes
mb93493-irqs.h -rw-r--r-- 1.7 KB
mb93493-regs.h -rw-r--r-- 12.5 KB
mc146818rtc.h -rw-r--r-- 485 bytes
mem-layout.h -rw-r--r-- 2.0 KB
mman.h -rw-r--r-- 614 bytes
mmu.h -rw-r--r-- 1.3 KB
mmu_context.h -rw-r--r-- 1.4 KB
module.h -rw-r--r-- 699 bytes
msgbuf.h -rw-r--r-- 980 bytes
mutex.h -rw-r--r-- 308 bytes
namei.h -rw-r--r-- 295 bytes
page.h -rw-r--r-- 2.4 KB
param.h -rw-r--r-- 436 bytes
pci.h -rw-r--r-- 3.5 KB
percpu.h -rw-r--r-- 108 bytes
pgalloc.h -rw-r--r-- 1.7 KB
pgtable.h -rw-r--r-- 16.7 KB
poll.h -rw-r--r-- 150 bytes
posix_types.h -rw-r--r-- 1.9 KB
processor.h -rw-r--r-- 4.0 KB
ptrace.h -rw-r--r-- 2.5 KB
registers.h -rw-r--r-- 6.7 KB
resource.h -rw-r--r-- 114 bytes
scatterlist.h -rw-r--r-- 924 bytes
sections.h -rw-r--r-- 1.2 KB
segment.h -rw-r--r-- 1.1 KB
semaphore.h -rw-r--r-- 3.5 KB
sembuf.h -rw-r--r-- 697 bytes
serial-regs.h -rw-r--r-- 1.6 KB
serial.h -rw-r--r-- 378 bytes
setup.h -rw-r--r-- 697 bytes
shmbuf.h -rw-r--r-- 1.1 KB
shmparam.h -rw-r--r-- 144 bytes
sigcontext.h -rw-r--r-- 803 bytes
siginfo.h -rw-r--r-- 204 bytes
signal.h -rw-r--r-- 3.4 KB
smp.h -rw-r--r-- 100 bytes
socket.h -rw-r--r-- 1.2 KB
sockios.h -rw-r--r-- 351 bytes
spinlock.h -rw-r--r-- 516 bytes
spr-regs.h -rw-r--r-- 17.4 KB
stat.h -rw-r--r-- 2.2 KB
statfs.h -rw-r--r-- 106 bytes
string.h -rw-r--r-- 1.4 KB
suspend.h -rw-r--r-- 537 bytes
system.h -rw-r--r-- 7.0 KB
termbits.h -rw-r--r-- 4.5 KB
termios.h -rw-r--r-- 1.4 KB
thread_info.h -rw-r--r-- 4.2 KB
timer-regs.h -rw-r--r-- 3.6 KB
timex.h -rw-r--r-- 408 bytes
tlb.h -rw-r--r-- 576 bytes
tlbflush.h -rw-r--r-- 1.9 KB
topology.h -rw-r--r-- 216 bytes
types.h -rw-r--r-- 1.4 KB
uaccess.h -rw-r--r-- 8.3 KB
ucontext.h -rw-r--r-- 242 bytes
unaligned.h -rw-r--r-- 5.5 KB
unistd.h -rw-r--r-- 10.5 KB
user.h -rw-r--r-- 3.3 KB
vga.h -rw-r--r-- 464 bytes
virtconvert.h -rw-r--r-- 1.1 KB
xor.h -rw-r--r-- 29 bytes

back to top