mm, frontswap: Fix frontswap_map issue with THP

This commit let zswap treats THP as continuous normal pages in zswap_frontswap_store.
It will store them to a lot of "zswap_entry". These "zswap_entry" will be inserted to "zswap_tree" together.

Signed-off-by Hui Zhu <[email protected]>

---
 mm/zswap.c | 170 +++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 109 insertions(+), 61 deletions(-)

mm/zswap.c +109 -62

index 46a3223..36aa10d 100644
@@ -316,11 +316,7 @@ static void zswap_rb_erase(struct rb_root *root, struct zswap_entry *entry)
        }
 }
 
-/*
- * Carries out the common pattern of freeing and entry's zpool allocation,
- * freeing the entry itself, and decrementing the number of stored pages.
- */
-static void zswap_free_entry(struct zswap_entry *entry)
+static void zswap_free_entry_1(struct zswap_entry *entry)
 {
        if (!entry->length)
                atomic_dec(&zswap_same_filled_pages);

@@ -329,6 +325,15 @@ static void zswap_free_entry(struct zswap_entry *entry)
                zswap_pool_put(entry->pool);
        }
        zswap_entry_cache_free(entry);
+}
+
+/*
+ * Carries out the common pattern of freeing and entry's zpool allocation,
+ * freeing the entry itself, and decrementing the number of stored pages.
+ */
+static void zswap_free_entry(struct zswap_entry *entry)
+{
+       zswap_free_entry_1(entry);
        atomic_dec(&zswap_stored_pages);
        zswap_update_total_size();
 }

@@ -980,15 +985,11 @@ static void zswap_fill_page(void *ptr, unsigned long value)
        memset_l(page, value, PAGE_SIZE / sizeof(unsigned long));
 }
 
-/*********************************
-* frontswap hooks
-**********************************/
-/* attempts to compress and store an single page */
-static int zswap_frontswap_store(unsigned type, pgoff_t offset,
-                               struct page *page)
+static int zswap_frontswap_store_1(unsigned type, pgoff_t offset,
+                               struct page *page,
+                               struct zswap_entry **entry_pointer)
 {
-       struct zswap_tree *tree = zswap_trees[type];
-       struct zswap_entry *entry, *dupentry;
+       struct zswap_entry *entry;
        struct crypto_comp *tfm;
        int ret;
        unsigned int hlen, dlen = PAGE_SIZE;

@@ -998,36 +999,6 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
        struct zswap_header zhdr = { .swpentry = swp_entry(type, offset) };
        gfp_t gfp;
 
-       /* THP isn't supported */
-       if (PageTransHuge(page)) {
-               ret = -EINVAL;
-               goto reject;
-       }
-
-       if (!zswap_enabled || !tree) {
-               ret = -ENODEV;
-               goto reject;
-       }
-
-       /* reclaim space if needed */
-       if (zswap_is_full()) {
-               zswap_pool_limit_hit++;
-               if (zswap_shrink()) {
-                       zswap_reject_reclaim_fail++;
-                       ret = -ENOMEM;
-                       goto reject;
-               }
-
-               /* A second zswap_is_full() check after
-                * zswap_shrink() to make sure it's now
-                * under the max_pool_percent
-                */
-               if (zswap_is_full()) {
-                       ret = -ENOMEM;
-                       goto reject;
-               }
-       }
-
        /* allocate entry */
        entry = zswap_entry_cache_alloc(GFP_KERNEL);
        if (!entry) {

@@ -1035,6 +1006,7 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
                ret = -ENOMEM;
                goto reject;
        }
+       *entry_pointer = entry;
 
        if (zswap_same_filled_pages_enabled) {
                src = kmap_atomic(page);

@@ -1044,7 +1016,7 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
                        entry->length = 0;
                        entry->value = value;
                        atomic_inc(&zswap_same_filled_pages);
-                       goto insert_entry;
+                       goto out;
                }
                kunmap_atomic(src);
        }

@@ -1093,31 +1065,105 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
        entry->handle = handle;
        entry->length = dlen;
 
