slab: correct pfmemalloc check

[firefly-linux-kernel-4.4.55.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 2580db062df97488a92beeb1e008d866db4d7f7e..0b4ddafd8a030fb2269af01134a4a5a9eb342b6d 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -930,7 +930,8 @@ static void *__ac_put_obj(struct kmem_cache *cachep, struct array_cache *ac,
 {
        if (unlikely(pfmemalloc_active)) {
                /* Some pfmemalloc slabs exist, check if this is one */
-               struct page *page = virt_to_head_page(objp);
+               struct slab *slabp = virt_to_slab(objp);
+               struct page *page = virt_to_head_page(slabp->s_mem);
                if (PageSlabPfmemalloc(page))
                        set_obj_pfmemalloc(&objp);
        }
@@ -1776,7 +1777,7 @@ static void *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, int nodeid)
                __SetPageSlab(page + i);
 
                if (page->pfmemalloc)
-                       SetPageSlabPfmemalloc(page + i);
+                       SetPageSlabPfmemalloc(page);
        }
        memcg_bind_pages(cachep, cachep->gfporder);
 
@@ -1809,9 +1810,10 @@ static void kmem_freepages(struct kmem_cache *cachep, void *addr)
        else
                sub_zone_page_state(page_zone(page),
                                NR_SLAB_UNRECLAIMABLE, nr_freed);
+
+       __ClearPageSlabPfmemalloc(page);
        while (i--) {
                BUG_ON(!PageSlab(page));
-               __ClearPageSlabPfmemalloc(page);
                __ClearPageSlab(page);
                page++;
        }