@@ -8486,7 +8486,7 @@ CONFIG_SYSFS policy<{'amd64': 'y', 'arm64': '
CONFIG_TMPFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_TMPFS_POSIX_ACL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_TMPFS_XATTR policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_HUGETLBFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_HUGETLBFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> mark<ENFORCED> note<LP: #1933627>
CONFIG_CONFIGFS_FS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'y'}>
CONFIG_EFIVAR_FS policy<{'amd64': 'y', 'arm64': 'y', 'i386': 'y'}>
#
@@ -8694,7 +8694,7 @@ CONFIG_DEBUG_BLK_CGROUP policy<{'amd64': 'n', 'arm64': '
CONFIG_CGROUP_PIDS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_CGROUP_RDMA policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_CGROUP_FREEZER policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_CGROUP_HUGETLB policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_CGROUP_HUGETLB policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> mark<ENFORCED> note<LP: #1933627>
CONFIG_CPUSETS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_PROC_PID_CPUSET policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
CONFIG_CGROUP_DEVICE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -10741,8 +10741,8 @@ CONFIG_HZ_200 policy<{'armhf': 'n'}>
CONFIG_HZ_500 policy<{'armhf': 'n'}>
# Menu: Processor type and features >> Transparent Hugepage Support sysfs defaults
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS policy<{'amd64': 'y', 'arm64': 'y', 'armhf-generic-lpae': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE policy<{'amd64': 'n', 'arm64': 'n', 'armhf-generic-lpae': 'n', 'i386': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'y', 's390x': 'n'}> mark<ENFORCED> note<LP: #1933627>
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'n', 's390x': 'y'}> mark<ENFORCED> note<LP: #1933627>
# Menu: Processor type and features >> Tune code generation >> Architecture: s390
CONFIG_TUNE_DEFAULT policy<{'s390x': 'n'}>
@@ -207,6 +207,7 @@ CONFIG_ARCH_CLOCKSOURCE_DATA=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
# CONFIG_ARCH_DOVE is not set
# CONFIG_ARCH_EBSA110 is not set
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
# CONFIG_ARCH_EP93XX is not set
@@ -1096,6 +1097,7 @@ CONFIG_CGROUP_CPUACCT=y
# CONFIG_CGROUP_DEBUG is not set
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
CONFIG_CGROUP_NET_CLASSID=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_PERF=y
@@ -1626,6 +1628,7 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_DEV_APPLETALK=m
CONFIG_DEV_COREDUMP=y
+CONFIG_DEV_DAX=m
CONFIG_DHT11=m
CONFIG_DIMLIB=y
CONFIG_DLCI=m
@@ -2817,7 +2820,8 @@ CONFIG_HTS221=m
CONFIG_HTS221_I2C=m
CONFIG_HTS221_SPI=m
CONFIG_HTU21=m
-# CONFIG_HUGETLBFS is not set
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
# CONFIG_HVC_DCC is not set
CONFIG_HVC_DRIVER=y
CONFIG_HWLAT_TRACER=y
@@ -5467,6 +5471,7 @@ CONFIG_RD_LZMA=y
CONFIG_RD_LZO=y
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
CONFIG_REALTEK_AUTOPM=y
CONFIG_REALTEK_PHY=m
CONFIG_REBOOT_MODE=m
@@ -7136,7 +7141,10 @@ CONFIG_TRACE_SINK=m
CONFIG_TRACING=y
CONFIG_TRACING_MAP=y
CONFIG_TRACING_SUPPORT=y
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
CONFIG_TREE_SRCU=y
CONFIG_TRUSTED_FOUNDATIONS=y
CONFIG_TRUSTED_KEYS=y
@@ -8006,6 +8014,7 @@ CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
CONFIG_X25=m
CONFIG_X25_ASY=m
CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_XARRAY_MULTI=y
CONFIG_XDP_SOCKETS=y
CONFIG_XDP_SOCKETS_DIAG=m
# CONFIG_XEN is not set
BugLink: https://bugs.launchpad.net/bugs/1933532 Enable HUGETLBFS and TRANSPARENT_HUGEPAGE to make full use of huge pages. Also enable the cgroups controller to match the master kernel. Signed-off-by: Juerg Haefliger <juergh@canonical.com> --- debian.raspi/config/annotations | 8 ++++---- debian.raspi/config/config.common.ubuntu | 13 +++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-)