]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
mm: fix kernel BUG at huge_memory.c:1474!
authorHugh Dickins <hughd@google.com>
Mon, 17 Dec 2012 02:56:58 +0000 (18:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Dec 2012 03:02:38 +0000 (19:02 -0800)
commita4f1de176614f634c367e5994a7bcc428c940df0
tree9193f723c6f61442cf1fbc50e2db48d060f417d6
parent2dfea3803dcf70983d14ce1dcbb3e97a7459a28b
mm: fix kernel BUG at huge_memory.c:1474!

Andrea's autonuma-benchmark numa01 hits kernel BUG at huge_memory.c:1474!
in change_huge_pmd called from change_protection from change_prot_numa
from task_numa_work.

That BUG, introduced in the huge zero page commit cad7f613c4d0 ("thp:
change_huge_pmd(): make sure we don't try to make a page writable")
was trying to verify that newprot never adds write permission to an
anonymous huge page; but Automatic NUMA Balancing's 4b10e7d562c9 ("mm:
mempolicy: Implement change_prot_numa() in terms of change_protection()")
adds a new prot_numa path into change_huge_pmd(), which makes no use of
the newprot provided, and may retain the write bit in the pmd.

Just move the BUG_ON(pmd_write(entry)) up into the !prot_numa block.

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/huge_memory.c