Commit f81f6e4b authored by Peng Liu's avatar Peng Liu Committed by Andrew Morton
Browse files

hugetlb: fix return value of __setup handlers 

When __setup() return '0', using invalid option values causes the entire
kernel boot option string to be reported as Unknown.  Hugetlb calls
__setup() and will return '0' when set invalid parameter string.

The following phenomenon is observed:
 cmdline:
  hugepagesz=1Y hugepages=1
 dmesg:
  HugeTLB: unsupported hugepagesz=1Y
  HugeTLB: hugepages=1 does not follow a valid hugepagesz, ignoring
  Unknown kernel command line parameters "hugepagesz=1Y hugepages=1"

Since hugetlb will print warning/error information before return for
invalid parameter string, just use return '1' to avoid print again.

Link: https://lkml.kernel.org/r/20220413032915.251254-4-liupeng256@huawei.com


Signed-off-by: default avatarPeng Liu <liupeng256@huawei.com>
Reviewed-by: default avatarMuchun Song <songmuchun@bytedance.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Liu Yuntao <liuyuntao10@huawei.com>
Cc: Zhenguo Yao <yaozhenguo1@gmail.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f87442f4

mm/hugetlb.c

+8 −8
Original line number Diff line number Diff line
@@ -4155,7 +4155,7 @@ static int __init hugepages_setup(char *s) 
	if (!parsed_valid_hugepagesz) {

		pr_warn("HugeTLB: hugepages=%s does not follow a valid hugepagesz, ignoring\n", s);

		parsed_valid_hugepagesz = true;

		return 0;

		return 1;

	}



	/*
@@ -4171,7 +4171,7 @@ static int __init hugepages_setup(char *s) 


	if (mhp == last_mhp) {

		pr_warn("HugeTLB: hugepages= specified twice without interleaving hugepagesz=, ignoring hugepages=%s\n", s);

		return 0;

		return 1;

	}



	while (*p) {
@@ -4182,7 +4182,7 @@ static int __init hugepages_setup(char *s) 
		if (p[count] == ':') {

			if (!hugetlb_node_alloc_supported()) {

				pr_warn("HugeTLB: architecture can't support node specific alloc, ignoring!\n");

				return 0;

				return 1;

			}

			if (tmp >= MAX_NUMNODES || !node_online(tmp))

				goto invalid;
@@ -4224,7 +4224,7 @@ static int __init hugepages_setup(char *s) 
invalid:

	pr_warn("HugeTLB: Invalid hugepages parameter %s\n", p);

	hugepages_clear_pages_in_node();

	return 0;

	return 1;

}

__setup("hugepages=", hugepages_setup);
@@ -4245,7 +4245,7 @@ static int __init hugepagesz_setup(char *s) 


	if (!arch_hugetlb_valid_size(size)) {

		pr_err("HugeTLB: unsupported hugepagesz=%s\n", s);

		return 0;

		return 1;

	}



	h = size_to_hstate(size);
@@ -4260,7 +4260,7 @@ static int __init hugepagesz_setup(char *s) 
		if (!parsed_default_hugepagesz ||  h != &default_hstate ||

		    default_hstate.max_huge_pages) {

			pr_warn("HugeTLB: hugepagesz=%s specified twice, ignoring\n", s);

			return 0;

			return 1;

		}



		/*
@@ -4291,14 +4291,14 @@ static int __init default_hugepagesz_setup(char *s) 
	parsed_valid_hugepagesz = false;

	if (parsed_default_hugepagesz) {

		pr_err("HugeTLB: default_hugepagesz previously specified, ignoring %s\n", s);

		return 0;

		return 1;

	}



	size = (unsigned long)memparse(s, NULL);



	if (!arch_hugetlb_valid_size(size)) {

		pr_err("HugeTLB: unsupported default_hugepagesz=%s\n", s);

		return 0;

		return 1;

	}



	hugetlb_add_hstate(ilog2(size) - PAGE_SHIFT);