-insert_entry:
+out:
+       return 0;
+
+put_dstmem:
+       put_cpu_var(zswap_dstmem);
+       zswap_pool_put(entry->pool);
+freepage:
+       zswap_entry_cache_free(entry);
+reject:
+       return ret;
+}
+
+/*********************************
+* frontswap hooks
+**********************************/
+/* attempts to compress and store an single page */
+static int zswap_frontswap_store(unsigned type, pgoff_t offset,
+                               struct page *page)
+{
+       struct zswap_tree *tree = zswap_trees[type];
+       struct zswap_entry **entries = NULL, *dupentry;
+       struct zswap_entry *single_entry[1];
+       int ret;
+       int i, nr;
+
+       if (!zswap_enabled || !tree) {
+               ret = -ENODEV;
+               goto reject;
+       }
+
+       /* reclaim space if needed */
+       if (zswap_is_full()) {
+               zswap_pool_limit_hit++;
+               if (zswap_shrink()) {
+                       zswap_reject_reclaim_fail++;
+                       ret = -ENOMEM;
+                       goto reject;
+               }
+
+               /* A second zswap_is_full() check after
+                * zswap_shrink() to make sure it's now
+                * under the max_pool_percent
+                */
+               if (zswap_is_full()) {
+                       ret = -ENOMEM;
+                       goto reject;
+               }
+       }
+
+       nr = hpage_nr_pages(page);
+
+       if (unlikely(nr > 1)) {
+               entries = kvmalloc(sizeof(struct zswap_entry *) * nr,
+                               GFP_KERNEL);
+               if (!entries) {
+                       ret = -ENOMEM;
+                       goto reject;
+               }
+       } else
+               entries = single_entry;
+
+       for (i = 0; i < nr; i++) {
+               ret = zswap_frontswap_store_1(type, offset + i, page + i,
+                                       &entries[i]);
+               if (ret)
+                       goto freepage;
+       }
+
        /* map */
        spin_lock(&tree->lock);
-       do {
-               ret = zswap_rb_insert(&tree->rbroot, entry, &dupentry);
-               if (ret == -EEXIST) {
-                       zswap_duplicate_entry++;
-                       /* remove from rbtree */
-                       zswap_rb_erase(&tree->rbroot, dupentry);
-                       zswap_entry_put(tree, dupentry);
-               }
-       } while (ret == -EEXIST);
+       for (i = 0; i < nr; i++) {
+               do {
+                       ret = zswap_rb_insert(&tree->rbroot, entries[i],
+                                       &dupentry);
+                       if (ret == -EEXIST) {
+                               zswap_duplicate_entry++;
+                               /* remove from rbtree */
+                               zswap_rb_erase(&tree->rbroot, dupentry);
+                               zswap_entry_put(tree, dupentry);
+                       }
+               } while (ret == -EEXIST);
+       }
        spin_unlock(&tree->lock);
 
        /* update stats */
-       atomic_inc(&zswap_stored_pages);
+       atomic_add(nr, &zswap_stored_pages);
        zswap_update_total_size();
 
-       return 0;
-
-put_dstmem:
-       put_cpu_var(zswap_dstmem);
-       zswap_pool_put(entry->pool);
+       ret = 0;
 freepage:
-       zswap_entry_cache_free(entry);
+       if (unlikely(nr > 1)) {
+               if (ret) {
+                       int j;
+
+                       for (j = 0; j < i; j++)
+                               zswap_free_entry_1(entries[j]);
+               }
+               kvfree(entries);
+       }
 reject:
        return ret;
 }

@@ -1136,6 +1182,8 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset,
        unsigned int dlen;
        int ret;
 
+       BUG_ON(PageTransHuge(page));
+
        /* find */
        spin_lock(&tree->lock);
        entry = zswap_entry_find_get(&tree->rbroot, offset);
--

2.7.4

Quoted 5 lines · Hui Zhu

This commit let zswap treats THP as continuous normal pages in zswap_frontswap_store.
It will store them to a lot of "zswap_entry". These "zswap_entry" will be inserted to "zswap_tree" together.

why does zswap need to carry the added complexity of converting THP into separate normal sized pages? That should be done higher up in the swap layer.

Quoted 248 lines

Signed-off-by Hui Zhu <[email protected]>

---
  mm/zswap.c | 170 +++++++++++++++++++++++++++++++++++++++----------------------
  1 file changed, 109 insertions(+), 61 deletions(-)

mm/zswap.c +109 -62

index 46a3223..36aa10d 100644
@@ -316,11 +316,7 @@ static void zswap_rb_erase(struct rb_root *root, struct zswap_entry *entry)
         }
  }
 
-/*
- * Carries out the common pattern of freeing and entry's zpool allocation,
- * freeing the entry itself, and decrementing the number of stored pages.
- */
-static void zswap_free_entry(struct zswap_entry *entry)
+static void zswap_free_entry_1(struct zswap_entry *entry)
  {
         if (!entry->length)
                 atomic_dec(&zswap_same_filled_pages);

@@ -329,6 +325,15 @@ static void zswap_free_entry(struct zswap_entry *entry)
                 zswap_pool_put(entry->pool);
         }
         zswap_entry_cache_free(entry);
+}
+
+/*
+ * Carries out the common pattern of freeing and entry's zpool allocation,
+ * freeing the entry itself, and decrementing the number of stored pages.
+ */
+static void zswap_free_entry(struct zswap_entry *entry)
+{
+       zswap_free_entry_1(entry);
         atomic_dec(&zswap_stored_pages);
         zswap_update_total_size();
  }

@@ -980,15 +985,11 @@ static void zswap_fill_page(void *ptr, unsigned long value)
         memset_l(page, value, PAGE_SIZE / sizeof(unsigned long));
  }
 
-/*********************************
-* frontswap hooks
-**********************************/
-/* attempts to compress and store an single page */
-static int zswap_frontswap_store(unsigned type, pgoff_t offset,
-                               struct page *page)
+static int zswap_frontswap_store_1(unsigned type, pgoff_t offset,
+                               struct page *page,
+                               struct zswap_entry **entry_pointer)
  {
-       struct zswap_tree *tree = zswap_trees[type];
-       struct zswap_entry *entry, *dupentry;
+       struct zswap_entry *entry;
         struct crypto_comp *tfm;
         int ret;
         unsigned int hlen, dlen = PAGE_SIZE;

@@ -998,36 +999,6 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
         struct zswap_header zhdr = { .swpentry = swp_entry(type, offset) };
         gfp_t gfp;
 
-       /* THP isn't supported */
-       if (PageTransHuge(page)) {
-               ret = -EINVAL;
-               goto reject;
-       }
-
-       if (!zswap_enabled || !tree) {
-               ret = -ENODEV;
-               goto reject;
-       }
-
-       /* reclaim space if needed */
-       if (zswap_is_full()) {
-               zswap_pool_limit_hit++;
-               if (zswap_shrink()) {
-                       zswap_reject_reclaim_fail++;
-                       ret = -ENOMEM;
-                       goto reject;
-               }
-
-               /* A second zswap_is_full() check after
-                * zswap_shrink() to make sure it's now
-                * under the max_pool_percent
-                */
-               if (zswap_is_full()) {
-                       ret = -ENOMEM;
-                       goto reject;
-               }
-       }
-
         /* allocate entry */
         entry = zswap_entry_cache_alloc(GFP_KERNEL);
         if (!entry) {

@@ -1035,6 +1006,7 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
                 ret = -ENOMEM;
                 goto reject;
         }
+       *entry_pointer = entry;
 
         if (zswap_same_filled_pages_enabled) {
                 src = kmap_atomic(page);

@@ -1044,7 +1016,7 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
                         entry->length = 0;
                         entry->value = value;
                         atomic_inc(&zswap_same_filled_pages);
-                       goto insert_entry;
+                       goto out;
                 }
                 kunmap_atomic(src);
         }

