From 57897f0ef5d9855febe4b79227491380a871ee46 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 1 Nov 2022 04:02:52 +0000 Subject: [PATCH 1/6] systemd: remove other notused systemd units CONFIG_HUGETLBFS and CONFIG_HUGETLB_PAGE need to be set for /sys/kernel/mm/hugepages to be available. Reading at https://www.kernel.org/doc/Documentation/vm/hugetlbpage.txt remove unused units: - systemd[1]: systemd-journald-audit.socket was skipped because of an unmet condition check (ConditionSecurity=audit). - systemd[1]: dev-hugepages.mount was skipped because of an unmet condition check (ConditionPathExists=/sys/kernel/mm/hugepages). --- packages/sysutils/systemd/package.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 94470331c4..7869e37632 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -140,6 +140,12 @@ post_makeinstall_target() { safe_remove ${INSTALL}/usr/lib/systemd/systemd-update-done safe_remove ${INSTALL}/usr/lib/systemd/system/systemd-update-done.service safe_remove ${INSTALL}/usr/lib/systemd/system/*.target.wants/systemd-update-done.service + # + safe_remove ${INSTALL}/usr/lib/systemd/system/dev-hugepages.mount + safe_remove ${INSTALL}/usr/lib/systemd/system/*.target.wants/dev-hugepages.mount + # + safe_remove ${INSTALL}/usr/lib/systemd/system/systemd-journald-audit.socket + safe_remove ${INSTALL}/usr/lib/systemd/system/*.target.wants/systemd-journald-audit.socket # adjust systemd-hwdb-update (we have read-only /etc). sed '/^ConditionNeedsUpdate=.*$/d' -i ${INSTALL}/usr/lib/systemd/system/systemd-hwdb-update.service From 227ca1ecef047b645d4f734678f67a8641e805e6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 15 Nov 2022 10:15:59 +0000 Subject: [PATCH 2/6] linux (Allwinner aarch64): change .config HUGETLBFS is not set --- projects/Allwinner/linux/linux.aarch64.conf | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/projects/Allwinner/linux/linux.aarch64.conf b/projects/Allwinner/linux/linux.aarch64.conf index 5127991c46..d2e915d445 100644 --- a/projects/Allwinner/linux/linux.aarch64.conf +++ b/projects/Allwinner/linux/linux.aarch64.conf @@ -177,7 +177,6 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_DEVICE=y @@ -817,7 +816,6 @@ CONFIG_COMPACTION=y CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 # CONFIG_PAGE_REPORTING is not set CONFIG_MIGRATION=y -CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y @@ -6333,11 +6331,8 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y +# CONFIG_HUGETLBFS is not set CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y From 9ccda45c5f6730e06129dd2a37d0f76c3d7a32c1 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 15 Nov 2022 10:16:24 +0000 Subject: [PATCH 3/6] linux (Qualcomm): change .config HUGETLBFS is not set --- .../Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf b/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf index 65edae1c99..84bbcd8e36 100644 --- a/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf +++ b/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf @@ -175,7 +175,6 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_HUGETLB=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_DEVICE=y @@ -848,7 +847,6 @@ CONFIG_COMPACTION=y CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y -CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y @@ -6485,11 +6483,8 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y +# CONFIG_HUGETLBFS is not set CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y From 7d016b9928798f2263d361c9d35306dc84b24f52 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 15 Nov 2022 10:17:31 +0000 Subject: [PATCH 4/6] linux (Rockchip RK3328): change .config HUGETLBFS is not set --- .../devices/RK3328/linux/default/linux.aarch64.conf | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf index 3e75475084..32747a5809 100644 --- a/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf @@ -172,7 +172,6 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set # CONFIG_CGROUP_FREEZER is not set -CONFIG_CGROUP_HUGETLB=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_DEVICE=y @@ -866,7 +865,6 @@ CONFIG_COMPACTION=y CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y -CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y @@ -5959,11 +5957,8 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y +# CONFIG_HUGETLBFS is not set CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y From c4321d067a2adc5ebcbd67645b529ff701802589 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 15 Nov 2022 10:17:48 +0000 Subject: [PATCH 5/6] linux (Rockchip RK3399): change .config HUGETLBFS is not set --- .../devices/RK3399/linux/default/linux.aarch64.conf | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf index 4e566e9bc9..f057c0380a 100644 --- a/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf +++ b/projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf @@ -172,7 +172,6 @@ CONFIG_FAIR_GROUP_SCHED=y CONFIG_CGROUP_PIDS=y # CONFIG_CGROUP_RDMA is not set # CONFIG_CGROUP_FREEZER is not set -CONFIG_CGROUP_HUGETLB=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_DEVICE=y @@ -867,7 +866,6 @@ CONFIG_COMPACTION=y CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_PAGE_REPORTING=y CONFIG_MIGRATION=y -CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_CONTIG_ALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y @@ -6729,11 +6727,8 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y -CONFIG_HUGETLBFS=y -CONFIG_HUGETLB_PAGE=y +# CONFIG_HUGETLBFS is not set CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y -# CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y From 8a2413d7f4691b797ebcaaa7f1bf5509b09d48b2 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 13 Dec 2022 22:18:07 +0000 Subject: [PATCH 6/6] kernel_options: add CONFIG_HUGETLBFS=n --- distributions/LibreELEC/kernel_options | 1 + 1 file changed, 1 insertion(+) diff --git a/distributions/LibreELEC/kernel_options b/distributions/LibreELEC/kernel_options index 9e72ce0708..0fec3b24df 100644 --- a/distributions/LibreELEC/kernel_options +++ b/distributions/LibreELEC/kernel_options @@ -4,6 +4,7 @@ CONFIG_SQUASHFS=y CONFIG_SQUASHFS_ZSTD=y CONFIG_VFAT_FS=y CONFIG_EXT4_FS=y +CONFIG_HUGETLBFS=n # packages/network/iwd CONFIG_CRYPTO_USER_API_HASH=y