mm: SLOB fix reclaim_state (1f0532eb) · Commits · 戴 / test

SLOB does not correctly account reclaim_state.reclaimed_slab, so it will break memory reclaim. Account it like SLAB does. Cc: stable@kernel.org Cc: linux-mm@kvack.org Acked-by:

Matt Mackall <mpm@selenic.com> Acked-by:

Christoph Lameter <cl@linux-foundation.org> Signed-off-by:

Nick Piggin <npiggin@suse.de> Signed-off-by:

Pekka Enberg <penberg@cs.helsinki.fi>

mm/slob.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@
		#include <linux/kernel.h>
		#include <linux/slab.h>
		#include <linux/mm.h>
		#include <linux/swap.h> /* struct reclaim_state */
		#include <linux/cache.h>
		#include <linux/init.h>
		#include <linux/module.h>
		@@ -255,6 +256,8 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)

		static void slob_free_pages(void *b, int order)
		{
		if (current->reclaim_state)
		current->reclaim_state->reclaimed_slab += 1 << order;
		free_pages((unsigned long)b, order);
		}

		@@ -407,7 +410,7 @@ static void slob_free(void *block, int size)
		spin_unlock_irqrestore(&slob_lock, flags);
		clear_slob_page(sp);
		free_slob_page(sp);
		free_page((unsigned long)b);
		slob_free_pages(b, 0);
		return;
		}

Admin message