From: Gerald Schaefer <gerald.schaefer@de.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Andrea Arcangeli <aarcange@redhat.com>,
Andi Kleen <ak@linux.intel.com>, Hugh Dickins <hughd@google.com>,
Hillf Danton <dhillf@gmail.com>
Cc: linux-kernel@vger.kernel.org,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>
Subject: [PATCH 4/8] thp: make MADV_HUGEPAGE check for mm->def_flags
Date: Thu, 6 Sep 2012 15:10:39 +0200 [thread overview]
Message-ID: <1346937043-28208-5-git-send-email-gerald.schaefer@de.ibm.com> (raw)
In-Reply-To: <1346937043-28208-1-git-send-email-gerald.schaefer@de.ibm.com>
This adds a check to hugepage_madvise(), to refuse MADV_HUGEPAGE
if VM_NOHUGEPAGE is set in mm->def_flags. On s390, the VM_NOHUGEPAGE
flag will be set in mm->def_flags for kvm processes, to prevent any
future thp mappings. In order to also prevent MADV_HUGEPAGE on such an
mm, hugepage_madvise() should check mm->def_flags.
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
---
mm/huge_memory.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 5617ee0..5fa0cd3 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1464,6 +1464,8 @@ 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:
/*
@@ -1471,6 +1473,8 @@ 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.11.5
next prev parent reply other threads:[~2012-09-06 13:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 13:10 [PATCH 0/8] thp: transparent hugepages on s390 Gerald Schaefer
2012-09-06 13:10 ` [PATCH 1/8] thp, x86: introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE Gerald Schaefer
2012-09-06 13:10 ` [PATCH 2/8] thp: remove assumptions on pgtable_t type Gerald Schaefer
2012-09-06 13:10 ` [PATCH 3/8] thp: introduce pmdp_invalidate() Gerald Schaefer
2012-09-06 13:10 ` Gerald Schaefer [this message]
2012-09-06 13:10 ` [PATCH 5/8] thp, s390: thp splitting backend for s390 Gerald Schaefer
2012-09-06 13:10 ` [PATCH 6/8] thp, s390: thp pagetable pre-allocation " Gerald Schaefer
2012-09-06 13:10 ` [PATCH 7/8] thp, s390: disable thp for kvm host on s390 Gerald Schaefer
2012-09-06 13:10 ` [PATCH 8/8] thp, s390: architecture backend for thp " Gerald Schaefer
2012-09-13 14:21 ` [PATCH] thp, s390: add missing earlyclobber to inline assembly Gerald Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346937043-28208-5-git-send-email-gerald.schaefer@de.ibm.com \
--to=gerald.schaefer@de.ibm.com \
--cc=aarcange@redhat.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=dhillf@gmail.com \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=schwidefsky@de.ibm.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).