@@ -1093,31 +1065,105 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
         entry->handle = handle;
         entry->length = dlen;
 
-insert_entry:
+out:
+       return 0;
+
+put_dstmem:
+       put_cpu_var(zswap_dstmem);
+       zswap_pool_put(entry->pool);
+freepage:
+       zswap_entry_cache_free(entry);
+reject:
+       return ret;
+}
+
+/*********************************
+* frontswap hooks
+**********************************/
+/* attempts to compress and store an single page */
+static int zswap_frontswap_store(unsigned type, pgoff_t offset,
+                               struct page *page)
+{
+       struct zswap_tree *tree = zswap_trees[type];
+       struct zswap_entry **entries = NULL, *dupentry;
+       struct zswap_entry *single_entry[1];
+       int ret;
+       int i, nr;
+
+       if (!zswap_enabled || !tree) {
+               ret = -ENODEV;
+               goto reject;
+       }
+
+       /* reclaim space if needed */
+       if (zswap_is_full()) {
+               zswap_pool_limit_hit++;
+               if (zswap_shrink()) {
+                       zswap_reject_reclaim_fail++;
+                       ret = -ENOMEM;
+                       goto reject;
+               }
+
+               /* A second zswap_is_full() check after
+                * zswap_shrink() to make sure it's now
+                * under the max_pool_percent
+                */
+               if (zswap_is_full()) {
+                       ret = -ENOMEM;
+                       goto reject;
+               }
+       }
+
+       nr = hpage_nr_pages(page);
+
+       if (unlikely(nr > 1)) {
+               entries = kvmalloc(sizeof(struct zswap_entry *) * nr,
+                               GFP_KERNEL);
+               if (!entries) {
+                       ret = -ENOMEM;
+                       goto reject;
+               }
+       } else
+               entries = single_entry;
+
+       for (i = 0; i < nr; i++) {
+               ret = zswap_frontswap_store_1(type, offset + i, page + i,
+                                       &entries[i]);
+               if (ret)
+                       goto freepage;
+       }
+
         /* map */
         spin_lock(&tree->lock);
-       do {
-               ret = zswap_rb_insert(&tree->rbroot, entry, &dupentry);
-               if (ret == -EEXIST) {
-                       zswap_duplicate_entry++;
-                       /* remove from rbtree */
-                       zswap_rb_erase(&tree->rbroot, dupentry);
-                       zswap_entry_put(tree, dupentry);
-               }
-       } while (ret == -EEXIST);
+       for (i = 0; i < nr; i++) {
+               do {
+                       ret = zswap_rb_insert(&tree->rbroot, entries[i],
+                                       &dupentry);
+                       if (ret == -EEXIST) {
+                               zswap_duplicate_entry++;
+                               /* remove from rbtree */
+                               zswap_rb_erase(&tree->rbroot, dupentry);
+                               zswap_entry_put(tree, dupentry);
+                       }
+               } while (ret == -EEXIST);
+       }
         spin_unlock(&tree->lock);
 
         /* update stats */
-       atomic_inc(&zswap_stored_pages);
+       atomic_add(nr, &zswap_stored_pages);
         zswap_update_total_size();
 
-       return 0;
-
-put_dstmem:
-       put_cpu_var(zswap_dstmem);
-       zswap_pool_put(entry->pool);
+       ret = 0;
  freepage:
-       zswap_entry_cache_free(entry);
+       if (unlikely(nr > 1)) {
+               if (ret) {
+                       int j;
+
+                       for (j = 0; j < i; j++)
+                               zswap_free_entry_1(entries[j]);
+               }
+               kvfree(entries);
+       }
  reject:
         return ret;
  }

@@ -1136,6 +1182,8 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset,
         unsigned int dlen;
         int ret;
 
+       BUG_ON(PageTransHuge(page));
+
         /* find */
         spin_lock(&tree->lock);
         entry = zswap_entry_find_get(&tree->rbroot, offset);
--

2.7.4

