| From: Peter Xu <peterx@redhat.com> |
| Subject: fs/Kconfig: make hugetlbfs a menuconfig |
| Date: Fri, 24 Nov 2023 10:19:02 -0500 |
| |
| Hugetlb vmemmap default option (HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON) |
| is a sub-option to hugetlbfs, but it shows in the same level as hugetlbfs |
| itself, under "Pesudo filesystems". |
| |
| Make the vmemmap option a sub-option to hugetlbfs, by changing hugetlbfs |
| into a menuconfig. When moving it, fix a typo 'v' spot by Randy. |
| |
| Link: https://lkml.kernel.org/r/20231124151902.1075697-1-peterx@redhat.com |
| Signed-off-by: Peter Xu <peterx@redhat.com> |
| Reviewed-by: Muchun Song <songmuchun@bytedance.com> |
| Cc: Mike Kravetz <mike.kravetz@oracle.com> |
| Cc: Randy Dunlap <rdunlap@infradead.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/Kconfig | 22 ++++++++++++---------- |
| 1 file changed, 12 insertions(+), 10 deletions(-) |
| |
| --- a/fs/Kconfig~fs-kconfig-make-hugetlbfs-a-menuconfig |
| +++ a/fs/Kconfig |
| @@ -254,7 +254,7 @@ config TMPFS_QUOTA |
| config ARCH_SUPPORTS_HUGETLBFS |
| def_bool n |
| |
| -config HUGETLBFS |
| +menuconfig HUGETLBFS |
| bool "HugeTLB file system support" |
| depends on X86 || SPARC64 || ARCH_SUPPORTS_HUGETLBFS || BROKEN |
| depends on (SYSFS || SYSCTL) |
| @@ -266,6 +266,17 @@ config HUGETLBFS |
| |
| If unsure, say N. |
| |
| +if HUGETLBFS |
| +config HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON |
| + bool "HugeTLB Vmemmap Optimization (HVO) defaults to on" |
| + default n |
| + depends on HUGETLB_PAGE_OPTIMIZE_VMEMMAP |
| + help |
| + The HugeTLB Vmemmap Optimization (HVO) defaults to off. Say Y here to |
| + enable HVO by default. It can be disabled via hugetlb_free_vmemmap=off |
| + (boot command line) or hugetlb_optimize_vmemmap (sysctl). |
| +endif # HUGETLBFS |
| + |
| config HUGETLB_PAGE |
| def_bool HUGETLBFS |
| select XARRAY_MULTI |
| @@ -275,15 +286,6 @@ config HUGETLB_PAGE_OPTIMIZE_VMEMMAP |
| depends on ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP |
| depends on SPARSEMEM_VMEMMAP |
| |
| -config HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON |
| - bool "HugeTLB Vmemmap Optimization (HVO) defaults to on" |
| - default n |
| - depends on HUGETLB_PAGE_OPTIMIZE_VMEMMAP |
| - help |
| - The HugeTLB VmemmapvOptimization (HVO) defaults to off. Say Y here to |
| - enable HVO by default. It can be disabled via hugetlb_free_vmemmap=off |
| - (boot command line) or hugetlb_optimize_vmemmap (sysctl). |
| - |
| config ARCH_HAS_GIGANTIC_PAGE |
| bool |
| |
| _ |
