Skip to contentSkip to conversation

SLAB changes for v3.11-rc0

GIT PULL Pekka Enberg 2 participants 4 messages Jul 14, 2013 – Jul 15, 2013

lore
Share & tools
lore
#0 lore raw

Hi Linus,

Please pull the latest SLAB tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux.git slab/for-linus

Highlights:

- Fix for boot-time problems on some architectures due to init_lock_keys() not respecting kmalloc_caches boundaries (Christoph Lameter)

- CONFIG_SLUB_CPU_PARTIAL requested by RT folks (Joonsoo Kim)

- Fix for excessive slab freelist draining (Wanpeng Li)

- SLUB and SLOB cleanups and fixes (various people)

The tree also contains Christoph's unification work that I merged in too late had to revert because it broke things. We'll try again for v3.12.

Pekka

------------------>
The following changes since commit 21884a83b2192a00885d7244a1dda32debd2fbc7:

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2013-07-06 14:09:38 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux.git slab/for-linus

Christoph Lameter (4):
slob: Rework #ifdeffery in slab.h
slab: fix init_lock_keys
mm/sl[aou]b: Move kmalloc_node functions to common code mm/sl[aou]b: Move kmalloc definitions to slab.h

Joonsoo Kim (2):
slub: do not put a slab to cpu partial list when cpu_partial is 0
slub: Make cpu partial slab support configurable

Michael Opdenacker (1):
slab: add kmalloc() to kernel API documentation

Pekka Enberg (2):
Revert "mm/sl[aou]b: Move kmalloc definitions to slab.h" Revert "mm/sl[aou]b: Move kmalloc_node functions to common code"

Sasha Levin (1):
slob: use DIV_ROUND_UP where possible

Steven Rostedt (2):
slob: Check for NULL pointer before calling ctor()
slub: Check for page NULL before doing the node_match check

Wanpeng Li (6):
mm/slab: Fix drain freelist excessively
mm/slab: Sharing s_next and s_stop between slab and slub mm/slab: Fix /proc/slabinfo unwriteable for slab mm/slub: Drop unnecessary nr_partials
mm/slub: Use node_nr_slabs and node_nr_objs in get_slabinfo mm/slab: Give s_next and s_stop slab-specific names

Zhouping Liu (1):
mm, slab: moved kmem_cache_alloc_node comment to correct place

 include/linux/slab.h     |   57 +++++++++++++++++++++++++++++++++------------
 include/linux/slob_def.h |    8 ------
 init/Kconfig             |   11 +++++++++
 mm/slab.c                |   51 ++++++++++++++++++----------------------
 mm/slab.h                |    3 ++
 mm/slab_common.c         |   18 ++++++++++----
 mm/slob.c                |    4 +-
 mm/slub.c                |   38 +++++++++++++++++++++---------
 8 files changed, 121 insertions(+), 69 deletions(-)
#1 lore raw
Quoted 4 lines · Pekka Enberg

The tree also contains Christoph's unification work that I merged in too late had to revert because it broke things. We'll try again for v3.12.

Ugh. I'll merge the commits leading up to that, but not the actual broken try at unification at all.

There's just one one-liner patch in between the broken commits and their reverts, I don't see the point of pulling that part at all, and I can take the one-liner separately.

Linus

#2 lore raw
Quoted 6 lines · Linus Torvalds
Quoted 4 lines · Pekka Enberg

The tree also contains Christoph's unification work that I merged in too late had to revert because it broke things. We'll try again for v3.12.

Quoted 6 lines

Ugh. I'll merge the commits leading up to that, but not the actual broken try at unification at all.

There's just one one-liner patch in between the broken commits and their reverts, I don't see the point of pulling that part at all, and I can take the one-liner separately.

OK, I'll requeue the oneliner commit. Thanks!

Pekka

#3 lore raw
Quoted 8 lines · Pekka Enberg
Quoted 6 lines

Ugh. I'll merge the commits leading up to that, but not the actual broken try at unification at all.

There's just one one-liner patch in between the broken commits and their reverts, I don't see the point of pulling that part at all, and I can take the one-liner separately.

OK, I'll requeue the oneliner commit. Thanks!

Oh, you picked it up yourself. Thanks Linus!

Pekka