Commit 5538c562 authored Oct 09, 2014 by Dan Streetman Committed by Linus Torvalds Oct 09, 2014

zsmalloc: simplify init_zspage free obj linking



Change zsmalloc init_zspage() logic to iterate through each object on each
of its pages, checking the offset to verify the object is on the current
page before linking it into the zspage.

The current zsmalloc init_zspage free object linking code has logic that
relies on there only being one page per zspage when PAGE_SIZE is a
multiple of class->size.  It calculates the number of objects for the
current page, and iterates through all of them plus one, to account for
the assumed partial object at the end of the page.  While this currently
works, the logic can be simplified to just link the object at each
successive offset until the offset is larger than PAGE_SIZE, which does
not rely on PAGE_SIZE being a multiple of class->size.

Signed-off-by: Dan Streetman <ddstreet@ieee.org>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Seth Jennings <sjennings@variantweb.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 6dd9737e

mm/zsmalloc.c

+5 −9

Original line number	Diff line number	Diff line
		@@ -628,7 +628,7 @@ static void init_zspage(struct page first_page, struct size_class class)
		while (page) {
		struct page *next_page;
		struct link_free *link;
		unsigned int i, objs_on_page;
		unsigned int i = 1;

		/*
		* page->index stores offset of first object starting
		@@ -641,15 +641,11 @@ static void init_zspage(struct page first_page, struct size_class class)

		link = (struct link_free *)kmap_atomic(page) +
		off / sizeof(*link);
		objs_on_page = (PAGE_SIZE - off) / class->size;

		for (i = 1; i <= objs_on_page; i++) {
		off += class->size;
		if (off < PAGE_SIZE) {
		link->next = obj_location_to_handle(page, i);
		while ((off += class->size) < PAGE_SIZE) {
		link->next = obj_location_to_handle(page, i++);
		link += class->size / sizeof(*link);
		}
		}

		/*
		* We now come to the last (full or partial) object on this
		@@ -660,7 +656,7 @@ static void init_zspage(struct page first_page, struct size_class class)
		link->next = obj_location_to_handle(next_page, 0);
		kunmap_atomic(link);
		page = next_page;
		off = (off + class->size) % PAGE_SIZE;
		off %= PAGE_SIZE;
		}
		}

Admin message