2024-06-14 23:23:04

by Jeff Xu

Subject: [PATCH v2 1/1] /proc/pid/smaps: add mseal info for vma

From: Jeff Xu <[email protected]>

Add sl in /proc/pid/smaps to indicate vma is sealed

Signed-off-by: Jeff Xu <[email protected]>
---
Documentation/filesystems/proc.rst | 1 +
fs/proc/task_mmu.c | 3 +++
include/linux/mm.h | 5 +++++
mm/internal.h | 5 -----
4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst
index 7c3a565ffbef..82d142de3461 100644
--- a/Documentation/filesystems/proc.rst
+++ b/Documentation/filesystems/proc.rst
@@ -571,6 +571,7 @@ encoded manner. The codes are the following:
um userfaultfd missing tracking
uw userfaultfd wr-protect tracking
ss shadow stack page
+ sl sealed
== =======================================

Note that there is no guarantee that every flag and associated mnemonic will
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 6ed1f56b32b4..93fb2c61b154 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -711,6 +711,9 @@ static void show_smap_vma_flags(struct seq_file *m, struct vm_area_struct *vma)
#endif /* CONFIG_HAVE_ARCH_USERFAULTFD_MINOR */
#ifdef CONFIG_X86_USER_SHADOW_STACK
[ilog2(VM_SHADOW_STACK)] = "ss",
+#endif
+#ifdef CONFIG_64BIT
+ [ilog2(VM_SEALED)] = "sl",
#endif
};
size_t i;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 587d34879865..84c4cc7354b4 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -406,6 +406,11 @@ extern unsigned int kobjsize(const void *objp);
#define VM_ALLOW_ANY_UNCACHED VM_NONE
#endif

+#ifdef CONFIG_64BIT
+/* VM is sealed, in vm_flags */
+#define VM_SEALED _BITUL(63)
+#endif
+
/* Bits set in the VMA until the stack is in its final location */
#define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ | VM_STACK_EARLY)

diff --git a/mm/internal.h b/mm/internal.h
index fd68c43664d5..72f7c110d563 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1509,11 +1509,6 @@ void __meminit __init_single_page(struct page *page, unsigned long pfn,
unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg,
int priority);

-#ifdef CONFIG_64BIT
-/* VM is sealed, in vm_flags */
-#define VM_SEALED _BITUL(63)
-#endif
-
#ifdef CONFIG_64BIT
static inline int can_do_mseal(unsigned long flags)
{
--
2.45.2.627.g7a2c4fd464-goog

2024-06-15 01:12:22

by Andrew Morton

Subject: Re: [PATCH v2 1/1] /proc/pid/smaps: add mseal info for vma

On Fri, 14 Jun 2024 23:20:14 +0000 [email protected] wrote:

> From: Jeff Xu <[email protected]>
>
> Add sl in /proc/pid/smaps to indicate vma is sealed
>
> ...
>
> --- a/Documentation/filesystems/proc.rst
> +++ b/Documentation/filesystems/proc.rst
> @@ -571,6 +571,7 @@ encoded manner. The codes are the following:
> um userfaultfd missing tracking
> uw userfaultfd wr-protect tracking
> ss shadow stack page
> + sl sealed
> == =======================================

I'll queue this for 6.10-rcX as a fix for 8be7258aad44 ("mseal: add
mseal syscall").