Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02cbc874 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

SLUB: move tracking definitions and check_valid_pointer() away from debug code 



Move the tracking definitions and the check_valid_pointer() function away from
the debugging related functions.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 636f0d7d

mm/slub.c

+29 −29
Original line number Diff line number Diff line
@@ -195,6 +195,18 @@ static enum { 
static DECLARE_RWSEM(slub_lock);

LIST_HEAD(slab_caches);



/*

 * Tracking user of a slab.

 */

struct track {

	void *addr;		/* Called from address */

	int cpu;		/* Was running on cpu */

	int pid;		/* Pid context */

	unsigned long when;	/* When did the operation occur */

};



enum track_item { TRACK_ALLOC, TRACK_FREE };



#ifdef CONFIG_SYSFS

static int sysfs_slab_add(struct kmem_cache *);

static int sysfs_slab_alias(struct kmem_cache *, const char *);
@@ -223,6 +235,23 @@ static inline struct kmem_cache_node *get_node(struct kmem_cache *s, int node) 
#endif

}



static inline int check_valid_pointer(struct kmem_cache *s,

				struct page *page, const void *object)

{

	void *base;



	if (!object)

		return 1;



	base = page_address(page);

	if (object < base || object >= base + s->objects * s->size ||

		(object - base) % s->size) {

		return 0;

	}



	return 1;

}



/*

 * Slow version of get and set free pointer.

 *
@@ -290,18 +319,6 @@ static void print_section(char *text, u8 *addr, unsigned int length) 
	}

}



/*

 * Tracking user of a slab.

 */

struct track {

	void *addr;		/* Called from address */

	int cpu;		/* Was running on cpu */

	int pid;		/* Pid context */

	unsigned long when;	/* When did the operation occur */

};



enum track_item { TRACK_ALLOC, TRACK_FREE };



static struct track *get_track(struct kmem_cache *s, void *object,

	enum track_item alloc)

{
@@ -436,23 +453,6 @@ static int check_bytes(u8 *start, unsigned int value, unsigned int bytes) 
	return 1;

}



static inline int check_valid_pointer(struct kmem_cache *s,

				struct page *page, const void *object)

{

	void *base;



	if (!object)

		return 1;



	base = page_address(page);

	if (object < base || object >= base + s->objects * s->size ||

		(object - base) % s->size) {

		return 0;

	}



	return 1;

}



/*

 * Object layout:

 *