2 files changed, 42 insertions, 4 deletions

diff --git a/drivers/block/zram/zcomp_lz4.c b/drivers/block/zram/zcomp_lz4.c
index ee44b51130a4..dd6083124276 100644
--- a/drivers/block/zram/zcomp_lz4.c
+++ b/drivers/block/zram/zcomp_lz4.c
@@ -10,17 +10,36 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/lz4.h>
+#include <linux/vmalloc.h>
+#include <linux/mm.h>
 
 #include "zcomp_lz4.h"
 
 static void *zcomp_lz4_create(void)
 {
-        return kzalloc(LZ4_MEM_COMPRESS, GFP_NOIO);
+        void *ret;
+
+        /*
+         * This function can be called in swapout/fs write path
+         * so we can't use GFP_FS|IO. And it assumes we already
+         * have at least one stream in zram initialization so we
+         * don't do best effort to allocate more stream in here.
+         * A default stream will work well without further multiple
+         * streams. That's why we use NORETRY | NOWARN.
+         */
+        ret = kzalloc(LZ4_MEM_COMPRESS, GFP_NOIO | __GFP_NORETRY |
+                                        __GFP_NOWARN);
+        if (!ret)
+                ret = __vmalloc(LZ4_MEM_COMPRESS,
+                                GFP_NOIO | __GFP_NORETRY | __GFP_NOWARN |
+                                __GFP_ZERO | __GFP_HIGHMEM,
+                                PAGE_KERNEL);
+        return ret;
 }
 
 static void zcomp_lz4_destroy(void *private)
 {
-        kfree(private);
+        kvfree(private);
 }
 
 static int zcomp_lz4_compress(const unsigned char *src, unsigned char *dst,
diff --git a/drivers/block/zram/zcomp_lzo.c b/drivers/block/zram/zcomp_lzo.c
index 683ce049e070..edc549920fa0 100644
--- a/drivers/block/zram/zcomp_lzo.c
+++ b/drivers/block/zram/zcomp_lzo.c
@@ -10,17 +10,36 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/lzo.h>
+#include <linux/vmalloc.h>
+#include <linux/mm.h>
 
 #include "zcomp_lzo.h"
 
 static void *lzo_create(void)
 {
-        return kzalloc(LZO1X_MEM_COMPRESS, GFP_NOIO);
+        void *ret;
+
+        /*
+         * This function can be called in swapout/fs write path
+         * so we can't use GFP_FS|IO. And it assumes we already
+         * have at least one stream in zram initialization so we
+         * don't do best effort to allocate more stream in here.
+         * A default stream will work well without further multiple
+         * streams. That's why we use NORETRY | NOWARN.
+         */
+        ret = kzalloc(LZO1X_MEM_COMPRESS, GFP_NOIO | __GFP_NORETRY |
+                                        __GFP_NOWARN);
+        if (!ret)
+                ret = __vmalloc(LZO1X_MEM_COMPRESS,
+                                GFP_NOIO | __GFP_NORETRY | __GFP_NOWARN |
+                                __GFP_ZERO | __GFP_HIGHMEM,
+                                PAGE_KERNEL);
+        return ret;
 }
 
 static void lzo_destroy(void *private)
 {
-        kfree(private);
+        kvfree(private);
 }
 
 static int lzo_compress(const unsigned char *src, unsigned char *dst,