1 files changed, 8 insertions, 15 deletions

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 94f38fac5e81..2a4acf400846 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -199,9 +199,6 @@ struct size_class {
 
         spinlock_t lock;
 
-        /* stats */
-        u64 pages_allocated;
-
         struct page *fullness_list[_ZS_NR_FULLNESS_GROUPS];
 };
 
@@ -220,6 +217,7 @@ struct zs_pool {
         struct size_class size_class[ZS_SIZE_CLASSES];
 
         gfp_t flags;    /* allocation flags used when growing pool */
+        atomic_long_t pages_allocated;
 };
 
 /*
@@ -1028,8 +1026,9 @@ unsigned long zs_malloc(struct zs_pool *pool, size_t size)
                         return 0;
 
                 set_zspage_mapping(first_page, class->index, ZS_EMPTY);
+                atomic_long_add(class->pages_per_zspage,
+                                        &pool->pages_allocated);
                 spin_lock(&class->lock);
-                class->pages_allocated += class->pages_per_zspage;
         }
 
         obj = (unsigned long)first_page->freelist;
@@ -1082,14 +1081,13 @@ void zs_free(struct zs_pool *pool, unsigned long obj)
 
         first_page->inuse--;
         fullness = fix_fullness_group(pool, first_page);
-
-        if (fullness == ZS_EMPTY)
-                class->pages_allocated -= class->pages_per_zspage;
-
         spin_unlock(&class->lock);
 
-        if (fullness == ZS_EMPTY)
+        if (fullness == ZS_EMPTY) {
+                atomic_long_sub(class->pages_per_zspage,
+                                &pool->pages_allocated);
                 free_zspage(first_page);
+        }
 }
 EXPORT_SYMBOL_GPL(zs_free);
 
@@ -1185,12 +1183,7 @@ EXPORT_SYMBOL_GPL(zs_unmap_object);
 
 u64 zs_get_total_size_bytes(struct zs_pool *pool)
 {
-        int i;
-        u64 npages = 0;
-
-        for (i = 0; i < ZS_SIZE_CLASSES; i++)
-                npages += pool->size_class[i].pages_allocated;
-
+        u64 npages = atomic_long_read(&pool->pages_allocated);
         return npages << PAGE_SHIFT;
 }
 EXPORT_SYMBOL_GPL(zs_get_total_size_bytes);