|
@@ -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++;
|
|
|
}
|