Quoted 7 lines · Dan Streetman

Quoted 5 lines · Hui Zhu

This commit let zswap treats THP as continuous normal pages in zswap_frontswap_store.
It will store them to a lot of "zswap_entry". These "zswap_entry" will be inserted to "zswap_tree" together.

Quoted 4 lines

why does zswap need to carry the added complexity of converting THP into separate normal sized pages? That should be done higher up in the swap layer.

Hi Dan,

There are 2 issues will increase the performance overhead if thp is handle in swap layer.
1, When zswap is full, it will let page go back to swap device. Thp swap out faster if it is not split.
But swap layer doesn't know if zswap is full or not, so it need split the thp each time. It will decrease thp swap out speed.

2. If thp can handle the thp with itself, it can decrease the times of access the locks.
For example:

        spin_lock(&tree->lock);
        for (i = 0; i < nr; i++) {
                do {
                        ret = zswap_rb_insert(&tree->rbroot, entries[i],
                                        &dupentry);
                        if (ret == -EEXIST) {
                                zswap_duplicate_entry++;
                                /* remove from rbtree */
                                zswap_rb_erase(&tree->rbroot, dupentry);
                                zswap_entry_put(tree, dupentry);
                        }
                } while (ret == -EEXIST);
        }
        spin_unlock(&tree->lock);

This is my test in a vm that has 1 CPU, 1G memory and 4G swap:
First, I write a very small patch that let shrink_page_list split all thps.

(quoted diff) +0 -0

@@ -1298,8 +1298,7 @@ static unsigned long shrink_page_list(struct
 list_head *page_list,
                                          * away. Chances are some or

all of the
* tail pages can be freed
without IO.

                                          */

(quoted diff) +1 -2

-                                       if (!compound_mapcount(page) &&
-                                           split_huge_page_to_list(page,
+                                       if (split_huge_page_to_list(page,

page_list))

                                                 goto activate_locked;
                                 }

Following is my test with this kernel:
echo lz4 > /sys/module/zswap/parameters/compressor echo zsmalloc > /sys/module/zswap/parameters/zpool echo 0 > /sys/module/zswap/parameters/same_filled_pages_enabled echo 50 > /sys/module/zswap/parameters/max_pool_percent echo 1 > /sys/module/zswap/parameters/enabled
swapon /swapfile
echo always > /sys/kernel/mm/transparent_hugepage/enabled

/ # usemem -a -n 1 $((2000 * 1024 * 1024))
2359296000 bytes / 3384272 usecs = 680796 KB/s
71011 usecs to free memory
/ # usemem -a -n 1 $((2000 * 1024 * 1024))
2359296000 bytes / 3288668 usecs = 700587 KB/s
74503 usecs to free memory
/ # usemem -a -n 1 $((2000 * 1024 * 1024))
2359296000 bytes / 3402337 usecs = 677181 KB/s
142834 usecs to free memory
/ # usemem -a -n 1 $((2000 * 1024 * 1024))
2359296000 bytes / 3299039 usecs = 698385 KB/s
130385 usecs to free memory

Second, same test with zswap thp patch:
echo lz4 > /sys/module/zswap/parameters/compressor echo zsmalloc > /sys/module/zswap/parameters/zpool echo 0 > /sys/module/zswap/parameters/same_filled_pages_enabled echo 50 > /sys/module/zswap/parameters/max_pool_percent echo 1 > /sys/module/zswap/parameters/enabled
swapon /swapfile
echo always > /sys/kernel/mm/transparent_hugepage/enabled / # usemem -a -n 1 $((2000 * 1024 * 1024))
2359296000 bytes / 2799385 usecs = 823037 KB/s
69978 usecs to free memory
/ # usemem -a -n 1 $((2000 * 1024 * 1024))
2359296000 bytes / 2794564 usecs = 824457 KB/s
69124 usecs to free memory
/ # usemem -a -n 1 $((2000 * 1024 * 1024))
2359296000 bytes / 3000326 usecs = 767916 KB/s
123705 usecs to free memory

You can see that let zswap handle zswap is faster.

Thanks,
Hui

Quoted 248 lines

Quoted 248 lines

Signed-off-by Hui Zhu <[email protected]>

---
  mm/zswap.c | 170 +++++++++++++++++++++++++++++++++++++++----------------------
  1 file changed, 109 insertions(+), 61 deletions(-)

mm/zswap.c +109 -62

index 46a3223..36aa10d 100644
@@ -316,11 +316,7 @@ static void zswap_rb_erase(struct rb_root *root, struct zswap_entry *entry)
         }
  }
 
