Skip to content

Commit efce8a4

Browse files
ljskernelgregkh
authored andcommitted
mm: introduce VM_MAYBE_GUARD and make visible in /proc/$pid/smaps
commit 5dba5cc upstream. Patch series "introduce VM_MAYBE_GUARD and make it sticky", v4. Currently, guard regions are not visible to users except through /proc/$pid/pagemap, with no explicit visibility at the VMA level. This makes the feature less useful, as it isn't entirely apparent which VMAs may have these entries present, especially when performing actions which walk through memory regions such as those performed by CRIU. This series addresses this issue by introducing the VM_MAYBE_GUARD flag which fulfils this role, updating the smaps logic to display an entry for these. The semantics of this flag are that a guard region MAY be present if set (we cannot be sure, as we can't efficiently track whether an MADV_GUARD_REMOVE finally removes all the guard regions in a VMA) - but if not set the VMA definitely does NOT have any guard regions present. It's problematic to establish this flag without further action, because that means that VMAs with guard regions in them become non-mergeable with adjacent VMAs for no especially good reason. To work around this, this series also introduces the concept of 'sticky' VMA flags - that is flags which: a. if set in one VMA and not in another still permit those VMAs to be merged (if otherwise compatible). b. When they are merged, the resultant VMA must have the flag set. The VMA logic is updated to propagate these flags correctly. Additionally, VM_MAYBE_GUARD being an explicit VMA flag allows us to solve an issue with file-backed guard regions - previously these established an anon_vma object for file-backed mappings solely to have vma_needs_copy() correctly propagate guard region mappings to child processes. We introduce a new flag alias VM_COPY_ON_FORK (which currently only specifies VM_MAYBE_GUARD) and update vma_needs_copy() to check explicitly for this flag and to copy page tables if it is present, which resolves this issue. Additionally, we add the ability for allow-listed VMA flags to be atomically writable with only mmap/VMA read locks held. The only flag we allow so far is VM_MAYBE_GUARD, which we carefully ensure does not cause any races by being allowed to do so. This allows us to maintain guard region installation as a read-locked operation and not endure the overhead of obtaining a write lock here. Finally we introduce extensive VMA userland tests to assert that the sticky VMA logic behaves correctly as well as guard region self tests to assert that smaps visibility is correctly implemented. This patch (of 9): Currently, if a user needs to determine if guard regions are present in a range, they have to scan all VMAs (or have knowledge of which ones might have guard regions). Since commit 8e2f2ae ("fs/proc/task_mmu: add guard region bit to pagemap") and the related commit a516403 ("fs/proc: extend the PAGEMAP_SCAN ioctl to report guard regions"), users can use either /proc/$pid/pagemap or the PAGEMAP_SCAN functionality to perform this operation at a virtual address level. This is not ideal, and it gives no visibility at a /proc/$pid/smaps level that guard regions exist in ranges. This patch remedies the situation by establishing a new VMA flag, VM_MAYBE_GUARD, to indicate that a VMA may contain guard regions (it is uncertain because we cannot reasonably determine whether a MADV_GUARD_REMOVE call has removed all of the guard regions in a VMA, and additionally VMAs may change across merge/split). We utilise 0x800 for this flag which makes it available to 32-bit architectures also, a flag that was previously used by VM_DENYWRITE, which was removed in commit 8d0920b ("mm: remove VM_DENYWRITE") and hasn't bee reused yet. We also update the smaps logic and documentation to identify these VMAs. Another major use of this functionality is that we can use it to identify that we ought to copy page tables on fork. We do not actually implement usage of this flag in mm/madvise.c yet as we need to allow some VMA flags to be applied atomically under mmap/VMA read lock in order to avoid the need to acquire a write lock for this purpose. Link: https://lkml.kernel.org/r/cover.1763460113.git.ljs@kernel.org Link: https://lkml.kernel.org/r/cf8ef821eba29b6c5b5e138fffe95d6dcabdedb9.1763460113.git.ljs@kernel.org Signed-off-by: Lorenzo Stoakes <ljs@kernel.org> Reviewed-by: Pedro Falcato <pfalcato@suse.de> Reviewed-by: Vlastimil Babka <vbabka@suse.cz> Acked-by: David Hildenbrand (Red Hat) <david@kernel.org> Reviewed-by: Lance Yang <lance.yang@linux.dev> Cc: Andrei Vagin <avagin@gmail.com> Cc: Baolin Wang <baolin.wang@linux.alibaba.com> Cc: Barry Song <baohua@kernel.org> Cc: Dev Jain <dev.jain@arm.com> Cc: Jann Horn <jannh@google.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: "Masami Hiramatsu (Google)" <mhiramat@kernel.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Michal Hocko <mhocko@suse.com> Cc: Mike Rapoport <rppt@kernel.org> Cc: Nico Pache <npache@redhat.com> Cc: Ryan Roberts <ryan.roberts@arm.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Zi Yan <ziy@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ahmed Elaidy <elaidya225@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0de7db2 commit efce8a4

