mm-percpu-increase-percpu_dynamic_size_shift-on-certain-builds.patch removed from -mm tree
The quilt patch titled
Subject: mm: percpu: increase PERCPU_DYNAMIC_SIZE_SHIFT on certain builds.
has been removed from the -mm tree. Its filename was
mm-percpu-increase-percpu_dynamic_size_shift-on-certain-builds.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Sebastian Andrzej Siewior <[email protected]>
Subject: mm: percpu: increase PERCPU_DYNAMIC_SIZE_SHIFT on certain builds.
Date: Mon, 7 Oct 2024 16:30:49 +0200
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 renamed from include/linux/percpu.h~mm-percpu-increase-percpu_dynamic_size_shift-on-certain-builds +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
_
Patches currently in -mm which might be from [email protected] are