-/*
- * Carries out the common pattern of freeing and entry's zpool allocation,
- * freeing the entry itself, and decrementing the number of stored pages.
- */
-static void zswap_free_entry(struct zswap_entry *entry)
+static void zswap_free_entry_1(struct zswap_entry *entry)
  {
         if (!entry->length)
                 atomic_dec(&zswap_same_filled_pages);

@@ -329,6 +325,15 @@ static void zswap_free_entry(struct zswap_entry *entry)
                 zswap_pool_put(entry->pool);
         }
         zswap_entry_cache_free(entry);
+}
+
+/*
+ * Carries out the common pattern of freeing and entry's zpool allocation,
+ * freeing the entry itself, and decrementing the number of stored pages.
+ */
+static void zswap_free_entry(struct zswap_entry *entry)
+{
+       zswap_free_entry_1(entry);
         atomic_dec(&zswap_stored_pages);
         zswap_update_total_size();
  }

@@ -980,15 +985,11 @@ static void zswap_fill_page(void *ptr, unsigned long value)
         memset_l(page, value, PAGE_SIZE / sizeof(unsigned long));
  }
 
-/*********************************
-* frontswap hooks
-**********************************/
-/* attempts to compress and store an single page */
-static int zswap_frontswap_store(unsigned type, pgoff_t offset,
-                               struct page *page)
+static int zswap_frontswap_store_1(unsigned type, pgoff_t offset,
+                               struct page *page,
+                               struct zswap_entry **entry_pointer)
  {
-       struct zswap_tree *tree = zswap_trees[type];
-       struct zswap_entry *entry, *dupentry;
+       struct zswap_entry *entry;
         struct crypto_comp *tfm;
         int ret;
         unsigned int hlen, dlen = PAGE_SIZE;

@@ -998,36 +999,6 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
         struct zswap_header zhdr = { .swpentry = swp_entry(type, offset) };
         gfp_t gfp;
 
-       /* THP isn't supported */
-       if (PageTransHuge(page)) {
-               ret = -EINVAL;
-               goto reject;
-       }
-
-       if (!zswap_enabled || !tree) {
-               ret = -ENODEV;
-               goto reject;
-       }
-
-       /* reclaim space if needed */
-       if (zswap_is_full()) {
-               zswap_pool_limit_hit++;
-               if (zswap_shrink()) {
-                       zswap_reject_reclaim_fail++;
-                       ret = -ENOMEM;
-                       goto reject;
-               }
-
-               /* A second zswap_is_full() check after
-                * zswap_shrink() to make sure it's now
-                * under the max_pool_percent
-                */
-               if (zswap_is_full()) {
-                       ret = -ENOMEM;
-                       goto reject;
-               }
-       }
-
         /* allocate entry */
         entry = zswap_entry_cache_alloc(GFP_KERNEL);
         if (!entry) {

@@ -1035,6 +1006,7 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
                 ret = -ENOMEM;
                 goto reject;
         }
+       *entry_pointer = entry;
 
         if (zswap_same_filled_pages_enabled) {
                 src = kmap_atomic(page);

@@ -1044,7 +1016,7 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
                         entry->length = 0;
                         entry->value = value;
                         atomic_inc(&zswap_same_filled_pages);
-                       goto insert_entry;
+                       goto out;
                 }
                 kunmap_atomic(src);
         }

