Skip to content

mm: improve map count checks

Lorenzo Stoakes (Oracle) linux-mm lkml 1 version Applied

Status from this message: [merged mm-stable] mm-mremap-check-map-count-under-mmap-write-lock-and-abstract.patch removed from -mm tree

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest3 patches 6 repliesApplied 3/3

Patches in v1 All 3 applied

#Subject and filesSizeRepliesApplied
1/3mm/mremap: correct invalid map count checkmm/mremap.c+12 -161 replyApplied
2/3mm: abstract reading sysctl_max_map_count, and READ_ONCE()include/linux/mm.h mm/internal.h mm/mmap.c +6 more+24 -121 replyApplied
3/3mm/mremap: check map count under mmap write lock and abstractmm/mremap.c+75 -132 repliesApplied

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchPedro Falcato
1/3R-b
2/3R-b
3/3R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/3] mm: improve map count checks

Firstly, in mremap(), it appears that our map count checks have been overly conservative - there is simply no reason to require that we have headroom of 4 mappings prior to moving the VMA, we only need headroom of 2 VMAs since commit 659ace584e7a ("mmap: don't return ENOMEM when mapcount is temporarily exceeded in munmap()").

Likely the original headroom of 4 mappings was a mistake, and 3 was actually intended.

Next, we access sysctl_max_map_count in a number of places without being all that careful about how we do so.

We introduces a simple helper that READ_ONCE()'s the field (get_sysctl_max_map_count()) to ensure that the field is accessed correctly. The WRITE_ONCE() side is already handled by the sysctl procfs code in proc_int_conv().

We also move this field to internal.h as there's no reason for anybody else to access it outside of mm. Unfortunately we have to maintain the extern variable, as mmap.c implements the procfs code.

Finally, we are accessing current->mm->map_count without holding the mmap write lock, which is also not correct, so this series ensures the lock is head before we access it.

We also abstract the check to a helper function, and add ASCII diagrams to explain why we're doing what we're doing.

Lorenzo Stoakes (Oracle) (3):
mm/mremap: correct invalid map count check
mm: abstract reading sysctl_max_map_count, and READ_ONCE() mm/mremap: check map count under mmap write lock and abstract

 include/linux/mm.h                 |  2 -
 mm/internal.h                      |  6 ++
 mm/mmap.c                          |  2 +-
 mm/mremap.c                        | 98 ++++++++++++++++++++++++------
 mm/nommu.c                         |  2 +-
 mm/vma.c                           |  6 +-
 tools/testing/vma/include/custom.h |  3 -
 tools/testing/vma/include/dup.h    |  9 +++
 tools/testing/vma/main.c           |  2 +
 9 files changed, 100 insertions(+), 30 deletions(-)

--
2.53.0