From 3fa67126b59243efafd53dc060e5a4dab9661b35 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 23 Jan 2018 19:22:35 +0100 Subject: [PATCH] Switch to SLUB as kernel allocator --- debian/changelog | 2 ++ debian/config/armel/config.marvell | 2 ++ debian/config/config | 10 ++++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0ade93f2..7aa8e55cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ linux (4.15~rc8-1~exp2) UNRELEASED; urgency=medium * x86: Enable SCHED_MC_PRIO, HYPERV_VSOCKETS. * Enable NVME_MULTIPATH, NVME_FC, NVME_TARGET_FC, move nvme module into scsi-modules installer udeb. + * Switch to SLUB as kernel allocator. (Closes: #862718) + - Enable SLUB_DEBUG, SLAB_FREELIST_HARDENED except on armel/marvell. [ Uwe Kleine-König ] * [arm64] enable I2C_PXA for espressobin (Closes: #886983) diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell index c85767564..c5703aeeb 100644 --- a/debian/config/armel/config.marvell +++ b/debian/config/armel/config.marvell @@ -730,6 +730,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y ## end choice # CONFIG_CHECKPOINT_RESTORE is not set # CONFIG_USERFAULTFD is not set +# CONFIG_SLUB_DEBUG is not set +# CONFIG_SLAB_FREELIST_HARDENED is not set # CONFIG_PROFILING is not set # CONFIG_MODULE_SIG is not set diff --git a/debian/config/config b/debian/config/config index 5f8039dd3..26bb807cf 100644 --- a/debian/config/config +++ b/debian/config/config @@ -5924,13 +5924,16 @@ CONFIG_USERFAULTFD=y CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_MEMCG_SYSFS_ON is not set # CONFIG_COMPAT_BRK is not set ## choice: Choose SLAB allocator -CONFIG_SLAB=y -# CONFIG_SLUB is not set -# CONFIG_SLOB is not set +CONFIG_SLUB=y ## end choice +CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y +CONFIG_SLAB_FREELIST_HARDENED=y +CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_MMAP_ALLOW_UNINITIALIZED is not set CONFIG_PROFILING=y CONFIG_MODULES=y @@ -6096,7 +6099,6 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_DEBUG_SLAB is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set # CONFIG_DEBUG_KMEMLEAK is not set