• S
    mm: fix wrong kunmap_atomic() pointer · 5f1a1907
    Steven Rostedt 提交于
    Running a ktest.pl test, I hit the following bug on x86_32:
    
      ------------[ cut here ]------------
      WARNING: at arch/x86/mm/highmem_32.c:81 __kunmap_atomic+0x64/0xc1()
       Hardware name:
      Modules linked in:
      Pid: 93, comm: sh Not tainted 2.6.39-test+ #1
      Call Trace:
       [<c04450da>] warn_slowpath_common+0x7c/0x91
       [<c042f5df>] ? __kunmap_atomic+0x64/0xc1
       [<c042f5df>] ? __kunmap_atomic+0x64/0xc1^M
       [<c0445111>] warn_slowpath_null+0x22/0x24
       [<c042f5df>] __kunmap_atomic+0x64/0xc1
       [<c04d4a22>] unmap_vmas+0x43a/0x4e0
       [<c04d9065>] exit_mmap+0x91/0xd2
       [<c0443057>] mmput+0x43/0xad
       [<c0448358>] exit_mm+0x111/0x119
       [<c044855f>] do_exit+0x1ff/0x5fa
       [<c0454ea2>] ? set_current_blocked+0x3c/0x40
       [<c0454f24>] ? sigprocmask+0x7e/0x8e
       [<c0448b55>] do_group_exit+0x65/0x88
       [<c0448b90>] sys_exit_group+0x18/0x1c
       [<c0c3915f>] sysenter_do_call+0x12/0x38
      ---[ end trace 8055f74ea3c0eb62 ]---
    
    Running a ktest.pl git bisect, found the culprit: commit e303297e
    ("mm: extended batches for generic mmu_gather")
    
    But although this was the commit triggering the bug, it was not the one
    originally responsible for the bug.  That was commit d16dfc55 ("mm:
    mmu_gather rework").
    
    The code in zap_pte_range() has something that looks like the following:
    
    	pte =  pte_offset_map_lock(mm, pmd, addr, &ptl);
    	do {
    		[...]
    	} while (pte++, addr += PAGE_SIZE, addr != end);
    	pte_unmap_unlock(pte - 1, ptl);
    
    The pte starts off pointing at the first element in the page table
    directory that was returned by the pte_offset_map_lock().  When it's done
    with the page, pte will be pointing to anything between the next entry and
    the first entry of the next page inclusive.  By doing a pte - 1, this puts
    the pte back onto the original page, which is all that pte_unmap_unlock()
    needs.
    
    In most archs (64 bit), this is not an issue as the pte is ignored in the
    pte_unmap_unlock().  But on 32 bit archs, where things may be kmapped, it
    is essential that the pte passed to pte_unmap_unlock() resides on the same
    page that was given by pte_offest_map_lock().
    
    The problem came in d16dfc55 ("mm: mmu_gather rework") where it introduced
    a "break;" from the while loop.  This alone did not seem to easily trigger
    the bug.  But the modifications made by e303297e caused that "break;" to
    be hit on the first iteration, before the pte++.
    
    The pte not being incremented will now cause pte_unmap_unlock(pte - 1) to
    be pointing to the previous page.  This will cause the wrong page to be
    unmapped, and also trigger the warning above.
    
    The simple solution is to just save the pointer given by
    pte_offset_map_lock() and use it in the unlock.
    Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Acked-by: NHugh Dickins <hughd@google.com>
    Cc: Mel Gorman <mel@csn.ul.ie>
    Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
    5f1a1907
memory.c 106.1 KB