mm-shmem-restore-shmem_huge_deny-precedence-over-madv_collapse.patch removed from -mm tree
The quilt patch titled
Subject: mm/shmem: restore SHMEM_HUGE_DENY precedence over MADV_COLLAPSE
has been removed from the -mm tree. Its filename was
mm-shmem-restore-shmem_huge_deny-precedence-over-madv_collapse.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Zach O'Keefe" <[email protected]>
Subject: mm/shmem: restore SHMEM_HUGE_DENY precedence over MADV_COLLAPSE
Date: Sat, 24 Dec 2022 00:20:35 -0800
SHMEM_HUGE_DENY is for emergency use by the admin, to disable allocation of shmem huge pages if, for example, a dangerous bug is found in their
usage: see "deny" in Documentation/mm/transhuge.rst. An app using madvise(,,MADV_COLLAPSE) should not be allowed to override it: restore its precedence over shmem_huge_force.
Restore SHMEM_HUGE_DENY precedence over MADV_COLLAPSE.
---
mm/shmem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
mm/shmem.c renamed from mm/shmem.c~mm-shmem-restore-shmem_huge_deny-precedence-over-madv_collapse +2 -4
@@ -478,12 +478,10 @@ bool shmem_is_huge(struct vm_area_structif (vma && ((vma->vm_flags &VM_NOHUGEPAGE ) ||test_bit (MMF_DISABLE_THP , &vma->vm_mm->flags)))return false; -if (shmem_huge_force) -return true; -if (shmem_huge ==SHMEM_HUGE_FORCE ) -return true;if (shmem_huge ==SHMEM_HUGE_DENY )return false; +if (shmem_huge_force || shmem_huge ==SHMEM_HUGE_FORCE ) +return true;switch (SHMEM_SB (inode->i_sb)->huge) {case SHMEM_HUGE_ALWAYS :
_
Patches currently in -mm which might be from [email protected] are