lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 31 Jan 2014 12:23:44 -0600 From: Alex Thorlton <athorlton@....com> To: linux-kernel@...r.kernel.org Cc: Alex Thorlton <athorlton@....com>, Oleg Nesterov <oleg@...hat.com>, Gerald Schaefer <gerald.schaefer@...ibm.com>, Martin Schwidefsky <schwidefsky@...ibm.com>, Heiko Carstens <heiko.carstens@...ibm.com>, Christian Borntraeger <borntraeger@...ibm.com>, Andrew Morton <akpm@...ux-foundation.org>, Paolo Bonzini <pbonzini@...hat.com>, "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>, Mel Gorman <mgorman@...e.de>, Rik van Riel <riel@...hat.com>, Ingo Molnar <mingo@...nel.org>, Peter Zijlstra <peterz@...radead.org>, Sasha Levin <sasha.levin@...cle.com>, linux390@...ibm.com, linux-s390@...r.kernel.org, linux-mm@...ck.org Subject: [PATCH 1/3] Revert "thp: make MADV_HUGEPAGE check for mm->def_flags" This reverts commit 8e72033f2a489b6c98c4e3c7cc281b1afd6cb85cm, and adds in code to fix up any issues caused by the revert. The revert is necessary because hugepage_madvise would return -EINVAL when VM_NOHUGEPAGE is set, which will break subsequent chunks of this patch set. Signed-off-by: Alex Thorlton <athorlton@....com> Cc: Oleg Nesterov <oleg@...hat.com> Cc: Gerald Schaefer <gerald.schaefer@...ibm.com> Cc: Martin Schwidefsky <schwidefsky@...ibm.com> Cc: Heiko Carstens <heiko.carstens@...ibm.com> Cc: Christian Borntraeger <borntraeger@...ibm.com> Cc: Andrew Morton <akpm@...ux-foundation.org> Cc: Paolo Bonzini <pbonzini@...hat.com> Cc: "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com> Cc: Mel Gorman <mgorman@...e.de> Cc: Rik van Riel <riel@...hat.com> Cc: Ingo Molnar <mingo@...nel.org> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Sasha Levin <sasha.levin@...cle.com> Cc: linux390@...ibm.com Cc: linux-s390@...r.kernel.org Cc: linux-kernel@...r.kernel.org Cc: linux-mm@...ck.org --- arch/s390/mm/pgtable.c | 3 +++ mm/huge_memory.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 3584ed9..a87cdb4 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -504,6 +504,9 @@ static int gmap_connect_pgtable(unsigned long address, unsigned long segment, if (!pmd_present(*pmd) && __pte_alloc(mm, vma, pmd, vmaddr)) return -ENOMEM; + /* large pmds cannot yet be handled */ + if (pmd_large(*pmd)) + return -EFAULT; /* pmd now points to a valid segment table entry. */ rmap = kmalloc(sizeof(*rmap), GFP_KERNEL|__GFP_REPEAT); if (!rmap) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 82166bf..a4310a5 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1968,8 +1968,6 @@ out: int hugepage_madvise(struct vm_area_struct *vma, unsigned long *vm_flags, int advice) { - struct mm_struct *mm = vma->vm_mm; - switch (advice) { case MADV_HUGEPAGE: /* @@ -1977,8 +1975,6 @@ int hugepage_madvise(struct vm_area_struct *vma, */ if (*vm_flags & (VM_HUGEPAGE | VM_NO_THP)) return -EINVAL; - if (mm->def_flags & VM_NOHUGEPAGE) - return -EINVAL; *vm_flags &= ~VM_NOHUGEPAGE; *vm_flags |= VM_HUGEPAGE; /* -- 1.7.12.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists