mm-take-placement-mappings-gap-into-account.patch removed from -mm tree
The quilt patch titled
Subject: mm: take placement mappings gap into account
has been removed from the -mm tree. Its filename was
mm-take-placement-mappings-gap-into-account.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Rick Edgecombe <[email protected]>
Subject: mm: take placement mappings gap into account
Date: Mon, 25 Mar 2024 19:16:53 -0700
When memory is being placed, mmap() will take care to respect the guard gaps of certain types of memory (VM_SHADOWSTACK, VM_GROWSUP and VM_GROWSDOWN). In order to ensure guard gaps between mappings, mmap() needs to consider two things:
1. That the new mapping isn't placed in an any existing mappings guard gaps.
2. That the new mapping isn't placed such that any existing mappings are not in *its* guard gaps.
The longstanding behavior of mmap() is to ensure 1, but not take any care around 2. So for example, if there is a PAGE_SIZE free area, and a mmap() with a PAGE_SIZE size, and a type that has a guard gap is being placed, mmap() may place the shadow stack in the PAGE_SIZE free area. Then the mapping that is supposed to have a guard gap will not have a gap to the adjacent VMA.
For MAP_GROWSDOWN/VM_GROWSDOWN and MAP_GROWSUP/VM_GROWSUP this has not been a problem in practice because applications place these kinds of mappings very early, when there is not many mappings to find a space between. But for shadow stacks, they may be placed throughout the lifetime of the application.
Use the start_gap field to find a space that includes the guard gap for the new mapping. Take care to not interfere with the alignment.
---
include/linux/mm.h | 1 + mm/mmap.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-take-placement-mappings-gap-into-account +1 -0
@@ -3468,6 +3468,7 @@ struct vm_unmapped_area_info {unsigned long high_limit;unsigned long align_mask;unsigned long align_offset; +unsigned long start_gap; };extern unsigned long vm_unmapped_area (struct vm_unmapped_area_info *info);
mm/mmap.c renamed from mm/mmap.c~mm-take-placement-mappings-gap-into-account +9 -3
@@ -1579,7 +1579,7 @@ static unsigned long unmapped_area(strucVMA_ITERATOR (vmi, current->mm,0 );/* Adjust search length to account for worst case alignment overhead */ - length = info->length + info->align_mask; + length = info->length + info->align_mask + info->start_gap;if (length < info->length)return -ENOMEM ;
@@ -1591,7 +1591,13 @@ retry:if (vma_iter_area_lowest (&vmi, low_limit, high_limit, length))return -ENOMEM ; - gap =vma_iter_addr (&vmi); +/* +* Adjust for the gap first so it doesn't interfere with the +* later alignment. The first step is the minimum needed to +* fulill the start gap, the next steps is the minimum to align +* that. It is the minimum needed to fulill both. +*/ + gap =vma_iter_addr (&vmi) + info->start_gap; gap += (info->align_offset - gap) & info->align_mask; tmp =vma_next (&vmi);if (tmp && (tmp->vm_flags &VM_STARTGAP_FLAGS )) {/* Avoid prev check if possible */
@@ -1630,7 +1636,7 @@ static unsigned long unmapped_area_topdoVMA_ITERATOR (vmi, current->mm,0 );/* Adjust search length to account for worst case alignment overhead */ - length = info->length + info->align_mask; + length = info->length + info->align_mask + info->start_gap;if (length < info->length)return -ENOMEM ;
_
Patches currently in -mm which might be from [email protected] are