All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mm: introduce MADV_CLR_HUGEPAGE
@ 2017-05-22  6:12 ` Mike Rapoport
  0 siblings, 0 replies; 117+ messages in thread
From: Mike Rapoport @ 2017-05-22  6:12 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Arnd Bergmann, Kirill A. Shutemov, Andrea Arcangeli, linux-mm,
	lkml, Mike Rapoport

Currently applications can explicitly enable or disable THP for a memory
region using MADV_HUGEPAGE or MADV_NOHUGEPAGE. However, once either of
these advises is used, the region will always have
VM_HUGEPAGE/VM_NOHUGEPAGE flag set in vma->vm_flags.
The MADV_CLR_HUGEPAGE resets both these flags and allows managing THP in
the region according to system-wide settings.

Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
---
 include/uapi/asm-generic/mman-common.h | 3 +++
 mm/khugepaged.c                        | 7 +++++++
 mm/madvise.c                           | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/include/uapi/asm-generic/mman-common.h b/include/uapi/asm-generic/mman-common.h
index 8c27db0..3201712 100644
--- a/include/uapi/asm-generic/mman-common.h
+++ b/include/uapi/asm-generic/mman-common.h
@@ -58,6 +58,9 @@
 					   overrides the coredump filter bits */
 #define MADV_DODUMP	17		/* Clear the MADV_DONTDUMP flag */
 
+#define MADV_CLR_HUGEPAGE 18		/* Clear flags controlling backing with
+					   hugepages */
+
 /* compatibility flags */
 #define MAP_FILE	0
 
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 945fd1c..b9ee9bb 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -336,6 +336,13 @@ int hugepage_madvise(struct vm_area_struct *vma,
 		 * it got registered before VM_NOHUGEPAGE was set.
 		 */
 		break;
+	case MADV_CLR_HUGEPAGE:
+		*vm_flags &= ~(VM_HUGEPAGE | VM_NOHUGEPAGE);
+		/*
+		 * The vma will be treated according to the
+		 * system-wide settings in transparent_hugepage_flags
+		 */
+		break;
 	}
 
 	return 0;
diff --git a/mm/madvise.c b/mm/madvise.c
index 25b78ee..ae650a3 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -105,6 +105,7 @@ static long madvise_behavior(struct vm_area_struct *vma,
 		break;
 	case MADV_HUGEPAGE:
 	case MADV_NOHUGEPAGE:
+	case MADV_CLR_HUGEPAGE:
 		error = hugepage_madvise(vma, &new_flags, behavior);
 		if (error) {
 			/*
@@ -684,6 +685,7 @@ madvise_behavior_valid(int behavior)
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 	case MADV_HUGEPAGE:
 	case MADV_NOHUGEPAGE:
+	case MADV_CLR_HUGEPAGE:
 #endif
 	case MADV_DONTDUMP:
 	case MADV_DODUMP:
@@ -739,6 +741,9 @@ madvise_behavior_valid(int behavior)
  *  MADV_NOHUGEPAGE - mark the given range as not worth being backed by
  *		transparent huge pages so the existing pages will not be
  *		coalesced into THP and new pages will not be allocated as THP.
+ *  MADV_CLR_HUGEPAGE - clear MADV_HUGEPAGE/MADV_NOHUGEPAGE marking;
+ *		the range will be treated by khugepaged according to the
+ *		system wide settings
  *  MADV_DONTDUMP - the application wants to prevent pages in the given range
  *		from being included in its core dump.
  *  MADV_DODUMP - cancel MADV_DONTDUMP: no longer exclude from core dump.
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 117+ messages in thread

end of thread, other threads:[~2017-06-02  9:11 UTC | newest]

Thread overview: 117+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-22  6:12 [PATCH] mm: introduce MADV_CLR_HUGEPAGE Mike Rapoport
2017-05-22  6:12 ` Mike Rapoport
2017-05-22  7:26 ` Anshuman Khandual
2017-05-22  7:26   ` Anshuman Khandual
2017-05-22  8:12   ` Mike Rapoport
2017-05-22  8:12     ` Mike Rapoport
2017-05-22 11:42 ` Kirill A. Shutemov
2017-05-22 11:42   ` Kirill A. Shutemov
2017-05-22 13:36   ` Mike Rapoport
2017-05-22 13:36     ` Mike Rapoport
2017-05-22 13:44     ` Kirill A. Shutemov
2017-05-22 13:44       ` Kirill A. Shutemov
2017-05-22 13:55     ` Michal Hocko
2017-05-22 13:55       ` Michal Hocko
2017-05-22 14:29       ` Mike Rapoport
2017-05-22 14:29         ` Mike Rapoport
2017-05-22 15:52         ` Vlastimil Babka
2017-05-22 15:52           ` Vlastimil Babka
2017-05-22 17:51           ` Mike Rapoport
2017-05-22 17:51             ` Mike Rapoport
2017-05-24  7:50           ` Mike Rapoport
2017-05-24  7:50             ` Mike Rapoport
2017-05-24  7:58             ` Vlastimil Babka
2017-05-24  7:58               ` Vlastimil Babka
2017-05-24  7:58               ` Vlastimil Babka
2017-05-24 10:39               ` Mike Rapoport
2017-05-24 10:39                 ` Mike Rapoport
2017-05-24 11:18                 ` Michal Hocko
2017-05-24 11:18                   ` Michal Hocko
2017-05-24 14:25                   ` Pavel Emelyanov
2017-05-24 14:25                     ` Pavel Emelyanov
2017-05-24 14:27                   ` Mike Rapoport
2017-05-24 14:27                     ` Mike Rapoport
2017-05-24 15:22                     ` Andrea Arcangeli
2017-05-24 15:22                       ` Andrea Arcangeli
2017-05-30  7:44                     ` Michal Hocko
2017-05-30  7:44                       ` Michal Hocko
2017-05-30  7:44                       ` Michal Hocko
2017-05-30 10:19                       ` Mike Rapoport
2017-05-30 10:19                         ` Mike Rapoport
2017-05-30 10:19                         ` Mike Rapoport
2017-05-30 10:39                         ` Michal Hocko
2017-05-30 10:39                           ` Michal Hocko
2017-05-30 14:04                           ` Andrea Arcangeli
2017-05-30 14:04                             ` Andrea Arcangeli
2017-05-30 14:04                             ` Andrea Arcangeli
2017-05-30 14:39                             ` Michal Hocko
2017-05-30 14:39                               ` Michal Hocko
2017-05-30 14:56                               ` Michal Hocko
2017-05-30 14:56                                 ` Michal Hocko
2017-05-30 14:56                                 ` Michal Hocko
2017-05-30 16:06                                 ` Andrea Arcangeli
2017-05-30 16:06                                   ` Andrea Arcangeli
2017-05-30 16:06                                   ` Andrea Arcangeli
2017-05-31  6:30                                   ` Vlastimil Babka
2017-05-31  6:30                                     ` Vlastimil Babka
2017-05-31  8:24                                     ` Michal Hocko
2017-05-31  8:24                                       ` Michal Hocko
2017-05-31  9:27                                       ` Mike Rapoport
2017-05-31  9:27                                         ` Mike Rapoport
2017-05-31 10:24                                         ` Michal Hocko
2017-05-31 10:24                                           ` Michal Hocko
2017-05-31 10:22                                       ` Michal Hocko
2017-05-31 10:22                                         ` Michal Hocko
2017-05-31 10:22                                         ` Michal Hocko
2017-06-01 11:00                                       ` Mike Rapoport
2017-06-01 11:00                                         ` Mike Rapoport
2017-06-01 12:27                                         ` Michal Hocko
2017-06-01 12:27                                           ` Michal Hocko
2017-05-30 15:43                               ` Andrea Arcangeli
2017-05-30 15:43                                 ` Andrea Arcangeli
2017-05-31 12:08                                 ` Michal Hocko
2017-05-31 12:08                                   ` Michal Hocko
2017-05-31 12:39                                   ` Mike Rapoprt
2017-05-31 12:39                                     ` Mike Rapoprt
2017-05-31 12:39                                     ` Mike Rapoprt
2017-05-31 14:18                                     ` Andrea Arcangeli
2017-05-31 14:18                                       ` Andrea Arcangeli
2017-05-31 14:32                                       ` Michal Hocko
2017-05-31 14:32                                         ` Michal Hocko
2017-05-31 14:32                                         ` Michal Hocko
2017-05-31 15:46                                         ` Andrea Arcangeli
2017-05-31 15:46                                           ` Andrea Arcangeli
2017-06-01  6:58                                       ` Mike Rapoport
2017-06-01  6:58                                         ` Mike Rapoport
2017-06-01  6:58                                         ` Mike Rapoport
2017-05-31 14:19                                     ` Michal Hocko
2017-05-31 14:19                                       ` Michal Hocko
2017-05-31 14:19                                       ` Michal Hocko
2017-06-01  6:53                               ` Mike Rapoport
2017-06-01  6:53                                 ` Mike Rapoport
2017-06-01  8:09                                 ` Michal Hocko
2017-06-01  8:09                                   ` Michal Hocko
2017-06-01  8:35                                   ` Mike Rapoport
2017-06-01  8:35                                     ` Mike Rapoport
2017-06-01  8:35                                     ` Mike Rapoport
2017-06-01 13:45                                   ` Andrea Arcangeli
2017-06-01 13:45                                     ` Andrea Arcangeli
2017-06-02  9:11                                     ` Mike Rapoport
2017-06-02  9:11                                       ` Mike Rapoport
2017-05-31  9:08                           ` Mike Rapoport
2017-05-31  9:08                             ` Mike Rapoport
2017-05-31  9:08                             ` Mike Rapoport
2017-05-31 12:05                             ` Michal Hocko
2017-05-31 12:05                               ` Michal Hocko
2017-05-31 12:25                               ` Mike Rapoprt
2017-05-31 12:25                                 ` Mike Rapoprt
2017-05-24 11:31                 ` Vlastimil Babka
2017-05-24 11:31                   ` Vlastimil Babka
2017-05-24 14:28                   ` Pavel Emelyanov
2017-05-24 14:28                     ` Pavel Emelyanov
2017-05-24 14:54                     ` Vlastimil Babka
2017-05-24 14:54                       ` Vlastimil Babka
2017-05-24 15:13                       ` Mike Rapoport
2017-05-24 15:13                         ` Mike Rapoport
2017-05-22 15:33 ` kbuild test robot
2017-05-22 15:33   ` kbuild test robot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.