Merge branch 'slab/for-6.8/slub-hook-cleanups' into slab/for-next

Merge the SLAB allocator removal and a number of subsequent SLUB
cleanups and optimizations.

CREDITS

@@ -9,10 +9,6 @@
  Linus
 ----------
 
-N: Matt Mackal
-E: [email protected]
-D: SLOB slab allocator
-
 N: Matti Aarnio
 E: [email protected]
 D: Alpha systems hacking, IPv6 and other network related stuff
@@ -1572,6 +1568,10 @@ S: Ampferstr. 50 / 4
 S: 6020 Innsbruck
 S: Austria
 
+N: Mark Hemment
+E: [email protected]
+D: SLAB allocator implementation
+
 N: Richard Henderson
 E: [email protected]
 E: [email protected]
@@ -2437,6 +2437,10 @@ D: work on suspend-to-ram/disk, killing duplicates from ioctl32,
 D: Altera SoCFPGA and Nokia N900 support.
 S: Czech Republic
 
+N: Olivia Mackall
+E: [email protected]
+D: SLOB slab allocator
+
 N: Paul Mackerras
 E: [email protected]
 D: PPP driver

Documentation/core-api/mm-api.rst

@@ -37,7 +37,7 @@ The Slab Cache
 .. kernel-doc:: include/linux/slab.h
  :internal:
 
-.. kernel-doc:: mm/slab.c
+.. kernel-doc:: mm/slub.c
  :export:
 
 .. kernel-doc:: mm/slab_common.c

arch/arm64/Kconfig

@@ -154,7 +154,7 @@ config ARM64
  select HAVE_MOVE_PUD
  select HAVE_PCI
  select HAVE_ACPI_APEI if (ACPI && EFI)
- select HAVE_ALIGNED_STRUCT_PAGE if SLUB
+ select HAVE_ALIGNED_STRUCT_PAGE
  select HAVE_ARCH_AUDITSYSCALL
  select HAVE_ARCH_BITREVERSE
  select HAVE_ARCH_COMPILER_H

arch/s390/Kconfig

@@ -146,7 +146,7 @@ config S390
  select GENERIC_TIME_VSYSCALL
  select GENERIC_VDSO_TIME_NS
  select GENERIC_IOREMAP if PCI
- select HAVE_ALIGNED_STRUCT_PAGE if SLUB
+ select HAVE_ALIGNED_STRUCT_PAGE
  select HAVE_ARCH_AUDITSYSCALL
  select HAVE_ARCH_JUMP_LABEL
  select HAVE_ARCH_JUMP_LABEL_RELATIVE

arch/x86/Kconfig

@@ -169,7 +169,7 @@ config X86
  select HAS_IOPORT
  select HAVE_ACPI_APEI if ACPI
  select HAVE_ACPI_APEI_NMI if ACPI
- select HAVE_ALIGNED_STRUCT_PAGE if SLUB
+ select HAVE_ALIGNED_STRUCT_PAGE
  select HAVE_ARCH_AUDITSYSCALL
  select HAVE_ARCH_HUGE_VMAP if X86_64 || X86_PAE
  select HAVE_ARCH_HUGE_VMALLOC if X86_64

include/linux/cpuhotplug.h

@@ -108,7 +108,6 @@ enum cpuhp_state {
  CPUHP_X2APIC_PREPARE,
  CPUHP_SMPCFD_PREPARE,
  CPUHP_RELAY_PREPARE,
- CPUHP_SLAB_PREPARE,
  CPUHP_MD_RAID5_PREPARE,
  CPUHP_RCUTREE_PREP,
  CPUHP_CPUIDLE_COUPLED_PREPARE,

include/linux/slab.h

@@ -24,7 +24,7 @@
 
 /*
  * Flags to pass to kmem_cache_create().
- * The ones marked DEBUG are only valid if CONFIG_DEBUG_SLAB is set.
+ * The ones marked DEBUG need CONFIG_SLUB_DEBUG enabled, otherwise are no-op
  */
 /* DEBUG: Perform (expensive) checks on alloc/free */
 #define SLAB_CONSISTENCY_CHECKS ((slab_flags_t __force)0x00000100U)
@@ -302,25 +302,15 @@ static inline unsigned int arch_slab_minalign(void)
  * Kmalloc array related definitions
  */
 
-#ifdef CONFIG_SLAB
 /*
- * SLAB and SLUB directly allocates requests fitting in to an order-1 page
+ * SLUB directly allocates requests fitting in to an order-1 page
  * (PAGE_SIZE*2). Larger requests are passed to the page allocator.
  */
 #define KMALLOC_SHIFT_HIGH (PAGE_SHIFT + 1)
 #define KMALLOC_SHIFT_MAX (MAX_ORDER + PAGE_SHIFT)
 #ifndef KMALLOC_SHIFT_LOW
-#define KMALLOC_SHIFT_LOW 5
-#endif
-#endif
-
-#ifdef CONFIG_SLUB
-#define KMALLOC_SHIFT_HIGH (PAGE_SHIFT + 1)
-#define KMALLOC_SHIFT_MAX (MAX_ORDER + PAGE_SHIFT)
-#ifndef KMALLOC_SHIFT_LOW
 #define KMALLOC_SHIFT_LOW 3
 #endif
-#endif
 
 /* Maximum allocatable size */
 #define KMALLOC_MAX_SIZE (1UL << KMALLOC_SHIFT_MAX)
@@ -788,12 +778,4 @@ size_t kmalloc_size_roundup(size_t size);
 
 void __init kmem_cache_init_late(void);
 
-#if defined(CONFIG_SMP) && defined(CONFIG_SLAB)
-int slab_prepare_cpu(unsigned int cpu);
-int slab_dead_cpu(unsigned int cpu);
-#else
-#define slab_prepare_cpu NULL
-#define slab_dead_cpu NULL
-#endif
-
 #endif /* _LINUX_SLAB_H */