preempt_rt: increase PERCPU_DYNAMIC_SIZE_SHIFT for slab randomization

Commit Message

Arnd Bergmann Oct. 4, 2024, 9:56 a.m. UTC

From: Arnd Bergmann <[e-mail]>

When both PREEMPT_RT and RANDOM_KMALLOC_CACHES are enabled, the slub allocator
runs into a build time failure:

In file included from <command-line>:
In function 'alloc_kmem_cache_cpus',
    inlined from 'do_kmem_cache_create' at mm/slub.c:6041:7:
include/linux/compiler_types.h:517:45: error: call to '__compiletime_assert_598' declared with attribute error: BUILD_BUG_ON failed: PERCPU_DYNAMIC_EARLY_SIZE < NR_KMALLOC_TYPES * KMALLOC_SHIFT_HIGH * sizeof(struct kmem_cache_cpu)
  517 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |                                             ^
include/linux/compiler_types.h:498:25: note: in definition of macro '__compiletime_assert'
  498 |                         prefix ## suffix();                             \
      |                         ^~~~~~
include/linux/compiler_types.h:517:9: note: in expansion of macro '_compiletime_assert'
  517 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
      |         ^~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert'
   39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
      |                                     ^~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:50:9: note: in expansion of macro 'BUILD_BUG_ON_MSG'
   50 |         BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
      |         ^~~~~~~~~~~~~~~~
mm/slub.c:5133:9: note: in expansion of macro 'BUILD_BUG_ON'
 5133 |         BUILD_BUG_ON(PERCPU_DYNAMIC_EARLY_SIZE <
      |         ^~~~~~~~~~~~

The problem is the additional size overhead from local_lock in
struct kmem_cache_cpu.  Avoid this by preallocating a larger area.

Fixes: d8fccd9ca5f9 ("arm64: Allow to enable PREEMPT_RT.")
Reported-by: kernel test robot <[e-mail]>
Closes: https://lore.kernel.org/oe-kbuild-all/[e-mail]/
Signed-off-by: Arnd Bergmann <[e-mail]>
---
There is a good chance that there is a better way to address this, this
version was the first I came up with and I verified that it fixes all of
the broken configs.

See https://pastebin.com/raw/tuPgfPzu for a .config from a failing
randconfig build on 6.12-rc1.
---
 include/linux/percpu.h | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index b6321fc49159..4083295da27f 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -41,7 +41,11 @@ 
 					 PCPU_MIN_ALLOC_SHIFT)
 
 #ifdef CONFIG_RANDOM_KMALLOC_CACHES
+#ifdef CONFIG_PREEMPT_RT
+#define PERCPU_DYNAMIC_SIZE_SHIFT      13
+#else
 #define PERCPU_DYNAMIC_SIZE_SHIFT      12
+#endif
 #else
 #define PERCPU_DYNAMIC_SIZE_SHIFT      10
 #endif