[GIT PULL] percpu for v2.6.37-rc1

[Tejun Heo]

Hello, Linus.

Please pull from the following branch to receive percpu changes for
v2.6.37-rc1.

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git for-linus

The branch contains the following notable changes.

* Optimize this_cpu_ptr() on x86 which makes it sequenced by two
  instructions instead of three and removes use of a temp register.
  Also, make get_cpu_var() use this_cpu_ptr() so that it also can
  benefit from the optimization.

* Until now, on UP, percpu allocator wasn't built at all and it
  behaved as a simple wrapper around kmalloc.  This caused the
  following two problems.

  - Unlike percpu allocator, kmalloc can't honor arbitrary alignment
    requirement.  This led to a hacky workaround in cpu_workqueue
    allocation for example.

  - On SMP, percpu allocator is initialized earlier than sl?b
    allocators and their usage of percpu allocator is growing.
    Creating an allocator dependency loop on UP makes special
    workarounds necessary in those allocators.

  So, percpu allocator is now also enabled on UP using the km
  allocator which was originally written for SMP architectures w/o
  mmu.  This will increase memory usage slightly on UP but shouldn't
  be anything noticeable.

Pulling into the current mainline (d4429f60) generates the following
conflict in include/linux/percpu.h caused by get/put_cpu_var()
addition routed through Ingo's tree.

index aeeeef1,0eb5083..5095b83
@@@ -38,10 -38,21 +38,19 @@@
  	(void)&(var);					\
  	preempt_enable();				\
  } while (0)

+ #define get_cpu_ptr(var) ({				\
+ 	preempt_disable();				\
+ 	this_cpu_ptr(var); })
+
+ #define put_cpu_ptr(var) do {				\
+ 	(void)(var);					\
+ 	preempt_enable();				\
+ } while (0)
+
 -#ifdef CONFIG_SMP
 -
  /* minimum unit size, also is the maximum supported allocation size */
 -#define PCPU_MIN_UNIT_SIZE		PFN_ALIGN(64 << 10)
 +#define PCPU_MIN_UNIT_SIZE		PFN_ALIGN(32 << 10)

  /*
   * Percpu allocator can serve percpu allocations before slab is
   * initialized which allows slab to depend on the percpu allocator.

Just in case, the merged tree is available in the following branch.

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git merged

Thanks.

Brian Gerst (2):
      x86, percpu: Optimize this_cpu_ptr
      percpu: Optimize __get_cpu_var()

Tejun Heo (6):
      vmalloc: pcpu_get/free_vm_areas() aren't needed on UP
      percpu: reduce PCPU_MIN_UNIT_SIZE to 32k
      percpu: use percpu allocator on UP too
      percpu: fix build breakage on s390 and cleanup build configuration tests
      percpu: clear memory allocated with the km allocator
      percpu: update comments to reflect that percpu allocations are always zero-filled

 arch/x86/include/asm/percpu.h |   14 ++
 include/asm-generic/percpu.h  |   14 +-
 include/linux/percpu.h        |   31 +---
 include/linux/vmalloc.h       |    2 +
 mm/Kconfig                    |    8 +
 mm/Makefile                   |    7 +-
 mm/percpu-km.c                |    8 +-
 mm/percpu.c                   |  401 ++++++++++++++++++++++++-----------------
 mm/percpu_up.c                |   30 ---
 mm/vmalloc.c                  |    2 +
 10 files changed, 281 insertions(+), 236 deletions(-)
 delete mode 100644 mm/percpu_up.c


-- 
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/