mm: percpu: Increase PERCPU_DYNAMIC_SIZE_SHIFT on certain builds.
Subsystems (2)
PATCH 1/1 mm: percpu: Increase PERCPU_DYNAMIC_SIZE_SHIFT on certain builds.
Arnd reported a build failure due to the BUILD_BUG_ON() statement in alloc_kmem_cache_cpus(). The test
PERCPU_DYNAMIC_EARLY_SIZE < NR_KMALLOC_TYPES * KMALLOC_SHIFT_HIGH * sizeof(struct kmem_cache_cpu)
The factors that increase the right side of the equation:
- PAGE_SIZE > 4KiB increases KMALLOC_SHIFT_HIGH
- For the local_lock_t in kmem_cache_cpu:
- PREEMPT_RT adds an actual lock.
- LOCKDEP increases the size of the lock.
- LOCK_STAT adds additional bytes plus padding to the lockdep structure.
The net difference with and without PREEMPT_RT is 88 bytes for the lock_lock_t, 96 bytes for kmem_cache_cpu due to additional padding. This is enough to exceed the 80KiB limit with 16KiB page size - the 8KiB page size is fine.
Increase PERCPU_DYNAMIC_SIZE_SHIFT to 13 on configs with PAGE_SIZE larger than 4KiB and LOCKDEP enabled.
--- include/linux/percpu.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/linux/percpu.h +5 -1
@@ -41,7 +41,11 @@ PCPU_MIN_ALLOC_SHIFT)#ifdef CONFIG_RANDOM_KMALLOC_CACHES -#define PERCPU_DYNAMIC_SIZE_SHIFT 12 +# if defined(CONFIG_LOCKDEP ) && !defined(CONFIG_PAGE_SIZE_4KB ) +# define PERCPU_DYNAMIC_SIZE_SHIFT 13 +# else +# define PERCPU_DYNAMIC_SIZE_SHIFT 12 +#endif /* LOCKDEP and PAGE_SIZE > 4KiB */ #else #define PERCPU_DYNAMIC_SIZE_SHIFT 10#endif
Signature · 1 line
2.45.2
Quoted 21 lines · Sebastian Andrzej Siewior
Arnd reported a build failure due to the
BUILD_BUG_ON()statement inalloc_kmem_cache_cpus(). The test
PERCPU_DYNAMIC_EARLY_SIZE<NR_KMALLOC_TYPES*KMALLOC_SHIFT_HIGH*sizeof(struct kmem_cache_cpu)The factors that increase the right side of the equation:
-PAGE_SIZE> 4KiB increasesKMALLOC_SHIFT_HIGH
- For thelocal_lock_tinkmem_cache_cpu:
-PREEMPT_RTadds an actual lock.
- LOCKDEP increases the size of the lock.
-LOCK_STATadds additional bytes plus padding to the lockdep structure.The net difference with and without
PREEMPT_RTis 88 bytes for thelock_lock_t, 96 bytes forkmem_cache_cpudue to additional padding. This is enough to exceed the 80KiB limit with 16KiB page size - the 8KiB page size is fine.Increase
PERCPU_DYNAMIC_SIZE_SHIFTto 13 on configs withPAGE_SIZElarger than 4KiB and LOCKDEP enabled.
Quoted 7 lines
Fixes d8fccd9ca5f9 ("arm64: Allow to enable PREEMPT_RT.")Reported-by kernel test robot <[email protected]>Reported-by Arnd Bergmann <[email protected]>Acked-by Arnd Bergmann <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>
IIRC Dennis at some point mentioned this will eventually become more robust as now it's kind of a whack-a-mole? :) But yeah, let's fix in a way that we can.
Quoted 21 lines
--- include/linux/percpu.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)include/linux/percpu.h +5
-1@@ -41,7 +41,11 @@ PCPU_MIN_ALLOC_SHIFT)#ifdef CONFIG_RANDOM_KMALLOC_CACHES -#define PERCPU_DYNAMIC_SIZE_SHIFT 12 +# if defined(CONFIG_LOCKDEP ) && !defined(CONFIG_PAGE_SIZE_4KB ) +# define PERCPU_DYNAMIC_SIZE_SHIFT 13 +# else +# define PERCPU_DYNAMIC_SIZE_SHIFT 12 +#endif /* LOCKDEP and PAGE_SIZE > 4KiB */ #else #define PERCPU_DYNAMIC_SIZE_SHIFT 10#endif
Quoted 21 lines · Sebastian Andrzej Siewior
Arnd reported a build failure due to the
BUILD_BUG_ON()statement inalloc_kmem_cache_cpus(). The test
PERCPU_DYNAMIC_EARLY_SIZE<NR_KMALLOC_TYPES*KMALLOC_SHIFT_HIGH*sizeof(struct kmem_cache_cpu)The factors that increase the right side of the equation:
-PAGE_SIZE> 4KiB increasesKMALLOC_SHIFT_HIGH
- For thelocal_lock_tinkmem_cache_cpu:
-PREEMPT_RTadds an actual lock.
- LOCKDEP increases the size of the lock.
-LOCK_STATadds additional bytes plus padding to the lockdep structure.The net difference with and without
PREEMPT_RTis 88 bytes for thelock_lock_t, 96 bytes forkmem_cache_cpudue to additional padding. This is enough to exceed the 80KiB limit with 16KiB page size - the 8KiB page size is fine.Increase
PERCPU_DYNAMIC_SIZE_SHIFTto 13 on configs withPAGE_SIZElarger than 4KiB and LOCKDEP enabled.
Quoted 7 lines
Fixes d8fccd9ca5f9 ("arm64: Allow to enable PREEMPT_RT.")Reported-by kernel test robot <[email protected]>Reported-by Arnd Bergmann <[email protected]>Acked-by Arnd Bergmann <[email protected]>Signed-off-by Sebastian Andrzej Siewior <[email protected]>