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

Commit 24f971ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux 

Pull SLAB changes from Pekka Enberg:
 "The patches from Joonsoo Kim switch mm/slab.c to use 'struct page' for
  slab internals similar to mm/slub.c.  This reduces memory usage and
  improves performance:

    https://lkml.org/lkml/2013/10/16/155

  Rest of the changes are bug fixes from various people"

* 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: (21 commits)
  mm, slub: fix the typo in mm/slub.c
  mm, slub: fix the typo in include/linux/slub_def.h
  slub: Handle NULL parameter in kmem_cache_flags
  slab: replace non-existing 'struct freelist *' with 'void *'
  slab: fix to calm down kmemleak warning
  slub: proper kmemleak tracking if CONFIG_SLUB_DEBUG disabled
  slab: rename slab_bufctl to slab_freelist
  slab: remove useless statement for checking pfmemalloc
  slab: use struct page for slab management
  slab: replace free and inuse in struct slab with newly introduced active
  slab: remove SLAB_LIMIT
  slab: remove kmem_bufctl_t
  slab: change the management method of free objects of the slab
  slab: use __GFP_COMP flag for allocating slab pages
  slab: use well-defined macro, virt_to_slab()
  slab: overloading the RCU head over the LRU for RCU free
  slab: remove cachep in struct slab_rcu
  slab: remove nodeid in struct slab
  slab: remove colouroff in struct slab
  slab: change return type of kmem_getpages() to struct page
  ...
parents 3bab0bf0 721ae22a

include/linux/mm_types.h

+16 −8
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct page { 
	/* First double word block */

	unsigned long flags;		/* Atomic flags, some possibly

					 * updated asynchronously */

	union {

		struct address_space *mapping;	/* If low bit clear, points to

						 * inode address_space, or NULL.

						 * If page mapped as anonymous
@@ -51,11 +52,14 @@ struct page { 
						 * it points to anon_vma object:

						 * see PAGE_MAPPING_ANON below.

						 */

		void *s_mem;			/* slab first object */

	};



	/* Second double word */

	struct {

		union {

			pgoff_t index;		/* Our offset within mapping. */

			void *freelist;		/* slub/slob first free object */

			void *freelist;		/* sl[aou]b first free object */

			bool pfmemalloc;	/* If set by the page allocator,

						 * ALLOC_NO_WATERMARKS was set

						 * and the low watermark was not
@@ -111,6 +115,7 @@ struct page { 
				};

				atomic_t _count;		/* Usage count, see below. */

			};

			unsigned int active;	/* SLAB */

		};

	};
@@ -132,6 +137,9 @@ struct page { 


		struct list_head list;	/* slobs list of pages */

		struct slab *slab_page; /* slab fields */

		struct rcu_head rcu_head;	/* Used by SLAB

						 * when destroying via RCU

						 */

#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && USE_SPLIT_PMD_PTLOCKS

		pgtable_t pmd_huge_pte; /* protected by page->ptl */

#endif

include/linux/slab.h

+8 −1
Original line number Diff line number Diff line
@@ -53,7 +53,14 @@ 
 *  }

 *  rcu_read_unlock();

 *

 * See also the comment on struct slab_rcu in mm/slab.c.

 * This is useful if we need to approach a kernel structure obliquely,

 * from its address obtained without the usual locking. We can lock

 * the structure to stabilize it and check it's still at the given address,

 * only if we can be sure that the memory has not been meanwhile reused

 * for some other kind of object (which our subsystem's lock might corrupt).

 *

 * rcu_read_lock before reading the address, then rcu_read_unlock after

 * taking the spinlock within the structure expected at that address.

 */

#define SLAB_DESTROY_BY_RCU	0x00080000UL	/* Defer freeing slabs to RCU */

#define SLAB_MEM_SPREAD		0x00100000UL	/* Spread some memory over cpuset */

include/linux/slab_def.h

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ struct kmem_cache { 


	size_t colour;			/* cache colouring range */

	unsigned int colour_off;	/* colour offset */

	struct kmem_cache *slabp_cache;

	unsigned int slab_size;

	struct kmem_cache *freelist_cache;

	unsigned int freelist_size;



	/* constructor func */

	void (*ctor)(void *obj);

include/linux/slub_def.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
enum stat_item {

	ALLOC_FASTPATH,		/* Allocation from cpu slab */

	ALLOC_SLOWPATH,		/* Allocation by getting a new cpu slab */

	FREE_FASTPATH,		/* Free to cpu slub */

	FREE_FASTPATH,		/* Free to cpu slab */

	FREE_SLOWPATH,		/* Freeing not to cpu slab */

	FREE_FROZEN,		/* Freeing to frozen slab */

	FREE_ADD_PARTIAL,	/* Freeing moves slab to partial list */

mm/slab.c

+217 −354

File changed.

Preview size limit exceeded, changes collapsed.