fs, seqfile: always allow oom killer
diff mbox

Message ID 1443167034-67530-1-git-send-email-gthelen@google.com
State New
Headers show

Commit Message

Greg Thelen Sept. 25, 2015, 7:43 a.m. UTC
Since commit 5cec38ac866b ("fs, seq_file: fallback to vmalloc instead of
oom kill processes") seq_buf_alloc() avoids calling the oom killer for
PAGE_SIZE or smaller allocations; but larger allocations can use the oom
killer via vmalloc().  Thus reads of small files can return ENOMEM, but
larger files use the oom killer to avoid ENOMEM.

Memory overcommit requires use of the oom killer to select a victim
regardless of file size.

Enable oom killer for small seq_buf_alloc() allocations.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Greg Thelen <gthelen@google.com>
---
 fs/seq_file.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Comments

Eric Dumazet Sept. 25, 2015, 1:13 p.m. UTC | #1
On Fri, 2015-09-25 at 00:43 -0700, Greg Thelen wrote:
> Since commit 5cec38ac866b ("fs, seq_file: fallback to vmalloc instead of
> oom kill processes") seq_buf_alloc() avoids calling the oom killer for
> PAGE_SIZE or smaller allocations; but larger allocations can use the oom
> killer via vmalloc().  Thus reads of small files can return ENOMEM, but
> larger files use the oom killer to avoid ENOMEM.
> 
> Memory overcommit requires use of the oom killer to select a victim
> regardless of file size.
> 
> Enable oom killer for small seq_buf_alloc() allocations.
> 
> Signed-off-by: David Rientjes <rientjes@google.com>
> Signed-off-by: Greg Thelen <gthelen@google.com>
> ---

Acked-by: Eric Dumazet <edumazet@google.com>

Thanks guys.


--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 225586e141ca..a8e288755f24 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -25,12 +25,17 @@  static void seq_set_overflow(struct seq_file *m)
 static void *seq_buf_alloc(unsigned long size)
 {
 	void *buf;
+	gfp_t gfp = GFP_KERNEL;
 
 	/*
-	 * __GFP_NORETRY to avoid oom-killings with high-order allocations -
-	 * it's better to fall back to vmalloc() than to kill things.
+	 * For high order allocations, use __GFP_NORETRY to avoid oom-killing -
+	 * it's better to fall back to vmalloc() than to kill things.  For small
+	 * allocations, just use GFP_KERNEL which will oom kill, thus no need
+	 * for vmalloc fallback.
 	 */
-	buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
+	if (size > PAGE_SIZE)
+		gfp |= __GFP_NORETRY | __GFP_NOWARN;
+	buf = kmalloc(size, gfp);
 	if (!buf && size > PAGE_SIZE)
 		buf = vmalloc(size);
 	return buf;