Commit 6cfd53fc authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds

nommu: fix kobjsize() for SLOB and SLUB

kobjsize() has been abusing page->index as a method for sorting out
compound order, which blows up both for page cache pages, and SLOB's
reuse of the index in struct slob_page.

Presently we are not able to accurately size arbitrary pointers that
don't come from kmalloc(), so the best we can do is sort out the
compound order from the head page if it's a compound page, or default
to 0-order if it's impossible to ksize() the object.

Obviously this leaves quite a bit to be desired in terms of object
sizing accuracy, but the behaviour is unchanged over the existing
implementation, while fixing the page->index oopses originally reported
here:

	http://marc.info/?l=linux-mm&m=121127773325245&w=2

Accuracy could also be improved by having SLUB and SLOB both set PG_slab
on ksizeable pages, rather than just handling the __GFP_COMP cases
irregardless of the PG_slab setting, as made possibly with Pekka's
patches:

	http://marc.info/?l=linux-kernel&m=121139439900534&w=2
	http://marc.info/?l=linux-kernel&m=121139440000537&w=2
	http://marc.info/?l=linux-kernel&m=121139440000540&w=2

This is primarily a bugfix for nommu systems for 2.6.26, with the aim
being to gradually kill off kobjsize() and its particular brand of
object abuse entirely.
Reviewed-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f09bdfc
...@@ -104,21 +104,43 @@ EXPORT_SYMBOL(vmtruncate); ...@@ -104,21 +104,43 @@ EXPORT_SYMBOL(vmtruncate);
unsigned int kobjsize(const void *objp) unsigned int kobjsize(const void *objp)
{ {
struct page *page; struct page *page;
int order = 0;
/* /*
* If the object we have should not have ksize performed on it, * If the object we have should not have ksize performed on it,
* return size of 0 * return size of 0
*/ */
if (!objp || (unsigned long)objp >= memory_end || !((page = virt_to_page(objp)))) if (!objp)
return 0; return 0;
if ((unsigned long)objp >= memory_end)
return 0;
page = virt_to_head_page(objp);
if (!page)
return 0;
/*
* If the allocator sets PageSlab, we know the pointer came from
* kmalloc().
*/
if (PageSlab(page)) if (PageSlab(page))
return ksize(objp); return ksize(objp);
BUG_ON(page->index < 0); /*
BUG_ON(page->index >= MAX_ORDER); * The ksize() function is only guaranteed to work for pointers
* returned by kmalloc(). So handle arbitrary pointers, that we expect
* always to be compound pages, here.
*/
if (PageCompound(page))
order = compound_order(page);
return (PAGE_SIZE << page->index); /*
* Finally, handle arbitrary pointers that don't set PageSlab.
* Default to 0-order in the case when we're unable to ksize()
* the object.
*/
return PAGE_SIZE << order;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment