hugetlbfs: move hugepagesz= parsing to arch independent code

Now that architectures provide arch_hugetlb_valid_size(), parsing of
"hugepagesz=" can be done in architecture independent code.  Create a
single routine to handle hugepagesz= parsing and remove all arch specific
routines.  We can also remove the interface hugetlb_bad_size() as this is
no longer used outside arch independent code.

This also provides consistent behavior of hugetlbfs command line options.
The hugepagesz= option should only be specified once for a specific size,
but some architectures allow multiple instances.  This appears to be more
of an oversight when code was added by some architectures to set up ALL
huge pages sizes.

Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tested-by: Sandipan Das <sandipan@linux.ibm.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Acked-by: Mina Almasry <almasrymina@google.com>
Acked-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>	[s390]
Acked-by: Will Deacon <will@kernel.org>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Longpeng <longpeng2@huawei.com>
Cc: Nitesh Narayan Lal <nitesh@redhat.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Anders Roxell <anders.roxell@linaro.org>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Cc: Qian Cai <cai@lca.pw>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Link: http://lkml.kernel.org/r/20200417185049.275845-3-mike.kravetz@oracle.com
Link: http://lkml.kernel.org/r/20200428205614.246260-3-mike.kravetz@oracle.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index 2ac41ce..d6cb9fe 100644 (file)
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -478,18 +478,3 @@ bool __init arch_hugetlb_valid_size(unsigned long size)
 
        return false;
 }
-
-static __init int setup_hugepagesz(char *opt)
-{
-       unsigned long ps = memparse(opt, &opt);
-
-       if (arch_hugetlb_valid_size(ps)) {
-               add_huge_page_size(ps);
-               return 1;
-       }
-
-       hugetlb_bad_size();
-       pr_err("hugepagesz: Unsupported page size %lu K\n", ps >> 10);
-       return 0;
-}
-__setup("hugepagesz=", setup_hugepagesz);

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index de54d2a..2c3fa0a 100644 (file)
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -589,21 +589,6 @@ static int __init add_huge_page_size(unsigned long long size)
        return 0;
 }
 
-static int __init hugepage_setup_sz(char *str)
-{
-       unsigned long long size;
-
-       size = memparse(str, &str);
-
-       if (add_huge_page_size(size) != 0) {
-               hugetlb_bad_size();
-               pr_err("Invalid huge page size specified(%llu)\n", size);
-       }
-
-       return 1;
-}
-__setup("hugepagesz=", hugepage_setup_sz);
-
 static int __init hugetlbpage_init(void)
 {
        bool configured = false;

diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c
index da1f516..4e5d7e9 100644 (file)
--- a/arch/riscv/mm/hugetlbpage.c
+++ b/arch/riscv/mm/hugetlbpage.c
@@ -22,22 +22,6 @@ bool __init arch_hugetlb_valid_size(unsigned long size)
                return false;
 }
 
-static __init int setup_hugepagesz(char *opt)
-{
-       unsigned long ps = memparse(opt, &opt);
-
-       if (arch_hugetlb_valid_size(ps)) {
-               hugetlb_add_hstate(ilog2(ps) - PAGE_SHIFT);
-               return 1;
-       }
-
-       hugetlb_bad_size();
-       pr_err("hugepagesz: Unsupported page size %lu M\n", ps >> 20);
-       return 0;
-
-}
-__setup("hugepagesz=", setup_hugepagesz);
-
 #ifdef CONFIG_CONTIG_ALLOC
 static __init int gigantic_pages_init(void)
 {

diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index 2f2b6b5..82df06d 100644 (file)
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -264,24 +264,6 @@ bool __init arch_hugetlb_valid_size(unsigned long size)
                return false;
 }
 