@@ -1093,31 +1065,105 @@ static int zswap_frontswap_store(unsigned type, pgoff_t offset,
         entry->handle = handle;
         entry->length = dlen;
 
-insert_entry:
+out:
+       return 0;
+
+put_dstmem:
+       put_cpu_var(zswap_dstmem);
+       zswap_pool_put(entry->pool);
+freepage:
+       zswap_entry_cache_free(entry);
+reject:
+       return ret;
+}
+
+/*********************************
+* frontswap hooks
+**********************************/
+/* attempts to compress and store an single page */
+static int zswap_frontswap_store(unsigned type, pgoff_t offset,
+                               struct page *page)
+{
+       struct zswap_tree *tree = zswap_trees[type];
+       struct zswap_entry **entries = NULL, *dupentry;
+       struct zswap_entry *single_entry[1];
+       int ret;
+       int i, nr;
+
+       if (!zswap_enabled || !tree) {
+               ret = -ENODEV;
+               goto reject;
+       }
+
+       /* reclaim space if needed */
+       if (zswap_is_full()) {
+               zswap_pool_limit_hit++;
+               if (zswap_shrink()) {
+                       zswap_reject_reclaim_fail++;
+                       ret = -ENOMEM;
+                       goto reject;
+               }
+
+               /* A second zswap_is_full() check after
+                * zswap_shrink() to make sure it's now
+                * under the max_pool_percent
+                */
+               if (zswap_is_full()) {
+                       ret = -ENOMEM;
+                       goto reject;
+               }
+       }
+
+       nr = hpage_nr_pages(page);
+
+       if (unlikely(nr > 1)) {
+               entries = kvmalloc(sizeof(struct zswap_entry *) * nr,
+                               GFP_KERNEL);
+               if (!entries) {
+                       ret = -ENOMEM;
+                       goto reject;
+               }
+       } else
+               entries = single_entry;
+
+       for (i = 0; i < nr; i++) {
+               ret = zswap_frontswap_store_1(type, offset + i, page + i,
+                                       &entries[i]);
+               if (ret)
+                       goto freepage;
+       }
+
         /* map */
         spin_lock(&tree->lock);
-       do {
-               ret = zswap_rb_insert(&tree->rbroot, entry, &dupentry);
-               if (ret == -EEXIST) {
-                       zswap_duplicate_entry++;
-                       /* remove from rbtree */
-                       zswap_rb_erase(&tree->rbroot, dupentry);
-                       zswap_entry_put(tree, dupentry);
-               }
-       } while (ret == -EEXIST);
+       for (i = 0; i < nr; i++) {
+               do {
+                       ret = zswap_rb_insert(&tree->rbroot, entries[i],
+                                       &dupentry);
+                       if (ret == -EEXIST) {
+                               zswap_duplicate_entry++;
+                               /* remove from rbtree */
+                               zswap_rb_erase(&tree->rbroot, dupentry);
+                               zswap_entry_put(tree, dupentry);
+                       }
+               } while (ret == -EEXIST);
+       }
         spin_unlock(&tree->lock);
 
         /* update stats */
-       atomic_inc(&zswap_stored_pages);
+       atomic_add(nr, &zswap_stored_pages);
         zswap_update_total_size();
 
-       return 0;
-
-put_dstmem:
-       put_cpu_var(zswap_dstmem);
-       zswap_pool_put(entry->pool);
+       ret = 0;
  freepage:
-       zswap_entry_cache_free(entry);
+       if (unlikely(nr > 1)) {
+               if (ret) {
+                       int j;
+
+                       for (j = 0; j < i; j++)
+                               zswap_free_entry_1(entries[j]);
+               }
+               kvfree(entries);
+       }
  reject:
         return ret;
  }

@@ -1136,6 +1182,8 @@ static int zswap_frontswap_load(unsigned type, pgoff_t offset,
         unsigned int dlen;
         int ret;
 
+       BUG_ON(PageTransHuge(page));
+
         /* find */
         spin_lock(&tree->lock);
         entry = zswap_entry_find_get(&tree->rbroot, offset);
--

2.7.4