Commit e182a345 authored by Pekka Enberg's avatar Pekka Enberg
Browse files

Merge branches 'slab/next' and 'slub/partial' into slab/for-linus

parents 3cfef952 fe353178 dcc3be6a

Documentation/vm/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ page_migration 
	- description of page migration in NUMA systems.

pagemap.txt

	- pagemap, from the userspace perspective

slabinfo.c

	- source code for a tool to get reports about slabs.

slub.txt

	- a short users guide for SLUB.

unevictable-lru.txt

include/linux/mm_types.h

+13 −1
Original line number Diff line number Diff line
@@ -79,9 +79,21 @@ struct page { 
	};



	/* Third double word block */

	union {

		struct list_head lru;	/* Pageout list, eg. active_list

					 * protected by zone->lru_lock !

					 */

		struct {		/* slub per cpu partial pages */

			struct page *next;	/* Next partial slab */

#ifdef CONFIG_64BIT

			int pages;	/* Nr of partial slabs left */

			int pobjects;	/* Approximate # of objects */

#else

			short int pages;

			short int pobjects;

#endif

		};

	};



	/* Remainder is not double word aligned */

	union {

include/linux/slub_def.h

+4 −0
Original line number Diff line number Diff line
@@ -36,12 +36,15 @@ enum stat_item { 
	ORDER_FALLBACK,		/* Number of times fallback was necessary */

	CMPXCHG_DOUBLE_CPU_FAIL,/* Failure of this_cpu_cmpxchg_double */

	CMPXCHG_DOUBLE_FAIL,	/* Number of times that cmpxchg double did not match */

	CPU_PARTIAL_ALLOC,	/* Used cpu partial on alloc */

	CPU_PARTIAL_FREE,	/* USed cpu partial on free */

	NR_SLUB_STAT_ITEMS };



struct kmem_cache_cpu {

	void **freelist;	/* Pointer to next available object */

	unsigned long tid;	/* Globally unique transaction id */

	struct page *page;	/* The slab from which we are allocating */

	struct page *partial;	/* Partially allocated frozen slabs */

	int node;		/* The node of the page (or -1 for debug) */

#ifdef CONFIG_SLUB_STATS

	unsigned stat[NR_SLUB_STAT_ITEMS];
@@ -79,6 +82,7 @@ struct kmem_cache { 
	int size;		/* The size of an object including meta data */

	int objsize;		/* The size of an object without meta data */

	int offset;		/* Free pointer offset. */

	int cpu_partial;	/* Number of per cpu partial objects to keep around */

	struct kmem_cache_order_objects oo;



	/* Allocation and freeing of slabs */

mm/slab.c

+7 −12
Original line number Diff line number Diff line
@@ -1857,9 +1857,9 @@ static void dump_line(char *data, int offset, int limit) 
			error = data[offset + i];

			bad_count++;

		}

		printk(" %02x", (unsigned char)data[offset + i]);

	}

	printk("\n");

	print_hex_dump(KERN_CONT, "", 0, 16, 1,

			&data[offset], limit, 1);



	if (bad_count == 1) {

		error ^= POISON_FREE;
@@ -3039,14 +3039,9 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp) 
		printk(KERN_ERR "slab: Internal list corruption detected in "

				"cache '%s'(%d), slabp %p(%d). Hexdump:\n",

			cachep->name, cachep->num, slabp, slabp->inuse);

		for (i = 0;

		     i < sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t);

		     i++) {

			if (i % 16 == 0)

				printk("\n%03x:", i);

			printk(" %02x", ((unsigned char *)slabp)[i]);

		}

		printk("\n");

		print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, slabp,

			sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t),

			1);

		BUG();

	}

}
@@ -4584,7 +4579,7 @@ static const struct file_operations proc_slabstats_operations = { 


static int __init slab_proc_init(void)

{

	proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);

	proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);

#ifdef CONFIG_DEBUG_SLAB_LEAK

	proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);

#endif

mm/slub.c

+392 −166

File changed.

Preview size limit exceeded, changes collapsed.