-static __init int setup_hugepagesz(char *opt)
-{
-       unsigned long size;
-       char *string = opt;
-
-       size = memparse(opt, &opt);
-       if (arch_hugetlb_valid_size(size)) {
-               hugetlb_add_hstate(ilog2(size) - PAGE_SHIFT);
-       } else {
-               hugetlb_bad_size();
-               pr_err("hugepagesz= specifies an unsupported page size %s\n",
-                       string);
-               return 0;
-       }
-       return 1;
-}
-__setup("hugepagesz=", setup_hugepagesz);
-
 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
                unsigned long addr, unsigned long len,
                unsigned long pgoff, unsigned long flags)

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 24475b7..1b1f1ac 100644 (file)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -397,28 +397,6 @@ bool __init arch_hugetlb_valid_size(unsigned long size)
 
        return true;
 }
-
-static int __init setup_hugepagesz(char *string)
-{
-       unsigned long long hugepage_size;
-       int rc = 0;
-
-       hugepage_size = memparse(string, &string);
-
-       if (!arch_hugetlb_valid_size((unsigned long)hugepage_size)) {
-               hugetlb_bad_size();
-               pr_err("hugepagesz=%llu not supported by MMU.\n",
-                       hugepage_size);
-               goto out;
-       }
-
-       add_huge_page_size(hugepage_size);
-       rc = 1;
-
-out:
-       return rc;
-}
-__setup("hugepagesz=", setup_hugepagesz);
 #endif /* CONFIG_HUGETLB_PAGE */
 
 void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *ptep)

diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index 1c4372b..937d640 100644 (file)
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
@@ -191,22 +191,6 @@ bool __init arch_hugetlb_valid_size(unsigned long size)
                return false;
 }
 
-static __init int setup_hugepagesz(char *opt)
-{
-       unsigned long ps = memparse(opt, &opt);
-
-       if (arch_hugetlb_valid_size(ps)) {
-               hugetlb_add_hstate(ilog2(ps) - PAGE_SHIFT);
-       } else {
-               hugetlb_bad_size();
-               printk(KERN_ERR "hugepagesz: Unsupported page size %lu M\n",
-                       ps >> 20);
-               return 0;
-       }
-       return 1;
-}
-__setup("hugepagesz=", setup_hugepagesz);
-
 #ifdef CONFIG_CONTIG_ALLOC
 static __init int gigantic_pages_init(void)
 {

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 2eb15f5..0c13706 100644 (file)
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -519,7 +519,6 @@ int huge_add_to_page_cache(struct page *page, struct address_space *mapping,
 int __init __alloc_bootmem_huge_page(struct hstate *h);
 int __init alloc_bootmem_huge_page(struct hstate *h);
 
-void __init hugetlb_bad_size(void);
 void __init hugetlb_add_hstate(unsigned order);
 bool __init arch_hugetlb_valid_size(unsigned long size);
 struct hstate *size_to_hstate(unsigned long size);

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 63ca424..6a8454b 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3262,12 +3262,6 @@ bool __init __attribute((weak)) arch_hugetlb_valid_size(unsigned long size)
        return size == HPAGE_SIZE;
 }
 
-/* Should be called on processing a hugepagesz=... option */
-void __init hugetlb_bad_size(void)
-{
-       parsed_valid_hugepagesz = false;
-}
-
 void __init hugetlb_add_hstate(unsigned int order)
 {
        struct hstate *h;
@@ -3337,6 +3331,23 @@ static int __init hugetlb_nrpages_setup(char *s)
 }
 __setup("hugepages=", hugetlb_nrpages_setup);
 
+static int __init hugepagesz_setup(char *s)
+{
+       unsigned long size;
+
+       size = (unsigned long)memparse(s, NULL);
+
+       if (!arch_hugetlb_valid_size(size)) {
+               parsed_valid_hugepagesz = false;
+               pr_err("HugeTLB: unsupported hugepagesz %s\n", s);
+               return 0;
+       }
+
+       hugetlb_add_hstate(ilog2(size) - PAGE_SHIFT);
+       return 1;
+}
+__setup("hugepagesz=", hugepagesz_setup);
+
 static int __init default_hugepagesz_setup(char *s)
 {
        unsigned long size;