[rh7,1/2] ms/mm: kvmalloc does not fallback to vmalloc for incompatible gfp flags

Submitted by Andrey Ryabinin on Sept. 12, 2018, 10:13 a.m.


Message ID 20180912101333.12824-1-aryabinin@virtuozzo.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Andrey Ryabinin Sept. 12, 2018, 10:13 a.m.
From: Michal Hocko <mhocko@suse.com>

kvmalloc warned about incompatible gfp_mask to catch abusers (mostly
GFP_NOFS) with an intention that this will motivate authors of the code
to fix those.  Linus argues that this just motivates people to do even
more hacks like

	if (gfp == GFP_KERNEL)

I haven't seen this happening much (Linus pointed to bucket_lock special
cases an atomic allocation but my git foo hasn't found much more) but it
is true that we can grow those in future.  Therefore Linus suggested to
simply not fallback to vmalloc for incompatible gfp flags and rather
stick with the kmalloc path.

Link: http://lkml.kernel.org/r/20180601115329.27807-1-mhocko@kernel.org
Signed-off-by: Michal Hocko <mhocko@suse.com>
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Tom Herbert <tom@quantonium.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit ce91f6ee5b3bbbad8caff61b1c46d845c8db19bf)
Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
 mm/util.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/mm/util.c b/mm/util.c
index b9afaef17dfd..5f27a98cbb2d 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -346,7 +346,8 @@  EXPORT_SYMBOL(vm_mmap);
  * is supported only for large (>32kB) allocations, and it should be used only if
  * kmalloc is preferable to the vmalloc fallback, due to visible performance drawbacks.
- * Any use of gfp flags outside of GFP_KERNEL should be consulted with mm people.
+ * Please note that any use of gfp flags outside of GFP_KERNEL is careful to not
+ * fall back to vmalloc.
 void *kvmalloc_node(size_t size, gfp_t flags, int node)
@@ -357,7 +358,8 @@  void *kvmalloc_node(size_t size, gfp_t flags, int node)
 	 * vmalloc uses GFP_KERNEL for some internal allocations (e.g page tables)
 	 * so the given set of flags has to be compatible.
+	if ((flags & GFP_KERNEL) != GFP_KERNEL)
+		return kmalloc_node(size, flags, node);
 	 * Make sure that larger requests are not too disruptive - no OOM