Skip to contentSkip to conversation

mm-do-not-show-for-vm_lockonfault-pages.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Dec 12, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: do not show fs mm pc for VM_LOCKONFAULT pages
has been removed from the -mm tree. Its filename was
mm-do-not-show-for-vm_lockonfault-pages.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: "Jason A. Donenfeld" <[email protected]>
Subject: mm: do not show fs mm pc for VM_LOCKONFAULT pages
Date: Mon, 5 Dec 2022 18:30:07 +0100

When VM_LOCKONFAULT was added, /proc/PID/smaps wasn't hooked up to it, so looking at /proc/PID/smaps, it shows '??' instead of something intelligable. This can be reached by userspace by simply calling mlock2(..., MLOCK_ONFAULT);.

Fix this by adding "lf" to denote VM_LOCKONFAULT.

Fixes de60f5f10c58 ("mm: introduce VM_LOCKONFAULT")
Cc Eric B Munson <[email protected]>
Cc Kirill A. Shutemov <[email protected]>

---

 fs/proc/task_mmu.c |    1 +
 1 file changed, 1 insertion(+)
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~mm-do-not-show-for-vm_lockonfault-pages +1 -0
@@ -674,6 +674,7 @@ static void show_smap_vma_flags(struct s
 		[ilog2(VM_RAND_READ)]	= "rr",
 		[ilog2(VM_DONTCOPY)]	= "dc",
 		[ilog2(VM_DONTEXPAND)]	= "de",
+		[ilog2(VM_LOCKONFAULT)]	= "lf",
 		[ilog2(VM_ACCOUNT)]	= "ac",
 		[ilog2(VM_NORESERVE)]	= "nr",
 		[ilog2(VM_HUGETLB)]	= "ht",

_

Patches currently in -mm which might be from [email protected] are