FAILED: patch "[PATCH] mm/huge_memory: replace VM_NO_THP VM_BUG_ON with actual VMA" failed to apply to 3.14-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 3.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
3486b85a29c1741db99d0c522211c82d2b7a56d0Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <[email protected]>
Date: Thu, 28 Apr 2016 16:18:32 -0700
Subject: [PATCH] mm/huge_memory: replace VM_NO_THP VM_BUG_ON with actual VMA
check
Khugepaged detects own VMAs by checking vm_file and vm_ops but this way it cannot distinguish private /dev/zero mappings from other special mappings like /dev/hpet which has no vm_ops and popultes PTEs in mmap.
This fixes false-positive VM_BUG_ON and prevents installing THP where they are not expected.
mm/huge_memory.c +2 -4
@@ -1960,10 +1960,9 @@ int khugepaged_enter_vma_merge(struct vm_area_struct *vma,* page fault if needed. */ return 0 ; -if (vma->vm_ops) +if (vma->vm_ops || (vm_flags &VM_NO_THP ))/* khugepaged not yet working on file or special mappings */ return 0 ; -VM_BUG_ON_VMA (vm_flags &VM_NO_THP , vma); hstart = (vma->vm_start + ~HPAGE_PMD_MASK ) &HPAGE_PMD_MASK ; hend = vma->vm_end &HPAGE_PMD_MASK ;if (hstart < hend)
@@ -2352,8 +2351,7 @@ static bool hugepage_vma_check(struct vm_area_struct *vma)return false;if (is_vma_temporary_stack (vma))return false; -VM_BUG_ON_VMA (vma->vm_flags &VM_NO_THP , vma); -return true; +return !(vma->vm_flags &VM_NO_THP ); } static void collapse_huge_page(struct mm_struct *mm,