Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] freepgt: free_pgtables from FIRST_USER_ADDRESS

The patches to free_pgtables by vma left problems on any architectures which
leave some user address page table entries unencapsulated by vma. Andi has
fixed the 32-bit vDSO on x86_64 to use a vma. Now fix arm (and arm26), whose
first PAGE_SIZE is reserved (perhaps) for machine vectors.

Our calls to free_pgtables must not touch that area, and exit_mmap's
BUG_ON(nr_ptes) must allow that arm's get_pgd_slow may (or may not) have
allocated an extra page table, which its free_pgd_slow would free later.

FIRST_USER_PGD_NR has misled me and others: until all the arches define
FIRST_USER_ADDRESS instead, a hack in mmap.c to derive one from t'other. This
patch fixes the bugs, the remaining patches just clean it up.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Hugh Dickins and committed by
Linus Torvalds
e2cdef8c 021740dc

+8 -3
+8 -3
mm/mmap.c
··· 1612 1612 validate_mm(mm); 1613 1613 } 1614 1614 1615 + #ifndef FIRST_USER_ADDRESS /* temporary hack */ 1616 + #define THIS_IS_ARM FIRST_USER_PGD_NR 1617 + #define FIRST_USER_ADDRESS (THIS_IS_ARM * PAGE_SIZE) 1618 + #endif 1619 + 1615 1620 /* 1616 1621 * Get rid of page table information in the indicated region. 1617 1622 * ··· 1635 1630 tlb = tlb_gather_mmu(mm, 0); 1636 1631 unmap_vmas(&tlb, mm, vma, start, end, &nr_accounted, NULL); 1637 1632 vm_unacct_memory(nr_accounted); 1638 - free_pgtables(&tlb, vma, prev? prev->vm_end: 0, 1633 + free_pgtables(&tlb, vma, prev? prev->vm_end: FIRST_USER_ADDRESS, 1639 1634 next? next->vm_start: 0); 1640 1635 tlb_finish_mmu(tlb, start, end); 1641 1636 spin_unlock(&mm->page_table_lock); ··· 1915 1910 /* Use -1 here to ensure all VMAs in the mm are unmapped */ 1916 1911 end = unmap_vmas(&tlb, mm, vma, 0, -1, &nr_accounted, NULL); 1917 1912 vm_unacct_memory(nr_accounted); 1918 - free_pgtables(&tlb, vma, 0, 0); 1913 + free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); 1919 1914 tlb_finish_mmu(tlb, 0, end); 1920 1915 1921 1916 mm->mmap = mm->mmap_cache = NULL; ··· 1936 1931 vma = next; 1937 1932 } 1938 1933 1939 - BUG_ON(mm->nr_ptes); /* This is just debugging */ 1934 + BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); 1940 1935 } 1941 1936 1942 1937 /* Insert vm structure into process list sorted by address