6 files changed

Lines changed: 13 additions & 2 deletions

File tree

Documentation/filesystems/proc.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ otherwise.
553553
kernel flags associated with the particular virtual memory area in two letter
554554
encoded manner. The codes are the following:
555555

556-
== =======================================
556+
== =============================================================
557557
rd readable
558558
wr writeable
559559
ex executable
@@ -591,7 +591,8 @@ encoded manner. The codes are the following:
591591
sl sealed
592592
lf lock on fault pages
593593
dp always lazily freeable mapping
594-
== =======================================
594+
gu maybe contains guard regions (if not set, definitely doesn't)
595+
== =============================================================
595596

596597
Note that there is no guarantee that every flag and associated mnemonic will
597598
be present in all further kernel releases. Things get changed, the flags may

fs/proc/task_mmu.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,6 +1159,7 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
11591159
[ilog2(VM_MAYSHARE)] = "ms",
11601160
[ilog2(VM_GROWSDOWN)] = "gd",
11611161
[ilog2(VM_PFNMAP)] = "pf",
1162+
[ilog2(VM_MAYBE_GUARD)] = "gu",
11621163
[ilog2(VM_LOCKED)] = "lo",
11631164
[ilog2(VM_IO)] = "io",
11641165
[ilog2(VM_SEQ_READ)] = "sr",

include/linux/mm.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,8 @@ extern struct rw_semaphore nommu_region_sem;
269269
extern unsigned int kobjsize(const void *objp);
270270
#endif
271271

272+
#define VM_MAYBE_GUARD_BIT 11
273+
272274
/*
273275
* vm_flags in vm_area_struct, see mm_types.h.
274276
* When changing, update also include/trace/events/mmflags.h
@@ -294,6 +296,7 @@ extern unsigned int kobjsize(const void *objp);
294296
#define VM_UFFD_MISSING 0
295297
#endif /* CONFIG_MMU */
296298
#define VM_PFNMAP 0x00000400 /* Page-ranges managed without "struct page", just pure PFN */
299+
#define VM_MAYBE_GUARD BIT(VM_MAYBE_GUARD_BIT) /* The VMA maybe contains guard regions. */
297300
#define VM_UFFD_WP 0x00001000 /* wrprotect pages tracking */
298301

299302
#define VM_LOCKED 0x00002000

include/trace/events/mmflags.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ IF_HAVE_PG_ARCH_3(arch_3)
213213
{VM_UFFD_MISSING, "uffd_missing" }, \
214214
IF_HAVE_UFFD_MINOR(VM_UFFD_MINOR, "uffd_minor" ) \
215215
{VM_PFNMAP, "pfnmap" }, \
216+
{VM_MAYBE_GUARD, "maybe_guard" }, \
216217
{VM_UFFD_WP, "uffd_wp" }, \
217218
{VM_LOCKED, "locked" }, \
218219
{VM_IO, "io" }, \

mm/memory.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,6 +1494,10 @@ vma_needs_copy(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma)
14941494
if (src_vma->anon_vma)
14951495
return true;
14961496

1497+
/* Guard regions have modified page tables that require copying. */
1498+
if (src_vma->vm_flags & VM_MAYBE_GUARD)
1499+
return true;
1500+
14971501
/*
14981502
* Don't copy ptes where a page fault will fill them correctly. Fork
14991503
* becomes much lighter when there are big shared or private readonly

tools/testing/vma/vma_internal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ extern unsigned long dac_mmap_min_addr;
5656
#define VM_MAYEXEC 0x00000040
5757
#define VM_GROWSDOWN 0x00000100
5858
#define VM_PFNMAP 0x00000400
59+
#define VM_MAYBE_GUARD 0x00000800
5960
#define VM_LOCKED 0x00002000
6061
#define VM_IO 0x00004000
6162
#define VM_SEQ_READ 0x00008000 /* App will access data sequentially */

0 commit comments

Comments
 (0)