Skip to contentSkip to conversation

mm: Use strtobool for param parsing

PATCH Applied Dr. David Alan Gilbert 2 participants 3 messages Feb 27, 2022 – Feb 28, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm: Use strtobool for param parsing

Use strtobool rather than open coding "on" and "off" parsing in mm/hugetlb_vmemmap.c and mm/page_table_check.c.

---
 mm/hugetlb_vmemmap.c  | 12 +-----------
 mm/page_table_check.c | 10 +---------
 2 files changed, 2 insertions(+), 20 deletions(-)
mm/hugetlb_vmemmap.c +1 -11
index c540c21e26f5b..919411386e547 100644
@@ -192,17 +192,7 @@ static int __init early_hugetlb_free_vmemmap_param(char *buf)
 		return 0;
 	}
 
-	if (!buf)
-		return -EINVAL;
-
-	if (!strcmp(buf, "on"))
-		hugetlb_free_vmemmap_enabled = true;
-	else if (!strcmp(buf, "off"))
-		hugetlb_free_vmemmap_enabled = false;
-	else
-		return -EINVAL;
-
-	return 0;
+	return strtobool(buf, &hugetlb_free_vmemmap_enabled);
 }
 early_param("hugetlb_free_vmemmap", early_hugetlb_free_vmemmap_param);
 
mm/page_table_check.c +1 -9
index 3763bd077861a..2458281bff893 100644
@@ -23,15 +23,7 @@ EXPORT_SYMBOL(page_table_check_disabled);
 
 static int __init early_page_table_check_param(char *buf)
 {
-	if (!buf)
-		return -EINVAL;
-
-	if (strcmp(buf, "on") == 0)
-		__page_table_check_enabled = true;
-	else if (strcmp(buf, "off") == 0)
-		__page_table_check_enabled = false;
-
-	return 0;
+	return strtobool(buf, &__page_table_check_enabled);
 }
 
 early_param("page_table_check", early_page_table_check_param);
Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 21 lines · On Sun, 27 Feb 2022 18:10:39 +0000 "Dr. David Alan Gilbert"…

Use strtobool rather than open coding "on" and "off" parsing in mm/hugetlb_vmemmap.c and mm/page_table_check.c.

---
 mm/hugetlb_vmemmap.c  | 12 +-----------
 mm/page_table_check.c | 10 +---------
 2 files changed, 2 insertions(+), 20 deletions(-)
mm/hugetlb_vmemmap.c +0 -4
index c540c21e26f5b..919411386e547 100644
@@ -192,17 +192,7 @@ static int __init early_hugetlb_free_vmemmap_param(char *buf)
 		return 0;
 	}
 
-	if (!buf)
-		return -EINVAL;
-
-	if (!strcmp(buf, "on"))

mm/hugetlb_vmemmap.c static int __init early_hugetlb_free_vmemmap_param(char *buf) · line 197

Quoted 10 lines
mm/hugetlb_vmemmap.c +1 -7
-		hugetlb_free_vmemmap_enabled = true;
-	else if (!strcmp(buf, "off"))
-		hugetlb_free_vmemmap_enabled = false;
-	else
-		return -EINVAL;
-
-	return 0;
+	return strtobool(buf, &hugetlb_free_vmemmap_enabled);
 }
 early_param("hugetlb_free_vmemmap", early_hugetlb_free_vmemmap_param);

This part falls afoul of the changes in
https://lkml.kernel.org/r/[email protected]

Quoted 9 lines
mm/page_table_check.c +0 -1
index 3763bd077861a..2458281bff893 100644
@@ -23,15 +23,7 @@ EXPORT_SYMBOL(page_table_check_disabled);
 
 static int __init early_page_table_check_param(char *buf)
 {
-	if (!buf)

mm/page_table_check.c EXPORT_SYMBOL(page_table_check_disabled); · line 27

Quoted 10 lines
mm/page_table_check.c +1 -8
-		return -EINVAL;
-
-	if (strcmp(buf, "on") == 0)
-		__page_table_check_enabled = true;
-	else if (strcmp(buf, "off") == 0)
-		__page_table_check_enabled = false;
-
-	return 0;
+	return strtobool(buf, &__page_table_check_enabled);
 }

But this works OK.

#2 lore raw
Quoted 28 lines · * Andrew Morton ([email protected]) wrote:
Quoted 26 lines · On Sun, 27 Feb 2022 18:10:39 +0000 "Dr. David Alan Gilbert"…

Use strtobool rather than open coding "on" and "off" parsing in mm/hugetlb_vmemmap.c and mm/page_table_check.c.

---
 mm/hugetlb_vmemmap.c  | 12 +-----------
 mm/page_table_check.c | 10 +---------
 2 files changed, 2 insertions(+), 20 deletions(-)
mm/hugetlb_vmemmap.c +0 -9
index c540c21e26f5b..919411386e547 100644
@@ -192,17 +192,7 @@ static int __init early_hugetlb_free_vmemmap_param(char *buf)
 		return 0;
 	}
 
-	if (!buf)
-		return -EINVAL;
-
-	if (!strcmp(buf, "on"))
-		hugetlb_free_vmemmap_enabled = true;
-	else if (!strcmp(buf, "off"))
-		hugetlb_free_vmemmap_enabled = false;
-	else
-		return -EINVAL;
Quoted 8 lines

mm/hugetlb_vmemmap.c static int __init early_hugetlb_free_vmemmap_param(char *buf) · line 197

Quoted 5 lines
mm/hugetlb_vmemmap.c +1 -2
-
-	return 0;
+	return strtobool(buf, &hugetlb_free_vmemmap_enabled);
 }
 early_param("hugetlb_free_vmemmap", early_hugetlb_free_vmemmap_param);

This part falls afoul of the changes in
https://lkml.kernel.org/r/[email protected]

Hmm, yes that's quite different.

Quoted 6 lines
Quoted 6 lines
mm/page_table_check.c +0 -0
index 3763bd077861a..2458281bff893 100644
@@ -23,15 +23,7 @@ EXPORT_SYMBOL(page_table_check_disabled);
 
Quoted 15 lines

mm/page_table_check.c EXPORT_SYMBOL(page_table_check_disabled); · line 27

Quoted 13 lines
mm/page_table_check.c +1 -9
 static int __init early_page_table_check_param(char *buf)
 {
-	if (!buf)
-		return -EINVAL;
-
-	if (strcmp(buf, "on") == 0)
-		__page_table_check_enabled = true;
-	else if (strcmp(buf, "off") == 0)
-		__page_table_check_enabled = false;
-
-	return 0;
+	return strtobool(buf, &__page_table_check_enabled);
 }

But this works OK.

Thanks for taking it.

Dave

Signature · 4 lines
 -----Open up your eyes, open up your mind, open up your code -------   
/ Dr. David Alan Gilbert    |       Running GNU/Linux       | Happy  \ 
\        dave @ treblig.org |                               | In Hex /
 \ _________________________|_____ http://www.treblig.org   |_______/